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

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: a70c24d454af0404cd3ad90e29c1e60d1273abb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70c24d454af0404cd3ad90e2… Author: Kim Malmo <berencamlost(a)msn.com> Date: Wed Jul 20 18:20:39 2016 +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 | 52 ++++++++++++++++------------------------------------ 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 11241ba..c91026b 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11976,86 +11976,66 @@ msgstr "regedit: Uhåndtert handling.\n" #: regedit.rc:367 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: Ikke nok minne! (%1!S!, linje %2!u!)\n" #: regedit.rc:368 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "reg: Ugyldig nøkkelnavn\n" +msgstr "regedit: Ugyldig heksadesimal verdi.\n" #: regedit.rc:369 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: Kan ikke konvertere heksadesimale data. En ugyldig verdi " +"inntraffved \"%1\".\n" #: regedit.rc:370 -#, fuzzy -#| msgid "regedit: Invalid or unrecognized switch [%1]\n" msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Ugyldig eller ukjent bryter [%1]\n" +msgstr "regedit: Ukjent escape-sekvens [\\%1!c!]\n" #: regedit.rc:371 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!]\n" -msgstr "reg: Registerdatatypen støttes ikke [%1]\n" +msgstr "regedit: Registerdatatypen [%1!u!] støttes ikke\n" #: regedit.rc:372 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "regedit: Kan ikke åpne filen \"%1\".\n" +msgstr "regedit: Uventet ende på linje i \"%1\".\n" #: regedit.rc:373 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "regedit: The line '%1' was not recognized.\n" -msgstr "regedit: Filen \"%1\" ble ikke funnet.\n" +msgstr "regedit: Linjen \"%1\" ble ikke gjenkjent.\n" #: regedit.rc:374 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "regedit: Kan ikke åpne filen \"%1\".\n" +msgstr "regedit: Kan ikke legge registerverdien \"%1\" til \"%2\".\n" #: regedit.rc:375 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: Kan ikke åpne filen \"%1\".\n" +msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" #: regedit.rc:376 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1!u!] encountered in '%2'.\n" -msgstr "reg: Registerdatatypen støttes ikke [%1]\n" +msgstr "regedit: Registerdatatypen [%1!u!], funnet i \"%2\", støttes ikke.\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: Registerverdien \"%1\" vil bli eksportert som binære data.\n" #: regedit.rc:378 -#, fuzzy -#| msgid "regedit: No registry key was specified for removal.\n" msgid "regedit: Incorrect registry class specification in '%1'.\n" -msgstr "regedit: Ingen registernøkkel ble oppgitt for fjerning.\n" +msgstr "regedit: Feil registerklasse-spesifikasjon i \"%1\".\n" #: regedit.rc:379 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" msgstr "" -"reg: Systemet klarte ikke finne den angitte registernøkkelen eller -verdien\n" +"regedit: Kan ikke eksportere \"%1\". Den spesifiserte registernøkkelen ble " +"ikke funnet.\n" #: regedit.rc:380 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to delete the registry class '%1'.\n" -msgstr "regedit: Kan ikke åpne filen \"%1\".\n" +msgstr "regedit: Kan ikke slette registerklassen \"%1\".\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Alexandre Julliard : loader: The preloader is not supported on Android, don't try to use it.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: c2d7bda87f5e0972c007b4d9639793fe67a5c32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d7bda87f5e0972c007b4d96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 21 12:29:08 2016 +0900 loader: The preloader is not supported on Android, don't try to use it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/loader/main.c b/loader/main.c index bb752b5..05e0c06 100644 --- a/loader/main.c +++ b/loader/main.c @@ -109,7 +109,14 @@ static void check_command_line( int argc, char *argv[] ) } -#if defined(__linux__) && (defined(__i386__) || defined(__arm__)) +#ifdef __ANDROID__ + +static int pre_exec(void) +{ + return 0; /* no exec needed */ +} + +#elif defined(__linux__) && (defined(__i386__) || defined(__arm__)) #ifdef __i386__ /* separate thread to check for NPTL and TLS features */

1 0

