[akhaldi] 74833: [OLEDLG] Sync with Wine Staging 2.9. CORE-13362 0028360 oledlg: Use W-functions to access window property.

Author: akhaldi
Date: Sat Jun  3 22:34:33 2017
New Revision: 74833

URL: http://svn.reactos.org/svn/reactos?rev=74833&view=rev
Log:
[OLEDLG] Sync with Wine Staging 2.9. CORE-13362

0028360 oledlg: Use W-functions to access window property.

Modified:
    trunk/reactos/dll/win32/oledlg/insobjdlg.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg....
==============================================================================
--- trunk/reactos/dll/win32/oledlg/insobjdlg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/insobjdlg.c	[iso-8859-1] Sat Jun  3 22:34:33 2017
@@ -60,7 +60,8 @@
 typedef HRESULT (*DLLREGISTER)          (void);

extern HINSTANCE OLEDLG_hInstance;
-static const char OleUIInsertObjectInfoStr[] = "OleUIInsertObjectInfoStr";
+static const WCHAR OleUIInsertObjectInfoStr[] = {'O','l','e','U','I','I','n','s','e','r','t','O','b','j','e','c','t',
+    'I','n','f','o','S','t','r',0};

/***********************************************************************
  *           OleUIInsertObjectA (OLEDLG.3)
@@ -112,7 +113,7 @@
  */
 INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-  InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr);
+  InsertObjectDlgInfo* pdlgInfo = GetPropW(hwnd, OleUIInsertObjectInfoStr);

switch(uMsg)
   {
@@ -122,7 +123,7 @@

pdlgInfo->hwndSelf = hwnd;

-        SetPropA(hwnd, OleUIInsertObjectInfoStr, pdlgInfo);
+        SetPropW(hwnd, OleUIInsertObjectInfoStr, pdlgInfo);

UIINSERTOBJECTDLG_InitDialog(pdlgInfo);

@@ -135,7 +136,7 @@
     case WM_DESTROY:
       if (pdlgInfo)
           UIINSERTOBJECTDLG_FreeObjectTypes(pdlgInfo);
-      RemovePropA(hwnd, OleUIInsertObjectInfoStr);
+      RemovePropW(hwnd, OleUIInsertObjectInfoStr);
       return FALSE;

default :
@@ -151,9 +152,9 @@
  */
 static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
+  InsertObjectDlgInfo* pdlgInfo = GetPropW(hwnd, OleUIInsertObjectInfoStr);
   WORD wNotifyCode = HIWORD(wParam);
   WORD wID = LOWORD(wParam);
-  InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr);

switch(wID)
   {

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Jun  3 22:34:33 2017
@@ -143,7 +143,7 @@
 reactos/dll/win32/oleacc              # Synced to WineStaging-1.9.11
 reactos/dll/win32/oleaut32            # Synced to WineStaging-2.9
 reactos/dll/win32/olecli32            # Synced to WineStaging-1.9.11
-reactos/dll/win32/oledlg              # Synced to WineStaging-1.9.23
+reactos/dll/win32/oledlg              # Synced to WineStaging-2.9
 reactos/dll/win32/olepro32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/olesvr32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/olethk32            # Synced to WineStaging-1.9.11