October 2013 - Wine-commits

Nikolay Sivov : wshom.ocx: Implement IWshShell3::ExpandEnvironmentStrings() .
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 71ecb55661a8cf14a0e19b94749f1d8957c9ab16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ecb55661a8cf14a0e19b947… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 27 12:28:06 2013 +0400 wshom.ocx: Implement IWshShell3::ExpandEnvironmentStrings(). --- dlls/wshom.ocx/shell.c | 22 +++++++++++++++++++--- dlls/wshom.ocx/tests/wshom.c | 10 ++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 17d0306..385d2a3 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -745,10 +745,26 @@ static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, return WshShortcut_Create(PathLink, Shortcut); } -static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* out_Dst) +static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* Dst) { - FIXME("(%s %p): stub\n", debugstr_w(Src), out_Dst); - return E_NOTIMPL; + DWORD ret; + + TRACE("(%s %p)\n", debugstr_w(Src), Dst); + + if (!Src || !Dst) return E_POINTER; + + ret = ExpandEnvironmentStringsW(Src, NULL, 0); + *Dst = SysAllocStringLen(NULL, ret); + if (!*Dst) return E_OUTOFMEMORY; + + if (ExpandEnvironmentStringsW(Src, *Dst, ret)) + return S_OK; + else + { + SysFreeString(*Dst); + *Dst = NULL; + return HRESULT_FROM_WIN32(GetLastError()); + } } static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR Name, VARIANT* out_Value) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index b2f60a8..50adb90 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -35,6 +35,7 @@ static void test_wshshell(void) { static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; static const WCHAR lnk1W[] = {'f','i','l','e','.','l','n','k',0}; + static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; IWshShell3 *sh3; IDispatchEx *dispex; IWshCollection *coll; @@ -113,6 +114,15 @@ static void test_wshshell(void) IUnknown_Release(unk); IDispatch_Release(shortcut); + /* ExpandEnvironmentStrings */ + hr = IWshShell3_ExpandEnvironmentStrings(sh3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + str = SysAllocString(pathW); + hr = IWshShell3_ExpandEnvironmentStrings(sh3, str, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + SysFreeString(str); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3);

1 0

Henri Verbeet : d3drm: Initialize the actual array in d3drm_frame_array_create() as well.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: bf235a66699b0326c1470b6590d1b8ccbc2331be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf235a66699b0326c1470b659… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:39 2013 +0100 d3drm: Initialize the actual array in d3drm_frame_array_create() as well. --- dlls/d3drm/frame.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 36baf2e..26501c2 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -197,15 +197,31 @@ static const struct IDirect3DRMFrameArrayVtbl d3drm_frame_array_vtbl = d3drm_frame_array_GetElement, }; -static struct d3drm_frame_array *d3drm_frame_array_create(void) +static struct d3drm_frame_array *d3drm_frame_array_create(unsigned int frame_count, IDirect3DRMFrame3 **frames) { struct d3drm_frame_array *array; + unsigned int i; if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) return NULL; array->IDirect3DRMFrameArray_iface.lpVtbl = &d3drm_frame_array_vtbl; array->ref = 1; + array->size = frame_count; + + if (frame_count) + { + if (!(array->frames = HeapAlloc(GetProcessHeap(), 0, frame_count * sizeof(*array->frames)))) + { + HeapFree(GetProcessHeap(), 0, array); + return NULL; + } + + for (i = 0; i < frame_count; ++i) + { + IDirect3DRMFrame3_QueryInterface(frames[i], &IID_IDirect3DRMFrame, (void **)&array->frames[i]); + } + } return array; } @@ -1500,25 +1516,9 @@ static HRESULT WINAPI d3drm_frame3_GetChildren(IDirect3DRMFrame3 *iface, IDirect if (!children) return D3DRMERR_BADVALUE; - if (!(array = d3drm_frame_array_create())) + if (!(array = d3drm_frame_array_create(frame->nb_children, frame->children))) return E_OUTOFMEMORY; - array->size = frame->nb_children; - if (frame->nb_children) - { - ULONG i; - - if (!(array->frames = HeapAlloc(GetProcessHeap(), 0, frame->nb_children * sizeof(*array->frames)))) - { - HeapFree(GetProcessHeap(), 0, array); - return E_OUTOFMEMORY; - } - for (i = 0; i < frame->nb_children; ++i) - { - IDirect3DRMFrame3_QueryInterface(frame->children[i], &IID_IDirect3DRMFrame, (void **)&array->frames[i]); - } - } - *children = &array->IDirect3DRMFrameArray_iface; return D3DRM_OK;

1 0

Henri Verbeet : d3drm: Initialize the actual array in d3drm_visual_array_create() as well.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: c0d05d9f4f2d7b7d14d8b4f5e49789eb6e9d1882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d05d9f4f2d7b7d14d8b4f5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:40 2013 +0100 d3drm: Initialize the actual array in d3drm_visual_array_create() as well. --- dlls/d3drm/frame.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 26501c2..28e222f 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -315,15 +315,32 @@ static const struct IDirect3DRMVisualArrayVtbl d3drm_visual_array_vtbl = d3drm_visual_array_GetElement, }; -static struct d3drm_visual_array *d3drm_visual_array_create(void) +static struct d3drm_visual_array *d3drm_visual_array_create(unsigned int visual_count, IDirect3DRMVisual **visuals) { struct d3drm_visual_array *array; + unsigned int i; if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) return NULL; array->IDirect3DRMVisualArray_iface.lpVtbl = &d3drm_visual_array_vtbl; array->ref = 1; + array->size = visual_count; + + if (visual_count) + { + if (!(array->visuals = HeapAlloc(GetProcessHeap(), 0, visual_count * sizeof(*array->visuals)))) + { + HeapFree(GetProcessHeap(), 0, array); + return NULL; + } + + for (i = 0; i < visual_count; ++i) + { + array->visuals[i] = visuals[i]; + IDirect3DRMVisual_AddRef(array->visuals[i]); + } + } return array; } @@ -765,26 +782,9 @@ static HRESULT WINAPI d3drm_frame2_GetVisuals(IDirect3DRMFrame2 *iface, IDirect3 if (!visuals) return D3DRMERR_BADVALUE; - if (!(array = d3drm_visual_array_create())) + if (!(array = d3drm_visual_array_create(frame->nb_visuals, frame->visuals))) return E_OUTOFMEMORY; - array->size = frame->nb_visuals; - if (frame->nb_visuals) - { - ULONG i; - - if (!(array->visuals = HeapAlloc(GetProcessHeap(), 0, frame->nb_visuals * sizeof(*array->visuals)))) - { - HeapFree(GetProcessHeap(), 0, array); - return E_OUTOFMEMORY; - } - for (i = 0; i < frame->nb_visuals; ++i) - { - array->visuals[i] = frame->visuals[i]; - IDirect3DRMVisual_AddRef(frame->visuals[i]); - } - } - *visuals = &array->IDirect3DRMVisualArray_iface; return D3DRM_OK;

1 0

Henri Verbeet : d3drm: Initialize the actual array in d3drm_light_array_create() as well.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 7dc0738911dad6a95c3d6f39b48e4f3a7749c712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc0738911dad6a95c3d6f39b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:41 2013 +0100 d3drm: Initialize the actual array in d3drm_light_array_create() as well. --- dlls/d3drm/frame.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 28e222f..768f347 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -434,15 +434,32 @@ static const struct IDirect3DRMLightArrayVtbl d3drm_light_array_vtbl = d3drm_light_array_GetElement, }; -static struct d3drm_light_array *d3drm_light_array_create(void) +static struct d3drm_light_array *d3drm_light_array_create(unsigned int light_count, IDirect3DRMLight **lights) { struct d3drm_light_array *array; + unsigned int i; if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) return NULL; array->IDirect3DRMLightArray_iface.lpVtbl = &d3drm_light_array_vtbl; array->ref = 1; + array->size = light_count; + + if (light_count) + { + if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, light_count * sizeof(*array->lights)))) + { + HeapFree(GetProcessHeap(), 0, array); + return NULL; + } + + for (i = 0; i < light_count; ++i) + { + array->lights[i] = lights[i]; + IDirect3DRMLight_AddRef(array->lights[i]); + } + } return array; } @@ -1541,25 +1558,9 @@ static HRESULT WINAPI d3drm_frame3_GetLights(IDirect3DRMFrame3 *iface, IDirect3D if (!lights) return D3DRMERR_BADVALUE; - if (!(array = d3drm_light_array_create())) + if (!(array = d3drm_light_array_create(frame->nb_lights, frame->lights))) return E_OUTOFMEMORY; - array->size = frame->nb_lights; - if (frame->nb_lights) - { - ULONG i; - - if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, frame->nb_lights * sizeof(*array->lights)))) - { - HeapFree(GetProcessHeap(), 0, array); - return E_OUTOFMEMORY; - } - for (i = 0; i < frame->nb_lights; ++i) - { - IDirect3DRMLight_QueryInterface(frame->lights[i], &IID_IDirect3DRMLight, (void **)&array->lights[i]); - } - } - *lights = &array->IDirect3DRMLightArray_iface; return D3DRM_OK;

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMLightImpl typedef.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: f4ca38eded43ab1bdf8df7d26f7e39cbb1b8abb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ca38eded43ab1bdf8df7d26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:42 2013 +0100 d3drm: Get rid of the IDirect3DRMLightImpl typedef. --- dlls/d3drm/light.c | 314 ++++++++++++++++++++++++---------------------------- 1 files changed, 147 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4ca38eded43ab1bdf8df…

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMMaterialImpl typedef.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 687e5cd33070cbaa2d8a9f0a03bc96a737c93964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687e5cd33070cbaa2d8a9f0a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:43 2013 +0100 d3drm: Get rid of the IDirect3DRMMaterialImpl typedef. --- dlls/d3drm/material.c | 243 +++++++++++++++++++++++-------------------------- 1 files changed, 114 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=687e5cd33070cbaa2d8a9…

