March 2017 - Wine-commits - list.winehq.org

Daniel Lehman : mshtml: Decrement refcount in nsWeakReference::Release ( Valgrind).
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: f21ec7f170950b610c5fbd36c8eda74a530cfe22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21ec7f170950b610c5fbd36c… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Mar 20 22:56:50 2017 -0700 mshtml: Decrement refcount in nsWeakReference::Release (Valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index e343dde..aee00e6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1204,7 +1204,7 @@ static nsrefcnt NSAPI nsWeakReference_AddRef(nsIWeakReference *iface) static nsrefcnt NSAPI nsWeakReference_Release(nsIWeakReference *iface) { nsWeakReference *This = impl_from_nsIWeakReference(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref);

1 0

Andrey Gusev : uiautomationcore: Add UiaLookupId stub.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: c9fcbf14ae25c241ac470c0df4d129233263cb2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fcbf14ae25c241ac470c0df… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Mar 20 15:15:07 2017 +0200 uiautomationcore: Add UiaLookupId stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 11 ++++++++++- dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 10 ++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 994d8e6..ceb2d1d 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "uiautomationcore.h" +#include "uiautomation.h" #include "wine/debug.h" @@ -45,3 +45,12 @@ BOOL WINAPI UiaClientsAreListening(void) FIXME("()\n"); return FALSE; } + +/*********************************************************************** + * UiaLookupId (uiautomationcore.@) + */ +int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid) +{ + FIXME("(%d, %s) stub!\n", type, debugstr_guid(guid)); + return 1; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 3026001..39af30a 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -69,7 +69,7 @@ @ stub UiaHUiaNodeFromVariant @ stub UiaHasServerSideProvider @ stub UiaHostProviderFromHwnd -@ stub UiaLookupId +@ stdcall UiaLookupId(long ptr) @ stub UiaNavigate @ stub UiaNodeFromFocus @ stub UiaNodeFromHandle diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 340f500..7d9fdba 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -39,6 +39,16 @@ DECLARE_HANDLE(HUIAPATTERNOBJECT); DECLARE_HANDLE(HUIATEXTRANGE); DECLARE_HANDLE(HUIAEVENT); +enum AutomationIdentifierType +{ + AutomationIdentifierType_Property, + AutomationIdentifierType_Pattern, + AutomationIdentifierType_Event, + AutomationIdentifierType_ControlType, + AutomationIdentifierType_TextAttribute +}; + +int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0

Akihiro Sagawa : winemac.drv: Use neutral language for the version resource.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 2680971ef4a175916ed6c8385d82b7e147170d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2680971ef4a175916ed6c8385… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:01 2017 +0900 winemac.drv: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/winemac.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/winemac.rc b/dlls/winemac.drv/winemac.rc index 863551e..629441b 100644 --- a/dlls/winemac.drv/winemac.rc +++ b/dlls/winemac.drv/winemac.rc @@ -43,6 +43,8 @@ STRINGTABLE STRING_MENU_ITEM_BRING_ALL_TO_FRONT "Bring All to Front" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Mac driver" #define WINE_FILENAME_STR "winemac.drv"

1 0

Akihiro Sagawa : wrc: Add support for translating version info through po files.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 52931c7523309e79b66e57cc1617ae3f2a401989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52931c7523309e79b66e57cc1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 23 00:00:57 2017 +0900 wrc: Add support for translating version info through po files. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/po.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52931c7523309e79b66e5…

1 0

Akihiro Sagawa : version/tests: Check the translation resource before testing.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: e0b4a3527b3862c3aaaac32237e3b43a4d6f8573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b4a3527b3862c3aaaac3223… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 23 00:00:59 2017 +0900 version/tests: Check the translation resource before testing. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/tests/info.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index c033aa9..e49671e 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winerror.h" #include "winnls.h" +#include "winuser.h" #include "winver.h" #include "verrsrc.h" #include "wine/test.h" @@ -646,6 +647,17 @@ static void test_GetFileVersionInfoEx(void) }; char desc[MAX_PATH]; + mod = GetModuleHandleA("kernel32.dll"); + assert(mod); + + if (!FindResourceExA(mod, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, lang) && + !FindResourceExA(mod, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, + MAKELANGID(PRIMARYLANGID(lang),SUBLANG_NEUTRAL))) + { + skip("Translation is not available\n"); + return; + } + size = GetFileVersionInfoSizeW(kernel32W, NULL); ok(size, "GetFileVersionInfoSize(kernel32) error %u\n", GetLastError());

1 0

Francois Gouget : testbot/WineRunTask: Clarify the timeout reporting.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: tools Branch: master Commit: 99a40fdf458c266c4524996fa99c8f8b31d93aea URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a40fdf458c266c4524996f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 22 01:16:22 2017 +0100 testbot/WineRunTask: Clarify the timeout reporting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index dc9e9e6..8799b0b 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -444,7 +444,7 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) my $ErrMessage = $TA->GetLastError(); if ($ErrMessage =~ /timed out waiting for the child process/) { - LogTaskError("The test timed out\n"); + LogTaskError("The task timed out\n"); $TestFailures = 1; $TimedOut = 1; } @@ -574,7 +574,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } elsif ($Rc == 258) { - # This is a timeout + # This is a timeout. Those are already reported based on the + # done line. $LogFailures++; } elsif ($LineFailures == 0 and $Rc != 0)

1 0

Francois Gouget : testbot/WineRunTask: Fix handling of tests with no argument.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: tools Branch: master Commit: 106bdce720415a6626cc3675d61e96b16dbfbd4f URL: http://source.winehq.org/git/tools.git/?a=commit;h=106bdce720415a6626cc3675… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 22 01:16:48 2017 +0100 testbot/WineRunTask: Fix handling of tests with no argument. TestLauncher always shows the first argument as the test unit name. If there is no argument the test unit name will be an empty string and yet the test will succeed if there is only one test unit for that dll. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 8799b0b..d364777 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -461,13 +461,14 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) chmod 0664, $FullLogFileName; if (open(my $LogFile, "<", $FullLogFileName)) { - # Note that for the TestBot we don't really care about the todos and skips + # There is more than one test unit when running the full test suite so keep + # track of the current one. Also note that for the TestBot we don't really + # care about the todos and skips my ($CurrentDll, $CurrentUnit, $LineFailures, $SummaryFailures) = ("", "", 0, 0); my ($CurrentIsPolluted, %CurrentPids, $LogFailures); foreach my $Line (<$LogFile>) { - # There may be more than one summary line due to child processes - if ($Line =~ m%([_.a-z0-9]+):([_a-z0-9]+) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) + if ($Line =~ m%([_.a-z0-9]+):([_a-z0-9]*) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) { my ($Dll, $Unit) = ($1, $2); if ($CurrentDll ne "") @@ -519,9 +520,12 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) { my ($Pid, $Unit, $Todo, $Failures) = ($1, $2, $3, $4); - # TestLauncher uses the wrong name in its test summary line - if ($Unit eq $CurrentUnit or $Unit eq $CurrentDll) + # Dlls that have only one test unit will run it even if there is + # no argument. Also TestLauncher uses the wrong name in its test + # summary line when skipping tests. + if ($Unit eq $CurrentUnit or $CurrentUnit eq "" or $Unit eq $CurrentDll) { + # There may be more than one summary line due to child processes $CurrentPids{$Pid || 0} = 1; $SummaryFailures += $Failures; } @@ -535,7 +539,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } } } - elsif ($Line =~ /^([_.a-z0-9]+):([_a-z0-9]+)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/) + elsif ($Line =~ /^([_.a-z0-9]+):([_a-z0-9]*)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4);

1 0

Henri Verbeet : wined3d: Merge surface_blt_to_drawable() into surface_load_drawable().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 5ab99b1643a7a26db5b17a14fcfe2a1f98bb7785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab99b1643a7a26db5b17a14f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:14 2017 +0100 wined3d: Merge surface_blt_to_drawable() into surface_load_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 008ca47..94ec035 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2098,29 +2098,6 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW rect->bottom = drawable_height - rect->bottom; } -/* Context activation is done by the caller. */ -static void surface_blt_to_drawable(struct wined3d_device *device, - struct wined3d_context *context, enum wined3d_texture_filter_type filter, - struct wined3d_surface *src_surface, const RECT *src_rect_in, - struct wined3d_surface *dst_surface, const RECT *dst_rect_in) -{ - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *dst_texture = dst_surface->container; - struct wined3d_surface *restore_rt = NULL; - - restore_rt = context_get_rt_surface(context); - if (restore_rt != dst_surface) - context = context_acquire(device, dst_texture, dst_sub_resource_idx); - else - restore_rt = NULL; - - device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, - src_surface, src_rect_in, dst_surface, dst_rect_in, NULL, filter); - - if (restore_rt) - context_restore(context, restore_rt); -} - HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) { struct wined3d_resource *resource = &s->container->resource; @@ -2337,6 +2314,8 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; + struct wined3d_surface *restore_rt = NULL; + struct wined3d_device *device; RECT r; if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) @@ -2354,10 +2333,20 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, return FALSE; } + device = texture->resource.device; + restore_rt = context_get_rt_surface(context); + if (restore_rt != surface) + context = context_acquire(device, texture, sub_resource_idx); + else + restore_rt = NULL; + surface_get_rect(surface, NULL, &r); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - surface_blt_to_drawable(texture->resource.device, context, - WINED3D_TEXF_POINT, surface, &r, surface, &r); + device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, + surface, &r, surface, &r, NULL, WINED3D_TEXF_POINT); + + if (restore_rt) + context_restore(context, restore_rt); return TRUE; }

