November 2006 - Wine-commits

Alexandre Julliard : Revert "comctl32: Fix a potential regression in ImageList_ReplaceIcon()."
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 1e6786699d960293b73e8c217ed38542dd5a8f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6786699d960293b73e8c217… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 11:33:35 2006 +0100 Revert "comctl32: Fix a potential regression in ImageList_ReplaceIcon()." This reverts commit 9e772d1369f0292cfb79d8cabc017611fc6d0369. --- dlls/comctl32/imagelist.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 6b7793e..18a88c5 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2252,7 +2252,6 @@ ImageList_ReplaceIcon (HIMAGELIST himl, BITMAP bmp; BOOL ret; POINT pt; - INT i; TRACE("(%p %d %p)\n", himl, nIndex, hIcon); @@ -2315,17 +2314,14 @@ ImageList_ReplaceIcon (HIMAGELIST himl, SetBkColor (himl->hdcImage, RGB(255,255,255)); hbmOldSrc = SelectObject (hdcImage, ii.hbmColor); - for (i=0; i<(bmp.bmWidth/himl->cx); i++) { - - imagelist_point_from_index(himl, nIndex+i, &pt); - StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, himl->cx*i, bmp.bmHeight, SRCCOPY); + imagelist_point_from_index(himl, nIndex, &pt); + StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, + hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); - if (himl->hbmMask) { - SelectObject (hdcImage, ii.hbmMask); - StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, himl->cx*i, bmp.bmHeight, SRCCOPY); - } + if (himl->hbmMask) { + SelectObject (hdcImage, ii.hbmMask); + StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); } SelectObject (hdcImage, hbmOldSrc);

1 0

Andrew Talbot : shell32: Cast-qual warnings fix.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 2f4bb7b78d10d24707f83f6f5186eb8f38dd3425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4bb7b78d10d24707f83f6f5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Nov 14 22:13:36 2006 +0000 shell32: Cast-qual warnings fix. --- dlls/shell32/shellole.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 90900d1..8572191 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -122,7 +122,7 @@ HRESULT WINAPI SHCoCreateInstance( { DWORD hres; IID iid; - CLSID * myclsid = (CLSID*)clsid; + const CLSID * myclsid = clsid; WCHAR sKeyName[MAX_PATH]; const WCHAR sCLSID[7] = {'C','L','S','I','D','\\','\0'}; WCHAR sClassID[60];

1 0

Andrew Talbot : shell32: Cast-qual warnings fix.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: fdd9a4e2a73409d98c5b337f534ca64d87586293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd9a4e2a73409d98c5b337f5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Nov 14 22:13:17 2006 +0000 shell32: Cast-qual warnings fix. --- dlls/shell32/shellpath.c | 2 +- dlls/shell32/undocshell.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2a2cc38..bc64129 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -550,7 +550,7 @@ BOOL WINAPI PathYetAnotherMakeUniqueName /************************************************************************* * PathFindOnPath [SHELL32.145] */ -BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs) +BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs) { if (SHELL_OsIsUnicode()) return PathFindOnPathW(sFile, (LPCWSTR *)sOtherDirs); diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 3121a1b..5bba7da 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -455,7 +455,7 @@ int WINAPI PathParseIconLocationAW(LPVOI BOOL WINAPI PathIsSameRootAW(LPCVOID lpszPath1, LPCVOID lpszPath2); -BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs); +BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); /**************************************************************************** * Shell Namespace Routines

1 0

Byeong-Sik Jeon : user32: Update the edit control when the IME composition string is emptied.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 8a4fe8e6e4bd5d2e9970ef75f39f8ac4f368c1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4fe8e6e4bd5d2e9970ef75f… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Wed Nov 15 15:52:31 2006 +0900 user32: Update the edit control when the IME composition string is emptied. --- dlls/user/edit.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user/edit.c b/dlls/user/edit.c index 5b38b68..76f3e04 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -5335,7 +5335,7 @@ static void EDIT_GetCompositionStr(HWND dwBufLen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); - if (dwBufLen <= 0) + if (dwBufLen < 0) { ImmReleaseContext(hwnd, hIMC); return; @@ -5349,7 +5349,8 @@ static void EDIT_GetCompositionStr(HWND return; } - ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); + if (dwBufLen) + ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; if (CompFlag & GCS_COMPATTR)

1 0

Alexandre Julliard : kernel32/tests: Reserve some more memory for the environment.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 6fa6cc7e835b3e7f9976b92e9cf8356b1f19b032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa6cc7e835b3e7f9976b92e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 11:31:41 2006 +0100 kernel32/tests: Reserve some more memory for the environment. --- dlls/kernel32/tests/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8b11e74..89657cc 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -47,7 +47,7 @@ #define MAX_LISTED_ENV_VAR 128 /* ---------------- portable memory allocation thingie */ -static char memory[1024*32]; +static char memory[1024*256]; static char* memory_index = memory; static char* grab_memory(size_t len)

