November 2006 - Wine-Commits

Dmitry Timoshkov : shlwapi: Unify SHDeleteKeyW implementation with SHDeleteKeyA.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 50a18ca57e595801e0ccfa6be0a5494bfc0f0623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a18ca57e595801e0ccfa6be… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Nov 10 18:57:27 2006 +0800 shlwapi: Unify SHDeleteKeyW implementation with SHDeleteKeyA. --- dlls/oleaut32/tests/typelib.c | 2 -- dlls/shlwapi/reg.c | 17 +++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 44b53d6..baeb370 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -503,9 +503,7 @@ static BOOL do_typelib_reg_key(GUID *uid if (remove) { -todo_wine { ok(SHDeleteKeyW(HKEY_CLASSES_ROOT, buf) == ERROR_SUCCESS, "SHDeleteKey failed\n"); -} return TRUE; } diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 331f84a..3cec25c 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1553,7 +1553,7 @@ DWORD WINAPI SHDeleteKeyA(HKEY hKey, LPC */ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPCWSTR lpszSubKey) { - DWORD dwRet, dwKeyCount = 0, dwMaxSubkeyLen = 0, dwSize, i; + DWORD dwRet, dwMaxSubkeyLen = 0, dwSize; WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; HKEY hSubKey = 0; @@ -1562,8 +1562,8 @@ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPC dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); if(!dwRet) { - /* Find how many subkeys there are */ - dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwKeyCount, + /* Find the maximum subkey length so that we can allocate a buffer */ + dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL); if(!dwRet) { @@ -1576,15 +1576,16 @@ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPC dwRet = ERROR_NOT_ENOUGH_MEMORY; else { - /* Recursively delete all the subkeys */ - for(i = 0; i < dwKeyCount && !dwRet; i++) + while (dwRet == ERROR_SUCCESS) { dwSize = dwMaxSubkeyLen; - dwRet = RegEnumKeyExW(hSubKey, i, lpszName, &dwSize, NULL, NULL, NULL, NULL); - if(!dwRet) + dwRet = RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, NULL, NULL, NULL); + if (dwRet == ERROR_SUCCESS || dwRet == ERROR_MORE_DATA) dwRet = SHDeleteKeyW(hSubKey, lpszName); } - + if (dwRet == ERROR_NO_MORE_ITEMS) + dwRet = ERROR_SUCCESS; + if (lpszName != szNameBuf) HeapFree(GetProcessHeap(), 0, lpszName); /* Free buffer if allocated */ }

1 0

Alexandre Julliard : opengl32: Hack to make sure winex11 is loaded before getting function pointers.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 879da0436aa1f235f9bc5eb84efa765578e33db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=879da0436aa1f235f9bc5eb84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 12:37:04 2006 +0100 opengl32: Hack to make sure winex11 is loaded before getting function pointers. --- dlls/opengl32/wgl.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 419f6c8..bc5014a 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -621,19 +621,22 @@ #endif creating a rendering context.... */ static BOOL process_attach(void) { - HMODULE mod = GetModuleHandleA( "winex11.drv" ); - HMODULE mod_gdi32 = GetModuleHandleA( "gdi32.dll" ); + HMODULE mod_x11, mod_gdi32; DWORD size = sizeof(internal_gl_disabled_extensions); HKEY hkey = 0; - if (!mod || !mod_gdi32) + GetDesktopWindow(); /* make sure winex11 is loaded (FIXME) */ + mod_x11 = GetModuleHandleA( "winex11.drv" ); + mod_gdi32 = GetModuleHandleA( "gdi32.dll" ); + + if (!mod_x11 || !mod_gdi32) { ERR("X11DRV or GDI32 not loaded. Cannot create default context.\n"); return FALSE; } - wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" ); - wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_unlock" ); + wine_tsx11_lock_ptr = (void *)GetProcAddress( mod_x11, "wine_tsx11_lock" ); + wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod_x11, "wine_tsx11_unlock" ); wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress");

1 0

Alexandre Julliard : advapi32: Fixed last error check in RegSaveKey.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 3d73173fe1cfe2ac72515691226ec8de5c6275bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d73173fe1cfe2ac725156912… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 12:22:44 2006 +0100 advapi32: Fixed last error check in RegSaveKey. --- dlls/advapi32/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 69717d8..20f6a7c 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1980,7 +1980,7 @@ LONG WINAPI RegSaveKeyW( HKEY hkey, LPCW handle = CreateFileW( buffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); if (handle != INVALID_HANDLE_VALUE) break; - if ((ret = GetLastError()) != ERROR_ALREADY_EXISTS) goto done; + if ((ret = GetLastError()) != ERROR_FILE_EXISTS) goto done; /* Something gone haywire ? Please report if this happens abnormally */ if (count >= 100)

1 0

Andrew Talbot : quartz: Cast-qual warning fix.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 35c0886939d26368004131d5e96fab201f6b301f URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c0886939d26368004131d5e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Nov 9 22:09:44 2006 +0000 quartz: Cast-qual warning fix. --- dlls/quartz/filtergraph.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 33bb6c7..ab31cd4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -141,7 +141,7 @@ static int EventsQueue_GetEvent(EventsQu #define MAX_ITF_CACHE_ENTRIES 3 typedef struct _ITF_CACHE_ENTRY { - IID* riid; + const IID* riid; IBaseFilter* filter; IUnknown* iface; } ITF_CACHE_ENTRY; @@ -1766,7 +1766,7 @@ static HRESULT GetTargetInterface(IFilte hr = IBaseFilter_QueryInterface(pGraph->ppFiltersInGraph[i], riid, ppvObj); if (hr == S_OK) { - pGraph->ItfCacheEntries[entry].riid = (IID*)riid; + pGraph->ItfCacheEntries[entry].riid = riid; pGraph->ItfCacheEntries[entry].filter = pGraph->ppFiltersInGraph[i]; pGraph->ItfCacheEntries[entry].iface = (IUnknown*)*ppvObj; if (entry >= pGraph->nItfCacheEntries)

1 0

Alexandre Julliard : server: Properly handle kill_thread recursion when killing a process.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 110a6fe5b65fd1b333f16d4878b9a6b2ad084557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=110a6fe5b65fd1b333f16d487… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 12:18:54 2006 +0100 server: Properly handle kill_thread recursion when killing a process. Spotted by Mike McCormack. --- server/process.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/server/process.c b/server/process.c index cc4fd6f..b66e492 100644 --- a/server/process.c +++ b/server/process.c @@ -515,15 +515,25 @@ static void process_unload_dll( struct p /* terminate a process with the given exit code */ static void terminate_process( struct process *process, struct thread *skip, int exit_code ) { - struct list *ptr, *next; + struct list *ptr; + + if (skip) /* move it to the end of the list */ + { + assert( skip->state != TERMINATED ); + list_remove( &skip->proc_entry ); + list_add_tail( &process->thread_list, &skip->proc_entry ); + } - LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) + grab_object( process ); /* make sure it doesn't get freed when threads die */ + while ((ptr = list_head( &process->thread_list ))) { struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); if (exit_code) thread->exit_code = exit_code; - if (thread != skip) kill_thread( thread, 1 ); + if (thread == skip) break; + kill_thread( thread, 1 ); } + release_object( process ); } /* kill all processes */ @@ -657,13 +667,15 @@ void kill_process( struct process *proce if (violent_death) terminate_process( process, NULL, 1 ); else { - struct list *ptr, *next; + struct list *ptr; - LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) + grab_object( process ); /* make sure it doesn't get freed when threads die */ + while ((ptr = list_head( &process->thread_list ))) { struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); kill_thread( thread, 0 ); } + release_object( process ); } }

