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

Julian Rüger : po: Update German translation.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 3c6a5a71599f56eb968f0427bc614e4eabb88c03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c6a5a71599f56eb968f0427… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 15:24:18 2018 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 77 +++++++++++++++++++++++----------------------------------------- 1 file changed, 28 insertions(+), 49 deletions(-) diff --git a/po/de.po b/po/de.po index b703717..01139cd 100644 --- a/po/de.po +++ b/po/de.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-03-07 15:56+0100\n" +"PO-Revision-Date: 2018-05-18 15:21+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3698,18 +3698,21 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"'writable'-Attribut des Eigenschaftendeskriptors kann bei diesem Objekt " +"nicht auf 'true' gesetzt werden" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" msgstr "" +"Nicht-konfigurierbare Eigenschaft '|' kann nicht erneut definiert werden" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Nicht-schreibbare Eigenschaft '|' kann nicht geändert werden" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Eigenschaft kann nicht sowohl Accessoren als auch einen Wert haben" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -8522,10 +8525,8 @@ msgid "&Browse..." msgstr "&Durchsuchen..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Dateityp" +msgstr "Dateityp:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8533,19 +8534,15 @@ msgstr "Ort:" #: shell32.rc:361 shell32.rc:394 winefile.rc:170 msgid "Size:" -msgstr "&Größe:" +msgstr "Größe:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Erstellungsdatum" +msgstr "Erstellungsdatum:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Attribute:" +msgstr "Attribute:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8556,28 +8553,20 @@ msgid "&Archive" msgstr "&Archiv" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Öffnen:" +msgstr "Öffnen mit:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "&Symbol ändern..." +msgstr "&Ändern..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Geändert" +msgstr "Zuletzt geändert:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Letzte &Änderung:" +msgstr "Letzter Zugriff:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9198,70 +9187,60 @@ msgstr "" "Es gibt mindestens ein unbekanntes Sicherheitsproblem mit diesem Zertifikat." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Zeitüberschreitung der Dienstanfrage.\n" +msgstr "Zeitüberschreitung der Anfrage.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Ein Druckerfehler ist aufgetreten." +msgstr "Ein interner Fehler ist aufgetreten.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Pfad ist ungültig.\n" +msgstr "Die URL ist ungültig.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "Das URL-Format wurde nicht erkannt oder wird nicht unterstützt.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Der Benutzername konnte nicht gefunden werden.\n" +msgstr "Der Servername konnte nicht aufgelöst werden.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Das Benutzerprofil ist ungültig.\n" +msgstr "Die angeforderte Operation ist ungültig.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"Die Operation wurde abgebrochen, üblicherweise weil das Handle, auf dem die " +"Anfrage ausgeführt wurde, vorzeitig geschlossen wurde.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Das Profil konnte nicht hinzugefügt werden.\n" +msgstr "Das angeforderte Objekt konnte nicht gefunden werden.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Kann nicht zum LDAP-Server verbinden" +msgstr "Der Verbindungsversuch zum Server ist fehlgeschlagen.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Die Verbindung zum Server wurde unterbrochen.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"Das Datum des empfangenen SSL-Zertifikats ist ungültig. Das Zertifikat ist " +"abgelaufen.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "Das Feld 'Common name' (Hostname) des SSL-Zertifikats ist inkorrekt.\n" #: winmm.rc:32 msgid "The specified command was carried out."

1 0

