wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Sergio Gómez Del Real : riched20: Mask out extended flags introduced by CHARFORMAT2 when converting to CHARFORMAT.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 4f007da8d3af4ec3acf573e8aca2fd5b182a378a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f007da8d3af4ec3acf573e8… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Feb 6 08:54:18 2019 +0000 riched20: Mask out extended flags introduced by CHARFORMAT2 when converting to CHARFORMAT. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/style.c | 4 ++++ dlls/riched20/tests/editor.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index c3f3fc3..3b9d771 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -85,6 +85,8 @@ BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(CP_ACP, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), NULL, NULL); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ + t->dwMask &= CFM_ALL; + t->dwEffects &= CFM_EFFECTS; return TRUE; } if (to->cbSize == sizeof(CHARFORMATW)) @@ -92,6 +94,8 @@ BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) CHARFORMATW *t = (CHARFORMATW *)to; CopyMemory(t, from, sizeof(*t)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ + t->dwMask &= CFM_ALL; + t->dwEffects &= CFM_EFFECTS; return TRUE; } if (to->cbSize == sizeof(CHARFORMAT2A)) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 932c8a1..ddb1018 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -751,6 +751,8 @@ static void test_EM_SETCHARFORMAT(void) HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2A cf2; CHARFORMAT2W cfW; + CHARFORMATA cf1a; + CHARFORMATW cf1w; int rc = 0; int tested_effects[] = { CFE_BOLD, @@ -1338,6 +1340,23 @@ static void test_EM_SETCHARFORMAT(void) ok(cf2.dwEffects & CFE_UNDERLINE, "got %08x\n", cf2.dwEffects); ok(cf2.bUnderlineType == CFU_UNDERLINEDOUBLE, "got %x\n", cf2.bUnderlineType); + /* Check setting CFM_ALL2/CFM_EFFECTS2 in CHARFORMAT(A/W). */ + memset(&cf1a, 0, sizeof(CHARFORMATA)); + memset(&cf1w, 0, sizeof(CHARFORMATW)); + cf1a.cbSize = sizeof(CHARFORMATA); + cf1w.cbSize = sizeof(CHARFORMATW); + cf1a.dwMask = cf1w.dwMask = CFM_ALL2; + cf1a.dwEffects = cf1w.dwEffects = CFM_EFFECTS2; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1a); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1a); + /* flags only valid for CHARFORMAT2 should be masked out */ + ok((cf1a.dwMask & (CFM_ALL2 & ~CFM_ALL)) == 0, "flags were not masked out\n"); + ok((cf1a.dwEffects & (CFM_EFFECTS2 & ~CFM_EFFECTS)) == 0, "flags were not masked out\n"); + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1w); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1w); + ok((cf1w.dwMask & (CFM_ALL2 & ~CFM_ALL)) == 0, "flags were not masked out\n"); + ok((cf1w.dwEffects & (CFM_EFFECTS2 & ~CFM_EFFECTS)) == 0, "flags were not masked out\n"); + DestroyWindow(hwndRichEdit); }

1 0