1 0

Markus Amsler : d3d8: Add GetContainer tests for implicit surfaces.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 100038dfb1e4632a72940c212bfa4228a3e200e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=100038dfb1e4632a72940c212… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Nov 10 10:23:03 2006 +0100 d3d8: Add GetContainer tests for implicit surfaces. --- dlls/d3d8/tests/device.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f9d1a21..748aa02 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -37,6 +37,7 @@ #define CHECK_CALL(r,c,d,rc) \ } else {\ trace("%s failed: %s\n", c, DXGetErrorString8(r)); \ } + #define CHECK_RELEASE(obj,d,rc) \ if (obj) { \ int tmp1, rc_new = rc; \ @@ -44,6 +45,7 @@ #define CHECK_RELEASE(obj,d,rc) \ tmp1 = get_refcount( (IUnknown *)d ); \ ok(tmp1 == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, tmp1); \ } + #define CHECK_REFCOUNT(obj,rc) \ { \ int rc_new = rc; \ @@ -58,6 +60,15 @@ #define CHECK_RELEASE_REFCOUNT(obj,rc) \ ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ } +#define CHECK_SURFACE_CONTAINER(obj,iid,expected) \ + { \ + void *container_ptr = (void *)0x1337c0d3; \ + hr = IDirect3DSurface8_GetContainer(obj, &iid, &container_ptr); \ + ok(SUCCEEDED(hr) && container_ptr == expected, "GetContainer returned: hr %#x, container_ptr %p. " \ + "Expected hr %#x, container_ptr %p\n", hr, container_ptr, S_OK, expected); \ + if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr); \ + } + static void check_mipmap_levels( IDirect3DDevice8* device, int width, int height, int count) @@ -301,6 +312,7 @@ static void test_refcount(void) /** * Check refcount of implicit surfaces. Findings: + * - 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) */ @@ -308,6 +320,7 @@ static void test_refcount(void) todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); if(pRenderTarget) { + todo_wine CHECK_SURFACE_CONTAINER( pRenderTarget, IID_IDirect3DDevice8, pDevice); todo_wine CHECK_REFCOUNT( pRenderTarget, 1); hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget); todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, refcount); @@ -322,6 +335,7 @@ static void test_refcount(void) todo_wine CHECK_CALL( hr, "GetDepthStencilSurface", pDevice, ++refcount); if(pStencilSurface) { + CHECK_SURFACE_CONTAINER( pStencilSurface, IID_IDirect3DDevice8, pDevice); todo_wine CHECK_REFCOUNT( pStencilSurface, 1); todo_wine CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); pStencilSurface = NULL; @@ -332,6 +346,7 @@ static void test_refcount(void) todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); if(pBackBuffer) { + todo_wine CHECK_SURFACE_CONTAINER( pBackBuffer, IID_IDirect3DDevice8, pDevice); todo_wine CHECK_REFCOUNT( pBackBuffer, 1); todo_wine CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); pBackBuffer = NULL; @@ -410,6 +425,7 @@ static void test_refcount(void) todo_wine CHECK_REFCOUNT( pSwapChain, 1); if(pBackBuffer) { + todo_wine CHECK_SURFACE_CONTAINER( pBackBuffer, IID_IDirect3DDevice8, pDevice); todo_wine CHECK_REFCOUNT( pBackBuffer, 1); todo_wine CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); pBackBuffer = NULL;

