wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

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

30 Oct '13

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 30 Oct '13

30 Oct '13

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

Dmitry Timoshkov : kernel32: Add special case for "." and ".." to GetShortPathName.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: d57444a62268ff6158f9c2295093b713e6400f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57444a62268ff6158f9c2295… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 30 11:43:50 2013 +0900 kernel32: Add special case for "." and ".." to GetShortPathName. --- dlls/kernel32/path.c | 10 ++++++++++ dlls/kernel32/tests/path.c | 4 ---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 1728bfa..7ed1c61 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -489,6 +489,16 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl tmplen = p - (longpath + lp); lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); + if (tmpshortpath[sp] == '.') + { + if (tmplen == 1 || (tmplen == 2 && tmpshortpath[sp + 1] == '.')) + { + sp += tmplen; + lp += tmplen; + continue; + } + } + /* Check if the file exists and use the existing short file name */ goit = FindFirstFileW(tmpshortpath, &wfd); if (goit == INVALID_HANDLE_VALUE) goto notfound; diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index fe699b2..62236a0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1963,7 +1963,6 @@ todo_wine strcpy(buf, "deadbeef"); ret = GetShortPathNameA(".", buf, MAX_PATH); ok(ret, "GetShortPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, "."), "expected ., got %s\n", buf); strcpy(buf, "deadbeef"); @@ -1974,7 +1973,6 @@ todo_wine strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..", buf, MAX_PATH); ok(ret, "GetShortPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); strcpy(buf, "deadbeef"); @@ -1985,9 +1983,7 @@ todo_wine ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..\\foo\\file", buf, MAX_PATH); -todo_wine ok(ret, "GetShortPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); SetCurrentDirectoryA("..");

1 0

Michael Stefaniuc : winmm/tests: Skip tests for MMSYSERR_NODRIVER too.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: ff7511cc0a5ffd410991f5563222adf45abc5663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7511cc0a5ffd410991f5563… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 29 23:31:04 2013 +0100 winmm/tests: Skip tests for MMSYSERR_NODRIVER too. --- dlls/winmm/tests/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 8fb035a..6438dba 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -282,7 +282,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) rc = midiOutOpen(&hm, udev, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiOutOpen(&hm, udev, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); - if (rc == MMSYSERR_NOTSUPPORTED) + if (rc == MMSYSERR_NOTSUPPORTED || rc == MMSYSERR_NODRIVER) { skip( "MIDI out not supported\n" ); return; @@ -481,7 +481,7 @@ static void test_midiStream(UINT udev, HWND hwnd) rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); - if (rc == MMSYSERR_NOTSUPPORTED) + if (rc == MMSYSERR_NOTSUPPORTED || rc == MMSYSERR_NODRIVER) { skip( "MIDI stream not supported\n" ); return;

1 0

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

30 Oct '13

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

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

29 Oct '13

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

Nikolay Sivov : quartz/tests: Enable compilation with -D__WINESRC__.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: ff3521718d13c21440cfca4472b9dddac143f4ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3521718d13c21440cfca447… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 29 19:27:07 2013 +0400 quartz/tests: Enable compilation with -D__WINESRC__. --- dlls/quartz/tests/Makefile.in | 1 - dlls/quartz/tests/filtergraph.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index d4f7c41..ae5fbac 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = quartz.dll IMPORTS = oleaut32 ole32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ avisplitter.c \ diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6e839a8..68ac884 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1643,7 +1643,7 @@ static void test_render_filter_priority(void) ok(hr == E_POINTER, "IFilterGraph2_Disconnect failed. Expected E_POINTER, received %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName2); - ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2), + ok(strcmp(ConnectedFilterName1, ConnectedFilterName2), "expected connected filters to be different but got %s both times\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); @@ -1699,7 +1699,7 @@ static void test_render_filter_priority(void) ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName1); - ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3") || !lstrcmp(ConnectedFilterName1, "TestfilterInstance2"), + ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3") || !strcmp(ConnectedFilterName1, "TestfilterInstance2"), "unexpected connected filter: %s\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); @@ -1751,9 +1751,9 @@ static void test_render_filter_priority(void) ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName2); - ok(!lstrcmp(ConnectedFilterName2, "TestfilterInstance3") || !lstrcmp(ConnectedFilterName2, "TestfilterInstance2"), + ok(!strcmp(ConnectedFilterName2, "TestfilterInstance3") || !strcmp(ConnectedFilterName2, "TestfilterInstance2"), "unexpected connected filter: %s\n", ConnectedFilterName2); - ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2), + ok(strcmp(ConnectedFilterName1, ConnectedFilterName2), "expected connected filters to be different but got %s both times\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); @@ -1847,7 +1847,7 @@ static void test_render_filter_priority(void) ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName1); - ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3"), + ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3"), "unexpected connected filter: %s\n", ConnectedFilterName1); }

1 0

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

29 Oct '13

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

Nikolay Sivov : setupapi/tests: Enable compilation with -D__WINESRC__.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 9d03aa328f7a298102f983fa535dc4930e76ec3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d03aa328f7a298102f983fa5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 29 07:53:23 2013 +0400 setupapi/tests: Enable compilation with -D__WINESRC__. --- dlls/setupapi/tests/Makefile.in | 1 - dlls/setupapi/tests/devinst.c | 10 ++-- dlls/setupapi/tests/install.c | 80 +++++++++++++++++++------------------- dlls/setupapi/tests/misc.c | 60 ++++++++++++++-------------- dlls/setupapi/tests/parser.c | 6 +- dlls/setupapi/tests/query.c | 4 +- dlls/setupapi/tests/setupcab.c | 4 +- 7 files changed, 82 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d03aa328f7a298102f98…

1 0

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

29 Oct '13

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

← Newer
1
2
3
4
5
6
7
8
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013