1 0

Rob Shearman : rpcrt4: Use SecInvalidateHandle and SecIsValidHandle for handling RpcConnection:: ctx instead of setting/comparing the field to 0.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 8bb10f1082d2ed53243750d1890085c60d559e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb10f1082d2ed53243750d18… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 15 01:01:21 2006 +0000 rpcrt4: Use SecInvalidateHandle and SecIsValidHandle for handling RpcConnection::ctx instead of setting/comparing the field to 0. --- dlls/rpcrt4/rpc_message.c | 5 ++--- dlls/rpcrt4/rpc_transport.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index abc3d2f..5fb34b0 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -485,8 +485,7 @@ static void RPCRT4_AuthNegotiate(RpcConn out_desc.pBuffers = out; conn->attr = 0; - conn->ctx.dwLower = 0; - conn->ctx.dwUpper = 0; + SecInvalidateHandle(&conn->ctx); r = InitializeSecurityContextA(&conn->AuthInfo->cred, NULL, NULL, context_req, 0, SECURITY_NETWORK_DREP, @@ -567,7 +566,7 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Co if (!Connection->AuthInfo || Connection->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_DEFAULT || Connection->AuthInfo->AuthnLevel == RPC_C_AUTHN_LEVEL_NONE || - (Connection->ctx.dwUpper || Connection->ctx.dwLower)) + SecIsValidHandle(&Connection->ctx)) { return RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, NULL, 0); } diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8dc78af..4382a8b 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1309,7 +1309,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcCo memset(&NewConnection->ActiveInterface, 0, sizeof(NewConnection->ActiveInterface)); NewConnection->NextCallId = 1; - memset(&NewConnection->ctx, 0, sizeof(NewConnection->ctx)); + SecInvalidateHandle(&NewConnection->ctx); if (AuthInfo) RpcAuthInfo_AddRef(AuthInfo); NewConnection->AuthInfo = AuthInfo; list_init(&NewConnection->conn_pool_entry);

1 0

