October 2013 - Wine-Commits

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: 4473ce4db9827ca29eecd635fc10500df7be942d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4473ce4db9827ca29eecd635f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 29 15:57:31 2013 +0100 Assorted spelling fixes. --- dlls/avifil32/avifile.c | 2 +- dlls/comctl32/tests/header.c | 8 ++++---- dlls/msgsm32.acm/msgsm32.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/msrle32/msrle32.c | 4 ++-- dlls/ole32/filemoniker.c | 10 +++++----- dlls/shell32/shfldr_unixfs.c | 2 +- dlls/urlmon/tests/uri.c | 2 +- dlls/urlmon/uri.c | 2 +- dlls/winegstreamer/glibthread.c | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 2711ba4..7c14805 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -2096,7 +2096,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) if (This->dwMoviChunkPos == 0) AVIFILE_ComputeMoviStart(This); - /* written one record to much? */ + /* written one record too much? */ if (This->ckLastRecord.dwFlags & MMIO_DIRTY) { This->dwNextFramePos -= 3 * sizeof(DWORD); if (This->nIdxRecords > 0) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index fdde684..4ef4b5d 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1354,7 +1354,7 @@ static LRESULT customdraw_1(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return -1; } @@ -1381,7 +1381,7 @@ static LRESULT customdraw_2(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } @@ -1411,7 +1411,7 @@ static LRESULT customdraw_3(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } @@ -1439,7 +1439,7 @@ static LRESULT customdraw_4(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 8b0885f..5e7bce0 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -510,7 +510,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER return ACMERR_NOTPOSSIBLE; } - /* The packing algorythm writes 32 bytes, then 33 bytes, + /* The packing algorithm writes 32 bytes, then 33 bytes, * and it seems to pad to align to 65 bytes always * adding extra data where necessary */ diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f84af32..3ef255a 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -185,7 +185,7 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, nsres = aWriter(&This->nsIInputStream_iface, aClousure, This->buf, 0, aCount, &written); if(NS_FAILED(nsres)) - TRACE("aWritter failed: %08x\n", nsres); + TRACE("aWriter failed: %08x\n", nsres); else if(written != This->buf_size) FIXME("written %d != buf_size %d\n", written, This->buf_size); diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 668701a..882b5d2 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1486,7 +1486,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) computeInternalFrame(pi, lpic->lpbiPrev, lpic->lpPrev); /* swap buffers for current and previous frame */ - /* Don't free and alloc new -- costs to much time and they are of equal size ! */ + /* Don't free and alloc new -- costs too much time and they are of equal size ! */ pTmp = pi->pPrevFrame; pi->pPrevFrame = pi->pCurFrame; pi->pCurFrame = pTmp; @@ -1534,7 +1534,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) } { /* swap buffer for current and previous frame */ - /* Don't free and alloc new -- costs to much time and they are of equal size ! */ + /* Don't free and alloc new -- costs too much time and they are of equal size ! */ LPWORD pTmp = pi->pPrevFrame; pi->pPrevFrame = pi->pCurFrame; diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 8905c55..9c542fc 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -939,7 +939,7 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p IBindCtx *pbind; DWORD mkSys; ULONG nb1,nb2,i,sameIdx; - BOOL machimeNameCase=FALSE; + BOOL machineNameCase = FALSE; if (ppmkPrefix==NULL) return E_POINTER; @@ -997,20 +997,20 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p if (sameIdx > 1 && *stringTable1[0]=='\\' && *stringTable2[1]=='\\'){ - machimeNameCase=TRUE; + machineNameCase = TRUE; for(i=2;i<sameIdx;i++) if( (*stringTable1[i]=='\\') && (i+1 < sameIdx) && (*stringTable1[i+1]=='\\') ){ - machimeNameCase=FALSE; + machineNameCase = FALSE; break; } } - if (machimeNameCase && *stringTable1[sameIdx-1]=='\\') + if (machineNameCase && *stringTable1[sameIdx-1]=='\\') sameIdx--; - if (machimeNameCase && (sameIdx<=3) && (nb1 > 3 || nb2 > 3) ) + if (machineNameCase && (sameIdx<=3) && (nb1 > 3 || nb2 > 3) ) ret = MK_E_NOPREFIX; else { diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 362d4e6..8723546 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -388,7 +388,7 @@ static inline BOOL UNIXFS_is_pidl_of_type(LPCITEMIDLIST pIDL, SHCONTF fFilter) { * * RETURNS * Success, TRUE - * Failure, FALSE - Path not existent, too long, insufficient rights, to many symlinks + * Failure, FALSE - Path not existent, too long, insufficient rights, too many symlinks */ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) { diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index ba31583..80d7741 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4595,7 +4595,7 @@ static const invalid_uri invalid_uri_tests[] = { {"*a*b*c*d://not.valid.com",0,FALSE}, /* Not allowed to have invalid % encoded data. */ {"ftp://google.co%XX/",0,FALSE}, - /* To many h16 components. */ + /* Too many h16 components. */ {"http://[1:2:3:4:5:6:7:8:9]",0,FALSE}, /* Not enough room for IPv4 address. */ {"http://[1:2:3:4:5:6:7:192.0.1.0]",0,FALSE}, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 724d60f..dbdeaff 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1618,7 +1618,7 @@ static BOOL parse_ipv6address(const WCHAR **ptr, parse_data *data, DWORD flags) /* An IPv6 address can have no more than 8 h16 components. */ if(ip.h16_count >= 8) { *ptr = start; - TRACE("(%p %p %x): Not a IPv6 address, to many h16 components.\n", + TRACE("(%p %p %x): Not a IPv6 address, too many h16 components.\n", ptr, data, flags); return FALSE; } diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c index 25eceb8..0d829a0 100644 --- a/dlls/winegstreamer/glibthread.c +++ b/dlls/winegstreamer/glibthread.c @@ -1,7 +1,7 @@ /* GLIB - Library of useful routines for C programming * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * - * Wine Gstramer integration + * Wine GStreamer integration * Copyright 2010 Aric Stewart, CodeWeavers * * gthread.c: solaris thread system implementation

1 0

Frédéric Delanoy : ntdll: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: 86fdca67502d19d7432f3d41ea71d7dfc32c9b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86fdca67502d19d7432f3d41e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 29 21:54:12 2013 +0100 ntdll: Use BOOL type where appropriate. --- dlls/ntdll/cdrom.c | 22 +++++++++++----------- dlls/ntdll/directory.c | 6 +++--- dlls/ntdll/loadorder.c | 4 ++-- dlls/ntdll/misc.c | 4 ++-- dlls/ntdll/resource.c | 2 +- dlls/ntdll/signal_arm.c | 4 ++-- dlls/ntdll/signal_arm64.c | 4 ++-- dlls/ntdll/signal_powerpc.c | 4 ++-- dlls/ntdll/time.c | 4 ++-- dlls/ntdll/version.c | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 18c7874..62c3d16 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -575,13 +575,13 @@ static void CDROM_ClearCacheEntry(int dev) * Determines the ide interface (the number after the ide), and the * number of the device on that interface for ide cdroms (*iface <= 1). * Determines the scsi information for scsi cdroms (*iface >= 2). - * Returns false if the info cannot not be obtained. + * Returns FALSE if the info cannot not be obtained. */ -static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* device, UCHAR* lun) +static BOOL CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* device, UCHAR* lun) { #if defined(linux) struct stat st; - if ( fstat(fd, &st) == -1 || ! S_ISBLK(st.st_mode)) return 0; + if ( fstat(fd, &st) == -1 || ! S_ISBLK(st.st_mode)) return FALSE; *port = 0; *iface = 0; *device = 0; @@ -615,10 +615,10 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi #endif { WARN("CD-ROM device (%d, %d) not supported\n", major(st.st_rdev), minor(st.st_rdev)); - return 0; + return FALSE; } } - return 1; + return TRUE; #elif defined(__NetBSD__) struct scsi_addr addr; if (ioctl(fd, SCIOCIDENTIFY, &addr) != -1) @@ -630,16 +630,16 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi *iface = addr.addr.scsi.scbus; *device = addr.addr.scsi.target; *lun = addr.addr.scsi.lun; - return 1; + return TRUE; case TYPE_ATAPI: *port = 0; *iface = addr.addr.atapi.atbus; *device = addr.addr.atapi.drive; *lun = 0; - return 1; + return TRUE; } } - return 0; + return FALSE; #elif defined(__APPLE__) dk_scsi_identify_t addr; if (ioctl(fd, DKIOCSCSIIDENTIFY, &addr) != -1) @@ -648,12 +648,12 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi *iface = addr.port; *device = addr.target; *lun = addr.lun; - return 1; + return TRUE; } - return 0; + return FALSE; #else FIXME("not implemented on this O/S\n"); - return 0; + return FALSE; #endif } diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 4af3456..0306f77 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -161,7 +161,7 @@ static BOOL show_dot_files; static RTL_RUN_ONCE init_once = RTL_RUN_ONCE_INIT; /* at some point we may want to allow Winelib apps to set this */ -static const int is_case_sensitive = FALSE; +static const BOOL is_case_sensitive = FALSE; UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ @@ -187,7 +187,7 @@ static inline BOOL is_invalid_dos_char( WCHAR ch ) } /* check if the device can be a mounted volume */ -static inline int is_valid_mounted_device( const struct stat *st ) +static inline BOOL is_valid_mounted_device( const struct stat *st ) { #if defined(linux) || defined(__sun__) return S_ISBLK( st->st_mode ); @@ -1184,7 +1184,7 @@ static ULONG hash_short_file_name( const UNICODE_STRING *name, LPWSTR buffer ) */ static BOOLEAN match_filename( const UNICODE_STRING *name_str, const UNICODE_STRING *mask_str ) { - int mismatch; + BOOL mismatch; const WCHAR *name = name_str->Buffer; const WCHAR *mask = mask_str->Buffer; const WCHAR *name_end = name + name_str->Length / sizeof(WCHAR); diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index ae50a4c..401d256 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -53,7 +53,7 @@ struct loadorder_list static const WCHAR separatorsW[] = {',',' ','\t',0}; -static int init_done; +static BOOL init_done; static struct loadorder_list env_list; @@ -232,7 +232,7 @@ static void init_load_order(void) UNICODE_STRING strW; WCHAR *entry, *next; - init_done = 1; + init_done = TRUE; if (!order) return; if (!strcmp( order, "help" )) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index a6b3b22..8bd4eb7 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -74,12 +74,12 @@ void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **relea { #ifdef HAVE_SYS_UTSNAME_H static struct utsname buf; - static int init_done; + static BOOL init_done; if (!init_done) { uname( &buf ); - init_done = 1; + init_done = TRUE; } if (sysname) *sysname = buf.sysname; if (release) *release = buf.release; diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 0d60d96..9635bb0 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -56,7 +56,7 @@ static LANGID user_ui_language, system_ui_language; * * Check if a module handle is for a LOAD_LIBRARY_AS_DATAFILE module. */ -static inline int is_data_file_module( HMODULE hmod ) +static inline BOOL is_data_file_module( HMODULE hmod ) { return (ULONG_PTR)hmod & 1; } diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 9b0f1eb..6dbc7c8 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -876,12 +876,12 @@ void set_tpidrurw( TEB *teb ) */ void signal_init_thread( TEB *teb ) { - static int init_done; + static BOOL init_done; if (!init_done) { pthread_key_create( &teb_key, NULL ); - init_done = 1; + init_done = TRUE; } set_tpidrurw( teb ); pthread_setspecific( teb_key, teb ); diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 018d84f..2b82952 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -741,12 +741,12 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { - static int init_done; + static BOOL init_done; if (!init_done) { pthread_key_create( &teb_key, NULL ); - init_done = 1; + init_done = TRUE; } pthread_setspecific( teb_key, teb ); } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index ac8095a..a457bdf 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -999,12 +999,12 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { - static int init_done; + static BOOL init_done; if (!init_done) { pthread_key_create( &teb_key, NULL ); - init_done = 1; + init_done = TRUE; } pthread_setspecific( teb_key, teb ); } diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 2b810d4..c398878 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -96,9 +96,9 @@ static const int MonthLengths[2][MONSPERYEAR] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; -static inline int IsLeapYear(int Year) +static inline BOOL IsLeapYear(int Year) { - return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 1 : 0; + return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); } /* return a monotonic time counter, in Win32 ticks */ diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 1939c76..f4b1093 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -476,7 +476,7 @@ void version_init( const WCHAR *appname ) { static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; - static const int is_win64 = (sizeof(void *) > sizeof(int)); + static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE root, hkey, config_key;

1 0

Dmitry Timoshkov : kernel32: Add special case for "." and ".." to GetLongPathName.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: eba2f4322169715b3672651a5427b718b6eafa8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba2f4322169715b3672651a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 30 11:44:13 2013 +0900 kernel32: Add special case for "." and ".." to GetLongPathName. --- dlls/kernel32/path.c | 11 +++++++++++ dlls/kernel32/tests/path.c | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 7ed1c61..09fb04b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -358,6 +358,17 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (shortpath + sp); lstrcpynW(tmplongpath + lp, shortpath + sp, tmplen + 1); + + if (tmplongpath[lp] == '.') + { + if (tmplen == 1 || (tmplen == 2 && tmplongpath[lp + 1] == '.')) + { + lp += tmplen; + sp += tmplen; + continue; + } + } + /* Check if the file exists and use the existing file name */ goit = FindFirstFileW(tmplongpath, &wfd); if (goit == INVALID_HANDLE_VALUE) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 62236a0..7cfa19c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1958,7 +1958,6 @@ static void test_relative_path(void) strcpy(buf, "deadbeef"); ret = pGetLongPathNameA(".", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, "."), "expected ., got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA(".", buf, MAX_PATH); @@ -1968,7 +1967,6 @@ todo_wine strcpy(buf, "deadbeef"); ret = pGetLongPathNameA("..", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..", buf, MAX_PATH); @@ -1977,9 +1975,7 @@ todo_wine strcpy(buf, "deadbeef"); ret = pGetLongPathNameA("..\\foo\\file", buf, MAX_PATH); -todo_wine ok(ret, "GetLongPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..\\foo\\file", buf, MAX_PATH);

1 0

Michael Stefaniuc : dinput/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: 9a263e58fdb0fedb6d21fae0956a1e3bd4d2b8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a263e58fdb0fedb6d21fae09… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 29 23:13:02 2013 +0100 dinput/tests: Compile with -D__WINESRC__. --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/device.c | 26 +++++++++++++------------- dlls/dinput/tests/joystick.c | 39 +++++++++++++++++---------------------- dlls/dinput/tests/keyboard.c | 32 ++++++++++++++++---------------- dlls/dinput/tests/mouse.c | 28 ++++++++++++++-------------- 5 files changed, 60 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a263e58fdb0fedb6d21f…

1 0

Alexandre Julliard : gdi32: Remove no longer used default driver name.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: 3bd1e59cfbf32eefa1493ec1a50d04285670edf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd1e59cfbf32eefa1493ec1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 09:47:22 2013 +0100 gdi32: Remove no longer used default driver name. --- dlls/gdi32/driver.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 99ac146..750ef11 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -59,12 +59,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -#ifdef __APPLE__ -static const char default_driver[] = "mac,x11"; -#else -static const char default_driver[] = "x11"; -#endif - /********************************************************************** * create_driver *

1 0

Stefan Dösinger : ddraw/tests: r200 accepts 3DDEVICE | ZBUFFER render targets in ddraw4.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 7899850d60f43a25ee4d5c1f3bad674c1f1033cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7899850d60f43a25ee4d5c1f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:49 2013 +0100 ddraw/tests: r200 accepts 3DDEVICE | ZBUFFER render targets in ddraw4. It doesn't in ddraw2 and 7. --- dlls/ddraw/tests/ddraw4.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f880f8e..f56c4e7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4269,7 +4269,7 @@ static void test_rt_caps(void) DWORD caps_in; DWORD caps_out; HRESULT create_device_hr; - HRESULT set_rt_hr; + HRESULT set_rt_hr, alternative_set_rt_hr; } test_data[] = { @@ -4279,6 +4279,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, D3D_OK, D3D_OK, + D3D_OK, }, { NULL, @@ -4286,6 +4287,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, D3D_OK, D3D_OK, + D3D_OK, }, { NULL, @@ -4293,6 +4295,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { NULL, @@ -4300,6 +4303,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, D3DERR_SURFACENOTINVIDMEM, D3D_OK, + D3D_OK, }, { NULL, @@ -4307,6 +4311,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { NULL, @@ -4314,6 +4319,7 @@ static void test_rt_caps(void) DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, D3D_OK, D3D_OK, + D3D_OK, }, { NULL, @@ -4321,6 +4327,7 @@ static void test_rt_caps(void) DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, D3D_OK, D3D_OK, + D3D_OK, }, { NULL, @@ -4328,6 +4335,7 @@ static void test_rt_caps(void) DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { NULL, @@ -4335,6 +4343,7 @@ static void test_rt_caps(void) DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, D3DERR_SURFACENOTINVIDMEM, D3D_OK, + D3D_OK, }, { NULL, @@ -4342,6 +4351,7 @@ static void test_rt_caps(void) DDSCAPS_SYSTEMMEMORY, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &p8_fmt, @@ -4349,6 +4359,7 @@ static void test_rt_caps(void) DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &p8_fmt, @@ -4356,6 +4367,7 @@ static void test_rt_caps(void) ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &p8_fmt, @@ -4363,6 +4375,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &p8_fmt, @@ -4370,6 +4383,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &p8_fmt, @@ -4377,6 +4391,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &z_fmt, @@ -4384,6 +4399,7 @@ static void test_rt_caps(void) DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDPIXELFORMAT, + D3D_OK /* r200 */, }, { &z_fmt, @@ -4391,6 +4407,7 @@ static void test_rt_caps(void) DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDPIXELFORMAT, + D3D_OK /* r200 */, }, { &z_fmt, @@ -4398,6 +4415,7 @@ static void test_rt_caps(void) DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &z_fmt, @@ -4405,6 +4423,7 @@ static void test_rt_caps(void) DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, DDERR_INVALIDCAPS, DDERR_INVALIDPIXELFORMAT, + D3D_OK /* r200 */, }, { &z_fmt, @@ -4412,6 +4431,7 @@ static void test_rt_caps(void) DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, }; @@ -4520,7 +4540,8 @@ static void test_rt_caps(void) i, test_data[i].caps_in, hr); hr = IDirect3DDevice3_SetRenderTarget(device, rt, 0); - ok(hr == test_data[i].set_rt_hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", + ok(hr == test_data[i].set_rt_hr || broken(hr == test_data[i].alternative_set_rt_hr), + "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].set_rt_hr); if (SUCCEEDED(hr) || hr == DDERR_INVALIDPIXELFORMAT) expected_rt = rt;

1 0

Nikolay Sivov : ntdll: Suppress a warning on 'description' attribute of ' comClass'.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: cb0ef08839e515d7a9053923d27ef8899978a263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0ef08839e515d7a9053923d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 29 21:35:30 2013 +0400 ntdll: Suppress a warning on 'description' attribute of 'comClass'. --- dlls/ntdll/actctx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 73f82d9..bf6e47b 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1510,6 +1510,10 @@ static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, str { entity->u.comclass.miscstatusdocprint = parse_com_class_misc(&attr_value); } + else if (xmlstr_cmp(&attr_name, descriptionW)) + { + /* not stored */ + } else { WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value));

1 0

Stefan Dösinger : d3d9/tests: Give stencil_cull_test its own device.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 60f62f4d48508909d140400921a65f8a2baadad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f62f4d48508909d14040092… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:50 2013 +0100 d3d9/tests: Give stencil_cull_test its own device. After drawing a quad with cullmode != none, the r500's Windows driver's ability to clip clear rectangles to the viewport is permanently broken. This shows up as a test failure in depth_buffer_test(). --- dlls/d3d9/tests/visual.c | 102 +++++++++++++++++++++++++++------------------- 1 files changed, 60 insertions(+), 42 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d010043..0b9c712 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -168,12 +168,35 @@ out: return ret; } +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device; + HRESULT hr; + + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = create_window(); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, + "Failed to create a device, hr %#x.\n", hr); + if (FAILED(hr)) + DestroyWindow(present_parameters.hDeviceWindow); + + return device; +} + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; IDirect3D9 *d3d9_ptr = 0; - IDirect3DDevice9 *device_ptr = 0; - D3DPRESENT_PARAMETERS present_parameters; HRESULT hr; D3DADAPTER_IDENTIFIER9 identifier; @@ -188,16 +211,6 @@ static IDirect3DDevice9 *init_d3d9(void) return NULL; } - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = 640; - present_parameters.BackBufferHeight = 480; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = TRUE; - present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - memset(&identifier, 0, sizeof(identifier)); hr = IDirect3D9_GetAdapterIdentifier(d3d9_ptr, 0, 0, &identifier); ok(hr == D3D_OK, "Failed to get adapter identifier description\n"); @@ -210,12 +223,7 @@ static IDirect3DDevice9 *init_d3d9(void) HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, - "Failed to create a device, hr %#x.\n", hr); - - return device_ptr; + return create_device(d3d9_ptr); } static void cleanup_device(IDirect3DDevice9 *device) @@ -8741,56 +8749,63 @@ cleanup: IDirect3DVertexDeclaration9_Release(vertex_declaration); } -static void stencil_cull_test(IDirect3DDevice9 *device) { +static void stencil_cull_test(IDirect3D9 *d3d9) +{ + IDirect3DDevice9 *device; + D3DCAPS9 caps; HRESULT hr; - IDirect3DSurface9 *depthstencil = NULL; - D3DSURFACE_DESC desc; - float quad1[] = { + static const float quad1[] = + { -1.0, -1.0, 0.1, 0.0, -1.0, 0.1, -1.0, 0.0, 0.1, 0.0, 0.0, 0.1, }; - float quad2[] = { + static const float quad2[] = + { 0.0, -1.0, 0.1, 1.0, -1.0, 0.1, 0.0, 0.0, 0.1, 1.0, 0.0, 0.1, }; - float quad3[] = { + static const float quad3[] = + { 0.0, 0.0, 0.1, 1.0, 0.0, 0.1, 0.0, 1.0, 0.1, 1.0, 1.0, 0.1, }; - float quad4[] = { + static const float quad4[] = + { -1.0, 0.0, 0.1, 0.0, 0.0, 0.1, -1.0, 1.0, 0.1, 0.0, 1.0, 0.1, }; - struct vertex painter[] = { + struct vertex painter[] = + { {-1.0, -1.0, 0.0, 0x00000000}, { 1.0, -1.0, 0.0, 0x00000000}, {-1.0, 1.0, 0.0, 0x00000000}, { 1.0, 1.0, 0.0, 0x00000000}, }; - WORD indices_cw[] = {0, 1, 3}; - WORD indices_ccw[] = {0, 2, 3}; + static const WORD indices_cw[] = {0, 1, 3}; + static const WORD indices_ccw[] = {0, 2, 3}; unsigned int i; DWORD color; - IDirect3DDevice9_GetDepthStencilSurface(device, &depthstencil); - if(depthstencil == NULL) { - skip("No depth stencil buffer\n"); + device = create_device(d3d9); + if (!device) + { + skip("Cannot create a device with a D24S8 stencil buffer.\n"); return; } - hr = IDirect3DSurface9_GetDesc(depthstencil, &desc); - ok(hr == D3D_OK, "IDirect3DSurface9_GetDesc failed with %08x\n", hr); - IDirect3DSurface9_Release(depthstencil); - if(desc.Format != D3DFMT_D24S8 && desc.Format != D3DFMT_D24X4S4) { - skip("No 4 or 8 bit stencil surface\n"); - return; + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (!(caps.StencilCaps & D3DSTENCILCAPS_TWOSIDED)) + { + skip("No two sided stencil support\n"); + goto cleanup; } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_STENCIL, 0x00ff0000, 0.0, 0x8); @@ -8798,6 +8813,10 @@ static void stencil_cull_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(SUCCEEDED(hr), "Failed to set FVF,hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "Failed to disable Z test, %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Failed to disable lighting, %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFAIL, D3DSTENCILOP_INCR); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_DECR); @@ -8927,6 +8946,9 @@ static void stencil_cull_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + +cleanup: + cleanup_device(device); } static void vpos_register_test(IDirect3DDevice9 *device) @@ -14872,11 +14894,6 @@ START_TEST(visual) fixed_function_decl_test(device_ptr); conditional_np2_repeat_test(device_ptr); fixed_function_bumpmap_test(device_ptr); - if(caps.StencilCaps & D3DSTENCILCAPS_TWOSIDED) { - stencil_cull_test(device_ptr); - } else { - skip("No two sided stencil support\n"); - } pointsize_test(device_ptr); tssargtemp_test(device_ptr); np2_stretch_rect_test(device_ptr); @@ -14970,6 +14987,7 @@ START_TEST(visual) multisampled_depth_buffer_test(d3d9); resz_test(d3d9); + stencil_cull_test(d3d9); IDirect3D9_Release(d3d9);

1 0

Stefan Dösinger : ddraw/tests: Make caps checking in test_rt_caps() less strict.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 4b39c46fa2faf922083dc95bc33624901ea42f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b39c46fa2faf922083dc95bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:48 2013 +0100 ddraw/tests: Make caps checking in test_rt_caps() less strict. R200 creates P8 3DDEVICE surfaces in video memory, and consequently returns a different error message when trying to create a device. --- dlls/ddraw/tests/ddraw1.c | 13 ++++++++----- dlls/ddraw/tests/ddraw2.c | 13 ++++++++----- dlls/ddraw/tests/ddraw4.c | 9 ++++++--- dlls/ddraw/tests/ddraw7.c | 9 ++++++--- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index de4947b..685b9cd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3162,7 +3162,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */ , DDERR_NOPALETTEATTACHED, FALSE, }, @@ -3197,14 +3197,14 @@ static void test_rt_caps(void) { NULL, DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, FALSE, }, { NULL, DDSCAPS_ZBUFFER, - DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, FALSE, }, @@ -3286,7 +3286,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -3298,7 +3298,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DHALDevice, (void **)&device); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } if (SUCCEEDED(hr)) { diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ae498d4..6bb8ffa 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3770,7 +3770,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, @@ -3815,7 +3815,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, DDERR_INVALIDPIXELFORMAT, DDERR_INVALIDCAPS, @@ -3824,7 +3824,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_ZBUFFER, - DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, @@ -3912,7 +3912,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -3926,7 +3926,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirect3D2_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ac885b4..f880f8e 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4353,7 +4353,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, }, @@ -4470,7 +4470,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -4484,7 +4484,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface4_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirect3D3_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device, NULL); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface4_Release(surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 27555fb..cf69cf9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4179,7 +4179,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, @@ -4310,7 +4310,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -4324,7 +4324,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface7_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirect3D7_CreateDevice(d3d, devtype, surface, &device); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface7_Release(surface);

1 0

Stefan Dösinger : ddraw/tests: Allow some flags to fail surface creation in test_rt_caps.
by Alexandre Julliard Oct. 29, 2013

Oct. 29, 2013

Module: wine Branch: master Commit: 3fafd37905e0f26b3c5d96c321ef8fb1d20828b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fafd37905e0f26b3c5d96c32… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:47 2013 +0100 ddraw/tests: Allow some flags to fail surface creation in test_rt_caps. --- dlls/ddraw/tests/ddraw1.c | 26 +++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3fafd37905e0f26b3c5d9…

1 0