wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

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

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

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

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

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

18 May '18

Module: wine Branch: master Commit: 4df43166f786cef4cc9fe26621694bcc2e29cc09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df43166f786cef4cc9fe266… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri May 18 11:52:59 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 | 64 +++++++++++++++++-------------------------------------------- 1 file changed, 18 insertions(+), 46 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b0912a7..ada37a6 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-03-01 23:15+0100\n" +"PO-Revision-Date: 2018-05-18 13:47+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" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.0.6\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -8514,10 +8514,8 @@ msgid "&Browse..." msgstr "&Bla..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Filtype" +msgstr "Filtype:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8528,16 +8526,12 @@ msgid "Size:" msgstr "Størrelse:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Dato opprettet" +msgstr "Dato opprettet:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Attributter:" +msgstr "Attributter:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8548,28 +8542,20 @@ msgid "&Archive" msgstr "&Arkiv" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Åpne:" +msgstr "Åpne med:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "Endre &ikon..." +msgstr "&Endre..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Endret" +msgstr "Sist endret:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Sist endret:" +msgstr "Siste tilgang:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9181,38 +9167,28 @@ msgstr "" "Det er minst ett uspesifisert sikkerhetsproblem med dette sertifikatet." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Tidsavbrudd for tjenesteforespørsel.\n" +msgstr "Forespørselen ble tidsavbrutt.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "En skriverfeil har oppstått." +msgstr "En intern feil har oppstått.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Stien er ugyldig.\n" +msgstr "URL'en er ugyldig.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL-skjemaet ble ikke gjenkjent eller er ikke støttet.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Brukernavnet finnes ikke.\n" +msgstr "Tjenernavnet kunne ikke slåes opp.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Brukerprofilen er ugyldig.\n" +msgstr "Den forespurte operasjonen er ugyldig.\n" #: winineterror.mc:56 msgid "" @@ -9221,20 +9197,16 @@ msgid "" msgstr "" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Klarte ikke legge til profilen.\n" +msgstr "Det forespurte elementet kunne ikke lokaliseres.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Kan ikke koble til LDAP-tjeneren" +msgstr "Tilkoblingsforsøk til tjeneren mislyktes.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Tilkoblingen til tjeneren har blitt terminert.\n" #: winineterror.mc:76 msgid ""

1 0

Józef Kucia : winevulkan: Trace unsupported instance extensions.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: fa786955f11cdc255d73d10e4a74d6a31e0e8d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa786955f11cdc255d73d10e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 18 12:49:18 2018 +0200 winevulkan: Trace unsupported instance extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ef9f095..53d7a11 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -730,9 +730,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na { if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) num_properties++; + else + TRACE("Instance extension '%s' is not supported.\n", host_properties[i].extensionName); } - /* We only have to count. */ if (!properties) { TRACE("Returning %u extensions\n", num_properties);

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for TDF_RTL_LAYOUT.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 35652ebfcd9cd9c9653980303a8ad4c3c6bf1e0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=35652ebfcd9cd9c965398030… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 18 17:23:26 2018 +0800 comctl32/taskdialog: Add support for TDF_RTL_LAYOUT. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 73ec234..ba19ed5 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -489,6 +489,7 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi template->style = DS_MODALFRAME | DS_SETFONT | WS_CAPTION | WS_VISIBLE | WS_SYSMENU; if (taskconfig->dwFlags & TDF_CAN_BE_MINIMIZED) template->style |= WS_MINIMIZEBOX; if (!(taskconfig->dwFlags & TDF_NO_SET_FOREGROUND)) template->style |= DS_SETFOREGROUND; + if (taskconfig->dwFlags & TDF_RTL_LAYOUT) template->dwExtendedStyle = WS_EX_LAYOUTRTL | WS_EX_RIGHT | WS_EX_RTLREADING; template->cdit = desc.control_count; template->x = (ref_rect.left + ref_rect.right + desc.dialog_width) / 2; template->y = (ref_rect.top + ref_rect.bottom + desc.dialog_height) / 2;

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for TDF_NO_SET_FOREGROUND.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 8455d4b94778cef0c21757935133d6b320550193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8455d4b94778cef0c2175793… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 18 17:22:31 2018 +0800 comctl32/taskdialog: Add support for TDF_NO_SET_FOREGROUND. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 6471eac..73ec234 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -488,6 +488,7 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi template->style = DS_MODALFRAME | DS_SETFONT | WS_CAPTION | WS_VISIBLE | WS_SYSMENU; if (taskconfig->dwFlags & TDF_CAN_BE_MINIMIZED) template->style |= WS_MINIMIZEBOX; + if (!(taskconfig->dwFlags & TDF_NO_SET_FOREGROUND)) template->style |= DS_SETFOREGROUND; template->cdit = desc.control_count; template->x = (ref_rect.left + ref_rect.right + desc.dialog_width) / 2; template->y = (ref_rect.top + ref_rect.bottom + desc.dialog_height) / 2;

1 0

Zhiyi Zhang : comctl32/taskdialog: Move TASKDIALOGCONFIG pointer in struct taskdialog_info.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 1c6e1ff807b721c5e06c1ba73eb314e51f58a56e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c6e1ff807b721c5e06c1ba7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 18 17:21:54 2018 +0800 comctl32/taskdialog: Move TASKDIALOGCONFIG pointer in struct taskdialog_info. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ef90efc..6471eac 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -84,8 +84,7 @@ struct taskdialog_template_desc struct taskdialog_info { HWND hwnd; - PFTASKDIALOGCALLBACK callback; - LONG_PTR callback_data; + const TASKDIALOGCONFIG *taskconfig; }; static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) @@ -520,8 +519,10 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam) { - return dialog_info->callback ? dialog_info->callback(dialog_info->hwnd, notification, wparam, lparam, - dialog_info->callback_data) : S_OK; + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + return taskconfig->pfCallback + ? taskconfig->pfCallback(dialog_info->hwnd, notification, wparam, lparam, taskconfig->lpCallbackData) + : S_OK; } static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD command_id) @@ -590,8 +591,7 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto if (!taskconfig || taskconfig->cbSize != sizeof(TASKDIALOGCONFIG)) return E_INVALIDARG; - dialog_info.callback = taskconfig->pfCallback; - dialog_info.callback_data = taskconfig->lpCallbackData; + dialog_info.taskconfig = taskconfig; template = create_taskdialog_template(taskconfig); ret = (short)DialogBoxIndirectParamW(taskconfig->hInstance, template, taskconfig->hwndParent,

1 0

Andrew Wesie : ntdll: Return success for TokenIntegrityLevel in NtSetInformationToken.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 407fd270a3114ea6a8f39d893292086a84e3d481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=407fd270a3114ea6a8f39d89… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri May 18 04:51:01 2018 +0000 ntdll: Return success for TokenIntegrityLevel in NtSetInformationToken. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 4ff9880..dc0ce04 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -638,6 +638,10 @@ NTSTATUS WINAPI NtSetInformationToken( FIXME("TokenSessionId stub!\n"); ret = STATUS_SUCCESS; break; + case TokenIntegrityLevel: + FIXME("TokenIntegrityLevel stub!\n"); + ret = STATUS_SUCCESS; + break; default: FIXME("unimplemented class %u\n", TokenInformationClass); break;

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018