Nikolay Sivov : explorerframe: Use W-functions to access window property.
Alexandre Julliard
julliard at winehq.org
Mon Feb 20 15:03:43 CST 2017
Module: wine
Branch: master
Commit: 312dc5dc1d23196e46145346f503a313a1f82daf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=312dc5dc1d23196e46145346f503a313a1f82daf
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sun Feb 19 21:21:33 2017 +0300
explorerframe: Use W-functions to access window property.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/explorerframe/nstc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c
index 9ed392b..a2ab974 100644
--- a/dlls/explorerframe/nstc.c
+++ b/dlls/explorerframe/nstc.c
@@ -72,6 +72,8 @@ static const DWORD unsupported_styles2 =
NSTCS2_INTERRUPTNOTIFICATIONS | NSTCS2_SHOWNULLSPACEMENU | NSTCS2_DISPLAYPADDING |
NSTCS2_DISPLAYPINNEDONLY | NTSCS2_NOSINGLETONAUTOEXPAND | NTSCS2_NEVERINSERTNONENUMERATED;
+static const WCHAR thispropW[] = {'P','R','O','P','_','T','H','I','S',0};
+
static inline NSTC2Impl *impl_from_INameSpaceTreeControl2(INameSpaceTreeControl2 *iface)
{
return CONTAINING_RECORD(iface, NSTC2Impl, INameSpaceTreeControl2_iface);
@@ -502,7 +504,7 @@ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs)
This->tv_oldwndproc = (WNDPROC)SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC,
(ULONG_PTR)tv_wndproc);
if(This->tv_oldwndproc)
- SetPropA(This->hwnd_tv, "PROP_THIS", This);
+ SetPropW(This->hwnd_tv, thispropW, This);
return TRUE;
}
@@ -526,7 +528,7 @@ static LRESULT destroy_namespacetree(NSTC2Impl *This)
if(This->tv_oldwndproc)
{
SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)This->tv_oldwndproc);
- RemovePropA(This->hwnd_tv, "PROP_THIS");
+ RemovePropW(This->hwnd_tv, thispropW);
}
INameSpaceTreeControl2_RemoveAllRoots(&This->INameSpaceTreeControl2_iface);
@@ -754,7 +756,7 @@ static LRESULT on_kbd_event(NSTC2Impl *This, UINT uMsg, WPARAM wParam, LPARAM lP
static LRESULT CALLBACK tv_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam)
{
- NSTC2Impl *This = (NSTC2Impl*)GetPropA(hWnd, "PROP_THIS");
+ NSTC2Impl *This = (NSTC2Impl*)GetPropW(hWnd, thispropW);
switch(uMessage) {
case WM_KEYDOWN:
More information about the wine-cvs
mailing list