March 2016 - Wine-Commits - list.winehq.org

Piotr Caban : user32/tests: Show that message conversion should work on window procedures without handles.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: b1132531bf6d9c589829f43bc049f29606934c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1132531bf6d9c589829f43bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:43 2016 +0100 user32/tests: Show that message conversion should work on window procedures without handles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e121809..cf7ddc8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8686,8 +8686,30 @@ static LRESULT WINAPI winproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) return 0; } -static LRESULT WINAPI winproc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +static LRESULT WINAPI winproc_convA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { + if(msg == WM_SETTEXT) + { + const char *text = (const char*)lparam; + + ok(!wparam, "wparam = %08lx\n", wparam); + ok(!strcmp(text, "text"), "WM_SETTEXT lparam = %s\n", text); + return 1; + } + return 0; +} + +static const WCHAR textW[] = {'t','e','x','t',0}; +static LRESULT WINAPI winproc_convW(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if(msg == WM_SETTEXT) + { + const WCHAR *text = (const WCHAR*)lparam; + + ok(!wparam, "wparam = %08lx\n", wparam); + ok(!lstrcmpW(text, textW), "WM_SETTEXT lparam = %s\n", wine_dbgstr_w(text)); + return 1; + } return 0; } @@ -8765,8 +8787,16 @@ static void test_winproc_limit(void) break; } ok(i != 0xffff, "unable to run out of winproc slots\n"); - ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc2), + + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc_convA), + "SetWindowLongPtr failed with error %d\n", GetLastError()); + ok(SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"text"), "WM_SETTEXT failed\n"); + ok(SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW), "WM_SETTEXT with conversion failed\n"); + + ok(SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc_convW), "SetWindowLongPtr failed with error %d\n", GetLastError()); + ok(SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"text"), "WM_SETTEXT failed\n"); + ok(SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW), "WM_SETTEXT with conversion failed\n"); i = 0; CallWindowProcA(winproc_handle, 0, 0, 0, (LPARAM)&i);

1 0

