From: Nikolay Sivov Subject: [PATCH] oledlg: Use W-functions to access window property Message-Id: <20170219182133.29925-1-nsivov@codeweavers.com> Date: Sun, 19 Feb 2017 21:21:32 +0300 Signed-off-by: Nikolay Sivov --- dlls/oledlg/insobjdlg.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 7cbea4e59a..506196ed45 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -72,7 +72,8 @@ static void UIINSERTOBJECTDLG_AddControl(InsertObjectDlgInfo* pdlgInfo); 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) @@ -124,7 +125,7 @@ UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject) */ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr); + InsertObjectDlgInfo* pdlgInfo = GetPropW(hwnd, OleUIInsertObjectInfoStr); switch(uMsg) { @@ -134,7 +135,7 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR pdlgInfo->hwndSelf = hwnd; - SetPropA(hwnd, OleUIInsertObjectInfoStr, pdlgInfo); + SetPropW(hwnd, OleUIInsertObjectInfoStr, pdlgInfo); UIINSERTOBJECTDLG_InitDialog(pdlgInfo); @@ -147,7 +148,7 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR case WM_DESTROY: if (pdlgInfo) UIINSERTOBJECTDLG_FreeObjectTypes(pdlgInfo); - RemovePropA(hwnd, OleUIInsertObjectInfoStr); + RemovePropW(hwnd, OleUIInsertObjectInfoStr); return FALSE; default : @@ -163,9 +164,9 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR */ 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) { -- 2.11.0