Jan Schmidt : quartz: Images in Direct3D surfaces must be top-down.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: b5a33f02d3ca63717b2e5f6751c556139467b276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a33f02d3ca63717b2e5f675… Author: Jan Schmidt <jan(a)centricular.com> Date: Wed Jul 20 14:37:10 2016 +1000 quartz: Images in Direct3D surfaces must be top-down. Invert images when copying to a Direct3D surface if they are provided bottom-up. Signed-off-by: Jan Schmidt <jan(a)centricular.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f2c3d93..d590a71 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -255,7 +255,17 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo * return hr; } - if (lock.Pitch != width * bmiHeader->biBitCount / 8) + if (height > 0) { + /* Bottom up image needs inverting */ + lock.pBits = (char *)lock.pBits + (height * lock.Pitch); + while (height--) + { + memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); + data = data + width * bmiHeader->biBitCount / 8; + lock.pBits = (char *)lock.pBits - lock.Pitch; + } + } + else if (lock.Pitch != width * bmiHeader->biBitCount / 8) { WARN("Slow path! %u/%u\n", lock.Pitch, width * bmiHeader->biBitCount/8);

1 0

Jan Schmidt : quartz: Return the fullscreen status in Videorenderer.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: 9f924276a6e53d39d3f47ae27a6426e78b1a16f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f924276a6e53d39d3f47ae27… Author: Jan Schmidt <jan(a)centricular.com> Date: Wed Jul 20 14:37:12 2016 +1000 quartz: Return the fullscreen status in Videorenderer. Signed-off-by: Jan Schmidt <jan(a)centricular.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 5cddaa7..c011da8 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -62,6 +62,7 @@ typedef struct VideoRendererImpl RECT WindowPos; LONG VideoWidth; LONG VideoHeight; + LONG FullScreenMode; } VideoRendererImpl; static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface) @@ -890,7 +891,12 @@ static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, { VideoRendererImpl *This = impl_from_IVideoWindow(iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, FullScreenMode); + TRACE("(%p/%p)->(%p): %d\n", This, iface, FullScreenMode, This->FullScreenMode); + + if (!FullScreenMode) + return E_POINTER; + + *FullScreenMode = This->FullScreenMode; return S_OK; } @@ -918,6 +924,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, SetWindowPos(This->baseControlWindow.baseWindow.hWnd,0,This->DestRect.left,This->DestRect.top,This->DestRect.right,This->DestRect.bottom,SWP_NOZORDER|SWP_SHOWWINDOW); This->WindowPos = This->DestRect; } + This->FullScreenMode = FullScreenMode; return S_OK; } @@ -1025,6 +1032,7 @@ HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); + pVideoRenderer->FullScreenMode = OAFALSE; if (pUnkOuter) pVideoRenderer->outer_unk = pUnkOuter;

1 0

Ken Thomases : winemac: Only call -[NSApplication unhide:] if the app is actually hidden.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: 951a6c0338d39d5bb1a02d701bc6069f85ce82a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=951a6c0338d39d5bb1a02d701… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 20 18:50:25 2016 -0500 winemac: Only call -[NSApplication unhide:] if the app is actually hidden. This avoids a Cocoa bug where, if an app in the background which is not hidden calls -unhide:, its main menu bar window is brought forward. The active app hasn't actually been changed. Key events continue to go to the app in the foreground. But it's confusing to the user when they look at the menu bar and, if they click in the menu bar, the background app really will be activated. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4f59121..808a7e7 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1427,7 +1427,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi BOOL wasVisible; [controller transformProcessToForeground]; - [NSApp unhide:nil]; + if ([NSApp isHidden]) + [NSApp unhide:nil]; wasVisible = [self isVisible]; if (activate)

1 0

Julian Rüger : German translation for release 1.9.14
by Jeremy Newman 21 Jul '16

21 Jul '16

Module: website Branch: master Commit: bb7fde6443588f6f4fbb303da21a520ff5f3b5a3 URL: http://source.winehq.org/git/website.git/?a=commit;h=bb7fde6443588f6f4fbb30… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 21 10:22:10 2016 +0200 German translation for release 1.9.14 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016070901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016070901.xml b/news/de/2016070901.xml new file mode 100644 index 0000000..2f131fa --- /dev/null +++ b/news/de/2016070901.xml @@ -0,0 +1,16 @@ +<news> +<date>9. Juli 2016</date> +<title>Wine 1.9.14 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.14 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.14">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mehr Shader-Model-5-Unterstützung in Direct3D.</li> + <li>Etwas bessere Schreibunterstützung in den WebServices.</li> + <li>Performance-Verbesserungen im GDI.</li> + <li>Weiterer Fortschritt in Richtung des Direct3D-Commandstream.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.14.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.13
by Jeremy Newman 21 Jul '16

