wine-commits November 2006

wine-commits@winehq.org

3 participants
792 discussions

Alexandre Julliard : dmsynth: Fix one more instance of && instead of &.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: b5e09b23c6f3bfe6a37a8839dfbc611d548c5ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e09b23c6f3bfe6a37a8839d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 18:20:30 2006 +0100 dmsynth: Fix one more instance of && instead of &. --- dlls/dmsynth/dmsynth_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 6de7c48..2d4a9da 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -195,8 +195,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 : 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 : 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

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

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

Francois Gouget : winepath: Fix --long option.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 888b0b98acaff2f7b358720df200be3f51cc5c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=888b0b98acaff2f7b358720df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 9 15:36:12 2006 +0100 winepath: Fix --long option. --- programs/winepath/winepath.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 9aef237..0fc4623 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -49,8 +49,10 @@ static int option(int shortopt, const WC "\n" " -u, --unix converts a Windows path to a Unix path\n" " -w, --windows converts a Unix path to a long Windows path\n" - " -l, --long converts a short Windows path to the long format\n" - " -s, --short converts a long Windows path to the short format\n" + " -l, --long converts the short Windows path of an existing file or\n" + " directory to the long format\n" + " -s, --short converts the long Windows path of an existing file or\n" + " directory to the short format\n" " -h, --help output this help message and exit\n" " -v, --version output version information and exit\n" "\n" @@ -177,7 +179,7 @@ int wmain(int argc, const WCHAR *argv[]) { *path='\0'; if (outputformats & LONGFORMAT) { - if (GetFullPathNameW(argv[i], MAX_PATH, dos_pathW, NULL)) + if (GetLongPathNameW(argv[i], dos_pathW, MAX_PATH)) WideCharToMultiByte(CP_UNIXCP, 0, dos_pathW, -1, path, MAX_PATH, NULL, NULL); printf("%s\n", path); }

1 0

Eric Pouech : mscms: GetColorDirectory: fixed incorrect A -> W conversions.
by Alexandre Julliard 09 Nov '06

09 Nov '06

Module: wine Branch: master Commit: 4b88fd842a58998d234ab7daa3ad77d5cbe23654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b88fd842a58998d234ab7daa… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 8 21:46:59 2006 +0100 mscms: GetColorDirectory: fixed incorrect A -> W conversions. --- dlls/mscms/profile.c | 27 ++++++++++++++------------- dlls/mscms/tests/profile.c | 10 ++-------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 0b1b437..0ada3e8 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -91,14 +91,13 @@ BOOL WINAPI GetColorDirectoryA( PCSTR ma if (bufferW) { - ret = GetColorDirectoryW( NULL, bufferW, &sizeW ); - *size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); - - if (ret) + if ((ret = GetColorDirectoryW( NULL, bufferW, &sizeW ))) { - len = WideCharToMultiByte( CP_ACP, 0, bufferW, *size, buffer, *size, NULL, NULL ); + *size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + len = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, *size, NULL, NULL ); if (!len) ret = FALSE; } + else *size = sizeW / sizeof(WCHAR); HeapFree( GetProcessHeap(), 0, bufferW ); } @@ -132,13 +131,14 @@ BOOL WINAPI GetColorDirectoryW( PCWSTR m len = lstrlenW( colordir ) * sizeof(WCHAR); - if (len <= *size && buffer) + if (buffer && len <= *size) { lstrcpyW( buffer, colordir ); *size = len; return TRUE; } + SetLastError( ERROR_MORE_DATA ); *size = len; return FALSE; } @@ -389,14 +389,13 @@ BOOL WINAPI GetStandardColorSpaceProfile if (profileW) { - ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW ); - *size = WideCharToMultiByte( CP_ACP, 0, profileW, -1, NULL, 0, NULL, NULL ); - - if (ret) + if ((ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW ))) { - len = WideCharToMultiByte( CP_ACP, 0, profileW, *size, profile, *size, NULL, NULL ); + *size = WideCharToMultiByte( CP_ACP, 0, profileW, -1, NULL, 0, NULL, NULL ); + len = WideCharToMultiByte( CP_ACP, 0, profileW, -1, profile, *size, NULL, NULL ); if (!len) ret = FALSE; } + else *size = sizeW / sizeof(WCHAR); HeapFree( GetProcessHeap(), 0, profileW ); } @@ -451,20 +450,22 @@ BOOL WINAPI GetStandardColorSpaceProfile switch (id) { - case 0x52474220: /* 'RGB ' */ + case SPACE_RGB: /* 'RGB ' */ lstrcatW( rgbprofile, rgbprofilefile ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR); if (*size < len || !profile) { *size = len; - return TRUE; + SetLastError( ERROR_MORE_DATA ); + return FALSE; } lstrcpyW( profile, rgbprofile ); break; default: + SetLastError( ERROR_FILE_NOT_FOUND ); return FALSE; } return TRUE; diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index fda6723..3cf1073 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -597,7 +597,6 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &sizeP); - todo_wine ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* 4th param, */ @@ -612,17 +611,14 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, newprofile, &zero); - todo_wine ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); } else { SetLastError(0xfaceabee); /* 3rd param, */ ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, NULL, &sizeP); - todo_wine ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* dereferenced 4th param. */ ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, newprofile, &sizeP); - todo_wine ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); } @@ -642,7 +638,7 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &sizeP); - if (!ret) todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); else ok( !lstrcmpiA( newprofile, emptyA ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Functional checks */ @@ -689,7 +685,6 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &sizeP); - todo_wine ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* 3th param, */ @@ -702,7 +697,6 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* dereferenced 4th param. */ ret = pGetStandardColorSpaceProfileW(NULL, SPACE_RGB, newprofile, &zero); - todo_wine ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Several invalid parameter checks: */ @@ -721,7 +715,7 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP); - if (!ret) todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); else ok( !lstrcmpiW( newprofile, emptyW ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Functional checks */

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
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