wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Rob Shearman : msi: Remove some unused functions.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 9b5d3677dff7ffdd974a6c2f5cb9d77b0b92c829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5d3677dff7ffdd974a6c2f5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 18 19:37:18 2008 +0000 msi: Remove some unused functions. --- dlls/msi/msipriv.h | 2 -- dlls/msi/registry.c | 43 ------------------------------------------- 2 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a735025..e23261b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -749,12 +749,10 @@ extern UINT MSIREG_OpenUninstallKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_DeleteUninstallKey(LPCWSTR szProduct); extern UINT MSIREG_OpenUserProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); -extern UINT MSIREG_OpenFeatures(HKEY* key); extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create); extern UINT MSIREG_OpenComponents(HKEY* key); extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); -extern UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create); extern UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 5c9c251..a3b63b5 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -52,14 +52,6 @@ static const WCHAR szUserFeatures_fmt[] = { 'F','e','a','t','u','r','e','s','\\', '%','s',0}; -static const WCHAR szInstaller_Features[] = { -'S','o','f','t','w','a','r','e','\\', -'M','i','c','r','o','s','o','f','t','\\', -'W','i','n','d','o','w','s','\\', -'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', -'I','n','s','t','a','l','l','e','r','\\', -'F','e','a','t','u','r','e','s',0 }; - static const WCHAR szUserDataFeatures_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -87,15 +79,6 @@ static const WCHAR szInstaller_Components[] = { 'I','n','s','t','a','l','l','e','r','\\', 'C','o','m','p','o','n','e','n','t','s',0 }; -static const WCHAR szInstaller_Components_fmt[] = { -'S','o','f','t','w','a','r','e','\\', -'M','i','c','r','o','s','o','f','t','\\', -'W','i','n','d','o','w','s','\\', -'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', -'I','n','s','t','a','l','l','e','r','\\', -'C','o','m','p','o','n','e','n','t','s','\\', -'%','s',0}; - static const WCHAR szUser_Components_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -608,11 +591,6 @@ UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct) return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } -UINT MSIREG_OpenFeatures(HKEY* key) -{ - return RegCreateKeyW(HKEY_LOCAL_MACHINE,szInstaller_Features,key); -} - UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create) { UINT rc; @@ -669,27 +647,6 @@ UINT MSIREG_OpenComponents(HKEY* key) return RegCreateKeyW(HKEY_LOCAL_MACHINE,szInstaller_Components,key); } -UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) -{ - UINT rc; - WCHAR squished_cc[GUID_SIZE]; - WCHAR keypath[0x200]; - - TRACE("%s\n",debugstr_w(szComponent)); - if (!squash_guid(szComponent,squished_cc)) - return ERROR_FUNCTION_FAILED; - TRACE("squished (%s)\n", debugstr_w(squished_cc)); - - sprintfW(keypath,szInstaller_Components_fmt,squished_cc); - - if (create) - rc = RegCreateKeyW(HKEY_LOCAL_MACHINE,keypath,key); - else - rc = RegOpenKeyW(HKEY_LOCAL_MACHINE,keypath,key); - - return rc; -} - UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) { UINT rc;

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

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 : 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 : 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 : 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 : 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

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

Mikołaj Zalewski : devenum: Convert resource file to UTF-8.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: b536702b60378f18ef338769adb9be1746ded59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b536702b60378f18ef338769a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 18 17:15:42 2008 +0100 devenum: Convert resource file to UTF-8. --- dlls/devenum/devenum.rc | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index cde4780..1f22158 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) + #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -45,10 +47,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { - 7 "DirectSound par d�faut" - 8 "DirectSound�: %s" - 9 "P�riph�rique WaveOut par d�faut" - 10 "P�riph�rique MidiOut par d�faut" + 7 "DirectSound par défaut" + 8 "DirectSound : %s" + 9 "Périphérique WaveOut par défaut" + 10 "Périphérique MidiOut par défaut" } STRINGTABLE DISCARDABLE @@ -56,8 +58,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { 7 "Standard DirectSound" 8 "DirectSound: %s" - 9 "Standard WaveOut - Ger�t" - 10 "Standard MidiOut - Ger�t" + 9 "Standard WaveOut - Gerät" + 10 "Standard MidiOut - Gerät" } STRINGTABLE DISCARDABLE @@ -72,10 +74,10 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT { - 7 "DirectSound padr�o" + 7 "DirectSound padrão" 8 "DirectSound: %s" - 9 "Dispositivo padr�o WaveOut" - 10 "Dispositivo padr�o MidiOut" + 9 "Dispositivo padrão WaveOut" + 10 "Dispositivo padrão MidiOut" } STRINGTABLE DISCARDABLE @@ -90,10 +92,10 @@ LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT { - 7 "Dafaultn� DirectSound" + 7 "Dafaultní DirectSound" 8 "DirectSound: %s" - 9 "Standardn� za��zen� WaveOut" - 10 "Standardn� za��zen� MidiOut" + 9 "Standardní zařízení WaveOut" + 10 "Standardní zařízení MidiOut" } STRINGTABLE DISCARDABLE

1 0

Alexander Dorofeyev : wined3d: Take alpha from device palette entry for d3d 8 and later.
by Alexandre Julliard 19 Feb '08

19 Feb '08

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

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 February 2008