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

Andrew Eikum : winepulse.drv: Check that the server connection actually succeeded.
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 0766334d04d00f1de6d601a4b052f7dfedcd9c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0766334d04d00f1de6d601a4b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 4 10:16:15 2016 -0600 winepulse.drv: Check that the server connection actually succeeded. When there is no PA server running, some older PulseAudio versions have pa_mainloop_iterate fail instead of setting the connection state to failed. So, we should also check the connection state after exiting the loop to ensure it really succeeded before continuing. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index d57b822..1c38e58 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -573,6 +573,9 @@ static HRESULT pulse_test_connect(void) break; } + if (pa_context_get_state(pulse_ctx) != PA_CONTEXT_READY) + goto fail; + TRACE("Test-connected to server %s with protocol version: %i.\n", pa_context_get_server(pulse_ctx), pa_context_get_server_protocol_version(pulse_ctx));

1 0

André Hentschel : wrc: Remove getopt prototype.
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 0beb178a2e1bac0efb774823567268cb75b0eaa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0beb178a2e1bac0efb7748235… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 4 19:07:18 2016 +0100 wrc: Remove getopt prototype. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/wrc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 15326ee..ea8bfe0 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -162,7 +162,6 @@ int parser_debug, yy_flex_debug; resource_t *resource_top; /* The top of the parsed resources */ -int getopt (int argc, char *const *argv, const char *optstring); static void cleanup_files(void); static void segvhandler(int sig);

1 0

Nikolay Sivov : ole32/tests: Fix tests failing on limited account.
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 485a412b1870b829b3865982e251d5418fb62a44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485a412b1870b829b3865982e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 08:02:17 2016 +0300 ole32/tests: Fix tests failing on limited account. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b88029f..49aced9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2364,17 +2364,21 @@ static void test_OleRegGetUserType(void) StringFromGUID2(&CLSID_non_existent, clsidW, sizeof(clsidW)/sizeof(clsidW[0])); ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsidkeyW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &clsidhkey, &disposition); + if (!ret) + { + ret = RegCreateKeyExW(clsidhkey, clsidW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &classkey, NULL); + if (ret) + RegCloseKey(clsidhkey); + } + if (ret == ERROR_ACCESS_DENIED) { - skip("Failed to create test key, skipping some of OleRegGetUserType() tests.\n"); + win_skip("Failed to create test key, skipping some of OleRegGetUserType() tests.\n"); return; } ok(!ret, "failed to create a key %d, error %d\n", ret, GetLastError()); - ret = RegCreateKeyExW(clsidhkey, clsidW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &classkey, NULL); - ok(!ret, "failed to create a key %d, error %d\n", ret, GetLastError()); - ret = RegSetValueExW(classkey, NULL, 0, REG_SZ, (const BYTE*)defvalueW, sizeof(defvalueW)); ok(!ret, "got %d, error %d\n", ret, GetLastError());

1 0

Nikolay Sivov : ole32/tests: Don' t trace last error when error code is returned directly.
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 2a1e856bd93cbbd6d536b6d7cdaa3c42aa19b759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1e856bd93cbbd6d536b6d7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 08:02:18 2016 +0300 ole32/tests: Don't trace last error when error code is returned directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 49aced9..65a8fb5 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2098,12 +2098,11 @@ static void test_TreatAsClass(void) ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &clsidkey); - ok(lr == ERROR_SUCCESS, "Couldn't open CLSID key\n"); + ok(!lr, "Couldn't open CLSID key, error %d\n", lr); lr = RegCreateKeyExA(clsidkey, deadbeefA, 0, NULL, 0, KEY_WRITE, NULL, &deadbeefkey, NULL); if (lr) { - win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", - GetLastError()); + win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", lr); RegCloseKey(clsidkey); return; } @@ -2377,13 +2376,13 @@ static void test_OleRegGetUserType(void) return; } - ok(!ret, "failed to create a key %d, error %d\n", ret, GetLastError()); + ok(!ret, "failed to create a key, error %d\n", ret); ret = RegSetValueExW(classkey, NULL, 0, REG_SZ, (const BYTE*)defvalueW, sizeof(defvalueW)); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); ret = RegCreateKeyExA(classkey, "AuxUserType", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &auxhkey, NULL); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); /* populate AuxUserType */ for (i = 0; i <= 4; i++) { @@ -2391,10 +2390,10 @@ static void test_OleRegGetUserType(void) sprintf(name, "AuxUserType\\%d", i); ret = RegCreateKeyExA(classkey, name, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); ret = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE*)auxvalues[i], strlen(auxvalues[i])); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); RegCloseKey(hkey); }

