April 2013 - Wine-commits - list.winehq.org

André Hentschel : winedev: Update opengl chapter.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: docs Branch: master Commit: fb7b36cca4cfcc40d299569d686d4ec7dea1b46e URL: http://source.winehq.org/git/docs.git/?a=commit;h=fb7b36cca4cfcc40d299569d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 4 02:46:10 2013 +0200 winedev: Update opengl chapter. --- en/winedev-opengl.sgml | 28 ++++------------------------ 1 files changed, 4 insertions(+), 24 deletions(-) diff --git a/en/winedev-opengl.sgml b/en/winedev-opengl.sgml index d26b742..c953e96 100644 --- a/en/winedev-opengl.sgml +++ b/en/winedev-opengl.sgml @@ -136,10 +136,7 @@ choosing if one wants a depth / alpha buffer, the size of these buffers, ...) and to do the 'page flipping' in double buffer mode. This is implemented in - <filename>dlls/x11drv/opengl.c</filename> (all these - functions are part of Wine's graphic driver function - pointer table and thus could be reimplemented if ever Wine - works on another Windowing system than X). + <filename>dlls/winex11.drv/opengl.c</filename>. </para> </listitem> <listitem> @@ -222,23 +219,6 @@ <title>Known problems</title> <sect2> - <title>When running an OpenGL application, the screen flickers</title> - - <para> - Due to restrictions (that do not exist in Windows) on OpenGL - contexts, if you want to prevent the screen to flicker when - using OpenGL applications (all games are using double-buffered - contexts), you need to set the following option in your - <filename>~/.wine/config</filename> file - in the <literal>[x11drv]</literal> section: - <programlisting> -DesktopDoubleBuffered = Y - </programlisting> - and to run Wine in desktop mode. - </para> - </sect2> - - <sect2> <title>Unknown extension error message:</title> <screen> @@ -284,7 +264,7 @@ Please report (lionel.ulmer(a)free.fr) ! </sect2> <sect2> - <title><filename>libopengl32.so</filename> is built but it is still not working</title> + <title><filename>opengl32.dll.so</filename> is built but it is still not working</title> <para> This may be caused by some missing functions required by @@ -310,12 +290,12 @@ int main(void) <listitem> <para> try to compile it by linking both libwine and - libopengl32 (this command line supposes that you + opengl32 (this command line supposes that you installed the Wine libraries in <filename>/usr/local/lib</filename>, YMMV) : </para> <programlisting> -gcc dummy.c -L/usr/local/lib -lwine -lopengl32 +gcc dummy.c -L/usr/local/lib -L/usr/local/lib/wine -lwine -lopengl32 </programlisting> </listitem> <listitem>

1 0

Francois Gouget : testbot/Users: Fix the deletion of user accounts.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: tools Branch: master Commit: 2411c853ce53830a32569c22a3b7ec4f08e094b3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2411c853ce53830a32569c22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 4 12:14:10 2013 +0200 testbot/Users: Fix the deletion of user accounts. Users cannot be deleted directly because the Jobs table hold references to them. So mark the accounts as deleted and let the Janitor.pl script delete them when they are not referenced anymore. To do so, transform the 'Active' boolean field into a 'Status' enumeration that can be 'active' (previously Active=Y), 'disabled' (Active=N) or 'deleted'. The Sessions table also contains references to the Users, but these should be deleted together with the user account, which will forcefully log out the user as a side effect. --- testbot/README | 4 +- testbot/bin/Janitor.pl | 63 +++++++++++++++++++++++++------ testbot/ddl/update25.sql | 17 ++++++++ testbot/ddl/winetestbot.sql | 6 +- testbot/doc/winetestbot-schema.dia | 4 +- testbot/lib/WineTestBot/CGI/Sessions.pm | 11 +++++- testbot/lib/WineTestBot/Users.pm | 17 ++++---- testbot/web/Register.pl | 2 +- testbot/web/admin/UsersList.pl | 4 +- 9 files changed, 98 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=2411c853ce53830a3256…

1 0

