December 2009 - Wine-Commits

Stefan Dösinger : wined3d: Fix VBO buffer usage.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 8eeb513b1a0e7a4f7963612f0305850499c9ec7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eeb513b1a0e7a4f7963612f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 28 11:38:29 2009 +0100 wined3d: Fix VBO buffer usage. --- dlls/wined3d/buffer.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f6e89dd..ff1ebd7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -79,22 +79,17 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) } /* Don't use static, because dx apps tend to update the buffer - * quite often even if they specify 0 usage. Because we always keep the local copy - * we never read from the vbo and can create a write only opengl buffer. - */ - switch(This->resource.usage & (WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC)) + * quite often even if they specify 0 usage. + */ + if(This->resource.usage & WINED3DUSAGE_DYNAMIC) + { + TRACE("Gl usage = GL_DYNAMIC_DRAW\n"); + gl_usage = GL_DYNAMIC_DRAW_ARB; + } + else { - case WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC: - case WINED3DUSAGE_DYNAMIC: - TRACE("Gl usage = GL_STREAM_DRAW\n"); - gl_usage = GL_STREAM_DRAW_ARB; - break; - - case WINED3DUSAGE_WRITEONLY: - default: - TRACE("Gl usage = GL_DYNAMIC_DRAW\n"); - gl_usage = GL_DYNAMIC_DRAW_ARB; - break; + TRACE("Gl usage = GL_STREAM_DRAW\n"); + gl_usage = GL_STREAM_DRAW_ARB; } /* Reserve memory for the buffer. The amount of data won't change

1 0

Maarten Lankhorst : dsound: Remove refcounting in classfactory.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 1b94450f789791908a370f16e125087b84f35bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b94450f789791908a370f16e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 15 15:39:14 2009 +0100 dsound: Remove refcounting in classfactory. --- dlls/dsound/dsound_main.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index f65dbf9..e7c59e9 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -497,7 +497,6 @@ typedef HRESULT (*FnCreateInstance)(REFIID riid, LPVOID *ppobj); typedef struct { const IClassFactoryVtbl *lpVtbl; - LONG ref; REFCLSID rclsid; FnCreateInstance pfnCreateInstance; } IClassFactoryImpl; @@ -522,19 +521,13 @@ DSCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); - return ref; + return 2; } static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); /* static class, won't be freed */ - return ref; + return 1; } static HRESULT WINAPI DSCF_CreateInstance( @@ -573,13 +566,13 @@ static const IClassFactoryVtbl DSCF_Vtbl = { }; static IClassFactoryImpl DSOUND_CF[] = { - { &DSCF_Vtbl, 1, &CLSID_DirectSound, (FnCreateInstance)DSOUND_Create }, - { &DSCF_Vtbl, 1, &CLSID_DirectSound8, (FnCreateInstance)DSOUND_Create8 }, - { &DSCF_Vtbl, 1, &CLSID_DirectSoundCapture, (FnCreateInstance)DSOUND_CaptureCreate }, - { &DSCF_Vtbl, 1, &CLSID_DirectSoundCapture8, (FnCreateInstance)DSOUND_CaptureCreate8 }, - { &DSCF_Vtbl, 1, &CLSID_DirectSoundFullDuplex, (FnCreateInstance)DSOUND_FullDuplexCreate }, - { &DSCF_Vtbl, 1, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, - { NULL, 0, NULL, NULL } + { &DSCF_Vtbl, &CLSID_DirectSound, (FnCreateInstance)DSOUND_Create }, + { &DSCF_Vtbl, &CLSID_DirectSound8, (FnCreateInstance)DSOUND_Create8 }, + { &DSCF_Vtbl, &CLSID_DirectSoundCapture, (FnCreateInstance)DSOUND_CaptureCreate }, + { &DSCF_Vtbl, &CLSID_DirectSoundCapture8, (FnCreateInstance)DSOUND_CaptureCreate8 }, + { &DSCF_Vtbl, &CLSID_DirectSoundFullDuplex, (FnCreateInstance)DSOUND_FullDuplexCreate }, + { &DSCF_Vtbl, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, + { NULL, NULL, NULL } }; /*******************************************************************************

1 0

Vladimir Pankratov : setupapi: Add stub for CM_Get_Device_ID_ExW.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 6f2ec37b60235bca17460e35fe89c6612fbdb54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2ec37b60235bca17460e35f… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Dec 15 21:46:59 2009 +0500 setupapi: Add stub for CM_Get_Device_ID_ExW. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/cfgmgr32.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 2f62b66..04473aa 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -74,7 +74,7 @@ @ stdcall CM_Get_Device_IDA(ptr ptr long long) @ stdcall CM_Get_Device_IDW(ptr ptr long long) @ stub CM_Get_Device_ID_ExA -@ stub CM_Get_Device_ID_ExW +@ stdcall CM_Get_Device_ID_ExW(ptr ptr long long ptr) @ stdcall CM_Get_Device_ID_ListA(str ptr long long) @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) @ stub CM_Get_Device_ID_List_ExA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 1b217db..44cd2c0 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -79,6 +79,16 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) } /*********************************************************************** + * CM_Get_Device_ID_ExW (SETUPAPI.@) + */ +DWORD WINAPI CM_Get_Device_ID_ExW( + DEVINST dnDevInst, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("0x%08x %p 0x%08x 0x%08x %p\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + return CR_SUCCESS; +} + +/*********************************************************************** * CM_Get_Device_ID_ListA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_Device_ID_ListA( diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 2b80534..cd26df8 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -127,6 +127,9 @@ CMAPI CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST,PSTR,ULONG,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST,PWSTR,ULONG,ULONG); #define CM_Get_Device_ID WINELIB_NAME_AW(CM_Get_Device_ID) +CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ExA(DEVINST,PSTR,ULONG,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ExW(DEVINST,PWSTR,ULONG,ULONG,HMACHINE); +#define CM_Get_Device_ID_Ex WINELIB_NAME_AW(CM_Get_Device_ID_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ListA(PCSTR,PCHAR,ULONG,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ListW(PCWSTR,PWCHAR,ULONG,ULONG); #define CM_Get_Device_ID_List WINELIB_NAME_AW(CM_Get_Device_ID_List)

1 0

Alexandre Julliard : user32/tests: Fix a number of message test failures on various Windows boxes.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: b51311d60c3d6965d8dc8aa4cd04a85fdba71f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51311d60c3d6965d8dc8aa4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 12:28:41 2009 +0100 user32/tests: Fix a number of message test failures on various Windows boxes. --- dlls/user32/tests/msg.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c67aa13..90ec5a0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -161,7 +161,7 @@ static const struct message WmSWP_ShowOverlappedSeq[] = { { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* Win9x: SWP_NOSENDCHANGING */ { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 1 }, { HCBT_SETFOCUS, hook }, @@ -268,7 +268,7 @@ static const struct message WmSWP_ResizeNoZOrder[] = { { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, /*SWP_NOZORDER|*/SWP_NOACTIVATE, 0, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, /*SWP_NOZORDER|*/SWP_NOACTIVATE, 0, SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|optional }, { WM_SIZE, sent|defwinproc|optional }, @@ -631,9 +631,10 @@ static const struct message WmHideOverlappedSeq[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_SIZE, sent|optional }, /* XP doesn't send it */ { WM_MOVE, sent|optional }, /* XP doesn't send it */ - { WM_NCACTIVATE, sent|wparam, 0 }, - { WM_ACTIVATE, sent|wparam, 0 }, - { WM_ACTIVATEAPP, sent|wparam, 0 }, + { WM_NCACTIVATE, sent|wparam|optional, 0 }, + { WM_ACTIVATE, sent|wparam|optional, 0 }, + { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, + { HCBT_SETFOCUS, hook|optional }, { WM_KILLFOCUS, sent|wparam, 0 }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, { WM_IME_NOTIFY, sent|wparam|optional|defwinproc, 1 }, @@ -1776,7 +1777,8 @@ static BOOL ignore_message( UINT message ) message == WM_GETOBJECT || message == WM_TIMECHANGE || message == WM_DISPLAYCHANGE || - message == WM_DEVICECHANGE); + message == WM_DEVICECHANGE || + message == WM_DWMNCRENDERINGCHANGED); } @@ -5384,6 +5386,7 @@ static void test_button_messages(void) UpdateWindow(hwnd); SetFocus(0); flush_events(); + SetFocus(0); flush_sequence(); log_all_parent_messages++; @@ -9324,17 +9327,21 @@ static void test_PeekMessage(void) skip( "queuing key events not supported\n" ); goto done; } - ok(qstatus == MAKELONG(QS_KEY, QS_KEY), + ok(qstatus == MAKELONG(QS_KEY, QS_KEY) || + /* keybd_event seems to trigger a sent message on NT4 */ + qstatus == MAKELONG(QS_KEY|QS_SENDMESSAGE, QS_KEY|QS_SENDMESSAGE), "wrong qstatus %08x\n", qstatus); PostMessageA(info.hwnd, WM_CHAR, 'z', 0); qstatus = GetQueueStatus(qs_all_input); - ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY) || + qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY|QS_SENDMESSAGE), "wrong qstatus %08x\n", qstatus); InvalidateRect(info.hwnd, NULL, FALSE); qstatus = GetQueueStatus(qs_all_input); - ok(qstatus == MAKELONG(QS_PAINT, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + ok(qstatus == MAKELONG(QS_PAINT, QS_PAINT|QS_POSTMESSAGE|QS_KEY) || + qstatus == MAKELONG(QS_PAINT, QS_PAINT|QS_POSTMESSAGE|QS_KEY|QS_SENDMESSAGE), "wrong qstatus %08x\n", qstatus); trace("signalling to send message\n"); @@ -9896,7 +9903,7 @@ static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) /* Timer proc messages are not dispatched to the window proc, * and therefore not logged. */ - if (msg.message == WM_TIMER || msg.message == WM_SYSTIMER) + if ((msg.message == WM_TIMER || msg.message == WM_SYSTIMER) && msg.hwnd) { struct recvd_message s_msg; @@ -10291,8 +10298,8 @@ static const struct message WmRestore_5[] = { }; static const struct message WmHide_1[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE, 0, SWP_NOACTIVATE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0, SWP_NOACTIVATE }, { HCBT_ACTIVATE, hook|optional }, { HCBT_SETFOCUS, hook|optional }, /* win2000 sends it */ { 0 } @@ -10840,6 +10847,7 @@ static const struct message SetActiveWindowSeq4[] = { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCACTIVATE, sent|wparam, 1 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 1 },

1 0

Huw Davies : riched20: Initialise window size.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 8808fccd576ec956013fd671eb93410a7e4c62e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8808fccd576ec956013fd671e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 16 10:34:01 2009 +0000 riched20: Initialise window size. Found by Valgrind. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3dc1133..2ae4f94 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2646,6 +2646,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->hWnd = NULL; ed->hwndParent = NULL; + ed->sizeWindow.cx = ed->sizeWindow.cy = 0; ed->texthost = texthost; ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0;

1 0

Huw Davies : oleaut32: Fix memory leaks in the tests.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 487dc6b639fb4dbb89d7567e8299fc521e7d4b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=487dc6b639fb4dbb89d7567e8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 16 09:56:54 2009 +0000 oleaut32: Fix memory leaks in the tests. Found by Valgrind. --- dlls/oleaut32/tests/vartype.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 8f19294..a61c777 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3484,6 +3484,7 @@ static void test_VarDateChangeTypeEx(void) (!lstrcmpW(V_BSTR(&vDst), sz25570) || !lstrcmpW(V_BSTR(&vDst), sz25570_2)), "hres=0x%X, type=%d (should be VT_BSTR), *bstr=%s\n", hres, V_VT(&vDst), V_BSTR(&vDst) ? wtoascii(V_BSTR(&vDst)) : "?"); + VariantClear(&vDst); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); if (HAVE_OLEAUT32_LOCALES) @@ -3492,6 +3493,7 @@ static void test_VarDateChangeTypeEx(void) ok(hres == S_OK && V_VT(&vDst) == VT_BSTR && V_BSTR(&vDst) && !lstrcmpW(V_BSTR(&vDst), sz25570Nls), "hres=0x%X, type=%d (should be VT_BSTR), *bstr=%s\n", hres, V_VT(&vDst), V_BSTR(&vDst) ? wtoascii(V_BSTR(&vDst)) : "?"); + VariantClear(&vDst); } } @@ -4780,7 +4782,8 @@ static void test_VarBoolCopy(void) ok(hres == S_OK && V_VT(&vDst) == VT_BSTR && \ V_BSTR(&vDst) && !memcmp(V_BSTR(&vDst), str, sizeof(str)), \ "hres=0x%X, type=%d (should be VT_BSTR), *bstr='%c'\n", \ - hres, V_VT(&vDst), V_BSTR(&vDst) ? *V_BSTR(&vDst) : '?') + hres, V_VT(&vDst), V_BSTR(&vDst) ? *V_BSTR(&vDst) : '?'); \ + VariantClear(&vDst) static void test_VarBoolChangeTypeEx(void) {

1 0

Huw Davies : shell32: Fix a memory leak in the tests.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 7078cfa76bf6f9aeec663b02cc050c607074da8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7078cfa76bf6f9aeec663b02c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 16 10:21:55 2009 +0000 shell32: Fix a memory leak in the tests. Found by Valgrind. --- dlls/shell32/tests/shlfolder.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e3bf191..31ae05a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -586,6 +586,7 @@ static void test_GetDisplayName(void) ok (!lstrcmpiW(wszTestFile, wszTestFile2), "GetDisplayNameOf returns incorrect path!\n"); } + ILFree(pidlTestFile); IShellFolder_Release(psfDesktop); IShellFolder_Release(psfPersonal); }

