July 2018 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: Update RedrawWindow behavior with explicit desktop window handle.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: b73a50a35e2cb5630bac89eafa5487529282a0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73a50a35e2cb5630bac89ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 13:20:56 2018 +0200 user32: Update RedrawWindow behavior with explicit desktop window handle. Newer Windows versions behave differently. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 4 +-- dlls/user32/sysparams.c | 3 +- dlls/user32/tests/msg.c | 86 ++++++++++++++++++++++++++++++++++++++++++------- server/window.c | 19 ++++++++--- 4 files changed, 92 insertions(+), 20 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 79db230..9178b61 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1227,8 +1227,6 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) static const RECT empty; BOOL ret; - if (!hwnd) hwnd = GetDesktopWindow(); - if (TRACE_ON(win)) { if (hrgn) @@ -1272,6 +1270,8 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) HeapFree( GetProcessHeap(), 0, data ); } + if (!hwnd) hwnd = GetDesktopWindow(); + if (flags & RDW_UPDATENOW) update_now( hwnd, flags ); else if (flags & RDW_ERASENOW) erase_now( hwnd, flags ); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index fc55b06..13bd425 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2938,8 +2938,7 @@ BOOL WINAPI SetSysColors( INT count, const INT *colors, const COLORREF *values ) /* Repaint affected portions of all visible windows */ - RedrawWindow( GetDesktopWindow(), NULL, 0, - RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); + RedrawWindow( 0, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); return TRUE; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 80c699f..55d8994 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7229,7 +7229,8 @@ void dump_region(HRGN hrgn) HeapFree( GetProcessHeap(), 0, data ); } -static void check_update_rgn( HWND hwnd, HRGN hrgn ) +#define check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, hwnd, hrgn ) +static void check_update_rgn_( int line, HWND hwnd, HRGN hrgn ) { INT ret; RECT r1, r2; @@ -7240,13 +7241,13 @@ static void check_update_rgn( HWND hwnd, HRGN hrgn ) ok( ret != ERROR, "GetUpdateRgn failed\n" ); if (ret == NULLREGION) { - ok( !hrgn, "Update region shouldn't be empty\n" ); + ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" ); } else { if (CombineRgn( tmp, hrgn, update, RGN_XOR ) != NULLREGION) { - ok( 0, "Regions are different\n" ); + ok_(__FILE__,line)( 0, "Regions are different\n" ); if (winetest_debug > 0) { printf( "Update region: " ); @@ -7258,8 +7259,8 @@ static void check_update_rgn( HWND hwnd, HRGN hrgn ) } GetRgnBox( update, &r1 ); GetUpdateRect( hwnd, &r2, FALSE ); - ok( EqualRect( &r1, &r2 ), "Rectangles are different: %s / %s\n", wine_dbgstr_rect( &r1 ), - wine_dbgstr_rect( &r2 )); + ok_(__FILE__,line)( EqualRect( &r1, &r2 ), "Rectangles are different: %s / %s\n", + wine_dbgstr_rect( &r1 ), wine_dbgstr_rect( &r2 )); DeleteObject( tmp ); DeleteObject( update ); @@ -7455,9 +7456,76 @@ static void test_paint_messages(void) /* MSDN: if hwnd parameter is NULL, InvalidateRect invalidates and redraws * all windows and sends WM_ERASEBKGND and WM_NCPAINT. */ - trace("testing InvalidateRect(0, NULL, FALSE)\n"); SetRectEmpty( &rect ); - ok(InvalidateRect(0, &rect, FALSE), "InvalidateRect(0, &rc, FALSE) should fail\n"); + ok(InvalidateRect(0, &rect, FALSE), "InvalidateRect(0, &rc, FALSE) failed\n"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + flush_events(); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + SetRectEmpty( &rect ); + ok(RedrawWindow(0, &rect, 0, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + SetRectEmpty( &rect ); + ok(RedrawWindow(0, &rect, 0, RDW_ALLCHILDREN | RDW_VALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + GetWindowRect( hwnd, &rect ); + ok(RedrawWindow(0, &rect, 0, RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + flush_events(); + ok(RedrawWindow(0, &rect, 0, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + flush_events(); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + ok(RedrawWindow(GetDesktopWindow(), &rect, 0, + RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + ret = GetUpdateRgn( hwnd, hrgn2, FALSE ); + ok( ret == NULLREGION || broken(ret == SIMPLEREGION), /* <= win7 */ + "region should be null (%d)\n", ret ); + if (ret == SIMPLEREGION) ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + flush_events(); + + ok(RedrawWindow(GetDesktopWindow(), NULL, 0, + RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + ret = GetUpdateRgn( hwnd, hrgn2, FALSE ); + ok( ret == NULLREGION || broken(ret == SIMPLEREGION), /* <= win7 */ + "region should be null (%d)\n", ret ); + if (ret == SIMPLEREGION) ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + flush_events(); + + SetRectRgn( hrgn2, rect.left, rect.top, rect.right, rect.bottom ); + ok(RedrawWindow(0, NULL, hrgn2, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + flush_events(); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + ok(RedrawWindow(0, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + ok(RedrawWindow(0, NULL, 0, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); check_update_rgn( hwnd, hrgn ); ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); flush_events(); @@ -7468,7 +7536,6 @@ static void test_paint_messages(void) /* MSDN: if hwnd parameter is NULL, ValidateRect invalidates and redraws * all windows and sends WM_ERASEBKGND and WM_NCPAINT. */ - trace("testing ValidateRect(0, NULL)\n"); SetRectEmpty( &rect ); if (ValidateRect(0, &rect) && /* not supported on Win9x */ GetUpdateRect(hwnd, NULL, FALSE)) /* or >= Win 8 */ @@ -7481,7 +7548,6 @@ static void test_paint_messages(void) check_update_rgn( hwnd, 0 ); } - trace("testing InvalidateRgn(0, NULL, FALSE)\n"); SetLastError(0xdeadbeef); ok(!InvalidateRgn(0, NULL, FALSE), "InvalidateRgn(0, NULL, FALSE) should fail\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || GetLastError() == 0xdeadbeef, @@ -7490,7 +7556,6 @@ static void test_paint_messages(void) flush_events(); ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); - trace("testing ValidateRgn(0, NULL)\n"); SetLastError(0xdeadbeef); ok(!ValidateRgn(0, NULL), "ValidateRgn(0, NULL) should fail\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || @@ -7500,7 +7565,6 @@ static void test_paint_messages(void) flush_events(); ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); - trace("testing UpdateWindow(NULL)\n"); SetLastError(0xdeadbeef); ok(!UpdateWindow(NULL), "UpdateWindow(NULL) should fail\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || diff --git a/server/window.c b/server/window.c index 322001d..532edd8 100644 --- a/server/window.c +++ b/server/window.c @@ -2634,13 +2634,23 @@ DECL_HANDLER(update_window_zorder) /* mark parts of a window as needing a redraw */ DECL_HANDLER(redraw_window) { + unsigned int flags = req->flags; struct region *region = NULL; - struct window *win = get_window( req->window ); + struct window *win; + + if (!req->window) + { + if (!(win = get_desktop_window( current ))) return; + } + else + { + if (!(win = get_window( req->window ))) return; + if (is_desktop_window( win )) flags &= ~RDW_ALLCHILDREN; + } - if (!win) return; if (!is_visible( win )) return; /* nothing to do */ - if (req->flags & (RDW_VALIDATE|RDW_INVALIDATE)) + if (flags & (RDW_VALIDATE|RDW_INVALIDATE)) { if (get_req_data_size()) /* no data means whole rectangle */ { @@ -2650,8 +2660,7 @@ DECL_HANDLER(redraw_window) } } - redraw_window( win, region, (req->flags & RDW_INVALIDATE) && (req->flags & RDW_FRAME), - req->flags ); + redraw_window( win, region, (flags & RDW_INVALIDATE) && (flags & RDW_FRAME), flags ); if (region) free_region( region ); }