1 0

Nikolay Sivov : msxml3: Set referer in case with no user headers too.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 0fc177fe2f06577e9d9657b11cd66856170be99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc177fe2f06577e9d9657b11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 28 17:01:02 2013 +0400 msxml3: Set referer in case with no user headers too. --- dlls/msxml3/httprequest.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c90cc51..3caecad 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -476,14 +476,18 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac if (!list_empty(&This->request->reqheaders)) size += This->request->reqheader_size*sizeof(WCHAR); - if (!size) return S_OK; - if (This->request->base_uri) { IUri_GetRawUri(This->request->base_uri, &base_uri); size += SysStringLen(base_uri)*sizeof(WCHAR) + sizeof(refererW) + sizeof(crlfW); } + if (!size) + { + SysFreeString(base_uri); + return S_OK; + } + buff = CoTaskMemAlloc(size); if (!buff) {

1 0

Alexandre Julliard : user32: Create the desktop window to trigger builtin class registration before accessing the class list .
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 4c41c20e0227dfff62aebfc9b4d392121b4d28f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c41c20e0227dfff62aebfc9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 15:24:58 2013 +0100 user32: Create the desktop window to trigger builtin class registration before accessing the class list. --- dlls/user32/class.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e03272f..fa340dc 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -268,6 +268,8 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) struct list *ptr; ATOM atom = get_int_atom_value( name ); + GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ + USER_Lock(); LIST_FOR_EACH( ptr, &class_list ) @@ -507,7 +509,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) CLASS *classPtr; HINSTANCE instance; - InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || wc->hInstance == user32_module) /* we can't register a class for user32 */ @@ -562,7 +564,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) CLASS *classPtr; HINSTANCE instance; - InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || wc->hInstance == user32_module) /* we can't register a class for user32 */ @@ -620,7 +622,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) { CLASS *classPtr = NULL; - InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ SERVER_START_REQ( destroy_class ) { @@ -1122,8 +1124,6 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) TRACE("%p %s %p\n", hInstance, debugstr_a(name), wc); - InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); - if (!wc) { SetLastError( ERROR_NOACCESS ); @@ -1175,8 +1175,6 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc TRACE("%p %s %p\n", hInstance, debugstr_w(name), wc); - InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); - if (!wc) { SetLastError( ERROR_NOACCESS );

1 0

Alexandre Julliard : user32: Automatically load comctl32 when one of its classes is requested.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: c25c0198833885581dd381240882fc9312c81f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25c0198833885581dd381240… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 18:41:04 2013 +0100 user32: Automatically load comctl32 when one of its classes is requested. --- dlls/user32/class.c | 84 ++++++++++++++++++++++++++++++++++--------- dlls/user32/tests/class.c | 89 +++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/win.c | 9 ++++- 3 files changed, 160 insertions(+), 22 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index fa340dc..349aedf 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -121,6 +121,47 @@ ATOM get_int_atom_value( LPCWSTR name ) /*********************************************************************** + * is_comctl32_class + */ +static BOOL is_comctl32_class( const WCHAR *name ) +{ + static const WCHAR classesW[][20] = + { + {'C','o','m','b','o','B','o','x','E','x','3','2',0}, + {'m','s','c','t','l','s','_','h','o','t','k','e','y','3','2',0}, + {'m','s','c','t','l','s','_','p','r','o','g','r','e','s','s','3','2',0}, + {'m','s','c','t','l','s','_','s','t','a','t','u','s','b','a','r','3','2',0}, + {'m','s','c','t','l','s','_','t','r','a','c','k','b','a','r','3','2',0}, + {'m','s','c','t','l','s','_','u','p','d','o','w','n','3','2',0}, + {'N','a','t','i','v','e','F','o','n','t','C','t','l',0}, + {'R','e','B','a','r','W','i','n','d','o','w','3','2',0}, + {'S','y','s','A','n','i','m','a','t','e','3','2',0}, + {'S','y','s','D','a','t','e','T','i','m','e','P','i','c','k','3','2',0}, + {'S','y','s','H','e','a','d','e','r','3','2',0}, + {'S','y','s','I','P','A','d','d','r','e','s','s','3','2',0}, + {'S','y','s','L','i','s','t','V','i','e','w','3','2',0}, + {'S','y','s','M','o','n','t','h','C','a','l','3','2',0}, + {'S','y','s','P','a','g','e','r',0}, + {'S','y','s','T','a','b','C','o','n','t','r','o','l','3','2',0}, + {'S','y','s','T','r','e','e','V','i','e','w','3','2',0}, + {'T','o','o','l','b','a','r','W','i','n','d','o','w','3','2',0}, + {'t','o','o','l','t','i','p','s','_','c','l','a','s','s','3','2',0}, + }; + + int min = 0, max = (sizeof(classesW) / sizeof(classesW[0])) - 1; + + while (min <= max) + { + int res, pos = (min + max) / 2; + if (!(res = strcmpiW( name, classesW[pos] ))) return TRUE; + if (res < 0) max = pos - 1; + else min = pos + 1; + } + return FALSE; +} + + +/*********************************************************************** * set_server_info * * Set class info with the wine server. @@ -261,35 +302,44 @@ static void CLASS_FreeClass( CLASS *classPtr ) * CLASS_FindClass * * Return a pointer to the class. - * hinstance has been normalized by the caller. */ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) { + static const WCHAR comctl32W[] = {'c','o','m','c','t','l','3','2','.','d','l','l',0}; struct list *ptr; ATOM atom = get_int_atom_value( name ); GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - USER_Lock(); - - LIST_FOR_EACH( ptr, &class_list ) + for (;;) { - CLASS *class = LIST_ENTRY( ptr, CLASS, entry ); - if (atom) - { - if (class->atomName != atom) continue; - } - else - { - if (!name || strcmpiW( class->name, name )) continue; - } - if (!hinstance || !class->local || class->hInstance == hinstance) + USER_Lock(); + + LIST_FOR_EACH( ptr, &class_list ) { - TRACE("%s %p -> %p\n", debugstr_w(name), hinstance, class); - return class; + CLASS *class = LIST_ENTRY( ptr, CLASS, entry ); + if (atom) + { + if (class->atomName != atom) continue; + } + else + { + if (!name || strcmpiW( class->name, name )) continue; + } + if (!class->local || class->hInstance == hinstance) + { + TRACE("%s %p -> %p\n", debugstr_w(name), hinstance, class); + return class; + } } + USER_Unlock(); + + if (!is_comctl32_class( name )) break; + if (GetModuleHandleW( comctl32W )) break; + if (!LoadLibraryW( comctl32W )) break; + TRACE( "%s retrying after loading comctl32\n", debugstr_w(name) ); } - USER_Unlock(); + TRACE("%s %p -> not found\n", debugstr_w(name), hinstance); return NULL; } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index f32938c..c8d6a26 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -28,13 +28,11 @@ #include "wine/test.h" #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winreg.h" #include "wingdi.h" #include "winuser.h" - -/* we don't want to include commctrl.h: */ -static const CHAR WC_EDITA[] = "Edit"; -static const WCHAR WC_EDITW[] = {'E','d','i','t',0}; +#include "commctrl.h" #define NUMCLASSWORDS 4 @@ -1029,9 +1027,91 @@ static void test_icons(void) DestroyWindow(hwnd); } +static void test_comctl32_class( const char *name ) +{ + WNDCLASSA wcA; + WNDCLASSW wcW; + BOOL ret; + HMODULE module; + WCHAR nameW[20]; + HWND hwnd; + + module = GetModuleHandleA( "comctl32" ); + ok( !module, "comctl32 already loaded\n" ); + ret = GetClassInfoA( 0, name, &wcA ); + ok( ret || broken(!ret) /* <= winxp */, "GetClassInfoA failed for %s\n", name ); + if (!ret) return; + MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW) ); + ret = GetClassInfoW( 0, nameW, &wcW ); + ok( ret, "GetClassInfoW failed for %s\n", name ); + module = GetModuleHandleA( "comctl32" ); + ok( module != 0, "comctl32 not loaded\n" ); + FreeLibrary( module ); + module = GetModuleHandleA( "comctl32" ); + ok( !module, "comctl32 still loaded\n" ); + hwnd = CreateWindowA( name, "test", WS_OVERLAPPEDWINDOW, 0, 0, 10, 10, NULL, NULL, NULL, 0 ); + ok( hwnd != 0, "failed to create window for %s\n", name ); + module = GetModuleHandleA( "comctl32" ); + ok( module != 0, "comctl32 not loaded\n" ); +} + +/* verify that comctl32 classes are automatically loaded by user32 */ +static void test_comctl32_classes(void) +{ + char path_name[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char **argv; + int i; + + static const char *classes[] = + { + ANIMATE_CLASSA, + WC_COMBOBOXEXA, + DATETIMEPICK_CLASSA, + WC_HEADERA, + HOTKEY_CLASSA, + WC_IPADDRESSA, + WC_LISTVIEWA, + MONTHCAL_CLASSA, + WC_NATIVEFONTCTLA, + WC_PAGESCROLLERA, + PROGRESS_CLASSA, + REBARCLASSNAMEA, + STATUSCLASSNAMEA, + WC_TABCONTROLA, + TOOLBARCLASSNAMEA, + TOOLTIPS_CLASSA, + TRACKBAR_CLASSA, + WC_TREEVIEWA, + UPDOWN_CLASSA + }; + + winetest_get_mainargs( &argv ); + for (i = 0; i < sizeof(classes) / sizeof(classes[0]); i++) + { + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof( startup ); + sprintf( path_name, "%s class %s", argv[0], classes[i] ); + ok( CreateProcessA( NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ), + "CreateProcess failed.\n" ); + winetest_wait_child_process( info.hProcess ); + CloseHandle( info.hProcess ); + CloseHandle( info.hThread ); + } +} + START_TEST(class) { + char **argv; HANDLE hInstance = GetModuleHandleA( NULL ); + int argc = winetest_get_mainargs( &argv ); + + if (argc >= 3) + { + test_comctl32_class( argv[2] ); + return; + } test_GetClassInfo(); test_extra_values(); @@ -1048,6 +1128,7 @@ START_TEST(class) test_styles(); test_builtinproc(); test_icons(); + test_comctl32_classes(); /* this test unregisters the Button class so it should be executed at the end */ test_instances(); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 30a7c6f..7223b41 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1448,7 +1448,14 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* Create the window structure */ if (!(wndPtr = create_window_handle( parent, owner, className, module, unicode ))) - return 0; + { + WNDCLASSW wc; + /* if it's a comctl32 class, GetClassInfo will load it, then we can retry */ + if (GetLastError() != ERROR_INVALID_HANDLE || + !GetClassInfoW( 0, className, &wc ) || + !(wndPtr = create_window_handle( parent, owner, className, module, unicode ))) + return 0; + } hwnd = wndPtr->obj.handle; /* Fill the window structure */

