November 2006 - Wine-commits

Alexandre Julliard : rpcrt4/tests: Replace || by |.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: c0f9d369dc578bd1d5cfefad2852c5690668a8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f9d369dc578bd1d5cfefad2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 18:20:49 2006 +0100 rpcrt4/tests: Replace || by |. --- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index e441698..58428c2 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -660,7 +660,7 @@ static void test_simple_struct(void) s1.c = 0xa5; s1.l1 = 0xdeadbeef; s1.l2 = 0xcafebabe; - s1.ll = ((LONGLONG) 0xbadefeed << 32) || 0x2468ace0; + s1.ll = ((LONGLONG) 0xbadefeed << 32) | 0x2468ace0; wiredatalen = 24; memcpy(wiredata, &s1, wiredatalen);

1 0

Marcus Meissner : dmscript: Replaced && 0xff by & 0xff.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 7c0de330f93c52c30ee8a88dd41f0d0ee54875f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0de330f93c52c30ee8a88dd… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 9 15:42:46 2006 +0100 dmscript: Replaced && 0xff by & 0xff. --- dlls/dmscript/dmscript_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 1ccaebf..67f2b10 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -647,8 +647,8 @@ const char *debugstr_fourcc (DWORD fourc const char *debugstr_dmversion (LPDMUS_VERSION version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS && 0xFFFF0000) >> 8), (int)(version->dwVersionMS && 0x0000FFFF), - (int)((version->dwVersionLS && 0xFFFF0000) >> 8), (int)(version->dwVersionLS && 0x0000FFFF)); + (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), + (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); } /* returns name of given GUID */

1 0

