February 2016 - Wine-Commits

Henri Verbeet : ddraw: Handle DDBLT_DDROPS in ddraw_surface7_Blt().
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 47635a60a0f372b8c5258afb0346f829fad5b6f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47635a60a0f372b8c5258afb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:01 2016 +0100 ddraw: Handle DDBLT_DDROPS in ddraw_surface7_Blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 8 ++++++++ dlls/wined3d/surface.c | 4 ---- include/wine/wined3d.h | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index dc6ad25..6d9bed1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1553,6 +1553,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * return DDERR_INVALIDPARAMS; } + if (Flags & DDBLT_DDROPS) + { + FIXME("DDBLT_DDROPS not implemented.\n"); + if (DDBltFx) + FIXME(" rop %#x, pattern %p.\n", DDBltFx->dwDDROP, DDBltFx->u5.lpDDSPattern); + return DDERR_NORASTEROPHW; + } + wined3d_mutex_lock(); if (Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0e6bf28..33942d8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4375,10 +4375,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { FIXME("DDBLT_DEPTHFILL needs to be implemented!\n"); } - if (flags & WINEDDBLT_DDROPS) - { - FIXME("\tDdraw Raster Ops: %08x Pattern: %p\n", fx->dwDDROP, fx->u5.lpDDSPattern); - } /* Now the 'with source' blits. */ if (src_surface) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3b5e0d6..18d7a75 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1279,7 +1279,6 @@ enum wined3d_display_rotation #define WINEDDBLT_ASYNC 0x00000200 #define WINEDDBLT_COLORFILL 0x00000400 #define WINEDDBLT_DDFX 0x00000800 -#define WINEDDBLT_DDROPS 0x00001000 #define WINEDDBLT_KEYDEST 0x00002000 #define WINEDDBLT_KEYDESTOVERRIDE 0x00004000 #define WINEDDBLT_KEYSRC 0x00008000

1 0

Henri Verbeet : wined3d: Get rid of the unused _WINEDDOVERLAYFX structure.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 05b84945d5b1b2d37b20ae390db557b70d3395ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b84945d5b1b2d37b20ae390… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:00 2016 +0100 wined3d: Get rid of the unused _WINEDDOVERLAYFX structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 26 +------------------------- 4 files changed, 10 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index aa6a0d1..dc6ad25 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3707,14 +3707,17 @@ static HRESULT WINAPI ddraw_surface7_UpdateOverlay(IDirectDrawSurface7 *iface, R TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), flags, fx); + if (fx) + FIXME("Ignoring fx %p.\n", fx); + wined3d_mutex_lock(); if (dst_impl) { dst_wined3d_texture = dst_impl->wined3d_texture; dst_sub_resource_idx = dst_impl->sub_resource_idx; } - hr = wined3d_texture_update_overlay(src_impl->wined3d_texture, src_impl->sub_resource_idx, src_rect, - dst_wined3d_texture, dst_sub_resource_idx, dst_rect, flags, (WINEDDOVERLAYFX *)fx); + hr = wined3d_texture_update_overlay(src_impl->wined3d_texture, src_impl->sub_resource_idx, + src_rect, dst_wined3d_texture, dst_sub_resource_idx, dst_rect, flags); wined3d_mutex_unlock(); switch (hr) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b4c8bb2..1b144e3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1432,15 +1432,15 @@ HRESULT CDECL wined3d_texture_set_overlay_position(struct wined3d_texture *textu HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, - const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx) + const RECT *dst_rect, DWORD flags) { struct wined3d_resource *sub_resource, *dst_sub_resource; struct wined3d_surface *surface, *dst_surface; TRACE("texture %p, sub_resource_idx %u, src_rect %s, dst_texture %p, " - "dst_sub_resource_idx %u, dst_rect %s, flags %#x, fx %p.\n", + "dst_sub_resource_idx %u, dst_rect %s, flags %#x.\n", texture, sub_resource_idx, wine_dbgstr_rect(src_rect), dst_texture, - dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), flags, fx); + dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), flags); if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D || !(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bbd2fb5..47eea42 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,7 +259,7 @@ @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_overlay_position(ptr long long long) @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) -@ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long ptr) +@ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long) @ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr) @ cdecl wined3d_vertex_declaration_create_from_fvf(ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d5cae29..3b5e0d6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1901,30 +1901,6 @@ typedef struct _WINEDDBLTFX struct wined3d_color_key ddckSrcColorkey; /* SrcColorkey override */ } WINEDDBLTFX,*LPWINEDDBLTFX; -typedef struct _WINEDDOVERLAYFX -{ - DWORD dwSize; /* size of structure */ - DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */ - DWORD dwAlphaEdgeBlend; /* Constant to use as alpha for edge blend */ - DWORD dwReserved; - DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */ - union - { - DWORD dwAlphaDestConst; /* Constant to use as alpha channel for dest */ - struct wined3d_surface *lpDDSAlphaDest; /* Surface to use as alpha channel for dest */ - } DUMMYUNIONNAME1; - DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */ - union - { - DWORD dwAlphaSrcConst; /* Constant to use as alpha channel for src */ - struct wined3d_surface *lpDDSAlphaSrc; /* Surface to use as alpha channel for src */ - } DUMMYUNIONNAME2; - struct wined3d_color_key dckDestColorkey; /* DestColorkey override */ - struct wined3d_color_key dckSrcColorkey; /* SrcColorkey override */ - DWORD dwDDFX; /* Overlay FX */ - DWORD dwFlags; /* flags */ -} WINEDDOVERLAYFX; - struct wined3d_buffer_desc { UINT byte_width; @@ -2545,7 +2521,7 @@ HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, void *mem, UINT pitch); HRESULT __cdecl wined3d_texture_update_overlay(struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, - const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx); + const RECT *dst_rect, DWORD flags); HRESULT __cdecl wined3d_vertex_declaration_create(struct wined3d_device *device, const struct wined3d_vertex_element *elements, UINT element_count, void *parent,

1 0

Charles Davis : winemac.drv: Don't bother storing the OpenGL version.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: d8eac069402134364faf5ecafe4af51fbec9909e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8eac069402134364faf5ecaf… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 15 01:49:02 2016 -0700 winemac.drv: Don't bother storing the OpenGL version. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index a6f1440..ab79a82 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -44,7 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); struct gl_info { - char *glVersion; char *glExtensions; char wglExtensions[4096]; @@ -1259,9 +1258,6 @@ static BOOL init_gl_info(void) return FALSE; } - str = (const char*)opengl_funcs.gl.p_glGetString(GL_VERSION); - gl_info.glVersion = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); - strcpy(gl_info.glVersion, str); str = (const char*)opengl_funcs.gl.p_glGetString(GL_EXTENSIONS); length = strlen(str) + sizeof(legacy_extensions); if (allow_vsync) @@ -1274,9 +1270,10 @@ static BOOL init_gl_info(void) opengl_funcs.gl.p_glGetIntegerv(GL_MAX_VIEWPORT_DIMS, gl_info.max_viewport_dims); - TRACE("GL version : %s\n", gl_info.glVersion); + str = (const char*)opengl_funcs.gl.p_glGetString(GL_VERSION); + sscanf(str, "%u.%u", &gl_info.max_major, &gl_info.max_minor); + TRACE("GL version : %s\n", str); TRACE("GL renderer : %s\n", opengl_funcs.gl.p_glGetString(GL_RENDERER)); - sscanf(gl_info.glVersion, "%u.%u", &gl_info.max_major, &gl_info.max_minor); CGLSetCurrentContext(old_context); CGLReleaseContext(context);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: c38ddf4bbb760258b75416f17b3a274c19dd5e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38ddf4bbb760258b75416f17… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Feb 15 22:14:11 2016 +0100 po: Update French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 60 ++++++++++++++---------------------------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6f3b5b0..8f1efb6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11707,94 +11707,64 @@ msgid "The operation completed successfully\n" msgstr "L'opération s'est terminée avec succès\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Erreur : nom de clé invalide\n" +msgstr "reg : nom de clé invalide\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Erreur : paramètre de ligne de commande invalide\n" +msgstr "reg : paramètres de ligne de commande invalide\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Erreur : impossible d'accéder à une machine distante\n" +msgstr "reg : impossible d'accéder à une machine distante\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" msgstr "" -"Erreur : le système n'a pas pu trouver la clé ou la valeur de registre " -"spécifiée\n" +"reg : le système n'a pas pu trouver la clé ou valeur de registre spécifiée\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Erreur : type non pris en charge\n" +msgstr "reg : type non pris en charge [%1]\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"uninstaller : l'option « --remove » doit être suivie d'un GUID " -"d'application\n" +msgstr "reg : l'option [/d] doit être suivie d'un entier valide\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -"uninstaller : l'option « --remove » doit être suivie d'un GUID " -"d'application\n" +"reg : l'option [/d] doit être suivie d'une valeur hexadécimale valide\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg : type de donnée non géré [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "Le fichier spécifié existe déjà. Voulez-vous le remplacer ?" +msgstr "La valeur de registre « %1 » existe déjà. Voulez-vous la remplacer ?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "L'operation sur le registre a été annulée\n" #: reg.rc:48 regedit.rc:204 msgid "(Default)" msgstr "(par défaut)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Voulez-vous réellement supprimer ces valeurs ?" +msgstr "Voulez-vous réellement supprimer la valeur de registre « %1 » ?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Voulez-vous réellement supprimer la valeur « %s » ?" +msgstr "" +"Voulez-vous réellement supprimer toutes les valeurs de registre dans « %1 » ?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Voulez-vous réellement supprimer « %1 » ?" +msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" #: regedit.rc:34 msgid "&Registry" @@ -13950,8 +13920,6 @@ msgid "Configuration error" msgstr "Erreur de configuration" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window."

1 0

Alexandre Julliard : patches: Add email notifications for assigned patches.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: tools Branch: master Commit: 816ac2d399b782ca0450251084cdefc36ddaa22c URL: http://source.winehq.org/git/tools.git/?a=commit;h=816ac2d399b782ca04502510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 20:58:34 2016 +0900 patches: Add email notifications for assigned patches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/patches/expire b/patches/expire index 0ff3bc7..6bbd5c8 100755 --- a/patches/expire +++ b/patches/expire @@ -149,6 +149,8 @@ my $dry_run = 0; my $quiet = 1; my $now = time(); my $email_from = "Marvin <testbot\(a)winehq.org>"; +my $base_url = "https://source.winehq.org/patches/data"; +my %reviews; foreach my $arg (@ARGV) { @@ -210,6 +212,16 @@ sub get_previous_state($) return $prev_status; } +sub get_patch_reviewer($) +{ + my $file = shift; + + return undef unless open REVIEW, "<$dir/$file.review"; + chomp( my $ret = <REVIEW> ); + close REVIEW; + return $ret; +} + sub get_notify_headers($$) { my $file = shift; @@ -242,7 +254,7 @@ sub get_notify_headers($$) close PATCH; push @headers, "X-Patch-Status: $status_descr{$status}"; - push @headers, "X-Patch-URL: https://source.winehq.org/patches/data/$file"; + push @headers, "X-Patch-URL: $base_url/$file"; push @headers, "Reply-To: wine-devel\(a)winehq.org"; return @headers; } @@ -260,9 +272,17 @@ sub notify_state_change($$$) # if there's no available explanation, don't notify return unless defined $status_explanation{$status}; + if ($status eq "assigned") + { + my $reviewer = get_patch_reviewer( $file ); + push @{$reviews{$reviewer}}, $file if $reviewer; + } + my @headers = get_notify_headers( $file, $status ); return unless @headers; + return if $dry_run; + open PREVSTATUS, ">$dir/OLD/$file.status" or return; printf PREVSTATUS "%s\n", $status; close PREVSTATUS; @@ -290,6 +310,48 @@ EOF close SENDMAIL; } +sub notify_reviewers() +{ + while ((my $rev, $patches) = each( %reviews )) + { + my $patch_urls = join "\n ", map({ "$base_url/$_"; } sort @{$patches}); + my $patch_str = @{$patches} > 1 ? "patches" : "patch"; + + printf "notifying %s about %s\n", $rev, join ", ", sort @{$patches} unless $quiet; + next if $dry_run; + + open SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq" or return; + print SENDMAIL <<"EOF"; +From: $email_from +To: $rev +Subject: Wine $patch_str assigned for review +X-Patch-URL: $patch_urls +Reply-To: wine-devel\(a)winehq.org + +This is an automated notification to let you know that you have been +asked to review the following Wine $patch_str: + + $patch_urls + +If you think that a patch is correct and can be committed, please send +a mail to wine-patches with your Signed-off-by header, as a reply to +the original patch email. + +If you find some issues in a patch, please send a mail to the patch +author and CC wine-devel so that the patch status can be updated +accordingly. + +If you feel that you don't have the time or the qualifications to +review a patch, please send a mail to wine-devel or directly to +julliard\(a)winehq.org so that the patch can be assigned to another +reviewer. + +Thank you for your help! +EOF + close SENDMAIL; + } +} + # expire current patches opendir DIR, $dir or die "cannot open '$dir': $!\n"; @@ -368,3 +430,5 @@ foreach my $file (sort readdir DIR) } } closedir DIR; + +notify_reviewers();

1 0

Anton Baskanov : quartz: Set the result to 1.0 in FilterGraph::GetRate.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: f253e6cf9395c5895920ea4f09bd0994d253483e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f253e6cf9395c5895920ea4f0… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Feb 13 22:12:56 2016 +0600 quartz: Set the result to 1.0 in FilterGraph::GetRate. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5cb670e..39fa783 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2632,6 +2632,11 @@ static HRESULT WINAPI MediaSeeking_GetRate(IMediaSeeking *iface, double *pdRate) FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pdRate); + if (!pdRate) + return E_POINTER; + + *pdRate = 1.0; + return S_OK; }

