November 2012 - Wine-commits

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

15 Nov '12

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: Add parameter entry objects for the desktop wallpaper and pattern.
by Alexandre Julliard 15 Nov '12

15 Nov '12

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: Simplify initialization of the desktop wallpaper.
by Alexandre Julliard 15 Nov '12

15 Nov '12

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: Check the length of the loaded registry key for system parameters.
by Alexandre Julliard 15 Nov '12

15 Nov '12

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: Forward SystemParametersInfo calls to the user driver first.
by Alexandre Julliard 15 Nov '12

15 Nov '12

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

Alexandre Julliard : winex11: Move the screen saver support to a new SystemParametersInfo entry point.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 67d16ddee3ba20ea0aa794a4153fcbbb67869a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d16ddee3ba20ea0aa794a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 17:46:37 2012 +0100 winex11: Move the screen saver support to a new SystemParametersInfo entry point. --- dlls/winex11.drv/winex11.drv.spec | 3 +- dlls/winex11.drv/x11drv_main.c | 58 +++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index db3e4f5..f14be21 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -19,8 +19,6 @@ @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor -@ cdecl GetScreenSaveActive() X11DRV_GetScreenSaveActive -@ cdecl SetScreenSaveActive(long) X11DRV_SetScreenSaveActive @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx @ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @@ -54,6 +52,7 @@ @ cdecl WindowMessage(long long long long) X11DRV_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) X11DRV_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) X11DRV_WindowPosChanged +@ cdecl SystemParametersInfo(long long ptr long) X11DRV_SystemParametersInfo # WinTab32 @ cdecl AttachEventQueueToTablet(long) X11DRV_AttachEventQueueToTablet diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 3ff4233..ef6b1a9 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -696,35 +696,39 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return ret; } -/*********************************************************************** - * GetScreenSaveActive (X11DRV.@) - * - * Returns the active status of the screen saver - */ -BOOL CDECL X11DRV_GetScreenSaveActive(void) -{ - int timeout, temp; - XGetScreenSaver(gdi_display, &timeout, &temp, &temp, &temp); - return timeout != 0; -} /*********************************************************************** - * SetScreenSaveActive (X11DRV.@) - * - * Activate/Deactivate the screen saver + * SystemParametersInfo (X11DRV.@) */ -void CDECL X11DRV_SetScreenSaveActive(BOOL bActivate) +BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ) { - int timeout, interval, prefer_blanking, allow_exposures; - static int last_timeout = 15 * 60; - - XLockDisplay( gdi_display ); - XGetScreenSaver(gdi_display, &timeout, &interval, &prefer_blanking, - &allow_exposures); - if (timeout) last_timeout = timeout; - - timeout = bActivate ? last_timeout : 0; - XSetScreenSaver(gdi_display, timeout, interval, prefer_blanking, - allow_exposures); - XUnlockDisplay( gdi_display ); + switch (action) + { + case SPI_GETSCREENSAVEACTIVE: + if (ptr_param) + { + int timeout, temp; + XGetScreenSaver(gdi_display, &timeout, &temp, &temp, &temp); + *(BOOL *)ptr_param = timeout != 0; + return TRUE; + } + break; + case SPI_SETSCREENSAVEACTIVE: + { + int timeout, interval, prefer_blanking, allow_exposures; + static int last_timeout = 15 * 60; + + XLockDisplay( gdi_display ); + XGetScreenSaver(gdi_display, &timeout, &interval, &prefer_blanking, + &allow_exposures); + if (timeout) last_timeout = timeout; + + timeout = int_param ? last_timeout : 0; + XSetScreenSaver(gdi_display, timeout, interval, prefer_blanking, + allow_exposures); + XUnlockDisplay( gdi_display ); + } + break; + } + return FALSE; /* let user32 handle it */ }

1 0

Dmitry Timoshkov : fonts: Update 10-pixel cyrillic bitmaps for Tahoma.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: e070173ac6316cd9afc2755087d8e6b95b6cdafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e070173ac6316cd9afc275508… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 15 16:44:43 2012 +0800 fonts: Update 10-pixel cyrillic bitmaps for Tahoma. --- fonts/tahoma.sfd | 352 ++++++++++++++++++++++++++++-------------------------- fonts/tahoma.ttf | Bin 101036 -> 101052 bytes 2 files changed, 180 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e070173ac6316cd9afc27…

1 0

