November 2012 - Wine-Commits

Alexandre Julliard : user32: Check the length of the loaded registry key for system parameters.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 4a8716cf5b4a434d72638425038eff0f589f3871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8716cf5b4a434d726384250… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 16:18:16 2012 +0100 user32: Check the length of the loaded registry key for system parameters. --- dlls/user32/sysparams.c | 125 ++++++++++++++++------------------------------- 1 files changed, 43 insertions(+), 82 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 465ab8f..45e23c7 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -601,32 +601,6 @@ static void SYSPARAMS_NotifyChange( UINT uiAction, UINT fWinIni ) /*********************************************************************** - * Loads system parameter from user profile. - */ -static BOOL SYSPARAMS_Load( LPCWSTR lpRegKey, LPCWSTR lpValName, void *lpBuf, DWORD count ) -{ - BOOL ret = FALSE; - DWORD type; - HKEY hKey; - - memset( lpBuf, 0, count ); - - if (RegOpenKeyW( get_volatile_regkey(), lpRegKey, &hKey ) == ERROR_SUCCESS) - { - ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, lpBuf, &count ); - RegCloseKey( hKey ); - } - - if (!ret && RegOpenKeyW( HKEY_CURRENT_USER, lpRegKey, &hKey ) == ERROR_SUCCESS) - { - ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, lpBuf, &count ); - RegCloseKey( hKey ); - } - - return ret; -} - -/*********************************************************************** * Saves system parameter to user profile. */ @@ -676,11 +650,27 @@ static BOOL SYSPARAMS_Save( LPCWSTR lpRegKey, LPCWSTR lpValName, LPCWSTR lpValue } /* load a value to a registry entry */ -static BOOL load_entry( struct sysparam_entry *entry, void *data, DWORD size ) +static DWORD load_entry( struct sysparam_entry *entry, void *data, DWORD size ) { - BOOL ret = SYSPARAMS_Load( entry->regkey, entry->regval, data, size ); + DWORD type, count = 0; + HKEY key; + + if (!RegOpenKeyW( get_volatile_regkey(), entry->regkey, &key )) + { + count = size; + if (RegQueryValueExW( key, entry->regval, NULL, &type, data, &count )) count = 0; + RegCloseKey( key ); + } + if (!count && !RegOpenKeyW( HKEY_CURRENT_USER, entry->regkey, &key )) + { + count = size; + if (RegQueryValueExW( key, entry->regval, NULL, &type, data, &count )) count = 0; + RegCloseKey( key ); + } + /* make sure strings are null-terminated */ + if (size && count == size && type == REG_SZ) ((WCHAR *)data)[count - 1] = 0; entry->loaded = TRUE; - return ret; + return count; } /* save a value to a registry entry */ @@ -792,53 +782,6 @@ void SYSPARAMS_Init(void) } -/*********************************************************************** - * reg_get_logfont - * - * Tries to retrieve logfont info from the specified key and value - */ -static BOOL reg_get_logfont(LPCWSTR key, LPCWSTR value, LOGFONTW *lf) -{ - HKEY hkey; - LOGFONTW lfbuf; - DWORD type, size; - BOOL found = FALSE; - HKEY base_keys[2]; - int i; - - base_keys[0] = get_volatile_regkey(); - base_keys[1] = HKEY_CURRENT_USER; - - for(i = 0; i < 2 && !found; i++) - { - if(RegOpenKeyW(base_keys[i], key, &hkey) == ERROR_SUCCESS) - { - size = sizeof(lfbuf); - if(RegQueryValueExW(hkey, value, NULL, &type, (LPBYTE)&lfbuf, &size) == ERROR_SUCCESS && - type == REG_BINARY) - { - if( size == sizeof(lfbuf)) - { - found = TRUE; - memcpy(lf, &lfbuf, size); - } else if( size == sizeof( LOGFONT16)) - { /* win9x-winME format */ - found = TRUE; - SYSPARAMS_LogFont16To32W( (LOGFONT16*) &lfbuf, lf); - } else - WARN("Unknown format in key %s value %s, size is %d\n", - debugstr_w( key), debugstr_w( value), size); - } - RegCloseKey(hkey); - } - } - if( found && lf->lfHeight > 0) { - /* positive height value means points ( inch/72 ) */ - lf->lfHeight = -MulDiv( lf->lfHeight, get_display_dpi(), 72); - } - return found; -} - /* adjust some of the raw values found in the registry */ static void normalize_nonclientmetrics( NONCLIENTMETRICSW *pncm) { @@ -997,8 +940,7 @@ static BOOL get_dword_entry( union sysparam_all_entry *entry, UINT int_param, vo if (!entry->hdr.loaded) { DWORD val; - - if (load_entry( &entry->hdr, &val, sizeof(val) )) entry->dword.val = val; + if (load_entry( &entry->hdr, &val, sizeof(val) ) == sizeof(DWORD)) entry->dword.val = val; } *(DWORD *)ptr_param = entry->bool.val; return TRUE; @@ -1024,13 +966,28 @@ static BOOL get_font_entry( union sysparam_all_entry *entry, UINT int_param, voi { LOGFONTW font; - if (!reg_get_logfont( entry->hdr.regkey, entry->hdr.regval, &font )) + switch (load_entry( &entry->hdr, &font, sizeof(font) )) { - /* use the default GUI font */ + case sizeof(font): + entry->font.val = font; + if (font.lfHeight > 0) /* positive height value means points ( inch/72 ) */ + font.lfHeight = -MulDiv( font.lfHeight, get_display_dpi(), 72 ); + break; + case sizeof(LOGFONT16): /* win9x-winME format */ + SYSPARAMS_LogFont16To32W( (LOGFONT16 *)&font, &entry->font.val ); + if (entry->font.val.lfHeight > 0) + entry->font.val.lfHeight = -MulDiv( entry->font.val.lfHeight, get_display_dpi(), 72 ); + break; + default: + WARN( "Unknown format in key %s value %s\n", + debugstr_w(entry->hdr.regkey), debugstr_w(entry->hdr.regval)); + /* fall through */ + case 0: /* use the default GUI font */ GetObjectW( GetStockObject( DEFAULT_GUI_FONT ), sizeof(font), &font ); font.lfWeight = entry->font.weight; + entry->font.val = font; + break; } - entry->font.val = font; entry->hdr.loaded = TRUE; } *(LOGFONTW *)ptr_param = entry->font.val; @@ -1096,9 +1053,13 @@ static BOOL get_binary_entry( union sysparam_all_entry *entry, UINT int_param, v if (!entry->hdr.loaded) { void *buffer = HeapAlloc( GetProcessHeap(), 0, entry->bin.size ); + DWORD len = load_entry( &entry->hdr, buffer, entry->bin.size ); - if (load_entry( &entry->hdr, buffer, entry->bin.size )) + if (len) + { memcpy( entry->bin.ptr, buffer, entry->bin.size ); + memset( (char *)entry->bin.ptr + len, 0, entry->bin.size - len ); + } HeapFree( GetProcessHeap(), 0, buffer ); } memcpy( ptr_param, entry->bin.ptr, min( int_param, entry->bin.size ) );

1 0

Alexandre Julliard : user32: Simplify initialization of the desktop wallpaper.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: b2fa004ee41b8c5d5d3ffa65bd2d9f06ba2cc3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2fa004ee41b8c5d5d3ffa65b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 15:55:09 2012 +0100 user32: Simplify initialization of the desktop wallpaper. --- dlls/user32/desktop.c | 96 +++++++++++++----------------------------- programs/explorer/desktop.c | 1 - 2 files changed, 30 insertions(+), 67 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 92ee21a..ddf812a 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -55,59 +55,44 @@ const struct builtin_class_descr DESKTOP_builtin_class = /*********************************************************************** * DESKTOP_LoadBitmap - * - * Load a bitmap from a file. Used by SetDeskWallPaper(). */ -static HBITMAP DESKTOP_LoadBitmap( HDC hdc, const char *filename ) +static HBITMAP DESKTOP_LoadBitmap(void) { - BITMAPFILEHEADER *fileHeader; - BITMAPINFO *bitmapInfo; HBITMAP hbitmap; - HFILE file; - LPSTR buffer; - LONG size; - - /* Read all the file into memory */ + WCHAR filename[MAX_PATH]; - if ((file = _lopen( filename, OF_READ )) == HFILE_ERROR) + if (!SystemParametersInfoW( SPI_GETDESKWALLPAPER, MAX_PATH, filename, 0 )) return 0; + if (!filename[0]) return 0; + hbitmap = LoadImageW( 0, filename, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION | LR_LOADFROMFILE ); + if (!hbitmap) { - UINT len = GetWindowsDirectoryA( NULL, 0 ); - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, - len + strlen(filename) + 2 ))) - return 0; - GetWindowsDirectoryA( buffer, len + 1 ); - strcat( buffer, "\\" ); - strcat( buffer, filename ); - file = _lopen( buffer, OF_READ ); - HeapFree( GetProcessHeap(), 0, buffer ); + WCHAR buffer[MAX_PATH]; + UINT len = GetWindowsDirectoryW( buffer, MAX_PATH - 2 ); + if (buffer[len - 1] != '\\') buffer[len++] = '\\'; + lstrcpynW( buffer + len, filename, MAX_PATH - len ); + hbitmap = LoadImageW( 0, buffer, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION | LR_LOADFROMFILE ); } - if (file == HFILE_ERROR) return 0; - size = _llseek( file, 0, 2 ); - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size ))) - { - _lclose( file ); - return 0; - } - _llseek( file, 0, 0 ); - size = _lread( file, buffer, size ); - _lclose( file ); - fileHeader = (BITMAPFILEHEADER *)buffer; - bitmapInfo = (BITMAPINFO *)(buffer + sizeof(BITMAPFILEHEADER)); - - /* Check header content */ - if ((fileHeader->bfType != 0x4d42) || (size < fileHeader->bfSize)) - { - HeapFree( GetProcessHeap(), 0, buffer ); - return 0; - } - hbitmap = CreateDIBitmap( hdc, &bitmapInfo->bmiHeader, CBM_INIT, - buffer + fileHeader->bfOffBits, - bitmapInfo, DIB_RGB_COLORS ); - HeapFree( GetProcessHeap(), 0, buffer ); return hbitmap; } +/*********************************************************************** + * init_wallpaper + */ +static void init_wallpaper(void) +{ + HBITMAP hbitmap = DESKTOP_LoadBitmap(); + if (hbitmapWallPaper) DeleteObject( hbitmapWallPaper ); + hbitmapWallPaper = hbitmap; + if (hbitmap) + { + BITMAP bmp; + GetObjectA( hbitmap, sizeof(bmp), &bmp ); + bitmapSize.cx = (bmp.bmWidth != 0) ? bmp.bmWidth : 1; + bitmapSize.cy = (bmp.bmHeight != 0) ? bmp.bmHeight : 1; + fTileWallPaper = GetProfileIntA( "desktop", "TileWallPaper", 0 ); + } +} /*********************************************************************** * DesktopWndProc @@ -182,29 +167,7 @@ BOOL WINAPI PaintDesktop(HDC hdc) */ BOOL WINAPI SetDeskWallPaper( LPCSTR filename ) { - HBITMAP hbitmap; - HDC hdc; - char buffer[256]; - - if (filename == (LPSTR)-1) - { - GetProfileStringA( "desktop", "WallPaper", "(None)", buffer, 256 ); - filename = buffer; - } - hdc = GetDC( 0 ); - hbitmap = DESKTOP_LoadBitmap( hdc, filename ); - ReleaseDC( 0, hdc ); - if (hbitmapWallPaper) DeleteObject( hbitmapWallPaper ); - hbitmapWallPaper = hbitmap; - fTileWallPaper = GetProfileIntA( "desktop", "TileWallPaper", 0 ); - if (hbitmap) - { - BITMAP bmp; - GetObjectA( hbitmap, sizeof(bmp), &bmp ); - bitmapSize.cx = (bmp.bmWidth != 0) ? bmp.bmWidth : 1; - bitmapSize.cy = (bmp.bmHeight != 0) ? bmp.bmHeight : 1; - } - return TRUE; + return SystemParametersInfoA( SPI_SETDESKWALLPAPER, MAX_PATH, (void *)filename, SPIF_UPDATEINIFILE ); } @@ -238,5 +201,6 @@ BOOL DESKTOP_SetPattern( LPCWSTR pattern ) DeleteObject( hbitmap ); } } + init_wallpaper(); return TRUE; } diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index c646f2d..fdb966f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -312,7 +312,6 @@ void manage_desktop( WCHAR *arg ) SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); SystemParametersInfoA( SPI_SETDESKPATTERN, -1, NULL, FALSE ); - SetDeskWallPaper( (LPSTR)-1 ); ClipCursor( NULL ); initialize_display_settings( hwnd ); initialize_appbar();