Marcus Meissner : user32: Replaced && 0xff by & 0xff.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 6e413d2cd38e303ffebc715e7358bb7e12289921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e413d2cd38e303ffebc715e7… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 9 15:39:58 2006 +0100 user32: Replaced && 0xff by & 0xff. --- dlls/user/text.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user/text.c b/dlls/user/text.c index 5a823a7..e03130e 100644 --- a/dlls/user/text.c +++ b/dlls/user/text.c @@ -1083,7 +1083,7 @@ INT WINAPI DrawTextW( HDC hdc, LPCWSTR s memset (&dtp, 0, sizeof(dtp)); if (flags & DT_TABSTOP) { - dtp.iTabLength = (flags >> 8) && 0xff; + dtp.iTabLength = (flags >> 8) & 0xff; flags &= 0xffff00ff; } return DrawTextExW(hdc, (LPWSTR)str, count, rect, flags, &dtp); @@ -1099,7 +1099,7 @@ INT WINAPI DrawTextA( HDC hdc, LPCSTR st memset (&dtp, 0, sizeof(dtp)); if (flags & DT_TABSTOP) { - dtp.iTabLength = (flags >> 8) && 0xff; + dtp.iTabLength = (flags >> 8) & 0xff; flags &= 0xffff00ff; } return DrawTextExA( hdc, (LPSTR)str, count, rect, flags, &dtp );

1 0

Marcus Meissner : dmusic: Replaced && 0xfff... by & 0xff.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: af30447348937acc69b218d13a483008029fcb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af30447348937acc69b218d13… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 9 15:40:55 2006 +0100 dmusic: Replaced && 0xfff... by & 0xff. --- dlls/dmusic/collection.c | 4 ++-- dlls/dmusic/dmusic_main.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index cb1be18..82c1622 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -715,8 +715,8 @@ static HRESULT WINAPI IDirectMusicCollec if (This->pDesc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - GUID = %s\n", debugstr_dmguid(&This->pDesc->guidObject)); if (This->pDesc->dwValidData & DMUS_OBJ_VERSION) - TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) && 0x0000FFFF, This->pDesc->vVersion.dwVersionMS && 0x0000FFFF, \ - (This->pDesc->vVersion.dwVersionLS >> 8) && 0x0000FFFF, This->pDesc->vVersion.dwVersionLS && 0x0000FFFF); + TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionMS & 0x0000FFFF, \ + (This->pDesc->vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionLS & 0x0000FFFF); if (This->pDesc->dwValidData & DMUS_OBJ_NAME) TRACE(" - Name = %s\n", debugstr_w(This->pDesc->wszName)); diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 427a41f..1eb508f 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -219,8 +219,8 @@ const char *debugstr_fourcc (DWORD fourc const char *debugstr_dmversion (LPDMUS_VERSION version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS && 0xFFFF0000) >> 8), (int)(version->dwVersionMS && 0x0000FFFF), - (int)((version->dwVersionLS && 0xFFFF0000) >> 8), (int)(version->dwVersionLS && 0x0000FFFF)); + (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), + (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); } /* returns name of given GUID */

1 0

Marcus Meissner : dswave: Replaced && 0xff by & 0xff.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 2c10db0c2ffc29f1d954fad46d7b962e4f566ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c10db0c2ffc29f1d954fad46… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 9 15:41:28 2006 +0100 dswave: Replaced && 0xff by & 0xff. --- dlls/dswave/dswave_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 1b7495d..37f9e4c 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -147,8 +147,8 @@ const char *debugstr_fourcc (DWORD fourc const char *debugstr_dmversion (LPDMUS_VERSION version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS && 0xFFFF0000) >> 8), (int)(version->dwVersionMS && 0x0000FFFF), - (int)((version->dwVersionLS && 0xFFFF0000) >> 8), (int)(version->dwVersionLS && 0x0000FFFF)); + (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), + (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); } /* returns name of given GUID */

1 0

Marcus Meissner : dmcompos: Replaced && 0xff by & 0xff.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 70700592172b5fc15b51f8fe795bdff510a30a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70700592172b5fc15b51f8fe7… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 9 15:42:00 2006 +0100 dmcompos: Replaced && 0xff by & 0xff. --- dlls/dmcompos/dmcompos_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 66d561d..593e6e8 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -363,8 +363,8 @@ const char *debugstr_fourcc (DWORD fourc const char *debugstr_dmversion (LPDMUS_VERSION version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS && 0xFFFF0000) >> 8), (int)(version->dwVersionMS && 0x0000FFFF), - (int)((version->dwVersionLS && 0xFFFF0000) >> 8), (int)(version->dwVersionLS && 0x0000FFFF)); + (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), + (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); } /* returns name of given GUID */

1 0