Jacek Caban : mshtml: Added IHTMLWindow7:: innerWidth and innerHeight implementation.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 127df7021dd99a6698286a33fe97f2c7e3a90aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=127df7021dd99a6698286a33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 18 13:53:38 2018 +0200 mshtml: Added IHTMLWindow7::innerWidth and innerHeight implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e198ed1..ec20e8f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2330,15 +2330,37 @@ static HRESULT WINAPI HTMLWindow7_get_performance(IHTMLWindow7 *iface, VARIANT * static HRESULT WINAPI HTMLWindow7_get_innerWidth(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 ret; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMWindow_GetInnerWidth(This->outer_window->nswindow, &ret); + if(NS_FAILED(nsres)) { + ERR("GetInnerWidth failed: %08x\n", nsres); + return E_FAIL; + } + + *p = ret; + return S_OK; } static HRESULT WINAPI HTMLWindow7_get_innerHeight(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 ret; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMWindow_GetInnerHeight(This->outer_window->nswindow, &ret); + if(NS_FAILED(nsres)) { + ERR("GetInnerWidth failed: %08x\n", nsres); + return E_FAIL; + } + + *p = ret; + return S_OK; } static HRESULT WINAPI HTMLWindow7_get_pageXOffset(IHTMLWindow7 *iface, LONG *p)

1 0

Jacek Caban : mshtml: Expose IHTMLWindow7 interface to scripts.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: ca313f57b1ef722d1433c2a496f85d9c849a3bac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca313f57b1ef722d1433c2a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 18 13:53:54 2018 +0200 mshtml: Expose IHTMLWindow7 interface to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 9 +++++++++ dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 11 insertions(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ec20e8f..9b84780 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3418,6 +3418,15 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { + /* FIXME: Expose getComputedStyle and performance once they are implemented. + * Stubs break existing web sites. */ + static const dispex_hook_t window7_hooks[] = { + {DISPID_IHTMLWINDOW7_GETCOMPUTEDSTYLE, NULL}, + {DISPID_IHTMLWINDOW7_PERFORMANCE, NULL}, + {DISPID_UNKNOWN} + }; + if(compat_mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLWindow7_tid, window7_hooks); dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); EventTarget_init_dispex_info(info, compat_mode); } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 02f0778..12edb4b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -84,6 +84,8 @@ function test_window_props() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); + test_exposed("getSelection", v >= 9); + test_exposed("onfocusout", v >= 9); next_test(); }

1 0

