May 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : ddraw/tests: Add a test for SetCooperativeLevel() window styles.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 65272a4f8124a74ed120b9efb3fd130843092fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=65272a4f8124a74ed120b9efb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:38 2011 +0200 ddraw/tests: Add a test for SetCooperativeLevel() window styles. --- dlls/ddraw/tests/d3d.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 8bb517c..9c01ef0 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3874,6 +3874,56 @@ static void BackBuffer3DAttachmentTest(void) DestroyWindow(window); } +static void test_window_style(void) +{ + LONG style, exstyle, tmp; + RECT fullscreen_rect, r; + IDirectDraw7 *ddraw7; + HWND window; + HRESULT hr; + ULONG ref; + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + + style = GetWindowLongA(window, GWL_STYLE); + exstyle = GetWindowLongA(window, GWL_EXSTYLE); + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + DestroyWindow(window); + return; + } + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(d3d) { init_function_pointers(); @@ -3915,4 +3965,5 @@ START_TEST(d3d) } test_wndproc(); + test_window_style(); }

1 0

Henri Verbeet : wined3d: Cleanup surfaces only once.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 0116af370330941a5cb9b6da92cedcb2f64a9f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0116af370330941a5cb9b6da9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:35 2011 +0200 wined3d: Cleanup surfaces only once. --- dlls/wined3d/surface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 67d3f16..f5245cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2667,7 +2667,6 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) if (!refcount) { - surface_cleanup(surface); surface->surface_ops->surface_cleanup(surface); surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent);

1 0

Francois Gouget : msvcrt: Make printf_arg arg_clbk_positional() and MSVCRT_wcsrtombs_s_l() static.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: ca268b199a76525742b7f5acbc1edf056a30e64f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca268b199a76525742b7f5acb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:35:12 2011 +0200 msvcrt: Make printf_arg arg_clbk_positional() and MSVCRT_wcsrtombs_s_l() static. --- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/wcs.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 40d7261..838895a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -933,7 +933,6 @@ int pf_printf_a(puts_clbk_a, void*, const char*, MSVCRT__locale_t, int pf_printf_w(puts_clbk_w, void*, const MSVCRT_wchar_t*, MSVCRT__locale_t, BOOL, BOOL, args_clbk, void*, __ms_va_list); printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*); -printf_arg arg_clbk_positional(void*, int, int, __ms_va_list*); #define MSVCRT__OVERFLOW 3 #define MSVCRT__UNDERFLOW 4 diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 527bcff..2f2c140 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -376,7 +376,7 @@ MSVCRT_size_t CDECL MSVCRT_wcsrtombs(char *mbstr, const MSVCRT_wchar_t **wcstr, /********************************************************************* * MSVCRT_wcsrtombs_s_l (INTERNAL) */ -MSVCRT_size_t CDECL MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, +static MSVCRT_size_t MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, MSVCRT_size_t size, const MSVCRT_wchar_t **wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { @@ -501,7 +501,7 @@ printf_arg arg_clbk_valist(void *ctx, int arg_pos, int type, __ms_va_list *valis /********************************************************************* * arg_clbk_positional (INTERNAL) */ -printf_arg arg_clbk_positional(void *ctx, int pos, int type, __ms_va_list *valist) +static printf_arg arg_clbk_positional(void *ctx, int pos, int type, __ms_va_list *valist) { printf_arg *args = ctx; return args[pos];

1 0

Henri Verbeet : ddraw/tests: Make sure the window is properly released by ddraw in test_wndproc().
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 0293e19928f9ec66697cbd6e421c64bb43380aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0293e19928f9ec66697cbd6e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:37 2011 +0200 ddraw/tests: Make sure the window is properly released by ddraw in test_wndproc(). --- dlls/ddraw/tests/d3d.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 8d43cca..8bb517c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3251,6 +3251,27 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM return DefWindowProcA(hwnd, message, wparam, lparam); } +/* Set the wndproc back to what ddraw expects it to be, and release the ddraw + * interface. This prevents subsequent SetCooperativeLevel() calls on a + * different window from failing with DDERR_HWNDALREADYSET. */ +static void fix_wndproc(HWND window, LONG_PTR proc) +{ + IDirectDraw7 *ddraw7; + HRESULT hr; + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + ok(SUCCEEDED(hr), "Failed to create IDirectDraw7 object, hr %#x.", hr); + if (FAILED(hr)) return; + + SetWindowLongPtrA(window, GWLP_WNDPROC, proc); + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + IDirectDraw7_Release(ddraw7); +} + static void test_wndproc(void) { LONG_PTR proc, ddraw_proc; @@ -3458,6 +3479,7 @@ static void test_wndproc(void) (LONG_PTR)DefWindowProcA, proc); done: + fix_wndproc(window, (LONG_PTR)test_proc); expect_messages = NULL; DestroyWindow(window); UnregisterClassA("d3d7_test_wndproc_wc", GetModuleHandleA(NULL));

1 0

