December 2012 - Wine-commits

Francois Gouget : testbot/WineRunTask: 'cls' is only needed on Win9x so remove it.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: d5ffbdef47e94b714a0ab21bba306eac575b26fb URL: http://source.winehq.org/git/tools.git/?a=commit;h=d5ffbdef47e94b714a0ab21b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:02:23 2012 +0100 testbot/WineRunTask: 'cls' is only needed on Win9x so remove it. --- testbot/bin/WineRunTask.pl | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ccb2600..c6ca567 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -307,9 +307,6 @@ elsif ($Step->Type eq "suite") "$FileName -q -s $RptFileName\r\n"; } -# Needed to exit the command prompt on Win9x/WinMe -$Script .= "cls\r\n"; - $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout + 15); my $LogErrMessage = RetrieveLogFile $Job, $Step, $Task, $RptFileName, $FullLogFileName;

1 0

Francois Gouget : testbot/lib: Add parentheses to a LogMsg() call to make perl 5.10 happy.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: da8a256602397b815c0ecdbc03fb894d339a5fc2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da8a256602397b815c0ecdbc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 15:45:15 2012 +0100 testbot/lib: Add parentheses to a LogMsg() call to make perl 5.10 happy. --- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/VMs.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 79622de..fa53b07 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -125,7 +125,7 @@ sub Run delete $ENV{ENV}; exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $self->No) or require WineTestBot::Log; - WineTestBot::Log::LogMsg "Unable to exec ${ProjectName}$RunScript: $!\n"; + WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1); } diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2d1c1fd..f41453e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -539,7 +539,7 @@ sub RunRevert WineTestBot::Log::SetupRedirects(); exec("$BinDir/RevertVM.pl", $self->GetKey()) or require WineTestBot::Log; - WineTestBot::Log::LogMsg "Unable to exec RevertVM.pl: $!\n"; + WineTestBot::Log::LogMsg("Unable to exec RevertVM.pl: $!\n"); exit(1); }

1 0