Markus Amsler : d3d8: Add refcount tests for implicit surfaces.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: b3225ea42078b49d3bed2e9d3120786dfb2758e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3225ea42078b49d3bed2e9d3… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 9 16:06:34 2006 +0100 d3d8: Add refcount tests for implicit surfaces. --- dlls/d3d8/tests/device.c | 74 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4fe835b..f9d1a21 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -44,6 +44,19 @@ #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; \ + 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); \ + } static void check_mipmap_levels( IDirect3DDevice8* device, @@ -234,6 +247,7 @@ static void test_refcount(void) IDirect3DSurface8 *pImageSurface = NULL; IDirect3DSurface8 *pRenderTarget = NULL; IDirect3DSurface8 *pTextureLevel = NULL; + IDirect3DSurface8 *pBackBuffer = NULL; DWORD dStateBlock = -1; IDirect3DSwapChain8 *pSwapChain = NULL; @@ -274,6 +288,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 = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); @@ -283,6 +299,45 @@ 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: + * - they hold a refernce to the device + * - they are created with a refcount of 0 (Get/Release returns orignial refcount) + */ + hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget); + todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); + if(pRenderTarget) + { + todo_wine CHECK_REFCOUNT( pRenderTarget, 1); + hr = IDirect3DDevice8_GetRenderTarget(pDevice, &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; + } + CHECK_REFCOUNT( pDevice, --refcount); + + hr = IDirect3DDevice8_GetDepthStencilSurface(pDevice, &pStencilSurface); + todo_wine CHECK_CALL( hr, "GetDepthStencilSurface", pDevice, ++refcount); + if(pStencilSurface) + { + todo_wine CHECK_REFCOUNT( pStencilSurface, 1); + todo_wine CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); + pStencilSurface = NULL; + } + CHECK_REFCOUNT( pDevice, --refcount); + + hr = IDirect3DDevice8_GetBackBuffer(pDevice, 0, 0, &pBackBuffer); + todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); + if(pBackBuffer) + { + todo_wine CHECK_REFCOUNT( pBackBuffer, 1); + todo_wine CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); + pBackBuffer = NULL; + } + CHECK_REFCOUNT( pDevice, --refcount); + /* Buffers */ hr = IDirect3DDevice8_CreateIndexBuffer( pDevice, 16, 0, D3DFMT_INDEX32, D3DPOOL_DEFAULT, &pIndexBuffer ); CHECK_CALL( hr, "CreateIndexBuffer", pDevice, ++refcount ); @@ -347,6 +402,21 @@ static void test_refcount(void) CHECK_CALL( hr, "CreateStateBlock", pDevice, refcount ); hr = IDirect3DDevice8_CreateAdditionalSwapChain( pDevice, &d3dpp, &pSwapChain ); CHECK_CALL( hr, "CreateAdditionalSwapChain", pDevice, ++refcount ); + if(pSwapChain) + { + /* check implicit back buffer */ + hr = IDirect3DSwapChain8_GetBackBuffer(pSwapChain, 0, 0, &pBackBuffer); + todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); + todo_wine CHECK_REFCOUNT( pSwapChain, 1); + if(pBackBuffer) + { + todo_wine CHECK_REFCOUNT( pBackBuffer, 1); + todo_wine CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); + pBackBuffer = NULL; + } + CHECK_REFCOUNT( pSwapChain, 1); + CHECK_REFCOUNT( pDevice, --refcount); + } if(pVertexBuffer) { @@ -384,9 +454,9 @@ cleanup: /* Misc */ if (dStateBlock != -1) IDirect3DDevice8_DeleteStateBlock( pDevice, dStateBlock ); /* This will destroy device - cannot check the refcount here */ - if (pSwapChain) IUnknown_Release( pSwapChain ); + if (pSwapChain) CHECK_RELEASE_REFCOUNT( pSwapChain, 0); - if (pD3d) IUnknown_Release( pD3d ); + if (pD3d) CHECK_RELEASE_REFCOUNT( pD3d, 0); DestroyWindow( hwnd ); }

1 0

Dmitry Timoshkov : include: Remove duplicate definition.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 5f4ce3d72f38172ec097090d68df4fda5c859808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4ce3d72f38172ec097090d6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 9 23:38:18 2006 +0800 include: Remove duplicate definition. --- include/winsock.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index f2c4171..ae5df6d 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -885,7 +885,6 @@ #define WSAEUSERS (WSAB #define WSAEDQUOT (WSABASEERR+69) #define WSAESTALE (WSABASEERR+70) #define WSAEREMOTE (WSABASEERR+71) -#define WSAEDISCON (WSABASEERR+101) /* * Extended Windows Sockets error constant definitions

1 0