Alexandre Julliard : ntdll: Don' t use current directory for libraries unless explicitly specified in the search path.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 6fb00db51e21914e57b2c4ea04b1a95081425d48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fb00db51e21914e57b2c4ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 10:45:18 2019 +0100 ntdll: Don't use current directory for libraries unless explicitly specified in the search path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 84 ++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/loader.c | 12 ++----- 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index ba65e0a..2314c84 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -479,15 +479,13 @@ static void test_LoadLibraryEx_search_flags(void) { { 6, 5 }, 5, 0 }, { { 1, 1, 2 }, 0, 2 }, }; - char *p, path[MAX_PATH], buf[MAX_PATH]; + char *p, path[MAX_PATH], buf[MAX_PATH], curdir[MAX_PATH]; WCHAR bufW[MAX_PATH]; DLL_DIRECTORY_COOKIE cookies[4]; unsigned int i, j, k; BOOL ret; HMODULE mod; - if (!pAddDllDirectory || !pSetDllDirectoryA) return; - GetTempPathA( sizeof(path), path ); GetTempFileNameA( path, "tmp", 0, buf ); DeleteFileA( buf ); @@ -503,6 +501,80 @@ static void test_LoadLibraryEx_search_flags(void) sprintf( p, "\\%u\\winetestdll.dll", i ); create_test_dll( buf ); } + + GetCurrentDirectoryA( MAX_PATH, curdir ); + *p = 0; + SetCurrentDirectoryA( buf ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryA( "1\\winetestdll.dll" ); + ok( mod != NULL, "LoadLibrary failed err %u\n", GetLastError() ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + sprintf( path, "%c:1\\winetestdll.dll", buf[0] ); + mod = LoadLibraryA( path ); + ok( mod != NULL, "LoadLibrary failed err %u\n", GetLastError() ); + FreeLibrary( mod ); + + if (pAddDllDirectory) + { + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "1\\winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( path, 0, LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( mod != NULL, "LoadLibrary failed err %u\n", GetLastError() ); + FreeLibrary( mod ); + } + + strcpy( p, "\\1" ); + SetCurrentDirectoryA( buf ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryA( "winetestdll.dll" ); + ok( mod != NULL, "LoadLibrary failed err %u\n", GetLastError() ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + sprintf( path, "%c:winetestdll.dll", buf[0] ); + mod = LoadLibraryA( path ); + ok( mod != NULL || broken(!mod), /* win10 disallows this but allows c:1\\winetestdll.dll */ + "LoadLibrary failed err %u\n", GetLastError() ); + if (!mod) ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + else FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + sprintf( path, "%s\\winetestdll.dll", buf + 2 ); + mod = LoadLibraryA( path ); + ok( mod != NULL, "LoadLibrary failed err %u\n", GetLastError() ); + FreeLibrary( mod ); + + if (pAddDllDirectory) + { + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( path, 0, LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( mod != NULL, "LoadLibrary failed err %u\n", GetLastError() ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + sprintf( path, "%s\\winetestdll.dll", buf + 2 ); + mod = LoadLibraryExA( path, 0, LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( mod != NULL, "LoadLibrary failed err %u\n", GetLastError() ); + FreeLibrary( mod ); + } + + SetCurrentDirectoryA( curdir ); + + if (!pAddDllDirectory || !pSetDllDirectoryA) goto done; + SetLastError( 0xdeadbeef ); mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); ok( !mod, "LoadLibrary succeeded\n" ); @@ -539,6 +611,11 @@ static void test_LoadLibraryEx_search_flags(void) ok( !mod, "LoadLibrary succeeded\n" ); ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryA( "1\\winetestdll.dll" ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + for (j = 0; j < ARRAY_SIZE(tests); j++) { for (k = 0; tests[j].add_dirs[k]; k++) @@ -575,6 +652,7 @@ static void test_LoadLibraryEx_search_flags(void) for (k = 0; tests[j].add_dirs[k]; k++) pRemoveDllDirectory( cookies[k] ); } +done: for (i = 1; i <= 6; i++) { sprintf( p, "\\%u\\winetestdll.dll", i ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a47dfe0..1f92eb0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2442,23 +2442,17 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, return STATUS_NO_MEMORY; } *handle = open_dll_file( &nt_name, pwm, st ); - goto found; } - - /* not found */ - - if (!contains_path( libname )) + else /* not found, return the name as is, to be loaded as builtin */ { - /* if libname doesn't contain a path at all, we simply return the name as is, - * to be loaded as builtin */ len = strlenW(libname) * sizeof(WCHAR); if (len >= *size) goto overflow; strcpyW( filename, libname ); - goto found; } + goto found; } - /* absolute path name, or relative path name but not found above */ + /* absolute path name */ if (!RtlDosPathNameToNtPathName_U( libname, &nt_name, &file_part, NULL )) {

1 0

Michael Stefaniuc : gdi32: Avoid TRUE : FALSE conditional expressions.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 0aea7fc915a7ba02f71763c2068336b2c7fcf4d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aea7fc915a7ba02f71763c2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 4 23:16:42 2019 +0100 gdi32: Avoid TRUE : FALSE conditional expressions. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c38108e..de62425 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8217,14 +8217,14 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) UINT penalty = 0, new_penalty = 0; BOOL bold, italic, bd, it; - italic = font->font_desc.lf.lfItalic ? TRUE : FALSE; - bold = font->font_desc.lf.lfWeight > FW_MEDIUM ? TRUE : FALSE; + italic = !!font->font_desc.lf.lfItalic; + bold = font->font_desc.lf.lfWeight > FW_MEDIUM; face_list = get_face_list_from_family( child->face->family ); LIST_FOR_EACH_ENTRY( child_face, face_list, Face, entry ) { - it = child_face->ntmFlags & NTM_ITALIC ? TRUE : FALSE; - bd = child_face->ntmFlags & NTM_BOLD ? TRUE : FALSE; + it = !!(child_face->ntmFlags & NTM_ITALIC); + bd = !!(child_face->ntmFlags & NTM_BOLD); new_penalty = ( it ^ italic ) + ( bd ^ bold ); if (!best_face || new_penalty < penalty) {

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 08d6df5f810b08762ac6c416b70469c5916b220a URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d6df5f810b08762ac6c416… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed Feb 6 07:10:58 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 615 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 335 insertions(+), 280 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08d6df5f810b08762ac6…

1 0

Zebediah Figura : ntdll: Add a futex-based implementation of WaitOnAddress ().
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: cc8f9b64194f115de1161526e2f0ebbcb0bdcc4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8f9b64194f115de1161526… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 5 20:21:07 2019 -0600 ntdll: Add a futex-based implementation of WaitOnAddress(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 62cb3cd..8513561 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -26,7 +26,11 @@ #include <assert.h> #include <errno.h> +#include <limits.h> #include <signal.h> +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif @@ -63,6 +67,8 @@ HANDLE keyed_event = NULL; static const LARGE_INTEGER zero_timeout; +#define TICKSPERSEC 10000000 + static inline int interlocked_dec_if_nonzero( int *dest ) { int val, tmp; @@ -74,6 +80,41 @@ static inline int interlocked_dec_if_nonzero( int *dest ) return val; } + +#ifdef __linux__ + +static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ +static int wake_op = 129; /*FUTEX_WAKE|FUTEX_PRIVATE_FLAG*/ + +static inline int futex_wait( const int *addr, int val, struct timespec *timeout ) +{ + return syscall( __NR_futex, addr, wait_op, val, timeout, 0, 0 ); +} + +static inline int futex_wake( const int *addr, int val ) +{ + return syscall( __NR_futex, addr, wake_op, val, NULL, 0, 0 ); +} + +static inline int use_futexes(void) +{ + static int supported = -1; + + if (supported == -1) + { + futex_wait( &supported, 10, NULL ); + if (errno == ENOSYS) + { + wait_op = 0; /*FUTEX_WAIT*/ + wake_op = 1; /*FUTEX_WAKE*/ + futex_wait( &supported, 10, NULL ); + } + supported = (errno != ENOSYS); + } + return supported; +} +#endif + /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) @@ -1987,6 +2028,95 @@ static BOOL compare_addr( const void *addr, const void *cmp, SIZE_T size ) return FALSE; } +#ifdef __linux__ +/* We can't map addresses to futex directly, because an application can wait on + * 8 bytes, and we can't pass all 8 as the compare value to futex(). Instead we + * map all addresses to a small fixed table of futexes. This may result in + * spurious wakes, but the application is already expected to handle those. */ + +static int addr_futex_table[256]; + +static inline int *hash_addr( const void *addr ) +{ + ULONG_PTR val = (ULONG_PTR)addr; + + return &addr_futex_table[(val >> 2) & 255]; +} + +static inline NTSTATUS fast_wait_addr( const void *addr, const void *cmp, SIZE_T size, + const LARGE_INTEGER *timeout ) +{ + int *futex; + int val; + LARGE_INTEGER now; + timeout_t diff; + struct timespec timespec; + int ret; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + futex = hash_addr( addr ); + + /* We must read the previous value of the futex before checking the value + * of the address being waited on. That way, if we receive a wake between + * now and waiting on the futex, we know that val will have changed. + * Use an atomic load so that memory accesses are ordered between this read + * and the increment below. */ + val = interlocked_cmpxchg( futex, 0, 0 ); + if (!compare_addr( addr, cmp, size )) + return STATUS_SUCCESS; + + if (timeout) + { + if (timeout->QuadPart > 0) + { + NtQuerySystemTime( &now ); + diff = timeout->QuadPart - now.QuadPart; + } + else + diff = -timeout->QuadPart; + + timespec.tv_sec = diff / TICKSPERSEC; + timespec.tv_nsec = (diff % TICKSPERSEC) * 100; + + ret = futex_wait( futex, val, &timespec ); + } + else + ret = futex_wait( futex, val, NULL ); + + if (ret == -1 && errno == ETIMEDOUT) + return STATUS_TIMEOUT; + return STATUS_SUCCESS; +} + +static inline NTSTATUS fast_wake_addr( const void *addr ) +{ + int *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + futex = hash_addr( addr ); + + interlocked_xchg_add( futex, 1 ); + + futex_wake( futex, INT_MAX ); + return STATUS_SUCCESS; +} +#else +static inline NTSTATUS fast_wait_addr( const void *addr, const void *cmp, SIZE_T size, + const LARGE_INTEGER *timeout ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +static inline NTSTATUS fast_wake_addr( const void *addr ) +{ + return STATUS_NOT_IMPLEMENTED; +} +#endif + /*********************************************************************** * RtlWaitOnAddress (NTDLL.@) */ @@ -2005,6 +2135,9 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size if (size != 1 && size != 2 && size != 4 && size != 8) return STATUS_INVALID_PARAMETER; + if ((ret = fast_wait_addr( addr, cmp, size, timeout )) != STATUS_NOT_IMPLEMENTED) + return ret; + select_op.keyed_event.op = SELECT_KEYED_EVENT_WAIT; select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); select_op.keyed_event.key = wine_server_client_ptr( addr ); @@ -2059,6 +2192,9 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size */ void WINAPI RtlWakeAddressAll( const void *addr ) { + if (fast_wake_addr( addr ) != STATUS_NOT_IMPLEMENTED) + return; + RtlEnterCriticalSection( &addr_section ); while (NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ) == STATUS_SUCCESS) {} RtlLeaveCriticalSection( &addr_section ); @@ -2069,6 +2205,9 @@ void WINAPI RtlWakeAddressAll( const void *addr ) */ void WINAPI RtlWakeAddressSingle( const void *addr ) { + if (fast_wake_addr( addr ) != STATUS_NOT_IMPLEMENTED) + return; + RtlEnterCriticalSection( &addr_section ); NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ); RtlLeaveCriticalSection( &addr_section );

1 0

Zebediah Figura : kernelbase/tests: Relax tests for WaitOnAddress().
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 749fe42d1f34a1dfaa9833d9b5fc956b2b8e0b31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=749fe42d1f34a1dfaa9833d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 5 20:21:06 2019 -0600 kernelbase/tests: Relax tests for WaitOnAddress(). Application should be expected to handle spurious wakeups, which the following implementation will give in WakeByAddressSingle(). Avoid testing that WakeByAddressSingle() only wakes one thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/sync.c | 48 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 99cbbc4..9f57cf7 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -30,20 +30,24 @@ static BOOL (WINAPI *pWaitOnAddress)(volatile void *, void *, SIZE_T, DWORD); static void (WINAPI *pWakeByAddressAll)(void *); static void (WINAPI *pWakeByAddressSingle)(void *); -static LONG64 address; -static LONG64 compare; +static LONG address; static DWORD WINAPI test_WaitOnAddress_func(void *arg) { BOOL ret = FALSE; - DWORD gle; - while (address == compare) + LONG compare; + + do { - SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, sizeof(compare), INFINITE); - gle = GetLastError(); - ok(gle == 0xdeadbeef || broken(gle == ERROR_SUCCESS) /* Win 8 */, "got %d\n", gle); - } - ok(ret, "got %d\n", ret); + while (!(compare = address)) + { + SetLastError(0xdeadbeef); + ret = pWaitOnAddress(&address, &compare, sizeof(compare), INFINITE); + ok(ret, "wait failed\n"); + ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == ERROR_SUCCESS) /* Win 8 */, + "got error %d\n", GetLastError()); + } + } while (InterlockedCompareExchange(&address, compare - 1, compare) != compare); + return 0; } @@ -51,6 +55,7 @@ static void test_WaitOnAddress(void) { DWORD gle, val, nthreads; HANDLE threads[8]; + LONG compare; BOOL ret; int i; @@ -64,8 +69,8 @@ static void test_WaitOnAddress(void) compare = 0; if (0) /* crash on Windows */ { - ret = pWaitOnAddress(&address, NULL, 8, 0); - ret = pWaitOnAddress(NULL, &compare, 8, 0); + ret = pWaitOnAddress(&address, NULL, 4, 0); + ret = pWaitOnAddress(NULL, &compare, 4, 0); } /* invalid arguments */ @@ -111,15 +116,15 @@ static void test_WaitOnAddress(void) /* different address size */ address = 0; - compare = 0xffff0000; + compare = 0xff00; SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, 4, 0); + ret = pWaitOnAddress(&address, &compare, 2, 0); gle = GetLastError(); ok(gle == 0xdeadbeef || broken(gle == ERROR_SUCCESS) /* Win 8 */, "got %d\n", gle); ok(ret, "got %d\n", ret); SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, 2, 0); + ret = pWaitOnAddress(&address, &compare, 1, 0); gle = GetLastError(); ok(gle == ERROR_TIMEOUT, "got %d\n", gle); ok(!ret, "got %d\n", ret); @@ -128,24 +133,24 @@ static void test_WaitOnAddress(void) address = 0; compare = 1; SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, 8, 0); + ret = pWaitOnAddress(&address, &compare, 4, 0); gle = GetLastError(); ok(gle == 0xdeadbeef || broken(gle == ERROR_SUCCESS) /* Win 8 */, "got %d\n", gle); ok(ret, "got %d\n", ret); /* WakeByAddressAll */ address = 0; - compare = 0; for (i = 0; i < ARRAY_SIZE(threads); i++) threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); Sleep(100); - address = ~0; + address = ARRAY_SIZE(threads); pWakeByAddressAll(&address); val = WaitForMultipleObjects(ARRAY_SIZE(threads), threads, TRUE, 5000); ok(val == WAIT_OBJECT_0, "got %d\n", val); for (i = 0; i < ARRAY_SIZE(threads); i++) CloseHandle(threads[i]); + ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); /* WakeByAddressSingle */ address = 0; @@ -153,13 +158,10 @@ static void test_WaitOnAddress(void) threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); Sleep(100); - address = 1; nthreads = ARRAY_SIZE(threads); + address = ARRAY_SIZE(threads); while (nthreads) { - val = WaitForMultipleObjects(nthreads, threads, FALSE, 0); - ok(val == STATUS_TIMEOUT, "got %u\n", val); - pWakeByAddressSingle(&address); val = WaitForMultipleObjects(nthreads, threads, FALSE, 2000); ok(val < WAIT_OBJECT_0 + nthreads, "got %u\n", val); @@ -167,7 +169,7 @@ static void test_WaitOnAddress(void) memmove(&threads[val], &threads[val+1], (nthreads - val - 1) * sizeof(threads[0])); nthreads--; } - + ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); } START_TEST(sync)