1 0

Alexandre Julliard : user32: Add parameter entry objects for the desktop wallpaper and pattern.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 4d653b77ecda8b0d1ebcd30c7c7c844f0449a21c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d653b77ecda8b0d1ebcd30c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 15:54:52 2012 +0100 user32: Add parameter entry objects for the desktop wallpaper and pattern. --- dlls/user32/sysparams.c | 105 +++++++++++++++++++++++++++------------------- 1 files changed, 62 insertions(+), 43 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 437d9e2..465ab8f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -170,6 +170,8 @@ static const WCHAR SPI_SETSCREENREADER_REGKEY[]= {'C','o','n','t',' static const WCHAR SPI_SETSCREENREADER_VALNAME[]= {'O','n',0}; #define SPI_SETDESKWALLPAPER_REGKEY DESKTOP_REGKEY static const WCHAR SPI_SETDESKWALLPAPER_VALNAME[]= {'W','a','l','l','p','a','p','e','r',0}; +#define SPI_SETDESKPATTERN_REGKEY DESKTOP_REGKEY +static const WCHAR SPI_SETDESKPATTERN_VALNAME[]= {'P','a','t','t','e','r','n',0}; #define SPI_SETFONTSMOOTHING_REGKEY DESKTOP_REGKEY static const WCHAR SPI_SETFONTSMOOTHING_VALNAME[]= {'F','o','n','t','S','m','o','o','t','h','i','n','g',0}; #define SPI_SETDRAGWIDTH_REGKEY DESKTOP_REGKEY @@ -345,6 +347,12 @@ struct sysparam_binary_entry size_t size; }; +struct sysparam_path_entry +{ + struct sysparam_entry hdr; + WCHAR path[MAX_PATH]; +}; + struct sysparam_font_entry { struct sysparam_entry hdr; @@ -367,6 +375,7 @@ union sysparam_all_entry struct sysparam_bool_entry bool; struct sysparam_dword_entry dword; struct sysparam_binary_entry bin; + struct sysparam_path_entry path; struct sysparam_font_entry font; struct sysparam_pref_entry pref; }; @@ -1045,6 +1054,40 @@ static BOOL set_font_entry( union sysparam_all_entry *entry, UINT int_param, voi return TRUE; } +/* get a path parameter in the registry */ +static BOOL get_path_entry( union sysparam_all_entry *entry, UINT int_param, void *ptr_param ) +{ + if (!ptr_param) return FALSE; + + if (!entry->hdr.loaded) + { + WCHAR buffer[MAX_PATH]; + + if (load_entry( &entry->hdr, buffer, sizeof(buffer) )) + lstrcpynW( entry->path.path, buffer, MAX_PATH ); + HeapFree( GetProcessHeap(), 0, buffer ); + } + lstrcpynW( ptr_param, entry->path.path, int_param ); + return TRUE; +} + +/* set a path parameter in the registry */ +static BOOL set_path_entry( union sysparam_all_entry *entry, UINT int_param, void *ptr_param, UINT flags ) +{ + WCHAR buffer[MAX_PATH]; + BOOL ret; + + lstrcpynW( buffer, ptr_param, MAX_PATH ); + ret = save_entry_string( &entry->hdr, buffer, flags ); + if (ret) + { + strcpyW( entry->path.path, buffer ); + entry->hdr.loaded = TRUE; + } + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; +} + /* get a binary parameter in the registry */ static BOOL get_binary_entry( union sysparam_all_entry *entry, UINT int_param, void *ptr_param ) { @@ -1158,6 +1201,10 @@ static BOOL set_entry( void *ptr, UINT int_param, void *ptr_param, UINT flags ) struct sysparam_binary_entry entry_##name = { { get_binary_entry, set_binary_entry, \ SPI_SET ## name ##_REGKEY, SPI_SET ## name ##_VALNAME }, &(data), sizeof(data) } +#define PATH_ENTRY(name) \ + struct sysparam_binary_entry entry_##name = { { get_path_entry, set_path_entry, \ + SPI_SET ## name ##_REGKEY, SPI_SET ## name ##_VALNAME } } + #define FONT_ENTRY(name,weight) \ struct sysparam_font_entry entry_##name = { { get_font_entry, set_font_entry, \ SPI_SET ## name ##_REGKEY, SPI_SET ## name ##_VALNAME }, (weight) } @@ -1234,6 +1281,9 @@ static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3 ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0 ); static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); +static PATH_ENTRY( DESKPATTERN ); +static PATH_ENTRY( DESKWALLPAPER ); + static BYTE user_prefs[8] = { 0x30, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00, 0x00 }; static BINARY_ENTRY( USERPREFERENCESMASK, user_prefs ); @@ -1388,26 +1438,16 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETGRIDGRANULARITY: ret = set_entry( &entry_GRIDGRANULARITY, uiParam, pvParam, fWinIni ); break; - - case SPI_SETDESKWALLPAPER: /* 20 */ - if (!pvParam || !SetDeskWallPaper( pvParam )) return FALSE; - SYSPARAMS_Save(SPI_SETDESKWALLPAPER_REGKEY, SPI_SETDESKWALLPAPER_VALNAME, pvParam, fWinIni); - break; - - case SPI_SETDESKPATTERN: /* 21 */ - /* FIXME: the ability to specify a pattern in pvParam - doesn't seem to be documented for Win32 */ - if ((INT16)uiParam == -1) - { + case SPI_SETDESKWALLPAPER: + ret = set_entry( &entry_DESKWALLPAPER, uiParam, pvParam, fWinIni ); + break; + case SPI_SETDESKPATTERN: + if (!pvParam || set_entry( &entry_DESKPATTERN, uiParam, pvParam, fWinIni )) + { WCHAR buf[256]; - GetProfileStringW( Desktop, Pattern, - defPattern, - buf, sizeof(buf)/sizeof(WCHAR) ); - ret = DESKTOP_SetPattern( buf ); - } else - ret = DESKTOP_SetPattern( pvParam ); - break; - + ret = get_entry( &entry_DESKPATTERN, 256, buf ) && DESKTOP_SetPattern( buf ); + } + break; case SPI_GETKEYBOARDDELAY: ret = get_entry( &entry_KEYBOARDDELAY, uiParam, pvParam ); break; @@ -1911,30 +1951,9 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETSCREENSAVERRUNNING: ret = get_entry( &entry_SCREENSAVERRUNNING, uiParam, pvParam ); break; - - case SPI_GETDESKWALLPAPER: /* 115 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - { - WCHAR buf[MAX_PATH]; - - if (!pvParam) return FALSE; - - if (uiParam > MAX_PATH) - { - uiParam = MAX_PATH; - } - - if (SYSPARAMS_Load(SPI_SETDESKWALLPAPER_REGKEY, SPI_SETDESKWALLPAPER_VALNAME, buf, sizeof(buf))) - { - lstrcpynW(pvParam, buf, uiParam); - } - else - { - /* Return an empty string */ - memset(pvParam, 0, uiParam); - } - - break; - } + case SPI_GETDESKWALLPAPER: + ret = get_entry( &entry_DESKWALLPAPER, uiParam, pvParam ); + break; case SPI_GETACTIVEWINDOWTRACKING: ret = get_entry( &entry_ACTIVEWINDOWTRACKING, uiParam, pvParam ); break;