1 0

Lasse Rasinen : d3d9: Update locked_rect only if wined3d_surface_map succeeds.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: eeefed3dd02f5299e38d308ee6d9ba6998722bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeefed3dd02f5299e38d308ee… Author: Lasse Rasinen <lrasinen(a)iki.fi> Date: Mon Oct 28 18:48:17 2013 +0200 d3d9: Update locked_rect only if wined3d_surface_map succeeds. --- dlls/d3d9/surface.c | 7 +++++-- dlls/d3d9/tests/device.c | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 99f0b0f..d475ae4 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -293,8 +293,11 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); wined3d_mutex_unlock(); - locked_rect->Pitch = map_desc.row_pitch; - locked_rect->pBits = map_desc.data; + if (SUCCEEDED(hr)) + { + locked_rect->Pitch = map_desc.row_pitch; + locked_rect->pBits = map_desc.data; + } return hr; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 32fe8c7..37fb8fe 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5402,8 +5402,13 @@ static void test_lockrect_invalid(void) hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr %#x.\n", hr); + locked_rect.pBits = (BYTE *)0xdeadbeef; + locked_rect.Pitch = 1; hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(locked_rect.pBits == (BYTE *)0xdeadbeef, "Got unexpected pBits: %p\n", + locked_rect.pBits); + ok(locked_rect.Pitch == 1, "Got unexpected pitch %d\n", locked_rect.Pitch); hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);

1 0