Alexandre Julliard : kernel32/tests: Fixed the pipe test for MacOS.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 91bb29ca4d84b80551fce257dee5392a96108619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bb29ca4d84b80551fce257d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 15:40:36 2006 +0100 kernel32/tests: Fixed the pipe test for MacOS. --- dlls/kernel32/tests/pipe.c | 53 ++++++++++++++++++++++++++++--------------- 1 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index c956e75..9701939 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -129,22 +129,25 @@ static void test_CreateNamedPipe(int pip ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { - /* should return all 23 bytes */ + if (readden != sizeof(obuf)) /* Linux only returns the first message */ ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); - } + else + todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); } else - ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + { + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both messages */ + ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + } if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 3a check\n"); - if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { - pbuf += sizeof(obuf); - ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 3b check\n"); - } + if (pipemode == PIPE_TYPE_BYTE && readden >= sizeof(obuf)+sizeof(obuf2)) { + pbuf += sizeof(obuf); + ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 3b check\n"); } ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf) + sizeof(obuf2), "read 3 got %d bytes\n", readden); @@ -161,22 +164,26 @@ static void test_CreateNamedPipe(int pip ok(written == sizeof(obuf2), "write file len 4b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { + if (readden != sizeof(obuf)) /* Linux only returns the first message */ /* should return all 23 bytes */ ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); - } + else + todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); } else - ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + { + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both messages */ + ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + } if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 4a check\n"); - if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { - pbuf += sizeof(obuf); - ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 4b check\n"); - } + if (pipemode == PIPE_TYPE_BYTE && readden >= sizeof(obuf)+sizeof(obuf2)) { + pbuf += sizeof(obuf); + ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 4b check\n"); } ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); if (pipemode == PIPE_TYPE_BYTE) { @@ -212,9 +219,14 @@ static void test_CreateNamedPipe(int pip ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile5b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n"); - ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both writes */ + ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); + else + todo_wine ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n"); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); @@ -243,7 +255,10 @@ static void test_CreateNamedPipe(int pip ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile6b\n"); ok(written == sizeof(obuf2), "write file len 6b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6\n"); - ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both writes */ + ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %d bytes available\n", avail); pbuf = ibuf;

1 0

Eric Pouech : msi: Fixed bogus A -> W conversion.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: f2ee10aed7f5da5fa0abe904a887cf25863e306b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ee10aed7f5da5fa0abe904a… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 8 21:47:04 2006 +0100 msi: Fixed bogus A -> W conversion. --- dlls/msi/registry.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 5ad5059..bb50ae0 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -618,13 +618,8 @@ UINT WINAPI MsiDecomposeDescriptorW( LPC len = (p - &szDescriptor[20]); if( len > MAX_FEATURE_CHARS ) return ERROR_INVALID_PARAMETER; - if (szFeature) - { - memcpy( szFeature, &szDescriptor[20], len*sizeof(WCHAR) ); - szFeature[len] = 0; - } - TRACE("feature %s\n", debugstr_w( &szDescriptor[20] )); + TRACE("feature %s\n", debugstr_wn( &szDescriptor[20], len )); r = decode_base85_guid( p+1, &component ); if( !r ) @@ -636,6 +631,11 @@ UINT WINAPI MsiDecomposeDescriptorW( LPC StringFromGUID2( &product, szProduct, MAX_FEATURE_CHARS+1 ); if (szComponent) StringFromGUID2( &component, szComponent, MAX_FEATURE_CHARS+1 ); + if (szFeature) + { + memcpy( szFeature, &szDescriptor[20], len*sizeof(WCHAR) ); + szFeature[len] = 0; + } len = ( &p[21] - szDescriptor ); TRACE("length = %d\n", len); @@ -669,12 +669,15 @@ UINT WINAPI MsiDecomposeDescriptorA( LPC r = MsiDecomposeDescriptorW( str, p, f, c, pUsed ); - WideCharToMultiByte( CP_ACP, 0, p, MAX_FEATURE_CHARS+1, - szProduct, MAX_FEATURE_CHARS+1, NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, f, MAX_FEATURE_CHARS+1, - szFeature, MAX_FEATURE_CHARS+1, NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, c, MAX_FEATURE_CHARS+1, - szComponent, MAX_FEATURE_CHARS+1, NULL, NULL ); + if (r == ERROR_SUCCESS) + { + WideCharToMultiByte( CP_ACP, 0, p, -1, + szProduct, MAX_FEATURE_CHARS+1, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, f, -1, + szFeature, MAX_FEATURE_CHARS+1, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, c, -1, + szComponent, MAX_FEATURE_CHARS+1, NULL, NULL ); + } msi_free( str );

1 0