November 2012 - Wine-Commits

Alexandre Julliard : user32: Support more user preference system parameters .
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

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 helper functions for loading and saving system parameter registry entries .
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

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

Piotr Caban : msvcp60: Fixed basic_filebuf<short> implementation.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: 3b69e28a899bc9739fea1d446b4c0661d0b85bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b69e28a899bc9739fea1d446… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:37:42 2012 +0100 msvcp60: Fixed basic_filebuf<short> implementation. --- dlls/msvcp60/ios.c | 250 +++++++++++++++++-------------------------------- dlls/msvcp60/msvcp.h | 1 + 2 files changed, 88 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b69e28a899bc9739fea1…

1 0

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

Nov. 14, 2012

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

Michael Stefaniuc : msvcp100: Avoid FALSE:TRUE conditional expressions.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

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(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEX_NI(a)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(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEX_NI(a)Z */

1 0

Nozomi Kodama : d3dx9_36: Fix the case out = in for D3DXSHRotate.
by Alexandre Julliard Nov. 13, 2012

Nov. 13, 2012

Module: wine Branch: master Commit: 965e27149abc5d1becd4530d01f03dff42677721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965e27149abc5d1becd4530d0… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Sun Nov 11 15:23:57 2012 -1000 d3dx9_36: Fix the case out = in for D3DXSHRotate. --- dlls/d3dx9_36/math.c | 12 ++++---- dlls/d3dx9_36/tests/math.c | 65 ++++++++++++++++++++++++++++++------------- 2 files changed, 51 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 05125f7..12073e3 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2774,7 +2774,7 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in) FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, CONST D3DXMATRIX *matrix, CONST FLOAT *in) { - FLOAT alpha, beta, gamma, sinb, temp[36]; + FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36]; TRACE("out %p, order %u, matrix %p, in %p\n", out, order, matrix, in); @@ -2848,11 +2848,11 @@ FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, CONST D3DXMATRIX *matrix, CON gamma = 0.0f; } - D3DXSHRotateZ(out, order, gamma, in); - rotate_X(temp, order, 1.0f, out); - D3DXSHRotateZ(out, order, beta, temp); - rotate_X(temp, order, -1.0f, out); - D3DXSHRotateZ(out, order, alpha, temp); + D3DXSHRotateZ(temp, order, gamma, in); + rotate_X(temp1, order, 1.0f, temp); + D3DXSHRotateZ(temp, order, beta, temp1); + rotate_X(temp1, order, -1.0f, temp); + D3DXSHRotateZ(out, order, alpha, temp1); return out; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 53262b7..c727c5f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2751,7 +2751,7 @@ static void test_D3DXSHMultiply4(void) static void test_D3DXSHRotate(void) { D3DXMATRIX m[4]; - FLOAT expected, in[49], out[49], *received_ptr; + FLOAT expected, in[49], out[49], *out_temp, *received_ptr; static const FLOAT table[]= { /* Rotation around X-axis Pi/2 */ 1.01f, -3.01f, 2.01f, 4.01f, -8.01f, -6.01f, @@ -2760,6 +2760,8 @@ static void test_D3DXSHRotate(void) 30.241013f, 26.919991f, 39.236877f, -22.632446f, 6.707388f, -11.768282f, 3.443672f, -6.07445f, 11.61839f, 1.527561f, 37.89633f, -56.9012f, 47.42289f, 50.39153f, 10.61819f, 25.50101f, 0.049241f, 16.98330f, + + 1.01f, -3.01f, -3.01f, 4.01f, -8.01f, -6.01f, -11.307889f, -8.01f, 14.297919f, /* Rotation around X-axis -Pi/2 */ 1.01f, 3.01f, -2.01f, 4.01f, 8.01f, -6.01f, -11.307890f, -5.01f, -1.565839f, -1.093598f, -11.01f, -19.833414f, @@ -2767,6 +2769,8 @@ static void test_D3DXSHRotate(void) -30.241013f, 26.919991f, 39.236877f, 22.632446f, 6.707388f, 11.768282f, 3.443672f, 6.07445f, 11.61839f, -1.527561f, 37.89633f, 56.9012f, -47.42289f, 50.39153f, -10.61819f, 25.50101f, -0.049248f, 16.98330f, + + 1.01f, 3.01f, -3.01f, 4.01f, 8.01f, -6.01f, -11.307890f, -8.01f, 14.297919f, /* Yaw Pi/3, Pitch Pi/4, Roll Pi/5 */ 1.01f, 4.944899f, 1.442301f, 1.627281f, 0.219220f, 10.540824f, -9.136903f, 2.763750f, -7.30904f, -5.875721f, 5.303124f, -8.682154f, @@ -2774,41 +2778,62 @@ static void test_D3DXSHRotate(void) 14.629795f, -54.467102f, -12.231035f, -4.089857f, -9.444222f, 3.056035f, 0.179257f, -10.041875f, 23.090092f, -23.188709f, 11.727098f, -65.183090f, 48.671577f, -15.073209f, 38.793171f, -26.039536f, 6.192769f, -17.672247f, + + 1.01f, 4.944899f, -0.891142f, 4.607695f, 0.219218f, 10.773325f, + -8.204769f, 13.563829f, -12.007767f, /* Rotation around Z-axis Pi/6 */ 1.01f, 3.745711f, 3.01f, 2.467762f, 10.307889f, 9.209813f, 7.01f, 3.931864f, 0.166212f, 16.01f, 18.504042f, 17.405966f, 13.01f, 6.128016f, -2.029941f, -10.01f, 13.154292f, 24.01f, 29.432245f, 28.334167f, 21.01f, 9.056221f, -4.958143f, -18.01f, -27.236094f, -4.520332f, 16.814543f, 34.01f, 43.092495f, 41.994423f, - 31.01f, 12.716471f, -8.618400f, -28.01f, -40.896347f, -44.190571,}; - unsigned int i, j, order; + 31.01f, 12.716471f, -8.618400f, -28.01f, -40.896347f, -44.190571, + + 1.01f, 3.745711f, 3.01f, 1.599906f, 10.307889f, 9.209813f, + 7.01f, 2.331957f, -4.421894f, }; + unsigned int i, j, l, order; D3DXMatrixRotationX(&m[0], -D3DX_PI / 2.0f); D3DXMatrixRotationX(&m[1], D3DX_PI / 2.0f); D3DXMatrixRotationYawPitchRoll(&m[2], D3DX_PI / 3.0f, D3DX_PI / 4.0f, D3DX_PI / 5.0f); D3DXMatrixRotationZ(&m[3], D3DX_PI / 6.0f); - for (i = 0; i < 49; i++) - in[i] = i + 1.01f; - - for (j = 0; j < 4; j++) + for (l = 0; l < 2; l++) { - for (order = 0; order <= D3DXSH_MAXORDER; order++) - { - for (i = 0; i < 49; i++) - out[i] = ( i + 1.0f ) * ( i + 1.0f ); - - received_ptr = D3DXSHRotate(out, order, &m[j], in); - ok(received_ptr == out, "Order %u, expected %p, received %p\n", order, out, received_ptr); + if (l == 0) + out_temp = out; + else + out_temp = in; - for (i = 0; i < 49; i++) + for (j = 0; j < 4; j++) + { + for (order = 0; order <= D3DXSH_MAXORDER; order++) { - if ( ( i > 0 ) && ( ( i >= order * order ) || ( order > D3DXSH_MAXORDER ) ) ) - expected = ( i + 1.0f ) * ( i + 1.0f ); - else - expected = table[36 * j + i]; + for (i = 0; i < 49; i++) + { + out[i] = ( i + 1.0f ) * ( i + 1.0f ); + in[i] = i + 1.01f; + } + + received_ptr = D3DXSHRotate(out_temp, order, &m[j], in); + ok(received_ptr == out_temp, "Order %u, expected %p, received %p\n", order, out, received_ptr); - ok(relative_error(out[i], expected) < admitted_error, "Order %u index %u, expected %f, received %f\n", order, i, expected, out[i]); + for (i = 0; i < 49; i++) + { + if ((i > 0) && ((i >= order * order) || (order > D3DXSH_MAXORDER))) + { + if (l == 0) + expected = ( i + 1.0f ) * ( i + 1.0f ); + else + expected = i + 1.01f; + } + else if ((l == 0) || (order > 3)) + expected = table[45 * j + i]; + else + expected = table[45 * j + 36 +i]; + ok(relative_error(out_temp[i], expected) < admitted_error, + "Order %u index %u, expected %f, received %f\n", order, i, expected, out_temp[i]); + } } } }

1 0

Jörg Höhle : mciavi: Fix player deadlock when starting to play.
by Alexandre Julliard Nov. 13, 2012

Nov. 13, 2012

Module: wine Branch: master Commit: 42bdb48c675be7bc1b38a76554d2eb78fd64026c URL: http://source.winehq.org/git/wine.git/?a=commit;h=42bdb48c675be7bc1b38a7655… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 6 22:59:55 2012 +0100 mciavi: Fix player deadlock when starting to play. --- dlls/mciavi32/mciavi.c | 265 +++++++++++++++++++++------------------- dlls/mciavi32/private_mciavi.h | 1 - 2 files changed, 138 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42bdb48c675be7bc1b38a…

1 0

Detlef Riekenberg : advapi32/tests: Test string alias for common RID in sid strings.
by Alexandre Julliard Nov. 13, 2012

Nov. 13, 2012

Module: wine Branch: master Commit: ef603cbbd9867c0f6cbf3b3d174b27082ab8d255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef603cbbd9867c0f6cbf3b3d1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 13 05:31:25 2012 +0100 advapi32/tests: Test string alias for common RID in sid strings. --- dlls/advapi32/tests/security.c | 120 +++++++++++++++++++-------------------- 1 files changed, 58 insertions(+), 62 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f5fc4e2..844b238 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -129,6 +129,14 @@ static HMODULE hmod; static int myARGC; static char** myARGV; +struct strsid_entry +{ + const char *str; + DWORD flags; +}; +#define STRSID_OK 0 +#define STRSID_OPT 1 + struct sidRef { SID_IDENTIFIER_AUTHORITY auth; @@ -173,29 +181,6 @@ static void init(void) myARGC = winetest_get_mainargs( &myARGV ); } -static void test_str_sid(const char *str_sid) -{ - PSID psid; - char *temp; - - if (pConvertStringSidToSidA(str_sid, &psid)) - { - if (pConvertSidToStringSidA(psid, &temp)) - { - trace(" %s: %s\n", str_sid, temp); - LocalFree(temp); - } - LocalFree(psid); - } - else - { - if (GetLastError() != ERROR_INVALID_SID) - trace(" %s: couldn't be converted, returned %d\n", str_sid, GetLastError()); - else - trace(" %s: couldn't be converted\n", str_sid); - } -} - static void test_sid(void) { struct sidRef refs[] = { @@ -206,6 +191,18 @@ static void test_sid(void) { { {0x00,0x00,0x00,0x00,0x00,0x02} }, "S-1-2-1" }, { { {0x00,0x00,0x00,0x00,0x00,0x0c} }, "S-1-12-1" }, }; + struct strsid_entry strsid_table[] = { + {"AO", STRSID_OK}, {"RU", STRSID_OK}, {"AN", STRSID_OK}, {"AU", STRSID_OK}, + {"BA", STRSID_OK}, {"BG", STRSID_OK}, {"BO", STRSID_OK}, {"BU", STRSID_OK}, + {"CA", STRSID_OPT}, {"CG", STRSID_OK}, {"CO", STRSID_OK}, {"DA", STRSID_OPT}, + {"DC", STRSID_OPT}, {"DD", STRSID_OPT}, {"DG", STRSID_OPT}, {"DU", STRSID_OPT}, + {"EA", STRSID_OPT}, {"ED", STRSID_OK}, {"WD", STRSID_OK}, {"PA", STRSID_OPT}, + {"IU", STRSID_OK}, {"LA", STRSID_OK}, {"LG", STRSID_OK}, {"LS", STRSID_OK}, + {"SY", STRSID_OK}, {"NU", STRSID_OK}, {"NO", STRSID_OK}, {"NS", STRSID_OK}, + {"PO", STRSID_OK}, {"PS", STRSID_OK}, {"PU", STRSID_OK}, {"RS", STRSID_OPT}, + {"RD", STRSID_OK}, {"RE", STRSID_OK}, {"RC", STRSID_OK}, {"SA", STRSID_OPT}, + {"SO", STRSID_OK}, {"SU", STRSID_OK}}; + const char noSubAuthStr[] = "S-1-5"; unsigned int i; PSID psid = NULL; @@ -290,45 +287,44 @@ static void test_sid(void) LocalFree( psid ); } - trace("String SIDs:\n"); - test_str_sid("AO"); - test_str_sid("RU"); - test_str_sid("AN"); - test_str_sid("AU"); - test_str_sid("BA"); - test_str_sid("BG"); - test_str_sid("BO"); - test_str_sid("BU"); - test_str_sid("CA"); - test_str_sid("CG"); - test_str_sid("CO"); - test_str_sid("DA"); - test_str_sid("DC"); - test_str_sid("DD"); - test_str_sid("DG"); - test_str_sid("DU"); - test_str_sid("EA"); - test_str_sid("ED"); - test_str_sid("WD"); - test_str_sid("PA"); - test_str_sid("IU"); - test_str_sid("LA"); - test_str_sid("LG"); - test_str_sid("LS"); - test_str_sid("SY"); - test_str_sid("NU"); - test_str_sid("NO"); - test_str_sid("NS"); - test_str_sid("PO"); - test_str_sid("PS"); - test_str_sid("PU"); - test_str_sid("RS"); - test_str_sid("RD"); - test_str_sid("RE"); - test_str_sid("RC"); - test_str_sid("SA"); - test_str_sid("SO"); - test_str_sid("SU"); + /* string constant format not supported before XP */ + r = pConvertStringSidToSidA(strsid_table[0].str, &psid); + if(!r) + { + win_skip("String constant format not supported\n"); + return; + } + LocalFree(psid); + + for(i = 0; i < sizeof(strsid_table) / sizeof(strsid_table[0]); i++) + { + char *temp; + + SetLastError(0xdeadbeef); + r = pConvertStringSidToSidA(strsid_table[i].str, &psid); + + if (!(strsid_table[i].flags & STRSID_OPT)) + { + ok(r, "%s: got %u\n", strsid_table[i].str, GetLastError()); + } + + if (r) + { + if ((winetest_debug > 1) && (pConvertSidToStringSidA(psid, &temp))) + { + trace(" %s: %s\n", strsid_table[i].str, temp); + LocalFree(temp); + } + LocalFree(psid); + } + else + { + if (GetLastError() != ERROR_INVALID_SID) + trace(" %s: couldn't be converted, returned %d\n", strsid_table[i].str, GetLastError()); + else + trace(" %s: couldn't be converted\n", strsid_table[i].str); + } + } } static void test_trustee(void)

1 0

André Hentschel : msxml3: Fix remaining memory leak ( coverity).
by Alexandre Julliard Nov. 13, 2012

Nov. 13, 2012

Module: wine Branch: master Commit: 5e031741cd02785348da0d0c51d12e1a3c517c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e031741cd02785348da0d0c5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 15:57:22 2012 +0100 msxml3: Fix remaining memory leak (coverity). --- dlls/msxml3/httprequest.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 9a9d93e..62fff98 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -685,7 +685,11 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * case VT_ARRAY|VT_UI1: { sa = V_ARRAY(body); - if ((hr = SafeArrayAccessData(sa, (void **)&ptr)) != S_OK) return hr; + if ((hr = SafeArrayAccessData(sa, (void **)&ptr)) != S_OK) + { + heap_free(bsc); + return hr; + } if ((hr = SafeArrayGetUBound(sa, 1, &size) != S_OK)) { SafeArrayUnaccessData(sa);

1 0

Akihiro Sagawa : winmm: Fix SEEK_END direction of mmio files without buffering.
by Alexandre Julliard Nov. 13, 2012

Nov. 13, 2012

Module: wine Branch: master Commit: 2d3f3204633388e0bba5ace02ebd370a9be1692d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3f3204633388e0bba5ace02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Nov 13 00:26:45 2012 +0900 winmm: Fix SEEK_END direction of mmio files without buffering. --- dlls/winmm/mmio.c | 5 ++++- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 7f35480..b6f60d1 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -127,7 +127,10 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, * lParam2 = from whence to seek (SEEK_SET, SEEK_CUR, SEEK_END) * Returns: new file position, -1 on error */ - ret = _llseek((HFILE)lpmmioinfo->adwInfo[0], (LONG)lParam1, (LONG)lParam2); + if (lParam2 == SEEK_END) + ret = _llseek((HFILE)lpmmioinfo->adwInfo[0], -(LONG)lParam1, (LONG)lParam2); + else + ret = _llseek((HFILE)lpmmioinfo->adwInfo[0], (LONG)lParam1, (LONG)lParam2); if (ret != -1) lpmmioinfo->lDiskOffset = ret; return ret; diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 64f0149..a4e7a2d 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -750,7 +750,7 @@ static void test_mmioSeek(void) /* seek backward from the end */ pos = mmioSeek(hmmio, offset, SEEK_END); - todo_wine ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); + ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); mmioClose(hmmio, 0); }

1 0