1 0

Nikolay Sivov : ole32/tests: Fixed CoGetPSClsid() test failures when running on limited account.
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 22ef1c7e2aa7872d9b3c82a6d32abc92aa2b61a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22ef1c7e2aa7872d9b3c82a6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 08:02:19 2016 +0300 ole32/tests: Fixed CoGetPSClsid() test failures when running on limited account. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 65a8fb5..183d8a0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1293,6 +1293,12 @@ static void test_CoGetPSClsid(void) ok(!res, "RegCreateKeyEx returned %d\n", res); res = RegCreateKeyExA(hkey_iface, clsidDeadBeef, 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + win_skip("Failed to create a key, skipping some of CoGetPSClsid() tests\n"); + goto cleanup; + } + ok(!res, "RegCreateKeyEx returned %d\n", res); res = RegCreateKeyExA(hkey, "ProxyStubClsid32", 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey_psclsid, NULL); @@ -1310,6 +1316,8 @@ static void test_CoGetPSClsid(void) RegCloseKey(hkey); res = pRegDeleteKeyExA(hkey_iface, clsidDeadBeef, opposite, 0); ok(!res, "RegDeleteKeyEx returned %d\n", res); + + cleanup: RegCloseKey(hkey_iface); }

1 0

Francois Gouget : include: Don't use the visibility attribute on Solaris.
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 947fd6e6f966770c3b551f9744d5062ef46df4b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947fd6e6f966770c3b551f974… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 10:49:04 2016 +0100 include: Don't use the visibility attribute on Solaris. It is not supported and mostly ignored but can still break linking with static libraries. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 2309ae3..559a719 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -148,13 +148,13 @@ extern "C" { # define DECLSPEC_EXPORT __declspec(dllexport) #elif defined(__MINGW32__) # define DECLSPEC_EXPORT __attribute__((dllexport)) -#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) +#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) && !defined(__sun) # define DECLSPEC_EXPORT __attribute__((visibility ("default"))) #else # define DECLSPEC_EXPORT #endif -#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) || defined(__sun) # define DECLSPEC_HIDDEN #elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) # define DECLSPEC_HIDDEN __attribute__((visibility ("hidden")))

1 0

Frédéric Delanoy : winemaker: Markup fixes in French translation.
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 1bd60414c8f07461447b53e98dbc38001a04e6dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd60414c8f07461447b53e98… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Mar 6 02:30:28 2016 +0100 winemaker: Markup fixes in French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker.fr.UTF-8.man.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/winemaker/winemaker.fr.UTF-8.man.in b/tools/winemaker/winemaker.fr.UTF-8.man.in index 8e454ae..75ed9fd 100644 --- a/tools/winemaker/winemaker.fr.UTF-8.man.in +++ b/tools/winemaker/winemaker.fr.UTF-8.man.in @@ -29,12 +29,11 @@ winemaker \- générer une infrastructure de construction pour la compilation de .br [ .BR "--generated-files " "] [ " "--nogenerated-files " "] -] .br [ .BR "--wine32 " "] .br -.IR " répertoire_de_travail" "| " "fichier_projet" "| " "fichier_espace_de_travail" +.IR " répertoire_de_travail" " | " "fichier_projet" " | " "fichier_espace_de_travail" .SH DESCRIPTION .PP @@ -49,7 +48,7 @@ convertis en majuscules durant le transfert. .PP -\ convertir les fins de ligne DOS en fins de ligne UNIX (CRLF vers LF). .PP --\ balayer les directives d'inclusion et les références aux fichiers +-\ parcourir les directives d'inclusion et les références aux fichiers de ressources pour y remplacer les backslashs par des slashs. .PP -\ durant l'étape ci-dessus, @@ -182,7 +181,7 @@ L'ensemble standard de bibliothèques est : \fIodbc32.dll\fR, \fIodbccp32.dll\f \fIoleaut32.dll\fR et \fIwinspool.drv\fR. .TP .B --nomsvcrt -Définir certaines options afin que winegcc n'utilise pas +Définir certaines options afin que \fBwinegcc\fR n'utilise pas msvcrt durant la compilation. Utilisez cette option si certains fichiers cpp incluent \fI<string>\fR. .TP @@ -192,7 +191,7 @@ Utiliser le mode interactif. Dans ce mode, demandera de confirmer la liste de cibles pour chaque répertoire, et ensuite de fournir des options spécifiques de répertoire et/ou de cible. .TP -.BR --single-target " nom" +.BI --single-target " nom" Spécifier qu'il n'y a qu'une seule cible, appelée \fInom\fR. .TP .B --generated-files

