February 2008 - Wine-Commits

Michael Stefaniuc : gdi32: Move EnumFonts16 and EnumFontFamilies16 to gdi16 .c.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: e9a8e6a42602e37f320a26d2593683f8121d3085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9a8e6a42602e37f320a26d25… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 18 23:21:25 2008 +0100 gdi32: Move EnumFonts16 and EnumFontFamilies16 to gdi16.c. --- dlls/gdi32/font.c | 30 ------------------------------ dlls/gdi32/gdi16.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 86b3003..e2aca59 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -861,27 +861,6 @@ INT WINAPI EnumFontFamiliesExA( HDC hDC, LPLOGFONTA plf, } /*********************************************************************** - * EnumFontFamilies (GDI.330) - */ -INT16 WINAPI EnumFontFamilies16( HDC16 hDC, LPCSTR lpFamily, - FONTENUMPROC16 efproc, LPARAM lpData ) -{ - LOGFONT16 lf, *plf; - - if (lpFamily) - { - if (!*lpFamily) return 1; - lstrcpynA( lf.lfFaceName, lpFamily, LF_FACESIZE ); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = 0; - plf = &lf; - } - else plf = NULL; - - return EnumFontFamiliesEx16( hDC, plf, efproc, lpData, 0 ); -} - -/*********************************************************************** * EnumFontFamiliesA (GDI32.@) */ INT WINAPI EnumFontFamiliesA( HDC hDC, LPCSTR lpFamily, @@ -924,15 +903,6 @@ INT WINAPI EnumFontFamiliesW( HDC hDC, LPCWSTR lpFamily, } /*********************************************************************** - * EnumFonts (GDI.70) - */ -INT16 WINAPI EnumFonts16( HDC16 hDC, LPCSTR lpName, FONTENUMPROC16 efproc, - LPARAM lpData ) -{ - return EnumFontFamilies16( hDC, lpName, efproc, lpData ); -} - -/*********************************************************************** * EnumFontsA (GDI32.@) */ INT WINAPI EnumFontsA( HDC hDC, LPCSTR lpName, FONTENUMPROCA efproc, diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 069c528..813c57e 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -1046,6 +1046,16 @@ BOOL16 WINAPI DeleteObject16( HGDIOBJ16 obj ) /*********************************************************************** + * EnumFonts (GDI.70) + */ +INT16 WINAPI EnumFonts16( HDC16 hDC, LPCSTR lpName, FONTENUMPROC16 efproc, + LPARAM lpData ) +{ + return EnumFontFamilies16( hDC, lpName, efproc, lpData ); +} + + +/*********************************************************************** * EnumObjects (GDI.71) */ INT16 WINAPI EnumObjects16( HDC16 hdc, INT16 obj, GOBJENUMPROC16 proc, LPARAM lParam ) @@ -1928,6 +1938,28 @@ BOOL16 WINAPI GetRasterizerCaps16( LPRASTERIZER_STATUS lprs, UINT16 cbNumBytes ) } +/*********************************************************************** + * EnumFontFamilies (GDI.330) + */ +INT16 WINAPI EnumFontFamilies16( HDC16 hDC, LPCSTR lpFamily, + FONTENUMPROC16 efproc, LPARAM lpData ) +{ + LOGFONT16 lf, *plf; + + if (lpFamily) + { + if (!*lpFamily) return 1; + lstrcpynA( lf.lfFaceName, lpFamily, LF_FACESIZE ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + plf = &lf; + } + else plf = NULL; + + return EnumFontFamiliesEx16( hDC, plf, efproc, lpData, 0 ); +} + + /************************************************************************* * GetKerningPairs (GDI.332) *

1 0

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

Feb. 19, 2008

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 : wininet: Fix potential buffer overrun in HttpQueryInfoA.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

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 : comdlg32: Fix the character length passed into GetDlgItemTextW in PRINTDLG_PS_UpdateDlgStructW .
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

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 : mciwave: Fix the character count passed to GetTempPathW in create_tmp_file.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

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

Mikołaj Zalewski : devenum: Add Polish translation.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

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 : browseui: Fix typo in declaration of empty_string in set_buffer.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

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 : advapi32: Fix the AccessCheck tests so that the ACCESS_SYSTEM_SECURITY test now runs (when the user has the Security privilege).
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

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

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

Feb. 19, 2008

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 : wined3d: Take alpha from device palette entry for d3d 8 and later.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 5346039d5ad0a89df6d3d6656adecbae8ff3f214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5346039d5ad0a89df6d3d6656… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Feb 17 17:37:00 2008 -0800 wined3d: Take alpha from device palette entry for d3d 8 and later. Adds support for D3D >= 8 style palettes that contain alpha. This fixes rendering problems in games like Commandos 3 and Madden NFL 2004. --- dlls/wined3d/surface.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6a17949..c6b8403 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2000,6 +2000,7 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] IWineD3DPaletteImpl* pal = This->palette; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; BOOL index_in_alpha = FALSE; + int dxVersion = ( (IWineD3DImpl *) device->wineD3D)->dxVersion; int i; /* Old games like StarCraft, C&C, Red Alert and others use P8 render targets. @@ -2016,22 +2017,29 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] if (pal == NULL) { /* Still no palette? Use the device's palette */ - /* Get the surface's palette */ + /* can ddraw and d3d < 8 surfaces use device's palette (d3d >= 8 feature)? */ for (i = 0; i < 256; i++) { table[i][0] = device->palettes[device->currentPalette][i].peRed; table[i][1] = device->palettes[device->currentPalette][i].peGreen; table[i][2] = device->palettes[device->currentPalette][i].peBlue; - /* BltOverride uses a GL_ALPHA_TEST based on GL_NOT_EQUAL 0, so the alpha component - of pixels that should be masked away should be 0. When inde_in_alpha is set, - we will store the palette index (the glReadPixels code reads GL_ALPHA back) - or else we store 0xff. */ - if(colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { - table[i][3] = 0; - } else if(index_in_alpha) { - table[i][3] = i; + if(dxVersion >= 8) { + /* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8, + alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device + capability flag is present (wine does advertise this capability) */ + table[i][3] = device->palettes[device->currentPalette][i].peFlags; } else { - table[i][3] = 0xFF; + /* BltOverride uses a GL_ALPHA_TEST based on GL_NOT_EQUAL 0, so the alpha component + of pixels that should be masked away should be 0. When inde_in_alpha is set, + we will store the palette index (the glReadPixels code reads GL_ALPHA back) + or else we store 0xff. */ + if(colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { + table[i][3] = 0; + } else if(index_in_alpha) { + table[i][3] = i; + } else { + table[i][3] = 0xFF; + } } } } else {

1 0