wine-commits November 2006

wine-commits@winehq.org

3 participants
792 discussions

Huw Davies : ole32: CoRegisterMessageFilter shouldn' t crash on an uninitialized apartment.
by Alexandre Julliard 17 Nov '06

17 Nov '06

Module: wine Branch: master Commit: 241336c7491e5ef214c78d39ef1fb380846614fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=241336c7491e5ef214c78d39e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 16 17:49:31 2006 +0000 ole32: CoRegisterMessageFilter shouldn't crash on an uninitialized apartment. --- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/tests/compobj.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index db76dbc..59093ff 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2671,9 +2671,9 @@ HRESULT WINAPI CoRegisterMessageFilter( apt = COM_CurrentApt(); /* can't set a message filter in a multi-threaded apartment */ - if (apt->multi_threaded) + if (!apt || apt->multi_threaded) { - ERR("can't set message filter in MTA\n"); + WARN("can't set message filter in MTA or uninitialized apt\n"); return CO_E_NOT_SUPPORTED; } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b2e9bf9..81bf831 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -250,9 +250,10 @@ static void test_CoRegisterMessageFilter HRESULT hr; IMessageFilter *prev_filter; -#if 0 /* crashes without an apartment! */ hr = CoRegisterMessageFilter(&MessageFilter, &prev_filter); -#endif + ok(hr == CO_E_NOT_SUPPORTED, + "CoRegisterMessageFilter should have failed with CO_E_NOT_SUPPORTED instead of 0x%08x\n", + hr); pCoInitializeEx(NULL, COINIT_MULTITHREADED); prev_filter = (IMessageFilter *)0xdeadbeef;

1 0

Detlef Riekenberg : shell32: Fix a function name in a comment.
by Alexandre Julliard 17 Nov '06

17 Nov '06