Francois Gouget : testbot/Users: Forcefully log out the user as soon as the account is disabled or deleted.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: tools Branch: master Commit: 77129d2e16eaa902fcbb86a09bbd00d63634a053 URL: http://source.winehq.org/git/tools.git/?a=commit;h=77129d2e16eaa902fcbb86a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 4 12:14:34 2013 +0200 testbot/Users: Forcefully log out the user as soon as the account is disabled or deleted. Still delete any left-over session in Janitor.pl just in case. --- testbot/web/admin/UserDetails.pl | 19 +++++++++++++++++++ testbot/web/admin/UsersList.pl | 29 +++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index bc56eec..f9c1bea 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -22,6 +22,7 @@ use strict; package UserDetailsPage; use ObjectModel::CGI::ItemPage; +use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; @@ -75,6 +76,20 @@ sub OnApprove($) exit; } +sub OnOK($) +{ + my $self = shift; + + return !1 if (!$self->Save()); + if ($self->{Item}->Status ne 'active') + { + # Forcefully log out that user by deleting his web sessions + DeleteSessions($self->{Item}); + } + $self->RedirectToList(); + exit; +} + sub OnAction { my $self = shift; @@ -84,6 +99,10 @@ sub OnAction { return $self->OnApprove(); } + elsif ($Action eq "OK") + { + return $self->OnOK(); + } return $self->SUPER::OnAction(@_); } diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 4971f99..5148394 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -23,6 +23,7 @@ package UsersListPage; use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; +use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; @@ -69,6 +70,34 @@ sub GetActions return $self->SUPER::GetActions(@_); } +sub OnAction +{ + my $self = shift; + my ($CollectionBlock, $Action) = @_; + + if ($Action eq "Delete") + { + foreach my $UserName (@{$self->{Collection}->GetKeys()}) + { + next if (!defined $self->GetParam($CollectionBlock->SelName($UserName))); + my $User = $self->{Collection}->GetItem($UserName); + $User->Status('deleted'); + my ($ErrProperty, $ErrMessage) = $User->Save(); + if (defined $ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + # Forcefully log out that user by deleting his web sessions + DeleteSessions($User); + } + return 1; + } + + return $self->SUPER::OnAction(@_); +} + + package main; my $Request = shift;

1 0

Francois Gouget : testbot/Users: Add a 'Reject' button for accounts waiting for approval.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: tools Branch: master Commit: e92578b7804177c3af9b9954781eb685d3c8bcc8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e92578b7804177c3af9b9954… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 4 12:29:44 2013 +0200 testbot/Users: Add a 'Reject' button for accounts waiting for approval. --- testbot/README | 4 ++-- testbot/web/admin/UserDetails.pl | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/testbot/README b/testbot/README index 7ddaba9..3977c5d 100644 --- a/testbot/README +++ b/testbot/README @@ -78,8 +78,8 @@ but has to be 'activated' before it can be used. Also an email is sent to the WineTestBot administrators. If the request is considered to be illegitimate / spam, the administrator -should directly delete the provisional account. Otherwise the account should -be approved. +should directly delete / reject the provisional account. Otherwise the account +should be approved. Approving the account will generate a 'password reset code' and send an email to the user with a URL to visit to set the account password. That will activate diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index f9c1bea..faf8bbd 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -57,7 +57,8 @@ sub GetActions my @Actions; if (!defined $LDAPServer and $self->{Item}->WaitingForApproval()) { - $Actions[0] = "Approve"; + push @Actions, "Approve"; + push @Actions, "Reject" if ($self->{Item}->Name); } push(@Actions, @{$self->SUPER::GetActions()}); @@ -76,6 +77,19 @@ sub OnApprove($) exit; } +sub OnReject($) +{ + my $self = shift; + + $self->{Item}->Status('deleted'); + ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); + return !1 if (defined $self->{ErrMessage}); + # Forcefully log out that user by deleting his web sessions + DeleteSessions($self->{Item}); + $self->RedirectToList(); + exit; +} + sub OnOK($) { my $self = shift; @@ -99,6 +113,10 @@ sub OnAction { return $self->OnApprove(); } + elsif ($Action eq "Reject") + { + return $self->OnReject(); + } elsif ($Action eq "OK") { return $self->OnOK();

1 0

Jérôme Gardou : wined3d: Initialize adapter device name even if opengl is not used.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: b7649efb2df134aaac523c8c2e6587a7cff0f1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7649efb2df134aaac523c8c2… Author: Jérôme Gardou <jerome.gardou(a)reactos.org> Date: Tue Apr 2 15:04:57 2013 +0200 wined3d: Initialize adapter device name even if opengl is not used. --- dlls/wined3d/directx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6b6bc8e..4b42845 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5237,6 +5237,8 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) { + DISPLAY_DEVICEW display_device; + memset(adapter, 0, sizeof(*adapter)); adapter->ordinal = ordinal; adapter->monitorPoint.x = -1; @@ -5254,6 +5256,11 @@ static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordi adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; adapter->blitter = &cpu_blit; + + display_device.cb = sizeof(display_device); + EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); + TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); + strcpyW(adapter->DeviceName, display_device.DeviceName); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {}