1 0

Alistair Leslie-Hughes : user32: Support SPI_S/ GETAUDIODESCRIPTION in SystemParametersInfo.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: 80205232d3ece73d4cc6c7589cea893583aae0b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80205232d3ece73d4cc6c758… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 6 01:16:57 2018 +0000 user32: Support SPI_S/GETAUDIODESCRIPTION in SystemParametersInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 32 +++++++++++++++++++++++++++++++- include/winuser.h | 9 +++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 13bd425..95387cd 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -70,6 +70,7 @@ enum parameter_key SHOWSOUNDS_KEY, KEYBOARDPREF_KEY, SCREENREADER_KEY, + AUDIODESC_KEY, NB_PARAM_KEYS }; @@ -94,6 +95,9 @@ static const WCHAR KEYBOARDPREF_REGKEY[] = {'C','o','n','t','r','o','l',' ','P', static const WCHAR SCREENREADER_REGKEY[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', 'A','c','c','e','s','s','i','b','i','l','i','t','y','\\', 'B','l','i','n','d',' ','A','c','c','e','s','s',0}; +static const WCHAR AUDIODESC_REGKEY[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'A','c','c','e','s','s','i','b','i','l','i','t','y','\\', + 'A','u','d','i','o','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR *parameter_key_names[NB_PARAM_KEYS] = { @@ -107,6 +111,7 @@ static const WCHAR *parameter_key_names[NB_PARAM_KEYS] = SHOWSOUNDS_REGKEY, KEYBOARDPREF_REGKEY, SCREENREADER_REGKEY, + AUDIODESC_REGKEY, }; /* parameter key values; the first char is actually an enum parameter_key to specify the key */ @@ -217,6 +222,8 @@ static const WCHAR COLOR_GRADIENTACTIVECAPTION_VALNAME[] = {COLORS_KEY,'G','r',' static const WCHAR COLOR_GRADIENTINACTIVECAPTION_VALNAME[] = {COLORS_KEY,'G','r','a','d','i','e','n','t','I','n','a','c','t','i','v','e','T','i','t','l','e',0}; static const WCHAR COLOR_MENUHILIGHT_VALNAME[] = {COLORS_KEY,'M','e','n','u','H','i','l','i','g','h','t',0}; static const WCHAR COLOR_MENUBAR_VALNAME[] = {COLORS_KEY,'M','e','n','u','B','a','r',0}; +static const WCHAR AUDIODESC_LOCALE_VALNAME[] = {AUDIODESC_KEY,'L','o','c','a','l','e',0}; +static const WCHAR AUDIODESC_ON_VALNAME[] = {AUDIODESC_KEY,'O','n',0}; /* FIXME - real value */ static const WCHAR SCREENSAVERRUNNING_VALNAME[]= {DESKTOP_KEY,'W','I','N','E','_','S','c','r','e','e','n','S','a','v','e','r','R','u','n','n','i','n','g',0}; @@ -1240,6 +1247,7 @@ static BOOL_ENTRY( SCREENSAVERRUNNING, FALSE ); static BOOL_ENTRY( SHOWSOUNDS, FALSE ); static BOOL_ENTRY( SNAPTODEFBUTTON, FALSE ); static BOOL_ENTRY_MIRROR( ICONTITLEWRAP, TRUE ); +static BOOL_ENTRY( AUDIODESC_ON, FALSE); static YESNO_ENTRY( BEEP, TRUE ); @@ -1269,6 +1277,7 @@ static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3 ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0 ); static DWORD_ENTRY( LOGPIXELS, 0 ); static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); +static DWORD_ENTRY( AUDIODESC_LOCALE, 0 ); static PATH_ENTRY( DESKPATTERN ); static PATH_ENTRY( DESKWALLPAPER ); @@ -1399,6 +1408,8 @@ static union sysparam_all_entry * const default_entries[] = (union sysparam_all_entry *)&entry_USERPREFERENCESMASK, (union sysparam_all_entry *)&entry_WHEELSCROLLCHARS, (union sysparam_all_entry *)&entry_WHEELSCROLLLINES, + (union sysparam_all_entry *)&entry_AUDIODESC_LOCALE, + (union sysparam_all_entry *)&entry_AUDIODESC_ON, }; /*********************************************************************** @@ -2334,7 +2345,26 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETFONTSMOOTHINGORIENTATION: ret = set_entry( &entry_FONTSMOOTHINGORIENTATION, uiParam, pvParam, fWinIni ); break; - + case SPI_GETAUDIODESCRIPTION: + { + AUDIODESCRIPTION *audio = pvParam; + if (audio && audio->cbSize == sizeof(AUDIODESCRIPTION) && uiParam == sizeof(AUDIODESCRIPTION) ) + { + ret = get_entry( &entry_AUDIODESC_ON, 0, &audio->Enabled ) && + get_entry( &entry_AUDIODESC_LOCALE, 0, &audio->Locale ); + } + break; + } + case SPI_SETAUDIODESCRIPTION: + { + AUDIODESCRIPTION *audio = pvParam; + if (audio && audio->cbSize == sizeof(AUDIODESCRIPTION) && uiParam == sizeof(AUDIODESCRIPTION) ) + { + ret = set_entry( &entry_AUDIODESC_ON, 0, &audio->Enabled, fWinIni) && + set_entry( &entry_AUDIODESC_LOCALE, 0, &audio->Locale, fWinIni ); + } + break; + } default: FIXME( "Unknown action: %u\n", uiAction ); SetLastError( ERROR_INVALID_SPI_VALUE ); diff --git a/include/winuser.h b/include/winuser.h index 24ca055..a653ef4 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2362,6 +2362,8 @@ typedef struct tagDROPSTRUCT #define SPI_SETMOUSESPEED 113 #define SPI_GETSCREENSAVERRUNNING 114 #define SPI_GETDESKWALLPAPER 115 +#define SPI_GETAUDIODESCRIPTION 116 +#define SPI_SETAUDIODESCRIPTION 117 #define SPI_GETACTIVEWINDOWTRACKING 0x1000 #define SPI_SETACTIVEWINDOWTRACKING 0x1001 @@ -3387,6 +3389,13 @@ enum tagPOINTER_INPUT_TYPE }; typedef DWORD POINTER_INPUT_TYPE; +typedef struct tagAUDIODESCRIPTION +{ + UINT cbSize; + BOOL Enabled; + LCID Locale; +} AUDIODESCRIPTION, *LPAUDIODESCRIPTION; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD);

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: 0f5d528f70fe41a05a56110d26b933727b169f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f5d528f70fe41a05a56110d… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Jul 6 17:09:20 2018 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 74 ++++++++++++++----------------------------------------------- 1 file changed, 17 insertions(+), 57 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b5d496d..40775b0 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-06-09 23:18+0200\n" +"PO-Revision-Date: 2018-07-06 19:05+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -3436,32 +3436,24 @@ msgid "Publishers..." msgstr "Utgivere..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Lokal nettverksforbindelse" +msgstr "Nettverksforbindelser" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Lokal tjener" +msgstr "Mellomtjener" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Bruk en mellomtjener" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresse" +msgstr "Adresse:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Ingen porter" +msgstr "Port:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -4451,7 +4443,7 @@ msgstr "Katalognavnet er ugyldig.\n" #: winerror.mc:918 msgid "Extended attributes didn't fit.\n" -msgstr "De utvidede atributtene fikk ikke plass.\n" +msgstr "De utvidede egenskapene fikk ikke plass.\n" #: winerror.mc:923 msgid "Extended attribute file corrupt.\n" @@ -4467,7 +4459,7 @@ msgstr "Ugyldig referanse for utvidet atributt.\n" #: winerror.mc:938 msgid "Extended attributes not supported.\n" -msgstr "Utvidede atributter støttes ikke.\n" +msgstr "Utvidede egenskaper støttes ikke.\n" #: winerror.mc:943 msgid "Mutex not owned by caller.\n" @@ -6799,7 +6791,7 @@ msgstr "&Format:" #: msacm32.rc:47 msgid "&Attributes:" -msgstr "&Attributter:" +msgstr "&Egenskaper:" #: mshtml.rc:39 msgid "Hyperlink" @@ -8559,7 +8551,7 @@ msgstr "Dato opprettet:" #: shell32.rc:369 shell32.rc:406 msgid "Attributes:" -msgstr "Attributter:" +msgstr "Egenskaper:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8599,7 +8591,7 @@ msgstr "Endret" #: shell32.rc:141 winefile.rc:172 winefile.rc:114 msgid "Attributes" -msgstr "Attributter" +msgstr "Egenskaper" #: shell32.rc:143 msgid "Size available" @@ -9241,10 +9233,12 @@ msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"SSL-sertifikatdato som ble mottatt fra tjeneren er feil. Sertifikatet er " +"utgått.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL-sertifikatets vertsnavn-felt er feil.\n" #: winmm.rc:32 msgid "The specified command was carried out." @@ -12020,7 +12014,7 @@ msgstr "Kopier program:" #: progman.rc:152 msgid "Program Group Attributes" -msgstr "Programgruppeattributter" +msgstr "Programgruppe-egenskaper" #: progman.rc:156 msgid "&Group file:" @@ -12028,7 +12022,7 @@ msgstr "&Gruppefil:" #: progman.rc:168 msgid "Program Attributes" -msgstr "Programattributter" +msgstr "Programegenskaper" #: progman.rc:172 progman.rc:212 msgid "&Command line:" @@ -15664,41 +15658,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15762,6 +15721,7 @@ msgstr "" "[/A] Bare kopier filer som er markert som arkiv.\n" "[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" "\tmerkingen etterpå.\n" +"[/K] Kopier filegenskaper, uten denne blir ikke egenskapene preservert.\n" "[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n" "\t\tden oppgitte datoen. Hvis ingen dato oppgis kopieres det bare hvis\n" "\t\tmålet er eldre enn kilden.\n"

1 0

Zebediah Figura : winemac.drv: Wake up the display on user input.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: 60edba563bbf95d15b7691fc9facbd97fce3f7b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60edba563bbf95d15b7691fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 5 16:02:32 2018 -0500 winemac.drv: Wake up the display on user input. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e49a445..6558824 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -23,6 +23,13 @@ #include "config.h" +#include <IOKit/pwr_mgt/IOPMLib.h> +#define GetCurrentThread Mac_GetCurrentThread +#define LoadResource Mac_LoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource + #include "macdrv.h" #include "winuser.h" #include "wine/unicode.h" @@ -1551,13 +1558,44 @@ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) } +static WNDPROC desktop_orig_wndproc; + +#define WM_WINE_NOTIFY_ACTIVITY WM_USER + +static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case WM_WINE_NOTIFY_ACTIVITY: + { + /* This wakes from display sleep, but doesn't affect the screen saver. */ + static IOPMAssertionID assertion; + IOPMAssertionDeclareUserActivity(CFSTR("Wine user input"), kIOPMUserActiveLocal, &assertion); + + /* This prevents the screen saver, but doesn't wake from display sleep. */ + /* It's deprecated, but there's no better alternative. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + UpdateSystemActivity(UsrActivity); +#pragma clang diagnostic pop + break; + } + } + return desktop_orig_wndproc( hwnd, msg, wp, lp ); +} + /********************************************************************** * CreateWindow (MACDRV.@) */ BOOL CDECL macdrv_CreateWindow(HWND hwnd) { if (hwnd == GetDesktopWindow()) + { + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), + GWLP_WNDPROC, (LONG_PTR)desktop_wndproc_wrapper ); + macdrv_init_clipboard(); + } return TRUE; }

1 0

Michael Stefaniuc : user32: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: 2d8edab66d331f6ad1b2aed8560e5d4d9efa4573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d8edab66d331f6ad1b2aed8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:13 2018 +0200 user32: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 749fc22..ddd90e6 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -39,7 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(message); #define SPY_MAX_MSGNUM WM_USER #define SPY_INDENT_UNIT 4 /* 4 spaces */ -#define ARRAYSIZE(a) ((sizeof(a) / sizeof((a)[0]))) #define DEBUG_SPY 0 @@ -1778,14 +1777,15 @@ static const USER_MSG richedit_array[] = { #undef USM static const CONTROL_CLASS cc_array[] = { - {WC_COMBOBOXEXW, comboex_array, ARRAYSIZE(comboex_array) }, - {WC_PROPSHEETW, propsht_array, ARRAYSIZE(propsht_array) }, - {REBARCLASSNAMEW, rebar_array, ARRAYSIZE(rebar_array) }, - {TOOLBARCLASSNAMEW, toolbar_array, ARRAYSIZE(toolbar_array) }, - {TOOLTIPS_CLASSW, tooltips_array, ARRAYSIZE(tooltips_array) }, - {UPDOWN_CLASSW, updown_array, ARRAYSIZE(updown_array) }, - {RICHEDIT_CLASS20W, richedit_array, ARRAYSIZE(richedit_array) }, - {0, 0, 0} }; + {WC_COMBOBOXEXW, comboex_array, ARRAY_SIZE(comboex_array)}, + {WC_PROPSHEETW, propsht_array, ARRAY_SIZE(propsht_array)}, + {REBARCLASSNAMEW, rebar_array, ARRAY_SIZE(rebar_array)}, + {TOOLBARCLASSNAMEW, toolbar_array, ARRAY_SIZE(toolbar_array)}, + {TOOLTIPS_CLASSW, tooltips_array, ARRAY_SIZE(tooltips_array)}, + {UPDOWN_CLASSW, updown_array, ARRAY_SIZE(updown_array)}, + {RICHEDIT_CLASS20W, richedit_array, ARRAY_SIZE(richedit_array)}, + {0, 0, 0} +}; /************************************************************************/ @@ -2278,7 +2278,7 @@ const char *SPY_GetVKeyName(WPARAM wParam) */ static const SPY_NOTIFY *SPY_Bsearch_Notify( UINT code) { - int low = 0, high = ARRAYSIZE(spnfy_array) - 1; + int low = 0, high = ARRAY_SIZE(spnfy_array) - 1; while (low <= high) {

1 0

Michael Stefaniuc : dinput: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: 870a87677331a610ca8ada774adaf514eca9b311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=870a87677331a610ca8ada77… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:16 2018 +0200 dinput: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/data_formats.c | 12 +++++------- dlls/dinput/dinput_main.c | 13 ++++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c index 5fac7b7..9c9f00f 100644 --- a/dlls/dinput/data_formats.c +++ b/dlls/dinput/data_formats.c @@ -25,8 +25,6 @@ #include "windef.h" #include "dinput.h" -#define numObjects(x) (sizeof(x) / sizeof(x[0])) - static const DIOBJECTDATAFORMAT dfDIJoystick[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -79,7 +77,7 @@ const DIDATAFORMAT c_dfDIJoystick = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE), - numObjects(dfDIJoystick), + ARRAY_SIZE(dfDIJoystick), (LPDIOBJECTDATAFORMAT)dfDIJoystick }; @@ -255,7 +253,7 @@ const DIDATAFORMAT c_dfDIJoystick2 = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE2), - numObjects(dfDIJoystick2), + ARRAY_SIZE(dfDIJoystick2), (LPDIOBJECTDATAFORMAT)dfDIJoystick2 }; @@ -274,7 +272,7 @@ const DIDATAFORMAT c_dfDIMouse = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, sizeof(DIMOUSESTATE), - numObjects(dfDIMouse), + ARRAY_SIZE(dfDIMouse), (LPDIOBJECTDATAFORMAT)dfDIMouse }; @@ -297,7 +295,7 @@ const DIDATAFORMAT c_dfDIMouse2 = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, sizeof(DIMOUSESTATE2), - numObjects(dfDIMouse2), + ARRAY_SIZE(dfDIMouse2), (LPDIOBJECTDATAFORMAT)dfDIMouse2 }; @@ -565,6 +563,6 @@ const DIDATAFORMAT c_dfDIKeyboard = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, 256, - numObjects(dfDIKeyboard), + ARRAY_SIZE(dfDIKeyboard), (LPDIOBJECTDATAFORMAT)dfDIKeyboard }; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a592174..e4538a0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -92,7 +92,6 @@ static const struct dinput_device *dinput_devices[] = &joystick_linux_device, &joystick_osx_device }; -#define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0])) static HINSTANCE DINPUT_instance = NULL; @@ -409,7 +408,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( if (!This->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < NB_DINPUT_DEVICES; i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue; for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); @@ -449,7 +448,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( if (!This->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < NB_DINPUT_DEVICES; i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceW) continue; for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); @@ -750,7 +749,7 @@ static HRESULT create_device(IDirectInputImpl *This, REFGUID rguid, REFIID riid, return DIERR_NOTINITIALIZED; /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT ret; @@ -1006,7 +1005,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( } /* Enumerate all the joysticks */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT enumSuccess; @@ -1107,7 +1106,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); /* Enumerate all the joysticks */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT enumSuccess; @@ -1330,7 +1329,7 @@ static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UI #undef X /* Enumerate all joysticks in order */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue;

1 0

Michael Stefaniuc : iphlpapi: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: 3aa189ec63ac0f6c385c1c46f61eebb9ed1b7ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa189ec63ac0f6c385c1c46… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:17 2018 +0200 iphlpapi: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 863edd3..8f6720e 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -349,14 +349,12 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) #elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_IFLIST) { int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_IFLIST, if_nametoindex(name)}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) - size_t needed; char *buf = NULL, *end; struct if_msghdr *ifm; struct if_data ifdata; - if(sysctl(mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) { ERR ("failed to get size of iflist\n"); goto done; @@ -367,7 +365,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) ret = ERROR_OUTOFMEMORY; goto done; } - if(sysctl(mib, MIB_LEN, buf, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) { ERR ("failed to get iflist\n"); goto done; @@ -514,12 +512,11 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) #elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && (defined(HAVE_STRUCT_ICMPSTAT_ICPS_INHIST) || defined(HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct icmpstat icmp_stat; size_t needed = sizeof(icmp_stat); int i; - if(sysctl(mib, MIB_LEN, &icmp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &icmp_stat, &needed, NULL, 0) != -1) { #ifdef HAVE_STRUCT_ICMPSTAT_ICPS_INHIST /*in stats */ @@ -922,7 +919,6 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) #elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) || defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) int ip_ttl, ip_forwarding; #if defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) struct ipstat ip_stat; @@ -932,7 +928,7 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) size_t needed; needed = sizeof(ip_stat); - if(sysctl(mib, MIB_LEN, &ip_stat, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), &ip_stat, &needed, NULL, 0) == -1) { ERR ("failed to get ipstat\n"); return ERROR_NOT_SUPPORTED; @@ -1103,7 +1099,6 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) #define TCPTV_REXMTMAX 128 #endif int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) #define hz 1000 #if defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) struct tcpstat tcp_stat; @@ -1112,7 +1107,7 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) #endif size_t needed = sizeof(tcp_stat); - if(sysctl(mib, MIB_LEN, &tcp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &tcp_stat, &needed, NULL, 0) != -1) { stats->u.RtoAlgorithm = MIB_TCP_RTO_VANJ; stats->dwRtoMin = TCPTV_MIN; @@ -1286,12 +1281,11 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) #elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && defined(HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS) { int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct udpstat udp_stat; MIB_UDPTABLE *udp_table; size_t needed = sizeof(udp_stat); - if(sysctl(mib, MIB_LEN, &udp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &udp_stat, &needed, NULL, 0) != -1) { stats->dwInDatagrams = udp_stat.udps_ipackets; stats->dwOutDatagrams = udp_stat.udps_opackets; @@ -1742,14 +1736,13 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO #elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) { int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) size_t needed; char *buf = NULL, *lim, *next; struct rt_msghdr *rtm; struct sockaddr_inarp *sinarp; struct sockaddr_dl *sdl; - if (sysctl (mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) + if (sysctl (mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) { ERR ("failed to get arp table\n"); ret = ERROR_NOT_SUPPORTED; @@ -1763,7 +1756,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO goto done; } - if (sysctl (mib, MIB_LEN, buf, &needed, NULL, 0) == -1) + if (sysctl (mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) { ret = ERROR_NOT_SUPPORTED; goto done;

1 0

Michael Stefaniuc : mscoree: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: b412c166b3bb1568f1359bb2cc42c5d3984f62bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b412c166b3bb1568f1359bb2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 00:21:23 2018 +0200 mscoree: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 64f345d..0c933ca 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1607,7 +1607,6 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, } #define CHARS_IN_GUID 39 -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) { @@ -1618,7 +1617,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; static const WCHAR wszDLL[] = {'.','d','l','l',0}; - WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; + WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) + ARRAY_SIZE(wszInprocServer32) - 1]; MonoDomain *domain; MonoAssembly *assembly; ICLRRuntimeInfo *info = NULL;

1 0

Michael Stefaniuc : wininet: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: d870d4105d3c4024bd0e09c8e1ac9042d57268c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d870d4105d3c4024bd0e09c8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:15 2018 +0200 wininet: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b91dbdf..c699c5b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -145,8 +145,6 @@ static const WCHAR emptyW[] = {0}; #define COLLECT_TIME 60000 -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - struct HttpAuthInfo { LPWSTR scheme; @@ -810,12 +808,12 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) static const WCHAR szBasic[] = {'B','a','s','i','c'}; /* Note: not nul-terminated */ static const WCHAR szRealm[] = {'r','e','a','l','m'}; /* Note: not nul-terminated */ BOOL is_basic; - is_basic = !strncmpiW(pszAuthValue, szBasic, ARRAYSIZE(szBasic)) && - ((pszAuthValue[ARRAYSIZE(szBasic)] == ' ') || !pszAuthValue[ARRAYSIZE(szBasic)]); + is_basic = !strncmpiW(pszAuthValue, szBasic, ARRAY_SIZE(szBasic)) && + ((pszAuthValue[ARRAY_SIZE(szBasic)] == ' ') || !pszAuthValue[ARRAY_SIZE(szBasic)]); if (is_basic && pszRealm) { LPCWSTR token; - LPCWSTR ptr = &pszAuthValue[ARRAYSIZE(szBasic)]; + LPCWSTR ptr = &pszAuthValue[ARRAY_SIZE(szBasic)]; LPCWSTR realm; ptr++; *pszRealm=NULL; @@ -825,8 +823,8 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) realm = ptr; while (*realm == ' ') realm++; - if(!strncmpiW(realm, szRealm, ARRAYSIZE(szRealm)) && - (realm[ARRAYSIZE(szRealm)] == ' ' || realm[ARRAYSIZE(szRealm)] == '=')) + if(!strncmpiW(realm, szRealm, ARRAY_SIZE(szRealm)) && + (realm[ARRAY_SIZE(szRealm)] == ' ' || realm[ARRAY_SIZE(szRealm)] == '=')) { token++; while (*token == ' ') @@ -1566,9 +1564,9 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) { signed char in[4]; - if (base64[0] >= ARRAYSIZE(HTTP_Base64Dec) || + if (base64[0] >= ARRAY_SIZE(HTTP_Base64Dec) || ((in[0] = HTTP_Base64Dec[base64[0]]) == -1) || - base64[1] >= ARRAYSIZE(HTTP_Base64Dec) || + base64[1] >= ARRAY_SIZE(HTTP_Base64Dec) || ((in[1] = HTTP_Base64Dec[base64[1]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(base64)); @@ -1580,7 +1578,7 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) if ((base64[2] == '=') && (base64[3] == '=')) break; - if (base64[2] > ARRAYSIZE(HTTP_Base64Dec) || + if (base64[2] > ARRAY_SIZE(HTTP_Base64Dec) || ((in[2] = HTTP_Base64Dec[base64[2]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(&base64[2])); @@ -1592,7 +1590,7 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) if (base64[3] == '=') break; - if (base64[3] > ARRAYSIZE(HTTP_Base64Dec) || + if (base64[3] > ARRAY_SIZE(HTTP_Base64Dec) || ((in[3] = HTTP_Base64Dec[base64[3]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(&base64[3]));

1 0

Michael Stefaniuc : winhttp: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard 06 Jul '18

06 Jul '18

Module: wine Branch: master Commit: ebc7959e171b4242e1fd9eaa36cc6173976625f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc7959e171b4242e1fd9eaa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:14 2018 +0200 winhttp: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 56ec910..5e5b229 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -851,8 +851,6 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, } -#define ARRAYSIZE(array) (sizeof(array) / sizeof((array)[0])) - static const WCHAR basicW[] = {'B','a','s','i','c',0}; static const WCHAR ntlmW[] = {'N','T','L','M',0}; static const WCHAR passportW[] = {'P','a','s','s','p','o','r','t',0}; @@ -867,11 +865,11 @@ static const struct } auth_schemes[] = { - { basicW, ARRAYSIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, - { ntlmW, ARRAYSIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, - { passportW, ARRAYSIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, - { digestW, ARRAYSIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, - { negotiateW, ARRAYSIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } + { basicW, ARRAY_SIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, + { ntlmW, ARRAY_SIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, + { passportW, ARRAY_SIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, + { digestW, ARRAY_SIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, + { negotiateW, ARRAY_SIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } }; static const unsigned int num_auth_schemes = sizeof(auth_schemes)/sizeof(auth_schemes[0]);

1 0