1 0

Alexandre Julliard : user32: Use parameter entry objects for the non-client metrics parameters.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 002c626a11103eab5462a6cf25cba2df87c63afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=002c626a11103eab5462a6cf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 13:28:54 2012 +0100 user32: Use parameter entry objects for the non-client metrics parameters. --- dlls/user32/sysparams.c | 514 ++++++++++++++--------------------------------- 1 files changed, 154 insertions(+), 360 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=002c626a11103eab5462a…

1 0

Alexandre Julliard : user32: Forward SystemParametersInfo calls to the user driver first.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 13fbce5627c759ba260618e665436c6315d592da URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fbce5627c759ba260618e66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 17:38:21 2012 +0100 user32: Forward SystemParametersInfo calls to the user driver first. --- dlls/user32/driver.c | 46 +++++--------- dlls/user32/sysparams.c | 139 +++++++++++++++----------------------------- dlls/user32/user_private.h | 5 +- 3 files changed, 66 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13fbce5627c759ba26061…

1 0

Hans Leidekker : advapi32: Avoid a buffer overflow in CredUnmarshalCredentialW.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: bff64e8578d54fa27ee9667d70812c72b8db4d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff64e8578d54fa27ee9667d7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:12:22 2012 +0100 advapi32: Avoid a buffer overflow in CredUnmarshalCredentialW. Spotted by Stefan Leichter. --- dlls/advapi32/cred.c | 7 +++++-- dlls/advapi32/tests/cred.c | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index b2597b6..b735821 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <time.h> +#include <limits.h> #ifdef __APPLE__ # include <Security/SecKeychain.h> @@ -2102,7 +2103,7 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) */ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVOID *out ) { - unsigned int len, buflen, size; + unsigned int len, buflen; TRACE("%s, %p, %p\n", debugstr_w(cred), type, out); @@ -2134,8 +2135,10 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO case UsernameTargetCredential: { USERNAME_TARGET_CREDENTIAL_INFO *target; + ULONGLONG size = 0; - if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR)) + if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || + !size || size % sizeof(WCHAR) || size > INT_MAX) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 3d37a3c..83212c5 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -670,6 +670,14 @@ static void test_CredUnmarshalCredentialA(void) ok( username->UserName != NULL, "UserName is NULL\n" ); ok( !lstrcmpW( username->UserName, testW ), "got %s\n", wine_dbgstr_w(username->UserName) ); pCredFree( username ); + + type = 0; + username = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@CA-----0BQZAMHA0BA", &type, (void **)&username ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); } static void test_CredIsMarshaledCredentialA(void)