1 0

Hans Leidekker : odbc32: Improve tracing in the remaining functions.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 69c2be841ca02155d76edc30d2a48328d21f727b URL: https://source.winehq.org/git/wine.git/?a=commit;h=69c2be841ca02155d76edc30… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 5 21:22:57 2019 +0100 odbc32: Improve tracing in the remaining functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 1835 +++++++++++++++++++++++++++-------------------- 1 file changed, 1051 insertions(+), 784 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69c2be841ca02155d76e…

1 0

Hans Leidekker : odbc32: Work around drivers that don' t accept NULL name length in SQLDescribeCol.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 74b2dc01c6c4c84d7759764ca30946c92b7f353f URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b2dc01c6c4c84d7759764c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 5 21:22:56 2019 +0100 odbc32: Work around drivers that don't accept NULL name length in SQLDescribeCol. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 13546ed..ab28506 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1020,6 +1020,7 @@ SQLRETURN WINAPI ODBC32_SQLDescribeCol(SQLHSTMT StatementHandle, SQLUSMALLINT Co SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT *DataType, SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) { + SQLSMALLINT dummy; SQLRETURN ret; TRACE("(StatementHandle %p, ColumnNumber %d, ColumnName %p, BufferLength %d, NameLength %p, DataType %p," @@ -1027,6 +1028,7 @@ SQLRETURN WINAPI ODBC32_SQLDescribeCol(SQLHSTMT StatementHandle, SQLUSMALLINT Co BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); if (!pSQLDescribeCol) return SQL_ERROR; + if (!NameLength) NameLength = &dummy; /* workaround for drivers that don't accept NULL NameLength */ ret = pSQLDescribeCol(StatementHandle, ColumnNumber, ColumnName, BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); @@ -2167,6 +2169,7 @@ SQLRETURN WINAPI ODBC32_SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT C SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT *DataType, SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) { + SQLSMALLINT dummy; SQLRETURN ret; TRACE("(StatementHandle %p, ColumnNumber %d, ColumnName %p, BufferLength %d, NameLength %p, DataType %p," @@ -2174,6 +2177,7 @@ SQLRETURN WINAPI ODBC32_SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT C BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); if (!pSQLDescribeColW) return SQL_ERROR; + if (!NameLength) NameLength = &dummy; /* workaround for drivers that don't accept NULL NameLength */ ret = pSQLDescribeColW(StatementHandle, ColumnNumber, ColumnName, BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable);

1 0

Hans Leidekker : odbc32: Improve tracing in a number of functions.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 4f0e765909c185879421db79a0aa574b72d2cdf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f0e765909c185879421db79… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 5 21:22:55 2019 +0100 odbc32: Improve tracing in a number of functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 833 +++++++++++++++++++++++++++--------------------- 1 file changed, 466 insertions(+), 367 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f0e765909c185879421…

1 0

Zhiyi Zhang : tests: Add SetName() tests.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: vkd3d Branch: master Commit: f5fd7ce046e439e5ffce0320fac604333956bb67 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f5fd7ce046e439e5ffce032… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 6 21:52:02 2019 +0330 tests: Add SetName() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index a854bd6..136af92 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2740,7 +2740,7 @@ static void test_create_fence(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_private_data(void) +static void test_object_interface(void) { D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_QUERY_HEAP_DESC query_heap_desc; @@ -2763,6 +2763,8 @@ static void test_private_data(void) static const GUID test_guid2 = {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; static const DWORD data[] = {1, 2, 3, 4}; + static const WCHAR deadbeefW[] = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f', 0}; + static const WCHAR emptyW[] = {0}; static const GUID *tests[] = { &IID_ID3D12CommandAllocator, @@ -2994,6 +2996,15 @@ static void test_private_data(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } + hr = ID3D12Object_SetName(object, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, emptyW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, deadbeefW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12Object_Release(object); refcount = IUnknown_Release(test_object); @@ -24044,7 +24055,7 @@ START_TEST(d3d12) run_test(test_create_compute_pipeline_state); run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); - run_test(test_private_data); + run_test(test_object_interface); run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence);

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
68
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 February 2019