Module: wine Branch: master Commit: 7c70f7f9b24ad95e7d55d5aa52d038901c970f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c70f7f9b24ad95e7d55d5aa5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Nov 16 17:10:44 2006 +0100 shell32: Fix a function name in a comment. --- dlls/shell32/xdg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 4c4d10e..75196f4 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -148,7 +148,7 @@ const char *XDG_GetPath(int path_id) } /****************************************************************************** - * XDG_GetPath [internal] + * XDG_BuildPath [internal] * * Build a string with a subpath of one of the XDG standard paths. * The root can be one of XDG_DATA_HOME, XDG_CONFIG_HOME and XDG_CACHE_HOME.

1 0

Dmitry Timoshkov : kernel32: Add a basic PE loader test.
by Alexandre Julliard 17 Nov '06

17 Nov '06

Module: wine Branch: master Commit: a77d00eabb989544fa1d0fa503674e013b9c7ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77d00eabb989544fa1d0fa50… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 16 23:50:57 2006 +0800 kernel32: Add a basic PE loader test. --- dlls/kernel32/tests/Makefile.in | 1 + dlls/kernel32/tests/loader.c | 258 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 259 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a77d00eabb989544fa1d0…

1 0

Hans Leidekker : setupapi: Implement SetupGetTargetPath{A,W}.
by Alexandre Julliard 17 Nov '06

17 Nov '06

Module: wine Branch: master Commit: 134c03b3bea0a33cd898b7974d1647d97ae83b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134c03b3bea0a33cd898b7974… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Nov 16 14:26:01 2006 +0100 setupapi: Implement SetupGetTargetPath{A,W}. --- dlls/setupapi/query.c | 91 +++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 +- include/setupapi.h | 3 + 3 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index bda2f3a..82eb62d 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -516,3 +516,94 @@ BOOL WINAPI SetupGetSourceInfoW( HINF hi } return TRUE; } + +/*********************************************************************** + * SetupGetTargetPathA (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetTargetPathA( HINF hinf, PINFCONTEXT context, PCSTR section, PSTR buffer, + DWORD buffer_size, PDWORD required_size ) +{ + BOOL ret = FALSE; + WCHAR *sectionW = NULL, *bufferW = NULL; + DWORD required; + INT size; + + TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_a(section), buffer, + buffer_size, required_size); + + if (section && !(sectionW = strdupAtoW( section ))) + return FALSE; + + if (!SetupGetTargetPathW( hinf, context, sectionW, NULL, 0, &required )) + goto done; + + if (!(bufferW = HeapAlloc( GetProcessHeap(), 0, required * sizeof(WCHAR) ))) + goto done; + + if (!SetupGetTargetPathW( hinf, context, sectionW, bufferW, required, NULL )) + goto done; + + size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + if (required_size) *required_size = size; + + if (buffer) + { + if (buffer_size >= size) + WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, buffer_size, NULL, NULL ); + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + goto done; + } + } + ret = TRUE; + + done: + HeapFree( GetProcessHeap(), 0, sectionW ); + HeapFree( GetProcessHeap(), 0, bufferW ); + return ret; +} + +/*********************************************************************** + * SetupGetTargetPathW (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section, PWSTR buffer, + DWORD buffer_size, PDWORD required_size ) +{ + static const WCHAR destination_dirs[] = + {'D','e','s','t','i','n','a','t','i','o','n','D','i','r','s',0}; + static const WCHAR default_dest_dir[] = + {'D','e','f','a','u','l','t','D','e','s','t','D','i','r',0}; + + INFCONTEXT ctx; + WCHAR *dir; + INT size; + + TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_w(section), buffer, + buffer_size, required_size); + + if (context && !SetupFindFirstLineW( hinf, destination_dirs, NULL, context )) return FALSE; + else if (section && !SetupFindFirstLineW( hinf, section, NULL, &ctx )) return FALSE; + else if (!SetupFindFirstLineW( hinf, destination_dirs, default_dest_dir, &ctx )) return FALSE; + + if (!(dir = PARSER_get_dest_dir( context ? context : &ctx ))) return FALSE; + + size = lstrlenW( dir ) + 1; + if (required_size) *required_size = size; + + if (buffer) + { + if (buffer_size >= size) + lstrcpyW( buffer, dir ); + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + HeapFree( GetProcessHeap(), 0, dir ); + return FALSE; + } + } + HeapFree( GetProcessHeap(), 0, dir ); + return TRUE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 0575339..f5e63fb 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -421,8 +421,8 @@ @ stdcall SetupGetSourceInfoW(ptr long long ptr long ptr) @ stdcall SetupGetStringFieldA(ptr long ptr long ptr) @ stdcall SetupGetStringFieldW(ptr long ptr long ptr) -@ stub SetupGetTargetPathA -@ stub SetupGetTargetPathW +@ stdcall SetupGetTargetPathA(ptr ptr str ptr long ptr) +@ stdcall SetupGetTargetPathW(ptr ptr wstr ptr long ptr) @ stdcall SetupInitDefaultQueueCallback(long) @ stdcall SetupInitDefaultQueueCallbackEx(long long long long ptr) @ stdcall SetupInitializeFileLogA (str long) diff --git a/include/setupapi.h b/include/setupapi.h index 74faf64..d27cb9f 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -827,6 +827,9 @@ BOOL WINAPI SetupGetSourceInfoW( HIN BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, DWORD size, PDWORD required ); BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer, DWORD size, PDWORD required ); #define SetupGetStringField WINELIB_NAME_AW(SetupGetStringField) +BOOL WINAPI SetupGetTargetPathA( HINF hinf, PINFCONTEXT context, PCSTR section, PSTR buffer, DWORD buffer_size, PDWORD required_size ); +BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section, PWSTR buffer, DWORD buffer_size, PDWORD required_size ); +#define SetupGetTargetPath WINELIB_NAME_AW(SetupGetTargetPath) PVOID WINAPI SetupInitDefaultQueueCallback( HWND ); PVOID WINAPI SetupInitDefaultQueueCallbackEx( HWND, HWND, UINT, DWORD, PVOID ); BOOL WINAPI SetupInstallFilesFromInfSectionA( HINF, HINF, HSPFILEQ, PCSTR, PCSTR, UINT );

1 0

Detlef Riekenberg : localspl/tests: Add test for ConfigurePortW.
by Alexandre Julliard 17 Nov '06

17 Nov '06

Module: wine Branch: master Commit: 01ab25e4fe969e9cf1c462c6b1dbb9828b6af1d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ab25e4fe969e9cf1c462c6b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Nov 15 00:20:58 2006 +0100 localspl/tests: Add test for ConfigurePortW. --- dlls/localspl/tests/localmon.c | 47 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 766b553..e8e3b08 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -67,8 +67,51 @@ static WCHAR Monitors_LocalPortW[] = { \ 'P','r','i','n','t','\\', 'M','o','n','i','t','o','r','s','\\', 'L','o','c','a','l',' ','P','o','r','t',0}; + +static WCHAR portname_com1W[] = {'C','O','M','1',':',0}; +static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; +static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0}; + +/* ########################### */ -/* ##### */ +static void test_ConfigurePort(void) +{ + DWORD res; + + if (!pConfigurePort) return; + +#if 0 + /* NT4 crash on this test */ + res = pConfigurePort(NULL, 0, NULL); +#endif + + /* Testing-Results (localmon.dll from NT4.0): + - Case of Portname is ignored + - "COM1:" and "COM01:" are the same (Compared by value) + - Portname without ":" => Dialog "Nothing to configure" comes up; Success + - "LPT1:", "LPT0:" and "LPT:" are the same (Numbers in "LPT:" are ignored) + - Empty Servername (LPT1:) => Dialog comes up (Servername is ignored) + - "FILE:" => Dialog "Nothing to configure" comes up; Success + - Empty Portname => => Dialog "Nothing to configure" comes up; Success + - Port "does_not_exist" => Dialog "Nothing to configure" comes up; Success + */ + if (winetest_interactive > 0) { + + SetLastError(0xdeadbeef); + res = pConfigurePort(NULL, 0, portname_com1W); + trace("returned %d with %d\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = pConfigurePort(NULL, 0, portname_lpt1W); + trace("returned %d with %d\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = pConfigurePort(NULL, 0, portname_fileW); + trace("returned %d with %d\n", res, GetLastError()); + } +} + +/* ########################### */ static void test_EnumPorts(void) { @@ -241,5 +284,7 @@ START_TEST(localmon) GET_MONITOR_FUNC(XcvClosePort); } test_InitializePrintMonitor(); + + test_ConfigurePort(); test_EnumPorts(); }

1 0

Alexandre Julliard : user32: Renamed the user/ directory to user32.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: b8a2e3b8a44c6a518cd88757b7cac5977b021903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a2e3b8a44c6a518cd88757b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 14:49:25 2006 +0100 user32: Renamed the user/ directory to user32. --- Makefile.in | 8 ++++---- configure | 14 +++++++------- configure.ac | 6 +++--- dlls/.gitignore | 3 +-- dlls/Makefile.in | 19 +++++-------------- dlls/{user => user32}/Makefile.in | 0 dlls/{user => user32}/bidi16.c | 0 dlls/{user => user32}/button.c | 0 dlls/{user => user32}/caret.c | 0 dlls/{user => user32}/class.c | 0 dlls/{user => user32}/clipboard.c | 0 dlls/{user => user32}/combo.c | 0 dlls/{user => user32}/comm16.c | 0 dlls/{user => user32}/controls.h | 0 dlls/{user => user32}/cursoricon.c | 0 dlls/{user => user32}/dde_client.c | 0 dlls/{user => user32}/dde_misc.c | 0 dlls/{user => user32}/dde_private.h | 0 dlls/{user => user32}/dde_server.c | 0 dlls/{user => user32}/ddeml.spec | 0 dlls/{user => user32}/ddeml16.c | 0 dlls/{user => user32}/defdlg.c | 0 dlls/{user => user32}/defwnd.c | 0 dlls/{user => user32}/desktop.c | 0 dlls/{user => user32}/dialog.c | 0 dlls/{user => user32}/dialog16.c | 0 dlls/{user => user32}/display.c | 0 dlls/{user => user32}/display.drv.spec | 0 dlls/{user => user32}/driver.c | 0 dlls/{user => user32}/driver16.c | 0 dlls/{user => user32}/edit.c | 0 dlls/{user => user32}/exticon.c | 0 dlls/{user => user32}/focus.c | 0 dlls/{user => user32}/hook.c | 0 dlls/{user => user32}/hook16.c | 0 dlls/{user => user32}/icontitle.c | 0 dlls/{user => user32}/input.c | 0 dlls/{user => user32}/kbd16.c | 0 dlls/{user => user32}/keyboard.drv.spec | 0 dlls/{user => user32}/listbox.c | 0 dlls/{user => user32}/lstr.c | 0 dlls/{user => user32}/mdi.c | 0 dlls/{user => user32}/menu.c | 0 dlls/{user => user32}/message.c | 0 dlls/{user => user32}/misc.c | 0 dlls/{user => user32}/mouse.drv.spec | 0 dlls/{user => user32}/mouse16.c | 0 dlls/{user => user32}/msg16.c | 0 dlls/{user => user32}/msgbox.c | 0 dlls/{user => user32}/network.c | 0 dlls/{user => user32}/nonclient.c | 0 dlls/{user => user32}/painting.c | 0 dlls/{user => user32}/property.c | 0 dlls/{user => user32}/resource.c | 0 dlls/{user => user32}/resources/display.rc | 0 dlls/{user => user32}/resources/mouse.rc | 0 dlls/{user => user32}/resources/user32.rc | 0 dlls/{user => user32}/resources/user32_Bg.rc | 0 dlls/{user => user32}/resources/user32_Ca.rc | 0 dlls/{user => user32}/resources/user32_Cs.rc | 0 dlls/{user => user32}/resources/user32_Da.rc | 0 dlls/{user => user32}/resources/user32_De.rc | 0 dlls/{user => user32}/resources/user32_En.rc | 0 dlls/{user => user32}/resources/user32_Eo.rc | 0 dlls/{user => user32}/resources/user32_Es.rc | 0 dlls/{user => user32}/resources/user32_Fi.rc | 0 dlls/{user => user32}/resources/user32_Fr.rc | 0 dlls/{user => user32}/resources/user32_Hu.rc | 0 dlls/{user => user32}/resources/user32_It.rc | 0 dlls/{user => user32}/resources/user32_Ja.rc | 0 dlls/{user => user32}/resources/user32_Ko.rc | 0 dlls/{user => user32}/resources/user32_Nl.rc | 0 dlls/{user => user32}/resources/user32_No.rc | 0 dlls/{user => user32}/resources/user32_Pl.rc | 0 dlls/{user => user32}/resources/user32_Pt.rc | 0 dlls/{user => user32}/resources/user32_Ru.rc | 0 dlls/{user => user32}/resources/user32_Si.rc | 0 dlls/{user => user32}/resources/user32_Sk.rc | 0 dlls/{user => user32}/resources/user32_Sv.rc | 0 dlls/{user => user32}/resources/user32_Tr.rc | 0 dlls/{user => user32}/resources/user32_Uk.rc | 0 dlls/{user => user32}/resources/user32_Wa.rc | 0 dlls/{user => user32}/resources/user32_Zh.rc | 0 dlls/{user => user32}/resources/user32_bin.rc | 0 dlls/{user => user32}/resources/version.rc | 0 dlls/{user => user32}/resources/version16.rc | 0 dlls/{user => user32}/scroll.c | 0 dlls/{user => user32}/spy.c | 0 dlls/{user => user32}/static.c | 0 dlls/{user => user32}/sysparams.c | 0 dlls/{user => user32}/tests/Makefile.in | 0 dlls/{user => user32}/tests/class.c | 0 dlls/{user => user32}/tests/clipboard.c | 0 dlls/{user => user32}/tests/cursoricon.c | 0 dlls/{user => user32}/tests/dce.c | 0 dlls/{user => user32}/tests/dde.c | 0 dlls/{user => user32}/tests/dialog.c | 0 dlls/{user => user32}/tests/edit.c | 0 dlls/{user => user32}/tests/generated.c | 0 dlls/{user => user32}/tests/input.c | 0 dlls/{user => user32}/tests/listbox.c | 0 dlls/{user => user32}/tests/menu.c | 0 dlls/{user => user32}/tests/monitor.c | 0 dlls/{user => user32}/tests/msg.c | 0 dlls/{user => user32}/tests/resource.c | 0 dlls/{user => user32}/tests/resource.rc | 0 dlls/{user => user32}/tests/sysparams.c | 0 dlls/{user => user32}/tests/text.c | 0 dlls/{user => user32}/tests/win.c | 0 dlls/{user => user32}/tests/winstation.c | 0 dlls/{user => user32}/tests/wsprintf.c | 0 dlls/{user => user32}/text.c | 0 dlls/{user => user32}/uitools.c | 0 dlls/{user => user32}/user.exe.spec | 0 dlls/{user => user32}/user16.c | 0 dlls/{user => user32}/user32.spec | 0 dlls/{user => user32}/user_main.c | 0 dlls/{user => user32}/user_private.h | 0 dlls/{user => user32}/win.c | 0 dlls/{user => user32}/winhelp.c | 0 dlls/{user => user32}/winpos.c | 0 dlls/{user => user32}/winproc.c | 0 dlls/{user => user32}/winproc.h | 0 dlls/{user => user32}/winstation.c | 0 dlls/{user => user32}/wnd16.c | 0 dlls/{user => user32}/wsprintf.c | 0 programs/winetest/Makefile.in | 4 ++-- tools/winapi/tests.dat | 2 +- 128 files changed, 23 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8a2e3b8a44c6a518cd88…

1 0

Markus Amsler : d3d9: Forward port d3d8 refcount tests.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: b9807c2a3bd1ff6cbcb237623e3d65306f5d8711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9807c2a3bd1ff6cbcb237623… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Wed Nov 15 23:33:20 2006 +0100 d3d9: Forward port d3d8 refcount tests. --- dlls/d3d9/tests/device.c | 134 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 114 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9807c2a3bd1ff6cbcb23…

1 0

Markus Amsler : d3d8: Show that the implicit surfaces are not freed if refcount reaches 0.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: 07fad29c7dc2b48e6c0b419aea2c5390e6d77f8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07fad29c7dc2b48e6c0b419ae… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Wed Nov 15 23:32:57 2006 +0100 d3d8: Show that the implicit surfaces are not freed if refcount reaches 0. --- dlls/d3d8/tests/device.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 64d3ea8..e7e274c 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -265,6 +265,8 @@ static void test_refcount(void) IDirect3DSurface8 *pStencilSurface = NULL; IDirect3DSurface8 *pImageSurface = NULL; IDirect3DSurface8 *pRenderTarget = NULL; + IDirect3DSurface8 *pRenderTarget2 = NULL; + IDirect3DSurface8 *pRenderTarget3 = NULL; IDirect3DSurface8 *pTextureLevel = NULL; IDirect3DSurface8 *pBackBuffer = NULL; DWORD dStateBlock = -1; @@ -323,6 +325,7 @@ static void test_refcount(void) * - the container is the device * - they hold a refernce to the device * - they are created with a refcount of 0 (Get/Release returns orignial refcount) + * - they are not freed if refcount reaches 0. * - the refcount is not forwarded to the container. */ hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget); @@ -362,7 +365,6 @@ static void test_refcount(void) pBackBuffer = NULL; } CHECK_REFCOUNT( pDevice, --refcount); - pRenderTarget = NULL; hr = IDirect3DDevice8_GetDepthStencilSurface(pDevice, &pStencilSurface); todo_wine CHECK_CALL( hr, "GetDepthStencilSurface", pDevice, ++refcount); @@ -476,7 +478,7 @@ static void test_refcount(void) CHECK_CALL( hr, "CreateDepthStencilSurface", pDevice, ++refcount ); hr = IDirect3DDevice8_CreateImageSurface( pDevice, 32, 32, D3DFMT_X8R8G8B8, &pImageSurface ); CHECK_CALL( hr, "CreateImageSurface", pDevice, ++refcount ); - hr = IDirect3DDevice8_CreateRenderTarget( pDevice, 32, 32, D3DFMT_X8R8G8B8, D3DMULTISAMPLE_NONE, TRUE, &pRenderTarget ); + hr = IDirect3DDevice8_CreateRenderTarget( pDevice, 32, 32, D3DFMT_X8R8G8B8, D3DMULTISAMPLE_NONE, TRUE, &pRenderTarget3 ); CHECK_CALL( hr, "CreateRenderTarget", pDevice, ++refcount ); /* Misc */ hr = IDirect3DDevice8_CreateStateBlock( pDevice, D3DSBT_ALL, &dStateBlock ); @@ -520,6 +522,20 @@ static void test_refcount(void) ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Unlock failed with %08x\n", hr); } + /* The implicit render target is not freed if refcount reaches 0. + * Otherwise GetRenderTarget would re-allocate it and the pointer would change.*/ + hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget2); + todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); + if(pRenderTarget2) + { + todo_wine CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); + ok(pRenderTarget == pRenderTarget2, "RenderTarget=%p and RenderTarget2=%p should be the same.\n", + pRenderTarget, pRenderTarget2); + CHECK_REFCOUNT( pDevice, --refcount); + pRenderTarget2 = NULL; + } + pRenderTarget = NULL; + cleanup: CHECK_RELEASE(pDevice, pDevice, --refcount); @@ -536,7 +552,7 @@ cleanup: /* Surfaces */ CHECK_RELEASE(pStencilSurface, pDevice, --refcount); CHECK_RELEASE(pImageSurface, pDevice, --refcount); - CHECK_RELEASE(pRenderTarget, pDevice, --refcount); + CHECK_RELEASE(pRenderTarget3, pDevice, --refcount); /* Misc */ if (dStateBlock != -1) IDirect3DDevice8_DeleteStateBlock( pDevice, dStateBlock ); /* This will destroy device - cannot check the refcount here */