Zebediah Figura : winedbg: Use gdb's default handling of breakpoints.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: a602405efd59d9728b29216828cc9f9f5c26b425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a602405efd59d9728b292168… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 08:51:22 2018 -0500 winedbg: Use gdb's default handling of breakpoints. We're essentially doing the same thing, so there's no reason not to leave the handling entirely to gdb. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 129 +------------------------------------------- 1 file changed, 2 insertions(+), 127 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3909cb5..3ecf629 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -72,13 +72,6 @@ #define GDBPXY_TRC_WIN32_ERROR 0x20 #define GDBPXY_TRC_COMMAND_FIXME 0x80 -struct gdb_ctx_Xpoint -{ - enum be_xpoint_type type; /* (-1) == be_xpoint_free means free */ - void* addr; - unsigned long val; -}; - struct gdb_context { /* gdb information */ @@ -105,8 +98,6 @@ struct gdb_context CONTEXT context; /* Win32 information */ struct dbg_process* process; -#define NUM_XPOINT 32 - struct gdb_ctx_Xpoint Xpoints[NUM_XPOINT]; /* Unix environment */ unsigned long wine_segs[3]; /* load addresses of the ELF wine exec segments (text, bss and data) */ }; @@ -1570,28 +1561,6 @@ static enum packet_return packet_thread(struct gdb_context* gdbctx) } } -static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SIZE_T blk_len, SIZE_T *r) -{ - /* Wrapper around process_io->read() that replaces values displaced by breakpoints. */ - - BOOL ret; - - ret = gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, r); - if (ret) - { - struct gdb_ctx_Xpoint *xpt; - - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - char *xpt_addr = xpt->addr; - - if (xpt->type != be_xpoint_free && xpt_addr >= addr && xpt_addr < addr + blk_len) - buffer[xpt_addr - addr] = xpt->val; - } - } - return ret; -} - static enum packet_return packet_read_memory(struct gdb_context* gdbctx) { char *addr; @@ -1608,7 +1577,8 @@ static enum packet_return packet_read_memory(struct gdb_context* gdbctx) for (nread = 0; nread < len; nread += r, addr += r) { blk_len = min(sizeof(buffer), len - nread); - if (!read_memory(gdbctx, addr, buffer, blk_len, &r) || r == 0) + if (!gdbctx->process->process_io->read(gdbctx->process->handle, addr, + buffer, blk_len, &r) || r == 0) { /* fail at first address, return error */ if (nread == 0) return packet_reply_error(gdbctx, EFAULT); @@ -2163,97 +2133,6 @@ static enum packet_return packet_thread_alive(struct gdb_context* gdbctx) return packet_reply_error(gdbctx, ESRCH); } -static enum packet_return packet_remove_breakpoint(struct gdb_context* gdbctx) -{ - void* addr; - unsigned len; - struct gdb_ctx_Xpoint* xpt; - enum be_xpoint_type t; - - /* FIXME: check packet_len */ - if (gdbctx->in_packet[0] < '0' || gdbctx->in_packet[0] > '4' || - gdbctx->in_packet[1] != ',' || - sscanf(gdbctx->in_packet + 2, "%p,%x", &addr, &len) != 2) - return packet_error; - if (gdbctx->trace & GDBPXY_TRC_COMMAND) - fprintf(stderr, "Remove bp %p[%u] typ=%c\n", - addr, len, gdbctx->in_packet[0]); - switch (gdbctx->in_packet[0]) - { - case '0': t = be_xpoint_break; len = 0; break; - case '1': t = be_xpoint_watch_exec; break; - case '2': t = be_xpoint_watch_read; break; - case '3': t = be_xpoint_watch_write; break; - default: return packet_error; - } - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - if (xpt->addr == addr && xpt->type == t) - { - if (be_cpu->remove_Xpoint(gdbctx->process->handle, - gdbctx->process->process_io, &gdbctx->context, - t, xpt->addr, xpt->val, len)) - { - xpt->type = be_xpoint_free; - return packet_ok; - } - break; - } - } - return packet_error; -} - -static enum packet_return packet_set_breakpoint(struct gdb_context* gdbctx) -{ - void* addr; - unsigned len; - struct gdb_ctx_Xpoint* xpt; - enum be_xpoint_type t; - - /* FIXME: check packet_len */ - if (gdbctx->in_packet[0] < '0' || gdbctx->in_packet[0] > '4' || - gdbctx->in_packet[1] != ',' || - sscanf(gdbctx->in_packet + 2, "%p,%x", &addr, &len) != 2) - return packet_error; - if (gdbctx->trace & GDBPXY_TRC_COMMAND) - fprintf(stderr, "Set bp %p[%u] typ=%c\n", - addr, len, gdbctx->in_packet[0]); - switch (gdbctx->in_packet[0]) - { - case '0': t = be_xpoint_break; len = 0; break; - case '1': t = be_xpoint_watch_exec; break; - case '2': t = be_xpoint_watch_read; break; - case '3': t = be_xpoint_watch_write; break; - default: return packet_error; - } - /* because of packet command handling, this should be made idempotent */ - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - if (xpt->addr == addr && xpt->type == t) - return packet_ok; /* nothing to do */ - } - /* really set the Xpoint */ - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - if (xpt->type == be_xpoint_free) - { - if (be_cpu->insert_Xpoint(gdbctx->process->handle, - gdbctx->process->process_io, &gdbctx->context, - t, addr, &xpt->val, len)) - { - xpt->addr = addr; - xpt->type = t; - return packet_ok; - } - fprintf(stderr, "cannot set xpoint\n"); - break; - } - } - /* no more entries... eech */ - fprintf(stderr, "Running out of spots for {break|watch}points\n"); - return packet_error; -} - /* =============================================== * * P A C K E T I N F R A S T R U C T U R E * * =============================================== * @@ -2287,8 +2166,6 @@ static struct packet_entry packet_entries[] = /*{'S', packet_step_signal}, hard(er) to implement */ {'T', packet_thread_alive}, {'v', packet_verbose}, - {'z', packet_remove_breakpoint}, - {'Z', packet_set_breakpoint}, }; static BOOL extract_packets(struct gdb_context* gdbctx) @@ -2578,8 +2455,6 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigne gdbctx->in_trap = FALSE; gdbctx->trace = /*GDBPXY_TRC_PACKET | GDBPXY_TRC_COMMAND |*/ GDBPXY_TRC_COMMAND_ERROR | GDBPXY_TRC_COMMAND_FIXME | GDBPXY_TRC_WIN32_EVENT; gdbctx->process = NULL; - for (i = 0; i < NUM_XPOINT; i++) - gdbctx->Xpoints[i].type = -1; for (i = 0; i < sizeof(gdbctx->wine_segs) / sizeof(gdbctx->wine_segs[0]); i++) gdbctx->wine_segs[i] = 0;