Rob Shearman : rpcrt4: Fix a crash in RPCRT4_OpenBinding that can occur if
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 8e178b2d4f250f248965d9054c28725111cd337b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e178b2d4f250f248965d9054… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 15 01:00:01 2006 +0000 rpcrt4: Fix a crash in RPCRT4_OpenBinding that can occur if RPCRT4_CreateConnection fails by checking the return value from the function and returning in this case. --- dlls/rpcrt4/rpc_binding.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 21d78c5..c8368ff 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -255,9 +255,13 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding } /* create a new connection */ - RPCRT4_CreateConnection(&NewConnection, Binding->server, Binding->Protseq, - Binding->NetworkAddr, Binding->Endpoint, NULL, - Binding->AuthInfo, Binding); + status = RPCRT4_CreateConnection(&NewConnection, Binding->server, + Binding->Protseq, Binding->NetworkAddr, + Binding->Endpoint, NULL, Binding->AuthInfo, + Binding); + if (status != RPC_S_OK) + return status; + status = RPCRT4_OpenClientConnection(NewConnection); if (status != RPC_S_OK) {

1 0

Rob Shearman : rpcrt4: Add support for signing, verifying, encrypting and decrypting RPC packets.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 51dd6f9fb801d81ab82f6a757a46dbcb3ab81f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51dd6f9fb801d81ab82f6a757… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 15 01:00:36 2006 +0000 rpcrt4: Add support for signing, verifying, encrypting and decrypting RPC packets. --- dlls/rpcrt4/rpc_message.c | 178 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 157 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51dd6f9fb801d81ab82f6…

1 0

Rob Shearman : rpcrt4: Add a FIXME for unsupported client protocol sequences.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 079b6b074c0b5472035062873cb628cf11f21d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079b6b074c0b5472035062873… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 15 01:00:06 2006 +0000 rpcrt4: Add a FIXME for unsupported client protocol sequences. --- dlls/rpcrt4/rpc_transport.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 9d84839..8dc78af 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1293,7 +1293,10 @@ RPC_STATUS RPCRT4_CreateConnection(RpcCo ops = rpcrt4_get_conn_protseq_ops(Protseq); if (!ops) + { + FIXME("not supported for protseq %s\n", Protseq); return RPC_S_PROTSEQ_NOT_SUPPORTED; + } NewConnection = ops->alloc(); NewConnection->Next = NULL;

1 0

Markus Amsler : d3d8: Test refcount forwarding.
by Alexandre Julliard 15 Nov '06

15 Nov '06

Module: wine Branch: master Commit: 577d5d25803411ec87d1dfd7ec9edc83b791cce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=577d5d25803411ec87d1dfd7e… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Wed Nov 15 00:53:40 2006 +0100 d3d8: Test refcount forwarding. --- dlls/d3d8/tests/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9be3381..381eedc 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -60,6 +60,13 @@ #define CHECK_RELEASE_REFCOUNT(obj,rc) \ ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ } +#define CHECK_ADDREF_REFCOUNT(obj,rc) \ + { \ + int rc_new = rc; \ + int count = IUnknown_AddRef( (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; \ @@ -254,6 +261,7 @@ static void test_refcount(void) IDirect3DCubeTexture8 *pCubeTexture = NULL; IDirect3DTexture8 *pTexture = NULL; IDirect3DVolumeTexture8 *pVolumeTexture = NULL; + IDirect3DVolume8 *pVolumeLevel = NULL; IDirect3DSurface8 *pStencilSurface = NULL; IDirect3DSurface8 *pImageSurface = NULL; IDirect3DSurface8 *pRenderTarget = NULL; @@ -315,6 +323,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) + * - the refcount is not forwarded to the container. */ hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget); todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); @@ -322,6 +331,12 @@ static void test_refcount(void) { todo_wine CHECK_SURFACE_CONTAINER( pRenderTarget, IID_IDirect3DDevice8, pDevice); todo_wine CHECK_REFCOUNT( pRenderTarget, 1); + + todo_wine CHECK_ADDREF_REFCOUNT(pRenderTarget, 2); + todo_wine CHECK_REFCOUNT(pDevice, refcount); + todo_wine CHECK_RELEASE_REFCOUNT(pRenderTarget, 1); + todo_wine CHECK_REFCOUNT(pDevice, refcount); + hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget); todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, refcount); todo_wine CHECK_REFCOUNT( pRenderTarget, 2); @@ -349,6 +364,12 @@ static void test_refcount(void) { CHECK_SURFACE_CONTAINER( pStencilSurface, IID_IDirect3DDevice8, pDevice); todo_wine CHECK_REFCOUNT( pStencilSurface, 1); + + todo_wine CHECK_ADDREF_REFCOUNT(pStencilSurface, 2); + todo_wine CHECK_REFCOUNT(pDevice, refcount); + todo_wine CHECK_RELEASE_REFCOUNT(pStencilSurface, 1); + todo_wine CHECK_REFCOUNT(pDevice, refcount); + todo_wine CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); pStencilSurface = NULL; } @@ -400,12 +421,44 @@ static void test_refcount(void) hr = IDirect3DTexture8_GetSurfaceLevel( pTexture, 1, &pTextureLevel ); CHECK_CALL( hr, "GetSurfaceLevel", pDevice, refcount ); /* But should increment texture's refcount */ - CHECK_CALL( hr, "GetSurfaceLevel", pTexture, tmp+1 ); + CHECK_REFCOUNT( pTexture, tmp+1 ); + /* Because the texture and surface refcount are identical */ + if (pTextureLevel) + { + CHECK_REFCOUNT ( pTextureLevel, tmp+1 ); + CHECK_ADDREF_REFCOUNT ( pTextureLevel, tmp+2 ); + CHECK_REFCOUNT ( pTexture , tmp+2 ); + CHECK_RELEASE_REFCOUNT( pTextureLevel, tmp+1 ); + CHECK_REFCOUNT ( pTexture , tmp+1 ); + CHECK_RELEASE_REFCOUNT( pTexture , tmp ); + CHECK_REFCOUNT ( pTextureLevel, tmp ); + } } hr = IDirect3DDevice8_CreateCubeTexture( pDevice, 32, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pCubeTexture ); CHECK_CALL( hr, "CreateCubeTexture", pDevice, ++refcount ); hr = IDirect3DDevice8_CreateVolumeTexture( pDevice, 32, 32, 2, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pVolumeTexture ); CHECK_CALL( hr, "CreateVolumeTexture", pDevice, ++refcount ); + if (pVolumeTexture) + { + tmp = get_refcount( (IUnknown *)pVolumeTexture ); + + /* This should not increment device refcount */ + hr = IDirect3DVolumeTexture8_GetVolumeLevel(pVolumeTexture, 0, &pVolumeLevel); + CHECK_CALL( hr, "GetVolumeLevel", pDevice, refcount ); + /* But should increment volume texture's refcount */ + CHECK_REFCOUNT( pVolumeTexture, tmp+1 ); + /* Because the volume texture and volume refcount are identical */ + if (pVolumeLevel) + { + CHECK_REFCOUNT ( pVolumeLevel , tmp+1 ); + CHECK_ADDREF_REFCOUNT ( pVolumeLevel , tmp+2 ); + CHECK_REFCOUNT ( pVolumeTexture, tmp+2 ); + CHECK_RELEASE_REFCOUNT( pVolumeLevel , tmp+1 ); + CHECK_REFCOUNT ( pVolumeTexture, tmp+1 ); + CHECK_RELEASE_REFCOUNT( pVolumeTexture, tmp ); + CHECK_REFCOUNT ( pVolumeLevel , tmp ); + } + } /* Surfaces */ hr = IDirect3DDevice8_CreateDepthStencilSurface( pDevice, 32, 32, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, &pStencilSurface ); CHECK_CALL( hr, "CreateDepthStencilSurface", pDevice, ++refcount ); @@ -459,9 +512,7 @@ cleanup: if (dVertexShader != -1) IDirect3DDevice8_DeleteVertexShader( pDevice, dVertexShader ); if (dPixelShader != -1) IDirect3DDevice8_DeletePixelShader( pDevice, dPixelShader ); /* Textures */ - /* pTextureLevel is holding a reference to the pTexture */ - CHECK_RELEASE(pTexture, pDevice, refcount); - CHECK_RELEASE(pTextureLevel, pDevice, --refcount); + CHECK_RELEASE(pTexture, pDevice, --refcount); CHECK_RELEASE(pCubeTexture, pDevice, --refcount); CHECK_RELEASE(pVolumeTexture, pDevice, --refcount); /* Surfaces */

1 0