wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Piotr Caban : msvcp60: Fixed basic_filebuf<char> implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 043fcc92be98c95d299503ea04accf4786266a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=043fcc92be98c95d299503ea0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:37:25 2012 +0100 msvcp60: Fixed basic_filebuf<char> implementation. --- dlls/msvcp60/ios.c | 225 ++++++++++++++++++--------------------------- dlls/msvcp60/locale.c | 4 - dlls/msvcp60/msvcp.h | 7 ++ dlls/msvcp60/msvcp60.spec | 8 +- 4 files changed, 99 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=043fcc92be98c95d29950…

1 0

Piotr Caban : msvcp90: Fixed basic_istream_char_read_uint64 tests.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: aa04ea700986d44b32d3c598837df6f14b707dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa04ea700986d44b32d3c5988… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:33:42 2012 +0100 msvcp90: Fixed basic_istream_char_read_uint64 tests. --- dlls/msvcp90/tests/ios.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index f0bc59e..0ae34d3 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -934,6 +934,12 @@ static void test_num_get_get_uint64(void) state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &ss.basic_ios.base); next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); + if(state==IOSTATE_faileof && tests[i].val==~0) { + /* Maximal uint64 test is broken on 9.0.21022.8 */ + skip("basic_istream_char_read_uint64(MAX_UINT64) is broken\n"); + continue; + } + ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val);

1 0

Michael Stefaniuc : msvcp100: Avoid FALSE:TRUE conditional expressions.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: bdd9a6294de0d13f23ed21ca0073add417e12d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd9a6294de0d13f23ed21ca0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 14 12:29:59 2012 +0100 msvcp100: Avoid FALSE:TRUE conditional expressions. --- dlls/msvcp100/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/string.c b/dlls/msvcp100/string.c index 7faf95f..9771ace 100644 --- a/dlls/msvcp100/string.c +++ b/dlls/msvcp100/string.c @@ -189,7 +189,7 @@ static MSVCP_bool basic_string_char_inside( { char *cstr = basic_string_char_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IAEX_NI@Z */ @@ -474,7 +474,7 @@ static MSVCP_bool basic_string_wchar_inside( { wchar_t *cstr = basic_string_wchar_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@IAEX_NI@Z */

1 0

Michael Stefaniuc : oleaut32: Remove a superfluous TRUE: FALSE conditional expression.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 333c71730d05147d039a3b031c37f35198831224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333c71730d05147d039a3b031… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 14 12:35:49 2012 +0100 oleaut32: Remove a superfluous TRUE:FALSE conditional expression. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 8a77593..21a2758 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2252,7 +2252,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, } /* Zero is not a negative number */ - bNegative = pNumprs->dwOutFlags & NUMPRS_NEG && ul64 ? TRUE : FALSE; + bNegative = pNumprs->dwOutFlags & NUMPRS_NEG && ul64; TRACE("Integer value is 0x%s, bNeg %d\n", wine_dbgstr_longlong(ul64), bNegative);

1 0

Christian Costa : user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 5267f8b7d99aed32fe15ee02b0bfdcf7b47edc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5267f8b7d99aed32fe15ee02b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 13 21:16:44 2012 +0100 user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient. Based on a patch by Rico Schüller. --- dlls/user32/tests/win.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 223 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5267f8b7d99aed32fe15e…

1 0

Alexandre Julliard : user32: Add some error checking in ScreenToClient and ClientToScreen.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 7fc61f6fea27d207706f896dbf47285516ebe760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc61f6fea27d207706f896db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 16:29:39 2012 +0100 user32: Add some error checking in ScreenToClient and ClientToScreen. --- dlls/user32/winpos.c | 62 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c620df9..0ce3ddd 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -235,26 +235,6 @@ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect ) } -/******************************************************************* - * ClientToScreen (USER32.@) - */ -BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) -{ - MapWindowPoints( hwnd, 0, lppnt, 1 ); - return TRUE; -} - - -/******************************************************************* - * ScreenToClient (USER32.@) - */ -BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) -{ - MapWindowPoints( 0, hwnd, lppnt, 1 ); - return TRUE; -} - - /*********************************************************************** * list_children_from_point * @@ -588,6 +568,48 @@ INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count } +/******************************************************************* + * ClientToScreen (USER32.@) + */ +BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) +{ + POINT offset; + BOOL mirrored; + + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + if (!WINPOS_GetWinOffset( hwnd, 0, &mirrored, &offset )) return FALSE; + lppnt->x += offset.x; + lppnt->y += offset.y; + if (mirrored) lppnt->x = -lppnt->x; + return TRUE; +} + + +/******************************************************************* + * ScreenToClient (USER32.@) + */ +BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) +{ + POINT offset; + BOOL mirrored; + + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + if (!WINPOS_GetWinOffset( 0, hwnd, &mirrored, &offset )) return FALSE; + lppnt->x += offset.x; + lppnt->y += offset.y; + if (mirrored) lppnt->x = -lppnt->x; + return TRUE; +} + + /*********************************************************************** * IsIconic (USER32.@) */