Francois Gouget : infosoft: Export DllUnregisterServer().
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 87d76cc2ab2f9337c7fbf1ef1e5b840050dc43b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d76cc2ab2f9337c7fbf1ef1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:35:00 2011 +0200 infosoft: Export DllUnregisterServer(). --- dlls/infosoft/infosoft.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/infosoft/infosoft.spec b/dlls/infosoft/infosoft.spec index d480bbb..b16365d 100644 --- a/dlls/infosoft/infosoft.spec +++ b/dlls/infosoft/infosoft.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() -# @ stdcall -private DllUnregisterServer() +@ stdcall -private DllUnregisterServer()

1 0

André Hentschel : winedbg: Implement printing the Program Status Register.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: a2d10bc2e5a9fc9ba4f3f86140a0ed15f82467a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d10bc2e5a9fc9ba4f3f8614… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 2 22:40:00 2011 +0200 winedbg: Implement printing the Program Status Register. --- programs/winedbg/be_arm.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index f34ecc7..f71514c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -57,9 +57,35 @@ static void be_arm_single_step(CONTEXT* ctx, unsigned enable) static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { + static const char condflags[] = "NZCV"; + int i; + char buf[8]; + + switch (ctx->Cpsr & 0x1F) + { + case 0: strcpy(buf, "User26"); break; + case 1: strcpy(buf, "FIQ26"); break; + case 2: strcpy(buf, "IRQ26"); break; + case 3: strcpy(buf, "SVC26"); break; + case 16: strcpy(buf, "User"); break; + case 17: strcpy(buf, "FIQ"); break; + case 18: strcpy(buf, "IRQ"); break; + case 19: strcpy(buf, "SVC"); break; + case 23: strcpy(buf, "ABT"); break; + case 27: strcpy(buf, "UND"); break; + default: strcpy(buf, "UNKNWN"); break; + } + dbg_printf("Register dump:\n"); - dbg_printf(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x\n", - ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr); + dbg_printf("%s %s Mode\n", (ctx->Cpsr & 0x20) ? "Thumb" : "ARM", buf); + + strcpy(buf, condflags); + for (i = 0; buf[i]; i++) + if (!((ctx->Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) + buf[i] = '-'; + + dbg_printf(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x(%s)\n", + ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr, buf); dbg_printf(" r0:%04x r1:%04x r2:%04x r3:%04x\n", ctx->R0, ctx->R1, ctx->R2, ctx->R3); dbg_printf(" r4:%04x r5:%04x r6:%04x r7:%04x r8:%04x\n",

1 0

André Hentschel : winedbg: Fix a typo.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 423a447fbe0df4b238a5d0ec9a07af8017673135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423a447fbe0df4b238a5d0ec9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 2 19:56:37 2011 +0200 winedbg: Fix a typo. --- programs/winedbg/be_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index a602c7e..904581d 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -145,7 +145,7 @@ static void be_i386_all_print_context(HANDLE hThread, const CONTEXT* ctx) (ctx->FloatSave.StatusWord & 0x00000200) >> 9, (ctx->FloatSave.StatusWord & 0x00000100) >> 8); - /* Now pull out hte 3 bit of the TOP stack pointer */ + /* Now pull out the 3 bit of the TOP stack pointer */ dbg_printf(" TOP:%01x", (unsigned int) (ctx->FloatSave.StatusWord & 0x00003800) >> 11); /* Lets analyse the error bits and indicate the status

1 0

Alexandre Julliard : msvcrt: Update spec files using the make_specfiles script.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 5ac184cad58e78419fcbb934d8f40d9c67fdc161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac184cad58e78419fcbb934d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 12:02:39 2011 +0200 msvcrt: Update spec files using the make_specfiles script. --- dlls/crtdll/crtdll.spec | 51 +++--- dlls/msvcirt/msvcirt.spec | 3 +- dlls/msvcp60/msvcp60.spec | 494 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 1 + dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcr100/msvcr100.spec | 138 ++++++------ dlls/msvcr71/msvcr71.spec | 6 +- dlls/msvcr80/msvcr80.spec | 138 ++++++------ dlls/msvcrt20/msvcrt20.spec | 3 +- dlls/msvcrt40/msvcrt40.spec | 3 +- 10 files changed, 419 insertions(+), 420 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ac184cad58e78419fcbb…

1 0

Alexandre Julliard : msvcrt: Add a stub for msvcp71.dll.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 4be2026aefce9db46426cbe8cc8628ccea50d7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be2026aefce9db46426cbe8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 2 17:32:22 2011 +0200 msvcrt: Add a stub for msvcp71.dll. --- configure | 1 + configure.ac | 1 + dlls/msvcp71/Makefile.in | 5 + dlls/msvcp71/msvcp71.c | 37 + dlls/msvcp71/msvcp71.spec | 5169 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 5213 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4be2026aefce9db46426c…

1 0

Alexandre Julliard : tools: Add a script to help synchronize spec files that share an implementation.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 2623e329cbd21fdbc33a4ebdccc7bd99bda6bda3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2623e329cbd21fdbc33a4ebdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 12:02:25 2011 +0200 tools: Add a script to help synchronize spec files that share an implementation. --- tools/make_specfiles | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 195 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles new file mode 100755 index 0000000..b911866 --- /dev/null +++ b/tools/make_specfiles @@ -0,0 +1,195 @@ +#!/usr/bin/perl -w +# +# Update spec files across dlls that share an implementation +# +# Copyright 2011 Alexandre Julliard +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +# + +use strict; + +my %funcs; +my $group_head; + +my @dll_groups = +( + [ + "msvcrt", + "msvcr90", + "msvcirt", + "msvcr100", + "msvcr80", + "msvcr71", + "msvcr70", + "msvcrt40", + "msvcrt20", + "msvcrtd", + "crtdll", + ], + [ + "msvcrt", + "msvcp90", + "msvcp100", + "msvcp80", + "msvcp71", + "msvcp70", + "msvcp60", + ], +); + +my $update_flags = 0; +my $show_duplicates = 0; + +foreach my $arg (@ARGV) +{ + if ($arg eq "-f") { $update_flags = 1; } + elsif ($arg eq "-d") { $show_duplicates = 1; } +} + +sub update_file($) +{ + my $file = shift; + my $ret = !(-f $file) || system "cmp $file $file.new >/dev/null"; + if (!$ret) + { + unlink "$file.new"; + } + else + { + #system "diff -u $file $file.new"; + rename "$file.new", "$file"; + print "$file updated\n"; + } + return $ret; +} + +# parse a spec file line +sub parse_line($$$) +{ + my ($name, $line, $_) = @_; + + if (/^\s*(\@|\d+)\s+(stdcall|cdecl|varargs|thiscall|stub|extern)\s+((?:-\S+\s+)*)([A-Za-z0-9_\@\$?]+)(?:\s*($[^)]*$))?(?:\s+([A-Za-z0-9_\@\$?.]+))?(\s*\#.*)?/) + { + return ( "ordinal" => $1, "callconv" => $2, "flags" => $3, "name" => $4, "args" => $5 || "", + "target" => $6 || $4, "comment" => $7, "spec" => $name ); + } + return () if /^\s*$/; + return () if /^\s*\#/; + printf STDERR "$name.spec:$line: error: Unrecognized line $_\n"; +} + +sub read_spec_file($) +{ + my $name = shift; + my $file = "dlls/$name/$name.spec"; + my %stubs; + open SPEC, "<$file" or die "cannot open $file"; + while (<SPEC>) + { + chomp; + my %descr = parse_line( $name, $., $_ ); + next unless %descr; + + my $func = $descr{name}; + next if defined $funcs{$func}; + $funcs{$func} = \%descr; + } + close SPEC; +} + +sub update_spec_file($) +{ + my $name = shift; + my $file = "dlls/$name/$name.spec"; + my %stubs; + + open SPEC, "<$file" or die "cannot open $file"; + open NEW, ">$file.new" or die "cannot create $file.new"; + while (<SPEC>) + { + chomp; + + my $commented_out = 0; + my %descr = parse_line( $name, $., $_ ); + if (!%descr) + { + # check for commented out exports + if (/^\s*\#\s*((?:\@|\d+)\s+)?((?:extern|stub|stdcall|cdecl|varargs|thiscall)\s+.*)/) + { + $commented_out = 1; + %descr = parse_line( $name, $., ($1 || "\@ ") . $2 ); + } + } + goto done unless %descr; + + my $func = $descr{name}; + if (!defined $funcs{$func}) + { + $funcs{$func} = \%descr unless $commented_out; + goto done; + } + + my %parent = %{$funcs{$func}}; + goto done if $parent{spec} eq $descr{spec}; # the definition is in this spec file + if ($descr{callconv} ne "stub" && $descr{target} !~ /\./) + { + printf "%s:%u: note: %s already defined in %s\n", $file, $., $func, $parent{spec} if $show_duplicates; + goto done; + } + + my $flags = ($parent{callconv} ne "stub" || $update_flags) ? $parent{flags} : $descr{flags}; + + if ($parent{callconv} ne "stub") + { + my $callconv = $parent{callconv} ne "stub" ? $parent{callconv} : + $parent{spec} =~ /msvc/ ? "cdecl" : "stdcall"; # hack + $_ = sprintf "@ %s %s%s", $callconv, $flags, $func; + + if ($parent{target} =~ /$group_head\./) # use the same forward as parent if possible + { + $_ .= sprintf "%s %s", $parent{args}, $parent{target}; + } + else + { + $_ .= sprintf "%s %s.%s", $parent{args}, $parent{spec}, $func; + } + } + else + { + $_ = sprintf "@ stub %s%s", $flags, $func; + } + $_ .= $descr{comment} || ""; + + done: + print NEW "$_\n"; + } + close SPEC; + close NEW; + update_file( $file ); +} + +sub sync_spec_files(@) +{ + %funcs = (); + $group_head = shift; + read_spec_file( $group_head ); + foreach my $spec (@_) { update_spec_file($spec); } +} + +foreach my $group (@dll_groups) +{ + sync_spec_files( @{$group} ); +}

1 0