February 2008 - Wine-commits

Francois Gouget : advapi32/tests: Check whether RegGetValue() '\0' -terminates the buffer when retrieving a zero-byte string value.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 7a585f3c378ce3e3f8c0374f7674c22f4cdef42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a585f3c378ce3e3f8c0374f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 19 00:21:09 2008 +0100 advapi32/tests: Check whether RegGetValue() '\0'-terminates the buffer when retrieving a zero-byte string value. --- dlls/advapi32/tests/registry.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d8be5c8..1180818 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -426,6 +426,8 @@ static void create_test_entries(void) "RegSetValueExA failed\n"); ok(!RegSetValueExA(hkey_main,"TP1_SZ",0,REG_SZ, (const BYTE *)sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed\n"); + ok(!RegSetValueExA(hkey_main,"TP1_ZB_SZ",0,REG_SZ, NULL, 0), + "RegSetValueExA failed\n"); ok(!RegSetValueExA(hkey_main,"TP2_EXP_SZ",0,REG_EXPAND_SZ, (const BYTE *)sTestpath2, strlen(sTestpath2)+1), "RegSetValueExA failed\n"); ok(!RegSetValueExA(hkey_main,"DWORD",0,REG_DWORD, (const BYTE *)qw, 4), @@ -770,6 +772,17 @@ static void test_get_value(void) "strlen(sTestpath1)=%d size=%d\n", lstrlenA(sTestpath1), size); ok(type == REG_SZ, "type=%d\n", type); + /* Query REG_SZ using RRF_RT_REG_SZ on a zero-byte value (ok) */ + strcpy(buf, sTestpath1); + type = 0xdeadbeef; + size = sizeof(buf); + ret = pRegGetValueA(hkey_main, NULL, "TP1_ZB_SZ", RRF_RT_REG_SZ, &type, buf, &size); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* v5.2.3790.1830 (2003 SP1) returns sTestpath1 length + 2 here. */ + ok(size == 0, "size=%d\n", size); + ok(type == REG_SZ, "type=%d\n", type); + ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); + /* Query REG_SZ using RRF_RT_REG_SZ|RRF_NOEXPAND (ok) */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); ret = pRegGetValueA(hkey_main, NULL, "TP1_SZ", RRF_RT_REG_SZ|RRF_NOEXPAND, &type, buf, &size);

1 0

Mikołaj Zalewski : devenum: Add Polish translation.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 39dce046583196c4734b1279593ea9d13cc7dbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39dce046583196c4734b12795… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 18 17:18:03 2008 +0100 devenum: Add Polish translation. --- dlls/devenum/devenum.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 1f22158..97474f5 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -99,6 +99,15 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT } STRINGTABLE DISCARDABLE +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +{ + 7 "Standardowe DirectSound" + 8 "DirectSound: %s" + 9 "Standardowe urządzenie WaveOut" + 10 "Standardowe urządzenie Device" +} + +STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL { 7 "Standard DirectSound"

1 0

Rob Shearman : wininet: Fix potential buffer overrun in HttpQueryInfoA.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 719cd82f3584dd6a863f0b7d2fca429e24d3bdca URL: http://source.winehq.org/git/wine.git/?a=commit;h=719cd82f3584dd6a863f0b7d2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 18 19:37:35 2008 +0000 wininet: Fix potential buffer overrun in HttpQueryInfoA. If HTTP_QUERY_CUSTOM is specified then the buffer contains a null-terminated string on input and data of length len on output. The code wasn't taking into account that the input len could be less than the length of the string and thus could result in the allocated buffer being overrun with the call to WideCharToMultiByte. --- dlls/wininet/http.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9e02d69..f27f828 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1982,11 +1982,20 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHttpRequest, DWORD dwInfoLevel, if (lpBuffer) { + DWORD alloclen; len = (*lpdwBufferLength)*sizeof(WCHAR); - bufferW = HeapAlloc( GetProcessHeap(), 0, len ); + if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM) + { + alloclen = MultiByteToWideChar( CP_ACP, 0, lpBuffer, -1, NULL, 0 ) * sizeof(WCHAR); + if (alloclen < len) + alloclen = len; + } + else + alloclen = len; + bufferW = HeapAlloc( GetProcessHeap(), 0, alloclen ); /* buffer is in/out because of HTTP_QUERY_CUSTOM */ if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM) - MultiByteToWideChar(CP_ACP,0,lpBuffer,-1,bufferW,len); + MultiByteToWideChar( CP_ACP, 0, lpBuffer, -1, bufferW, alloclen / sizeof(WCHAR) ); } else { bufferW = NULL;

1 0

Rob Shearman : browseui: Fix typo in declaration of empty_string in set_buffer.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: e1affcc55ed82fdc40e64677b19196dae465530f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1affcc55ed82fdc40e64677b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 18 19:37:41 2008 +0000 browseui: Fix typo in declaration of empty_string in set_buffer. --- dlls/browseui/progressdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 28538d3..a0444fd 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -78,7 +78,7 @@ static const IProgressDialogVtbl ProgressDialogVtbl; static void set_buffer(LPWSTR *buffer, LPCWSTR string) { - const WCHAR empty_string = {0}; + static const WCHAR empty_string[] = {0}; IMalloc *malloc; int cb;

1 0

Rob Shearman : comdlg32: Fix potential buffer overrun of lpxx-> lfFaceName in CFn_WMCommand.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: ff527875d9a834b7f77d7cd7d97ec8039e7deede URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff527875d9a834b7f77d7cd7d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 18 19:39:04 2008 +0000 comdlg32: Fix potential buffer overrun of lpxx->lfFaceName in CFn_WMCommand. --- dlls/comdlg32/fontdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index f25d17d..deefe8f 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -963,7 +963,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, call back with the extra FONTTYPE_... bits added */ lpxx->lfPitchAndFamily = HIWORD(l) >> 8; } - lstrcpyW(lpxx->lfFaceName,str); + lstrcpynW(lpxx->lfFaceName, str, sizeof(lpxx->lfFaceName)/sizeof(lpxx->lfFaceName[0])); i=SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); if (i!=CB_ERR) {

1 0

Rob Shearman : comdlg32: Fix the character length passed into GetDlgItemTextW in PRINTDLG_PS_UpdateDlgStructW .
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 9ad684b42621a6509db0f5e410f412e6f0097e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad684b42621a6509db0f5e41… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 18 19:39:11 2008 +0000 comdlg32: Fix the character length passed into GetDlgItemTextW in PRINTDLG_PS_UpdateDlgStructW. --- dlls/comdlg32/printdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 75da027..93b99e9 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2560,7 +2560,7 @@ PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pdw) { /* Save paper source into device context */ PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb3,devname,portname,dm); - if (GetDlgItemTextW(hDlg,cmb2,papername,sizeof(papername))>0) { + if (GetDlgItemTextW(hDlg,cmb2,papername,sizeof(papername)/sizeof(papername[0]))>0) { PRINTDLG_PaperSizeW(&(pdw->pdlg),papername,&(pdw->dlgw->ptPaperSize)); pdw->dlgw->ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pdw->dlgw,pdw->dlgw->ptPaperSize.x); pdw->dlgw->ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pdw->dlgw,pdw->dlgw->ptPaperSize.y);

1 0

Rob Shearman : advapi32: Fix the AccessCheck tests so that the ACCESS_SYSTEM_SECURITY test now runs (when the user has the Security privilege).
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 608ac1e828f65130a7ac36794f7f7948206a1708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=608ac1e828f65130a7ac36794… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 18 19:39:19 2008 +0000 advapi32: Fix the AccessCheck tests so that the ACCESS_SYSTEM_SECURITY test now runs (when the user has the Security privilege). Duplicate the token at SecurityImpersonation impersonation level instead of SecurityIdentification, otherwise the call to RtlAdjustPrivilege fails on Windows. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1cb3130..5086cb7 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -784,7 +784,7 @@ static void test_AccessCheck(void) pRtlAdjustPrivilege(SE_SECURITY_PRIVILEGE, FALSE, TRUE, &Enabled); - res = DuplicateToken(ProcessToken, SecurityIdentification, &Token); + res = DuplicateToken(ProcessToken, SecurityImpersonation, &Token); ok(res, "DuplicateToken failed with error %d\n", GetLastError()); /* SD without owner/group */

1 0

Rob Shearman : mciwave: Fix the character count passed to GetTempPathW in create_tmp_file.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 3f4eb28bf5f69d3c0641f41aefa6239d3107ff88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4eb28bf5f69d3c0641f41ae… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 18 19:39:32 2008 +0000 mciwave: Fix the character count passed to GetTempPathW in create_tmp_file. --- dlls/mciwave/mciwave.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 520d285..0b12ad2 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -369,7 +369,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) szPrefix[2] = 'I'; szPrefix[3] = '\0'; - if (!GetTempPathW(sizeof(szTmpPath), szTmpPath)) { + if (!GetTempPathW(sizeof(szTmpPath)/sizeof(szTmpPath[0]), szTmpPath)) { WARN("can't retrieve temp path!\n"); return MCIERR_FILE_NOT_FOUND; }

1 0

Alexander Dorofeyev : ddraw/tests: Split d3d1 initialization and destruction into separate functions.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: cfa40a22c97e85a780f4d3be291289a591f5914e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa40a22c97e85a780f4d3be2… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Feb 17 17:36:50 2008 -0800 ddraw/tests: Split d3d1 initialization and destruction into separate functions. Slight rewrite to make creating additional D3D1 tests easier. --- dlls/ddraw/tests/d3d.c | 266 +++++++++++++++++++++++++++--------------------- 1 files changed, 152 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfa40a22c97e85a780f4d…

1 0

Alexander Dorofeyev : ddraw/tests: Add test for palette handling in IDirect3DTexture_Load.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 74c380cb7b6594ba0a917cf27d33b04b859c68e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c380cb7b6594ba0a917cf27… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Feb 17 17:36:56 2008 -0800 ddraw/tests: Add test for palette handling in IDirect3DTexture_Load. --- dlls/ddraw/tests/d3d.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f4e2c80..e51f476 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1347,6 +1347,159 @@ static void Direct3D1Test(void) ok(hr == D3D_OK, "IDirect3DDevice_DeleteViewport returned %08x\n", hr); } +static BOOL colortables_check_equality(PALETTEENTRY table1[256], PALETTEENTRY table2[256]) +{ + int i; + + for (i = 0; i < 256; i++) { + if (table1[i].peRed != table2[i].peRed || table1[i].peGreen != table2[i].peGreen || + table1[i].peBlue != table2[i].peBlue) return FALSE; + } + + return TRUE; +} + +/* test palette handling in IDirect3DTexture_Load */ +static void TextureLoadTest(void) +{ + IDirectDrawSurface *TexSurface = NULL; + IDirect3DTexture *Texture = NULL; + IDirectDrawSurface *TexSurface2 = NULL; + IDirect3DTexture *Texture2 = NULL; + IDirectDrawPalette *palette = NULL; + IDirectDrawPalette *palette2 = NULL; + IDirectDrawPalette *palette_tmp = NULL; + PALETTEENTRY table1[256], table2[256], table_tmp[256]; + HRESULT hr; + DDSURFACEDESC ddsd; + int i; + + memset (&ddsd, 0, sizeof (ddsd)); + ddsd.dwSize = sizeof (ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwHeight = 128; + ddsd.dwWidth = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 8; + + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &TexSurface, NULL); + ok(hr==D3D_OK, "CreateSurface returned: %x\n", hr); + if (FAILED(hr)) { + skip("IDirectDraw_CreateSurface failed; skipping further tests\n"); + goto cleanup; + } + + hr = IDirectDrawSurface_QueryInterface(TexSurface, &IID_IDirect3DTexture, + (void *)&Texture); + ok(hr==D3D_OK, "IDirectDrawSurface_QueryInterface returned: %x\n", hr); + if (FAILED(hr)) { + skip("Can't get IDirect3DTexture interface; skipping further tests\n"); + goto cleanup; + } + + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &TexSurface2, NULL); + ok(hr==D3D_OK, "CreateSurface returned: %x\n", hr); + if (FAILED(hr)) { + skip("IDirectDraw_CreateSurface failed; skipping further tests\n"); + goto cleanup; + } + + hr = IDirectDrawSurface_QueryInterface(TexSurface2, &IID_IDirect3DTexture, + (void *)&Texture2); + ok(hr==D3D_OK, "IDirectDrawSurface_QueryInterface returned: %x\n", hr); + if (FAILED(hr)) { + skip("Can't get IDirect3DTexture interface; skipping further tests\n"); + goto cleanup; + } + + /* test Load when both textures have no palette */ + hr = IDirect3DTexture_Load(Texture2, Texture); + ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr); + + for (i = 0; i < 256; i++) { + table1[i].peRed = i; + table1[i].peGreen = i; + table1[i].peBlue = i; + table1[i].peFlags = 0; + } + + hr = IDirectDraw_CreatePalette(DirectDraw1, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, table1, &palette, NULL); + ok(hr == DD_OK, "CreatePalette returned %08x\n", hr); + if (FAILED(hr)) { + skip("IDirectDraw_CreatePalette failed; skipping further tests\n"); + goto cleanup; + } + + /* test Load when source texture has palette and destination has no palette */ + hr = IDirectDrawSurface_SetPalette(TexSurface, palette); + ok(hr == DD_OK, "IDirectDrawSurface_SetPalette returned %08x\n", hr); + hr = IDirect3DTexture_Load(Texture2, Texture); + ok(hr == DDERR_NOPALETTEATTACHED, "IDirect3DTexture_Load returned %08x\n", hr); + + for (i = 0; i < 256; i++) { + table2[i].peRed = 255 - i; + table2[i].peGreen = 255 - i; + table2[i].peBlue = 255 - i; + table2[i].peFlags = 0; + } + + hr = IDirectDraw_CreatePalette(DirectDraw1, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, table2, &palette2, NULL); + ok(hr == DD_OK, "CreatePalette returned %08x\n", hr); + if (FAILED(hr)) { + skip("IDirectDraw_CreatePalette failed; skipping further tests\n"); + goto cleanup; + } + + /* test Load when source has no palette and destination has a palette */ + hr = IDirectDrawSurface_SetPalette(TexSurface, NULL); + ok(hr == DD_OK, "IDirectDrawSurface_SetPalette returned %08x\n", hr); + hr = IDirectDrawSurface_SetPalette(TexSurface2, palette2); + ok(hr == DD_OK, "IDirectDrawSurface_SetPalette returned %08x\n", hr); + hr = IDirect3DTexture_Load(Texture2, Texture); + ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr); + hr = IDirectDrawSurface_GetPalette(TexSurface2, &palette_tmp); + ok(hr == DD_OK, "IDirectDrawSurface_GetPalette returned %08x\n", hr); + if (!palette_tmp) { + skip("IDirectDrawSurface_GetPalette failed; skipping color table check\n"); + goto cleanup; + } else { + hr = IDirectDrawPalette_GetEntries(palette_tmp, 0, 0, 256, table_tmp); + ok(hr == DD_OK, "IDirectDrawPalette_GetEntries returned %08x\n", hr); + ok(colortables_check_equality(table2, table_tmp), "Unexpected palettized texture color table\n"); + IDirectDrawPalette_Release(palette_tmp); + } + + /* test Load when both textures have palettes */ + hr = IDirectDrawSurface_SetPalette(TexSurface, palette); + ok(hr == DD_OK, "IDirectDrawSurface_SetPalette returned %08x\n", hr); + hr = IDirect3DTexture_Load(Texture2, Texture); + ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr); + hr = IDirect3DTexture_Load(Texture2, Texture); + ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr); + hr = IDirectDrawSurface_GetPalette(TexSurface2, &palette_tmp); + ok(hr == DD_OK, "IDirectDrawSurface_GetPalette returned %08x\n", hr); + if (!palette_tmp) { + skip("IDirectDrawSurface_GetPalette failed; skipping color table check\n"); + goto cleanup; + } else { + hr = IDirectDrawPalette_GetEntries(palette_tmp, 0, 0, 256, table_tmp); + ok(hr == DD_OK, "IDirectDrawPalette_GetEntries returned %08x\n", hr); + ok(colortables_check_equality(table1, table_tmp), "Unexpected palettized texture color table\n"); + IDirectDrawPalette_Release(palette_tmp); + } + + cleanup: + + if (palette) IDirectDrawPalette_Release(palette); + if (palette2) IDirectDrawPalette_Release(palette2); + if (TexSurface) IDirectDrawSurface_Release(TexSurface); + if (Texture) IDirect3DTexture_Release(Texture); + if (TexSurface2) IDirectDrawSurface_Release(TexSurface2); + if (Texture2) IDirect3DTexture_Release(Texture2); +} + START_TEST(d3d) { init_function_pointers(); @@ -1372,6 +1525,7 @@ START_TEST(d3d) skip("Skipping d3d1 tests\n"); } else { Direct3D1Test(); + TextureLoadTest(); D3D1_releaseObjects(); } }

1 0