1 0

Huw Davies : oleaut32: Fix a memory leak.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: d83cf1af0f6b4323000cc9bb4b400dfd92f6a290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83cf1af0f6b4323000cc9bb4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 16 10:08:18 2009 +0000 oleaut32: Fix a memory leak. Found by Valgrind. --- dlls/oleaut32/variant.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 10bc8ed..56ab2b3 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2854,6 +2854,7 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) if (FAILED(rc)) return rc; rc = VarBstrCmp(V_BSTR(bstrv), V_BSTR(&rv), lcid, flags); + VariantClear(&rv); } else if (V_BSTR(bstrv) && *V_BSTR(bstrv)) { /* Non NULL nor empty BSTR */ /* If the BSTR is not a number the BSTR is greater */ @@ -2869,8 +2870,8 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) /* Numeric comparison, will be handled below. VARCMP_NULL used only to break out. */ rc = VARCMP_NULL; - VariantClear(&lv); - VariantClear(&rv); + VariantClear(&lv); + VariantClear(&rv); } else /* Empty or NULL BSTR */ rc = VARCMP_GT;

1 0

Paul Vriens : gdiplus/tests: Fix some test failures on older gdiplus.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: ffbc346565cc0f765f840c0d87e23f357a7e5b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbc346565cc0f765f840c0d8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 16 09:48:47 2009 +0100 gdiplus/tests: Fix some test failures on older gdiplus. --- dlls/gdiplus/tests/image.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 2b08ef8..486a679 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1055,7 +1055,9 @@ static void test_palette(void) palette->Count = 257; stat = GdipSetImagePalette((GpImage*)bitmap, palette); - expect(InvalidParameter, stat); + ok(stat == InvalidParameter || + broken(stat == Ok), /* Old gdiplus behavior */ + "Expected %.8x, got %.8x\n", InvalidParameter, stat); GdipDisposeImage((GpImage*)bitmap); }