1 0

Henri Verbeet : wined3d: Check for GL_FRONT before GL_BACK in wined3d_texture_get_gl_buffer().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 0d0f3c940f45d10f3d8dceb5fa52bb9f1893c75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0f3c940f45d10f3d8dceb5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:15 2017 +0100 wined3d: Check for GL_FRONT before GL_BACK in wined3d_texture_get_gl_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4351089..d4436d9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -60,7 +60,13 @@ GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) return GL_NONE; } - if (swapchain->back_buffers && swapchain->back_buffers[0] == texture) + if (texture == swapchain->front_buffer) + { + TRACE("Returning GL_FRONT.\n"); + return GL_FRONT; + } + + if (texture == swapchain->back_buffers[0]) { if (swapchain->render_to_fbo) { @@ -70,11 +76,6 @@ GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) TRACE("Returning GL_BACK.\n"); return GL_BACK; } - else if (texture == swapchain->front_buffer) - { - TRACE("Returning GL_FRONT.\n"); - return GL_FRONT; - } FIXME("Higher back buffer, returning GL_BACK.\n"); return GL_BACK;

1 0

Huw Davies : msi/tests: Clean up the registry in the correct order.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 582245b5c49452c28a1e6ed30d8935772d368340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582245b5c49452c28a1e6ed30… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 20:16:01 2017 +0000 msi/tests: Clean up the registry in the correct order. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 46d0b73..ad7fb84 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11217,18 +11217,18 @@ static void test_MsiEnumPatchesEx_machine(void) ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); delete_key(hpatch, "", access & KEY_WOW64_64KEY); + RegDeleteValueA(hpatch, "State"); RegCloseKey(hpatch); delete_key(udpatch, "", access & KEY_WOW64_64KEY); RegCloseKey(udpatch); + delete_key(udprod, "", access & KEY_WOW64_64KEY); + RegCloseKey(udprod); done: RegDeleteValueA(patches, patch_squashed); RegDeleteValueA(patches, "Patches"); delete_key(patches, "", access & KEY_WOW64_64KEY); RegCloseKey(patches); - RegDeleteValueA(hpatch, "State"); - delete_key(udprod, "", access & KEY_WOW64_64KEY); - RegCloseKey(udprod); delete_key(prodkey, "", access & KEY_WOW64_64KEY); RegCloseKey(prodkey); }

1 0