2015-08-30 22:59 合并 zhanjx1314 实现的获取 cookie 的功能。

合并 zhanjx1314 实现的获取 cookie 的功能（wchar_t* 版本），并在其基础上增加了一个 utf8* 版本的重载，另外在 webBrowser 中增加一个菜单项测试此功能。
BlzFans · BrentHuang · Aug 29, 2015 · Aug 29, 2015 · Aug 29, 2015 · Aug 29, 2015
commit 8fb791afe4bd49f5b7236a704aca50dfc47ae26d
diff --git a/Document/history.md b/Document/history.md
@@ -1,4 +1,7 @@
-#### 2015-08-30 02:00 调整`Document/history.md`标题级别（之前太大）。
+#### 2015-08-30 22:59 合并[zhanjx1314](https://github.com/zhanjx1314/oos)实现的获取cookie的功能。
+合并[zhanjx1314](https://github.com/zhanjx1314/oos)实现的获取cookie的功能（`wchar_t*`版本），并在其基础上增加了一个`utf8*`版本的重载，另外在webBrowser中增加一个菜单项测试此功能。
+
+#### 2015-08-30 02:00 调整`Document/history.md`标题级别（之前太大）。
 
 #### 2015-08-30 01:40 修正`CWebView::loadURL`加载中文路径的HTML文件失败的问题。
 `CWebView::loadURL`调用`KURL::KURL(const KURL& base, const String& relative, const TextEncoding&)`构造`KURL`，第二个参数传入的是`const char*`类型的UTF-8字符串以构造一个`String`对象，然而`String::String(const char*)`是把字符串按照latin1处理的，正确应该使用`String::fromUTF8`显式从UTF-8构造。可以用wkeBrowser加载`demo/bin/中文.html`测试。
@@ -12,7 +15,7 @@
 
 #### 2015-08-30 01:19 增加webBrowser拖放加载HTML文件的功能。
 
-#### 2015-08-29 23:56 修正jsSet/jsGet多次调用不同属性却始终获取/设置的是第一次调用时的属性的问题。
+#### 2015-08-29 23:56 修正`jsSet`/`jsGet`多次调用不同属性却始终获取/设置的是第一次调用时的属性的问题。
 `JSC::Identifier`内部以`JSC::UString`保存属性名称，而`JSC::UString`内部把`char*`类型字符串的指针值作为其hash值，虽然在一个字符串内存上设置了与前次不同的字符串内容，但因为使用了同一内存地址（指针相同），hash值相同，会认为是同一个字符串。
 
 #### 2015-08-29 22:14 增删、修改JS绑定相关的接口，增加`Document/说明.txt`。

diff --git a/demo/bin/wke.dll b/demo/bin/wke.dll
diff --git a/demo/bin/wkeBrowser.exe b/demo/bin/wkeBrowser.exe
diff --git a/demo/libwke/wke.h b/demo/libwke/wke.h
@@ -139,7 +139,9 @@ namespace wke
  virtual void cut() = 0;
  virtual void paste() = 0;
  virtual void delete_() = 0;
-
+
+ virtual const wchar_t * cookieW() =0;
+ virtual const utf8* cookie() = 0;
  virtual void setCookieEnabled(bool enable) = 0;
  virtual bool cookieEnabled() const = 0;
 
@@ -278,6 +280,8 @@ WKE_API void wkeCut(wkeWebView webView);
 WKE_API void wkePaste(wkeWebView webView);
 WKE_API void wkeDelete(wkeWebView webView);
 
+WKE_API const wchar_t* wkeGetCookieW();
+WKE_API const utf8* wkeGetCookie();
 WKE_API void wkeSetCookieEnabled(wkeWebView webView, bool enable);
 WKE_API bool wkeCookieEnabled(wkeWebView webView);
 

diff --git a/demo/libwke/wke.lib b/demo/libwke/wke.lib
diff --git a/vs2008/wkeBrowser.vcproj b/vs2008/wkeBrowser.vcproj
@@ -204,6 +204,10 @@
  RelativePath="..\wkeBrowser\Resource.h"
  >
  </File>
+ <File
+ RelativePath=".\targetver.h"
+ >
+ </File>
  <File
  RelativePath="..\wkeBrowser\wkeBrowser.cpp"
  >

diff --git a/wke/wke.cpp b/wke/wke.cpp
@@ -289,6 +289,17 @@ void wkeDelete(wkeWebView webView)
  webView->delete_();
 }
 