1 0

Alexandre Julliard : user32: Properly set last error in MapWindowPoints.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 5dea6543170fd12928cf2196b55fec9c2fe82c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dea6543170fd12928cf2196b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 16:26:13 2012 +0100 user32: Properly set last error in MapWindowPoints. --- dlls/user32/winpos.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index eda5b78..c620df9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -422,11 +422,11 @@ HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt, UINT uFlags) * Calculate the offset between the origin of the two windows. Used * to implement MapWindowPoints. */ -static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) +static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POINT *ret_offset ) { WND * wndPtr; POINT offset; - BOOL mirror_from, mirror_to; + BOOL mirror_from, mirror_to, ret; HWND hwnd; offset.x = offset.y = 0; @@ -435,7 +435,11 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) /* Translate source window origin to screen coords */ if (hwndFrom) { - if (!(wndPtr = WIN_GetPtr( hwndFrom ))) return offset; + if (!(wndPtr = WIN_GetPtr( hwndFrom ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } if (wndPtr == WND_OTHER_PROCESS) goto other_process; if (wndPtr != WND_DESKTOP) { @@ -466,7 +470,11 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) /* Translate origin to destination window coords */ if (hwndTo) { - if (!(wndPtr = WIN_GetPtr( hwndTo ))) return offset; + if (!(wndPtr = WIN_GetPtr( hwndTo ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } if (wndPtr == WND_OTHER_PROCESS) goto other_process; if (wndPtr != WND_DESKTOP) { @@ -496,35 +504,37 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) *mirrored = mirror_from ^ mirror_to; if (mirror_from) offset.x = -offset.x; - return offset; + *ret_offset = offset; + return TRUE; other_process: /* one of the parents may belong to another process, do it the hard way */ - offset.x = offset.y = 0; SERVER_START_REQ( get_windows_offset ) { req->from = wine_server_user_handle( hwndFrom ); req->to = wine_server_user_handle( hwndTo ); - if (!wine_server_call( req )) + if ((ret = !wine_server_call_err( req ))) { - offset.x = reply->x; - offset.y = reply->y; + ret_offset->x = reply->x; + ret_offset->y = reply->y; *mirrored = reply->mirror; } } SERVER_END_REQ; - return offset; + return ret; } /* map coordinates of a window region */ void map_window_region( HWND from, HWND to, HRGN hrgn ) { BOOL mirrored; - POINT offset = WINPOS_GetWinOffset( from, to, &mirrored ); + POINT offset; UINT i, size; RGNDATA *data; HRGN new_rgn; RECT *rect; + if (!WINPOS_GetWinOffset( from, to, &mirrored, &offset )) return; + if (!mirrored) { OffsetRgn( hrgn, offset.x, offset.y ); @@ -557,9 +567,11 @@ void map_window_region( HWND from, HWND to, HRGN hrgn ) INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count ) { BOOL mirrored; - POINT offset = WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored ); + POINT offset; UINT i; + if (!WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored, &offset )) return 0; + for (i = 0; i < count; i++) { lppt[i].x += offset.x;

1 0

Alexandre Julliard : user32: Add helper functions for loading and saving system parameter registry entries .
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: fb1c533e94578f1fb21b6e53b999517ca29f987c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb1c533e94578f1fb21b6e53b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 13:22:25 2012 +0100 user32: Add helper functions for loading and saving system parameter registry entries. --- dlls/user32/sysparams.c | 79 +++++++++++++++++++++------------------------- 1 files changed, 36 insertions(+), 43 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5070469..fa97815 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -606,7 +606,7 @@ static void SYSPARAMS_NotifyChange( UINT uiAction, UINT fWinIni ) /*********************************************************************** * Loads system parameter from user profile. */ -static BOOL SYSPARAMS_LoadRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, void *lpBuf, DWORD count ) +static BOOL SYSPARAMS_Load( LPCWSTR lpRegKey, LPCWSTR lpValName, void *lpBuf, DWORD count ) { BOOL ret = FALSE; DWORD type; @@ -629,11 +629,6 @@ static BOOL SYSPARAMS_LoadRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, void *lpBuf, return ret; } -static BOOL SYSPARAMS_Load( LPCWSTR lpRegKey, LPCWSTR lpValName, LPWSTR lpBuf, DWORD count ) -{ - return SYSPARAMS_LoadRaw( lpRegKey, lpValName, (LPBYTE)lpBuf, count ); -} - /*********************************************************************** * Saves system parameter to user profile. */ @@ -701,6 +696,28 @@ static BOOL SYSPARAMS_SaveLogFont( LPCWSTR lpRegKey, LPCWSTR lpValName, sizeof(LOGFONTW), REG_BINARY, fWinIni ); } +/* load a value to a registry entry */ +static BOOL load_entry( struct sysparam_entry *entry, void *data, DWORD size ) +{ + BOOL ret = SYSPARAMS_Load( entry->regkey, entry->regval, data, size ); + entry->loaded = TRUE; + return ret; +} + +/* save a value to a registry entry */ +static BOOL save_entry( const struct sysparam_entry *entry, const void *data, DWORD size, + DWORD type, UINT flags ) +{ + if (!SYSPARAMS_SaveRaw( entry->regkey, entry->regval, data, size, type, flags )) return FALSE; + if (entry->mirror) SYSPARAMS_SaveRaw( entry->mirror, entry->regval, data, size, type, flags ); + return TRUE; +} + +/* save a string value to a registry entry */ +static BOOL save_entry_string( const struct sysparam_entry *entry, const WCHAR *str, UINT flags ) +{ + return save_entry( entry, str, (strlenW(str) + 1) * sizeof(WCHAR), REG_SZ, flags ); +} static inline HDC get_display_dc(void) { @@ -1042,9 +1059,7 @@ static BOOL get_uint_entry( union sysparam_all_entry *entry, UINT int_param, voi { WCHAR buf[32]; - if (SYSPARAMS_Load( entry->hdr.regkey, entry->hdr.regval, buf, sizeof(buf) )) - entry->uint.val = atoiW( buf ); - entry->hdr.loaded = TRUE; + if (load_entry( &entry->hdr, buf, sizeof(buf) )) entry->uint.val = atoiW( buf ); } *(UINT *)ptr_param = entry->uint.val; return TRUE; @@ -1056,8 +1071,7 @@ static BOOL set_uint_entry( union sysparam_all_entry *entry, UINT int_param, voi WCHAR buf[32]; wsprintfW( buf, CSu, int_param ); - if (!SYSPARAMS_Save( entry->hdr.regkey, entry->hdr.regval, buf, flags )) return FALSE; - if (entry->hdr.mirror) SYSPARAMS_Save( entry->hdr.mirror, entry->hdr.regval, buf, flags ); + if (!save_entry_string( &entry->hdr, buf, flags )) return FALSE; entry->uint.val = int_param; entry->hdr.loaded = TRUE; return TRUE; @@ -1069,8 +1083,7 @@ static BOOL set_int_entry( union sysparam_all_entry *entry, UINT int_param, void WCHAR buf[32]; wsprintfW( buf, CSd, int_param ); - if (!SYSPARAMS_Save( entry->hdr.regkey, entry->hdr.regval, buf, flags )) return FALSE; - if (entry->hdr.mirror) SYSPARAMS_Save( entry->hdr.mirror, entry->hdr.regval, buf, flags ); + if (!save_entry_string( &entry->hdr, buf, flags )) return FALSE; entry->uint.val = int_param; entry->hdr.loaded = TRUE; return TRUE; @@ -1085,9 +1098,8 @@ static BOOL get_twips_entry( union sysparam_all_entry *entry, UINT int_param, vo { WCHAR buf[32]; - if (SYSPARAMS_Load( entry->hdr.regkey, entry->hdr.regval, buf, sizeof(buf) )) + if (load_entry( &entry->hdr, buf, sizeof(buf) )) entry->uint.val = SYSPARAMS_Twips2Pixels( atoiW(buf) ); - entry->hdr.loaded = TRUE; } *(UINT *)ptr_param = entry->uint.val; return TRUE; @@ -1102,9 +1114,7 @@ static BOOL get_bool_entry( union sysparam_all_entry *entry, UINT int_param, voi { WCHAR buf[32]; - if (SYSPARAMS_Load( entry->hdr.regkey, entry->hdr.regval, buf, sizeof(buf) )) - entry->bool.val = atoiW( buf ) != 0; - entry->hdr.loaded = TRUE; + if (load_entry( &entry->hdr, buf, sizeof(buf) )) entry->bool.val = atoiW( buf ) != 0; } *(UINT *)ptr_param = entry->bool.val; return TRUE; @@ -1116,8 +1126,7 @@ static BOOL set_bool_entry( union sysparam_all_entry *entry, UINT int_param, voi WCHAR buf[32]; wsprintfW( buf, CSu, int_param != 0 ); - if (!SYSPARAMS_Save( entry->hdr.regkey, entry->hdr.regval, buf, flags )) return FALSE; - if (entry->hdr.mirror) SYSPARAMS_Save( entry->hdr.mirror, entry->hdr.regval, buf, flags ); + if (!save_entry_string( &entry->hdr, buf, flags )) return FALSE; entry->bool.val = int_param != 0; entry->hdr.loaded = TRUE; return TRUE; @@ -1132,9 +1141,7 @@ static BOOL get_yesno_entry( union sysparam_all_entry *entry, UINT int_param, vo { WCHAR buf[32]; - if (SYSPARAMS_Load( entry->hdr.regkey, entry->hdr.regval, buf, sizeof(buf) )) - entry->bool.val = !lstrcmpiW( Yes, buf ); - entry->hdr.loaded = TRUE; + if (load_entry( &entry->hdr, buf, sizeof(buf) )) entry->bool.val = !lstrcmpiW( Yes, buf ); } *(UINT *)ptr_param = entry->bool.val; return TRUE; @@ -1145,8 +1152,7 @@ static BOOL set_yesno_entry( union sysparam_all_entry *entry, UINT int_param, vo { const WCHAR *str = int_param ? Yes : No; - if (!SYSPARAMS_Save( entry->hdr.regkey, entry->hdr.regval, str, flags )) return FALSE; - if (entry->hdr.mirror) SYSPARAMS_Save( entry->hdr.mirror, entry->hdr.regval, str, flags ); + if (!save_entry_string( &entry->hdr, str, flags )) return FALSE; entry->bool.val = int_param != 0; entry->hdr.loaded = TRUE; return TRUE; @@ -1161,9 +1167,7 @@ static BOOL get_dword_entry( union sysparam_all_entry *entry, UINT int_param, vo { DWORD val; - if (SYSPARAMS_LoadRaw( entry->hdr.regkey, entry->hdr.regval, &val, sizeof(val) )) - entry->dword.val = val; - entry->hdr.loaded = TRUE; + if (load_entry( &entry->hdr, &val, sizeof(val) )) entry->dword.val = val; } *(DWORD *)ptr_param = entry->bool.val; return TRUE; @@ -1174,10 +1178,7 @@ static BOOL set_dword_entry( union sysparam_all_entry *entry, UINT int_param, vo { DWORD val = PtrToUlong( ptr_param ); - if (!SYSPARAMS_SaveRaw( entry->hdr.regkey, entry->hdr.regval, &val, sizeof(val), REG_DWORD, flags )) - return FALSE; - if (entry->hdr.mirror) - SYSPARAMS_SaveRaw( entry->hdr.mirror, entry->hdr.regval, &val, sizeof(val), REG_DWORD, flags ); + if (!save_entry( &entry->hdr, &val, sizeof(val), REG_DWORD, flags )) return FALSE; entry->dword.val = val; entry->hdr.loaded = TRUE; return TRUE; @@ -1211,10 +1212,7 @@ static BOOL set_font_entry( union sysparam_all_entry *entry, UINT int_param, voi ptr = memchrW( font.lfFaceName, 0, LF_FACESIZE ); if (ptr) memset( ptr, 0, (font.lfFaceName + LF_FACESIZE - ptr) * sizeof(WCHAR) ); - if (!SYSPARAMS_SaveRaw( entry->hdr.regkey, entry->hdr.regval, &font, sizeof(font), REG_BINARY, flags )) - return FALSE; - if (entry->hdr.mirror) - SYSPARAMS_SaveRaw( entry->hdr.mirror, entry->hdr.regval, &font, sizeof(font), REG_BINARY, flags ); + if (!save_entry( &entry->hdr, &font, sizeof(font), REG_BINARY, flags )) return FALSE; entry->font.val = font; entry->hdr.loaded = TRUE; return TRUE; @@ -1229,9 +1227,8 @@ static BOOL get_binary_entry( union sysparam_all_entry *entry, UINT int_param, v { void *buffer = HeapAlloc( GetProcessHeap(), 0, entry->bin.size ); - if (SYSPARAMS_LoadRaw( entry->hdr.regkey, entry->hdr.regval, buffer, entry->bin.size )) + if (load_entry( &entry->hdr, buffer, entry->bin.size )) memcpy( entry->bin.ptr, buffer, entry->bin.size ); - entry->hdr.loaded = TRUE; HeapFree( GetProcessHeap(), 0, buffer ); } memcpy( ptr_param, entry->bin.ptr, min( int_param, entry->bin.size ) ); @@ -1246,13 +1243,9 @@ static BOOL set_binary_entry( union sysparam_all_entry *entry, UINT int_param, v memcpy( buffer, entry->bin.ptr, entry->bin.size ); memcpy( buffer, ptr_param, min( int_param, entry->bin.size )); - ret = SYSPARAMS_SaveRaw( entry->hdr.regkey, entry->hdr.regval, buffer, - entry->bin.size, REG_BINARY, flags ); + ret = save_entry( &entry->hdr, buffer, entry->bin.size, REG_BINARY, flags ); if (ret) { - if (entry->hdr.mirror) - SYSPARAMS_SaveRaw( entry->hdr.mirror, entry->hdr.regval, buffer, - entry->bin.size, REG_BINARY, flags ); memcpy( entry->bin.ptr, buffer, entry->bin.size ); entry->hdr.loaded = TRUE; }

1 0

Alexandre Julliard : user32: Support more user preference system parameters .
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 270979dc9ee30cd018f8b1070a8a8bf8eb7f3e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=270979dc9ee30cd018f8b1070… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 12:54:41 2012 +0100 user32: Support more user preference system parameters. --- dlls/user32/sysparams.c | 114 ++++++++++++++++++++++++++++++----------------- 1 files changed, 73 insertions(+), 41 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 66e12a3..5070469 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1264,7 +1264,7 @@ static BOOL set_binary_entry( union sysparam_all_entry *entry, UINT int_param, v static BOOL get_userpref_entry( union sysparam_all_entry *entry, UINT int_param, void *ptr_param ) { union sysparam_all_entry *parent_entry = (union sysparam_all_entry *)entry->pref.parent; - BYTE prefs[4]; + BYTE prefs[8]; if (!ptr_param) return FALSE; @@ -1277,7 +1277,7 @@ static BOOL get_userpref_entry( union sysparam_all_entry *entry, UINT int_param, static BOOL set_userpref_entry( union sysparam_all_entry *entry, UINT int_param, void *ptr_param, UINT flags ) { union sysparam_all_entry *parent_entry = (union sysparam_all_entry *)entry->pref.parent; - BYTE prefs[4]; + BYTE prefs[8]; parent_entry->hdr.loaded = FALSE; /* force loading it again */ if (!parent_entry->hdr.get( parent_entry, sizeof(prefs), prefs )) return FALSE; @@ -1404,26 +1404,33 @@ static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3 ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0 ); static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); -static BYTE user_prefs[4]; +static BYTE user_prefs[8] = { 0x30, 0x00, 0x02, 0x80, 0x10, 0x00, 0x00, 0x00 }; static BINARY_ENTRY( USERPREFERENCESMASK, user_prefs ); static FONT_ENTRY( ICONTITLELOGFONT ); -static USERPREF_ENTRY( MENUANIMATION, 0, 0x02 ); -static USERPREF_ENTRY( COMBOBOXANIMATION, 0, 0x04 ); -static USERPREF_ENTRY( LISTBOXSMOOTHSCROLLING, 0, 0x08 ); -static USERPREF_ENTRY( GRADIENTCAPTIONS, 0, 0x10 ); -static USERPREF_ENTRY( KEYBOARDCUES, 0, 0x20 ); -static USERPREF_ENTRY( HOTTRACKING, 0, 0x80 ); -static USERPREF_ENTRY( SELECTIONFADE, 1, 0x04 ); -static USERPREF_ENTRY( TOOLTIPANIMATION, 1, 0x08 ); -static USERPREF_ENTRY( TOOLTIPFADE, 1, 0x10 ); -static USERPREF_ENTRY( CURSORSHADOW, 1, 0x20 ); -static USERPREF_ENTRY( MOUSEVANISH, 2, 0x01 ); -static USERPREF_ENTRY( FLATMENU, 2, 0x02 ); -static USERPREF_ENTRY( DROPSHADOW, 2, 0x04 ); -static USERPREF_ENTRY( UIEFFECTS, 3, 0x80 ); - +static USERPREF_ENTRY( MENUANIMATION, 0, 0x02 ); +static USERPREF_ENTRY( COMBOBOXANIMATION, 0, 0x04 ); +static USERPREF_ENTRY( LISTBOXSMOOTHSCROLLING, 0, 0x08 ); +static USERPREF_ENTRY( GRADIENTCAPTIONS, 0, 0x10 ); +static USERPREF_ENTRY( KEYBOARDCUES, 0, 0x20 ); +static USERPREF_ENTRY( ACTIVEWNDTRKZORDER, 0, 0x40 ); +static USERPREF_ENTRY( HOTTRACKING, 0, 0x80 ); +static USERPREF_ENTRY( MENUFADE, 1, 0x02 ); +static USERPREF_ENTRY( SELECTIONFADE, 1, 0x04 ); +static USERPREF_ENTRY( TOOLTIPANIMATION, 1, 0x08 ); +static USERPREF_ENTRY( TOOLTIPFADE, 1, 0x10 ); +static USERPREF_ENTRY( CURSORSHADOW, 1, 0x20 ); +static USERPREF_ENTRY( MOUSESONAR, 1, 0x40 ); +static USERPREF_ENTRY( MOUSECLICKLOCK, 1, 0x80 ); +static USERPREF_ENTRY( MOUSEVANISH, 2, 0x01 ); +static USERPREF_ENTRY( FLATMENU, 2, 0x02 ); +static USERPREF_ENTRY( DROPSHADOW, 2, 0x04 ); +static USERPREF_ENTRY( UIEFFECTS, 3, 0x80 ); +static USERPREF_ENTRY( DISABLEOVERLAPPEDCONTENT, 4, 0x01 ); +static USERPREF_ENTRY( CLIENTAREAANIMATION, 4, 0x02 ); +static USERPREF_ENTRY( CLEARTYPE, 4, 0x10 ); +static USERPREF_ENTRY( SPEECHRECOGNITION, 4, 0x20 ); /*********************************************************************** * SystemParametersInfoW (USER32.@) @@ -2201,18 +2208,24 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETKEYBOARDCUES: ret = set_entry( &entry_KEYBOARDCUES, uiParam, pvParam, fWinIni ); break; - - WINE_SPI_FIXME(SPI_GETACTIVEWNDTRKZORDER); /* 0x100C _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETACTIVEWNDTRKZORDER); /* 0x100D _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETACTIVEWNDTRKZORDER: + ret = get_entry( &entry_ACTIVEWNDTRKZORDER, uiParam, pvParam ); + break; + case SPI_SETACTIVEWNDTRKZORDER: + ret = set_entry( &entry_ACTIVEWNDTRKZORDER, uiParam, pvParam, fWinIni ); + break; case SPI_GETHOTTRACKING: ret = get_entry( &entry_HOTTRACKING, uiParam, pvParam ); break; case SPI_SETHOTTRACKING: ret = set_entry( &entry_HOTTRACKING, uiParam, pvParam, fWinIni ); break; - - WINE_SPI_FIXME(SPI_GETMENUFADE); /* 0x1012 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETMENUFADE); /* 0x1013 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETMENUFADE: + ret = get_entry( &entry_MENUFADE, uiParam, pvParam ); + break; + case SPI_SETMENUFADE: + ret = set_entry( &entry_MENUFADE, uiParam, pvParam, fWinIni ); + break; case SPI_GETSELECTIONFADE: ret = get_entry( &entry_SELECTIONFADE, uiParam, pvParam ); break; @@ -2237,12 +2250,18 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETCURSORSHADOW: ret = set_entry( &entry_CURSORSHADOW, uiParam, pvParam, fWinIni ); break; - - WINE_SPI_FIXME(SPI_GETMOUSESONAR); /* 0x101C _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_SETMOUSESONAR); /* 0x101D _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_GETMOUSECLICKLOCK); /* 0x101E _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_SETMOUSECLICKLOCK); /* 0x101F _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - + case SPI_GETMOUSESONAR: + ret = get_entry( &entry_MOUSESONAR, uiParam, pvParam ); + break; + case SPI_SETMOUSESONAR: + ret = set_entry( &entry_MOUSESONAR, uiParam, pvParam, fWinIni ); + break; + case SPI_GETMOUSECLICKLOCK: + ret = get_entry( &entry_MOUSECLICKLOCK, uiParam, pvParam ); + break; + case SPI_SETMOUSECLICKLOCK: + ret = set_entry( &entry_MOUSECLICKLOCK, uiParam, pvParam, fWinIni ); + break; case SPI_GETMOUSEVANISH: ret = get_entry( &entry_MOUSEVANISH, uiParam, pvParam ); break; @@ -2274,17 +2293,30 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, /* FIXME: this probably should mask other UI effect values when unset */ ret = set_entry( &entry_UIEFFECTS, uiParam, pvParam, fWinIni ); break; - - /* _WIN32_WINNT >= 0x600 */ - WINE_SPI_FIXME(SPI_GETDISABLEOVERLAPPEDCONTENT); - WINE_SPI_FIXME(SPI_SETDISABLEOVERLAPPEDCONTENT); - WINE_SPI_FIXME(SPI_GETCLIENTAREAANIMATION); - WINE_SPI_FIXME(SPI_SETCLIENTAREAANIMATION); - WINE_SPI_FIXME(SPI_GETCLEARTYPE); - WINE_SPI_FIXME(SPI_SETCLEARTYPE); - WINE_SPI_FIXME(SPI_GETSPEECHRECOGNITION); - WINE_SPI_FIXME(SPI_SETSPEECHRECOGNITION); - + case SPI_GETDISABLEOVERLAPPEDCONTENT: + ret = get_entry( &entry_DISABLEOVERLAPPEDCONTENT, uiParam, pvParam ); + break; + case SPI_SETDISABLEOVERLAPPEDCONTENT: + ret = set_entry( &entry_DISABLEOVERLAPPEDCONTENT, uiParam, pvParam, fWinIni ); + break; + case SPI_GETCLIENTAREAANIMATION: + ret = get_entry( &entry_CLIENTAREAANIMATION, uiParam, pvParam ); + break; + case SPI_SETCLIENTAREAANIMATION: + ret = set_entry( &entry_CLIENTAREAANIMATION, uiParam, pvParam, fWinIni ); + break; + case SPI_GETCLEARTYPE: + ret = get_entry( &entry_CLEARTYPE, uiParam, pvParam ); + break; + case SPI_SETCLEARTYPE: + ret = set_entry( &entry_CLEARTYPE, uiParam, pvParam, fWinIni ); + break; + case SPI_GETSPEECHRECOGNITION: + ret = get_entry( &entry_SPEECHRECOGNITION, uiParam, pvParam ); + break; + case SPI_SETSPEECHRECOGNITION: + ret = set_entry( &entry_SPEECHRECOGNITION, uiParam, pvParam, fWinIni ); + break; case SPI_GETFOREGROUNDLOCKTIMEOUT: ret = get_entry( &entry_FOREGROUNDLOCKTIMEOUT, uiParam, pvParam ); break;

1 0

Alexandre Julliard : user32: Add system parameter descriptors for user preference parameters.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 95d782779c92dfb3d07fcaf82deb1048b9ff2f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d782779c92dfb3d07fcaf82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 12:19:19 2012 +0100 user32: Add system parameter descriptors for user preference parameters. --- dlls/user32/sysparams.c | 270 ++++++++++++++++++++++++++++------------------- 1 files changed, 161 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95d782779c92dfb3d07fc…

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
71
Older →

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 November 2012