1 0

Markus Amsler : d3d9: Forwardport implicit surface tests.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 2c40b823e1d21682120989e8576d9e6777f72213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c40b823e1d21682120989e85… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Nov 10 10:23:17 2006 +0100 d3d9: Forwardport implicit surface tests. --- dlls/d3d9/tests/device.c | 101 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2ed0926..22ef7e2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -38,6 +38,7 @@ #define CHECK_CALL(r,c,d,rc) \ } else {\ trace("%s failed: %s\n", c, DXGetErrorString9(r)); \ } + #define CHECK_RELEASE(obj,d,rc) \ if (obj) { \ int tmp1, rc_new = rc; \ @@ -46,6 +47,29 @@ #define CHECK_RELEASE(obj,d,rc) \ ok(tmp1 == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, tmp1); \ } +#define CHECK_REFCOUNT(obj,rc) \ + { \ + int rc_new = rc; \ + int count = get_refcount( (IUnknown *)obj ); \ + ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ + } + +#define CHECK_RELEASE_REFCOUNT(obj,rc) \ + { \ + int rc_new = rc; \ + int count = IUnknown_Release( (IUnknown *)obj ); \ + ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ + } + +#define CHECK_SURFACE_CONTAINER(obj,iid,expected) \ + { \ + void *container_ptr = (void *)0x1337c0d3; \ + hr = IDirect3DSurface9_GetContainer(obj, &iid, &container_ptr); \ + ok(SUCCEEDED(hr) && container_ptr == expected, "GetContainer returned: hr %#x, container_ptr %p. " \ + "Expected hr %#x, container_ptr %p\n", hr, container_ptr, S_OK, expected); \ + if (container_ptr && container_ptr != (void *)0x1337c0d3) IUnknown_Release((IUnknown *)container_ptr); \ + } + static void check_mipmap_levels( IDirect3DDevice9* device, int width, int height, int count) @@ -264,6 +288,7 @@ static void test_refcount(void) IDirect3DSurface9 *pOffscreenSurface = NULL; IDirect3DSurface9 *pRenderTarget = NULL; IDirect3DSurface9 *pTextureLevel = NULL; + IDirect3DSurface9 *pBackBuffer = NULL; IDirect3DStateBlock9 *pStateBlock = NULL; IDirect3DStateBlock9 *pStateBlock1 = NULL; IDirect3DSwapChain9 *pSwapChain = NULL; @@ -303,6 +328,8 @@ static void test_refcount(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); @@ -312,6 +339,60 @@ static void test_refcount(void) refcount = get_refcount( (IUnknown *)pDevice ); ok(refcount == 1, "Invalid device RefCount %d\n", refcount); + /** + * Check refcount of implicit surfaces. Findings: + * - the container is the device OR swapchain + * - they hold a refernce to the device + * - they are created with a refcount of 0 (Get/Release returns orignial refcount) + */ + hr = IDirect3DDevice9_GetSwapChain(pDevice, 0, &pSwapChain); + todo_wine CHECK_CALL( hr, "GetSwapChain", pDevice, ++refcount); + if (pSwapChain) + { + todo_wine CHECK_REFCOUNT( pSwapChain, 1); + + hr = IDirect3DDevice9_GetRenderTarget(pDevice, 0, &pRenderTarget); + todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); + if(pRenderTarget) + { + CHECK_SURFACE_CONTAINER( pRenderTarget, IID_IDirect3DSwapChain9, pSwapChain); + todo_wine CHECK_REFCOUNT( pRenderTarget, 1); + hr = IDirect3DDevice9_GetRenderTarget(pDevice, 0, &pRenderTarget); + todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, refcount); + todo_wine CHECK_REFCOUNT( pRenderTarget, 2); + todo_wine CHECK_RELEASE_REFCOUNT( pRenderTarget, 1); + todo_wine CHECK_RELEASE_REFCOUNT( pRenderTarget, 0); + pRenderTarget = NULL; + } + todo_wine CHECK_REFCOUNT( pDevice, --refcount); + + hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &pStencilSurface); + todo_wine CHECK_CALL( hr, "GetDepthStencilSurface", pDevice, ++refcount); + if(pStencilSurface) + { + CHECK_SURFACE_CONTAINER( pStencilSurface, IID_IDirect3DDevice9, pDevice); + todo_wine CHECK_REFCOUNT( pStencilSurface, 1); + todo_wine CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); + pStencilSurface = NULL; + } + todo_wine CHECK_REFCOUNT( pDevice, --refcount); + + hr = IDirect3DDevice9_GetBackBuffer(pDevice, 0, 0, 0, &pBackBuffer); + todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); + if(pBackBuffer) + { + CHECK_SURFACE_CONTAINER( pBackBuffer, IID_IDirect3DSwapChain9, pSwapChain); + todo_wine CHECK_REFCOUNT( pBackBuffer, 1); + todo_wine CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); + pBackBuffer = NULL; + } + todo_wine CHECK_REFCOUNT( pDevice, --refcount); + + todo_wine CHECK_RELEASE_REFCOUNT( pSwapChain, 0); + CHECK_REFCOUNT( pDevice, --refcount); + pSwapChain = NULL; + } + /* Buffers */ hr = IDirect3DDevice9_CreateIndexBuffer( pDevice, 16, 0, D3DFMT_INDEX32, D3DPOOL_DEFAULT, &pIndexBuffer, NULL ); CHECK_CALL( hr, "CreateIndexBuffer", pDevice, ++refcount ); @@ -378,6 +459,22 @@ static void test_refcount(void) CHECK_CALL( hr, "CreateStateBlock", pDevice, ++refcount ); hr = IDirect3DDevice9_CreateAdditionalSwapChain( pDevice, &d3dpp, &pSwapChain ); CHECK_CALL( hr, "CreateAdditionalSwapChain", pDevice, ++refcount ); + if(pSwapChain) + { + /* check implicit back buffer */ + hr = IDirect3DSwapChain9_GetBackBuffer(pSwapChain, 0, 0, &pBackBuffer); + todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); + todo_wine CHECK_REFCOUNT( pSwapChain, 1); + if(pBackBuffer) + { + CHECK_SURFACE_CONTAINER( pBackBuffer, IID_IDirect3DSwapChain9, pSwapChain); + todo_wine CHECK_REFCOUNT( pBackBuffer, 1); + todo_wine CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); + pBackBuffer = NULL; + } + CHECK_REFCOUNT( pSwapChain, 1); + CHECK_REFCOUNT( pDevice, --refcount); + } hr = IDirect3DDevice9_CreateQuery( pDevice, D3DQUERYTYPE_EVENT, &pQuery ); CHECK_CALL( hr, "CreateQuery", pDevice, ++refcount ); @@ -411,9 +508,9 @@ cleanup: CHECK_RELEASE(pSwapChain, pDevice, --refcount); CHECK_RELEASE(pQuery, pDevice, --refcount); /* This will destroy device - cannot check the refcount here */ - if (pStateBlock1) IUnknown_Release( pStateBlock1 ); + if (pStateBlock1) CHECK_RELEASE_REFCOUNT( pStateBlock1, 0); - if (pD3d) IUnknown_Release( pD3d ); + if (pD3d) CHECK_RELEASE_REFCOUNT( pD3d, 0); DestroyWindow( hwnd ); }

