wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

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

16 Feb '16

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

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

16 Feb '16

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

Jianqiu Zhang : wpcap: Fix crash on pcap_loop.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: eacc448f6c7525cdfa725cea497d5d4e1864213b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eacc448f6c7525cdfa725cea4… Author: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Date: Tue Jan 5 09:12:42 2016 +0800 wpcap: Fix crash on pcap_loop. Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index ae9e482..b770067 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -95,7 +95,6 @@ static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h TRACE("(%p %p %p)\n", user_data, h, p); pcb = (PCAP_HANDLER_CALLBACK *)user_data; pcb->pfn_cb(pcb->user_data, h, p); - HeapFree(GetProcessHeap(), 0, pcb); TRACE("Callback COMPLETED\n"); } @@ -107,11 +106,10 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, if (callback) { - PCAP_HANDLER_CALLBACK *pcb; - pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); - pcb->pfn_cb = callback; - pcb->user_data = user; - return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + PCAP_HANDLER_CALLBACK pcb; + pcb.pfn_cb = callback; + pcb.user_data = user; + return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char *)&pcb); } return pcap_dispatch(p, cnt, NULL, user); @@ -200,11 +198,10 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt, if (callback) { - PCAP_HANDLER_CALLBACK *pcb; - pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); - pcb->pfn_cb = callback; - pcb->user_data = user; - return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + PCAP_HANDLER_CALLBACK pcb; + pcb.pfn_cb = callback; + pcb.user_data = user; + return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char *)&pcb); } return pcap_loop(p, cnt, NULL, user);

1 0

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

16 Feb '16

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

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

16 Feb '16

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

Nikolay Sivov : xmllite/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: b190a72bfe53a41a83ae55d75de8327c24512bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b190a72bfe53a41a83ae55d75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 15 17:39:58 2016 +0300 xmllite/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 42 ++++++------------------------------------ 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9c0cdec..a62f802 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -96,15 +96,9 @@ static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken, broken_state = broken((line_broken == -1 ? line : line_broken) == l && (pos_broken == -1 ? pos : pos_broken) == p); - if (todo) - todo_wine + todo_wine_if (todo) ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); - else - { - ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, - "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); - } } #define ok_pos(reader, l, p, l_brk, p_brk, todo) ok_pos_(reader, l, p, l_brk, p_brk, todo, __LINE__) @@ -147,12 +141,8 @@ static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID * while (expected[i++]) size++; - if (todo) { - todo_wine - ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); - } - else - ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); + todo_wine_if (todo) + ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); if (iids->count != size) return; @@ -247,13 +237,7 @@ static void test_read_state_(IXmlReader *reader, XmlReadState expected, else broken_state = broken(exp_broken == state); - if (todo) - { - todo_wine - ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", - state_to_str(expected), state_to_str(state)); - } - else + todo_wine_if (todo) ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", state_to_str(expected), state_to_str(state)); } @@ -1515,14 +1499,7 @@ static void test_read_cdata(void) ok(hr == S_OK, "got 0x%08x\n", hr); str_exp = a2w(test->value); - if (test->todo) - { - todo_wine { - ok(len == strlen(test->value), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - } - } - else + todo_wine_if (test->todo) { ok(len == strlen(test->value), "got %u\n", len); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); @@ -1615,14 +1592,7 @@ static void test_read_text(void) ok(hr == S_OK, "got 0x%08x\n", hr); str_exp = a2w(test->value); - if (test->todo) - { - todo_wine { - ok(len == strlen(test->value), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - } - } - else + todo_wine_if (test->todo) { ok(len == strlen(test->value), "got %u\n", len); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));

1 0