+const wchar_t * wkeGetCookieW(wkeWebView webView)
+{
+ return webView->cookieW();
+}
+
+const utf8* wkeGetCookie(wkeWebView webView)
+{
+ return webView->cookie();
+}
+
+
 void wkeSetCookieEnabled(wkeWebView webView, bool enable)
 {
  webView->setCookieEnabled(enable);

diff --git a/wke/wke.h b/wke/wke.h
@@ -139,7 +139,9 @@ namespace wke
  virtual void cut() = 0;
  virtual void paste() = 0;
  virtual void delete_() = 0;
-
+
+ virtual const wchar_t * cookieW() =0;
+ virtual const utf8* cookie() = 0;
  virtual void setCookieEnabled(bool enable) = 0;
  virtual bool cookieEnabled() const = 0;
 
@@ -278,6 +280,8 @@ WKE_API void wkeCut(wkeWebView webView);
 WKE_API void wkePaste(wkeWebView webView);
 WKE_API void wkeDelete(wkeWebView webView);
 
+WKE_API const wchar_t* wkeGetCookieW();
+WKE_API const utf8* wkeGetCookie();
 WKE_API void wkeSetCookieEnabled(wkeWebView webView, bool enable);
 WKE_API bool wkeCookieEnabled(wkeWebView webView);
 

diff --git a/wke/wkeWebView.cpp b/wke/wkeWebView.cpp
@@ -492,6 +492,21 @@ namespace wke
  page()->setCookieEnabled(enable);
  }
 
+ //��ȡcookies
+ const wchar_t* CWebView::cookieW()
+ {
+ int e = 0;
+ WTF::String str = mainFrame()->document()->cookie(e);
+ return StringTableW::addString(str.characters(), str.length());
+ }
+
+ const utf8* CWebView::cookie()
+ {
+ int e = 0;
+ WTF::String str = mainFrame()->document()->cookie(e);
+ return str.utf8().data();
+ }
+
  bool CWebView::cookieEnabled() const
  {
  return page()->cookieEnabled();

diff --git a/wke/wkeWebView.h b/wke/wkeWebView.h
@@ -65,7 +65,10 @@ namespace wke
  virtual void cut();
  virtual void paste();
  virtual void delete_();
-
+
+ virtual const wchar_t* cookieW();
+ virtual const utf8* cookie();
+
  virtual void setCookieEnabled(bool enable);
  virtual bool cookieEnabled() const;
 

diff --git a/wkeBrowser/Resource.h b/wkeBrowser/Resource.h
@@ -21,6 +21,8 @@
 #define ID_SET_EDITABLE 32804
 #define ID_URL_SF 32805
 #define ID_URL_GITHUB 32806
+#define ID_Menu 32902
+#define ID_TOOLS_VIEWCOOKIE 32903
 #define IDC_STATIC -1
 
 // Next default values for new objects
@@ -29,7 +31,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC 1
 #define _APS_NEXT_RESOURCE_VALUE 130
-#define _APS_NEXT_COMMAND_VALUE 32902
+#define _APS_NEXT_COMMAND_VALUE 32904
 #define _APS_NEXT_CONTROL_VALUE 1000
 #define _APS_NEXT_SYMED_VALUE 110
 #endif

diff --git a/wkeBrowser/wkeBrowser.cpp b/wkeBrowser/wkeBrowser.cpp
@@ -459,6 +459,15 @@ void takeScreenshot()
  g_webView->runJS("document.body.style.overflow='visible'");
 }
 
+void viewCookie()
+{
+ if (g_webView == NULL)
+ return;
+
+ const wchar_t* cookie = g_webView->cookieW();
+ MessageBoxW(NULL, cookie, L"Cookie", MB_OK|MB_ICONINFORMATION);
+}
+
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
  int wmId, wmEvent;
@@ -502,6 +511,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
  takeScreenshot();
  break;
 