1 0

Mike McCormack : riched20: Remember to close windows after tests.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: 6ea5a664dd8111923aaa01d4d6c7d05449a1949f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea5a664dd8111923aaa01d4d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:41:53 2006 +0900 riched20: Remember to close windows after tests. --- dlls/riched20/tests/editor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 98aa32c..17ccfcc 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -570,6 +570,7 @@ static void test_WM_GETTEXT(void) result = strcmp(buffer,text); ok(result == 0, "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); + DestroyWindow(hwndRichEdit); } /* FIXME: need to test unimplemented options and robustly test wparam */ @@ -897,6 +898,7 @@ static void test_ES_PASSWORD() result = SendMessage(hwndRichEdit, EM_GETPASSWORDCHAR, 0, 0); ok (result == 1234, "EM_GETPASSWORDCHAR returned %c (%d) when set to 'x', instead of x (120)\n",result,result); + DestroyWindow(hwndRichEdit); } static void test_EM_SETTEXTEX() @@ -1311,7 +1313,6 @@ static void test_EM_GETMODIFY(void) "EM_GETMODIFY returned zero, instead of non-zero for EM_STREAM\n"); } - DestroyWindow(hwndRichEdit); }

1 0

Mike McCormack : riched20: Fix a memory leak.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: bb1f8edcc22480d825c6c8a4614e5e379f00386b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb1f8edcc22480d825c6c8a46… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:41:38 2006 +0900 riched20: Fix a memory leak. --- dlls/riched20/editor.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d8fa7ae..07aa4e0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2201,20 +2201,26 @@ LRESULT WINAPI RichEditANSIWndProc(HWND FINDTEXTA *ft = (FINDTEXTA *)lParam; int nChars = MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, NULL, 0); WCHAR *tmp; - + LRESULT r; + if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); - return ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); + r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); + FREE_OBJ( tmp ); + return r; } case EM_FINDTEXTEX: { FINDTEXTEXA *ex = (FINDTEXTEXA *)lParam; int nChars = MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, NULL, 0); WCHAR *tmp; - + LRESULT r; + if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); - return ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); + r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); + FREE_OBJ( tmp ); + return r; } case EM_FINDTEXTW: {

1 0

Mike McCormack : riched20: Flush the clipboard before exiting the test.
by Alexandre Julliard Nov. 10, 2006

Nov. 10, 2006

Module: wine Branch: master Commit: c6118c34b238ec7d90453fcce42108ad2456f224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6118c34b238ec7d90453fcce… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:42:39 2006 +0900 riched20: Flush the clipboard before exiting the test. --- dlls/riched20/tests/Makefile.in | 2 +- dlls/riched20/tests/editor.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in index a744940..387e868 100644 --- a/dlls/riched20/tests/Makefile.in +++ b/dlls/riched20/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = riched20.dll -IMPORTS = riched20 user32 gdi32 kernel32 +IMPORTS = riched20 ole32 user32 gdi32 kernel32 CTESTS = \ editor.c diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bd0b51d..1625481 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1411,5 +1411,6 @@ START_TEST( editor ) } } + OleFlushClipboard(); ok(FreeLibrary(hmoduleRichEdit) != 0, "error: %d\n", (int) GetLastError()); }

1 0