21 Jul '16

Module: website Branch: master Commit: 6d5dd357df83a60bb48ce92ca014c26d3c4a481e URL: http://source.winehq.org/git/website.git/?a=commit;h=6d5dd357df83a60bb48ce9… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 21 10:17:17 2016 +0200 German translation for release 1.9.13 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016062401.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2016062401.xml b/news/de/2016062401.xml new file mode 100644 index 0000000..161e72f --- /dev/null +++ b/news/de/2016062401.xml @@ -0,0 +1,18 @@ +<news> +<date>24. Juni 2016</date> +<title>Wine 1.9.13 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko-Engine, basierend auf Firefox 47.</li> + <li>Mehr Shader-Model-5-Unterstützung in Direct3D.</li> + <li>Unicode-Daten auf Unicode 9.0.0 aktualisiert.</li> + <li>Verbesserungen an GDI-Pfaden und Metafiles.</li> + <li>Weiterer Fortschritt in Richtung des Direct3D-Commandstream.</li> + <li>Bessere Joystick-Unterstützung unter Mac OS X.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.13.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Andrey Gusev : avifil32: Use debugstr_guid() in TRACE() message.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: e9907520b8f144fa86a8d97cb5031c869e12af96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9907520b8f144fa86a8d97cb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jul 20 12:52:45 2016 +0300 avifil32: Use debugstr_guid() in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 30fa604..98231e8 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -56,7 +56,7 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) static HRESULT WINAPI IClassFactory_fnQueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { - TRACE("(%p,%p,%p)\n", iface, riid, ppobj); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj); if ((IsEqualGUID(&IID_IUnknown, riid)) || (IsEqualGUID(&IID_IClassFactory, riid))) {

1 0

Jacek Caban : jscript: Use IDispatch* as iface_to_jsdisp argument type.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: be37b894a43dc74e7629e49180f6d62839f98127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be37b894a43dc74e7629e4918… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 20 13:40:41 2016 +0200 jscript: Use IDispatch* as iface_to_jsdisp argument type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 4 ++-- dlls/jscript/dispex.c | 18 +++++++++--------- dlls/jscript/engine.c | 10 +++++----- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/json.c | 6 +++--- dlls/jscript/jsregexp.c | 4 ++-- dlls/jscript/jsutils.c | 2 +- dlls/jscript/string.c | 10 +++++----- 9 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be37b894a43dc74e7629e…

1 0

Jacek Caban : jscript: Optimize iface_to_jsdisp by using vtbl comparison.
by Alexandre Julliard 20 Jul '16

20 Jul '16

Module: wine Branch: master Commit: 798ba715e398495fcd172d78196068e39f5b257b URL: http://source.winehq.org/git/wine.git/?a=commit;h=798ba715e398495fcd172d781… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 20 13:41:23 2016 +0200 jscript: Optimize iface_to_jsdisp by using vtbl comparison. This is 14% win on SunSpider 0.9 benchmark. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 93d74ba..538219e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -25,13 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -/* - * This IID is used to get jsdisp_t objecto from interface. - * We might consider using private interface instead. - */ -static const IID IID_IDispatchJS = - {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6}}; - #define FDEX_VERSION_MASK 0xf0000000 #define GOLDEN_RATIO 0x9E3779B9U @@ -565,11 +558,6 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = &This->IDispatchEx_iface; - }else if(IsEqualGUID(&IID_IDispatchJS, riid)) { - TRACE("(%p)->(IID_IDispatchJS %p)\n", This, ppv); - jsdisp_addref(This); - *ppv = This; - return S_OK; }else { WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -1027,14 +1015,9 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built jsdisp_t *iface_to_jsdisp(IDispatch *iface) { - jsdisp_t *ret; - HRESULT hres; - - hres = IDispatch_QueryInterface(iface, &IID_IDispatchJS, (void**)&ret); - if(FAILED(hres)) - return NULL; - - return ret; + return iface->lpVtbl == (const IDispatchVtbl*)&DispatchExVtbl + ? jsdisp_addref( impl_from_IDispatchEx((IDispatchEx*)iface)) + : NULL; } HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID *id)

1 0