1 0

Paul Vriens : rpcrt4/tests: Skip more tests on Win9x/WinMe.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 876c3c352bc8874af598513a97aae6616d6cb94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=876c3c352bc8874af598513a9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 16 09:09:01 2009 +0100 rpcrt4/tests: Skip more tests on Win9x/WinMe. --- dlls/rpcrt4/tests/server.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index f55bfcf..693fe69 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1338,6 +1338,11 @@ s_authinfo_test(unsigned int protseq, int secure) if (secure || protseq == RPC_PROTSEQ_LRPC) { status = RpcBindingInqAuthClientA(binding, &privs, &principal, &level, &authnsvc, NULL); + if (status == RPC_S_CANNOT_SUPPORT) + { + win_skip("RpcBindingInqAuthClientA not supported\n"); + return; + } ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); ok(privs != (RPC_AUTHZ_HANDLE)0xdeadbeef, "privs unchanged\n"); ok(principal != (unsigned char *)0xdeadbeef, "principal unchanged\n"); @@ -1362,11 +1367,6 @@ s_authinfo_test(unsigned int protseq, int secure) ok(authnsvc == RPC_C_AUTHN_WINNT, "authnsvc unchanged\n"); status = RpcImpersonateClient(NULL); - if (status == RPC_S_CANNOT_SUPPORT) - { - win_skip("RpcImpersonateClient not supported\n"); - return; - } ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); status = RpcRevertToSelf(); ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status);

1 0