Francois Gouget : testbot/TestAgent: Fix the check for the id_dsa and id_rsa keys.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: a273816ac6c7816a485490d622ef6abe080f7f86 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a273816ac6c7816a485490d6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 16:39:52 2012 +0100 testbot/TestAgent: Fix the check for the id_dsa and id_rsa keys. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index cb63cfd..6b8bff7 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -807,7 +807,7 @@ sub _Connect($) if (defined $ENV{HOME} and !exists $AuthOptions{"privatekey"} and !exists $AuthOptions{"publickey"}) { - foreach my $key ("dsa", "rsa") + foreach my $key ("id_dsa", "id_rsa") { if (-f "$ENV{HOME}/.ssh/$key" and -f "$ENV{HOME}/.ssh/$key.pub") {

1 0

Francois Gouget : testbot: Don' t try to dereference $TunnelDefaults if it is undefined.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: 25e1f7303e908b69d022330a8581d32be11088e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=25e1f7303e908b69d022330a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 17:09:29 2012 +0100 testbot: Don't try to dereference $TunnelDefaults if it is undefined. --- testbot/lib/WineTestBot/VMs.pm | 3 ++- testbot/scripts/TestAgent | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f41453e..ccfa9f2 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -369,7 +369,8 @@ sub _GetTunnel($) { my $ParsedURI = URI->new($URI); - my %TunnelInfo = %$TunnelDefaults; + my %TunnelInfo; + %TunnelInfo = %$TunnelDefaults if ($TunnelDefaults); $TunnelInfo{sshhost} = $ParsedURI->host; $TunnelInfo{sshport} = $ParsedURI->port; $TunnelInfo{username} = $ParsedURI->userinfo; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index f72531c..a4c8e1a 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -244,7 +244,7 @@ my $TunnelInfo; if ($TunnelOpt) { my $ParsedURI = URI->new($TunnelOpt); - %$TunnelInfo = %$TunnelDefaults; + %$TunnelInfo = %$TunnelDefaults if ($TunnelDefaults); $TunnelInfo->{sshhost} = $ParsedURI->host; $TunnelInfo->{sshport} = $ParsedURI->port; $TunnelInfo->{username} = $ParsedURI->userinfo;

1 0

Erich Hoover : advapi32: Support service objects in GetSecurityInfo.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 331b99cf191b39caf87db8c3902d680007317ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=331b99cf191b39caf87db8c39… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Dec 13 14:08:05 2012 -0700 advapi32: Support service objects in GetSecurityInfo. --- dlls/advapi32/advapi32_misc.h | 4 ++- dlls/advapi32/security.c | 31 ++++++++++++++++++++++++- dlls/advapi32/service.c | 31 ++++++++++++++++++++------ dlls/advapi32/tests/service.c | 48 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 101 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index e4ecfbb..3e58b04 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -21,6 +21,7 @@ #define __WINE_ADVAPI32MISC_H #include "ntsecapi.h" +#include "winsvc.h" const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; @@ -28,6 +29,7 @@ BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; -WCHAR *SERV_dup(const char *str); +WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; +NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; #endif /* __WINE_ADVAPI32MISC_H */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e000854..d857591 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3046,7 +3046,26 @@ DWORD WINAPI GetSecurityInfo( ULONG n1, n2; BOOL present, defaulted; - status = NtQuerySecurityObject(hObject, SecurityInfo, NULL, 0, &n1); + /* A NULL descriptor is allowed if any one of the other pointers is not NULL */ + if (!(ppsidOwner||ppsidGroup||ppDacl||ppSacl||ppSecurityDescriptor)) return ERROR_INVALID_PARAMETER; + + /* If no descriptor, we have to check that there's a pointer for the requested information */ + if( !ppSecurityDescriptor && ( + ((SecurityInfo & OWNER_SECURITY_INFORMATION) && !ppsidOwner) + || ((SecurityInfo & GROUP_SECURITY_INFORMATION) && !ppsidGroup) + || ((SecurityInfo & DACL_SECURITY_INFORMATION) && !ppDacl) + || ((SecurityInfo & SACL_SECURITY_INFORMATION) && !ppSacl) )) + return ERROR_INVALID_PARAMETER; + + switch (ObjectType) + { + case SE_SERVICE: + status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, NULL, 0, &n1); + break; + default: + status = NtQuerySecurityObject(hObject, SecurityInfo, NULL, 0, &n1); + break; + } if (status != STATUS_BUFFER_TOO_SMALL && status != STATUS_SUCCESS) return RtlNtStatusToDosError(status); @@ -3054,7 +3073,15 @@ DWORD WINAPI GetSecurityInfo( if (!sd) return ERROR_NOT_ENOUGH_MEMORY; - status = NtQuerySecurityObject(hObject, SecurityInfo, sd, n1, &n2); + switch (ObjectType) + { + case SE_SERVICE: + status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, sd, n1, &n2); + break; + default: + status = NtQuerySecurityObject(hObject, SecurityInfo, sd, n1, &n2); + break; + } if (status != STATUS_SUCCESS) { LocalFree(sd); diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 07b9e4b..fc98880 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -28,6 +28,8 @@ #include <time.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winsvc.h" @@ -2147,17 +2149,14 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, return err == ERROR_SUCCESS; } -/****************************************************************************** - * QueryServiceObjectSecurity [ADVAPI32.@] - */ -BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService, +NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation, PSECURITY_DESCRIPTOR lpSecurityDescriptor, DWORD cbBufSize, LPDWORD pcbBytesNeeded) { SECURITY_DESCRIPTOR descriptor; + NTSTATUS status; DWORD size; - BOOL succ; ACL acl; FIXME("%p %d %p %u %p - semi-stub\n", hService, dwSecurityInformation, @@ -2172,9 +2171,27 @@ BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService, SetSecurityDescriptorDacl(&descriptor, TRUE, &acl, TRUE); size = cbBufSize; - succ = MakeSelfRelativeSD(&descriptor, lpSecurityDescriptor, &size); + status = RtlMakeSelfRelativeSD(&descriptor, lpSecurityDescriptor, &size); *pcbBytesNeeded = size; - return succ; + return status; +} + +/****************************************************************************** + * QueryServiceObjectSecurity [ADVAPI32.@] + */ +BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService, + SECURITY_INFORMATION dwSecurityInformation, + PSECURITY_DESCRIPTOR lpSecurityDescriptor, + DWORD cbBufSize, LPDWORD pcbBytesNeeded) +{ + NTSTATUS status = SERV_QueryServiceObjectSecurity(hService, dwSecurityInformation, lpSecurityDescriptor, + cbBufSize, pcbBytesNeeded); + if (status != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index b6aff26..5fcd4cb 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -48,6 +48,8 @@ static BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD static BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); static BOOL (WINAPI *pQueryServiceStatusEx)(SC_HANDLE, SC_STATUS_TYPE, LPBYTE, DWORD, LPDWORD); +static BOOL (WINAPI *pQueryServiceObjectSecurity)(SC_HANDLE, SECURITY_INFORMATION, + PSECURITY_DESCRIPTOR, DWORD, LPDWORD); static void init_function_pointers(void) { @@ -60,6 +62,7 @@ static void init_function_pointers(void) pQueryServiceConfig2A= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2A"); pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); pQueryServiceStatusEx= (void*)GetProcAddress(hadvapi32, "QueryServiceStatusEx"); + pQueryServiceObjectSecurity = (void*)GetProcAddress(hadvapi32, "QueryServiceObjectSecurity"); } static void test_open_scm(void) @@ -1756,7 +1759,7 @@ static void test_close(void) static void test_sequence(void) { SC_HANDLE scm_handle, svc_handle; - BOOL ret; + BOOL ret, is_nt4; QUERY_SERVICE_CONFIGA *config; DWORD given, needed; static const CHAR servicename [] = "Winetest"; @@ -1780,6 +1783,9 @@ static void test_sequence(void) ok(scm_handle != NULL, "Could not get a handle to the manager: %d\n", GetLastError()); if (!scm_handle) return; + svc_handle = OpenServiceA(scm_handle, NULL, GENERIC_READ); + is_nt4=(svc_handle == NULL && GetLastError() == ERROR_INVALID_PARAMETER); + CloseServiceHandle(svc_handle); /* Create a dummy service */ SetLastError(0xdeadbeef); @@ -1817,8 +1823,44 @@ static void test_sequence(void) PSID sidOwner, sidGroup; PACL dacl, sacl; PSECURITY_DESCRIPTOR pSD; - HRESULT retval = pGetSecurityInfo(svc_handle,SE_SERVICE,DACL_SECURITY_INFORMATION,&sidOwner,&sidGroup,&dacl,&sacl,&pSD); - todo_wine ok(ERROR_SUCCESS == retval, "Expected GetSecurityInfo to succeed: result %d\n",retval); + DWORD error, n1, n2; + HRESULT retval; + BOOL bret; + + /* Test using GetSecurityInfo to obtain security information */ + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, &sidOwner, + &sidGroup, &dacl, &sacl, &pSD); + LocalFree(pSD); + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, + NULL, NULL, NULL, &pSD); + LocalFree(pSD); + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + if (!is_nt4) + { + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, + NULL, &dacl, NULL, NULL); + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + SetLastError(0xdeadbeef); + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, + NULL, NULL, NULL, NULL); + error = GetLastError(); + ok(retval == ERROR_INVALID_PARAMETER, "Expected GetSecurityInfo to fail: result %d\n", retval); + ok(error == 0xdeadbeef, "Unexpected last error %d\n", error); + } + else + win_skip("A NULL security descriptor in GetSecurityInfo results in an exception on NT4.\n"); + + /* Test using QueryServiceObjectSecurity to obtain security information */ + SetLastError(0xdeadbeef); + bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, pSD, 0, &n1); + error = GetLastError(); + ok(!bret, "Expected QueryServiceObjectSecurity to fail: result %d\n", bret); + ok(error == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", error); + pSD = LocalAlloc(0, n1); + bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, pSD, n1, &n2); + ok(bret, "Expected QueryServiceObjectSecurity to succeed: result %d\n", bret); + LocalFree(pSD); } }

1 0

Alexandre Julliard : gdi32: Fix handling of rotation matrices in GetGlyphOutline.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: ff5d68ccb2e9386f95ec6f8ff04010f1ebeafac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5d68ccb2e9386f95ec6f8ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 13:12:19 2012 +0100 gdi32: Fix handling of rotation matrices in GetGlyphOutline. --- dlls/gdi32/freetype.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6f3f070..6c39b97 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5836,8 +5836,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { FT_Matrix worldMat; worldMat.xx = FT_FixedFromFloat(font->font_desc.matrix.eM11); - worldMat.xy = FT_FixedFromFloat(font->font_desc.matrix.eM12); - worldMat.yx = FT_FixedFromFloat(font->font_desc.matrix.eM21); + worldMat.xy = -FT_FixedFromFloat(font->font_desc.matrix.eM21); + worldMat.yx = -FT_FixedFromFloat(font->font_desc.matrix.eM12); worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); pFT_Matrix_Multiply(&worldMat, &transMat); pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); @@ -5849,8 +5849,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { FT_Matrix extraMat; extraMat.xx = FT_FixedFromFIXED(lpmat->eM11); - extraMat.xy = FT_FixedFromFIXED(lpmat->eM12); - extraMat.yx = FT_FixedFromFIXED(lpmat->eM21); + extraMat.xy = FT_FixedFromFIXED(lpmat->eM21); + extraMat.yx = FT_FixedFromFIXED(lpmat->eM12); extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); pFT_Matrix_Multiply(&extraMat, &transMat); pFT_Matrix_Multiply(&extraMat, &transMatUnrotated);

1 0

Alexandre Julliard : gdi32: Add a helper function to order the points of a rectangle.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 456b4c876e6e272ea85ee54e5b41daf6e68157be URL: http://source.winehq.org/git/wine.git/?a=commit;h=456b4c876e6e272ea85ee54e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 16:55:56 2012 +0100 gdi32: Add a helper function to order the points of a rectangle. --- dlls/gdi32/dibdrv/graphics.c | 13 +------------ dlls/gdi32/font.c | 4 +--- dlls/gdi32/gdi_private.h | 16 ++++++++++++++++ dlls/gdi32/region.c | 16 ++-------------- 4 files changed, 20 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index bb4ec81..f9ed4c0 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -108,18 +108,7 @@ static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, rect.right--; } LPtoDP( hdc, (POINT *)&rect, 2 ); - if (rect.left > rect.right) - { - int tmp = rect.left; - rect.left = rect.right; - rect.right = tmp; - } - if (rect.top > rect.bottom) - { - int tmp = rect.top; - rect.top = rect.bottom; - rect.bottom = tmp; - } + order_rect( &rect ); return rect; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 34520f5..33e603c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2181,9 +2181,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, } LPtoDP(hdc, (POINT*)&rc, 2); - - if(rc.left > rc.right) {INT tmp = rc.left; rc.left = rc.right; rc.right = tmp;} - if(rc.top > rc.bottom) {INT tmp = rc.top; rc.top = rc.bottom; rc.bottom = tmp;} + order_rect( &rc ); } if (lprect && (flags & ETO_OPAQUE)) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 84febeb..edd4bf6 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -439,6 +439,22 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline void order_rect( RECT *rect ) +{ + if (rect->left > rect->right) + { + int tmp = rect->left; + rect->left = rect->right; + rect->right = tmp; + } + if (rect->top > rect->bottom) + { + int tmp = rect->top; + rect->top = rect->bottom; + rect->bottom = tmp; + } +} + static inline void get_bounding_rect( RECT *rect, int x, int y, int width, int height ) { rect->left = x; diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index cafd203..caa4ff6 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1114,20 +1114,8 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) /* swap the coordinates to make right >= left and bottom >= top */ /* (region building rectangles are normalized the same way) */ - if( rect->top > rect->bottom) { - rc.top = rect->bottom; - rc.bottom = rect->top; - } else { - rc.top = rect->top; - rc.bottom = rect->bottom; - } - if( rect->right < rect->left) { - rc.right = rect->left; - rc.left = rect->right; - } else { - rc.right = rect->right; - rc.left = rect->left; - } + rc = *rect; + order_rect( &rc ); if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) {

1 0

Alexandre Julliard : gdi32: Support wrongly ordered rectangles in RectVisible.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 5215895a11a582df775f4c794a14ad6d4629a7c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5215895a11a582df775f4c794… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 16:56:28 2012 +0100 gdi32: Support wrongly ordered rectangles in RectVisible. --- dlls/gdi32/clipping.c | 1 + dlls/gdi32/tests/clipping.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index ee7873e..572287e 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -392,6 +392,7 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) tmpRect = *rect; LPtoDP( hdc, (POINT *)&tmpRect, 2 ); + order_rect( &tmpRect ); update_dc( dc ); ret = (!get_dc_device_rect( dc, &visrect ) || intersect_rect( &visrect, &visrect, &tmpRect )); diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 04b2785..0247bbb 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -401,6 +401,14 @@ static void test_memory_dc_clipping(void) ok(rc.left == 0 && rc.top == 0 && rc.right == 100 && rc.bottom == 100, "expected 0,0-100,100, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + SetRect( &rc, 10, 10, 20, 20 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + + SetRect( &rc, 20, 20, 10, 10 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + DeleteDC(hdc); DeleteObject(hrgn); DeleteObject(hrgn_empty); @@ -446,6 +454,14 @@ static void test_window_dc_clipping(void) "expected 0,0-%d,%d, got %d,%d-%d,%d\n", screen_width, screen_height, rc.left, rc.top, rc.right, rc.bottom); + SetRect( &rc, 10, 10, 20, 20 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + + SetRect( &rc, 20, 20, 10, 10 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), "expected SIMPLEREGION, got %d\n", ret);

1 0

Francois Gouget : winhttp/tests: Make some traces more explicit.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 3951cb660fdd82ed477c53c67a8ea79ae327022f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3951cb660fdd82ed477c53c67… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 14 11:54:52 2012 +0100 winhttp/tests: Make some traces more explicit. --- dlls/winhttp/tests/winhttp.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 0f237d9..5fcdef6 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2417,14 +2417,14 @@ static void test_IWinHttpRequest(void) status = 0; hr = IWinHttpRequest_get_Status( req, &status ); ok( hr == S_OK, "got %08x\n", hr ); - trace("%d\n", status); + trace("Status=%d\n", status); hr = IWinHttpRequest_get_StatusText( req, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); hr = IWinHttpRequest_get_StatusText( req, &status_text ); ok( hr == S_OK, "got %08x\n", hr ); - trace("%s\n", wine_dbgstr_w(status_text)); + trace("StatusText=%s\n", wine_dbgstr_w(status_text)); SysFreeString( status_text ); hr = IWinHttpRequest_get_ResponseBody( req, NULL ); @@ -2608,10 +2608,10 @@ static void test_WinHttpGetIEProxyConfigForCurrentUser(void) ret = WinHttpGetIEProxyConfigForCurrentUser( &cfg ); ok( ret, "expected success\n" ); - trace("%d\n", cfg.fAutoDetect); - trace("%s\n", wine_dbgstr_w(cfg.lpszAutoConfigUrl)); - trace("%s\n", wine_dbgstr_w(cfg.lpszProxy)); - trace("%s\n", wine_dbgstr_w(cfg.lpszProxyBypass)); + trace("IEProxy.AutoDetect=%d\n", cfg.fAutoDetect); + trace("IEProxy.AutoConfigUrl=%s\n", wine_dbgstr_w(cfg.lpszAutoConfigUrl)); + trace("IEProxy.Proxy=%s\n", wine_dbgstr_w(cfg.lpszProxy)); + trace("IEProxy.ProxyBypass=%s\n", wine_dbgstr_w(cfg.lpszProxyBypass)); GlobalFree( cfg.lpszAutoConfigUrl ); GlobalFree( cfg.lpszProxy ); GlobalFree( cfg.lpszProxyBypass ); @@ -2700,9 +2700,9 @@ static void test_WinHttpGetProxyForUrl(void) if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); else { - trace("%u\n", info.dwAccessType); - trace("%s\n", wine_dbgstr_w(info.lpszProxy)); - trace("%s\n", wine_dbgstr_w(info.lpszProxyBypass)); + trace("Proxy.AccessType=%u\n", info.dwAccessType); + trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy)); + trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); GlobalFree( info.lpszProxyBypass ); } @@ -2718,9 +2718,9 @@ static void test_WinHttpGetProxyForUrl(void) if (!ret) ok( error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); else { - trace("%u\n", info.dwAccessType); - trace("%s\n", wine_dbgstr_w(info.lpszProxy)); - trace("%s\n", wine_dbgstr_w(info.lpszProxyBypass)); + trace("Proxy.AccessType=%u\n", info.dwAccessType); + trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy)); + trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); GlobalFree( info.lpszProxyBypass ); }