+ case ID_TOOLS_VIEWCOOKIE:
+ viewCookie();
+ break;
+
  case ID_SET_EDITABLE:
  if (g_webView)
  {

diff --git a/wkeBrowser/wkeBrowser.rc b/wkeBrowser/wkeBrowser.rc
@@ -7,6 +7,9 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
+#ifndef APSTUDIO_INVOKED
+#include "targetver.h"
+#endif
 #define APSTUDIO_HIDDEN_SYMBOLS
 #include "windows.h"
 #undef APSTUDIO_HIDDEN_SYMBOLS
@@ -15,7 +18,7 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// Ӣ��(����) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
@@ -49,11 +52,13 @@ BEGIN
  POPUP "&Tools"
  BEGIN
  MENUITEM "Zoom In Ctrl + +", ID_ZOOM_IN
- MENUITEM "Zoom Out Ctrl + -", ID_ZOOM_OUT
+ MENUITEM "Zoom Out Ctrl + -",  ID_ZOOM_OUT
  MENUITEM "Reset Zoom Ctrl + 0", ID_RESET_ZOOM
  MENUITEM SEPARATOR
  MENUITEM "Set Editable Ctrl + E", ID_SET_EDITABLE
  MENUITEM "Screenshot Ctrl + S", ID_TAKE_SCREENSHOT
+ MENUITEM SEPARATOR
+ MENUITEM "View cookie", ID_TOOLS_VIEWCOOKIE
  END
  POPUP "&Help"
  BEGIN
@@ -71,15 +76,14 @@ IDC_WKEBROWSER ACCELERATORS
 BEGIN
  "?", IDM_ABOUT, ASCII, ALT
  "/", IDM_ABOUT, ASCII, ALT
- VK_OEM_PLUS, ID_ZOOM_IN, CONTROL, VIRTKEY
- VK_OEM_MINUS, ID_ZOOM_OUT, CONTROL, VIRTKEY
- 48, ID_RESET_ZOOM, CONTROL, VIRTKEY
- "E", ID_SET_EDITABLE, CONTROL, VIRTKEY
- "S", ID_TAKE_SCREENSHOT, CONTROL, VIRTKEY
-
- VK_ADD, ID_ZOOM_IN, CONTROL, VIRTKEY
- VK_SUBTRACT, ID_ZOOM_OUT, CONTROL, VIRTKEY
- VK_NUMPAD0, ID_RESET_ZOOM, CONTROL, VIRTKEY
+ VK_OEM_PLUS, ID_ZOOM_IN, VIRTKEY, CONTROL
+ VK_OEM_MINUS, ID_ZOOM_OUT, VIRTKEY, CONTROL
+ "0", ID_RESET_ZOOM, VIRTKEY, CONTROL
+ "E", ID_SET_EDITABLE, VIRTKEY, CONTROL
+ "S", ID_TAKE_SCREENSHOT, VIRTKEY, CONTROL
+ VK_ADD, ID_ZOOM_IN, VIRTKEY, CONTROL
+ VK_SUBTRACT, ID_ZOOM_OUT, VIRTKEY, CONTROL
+ VK_NUMPAD0, ID_RESET_ZOOM, VIRTKEY, CONTROL
 END
 
 
@@ -99,37 +103,43 @@ BEGIN
  LTEXT "[email protected]",IDC_STATIC,42,50,114,8
 END
 
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,0,0
- PRODUCTVERSION 1,2,0,0
- FILEFLAGSMASK 0x3fL
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
+ FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
-  FILEFLAGS 0x1L
+ FILEFLAGS 0x1L
 #else
-  FILEFLAGS 0x0L
+ FILEFLAGS 0x0L
 #endif
-  FILEOS 0x4L
-  FILETYPE 0x1L
-  FILESUBTYPE 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
 BEGIN
- BLOCK "StringFileInfo"
- BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
  BLOCK "040904B0"
- BEGIN 
- VALUE "CompanyName",  "wke.sf.net\0"
- VALUE "FileDescription", "wkeBrowser\0"
- VALUE "FileVersion",  "1, 2, 0, 0\0"
- VALUE "InternalName",  "wkeBrowser\0"
- VALUE "LegalCopyright",  "[email protected] Copyright (C) 2012\0"
- VALUE "LegalTrademarks", "wke.sf.net\0"
- VALUE "OriginalFilename","wkeBrowser.exe\0"
- VALUE "ProductName",  "wkeBrowser\0"
- VALUE "ProductVersion",  "1, 2, 0, 0\0"
- END
- END
- BLOCK "VarFileInfo" 
- BEGIN 
- VALUE "Translation", 0x409, 1200
+ BEGIN
+ VALUE "CompanyName", "wke.sf.net"
+ VALUE "FileDescription", "wkeBrowser"
+ VALUE "FileVersion", "1, 2, 0, 0"
+ VALUE "InternalName", "wkeBrowser"
+ VALUE "LegalCopyright", "[email protected] Copyright (C) 2012"
+ VALUE "LegalTrademarks", "wke.sf.net"
+ VALUE "OriginalFilename", "wkeBrowser.exe"
+ VALUE "ProductName", "wkeBrowser"
+ VALUE "ProductVersion", "1, 2, 0, 0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
  END
 END
 
@@ -195,7 +205,7 @@ BEGIN
  IDC_WKEBROWSER "WKEBROWSER"
 END
 
-#endif // English(U.S.) resources
+#endif // Ӣ��(����) resources
 /////////////////////////////////////////////////////////////////////////////