1 0

Andrew Talbot : shlwapi: Cast-qual warnings fix.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: b7b28e33f01675291efff41c52edc2cef41649d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b28e33f01675291efff41c5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Nov 15 22:02:48 2006 +0000 shlwapi: Cast-qual warnings fix. --- dlls/shlwapi/ordinal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index de867d6..7d5a613 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -370,7 +370,7 @@ HANDLE WINAPI SHMapHandle(HANDLE hShared */ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) { - static const WCHAR szProperty[] = { '{','D','0','F','C','A','4','2','0', + static WCHAR szProperty[] = { '{','D','0','F','C','A','4','2','0', '-','D','3','F','5','-','1','1','C','F', '-','B','2','1','1','-','0', '0','A','A','0','0','4','A','E','8','3','7','}','\0' }; IEnumFORMATETC* pIEnumFormatEtc = NULL; @@ -4283,7 +4283,7 @@ HRESULT WINAPI SHCoCreateInstanceAC(REFC */ BOOL WINAPI SHSkipJunction(IBindCtx *pbc, const CLSID *pclsid) { - static const WCHAR szSkipBinding[] = { 'S','k','i','p',' ', + static WCHAR szSkipBinding[] = { 'S','k','i','p',' ', 'B','i','n','d','i','n','g',' ','C','L','S','I','D','\0' }; BOOL bRet = FALSE;

1 0

Andrew Talbot : shlwapi: Cast-qual warnings fix.
by Alexandre Julliard 16 Nov '06

16 Nov '06

Module: wine Branch: master Commit: cb12dd6cd9b1893dbab00d098fcf08b3e3187ed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb12dd6cd9b1893dbab00d098… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Nov 15 22:01:51 2006 +0000 shlwapi: Cast-qual warnings fix. --- dlls/shlwapi/clist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c index 274dafa..a313074 100644 --- a/dlls/shlwapi/clist.c +++ b/dlls/shlwapi/clist.c @@ -49,9 +49,9 @@ HRESULT WINAPI SHAddDataBlock(LPSHLWAPI_ * * Internal helper: move a DataBlock pointer to the next item. */ -inline static LPSHLWAPI_CLIST NextItem(LPCSHLWAPI_CLIST lpList) +inline static LPSHLWAPI_CLIST NextItem(LPSHLWAPI_CLIST lpList) { - const char* address = (const char*)lpList; + char* address = (char*)lpList; address += lpList->ulSize; return (LPSHLWAPI_CLIST)address; }

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2006