Jacek Caban : winex11.drv: Use grabbed window display in SetCapture.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: ecf9e9135d9d923071dbe9c598f7b5d5b6df8f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf9e9135d9d923071dbe9c59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 10 14:03:02 2016 +0100 winex11.drv: Use grabbed window display in SetCapture. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 4 ++-- dlls/winex11.drv/window.c | 28 ++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 63d202c..677acfa 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -602,7 +602,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU /* update the wine server Z-order */ - if (window != x11drv_thread_data()->grab_window && + if (hwnd != x11drv_thread_data()->grab_hwnd && /* ignore event if a button is pressed, since the mouse is then grabbed too */ !(state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask))) { @@ -1611,7 +1611,7 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); if (event->detail == NotifyVirtual) return; - if (event->window == x11drv_thread_data()->grab_window) return; + if (hwnd == x11drv_thread_data()->grab_hwnd) return; /* simulate a mouse motion event */ input.u.mi.dx = event->x; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4a047e2..4789f98 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2116,27 +2116,31 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); + struct x11drv_win_data *data; - if (!thread_data) return; if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return; if (hwnd) { - Window grab_win = X11DRV_get_whole_window( GetAncestor( hwnd, GA_ROOT ) ); - - if (!grab_win) return; - XFlush( gdi_display ); - XGrabPointer( thread_data->display, grab_win, False, - PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, None, None, CurrentTime ); - thread_data->grab_window = grab_win; + if (!(data = get_win_data( GetAncestor( hwnd, GA_ROOT )))) return; + if (data->whole_window) + { + XFlush( gdi_display ); + XGrabPointer( data->display, data->whole_window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, None, None, CurrentTime ); + thread_data->grab_hwnd = data->hwnd; + } + release_win_data( data ); } else /* release capture */ { + if (!(data = get_win_data( thread_data->grab_hwnd ))) return; XFlush( gdi_display ); - XUngrabPointer( thread_data->display, CurrentTime ); - XFlush( thread_data->display ); - thread_data->grab_window = None; + XUngrabPointer( data->display, CurrentTime ); + XFlush( data->display ); + thread_data->grab_hwnd = NULL; + release_win_data( data ); } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2694d23..23f4ab6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -308,7 +308,7 @@ struct x11drv_thread_data { Display *display; XEvent *current_event; /* event currently being processed */ - Window grab_window; /* window that currently grabs the mouse */ + HWND grab_hwnd; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */

1 0

Stefan Dösinger : wined3d: Merge wined3d_surface_map( ) and wined3d_volume_map().
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: aeefbdffba9ea77310759956007f1348920b4477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeefbdffba9ea773107599560… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 16:01:43 2016 +0100 wined3d: Merge wined3d_surface_map() and wined3d_volume_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/volume.c | 5 +- dlls/d3d9/volume.c | 5 +- dlls/wined3d/surface.c | 153 ------------------------ dlls/wined3d/texture.c | 256 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/volume.c | 163 +------------------------- dlls/wined3d/wined3d_private.h | 12 +- 6 files changed, 245 insertions(+), 349 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aeefbdffba9ea77310759…

1 0

Nikolay Sivov : ole32: Use CoGetApartmentType() to implement IComThreadingInfo.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 6fd208b41ca33da5192fefae27172ac2793bccfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd208b41ca33da5192fefae2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 08:09:59 2016 +0300 ole32: Use CoGetApartmentType() to implement IComThreadingInfo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a7fe650..b095aeb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4631,7 +4631,6 @@ typedef struct Context IContextCallback IContextCallback_iface; IObjContext IObjContext_iface; LONG refs; - APTTYPE apttype; } Context; static inline Context *impl_from_IComThreadingInfo( IComThreadingInfo *iface ) @@ -4710,21 +4709,26 @@ static ULONG WINAPI Context_CTI_Release(IComThreadingInfo *iface) static HRESULT WINAPI Context_CTI_GetCurrentApartmentType(IComThreadingInfo *iface, APTTYPE *apttype) { - Context *This = impl_from_IComThreadingInfo(iface); + APTTYPEQUALIFIER qualifier; TRACE("(%p)\n", apttype); - *apttype = This->apttype; - return S_OK; + return CoGetApartmentType(apttype, &qualifier); } static HRESULT WINAPI Context_CTI_GetCurrentThreadType(IComThreadingInfo *iface, THDTYPE *thdtype) { - Context *This = impl_from_IComThreadingInfo(iface); + APTTYPEQUALIFIER qualifier; + APTTYPE apttype; + HRESULT hr; + + hr = CoGetApartmentType(&apttype, &qualifier); + if (FAILED(hr)) + return hr; TRACE("(%p)\n", thdtype); - switch (This->apttype) + switch (apttype) { case APTTYPE_STA: case APTTYPE_MAINSTA: @@ -4945,12 +4949,6 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; context->refs = 1; - if (apt->multi_threaded) - context->apttype = APTTYPE_MTA; - else if (apt->main) - context->apttype = APTTYPE_MAINSTA; - else - context->apttype = APTTYPE_STA; hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); IComThreadingInfo_Release(&context->IComThreadingInfo_iface);

1 0

Nikolay Sivov : comctl32/monthcal: MCM_GETRANGE does not return BOOL values.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: c075d5aafda9308ec88ec8b640976fb73ec210d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c075d5aafda9308ec88ec8b64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 12:59:17 2016 +0300 comctl32/monthcal: MCM_GETRANGE does not return BOOL values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/tests/monthcal.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5accbe6..c68a073 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1503,7 +1503,7 @@ MONTHCAL_GetRange(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) { TRACE("%p\n", range); - if(!range) return FALSE; + if (!range) return 0; range[1] = infoPtr->maxDate; range[0] = infoPtr->minDate; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index c0d296a..792f66e 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -304,6 +304,9 @@ static void test_monthcal(void) expect(0, st[1].wSecond); expect(0, st[1].wMilliseconds); + limits = SendMessageA(hwnd, MCM_GETRANGE, 0, 0); + ok(limits == 0, "got %u\n", limits); + GetSystemTime(&st[0]); st[1] = st[0];

1 0

Nikolay Sivov : msxml3: Accept VT_UNKNOWN input for IXMLDOMSchemaCollection::add().
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: d241788d28e15b6a58899585f906a6471bf9caf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d241788d28e15b6a58899585f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 10:11:02 2016 +0300 msxml3: Accept VT_UNKNOWN input for IXMLDOMSchemaCollection::add(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/schema.c | 10 +++++----- dlls/msxml3/tests/schema.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 7a1f8b3..41d1640 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1226,12 +1226,13 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri break; case VT_DISPATCH: + case VT_UNKNOWN: { xmlDocPtr doc = NULL; cache_entry* entry; CacheEntryType type; IXMLDOMNode* domnode = NULL; - IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IXMLDOMNode, (void**)&domnode); + IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IXMLDOMNode, (void**)&domnode); if (domnode) doc = xmlNodePtr_from_domnode(domnode, XML_DOCUMENT_NODE)->doc; @@ -1275,10 +1276,9 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri break; default: - { - heap_free(name); - return E_INVALIDARG; - } + FIXME("arg type is not supported, %s\n", debugstr_variant(&var)); + heap_free(name); + return E_INVALIDARG; } heap_free(name); return S_OK; diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 43ddc3c..bd5c359 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -506,6 +506,7 @@ static void test_schema_refs(void) VARIANT_BOOL b; BSTR str; LONG len; + HRESULT hr; doc = create_document(&IID_IXMLDOMDocument2); if (!doc) @@ -557,6 +558,24 @@ static void test_schema_refs(void) ole_check(IXMLDOMSchemaCollection_get_length(cache, &len)); ok(len == 0, "got %d\n", len); + /* same, but with VT_UNKNOWN type */ + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)doc; + hr = IXMLDOMSchemaCollection_add(cache, NULL, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + len = -1; + hr = IXMLDOMSchemaCollection_get_length(cache, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 1, "got %d\n", len); + + hr = IXMLDOMSchemaCollection_remove(cache, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + len = -1; + hr = IXMLDOMSchemaCollection_get_length(cache, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 0, "got %d\n", len); + str = SysAllocString(xdr_schema_uri); ole_check(IXMLDOMSchemaCollection_add(cache, str, _variantdoc_(doc)));

1 0

Austin English : user32: Add GetGestureConfig stub.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 0cb983f8b8545a96b99abfb66e1a88ca79b7e417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb983f8b8545a96b99abfb66… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 7 11:08:41 2016 -0600 user32: Add GetGestureConfig stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 10 ++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 33016a1..4497621 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -729,6 +729,16 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) return TRUE; } +/***************************************************************************** + * GetGestureConfig (USER32.@) + */ +BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count, GESTURECONFIG *config, UINT size ) +{ + FIXME("(%p %08x %08x %p %p %u): stub\n", hwnd, reserved, flags, count, config, size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /********************************************************************** * SetGestureConfig [USER32.@] */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 2f5d36f..9ff5525 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -291,6 +291,7 @@ @ stdcall GetDoubleClickTime() @ stdcall GetFocus() @ stdcall GetForegroundWindow() +@ stdcall GetGestureConfig(long long long ptr ptr long) @ stdcall GetGUIThreadInfo(long ptr) @ stdcall GetGuiResources(long long) @ stdcall GetIconInfo(long ptr) diff --git a/include/winuser.h b/include/winuser.h index fa3e661..9c4586f 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3605,6 +3605,7 @@ WINUSERAPI UINT WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,INT); WINUSERAPI UINT WINAPI GetDoubleClickTime(void); WINUSERAPI HWND WINAPI GetFocus(void); WINUSERAPI HWND WINAPI GetForegroundWindow(void); +WINUSERAPI BOOL WINAPI GetGestureConfig(HWND,DWORD,DWORD,UINT*,GESTURECONFIG*,UINT); WINUSERAPI BOOL WINAPI GetGUIThreadInfo(DWORD,GUITHREADINFO*); WINUSERAPI BOOL WINAPI GetIconInfo(HICON,PICONINFO); WINUSERAPI BOOL WINAPI GetIconInfoExA(HICON,ICONINFOEXA*);

1 0

Nikolay Sivov : ieframe: Handle CreateView() failure in ActivateMe() ( Coverity).
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 2dc49eee2297e69b9c0a802a2a288adc6a627066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc49eee2297e69b9c0a802a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 16:07:46 2016 +0300 ieframe: Handle CreateView() failure in ActivateMe() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index dadbe13..d82195f 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -390,8 +390,10 @@ static HRESULT WINAPI OleDocumentSite_ActivateMe(IOleDocumentSite *iface, if(FAILED(hres)) return hres; - IOleDocument_CreateView(oledoc, (IOleInPlaceSite*) &This->IOleInPlaceSiteEx_iface, NULL, 0, &This->view); + hres = IOleDocument_CreateView(oledoc, (IOleInPlaceSite*) &This->IOleInPlaceSiteEx_iface, NULL, 0, &This->view); IOleDocument_Release(oledoc); + if(FAILED(hres)) + return hres; GetClientRect(This->hwnd, &rect); IOleDocumentView_SetRect(This->view, &rect);

1 0

Piotr Caban : user32: Return window procedure pointer in WINPROC_AllocProc if it' s not possible to allocate handle.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 7cb0e78dbf35420de4fd6302a580d8bc34e97930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb0e78dbf35420de4fd6302a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:21 2016 +0100 user32: Return window procedure pointer in WINPROC_AllocProc if it's not possible to allocate handle. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 3642109..507a36a 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -165,7 +165,7 @@ static inline WINDOWPROC *alloc_winproc( WNDPROC func, BOOL unicode ) proc_to_handle(proc), unicode ? 'W' : 'A', func, winproc_used, MAX_WINPROCS ); } - else FIXME( "too many winprocs, cannot allocate one for %p\n", func ); + else WARN( "too many winprocs, cannot allocate one for %p\n", func ); } else TRACE( "reusing %p for %p\n", proc_to_handle(proc), func ); @@ -309,7 +309,7 @@ WNDPROC WINPROC_AllocProc( WNDPROC func, BOOL unicode ) { WINDOWPROC *proc; - if (!(proc = alloc_winproc( func, unicode ))) return NULL; + if (!(proc = alloc_winproc( func, unicode ))) return func; if (proc == WINPROC_PROC16) return func; return proc_to_handle( proc ); }

1 0

Henri Verbeet : d3dx9/tests: Get rid of some redundant NULL checks in D3DXCreateTextTest().
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: a9506bf952d5c76c90eb0aeed71727cdcafb4ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9506bf952d5c76c90eb0aeed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 11 16:01:42 2016 +0100 d3dx9/tests: Get rid of some redundant NULL checks in D3DXCreateTextTest(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 1afba18..d193d1b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4401,7 +4401,7 @@ static void D3DXCreateTextTest(void) ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); number_of_vertices = d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh); number_of_faces = d3dxmesh->lpVtbl->GetNumFaces(d3dxmesh); - if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + d3dxmesh->lpVtbl->Release(d3dxmesh); hr = D3DXCreateTextA(device, hdc, "wine", 0.0f, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); @@ -4411,7 +4411,7 @@ static void D3DXCreateTextTest(void) ok(number_of_faces == d3dxmesh->lpVtbl->GetNumFaces(d3dxmesh), "Got %d faces, expected %d\n", d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh), number_of_faces); - if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + d3dxmesh->lpVtbl->Release(d3dxmesh); if (0) {

1 0