1 0

Alex Henrie : comctl32/listview: Don' t invalidate when new style is same as old.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 8e9ea7a8a163147012908bad696a539454654d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e9ea7a8a163147012908bad… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 13 21:56:12 2018 -0600 comctl32/listview: Don't invalidate when new style is same as old. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 8 +++++--- dlls/comctl32/tests/listview.c | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d63c23a..200bf93 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11108,14 +11108,13 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - UINT uNewView = lpss->styleNew & LVS_TYPEMASK; - UINT uOldView = lpss->styleOld & LVS_TYPEMASK; + UINT uNewView, uOldView; UINT style; TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); - if (wStyleType != GWL_STYLE) return 0; + if (wStyleType != GWL_STYLE || lpss->styleNew == infoPtr->dwStyle) return 0; infoPtr->dwStyle = lpss->styleNew; @@ -11127,6 +11126,9 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, ((lpss->styleNew & WS_VSCROLL) == 0)) ShowScrollBar(infoPtr->hwndSelf, SB_VERT, FALSE); + uNewView = lpss->styleNew & LVS_TYPEMASK; + uOldView = lpss->styleOld & LVS_TYPEMASK; + if (uNewView != uOldView) { HIMAGELIST himl; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c9a165c..c2d33c4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1781,6 +1781,7 @@ static void test_redraw(void) HDC hdc; BOOL res; DWORD r; + RECT rect; hwnd = create_listview_control(LVS_REPORT); subclass_header(hwnd); @@ -1838,6 +1839,13 @@ static void test_redraw(void) ReleaseDC(hwndparent, hdc); + /* test setting the window style to what it already was */ + UpdateWindow(hwnd); + SetWindowLongA(hwnd, GWL_STYLE, GetWindowLongA(hwnd, GWL_STYLE)); + GetUpdateRect(hwnd, &rect, FALSE); + ok(rect.left == 0 && rect.top == 0 && rect.right == 0 && rect.bottom == 0, + "Expected empty update rect, got %s\n", wine_dbgstr_rect(&rect)); + DestroyWindow(hwnd); }

1 0

Michael Stefaniuc : winecfg: Remove an ARRAY_SIZE()-like macro.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 8f420443d798ddf53cdcd253829807c09f498490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f420443d798ddf53cdcd253… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 18 00:17:05 2018 +0200 winecfg: Remove an ARRAY_SIZE()-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/appdefaults.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index a08542a..61d515c 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -72,8 +72,6 @@ static const struct #endif }; -#define NB_VERSIONS (sizeof(win_versions)/sizeof(win_versions[0])) - static const char szKey9x[] = "Software\\Microsoft\\Windows\\CurrentVersion"; static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOptions"; @@ -113,7 +111,7 @@ static int get_registry_version(void) } major = atoi(ver); - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { if (win_versions[i].dwPlatformId != platform) continue; if (win_versions[i].dwMajorVersion != major) continue; @@ -151,7 +149,7 @@ static void update_comboboxes(HWND dialog) WINE_TRACE("winver is %s\n", winver); /* normalize the version strings */ - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { if (!strcasecmp (win_versions[i].szVersion, winver)) { @@ -181,7 +179,7 @@ init_comboboxes (HWND dialog) SendDlgItemMessageW (dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM)str); } - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { SendDlgItemMessageA(dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM) win_versions[i].szDescription);