1 0

Francois Gouget : d3dx9_36/tests: Use software vertex processing so the tests can run on Intel GM950 graphics cards .
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 7b2d297d3eaef68192dc61f0d38605339590f51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2d297d3eaef68192dc61f0d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 14 11:55:40 2012 +0100 d3dx9_36/tests: Use software vertex processing so the tests can run on Intel GM950 graphics cards. --- dlls/d3dx9_36/tests/core.c | 2 +- dlls/d3dx9_36/tests/effect.c | 2 +- dlls/d3dx9_36/tests/line.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 18 +++++++++--------- dlls/d3dx9_36/tests/shader.c | 2 +- dlls/d3dx9_36/tests/surface.c | 2 +- dlls/d3dx9_36/tests/texture.c | 2 +- dlls/d3dx9_36/tests/volume.c | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index ba0f065..e25a5d3 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1240,7 +1240,7 @@ START_TEST(core) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8e12b74..7f238be 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2686,7 +2686,7 @@ START_TEST(effect) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index b9eacee..89e4fc6 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -138,7 +138,7 @@ START_TEST(line) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 35e38e4..0218000 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -129,7 +129,7 @@ static struct test_context *new_test_context(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Couldn't create IDirect3DDevice9 object %#x\n", hr); @@ -1183,7 +1183,7 @@ static void D3DXCreateMeshTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -1390,7 +1390,7 @@ static void D3DXCreateMeshFVFTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2263,7 +2263,7 @@ static void D3DXLoadMeshTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2462,7 +2462,7 @@ static void D3DXCreateBoxTest(void) memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2760,7 +2760,7 @@ static void D3DXCreateSphereTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -3004,7 +3004,7 @@ static void D3DXCreateCylinderTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -4004,7 +4004,7 @@ static void D3DXCreateTextTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -4298,7 +4298,7 @@ static void D3DXGenerateAdjacencyTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 75139b1..223bebf 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1370,7 +1370,7 @@ static void test_setting_constants(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 84a70cf..7ae7df9 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1230,7 +1230,7 @@ START_TEST(surface) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3277577..ebaf385 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1820,7 +1820,7 @@ START_TEST(texture) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 35cd509..f3976c0 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -284,7 +284,7 @@ START_TEST(volume) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr);

1 0