1 0

Stefan Leichter : kernel32: Return a dummy value in GetSystemPreferredUILanguages.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 9cd67d2a5e7a7ad441287e803c166523814e2bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd67d2a5e7a7ad441287e803… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Wed Feb 10 22:46:38 2016 +0100 kernel32: Return a dummy value in GetSystemPreferredUILanguages. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 43 ++++++++++++++++++++++++++++++++++++++++--- dlls/kernel32/tests/locale.c | 10 ---------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d7619db..b499aa5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1053,6 +1053,8 @@ INT WINAPI GetSystemDefaultLocaleName(LPWSTR localename, INT len) */ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buffer, ULONG* size) { + LCTYPE type; + int lsize; if (flags & ~(MUI_LANGUAGE_NAME | MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -1069,9 +1071,44 @@ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buff return FALSE; } - FIXME("(0x%x %p %p %p) stub\n", flags, count, buffer, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); + + if (flags & MUI_LANGUAGE_ID) + type = LOCALE_ILANGUAGE; + else + type = LOCALE_SNAME; + + lsize = GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, type, NULL, 0); + if (!lsize) + { + /* keep last error from callee */ + return FALSE; + } + lsize++; + if (!*size) + { + *size = lsize; + *count = 1; + return TRUE; + } + + if (lsize > *size) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + if (!GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, type, buffer, *size)) + { + /* keep last error from callee */ + return FALSE; + } + + buffer[lsize-1] = 0; + *size = lsize; + *count = 1; + TRACE("returned variable content: %d, \"%s\", %d\n", *count, debugstr_w(buffer), *size); + return TRUE; } /*********************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 6726fb9..d49e0d6 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4623,10 +4623,8 @@ static void test_GetSystemPreferredUILanguages(void) size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(0, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); count = 0xdeadbeef; @@ -4657,20 +4655,16 @@ static void test_GetSystemPreferredUILanguages(void) size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); /* second parameter @@ -4696,20 +4690,16 @@ static void test_GetSystemPreferredUILanguages(void) size_id = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); count = 0xdeadbeef; size_name = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size_name % 6 == 1, "Expected size (%d) %% 6 == 1\n", size_name); size_buffer = max(size_id, size_name);

1 0

Louis Lenders : uxtheme: Fix CloseThemeData with invalid handle value.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 997e2046df8368ab23f87bfa7fa3cb2372a4e000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997e2046df8368ab23f87bfa7… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Feb 12 10:51:42 2016 +0100 uxtheme: Fix CloseThemeData with invalid handle value. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 2 +- dlls/uxtheme/tests/system.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 8947587..7d07680 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -746,7 +746,7 @@ void WINAPI SetThemeAppProperties(DWORD dwFlags) HRESULT WINAPI CloseThemeData(HTHEME hTheme) { TRACE("(%p)\n", hTheme); - if(!hTheme) + if(!hTheme || hTheme == INVALID_HANDLE_VALUE) return E_HANDLE; return MSSTYLES_CloseThemeClass(hTheme); } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 49eba64..4aeedbc 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -541,6 +541,8 @@ static void test_CloseThemeData(void) hRes = pCloseThemeData(NULL); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); + hRes = pCloseThemeData(INVALID_HANDLE_VALUE); + ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); } START_TEST(system)

1 0

Nikolay Sivov : mpr: Query for NPAddConnection and NPAddConnection3 when loading a provider.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 164fe0470ccf7cb3c0946cbb52d4139aec0c4a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=164fe0470ccf7cb3c0946cbb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 12 14:03:43 2016 +0300 mpr: Query for NPAddConnection and NPAddConnection3 when loading a provider. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 01e49e7..834a826 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -56,6 +56,8 @@ typedef struct _WNetProvider PF_NPEnumResource enumResource; PF_NPCloseEnum closeEnum; PF_NPGetResourceInformation getResourceInformation; + PF_NPAddConnection addConnection; + PF_NPAddConnection3 addConnection3; } WNetProvider, *PWNetProvider; typedef struct _WNetProviderTable @@ -162,8 +164,9 @@ static void _tryLoadProvider(PCWSTR provider) if (hLib) { - PF_NPGetCaps getCaps = (PF_NPGetCaps)GetProcAddress(hLib, - "NPGetCaps"); +#define MPR_GETPROC(proc) ((PF_##proc)GetProcAddress(hLib, #proc)) + + PF_NPGetCaps getCaps = MPR_GETPROC(NPGetCaps); TRACE("loaded lib %p\n", hLib); if (getCaps) @@ -182,22 +185,17 @@ static void _tryLoadProvider(PCWSTR provider) if (provider->dwEnumScopes) { TRACE("supports enumeration\n"); - provider->openEnum = (PF_NPOpenEnum) - GetProcAddress(hLib, "NPOpenEnum"); - TRACE("openEnum is %p\n", provider->openEnum); - provider->enumResource = (PF_NPEnumResource) - GetProcAddress(hLib, "NPEnumResource"); - TRACE("enumResource is %p\n", - provider->enumResource); - provider->closeEnum = (PF_NPCloseEnum) - GetProcAddress(hLib, "NPCloseEnum"); - TRACE("closeEnum is %p\n", provider->closeEnum); - provider->getResourceInformation = (PF_NPGetResourceInformation) - GetProcAddress(hLib, "NPGetResourceInformation"); - TRACE("getResourceInformation is %p\n", - provider->getResourceInformation); - if (!provider->openEnum || !provider->enumResource - || !provider->closeEnum) + provider->openEnum = MPR_GETPROC(NPOpenEnum); + TRACE("NPOpenEnum %p\n", provider->openEnum); + provider->enumResource = MPR_GETPROC(NPEnumResource); + TRACE("NPEnumResource %p\n", provider->enumResource); + provider->closeEnum = MPR_GETPROC(NPCloseEnum); + TRACE("NPCloseEnum %p\n", provider->closeEnum); + provider->getResourceInformation = MPR_GETPROC(NPGetResourceInformation); + TRACE("NPGetResourceInformation %p\n", provider->getResourceInformation); + if (!provider->openEnum || + !provider->enumResource || + !provider->closeEnum) { provider->openEnum = NULL; provider->enumResource = NULL; @@ -206,6 +204,10 @@ static void _tryLoadProvider(PCWSTR provider) WARN("Couldn't load enumeration functions\n"); } } + provider->addConnection = MPR_GETPROC(NPAddConnection); + provider->addConnection3 = MPR_GETPROC(NPAddConnection3); + TRACE("NPAddConnection %p\n", provider->addConnection); + TRACE("NPAddConnection3 %p\n", provider->addConnection3); providerTable->numProviders++; } else @@ -215,6 +217,8 @@ static void _tryLoadProvider(PCWSTR provider) HeapFree(GetProcessHeap(), 0, name); FreeLibrary(hLib); } + +#undef MPR_GETPROC } else {

1 0

Aric Stewart : imm32: Detach hMsgBuf when sending messages in ImmGenerateMessage.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: e7f725ec5f641fbb425bb44cbfa17b6cd5de5da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f725ec5f641fbb425bb44cb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 12 09:31:11 2016 -0600 imm32: Detach hMsgBuf when sending messages in ImmGenerateMessage. The issues is that if a message being sent in ImmGenerateMessage gets turned around and sent into an IME that in response to that message calls ImmGenerateMessage, the hMsgBuf still has the old message in it and it ends up getting processed in a loop again and again. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2d08378..af47470 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2893,15 +2893,23 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) if (data->IMC.dwNumMsgBuf > 0) { LPTRANSMSG lpTransMsg; - DWORD i; + HIMCC hMsgBuf; + DWORD i, dwNumMsgBuf; - lpTransMsg = ImmLockIMCC(data->IMC.hMsgBuf); - for (i = 0; i < data->IMC.dwNumMsgBuf; i++) - ImmInternalSendIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam); - - ImmUnlockIMCC(data->IMC.hMsgBuf); + /* We are going to detach our hMsgBuff so that if processing messages + generates new messages they go into a new buffer */ + hMsgBuf = data->IMC.hMsgBuf; + dwNumMsgBuf = data->IMC.dwNumMsgBuf; + data->IMC.hMsgBuf = ImmCreateIMCC(0); data->IMC.dwNumMsgBuf = 0; + + lpTransMsg = ImmLockIMCC(hMsgBuf); + for (i = 0; i < dwNumMsgBuf; i++) + ImmInternalSendIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam); + + ImmUnlockIMCC(hMsgBuf); + ImmDestroyIMCC(hMsgBuf); } return TRUE;

1 0