December 2007 - Wine-Commits

Lei Zhang : quartz: Fix return value in IFilterGraph_FindFilterByName.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 31aab429340ac5c65adea83b769b36121507ba41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31aab429340ac5c65adea83b7… Author: Lei Zhang <thestig(a)google.com> Date: Wed Dec 5 20:11:13 2007 -0800 quartz: Fix return value in IFilterGraph_FindFilterByName. --- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/tests/filtergraph.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a64562a..e583cee 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -495,7 +495,7 @@ static HRESULT WINAPI GraphBuilder_FindFilterByName(IGraphBuilder *iface, } } - return E_FAIL; /* FIXME: check this error code */ + return VFW_E_NOT_FOUND; } /* NOTE: despite the implication, it doesn't matter which diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index abdaa09..85cce7c 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -138,9 +138,7 @@ static void test_graph_builder(void) ok(dir == PINDIR_INPUT, "pin has wrong direction\n"); hr = IGraphBuilder_FindFilterByName(pgraph, fooBarW, &pF2); - todo_wine { - ok(hr == VFW_E_NOT_FOUND, "IGraphBuilder_FindFilterByName returned %x\n", hr); - } + ok(hr == VFW_E_NOT_FOUND, "IGraphBuilder_FindFilterByName returned %x\n", hr); ok(pF2 == NULL, "IGraphBuilder_FindFilterByName returned %p\n", pF2); hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, &pF2); ok(hr == S_OK, "IGraphBuilder_FindFilterByName returned %x\n", hr);

1 0

Lei Zhang : quartz: Add a test for IFilterGraph2.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 4ab6fd3de0180bcd4acee4fc4b03f355a41a625c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab6fd3de0180bcd4acee4fc4… Author: Lei Zhang <thestig(a)google.com> Date: Wed Dec 5 20:10:41 2007 -0800 quartz: Add a test for IFilterGraph2. --- dlls/quartz/tests/filtergraph.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 57400d2..8cbae7b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -102,8 +102,22 @@ static void test_render_run(void) releasefiltergraph(); } +static void test_filter_graph2(void) +{ + HRESULT hr; + IFilterGraph2 *pF = NULL; + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (LPVOID*)&pF); + todo_wine { + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + ok(pF != NULL, "pF is NULL\n"); + } +} + START_TEST(filtergraph) { CoInitialize(NULL); test_render_run(); + test_filter_graph2(); }

1 0

Lei Zhang : quartz: Move current tests into their own test case.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: f84f4cab70b330daf3cfb0a1f2367b14d17d99a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84f4cab70b330daf3cfb0a1f… Author: Lei Zhang <thestig(a)google.com> Date: Wed Dec 5 20:10:24 2007 -0800 quartz: Move current tests into their own test case. --- dlls/quartz/tests/filtergraph.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fe26baf..57400d2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -85,20 +85,25 @@ static void releasefiltergraph(void) ok(hr==0, "Releasing filtergraph returned: %x\n", hr); } -START_TEST(filtergraph) +static void test_render_run(void) { HANDLE h; - - CoInitialize(NULL); + if (!createfiltergraph()) return; h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (h != INVALID_HANDLE_VALUE) { - CloseHandle(h); - renderfile(); - rungraph(); + CloseHandle(h); + renderfile(); + rungraph(); } releasefiltergraph(); } + +START_TEST(filtergraph) +{ + CoInitialize(NULL); + test_render_run(); +}

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 5f7a9cea3893156477bb04bcc1eee9028a124fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7a9cea3893156477bb04bcc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 7 01:03:54 2007 +0100 Assorted spelling fixes. --- dlls/d3d9/tests/visual.c | 2 +- dlls/kernel32/thread.c | 2 +- dlls/user32/tests/msg.c | 4 ++-- dlls/wined3d/directx.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 6 +++--- dlls/winex11.drv/opengl.c | 2 +- include/rpcdcep.h | 2 +- programs/regedit/regproc.c | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d929965..23053ed 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22,7 +22,7 @@ * * However, neither d3d nor opengl is guaranteed to be pixel exact, and thus the capability of this test * is rather limited. As a general guideline for adding tests, do not rely on corner pixels. Draw a big enough - * area which shows specific behavior(like a quad on the whole screen), and try to get resulting colos with + * area which shows specific behavior(like a quad on the whole screen), and try to get resulting colors with * all bits set or unset in all channels(like pure red, green, blue, white, black). Hopefully everything that * causes visible results in games can be tested in a way that does not depend on pixel exactness */ diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index ee89a82..bbcccd4 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -524,7 +524,7 @@ BOOL WINAPI GetThreadTimes( * Retrieve the identifier of a thread. * * PARAMS - * Thread [I] The thread to retrive the identifier of. + * Thread [I] The thread to retrieve the identifier of. * * RETURNS * Success: Identifier of the target thread. diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d1f5892..ea466af 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7866,7 +7866,7 @@ static void test_SendMessageTimeout(void) info.timeout = 1; info.ret = 0xdeadbeef; thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); - Sleep(100); /* SendMessageTimeout should timeout here */ + Sleep(100); /* SendMessageTimeout should time out here */ wait_for_thread( thread ); CloseHandle( thread ); ok( info.ret == 0, "SendMessageTimeout succeeded\n" ); @@ -7908,7 +7908,7 @@ static void test_SendMessageTimeout(void) thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); wait_for_thread( thread ); CloseHandle( thread ); - /* we should timeout but still get the message */ + /* we should time out but still get the message */ ok( info.ret == 0, "SendMessageTimeout failed\n" ); ok_sequence( WmUser, "WmUser", FALSE ); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a269988..43d2a79 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2526,7 +2526,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, * in max native instructions. Intel and others also offer the info in this extension but they * don't support GLSL (at least on Windows). * - * PS2.0 requires at least 96 instructions, 2.0a/2.0b go upto 512. Assume that if the number + * PS2.0 requires at least 96 instructions, 2.0a/2.0b go up to 512. Assume that if the number * of instructions is 512 or less we have to do with ps2.0 hardware. * NOTE: ps3.0 hardware requires 512 or more instructions but ati and nvidia offer 'enough' (1024 vs 4096) on their most basic ps3.0 hardware. */ @@ -2811,8 +2811,8 @@ static BOOL implementation_is_apple(WineD3D_GL_Info *gl_info) { * aren't sufficient either because a Linux binary may display on a macos X server via remote X11. * So try to detect the GL implementation by looking at certain Apple extensions. Some extensions * like client storage might be supported on other implementations too, but GL_APPLE_flush_render - * is specific to the MacOS window management, and GL_APPLE_ycbcr_422 is a Quicktime specific, so - * it the chance that other implementations support it is rather rare since Win32 Quicktime uses + * is specific to the Mac OS X window management, and GL_APPLE_ycbcr_422 is QuickTime specific. So + * the chance that other implementations support them is rather small since Win32 QuickTime uses * DirectDraw, not OpenGL. */ if(gl_info->supported[APPLE_FENCE] && @@ -2831,7 +2831,7 @@ static BOOL implementation_is_apple(WineD3D_GL_Info *gl_info) { static void fixup_extensions(WineD3D_GL_Info *gl_info) { if(implementation_is_apple(gl_info)) { - /* MacOS advertises more GLSL vertex shader uniforms than support on hardware, and if more are + /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are * used it falls back to software. While the compiler can detect if the shader uses all declared * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader * using relative addressing falls back to software. diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 80b8ea9..46ca6aa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -651,7 +651,7 @@ void shader_generate_glsl_declarations( shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); - /* Hardcodeable local constants */ + /* Hardcodable local constants */ if(!This->baseShader.load_local_constsF) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { float *value = (float *) lconst->value; @@ -1581,7 +1581,7 @@ void shader_glsl_compare(SHADER_OPCODE_ARG* arg) { case WINED3DSIO_SLT: /* Step(src0, src1) is not suitable here because if src0 == src1 SLT is supposed, * to return 0.0 but step returns 1.0 because step is not < x - * An alternative is a bvec compare padded with an unused secound component. + * An alternative is a bvec compare padded with an unused second component. * step(src1 * -1.0, src0 * -1.0) is not an option because it suffers from the same * issue. Playing with not() is not possible either because not() does not accept * a scalar. diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ef0fbd8..dca2e88 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3505,7 +3505,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W } if(wasrhw) { /* Apply the transform matrices when switching from rhw drawing to vertex shaders. Vertex - * shaders themselves do not need it it, but the matrices are not reapplied automatically when + * shaders themselves do not need it, but the matrices are not reapplied automatically when * switching back from vertex shaders to fixed function processing. So make sure we leave the * fixed function vertex processing states back in a sane state before switching to shaders */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6d45164..b8a97d5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3711,9 +3711,9 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT * Copies the current surface data from wherever it is to the requested * location. The location is one of the surface flags, SFLAG_INSYSMEM, * SFLAG_INTEXTURE and SFLAG_INDRAWABLE. When the surface is current in - * multiple locations, the gl texture is prefered over the drawable, which is - * prefered over system memory. The PBO counts as system memory. If rect is - * not NULL, only the specified rectangle is copied(only supported for + * multiple locations, the gl texture is preferred over the drawable, which is + * preferred over system memory. The PBO counts as system memory. If rect is + * not NULL, only the specified rectangle is copied (only supported for * sysmem<->drawable copies at the moment). If rect is NULL, the destination * location is marked up to date after the copy. * diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 712e1a8..f8cf301 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1524,7 +1524,7 @@ BOOL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { * In case of GLX you need to specify this at context creation time but in case of WGL you * do this using wglShareLists which you can call after creating the context. * To emulate WGL we try to delay the creation of the context until wglShareLists or wglMakeCurrent. - * Upto now that works fine. + * Up to now that works fine. * * The delayed GLX context creation could cause issues for wglCopyContext as it might get called * when there is no GLX context yet. Warn the user about it and let him report a bug report. diff --git a/include/rpcdcep.h b/include/rpcdcep.h index 46a402a..d3c2e09 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -131,7 +131,7 @@ RPCRTAPI RPC_BINDING_HANDLE RPC_ENTRY * Note that the prototypes for I_RpcBindingSetAsync are different for each case. * * Wine defaults to the WinNT case and only defines these function is MSWMSG is - * defined. Defining the NT functions by default causes MIDL generated proxys + * defined. Defining the NT functions by default causes MIDL generated proxies * to not compile. */ diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e17a973..fe5323e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -374,7 +374,7 @@ static void closeKey(void) /****************************************************************************** * This function is a wrapper for the setValue function. It prepares the - * land and clean the area once completed. + * land and cleans the area once completed. * Note: this function modifies the line parameter. * * line - registry file unwrapped line. Should have the registry value name and

1 0

Jonathan Ernst : Updated French translation.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 1c7787e69d5bc88bce30cdf85ae138dc4da7341f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7787e69d5bc88bce30cdf85… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Fri Dec 7 10:19:14 2007 +0100 Updated French translation. --- dlls/shell32/shell32_Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index 719572d..2c8c838 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -250,5 +250,5 @@ STRINGTABLE DISCARDABLE IDS_COMMON_VIDEO "Documents\\Mes vid�os" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Nouveau dossier" }

1 0

Rob Shearman : ole32: Register the window used in the marshal tests only once.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 34ab21d11ecdec40690b300bb0e20a4a581e14f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ab21d11ecdec40690b300bb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 7 14:14:25 2007 +0000 ole32: Register the window used in the marshal tests only once. Destroy the windows that have been created when they are no longer needed. --- dlls/ole32/tests/marshal.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index ae82e37..035a725 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1831,15 +1831,19 @@ static LRESULT CALLBACK window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM l } } -static void test_message_reentrancy(void) +static void register_test_window(void) { WNDCLASS wndclass; - MSG msg; memset(&wndclass, 0, sizeof(wndclass)); wndclass.lpfnWndProc = window_proc; wndclass.lpszClassName = "WineCOMTest"; RegisterClass(&wndclass); +} + +static void test_message_reentrancy(void) +{ + MSG msg; hwnd_app = CreateWindow("WineCOMTest", NULL, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, 0); ok(hwnd_app != NULL, "Window creation failed\n"); @@ -1852,6 +1856,7 @@ static void test_message_reentrancy(void) TranslateMessage(&msg); DispatchMessage(&msg); } + DestroyWindow(hwnd_app); } static HRESULT WINAPI TestMsg_IClassFactory_CreateInstance( @@ -1917,6 +1922,7 @@ static void test_call_from_message(void) TranslateMessage(&msg); DispatchMessage(&msg); } + DestroyWindow(hwnd_app); } static void test_WM_QUIT_handling(void) @@ -2873,7 +2879,6 @@ static void test_channel_hook(void) START_TEST(marshal) { - WNDCLASS wndclass; HMODULE hOle32 = GetModuleHandle("ole32"); int argc; char **argv; @@ -2890,11 +2895,7 @@ START_TEST(marshal) return; } - /* register a window class used in several tests */ - memset(&wndclass, 0, sizeof(wndclass)); - wndclass.lpfnWndProc = window_proc; - wndclass.lpszClassName = "WineCOMTest"; - RegisterClass(&wndclass); + register_test_window(); test_cocreateinstance_proxy();

1 0

Rob Shearman : mshtml: Fix a memory leak in the htmldoc tests.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: cf48f090f1aded774846952bb87dfba6036d10ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf48f090f1aded774846952bb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 7 14:14:15 2007 +0000 mshtml: Fix a memory leak in the htmldoc tests. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ccfe05e..6c662c0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2424,6 +2424,7 @@ static void _test_readyState(unsigned line, IUnknown *unk) ok_(__FILE__, line) (!lstrcmpW(state, expected_state[load_state]), "unexpected state \"%s\", expected %d\n", debugstr_w(state), load_state); + SysFreeString(state); IHTMLDocument_Release(htmldoc); }

1 0

Rob Shearman : oleaut32: Set the number of locks held on the safe arrays in the safe array tests to zero before destroying them , otherwise the operation will fail and leak memory.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 2a9168e586e067a1c7a63efb3472f6e5194d6912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9168e586e067a1c7a63efb3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 7 14:14:33 2007 +0000 oleaut32: Set the number of locks held on the safe arrays in the safe array tests to zero before destroying them, otherwise the operation will fail and leak memory. --- dlls/oleaut32/tests/usrmarshal.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 3139442..20fc2f8 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -208,6 +208,7 @@ static void test_marshal_LPSAFEARRAY(void) LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); } HeapFree(GetProcessHeap(), 0, buffer); + lpsa->cLocks = 0; SafeArrayDestroy(lpsa); /* test NULL safe array */ @@ -244,6 +245,7 @@ static void test_marshal_LPSAFEARRAY(void) check_safearray(buffer, lpsa); HeapFree(GetProcessHeap(), 0, buffer); + lpsa->cLocks = 0; SafeArrayDestroy(lpsa); /* VARTYPE-less arrays can be marshaled if cbElements is 1,2,4 or 8 as type SF_In */ @@ -1125,6 +1127,7 @@ static void test_marshal_VARIANT(void) VARIANT_UserFree(&umcb.Flags, &v2); } HeapFree(GetProcessHeap(), 0, buffer); + lpsa->cLocks = 0; SafeArrayDestroy(lpsa); /*** VARIANT BYREF ***/

1 0

Rob Shearman : oleaut32: Try to re-use existing memory when unmarshalling variants with byref types .
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 67a213fc1e08eeac21051861692d27ee300287a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a213fc1e08eeac210518616… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 7 14:14:05 2007 +0000 oleaut32: Try to re-use existing memory when unmarshalling variants with byref types. --- dlls/oleaut32/tests/usrmarshal.c | 4 +++ dlls/oleaut32/usrmarshal.c | 50 +++++++++++++++++++++---------------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 633a382..3139442 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -607,11 +607,15 @@ static void test_marshal_VARIANT(void) ok(*(short*)wirev == s, "wv[6] %08x\n", *wirev); if (VARIANT_UNMARSHAL_WORKS) { + void *mem; VariantInit(&v2); + V_VT(&v2) = VT_I2 | VT_BYREF; + V_BYREF(&v2) = mem = CoTaskMemAlloc(sizeof(V_I2(&v2))); stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); + ok(V_BYREF(&v2) == mem, "didn't reuse existing memory\n"); ok(*V_I2REF(&v) == *V_I2REF(&v2), "got i2 ref %x expect ui4 ref %x\n", *V_I2REF(&v), *V_I2REF(&v2)); VARIANT_UserFree(&umcb.Flags, &v2); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 49570f4..a9a738c 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -220,11 +220,11 @@ typedef struct DWORD switch_is; } variant_wire_t; -static unsigned int get_type_size(ULONG *pFlags, const VARIANT *pvar) +static unsigned int get_type_size(ULONG *pFlags, VARTYPE vt) { - if (V_VT(pvar) & VT_ARRAY) return 4; + if (vt & VT_ARRAY) return 4; - switch (V_VT(pvar) & ~VT_BYREF) { + switch (vt & ~VT_BYREF) { case VT_EMPTY: case VT_NULL: return 0; @@ -263,15 +263,15 @@ static unsigned int get_type_size(ULONG *pFlags, const VARIANT *pvar) case VT_RECORD: return 0; default: - FIXME("unhandled VT %d\n", V_VT(pvar)); + FIXME("unhandled VT %d\n", vt); return 0; } } -static unsigned int get_type_alignment(ULONG *pFlags, const VARIANT *pvar) +static unsigned int get_type_alignment(ULONG *pFlags, VARTYPE vt) { - unsigned int size = get_type_size(pFlags, pvar); - if(V_VT(pvar) & VT_BYREF) return 3; + unsigned int size = get_type_size(pFlags, vt); + if(vt & VT_BYREF) return 3; if(size == 0) return 0; if(size <= 4) return size - 1; return 7; @@ -441,12 +441,12 @@ ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar) if(V_VT(pvar) & VT_BYREF) Start += 4; - align = get_type_alignment(pFlags, pvar); + align = get_type_alignment(pFlags, V_VT(pvar)); ALIGN_LENGTH(Start, align); if(V_VT(pvar) == (VT_VARIANT | VT_BYREF)) Start += 4; else - Start += get_type_size(pFlags, pvar); + Start += get_type_size(pFlags, V_VT(pvar)); Start = wire_extra_user_size(pFlags, Start, pvar); TRACE("returning %d\n", Start); @@ -478,8 +478,8 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, header->switch_is &= ~VT_TYPEMASK; Pos = (unsigned char*)(header + 1); - type_size = get_type_size(pFlags, pvar); - align = get_type_alignment(pFlags, pvar); + type_size = get_type_size(pFlags, V_VT(pvar)); + align = get_type_alignment(pFlags, V_VT(pvar)); ALIGN_POINTER(Pos, align); if(header->vt & VT_BYREF) @@ -565,32 +565,33 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar); ALIGN_POINTER(Buffer, 7); - VariantClear(pvar); header = (variant_wire_t *)Buffer; - pvar->n1.n2.vt = header->vt; - pvar->n1.n2.wReserved1 = header->wReserved1; - pvar->n1.n2.wReserved2 = header->wReserved2; - pvar->n1.n2.wReserved3 = header->wReserved3; - Pos = (unsigned char*)(header + 1); - type_size = get_type_size(pFlags, pvar); - align = get_type_alignment(pFlags, pvar); + type_size = get_type_size(pFlags, header->vt); + align = get_type_alignment(pFlags, header->vt); ALIGN_POINTER(Pos, align); if(header->vt & VT_BYREF) { Pos += 4; - pvar->n1.n2.n3.byref = CoTaskMemAlloc(type_size); - memcpy(pvar->n1.n2.n3.byref, Pos, type_size); + if (V_VT(pvar) != header->vt) + { + VariantClear(pvar); + V_BYREF(pvar) = CoTaskMemAlloc(type_size); + } + else if (!V_BYREF(pvar)) + V_BYREF(pvar) = CoTaskMemAlloc(type_size); + memcpy(V_BYREF(pvar), Pos, type_size); if((header->vt & VT_TYPEMASK) != VT_VARIANT) - Pos += type_size; + Pos += type_size; else Pos += 4; } else { + VariantClear(pvar); if((header->vt & VT_TYPEMASK) == VT_DECIMAL) memcpy(pvar, Pos, type_size); else @@ -598,6 +599,11 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe Pos += type_size; } + pvar->n1.n2.vt = header->vt; + pvar->n1.n2.wReserved1 = header->wReserved1; + pvar->n1.n2.wReserved2 = header->wReserved2; + pvar->n1.n2.wReserved3 = header->wReserved3; + if(header->vt & VT_ARRAY) { if(header->vt & VT_BYREF)

1 0

Rob Shearman : oleaut32: Don' t call SafeArrayAllocData in LPSAFEARRAY_UserUnmarshal if we called SafeArrayCreateEx instead of SafeArrayAllocDescriptor .
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: baccba317e4472ae2cbfa2075b15ce9a3af3a5e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baccba317e4472ae2cbfa2075… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 7 14:13:57 2007 +0000 oleaut32: Don't call SafeArrayAllocData in LPSAFEARRAY_UserUnmarshal if we called SafeArrayCreateEx instead of SafeArrayAllocDescriptor. Otherwise, we'll leak memory. --- dlls/oleaut32/usrmarshal.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 3f84fab..49570f4 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1048,9 +1048,14 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B (*ppsa)->cbElements = wiresa->cbElements; (*ppsa)->cLocks = LOWORD(wiresa->cLocks); - hr = SafeArrayAllocData(*ppsa); - if (FAILED(hr)) - RpcRaiseException(hr); + /* SafeArrayCreateEx allocates the data for us, but + * SafeArrayAllocDescriptor doesn't */ + if(!vt) + { + hr = SafeArrayAllocData(*ppsa); + if (FAILED(hr)) + RpcRaiseException(hr); + } if ((*(ULONG *)Buffer != cell_count) || (SAFEARRAY_GetCellCount(*ppsa) != cell_count)) RpcRaiseException(RPC_S_INVALID_BOUND);

1 0