Jacek Caban : atl: Properly fail on an aggregation attempt.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: efd0eead07b81ea01abbbcb97ba3cd7536448f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd0eead07b81ea01abbbcb97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 15 11:21:57 2012 +0100 atl: Properly fail on an aggregation attempt. --- dlls/atl/registrar.c | 49 ++++++++++++++++++++++++++++++------------- dlls/atl/tests/registrar.c | 12 ++++++++++ 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 7b1fe30..028f35e 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -698,21 +698,22 @@ static const IRegistrarVtbl RegistrarVtbl = { Registrar_ResourceUnregister, }; -static HRESULT Registrar_create(const IUnknown *pUnkOuter, REFIID riid, void **ppvObject) +/* Exported only by newer ATL versions */ +static HRESULT AtlCreateRegistrar(IRegistrar **ret) { - Registrar *ret; + Registrar *registrar; - if(!IsEqualGUID(&IID_IUnknown, riid) && !IsEqualGUID(&IID_IRegistrar, riid)) - return E_NOINTERFACE; + registrar = HeapAlloc(GetProcessHeap(), 0, sizeof(*registrar)); + if(!registrar) + return E_OUTOFMEMORY; - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(Registrar)); - ret->IRegistrar_iface.lpVtbl = &RegistrarVtbl; - ret->ref = 1; - ret->rep = NULL; - *ppvObject = ret; + registrar->IRegistrar_iface.lpVtbl = &RegistrarVtbl; + registrar->ref = 1; + registrar->rep = NULL; InterlockedIncrement(&dll_count); + *ret = &registrar->IRegistrar_iface; return S_OK; } @@ -746,10 +747,25 @@ static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface) } static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN pUnkOuter, - REFIID riid, void **ppvObject) + REFIID riid, void **ppv) { - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); - return Registrar_create(pUnkOuter, riid, ppvObject); + IRegistrar *registrar; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + + if(pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + + hres = IRegistrar_QueryInterface(registrar, riid, ppv); + IRegistrar_Release(registrar); + return hres; } static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock) @@ -801,10 +817,13 @@ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; - if (pRegistrar) + if(pRegistrar) { registrar = pRegistrar; - else - Registrar_create(NULL, &IID_IRegistrar, (void**)&registrar); + }else { + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + } IRegistrar_AddReplacement(registrar, wszModule, wszDll); diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index 9c5dd23..1b1c797 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -135,11 +135,23 @@ static void test_registrar(void) IRegistrar_Release(registrar); } +static void test_aggregation(void) +{ + IUnknown *unk = (IUnknown*)0xdeadbeef; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_Registrar, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + ok(hres == CLASS_E_NOAGGREGATION, "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); + ok(!unk, "unk = %p\n", unk); +} + START_TEST(registrar) { CoInitialize(NULL); test_registrar(); + test_aggregation(); CoUninitialize(); }

1 0

Jacek Caban : cmd: Make allocation unfailable.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: c6d24089dbc284f0fef5e1ce37b75ac04c6ebd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d24089dbc284f0fef5e1ce3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 15 12:32:21 2012 +0100 cmd: Make allocation unfailable. --- programs/cmd/batch.c | 5 +- programs/cmd/builtins.c | 43 ++++++----------- programs/cmd/directory.c | 31 ++++-------- programs/cmd/wcmd.h | 18 +++++++- programs/cmd/wcmdmain.c | 116 ++++++++++++++++++++-------------------------- 5 files changed, 96 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6d24089dbc284f0fef5e…

1 0

Hans Leidekker : windowscodecs: Implement WICCreateColorContext_Proxy.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 1b762afa63ec6541425ae827090cde03ee152997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b762afa63ec6541425ae8270… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:06:10 2012 +0100 windowscodecs: Implement WICCreateColorContext_Proxy. --- dlls/windowscodecs/proxy.c | 7 +++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 4ee12c2..2f727b4 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -620,6 +620,13 @@ HRESULT WINAPI IWICStream_InitializeFromMemory_Proxy_W(IWICStream *iface, return IWICStream_InitializeFromMemory(iface, pbBuffer, cbBufferSize); } +HRESULT WINAPI WICCreateColorContext_Proxy(IWICImagingFactory *iface, IWICColorContext **ppIWICColorContext) +{ + TRACE("%p, %p\n", iface, ppIWICColorContext); + + return IWICImagingFactory_CreateColorContext(iface, ppIWICColorContext); +} + HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT SDKVersion, IWICImagingFactory **ppIImagingFactory) { TRACE("%x, %p\n", SDKVersion, ppIImagingFactory); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 453a84e..3d70084 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -106,7 +106,7 @@ @ stdcall IWICStream_InitializeFromMemory_Proxy(ptr ptr long) IWICStream_InitializeFromMemory_Proxy_W @ stdcall WICConvertBitmapSource(ptr ptr ptr) @ stub WICCreateBitmapFromSection -@ stub WICCreateColorContext_Proxy +@ stdcall WICCreateColorContext_Proxy(ptr ptr) @ stdcall WICCreateImagingFactory_Proxy(long ptr) @ stub WICGetMetadataContentSize @ stub WICMapGuidToShortName

1 0