1 0

Sam Edwards : wined3d: Make fullscreen windows use HWND_TOPMOST instead of HWND_TOP.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 6ab0ff5b9d2c681246257787da9f3fa4c9268b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab0ff5b9d2c681246257787d… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Sun Mar 31 18:25:18 2013 -0600 wined3d: Make fullscreen windows use HWND_TOPMOST instead of HWND_TOP. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c7874ba..bca5a54 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1032,7 +1032,7 @@ void CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOP, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); device->filter_messages = filter_messages; }

1 0

Sam Edwards : wined3d: Ignore WS_VISIBLE and WS_EX_TOPMOST when dropping out of fullscreen.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 6c43f90c50cb1c231beb4add3dcf869c83389b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c43f90c50cb1c231beb4add3… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Sun Mar 31 18:25:27 2013 -0600 wined3d: Ignore WS_VISIBLE and WS_EX_TOPMOST when dropping out of fullscreen. --- dlls/wined3d/device.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bca5a54..e4b970c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1044,12 +1044,21 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic if (!device->style && !device->exStyle) return; - TRACE("Restoring window style of window %p to %08x, %08x.\n", - window, device->style, device->exStyle); - style = GetWindowLongW(window, GWL_STYLE); exstyle = GetWindowLongW(window, GWL_EXSTYLE); + /* These flags are set by wined3d_device_setup_fullscreen_window, not the + * application, and we want to ignore them in the test below, since it's + * not the application's fault that they changed. Additionally, we want to + * preserve the current status of these flags (i.e. don't restore them) to + * more closely emulate the behavior of Direct3D, which leaves these flags + * alone when returning to windowed mode. */ + device->style ^= (device->style ^ style) & WS_VISIBLE; + device->exStyle ^= (device->exStyle ^ exstyle) & WS_EX_TOPMOST; + + TRACE("Restoring window style of window %p to %08x, %08x.\n", + window, device->style, device->exStyle); + filter_messages = device->filter_messages; device->filter_messages = TRUE;

1 0

Sam Edwards : d3d9/tests: Verify window style after exiting fullscreen mode .
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 8157aa143b74f26dad9b41bfe719647828322c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8157aa143b74f26dad9b41bfe… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Mon Apr 1 17:03:50 2013 -0600 d3d9/tests: Verify window style after exiting fullscreen mode. --- dlls/d3d9/tests/device.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bbbcbbc..f30938b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3130,6 +3130,7 @@ static void test_window_style(void) LONG style, expected_style; IDirect3DDevice9 *device; IDirect3D9 *d3d9; + HRESULT hr; ULONG ref; @@ -3186,6 +3187,25 @@ static void test_window_style(void) focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, r.left, r.top, r.right, r.bottom); + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | WS_VISIBLE; + ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + ref = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Sam Edwards : d3d8/tests: Verify window style after exiting fullscreen mode .
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: ce6173264dd6bdc91f414056ae8a623577bed5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6173264dd6bdc91f414056a… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Mon Apr 1 17:02:56 2013 -0600 d3d8/tests: Verify window style after exiting fullscreen mode. --- dlls/d3d8/tests/device.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fbc2d19..ba7e5e6 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2829,6 +2829,7 @@ static void test_window_style(void) LONG style, expected_style; IDirect3DDevice8 *device; IDirect3D8 *d3d8; + HRESULT hr; ULONG ref; @@ -2885,6 +2886,26 @@ static void test_window_style(void) focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, r.left, r.top, r.right, r.bottom); + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | WS_VISIBLE; + ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Sam Edwards : ddraw/tests: Verify window style after exiting fullscreen mode.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: d1b67698b97e79a723eab70f2343054fecd6307c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b67698b97e79a723eab70f2… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Apr 2 17:55:21 2013 -0600 ddraw/tests: Verify window style after exiting fullscreen mode. --- dlls/ddraw/tests/ddraw1.c | 8 ++++++++ dlls/ddraw/tests/ddraw2.c | 8 ++++++++ dlls/ddraw/tests/ddraw4.c | 8 ++++++++ dlls/ddraw/tests/ddraw7.c | 8 ++++++++ 4 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d3a296c..fa550f4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1898,6 +1898,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + 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); + ref = IDirectDraw_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index a52cb78..8bb33fc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2105,6 +2105,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + 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); + ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 55b6c01..742bd3f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2220,6 +2220,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + 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); + ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 027e03a..3d8c70d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1952,6 +1952,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + 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); + ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref);

1 0