1 0

Nikolay Sivov : msi: Remove unnecessary casts and argument from script site creation helper.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 3b0179cbde19e650804cb3b5a81857627470b0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b0179cbde19e650804cb3b5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 17:42:16 2012 -0500 msi: Remove unnecessary casts and argument from script site creation helper. --- dlls/msi/script.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index bea2712..8d48a94 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -59,8 +59,8 @@ static const WCHAR szSession[] = {'S','e','s','s','i','o','n',0}; */ typedef struct { IActiveScriptSite IActiveScriptSite_iface; - IDispatch *pInstaller; - IDispatch *pSession; + IDispatch *installer; + IDispatch *session; LONG ref; } MsiActiveScriptSite; @@ -144,7 +144,7 @@ static HRESULT WINAPI MsiActiveScriptSite_GetItemInfo(IActiveScriptSite* iface, return hr; } else if (dwReturnMask & SCRIPTINFO_IUNKNOWN) { - IDispatch_QueryInterface(This->pSession, &IID_IUnknown, (void **)ppiunkItem); + IDispatch_QueryInterface(This->session, &IID_IUnknown, (void **)ppiunkItem); return S_OK; } } @@ -251,23 +251,24 @@ static const struct IActiveScriptSiteVtbl activescriptsitevtbl = MsiActiveScriptSite_OnLeaveScript }; -static HRESULT create_ActiveScriptSite(IUnknown *outer, void **obj) +static HRESULT create_activescriptsite(MsiActiveScriptSite **obj) { MsiActiveScriptSite* object; - TRACE("(%p,%p)\n", outer, obj); + TRACE("(%p)\n", obj); - if( outer ) - return CLASS_E_NOAGGREGATION; + *obj = NULL; object = msi_alloc( sizeof(MsiActiveScriptSite) ); + if (!object) + return E_OUTOFMEMORY; object->IActiveScriptSite_iface.lpVtbl = &activescriptsitevtbl; object->ref = 1; - object->pInstaller = NULL; - object->pSession = NULL; + object->installer = NULL; + object->session = NULL; - *obj = &object->IActiveScriptSite_iface; + *obj = object; return S_OK; } @@ -280,7 +281,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function HRESULT hr; IActiveScript *pActiveScript = NULL; IActiveScriptParse *pActiveScriptParse = NULL; - MsiActiveScriptSite *pActiveScriptSite = NULL; + MsiActiveScriptSite *scriptsite; IDispatch *pDispatch = NULL; DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; DISPID dispid; @@ -291,15 +292,15 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function CoInitialize(NULL); /* Create MsiActiveScriptSite object */ - hr = create_ActiveScriptSite(NULL, (void **)&pActiveScriptSite); + hr = create_activescriptsite(&scriptsite); if (hr != S_OK) goto done; /* Create an installer object */ - hr = create_msiserver(NULL, (LPVOID *)&pActiveScriptSite->pInstaller); + hr = create_msiserver(NULL, (void**)&scriptsite->installer); if (hr != S_OK) goto done; /* Create a session object */ - hr = create_session(hPackage, pActiveScriptSite->pInstaller, &pActiveScriptSite->pSession); + hr = create_session(hPackage, scriptsite->installer, &scriptsite->session); if (hr != S_OK) goto done; /* Create the scripting engine */ @@ -325,7 +326,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse, (void **)&pActiveScriptParse); if (FAILED(hr)) goto done; - hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); + hr = IActiveScript_SetScriptSite(pActiveScript, &scriptsite->IActiveScriptSite_iface); if (FAILED(hr)) goto done; hr = IActiveScriptParse_InitNew(pActiveScriptParse); @@ -372,11 +373,11 @@ done: if (pDispatch) IDispatch_Release(pDispatch); if (pActiveScript) IActiveScript_Release(pActiveScript); if (pActiveScriptParse) IActiveScriptParse_Release(pActiveScriptParse); - if (pActiveScriptSite) + if (scriptsite) { - if (pActiveScriptSite->pSession) IDispatch_Release(pActiveScriptSite->pSession); - if (pActiveScriptSite->pInstaller) IDispatch_Release(pActiveScriptSite->pInstaller); - IActiveScriptSite_Release((IActiveScriptSite *)pActiveScriptSite); + if (scriptsite->session) IDispatch_Release(scriptsite->session); + if (scriptsite->installer) IDispatch_Release(scriptsite->installer); + IActiveScriptSite_Release(&scriptsite->IActiveScriptSite_iface); } CoUninitialize(); /* must call even if CoInitialize failed */ return ret;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DDEVICE2.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: d3b739ff31a26829db3505ab5fa4dc6fad4095f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b739ff31a26829db3505ab5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:05:56 2012 +0100 ddraw: Avoid LPDIRECT3DDEVICE2. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 5a8f576..4bec630 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -496,7 +496,7 @@ DECLARE_INTERFACE_(IDirect3DMaterial2,IUnknown) /*** IDirect3DMaterial2 methods ***/ STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DMATERIALHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice2 *device, D3DMATERIALHANDLE *handle) PURE; }; #undef INTERFACE @@ -614,7 +614,7 @@ DECLARE_INTERFACE_(IDirect3DTexture2,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DTexture2 methods ***/ - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DTEXTUREHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice2 *device, D3DTEXTUREHANDLE *handle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; STDMETHOD(Load)(THIS_ IDirect3DTexture2 *texture) PURE; };

1 0

Henri Verbeet : d3d10core: Fix the stream index in d3d10_device_IASetVertexBuffers().
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: e00f1590dba2d76604d48e1b3cee4c55104ad6f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00f1590dba2d76604d48e1b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:06:00 2012 +0100 d3d10core: Fix the stream index in d3d10_device_IASetVertexBuffers(). --- dlls/d3d10core/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 84fff72..be55387 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -212,7 +212,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *ifac { struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); - wined3d_device_set_stream_source(This->wined3d_device, start_slot, + wined3d_device_set_stream_source(This->wined3d_device, start_slot + i, buffer ? buffer->wined3d_buffer : NULL, offsets[i], strides[i]); } }

1 0

Henri Verbeet : wined3d: Add support for geometry shaders to the GLSL shader backend.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 9a27b0ad71acd52855eef1a710cb487ad677f37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a27b0ad71acd52855eef1a71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:05:59 2012 +0100 wined3d: Add support for geometry shaders to the GLSL shader backend. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 173 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 24 ++++++ dlls/wined3d/wined3d_private.h | 9 ++ 4 files changed, 204 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a27b0ad71acd52855eef…

1 0