1 0

Henri Verbeet : wined3d: Get resource info from the texture in context_setup_target().
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 34968bb2d80455348e52b9257d46c61a41e8ec7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34968bb2d80455348e52b9257… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 6 20:59:45 2016 +0100 wined3d: Get resource info from the texture in context_setup_target(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 500904d..415eedf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3426,8 +3426,8 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d } else { - const struct wined3d_format *old = context->current_rt->resource.format; - const struct wined3d_format *new = target->resource.format; + const struct wined3d_format *old = context->current_rt->container->resource.format; + const struct wined3d_format *new = target->container->resource.format; if (old->id != new->id) {

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_device_set_cursor_properties ().
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 1e78dd31979937862a66ac35ebcc79ee824603c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e78dd31979937862a66ac35e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 6 20:59:46 2016 +0100 wined3d: Get resource info from the texture in wined3d_device_set_cursor_properties(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ded1229..a724659 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4296,10 +4296,10 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device device->cursor_texture = NULL; } - if (cursor_image->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) + if (texture->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) { - WARN("Surface %p has an invalid format %s.\n", - cursor_image, debug_d3dformat(cursor_image->resource.format->id)); + WARN("Texture %p has invalid format %s.\n", + texture, debug_d3dformat(texture->resource.format->id)); return WINED3DERR_INVALIDCALL; }

1 0

Henri Verbeet : wined3d: Get resource info from the rendertarget view in device_clear_render_targets ().
by Alexandre Julliard 07 Mar '16

07 Mar '16

Module: wine Branch: master Commit: 2d8a1034fa8e90b45cc40987975306edd812a1c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8a1034fa8e90b45cc409879… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 6 20:59:47 2016 +0100 wined3d: Get resource info from the rendertarget view in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a724659..2305b2c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -320,13 +320,15 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c * checking all this if the dest surface is in the drawable anyway. */ for (i = 0; i < rt_count; ++i) { - struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(fb->render_targets[i]); - if (rt && rt->resource.format->id != WINED3DFMT_NULL) + struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; + struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(rtv); + + if (rt && rtv->format->id != WINED3DFMT_NULL) { if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, clear_rect)) - surface_load_location(rt, context, rt->container->resource.draw_binding); + surface_load_location(rt, context, rtv->resource->draw_binding); else - wined3d_surface_prepare(rt, context, rt->container->resource.draw_binding); + wined3d_surface_prepare(rt, context, rtv->resource->draw_binding); } } @@ -394,12 +396,13 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { for (i = 0; i < rt_count; ++i) { - struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(fb->render_targets[i]); + struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; + struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(rtv); if (rt) { - surface_validate_location(rt, rt->container->resource.draw_binding); - surface_invalidate_location(rt, ~rt->container->resource.draw_binding); + surface_validate_location(rt, rtv->resource->draw_binding); + surface_invalidate_location(rt, ~rtv->resource->draw_binding); } }

1 0