Nikolay Sivov : riched20/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: bf1cdf58cec547ecb24442b76383f2b1fa04c366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1cdf58cec547ecb24442b76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 15 17:35:37 2016 +0300 riched20/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8e93ba8..e32d403 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4578,13 +4578,9 @@ static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); - if (setsel->todo) { - todo_wine { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } - } else { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } + todo_wine_if (setsel->todo) + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", + id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); } static void test_EM_EXSETSEL(void) @@ -4636,13 +4632,9 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); - if (setsel->todo) { - todo_wine { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } - } else { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } + todo_wine_if (setsel->todo) + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", + id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); } static void test_EM_SETSEL(void) @@ -7826,15 +7818,10 @@ static void test_EM_FINDWORDBREAK_W(void) wbuf[1] = 0; SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)wbuf); result = SendMessageW(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER,0); - if (wbuf[0] == 0x20 || wbuf[0] == 0xf020) - todo_wine - ok(result == delimiter_tests[i].isdelimiter, - "wanted ISDELIMITER_W(0x%x) %d, got %d\n", - delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); - else + todo_wine_if (wbuf[0] == 0x20 || wbuf[0] == 0xf020) ok(result == delimiter_tests[i].isdelimiter, - "wanted ISDELIMITER_W(0x%x) %d, got %d\n", - delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); + "wanted ISDELIMITER_W(0x%x) %d, got %d\n", + delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); } DestroyWindow(hwndRichEdit); } @@ -7864,12 +7851,7 @@ static void test_EM_FINDWORDBREAK_A(void) buf[1] = 0; SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf); result = SendMessageA(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER, 0); - if (buf[0] == 0x20) - todo_wine - ok(result == delimiter_tests[i].isdelimiter, - "wanted ISDELIMITER_A(0x%x) %d, got %d\n", - delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); - else + todo_wine_if (buf[0] == 0x20) ok(result == delimiter_tests[i].isdelimiter, "wanted ISDELIMITER_A(0x%x) %d, got %d\n", delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result);

1 0

Jacek Caban : urlmon/tests: Use todo_wine_if in uri.c tests.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 43a64e38f74028a785f858ea295142ef4be36bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a64e38f74028a785f858ea2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 15:26:14 2016 +0100 urlmon/tests: Use todo_wine_if in uri.c tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 899 +++++++----------------------------------------- 1 file changed, 133 insertions(+), 766 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43a64e38f74028a785f85…

1 0

Hugh McMaster : reg: Abort the process if get_regdata returns NULL.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: aa9d2a7c178ec8b865a66cd81c31286845500de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9d2a7c178ec8b865a66cd81… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:35 2016 +1100 reg: Abort the process if get_regdata returns NULL. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 7 +++++-- programs/reg/tests/reg.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ce28749..20de804 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -379,8 +379,11 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; } - if (data) - reg_data = get_regdata(data,reg_type,separator,&reg_count); + if (data && !(reg_data = get_regdata(data, reg_type, separator, &reg_count))) + { + RegCloseKey(subkey); + return 1; + } RegSetValueExW(subkey,value_name,0,reg_type,reg_data,reg_count); HeapFree(GetProcessHeap(),0,reg_data); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index aedca14..80fc7d3 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -215,11 +215,11 @@ static void test_add(void) verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin1 /f /d 0xDeAdBeEf", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin2 /f /d x01", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin3 /f /d 01x", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin4 /f /d DeAdBeEf0DD", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -260,9 +260,9 @@ static void test_add(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword4 /t REG_DWORD /d 123xyz /f", &r); todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -314,43 +314,43 @@ static void test_add(void) /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); memcpy(buffer, "three\0little\0strings\0", 22); - verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s \"#\" /d \"three#little#strings\" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d \"\" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi6 /s \"\\0\" /d \"three\\0little\\0strings\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s \"\" /d \"three#little#strings\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s \"#\" /d \"##\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); buffer[0]='a'; buffer[1]=0; buffer[2]=0; - verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Hugh McMaster : reg: Add case for REG_MULTI_SZ.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 07c6b1392fdf0a53cca10705d16671169f776568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c6b1392fdf0a53cca10705d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:34 2016 +1100 reg: Add case for REG_MULTI_SZ. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 663f835..ce28749 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -282,6 +282,8 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r out_data = NULL; break; } + case REG_MULTI_SZ: + /* FIXME: Needs handling */ default: output_message(STRING_UNHANDLED_TYPE, reg_type, data); }

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
76
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 February 2016