1 0

Michael Stefaniuc : winecfg: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 7fdb828abf6324c80fba7e0b62498912fe4b5f17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fdb828abf6324c80fba7e0b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 18 00:17:06 2018 +0200 winecfg: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/appdefaults.c | 18 +++++++-------- programs/winecfg/audio.c | 37 ++++++++++++++---------------- programs/winecfg/drive.c | 2 +- programs/winecfg/drivedetect.c | 3 +-- programs/winecfg/driveui.c | 12 ++++------ programs/winecfg/libraries.c | 4 ++-- programs/winecfg/theme.c | 51 +++++++++++++++++------------------------- programs/winecfg/winecfg.c | 10 ++++----- 8 files changed, 58 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7fdb828abf6324c80fba…

1 0

Zebediah Figura : msi/tests: Test deferral of CreateFolders and RemoveFolders.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 0f7d50c02ea301ceebf0c18c1a49797ae9a93788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f7d50c02ea301ceebf0c18c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 22:26:08 2018 -0500 msi/tests: Test deferral of CreateFolders and RemoveFolders. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 14 ++++++++ dlls/msi/tests/custom.c | 87 ++++++++++++++++++++++++++++++++++++++++------ dlls/msi/tests/custom.spec | 2 ++ 4 files changed, 93 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 9c991d6..248439a 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version -custom_IMPORTS = uuid msi ole32 +custom_IMPORTS = uuid msi ole32 shell32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 849975d..ae1b47b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -596,7 +596,11 @@ static const char cf_install_exec_seq_dat[] = "FileCost\t\t900\n" "RemoveFiles\t\t3500\n" "CreateFolders\t\t3700\n" + "cf_immediate\tNOT REMOVE\t3701\n" + "cf_deferred\tNOT REMOVE\t3702\n" "RemoveFolders\t\t3800\n" + "rf_immediate\tREMOVE\t3801\n" + "rf_deferred\tREMOVE\t3802\n" "InstallFiles\t\t4000\n" "RegisterUser\t\t6000\n" "RegisterProduct\t\t6100\n" @@ -609,6 +613,15 @@ static const char cf_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "LaunchConditions\t\t100\n"; +static const char cf_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "cf_immediate\t1\tcustom.dll\tcf_absent\n" + "cf_deferred\t1025\tcustom.dll\tcf_present\n" + "rf_immediate\t1\tcustom.dll\tcf_present\n" + "rf_deferred\t1025\tcustom.dll\tcf_absent\n"; + static const char sr_selfreg_dat[] = "File_\tCost\n" "s72\tI2\n" @@ -1771,6 +1784,7 @@ static const msi_table cf_tables[] = ADD_TABLE(cf_file), ADD_TABLE(cf_create_folders), ADD_TABLE(cf_install_exec_seq), + ADD_TABLE(cf_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index ff1be9b..aeee98e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -24,10 +24,13 @@ #include <windef.h> #include <winbase.h> #define COBJMACROS +#include <shlobj.h> #include <msxml.h> #include <msi.h> #include <msiquery.h> +static int todo_level, todo_do_loop; + static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) { static char buffer[2000]; @@ -47,8 +50,30 @@ static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condi MsiProcessMessage(hinst, INSTALLMESSAGE_USER, record); MsiCloseHandle(record); } -#define ok(hinst, condition, ...) ok_(hinst, 0, __FILE__, __LINE__, condition, __VA_ARGS__) -#define todo_wine_ok(hinst, condition, ...) ok_(hinst, 1, __FILE__, __LINE__, condition, __VA_ARGS__) + +static void winetest_start_todo( int is_todo ) +{ + todo_level = (todo_level << 1) | (is_todo != 0); + todo_do_loop=1; +} + +static int winetest_loop_todo(void) +{ + int do_loop=todo_do_loop; + todo_do_loop=0; + return do_loop; +} + +static void winetest_end_todo(void) +{ + todo_level >>= 1; +} + +#define ok(hinst, condition, ...) ok_(hinst, todo_level, __FILE__, __LINE__, condition, __VA_ARGS__) +#define todo_wine_if(is_todo) for (winetest_start_todo(is_todo); \ + winetest_loop_todo(); \ + winetest_end_todo()) +#define todo_wine todo_wine_if(1) static const char *dbgstr_w(WCHAR *str) { @@ -886,7 +911,8 @@ static void test_costs(MSIHANDLE hinst) cost = 0xdead; r = MsiGetFeatureCostA(hinst, NULL, MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); - todo_wine_ok(hinst, !cost, "got %d\n", cost); + todo_wine + ok(hinst, !cost, "got %d\n", cost); r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, NULL); ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); @@ -894,7 +920,8 @@ static void test_costs(MSIHANDLE hinst) cost = 0xdead; r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, cost == 8, "got %d\n", cost); + todo_wine + ok(hinst, cost == 8, "got %d\n", cost); sz = cost = temp = 0xdead; r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, NULL, &sz, &cost, &temp); @@ -946,7 +973,8 @@ static void test_costs(MSIHANDLE hinst) r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine + ok(hinst, sz == 4, "got size %u\n", sz); ok(hinst, cost == 8, "got cost %d\n", cost); ok(hinst, !temp, "got temp %d\n", temp); @@ -954,15 +982,19 @@ static void test_costs(MSIHANDLE hinst) strcpy(buffer,"x"); r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); - todo_wine_ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine { + ok(hinst, !buffer[0], "got \"%s\"\n", buffer); + ok(hinst, sz == 4, "got size %u\n", sz); + } sz = 2; strcpy(buffer,"x"); r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); - todo_wine_ok(hinst, !strcmp(buffer, "C"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine { + ok(hinst, !strcmp(buffer, "C"), "got \"%s\"\n", buffer); + ok(hinst, sz == 4, "got size %u\n", sz); + } sz = 3; strcpy(buffer,"x"); @@ -1021,7 +1053,8 @@ UINT WINAPI main_test(MSIHANDLE hinst) /* Test MsiGetDatabaseState() */ res = MsiGetDatabaseState(hinst); - todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); + todo_wine + ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); test_props(hinst); test_db(hinst); @@ -1101,7 +1134,8 @@ UINT WINAPI da_deferred(MSIHANDLE hinst) len = sizeof(prop); r = MsiGetPropertyA(hinst, "TESTPATH", prop, &len); ok(hinst, r == ERROR_SUCCESS, "got %u\n", r); - todo_wine_ok(hinst, !prop[0], "got %s\n", prop); + todo_wine + ok(hinst, !prop[0], "got %s\n", prop); /* Test modes */ ok(hinst, MsiGetMode(hinst, MSIRUNMODE_SCHEDULED), "should be scheduled\n"); @@ -1113,3 +1147,34 @@ UINT WINAPI da_deferred(MSIHANDLE hinst) return ERROR_SUCCESS; } + +static BOOL pf_exists(const char *file) +{ + char path[MAX_PATH]; + + if (FAILED(SHGetFolderPathA(NULL, CSIDL_PROGRAM_FILESX86, NULL, 0, path))) + SHGetFolderPathA(NULL, CSIDL_PROGRAM_FILES, NULL, 0, path); + strcat(path, "\\"); + strcat(path, file); + return GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES; +} + +UINT WINAPI cf_present(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, pf_exists("msitest\\first"), "folder absent\n"); + ok(hinst, pf_exists("msitest\\second"), "folder absent\n"); + ok(hinst, pf_exists("msitest\\third"), "folder absent\n"); +} + return ERROR_SUCCESS; +} + +UINT WINAPI cf_absent(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !pf_exists("msitest\\first"), "folder present\n"); + ok(hinst, !pf_exists("msitest\\second"), "folder present\n"); + ok(hinst, !pf_exists("msitest\\third"), "folder present\n"); +} + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 51bb60e..cac0f85 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -3,3 +3,5 @@ @ stdcall da_immediate(long) @ stdcall da_deferred(long) @ stdcall nested(long) +@ stdcall cf_present(long) +@ stdcall cf_absent(long)

1 0

Zebediah Figura : msi/tests: Test deferral of CreateShorcuts and RemoveShortcuts.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: ab9ab2a8f701064af3212a91ecd89ffa6a4a331b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab9ab2a8f701064af3212a91… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 22:26:09 2018 -0500 msi/tests: Test deferral of CreateShorcuts and RemoveShortcuts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 14 ++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 30 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ae1b47b..ce36eda 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -917,12 +917,25 @@ static const char crs_install_exec_seq_dat[] = "RemoveFiles\t\t1700\n" "InstallFiles\t\t2000\n" "RemoveShortcuts\t\t3000\n" + "rs_immediate\tREMOVE\t3001\n" + "rs_deferred\tREMOVE\t3002\n" "CreateShortcuts\t\t3100\n" + "cs_immediate\tNOT REMOVE\t3101\n" + "cs_deferred\tNOT REMOVE\t3102\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char crs_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "cs_immediate\t1\tcustom.dll\tcrs_absent\n" + "cs_deferred\t1025\tcustom.dll\tcrs_present\n" + "rs_immediate\t1\tcustom.dll\tcrs_present\n" + "rs_deferred\t1025\tcustom.dll\tcrs_absent\n"; + static const char pub_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -1905,6 +1918,7 @@ static const msi_table crs_tables[] = ADD_TABLE(crs_file), ADD_TABLE(crs_shortcut), ADD_TABLE(crs_install_exec_seq), + ADD_TABLE(crs_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index aeee98e..db6d612 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1178,3 +1178,17 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { } return ERROR_SUCCESS; } + +UINT WINAPI crs_present(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, pf_exists("msitest\\shortcut.lnk"), "shortcut absent\n"); + return ERROR_SUCCESS; +} + +UINT WINAPI crs_absent(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, !pf_exists("msitest\\shortcut.lnk"), "shortcut present\n"); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index cac0f85..774f77b 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -5,3 +5,5 @@ @ stdcall nested(long) @ stdcall cf_present(long) @ stdcall cf_absent(long) +@ stdcall crs_present(long) +@ stdcall crs_absent(long)

1 0

Julian Rüger : German translation of the WineConf announcement
by Jeremy Newman 18 May '18

18 May '18

Module: website Branch: master Commit: a0bb8454e153eacf9d8a2d955be2ab49530aeacb URL: https://source.winehq.org/git/website.git/?a=commit;h=a0bb8454e153eacf9d8a2… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 14:33:49 2018 +0200 German translation of the WineConf announcement Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018030801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2018030801.xml b/news/de/2018030801.xml new file mode 100644 index 0000000..0c36048 --- /dev/null +++ b/news/de/2018030801.xml @@ -0,0 +1,15 @@ +<news> +<date>8. März 2018</date> +<title>WineConf 2018 - 25-jähriges Jubiläum</title> +<body> +Das Wine-Projekt ist erfreut verkünden zu können, dass die diesjährige WineConf 2018 +vom 29. Juni - 1. Juli in Den Haag stattfinden wird, passend zum +25-jährigen Jubiläum von Wine. +WineConf ist die jährliche Konferenz des Wine-Projekts, bei der sich +Mitgleider der Wine-Community, der breiteren Freie-Software-Bewegung +und interessierte Anwender treffen, um sich bei Essen und Getränken auszutauschen. +Traditionell finden dabei auch Vorträge einiger Teilnehmer statt, sowie formelle und +informelle Diskussionen zu allen Themen, die mit Wine zu tun haben. +Weitere Details dazu auf der <a href="https://wiki.winehq.org/WineConf2018">WineConf2018-Seite</a> +im Wine-Wiki. +</body></news>

1 0