April 2016 - Wine-Commits - list.winehq.org

Anton Baskanov : quartz: Set the result to 1.0 in FilterGraph::GetRate.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: daf5fae80aefc8f24bfc1670bdec7ff02f16b6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf5fae80aefc8f24bfc1670b… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Feb 13 22:12:56 2016 +0600 quartz: Set the result to 1.0 in FilterGraph::GetRate. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f253e6cf9395c5895920ea4f09bd0994d253483e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/filtergraph.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 495f4be..028a31e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2610,6 +2610,11 @@ static HRESULT WINAPI MediaSeeking_GetRate(IMediaSeeking *iface, double *pdRate) FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pdRate); + if (!pdRate) + return E_POINTER; + + *pdRate = 1.0; + return S_OK; }

1 0

Charles Davis : winex11.drv: Actually query the swap method attribute.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 32c912253b219c0e1c17da8039fbd5d2930dc2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c912253b219c0e1c17da803… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 12 02:01:42 2016 -0700 winex11.drv: Actually query the swap method attribute. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6509f90eacae5990de63d6f9a493fb60dd1982ad) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3d0bd24..704d62a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2738,7 +2738,7 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int case WGL_SWAP_METHOD_ARB: if (has_swap_method) { - hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &tmp); + hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_SWAP_METHOD_OML, &tmp); if (hTest) goto get_error; switch (tmp) {

1 0

Sebastian Lackner : kernel32/tests: Add tests for RtlInterlockedPushListSList[Ex].
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: bdfd2dfaa2c6644f025e4cfd2e534e4b221fbe2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfd2dfaa2c6644f025e4cfd2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:53:49 2016 +0100 kernel32/tests: Add tests for RtlInterlockedPushListSList[Ex]. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 32f72989b6bec7f79f434bffc2d4b10358b18a8c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/sync.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index e2aa3a1..325e1ff 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -28,6 +28,9 @@ #include "wine/test.h" +#undef __fastcall +#define __fastcall __stdcall + static BOOL (WINAPI *pChangeTimerQueueTimer)(HANDLE, HANDLE, ULONG, ULONG); static HANDLE (WINAPI *pCreateTimerQueue)(void); static BOOL (WINAPI *pCreateTimerQueueTimer)(PHANDLE, HANDLE, WAITORTIMERCALLBACK, @@ -61,6 +64,48 @@ static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_ static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); static NTSTATUS (WINAPI *pNtWaitForSingleObject)(HANDLE, BOOLEAN, const LARGE_INTEGER *); static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); +static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count); +static PSLIST_ENTRY (WINAPI *pRtlInterlockedPushListSListEx)(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count); + +#ifdef __i386__ + +#include "pshpack1.h" +struct fastcall_thunk +{ + BYTE pop_edx; /* popl %edx (ret addr) */ + BYTE pop_eax; /* popl %eax (func) */ + BYTE pop_ecx; /* popl %ecx (param 1) */ + BYTE xchg[3]; /* xchgl (%esp),%edx (param 2) */ + WORD jmp_eax; /* jmp *%eax */ +}; +#include "poppack.h" + +static void * (WINAPI *call_fastcall_func4)(void *func, const void *a, const void *b, const void *c, const void *d); + +static void init_fastcall_thunk(void) +{ + struct fastcall_thunk *thunk = VirtualAlloc(NULL, sizeof(*thunk), MEM_COMMIT, PAGE_EXECUTE_READWRITE); + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->xchg[0] = 0x87; /* xchgl (%esp),%edx */ + thunk->xchg[1] = 0x14; + thunk->xchg[2] = 0x24; + thunk->jmp_eax = 0xe0ff; /* jmp *%eax */ + call_fastcall_func4 = (void *)thunk; +} + +#define call_func4(func, a, b, c, d) call_fastcall_func4(func, (const void *)(a), \ + (const void *)(b), (const void *)(c), (const void *)(d)) + +#else /* __i386__ */ + +#define init_fastcall_thunk() do { } while(0) +#define call_func4(func, a, b, c, d) func(a, b, c, d) + +#endif /* __i386__ */ static void test_signalandwait(void) { @@ -276,6 +321,7 @@ static void test_slist(void) size = QueryDepthSList(&slist_header); ok(size == 0, "Expected size == 0, got %u\n", size); + /* test PushEntry, PopEntry and Flush */ entry = InterlockedPushEntrySList(&slist_header, &item1.entry); ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); size = QueryDepthSList(&slist_header); @@ -313,6 +359,83 @@ static void test_slist(void) entry = InterlockedPopEntrySList(&slist_header); ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + /* test RtlInterlockedPushListSList */ + entry = InterlockedPushEntrySList(&slist_header, &item3.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + entry = call_func4(pRtlInterlockedPushListSList, &slist_header, &item2.entry, &item1.entry, 42); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 43, "Expected size == 43, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 2, "Expected item->value == 2, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 42, "Expected size == 42, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 41, "Expected size == 41, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 40, "Expected size == 40, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + size = QueryDepthSList(&slist_header); + ok(size == 40, "Expected size == 40, got %u\n", size); + + entry = InterlockedFlushSList(&slist_header); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + size = QueryDepthSList(&slist_header); + ok(size == 40 || broken(size == 0) /* >= Win 8 */, "Expected size == 40, got %u\n", size); + + entry = InterlockedPushEntrySList(&slist_header, &item1.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + entry = InterlockedFlushSList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + + /* test RtlInterlockedPushListSListEx */ + if (pRtlInterlockedPushListSListEx) + { + entry = InterlockedPushEntrySList(&slist_header, &item3.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + entry = pRtlInterlockedPushListSListEx(&slist_header, &item2.entry, &item1.entry, 42); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 43, "Expected size == 43, got %u\n", size); + + entry = InterlockedFlushSList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 2, "Expected item->value == 2, got %u\n", item->value); + item = CONTAINING_RECORD(item->entry.Next, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + item = CONTAINING_RECORD(item->entry.Next, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + } + else + win_skip("RtlInterlockedPushListSListEx not available, skipping tests\n"); + + /* test with a lot of items */ for (i = 0; i < 65536; i++) { item = HeapAlloc(GetProcessHeap(), 0, sizeof(*item)); @@ -2561,6 +2684,8 @@ START_TEST(sync) pNtFreeVirtualMemory = (void *)GetProcAddress(hntdll, "NtFreeVirtualMemory"); pNtWaitForSingleObject = (void *)GetProcAddress(hntdll, "NtWaitForSingleObject"); pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); + pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList"); + pRtlInterlockedPushListSListEx = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSListEx"); argc = winetest_get_mainargs( &argv ); if (argc >= 3) @@ -2572,6 +2697,7 @@ START_TEST(sync) return; } + init_fastcall_thunk(); test_signalandwait(); test_mutex(); test_slist();

1 0

Sebastian Lackner : kernel32/tests: Clean up interlocked SList tests.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 8d550f192f344690ea6ec7d490b5c9443ad1bf0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d550f192f344690ea6ec7d49… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:53:11 2016 +0100 kernel32/tests: Clean up interlocked SList tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 38d0690a2c0f01272a4199e9b73f67b6b83f7fb6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/sync.c | 153 +++++++++++++++++++++------------------------ 1 file changed, 70 insertions(+), 83 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index fc278f8..e2aa3a1 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -261,104 +261,91 @@ static void test_slist(void) { SLIST_ENTRY entry; int value; - } item1, item2, item3, *pitem; - + } item1, item2, item3, *item; SLIST_HEADER slist_header; - PSLIST_ENTRY entry, next; + SLIST_ENTRY *entry; USHORT size; int i; - VOID (WINAPI *pInitializeSListHead)(PSLIST_HEADER); - USHORT (WINAPI *pQueryDepthSList)(PSLIST_HEADER); - PSLIST_ENTRY (WINAPI *pInterlockedFlushSList)(PSLIST_HEADER); - PSLIST_ENTRY (WINAPI *pInterlockedPopEntrySList)(PSLIST_HEADER); - PSLIST_ENTRY (WINAPI *pInterlockedPushEntrySList)(PSLIST_HEADER,PSLIST_ENTRY); - HMODULE kernel32; - - kernel32 = GetModuleHandleA("KERNEL32.DLL"); - pInitializeSListHead = (void*) GetProcAddress(kernel32, "InitializeSListHead"); - pQueryDepthSList = (void*) GetProcAddress(kernel32, "QueryDepthSList"); - pInterlockedFlushSList = (void*) GetProcAddress(kernel32, "InterlockedFlushSList"); - pInterlockedPopEntrySList = (void*) GetProcAddress(kernel32, "InterlockedPopEntrySList"); - pInterlockedPushEntrySList = (void*) GetProcAddress(kernel32, "InterlockedPushEntrySList"); - if (pInitializeSListHead == NULL || - pQueryDepthSList == NULL || - pInterlockedFlushSList == NULL || - pInterlockedPopEntrySList == NULL || - pInterlockedPushEntrySList == NULL) - { - win_skip("some required slist entrypoints were not found, skipping tests\n"); - return; - } - - memset(&slist_header, 0xFF, sizeof(slist_header)); - pInitializeSListHead(&slist_header); - size = pQueryDepthSList(&slist_header); - ok(size == 0, "initially created slist has size %d, expected 0\n", size); - item1.value = 1; - ok(pInterlockedPushEntrySList(&slist_header, &item1.entry) == NULL, - "previous entry in empty slist wasn't NULL\n"); - size = pQueryDepthSList(&slist_header); - ok(size == 1, "slist with 1 item has size %d\n", size); - item2.value = 2; - entry = pInterlockedPushEntrySList(&slist_header, &item2.entry); - ok(entry != NULL, "previous entry in non-empty slist was NULL\n"); - if (entry != NULL) - { - pitem = (struct item*) entry; - ok(pitem->value == 1, "previous entry in slist wasn't the one added\n"); - } - size = pQueryDepthSList(&slist_header); - ok(size == 2, "slist with 2 items has size %d\n", size); - item3.value = 3; - entry = pInterlockedPushEntrySList(&slist_header, &item3.entry); - ok(entry != NULL, "previous entry in non-empty slist was NULL\n"); - if (entry != NULL) - { - pitem = (struct item*) entry; - ok(pitem->value == 2, "previous entry in slist wasn't the one added\n"); - } - size = pQueryDepthSList(&slist_header); - ok(size == 3, "slist with 3 items has size %d\n", size); - - entry = pInterlockedPopEntrySList(&slist_header); - ok(entry != NULL, "entry shouldn't be NULL\n"); - if (entry != NULL) - { - pitem = (struct item*) entry; - ok(pitem->value == 3, "unexpected entry removed\n"); - } - size = pQueryDepthSList(&slist_header); - ok(size == 2, "slist with 2 items has size %d\n", size); - entry = pInterlockedFlushSList(&slist_header); - size = pQueryDepthSList(&slist_header); - ok(size == 0, "flushed slist should be empty, size is %d\n", size); - if (size == 0) - { - ok(pInterlockedPopEntrySList(&slist_header) == NULL, - "popping empty slist didn't return NULL\n"); - } - ok(((struct item*)entry)->value == 2, "item 2 not in front of list\n"); - ok(((struct item*)entry->Next)->value == 1, "item 1 not at the back of list\n"); + memset(&slist_header, 0xff, sizeof(slist_header)); + InitializeSListHead(&slist_header); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + + entry = InterlockedPushEntrySList(&slist_header, &item1.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + size = QueryDepthSList(&slist_header); + ok(size == 1, "Expected size == 1, got %u\n", size); + + entry = InterlockedPushEntrySList(&slist_header, &item2.entry); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 2, "Expected size == 2, got %u\n", size); + + entry = InterlockedPushEntrySList(&slist_header, &item3.entry); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 2, "Expected item->value == 2, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 3, "Expected size == 3, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 2, "Expected size == 2, got %u\n", size); + + entry = InterlockedFlushSList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 2, "Expected item->value == 2, got %u\n", item->value); + item = CONTAINING_RECORD(item->entry.Next, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + entry = InterlockedPopEntrySList(&slist_header); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); for (i = 0; i < 65536; i++) { - entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); - pInterlockedPushEntrySList(&slist_header, entry); + item = HeapAlloc(GetProcessHeap(), 0, sizeof(*item)); + item->value = i + 1; + entry = InterlockedPushEntrySList(&slist_header, &item->entry); + if (i) + { + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == i, "Expected item->value == %u, got %u\n", i, item->value); + } + else + { + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + } + size = QueryDepthSList(&slist_header); + ok(size == ((i + 1) & 0xffff), "Expected size == %u, got %u\n", (i + 1) & 0xffff, size); } - entry = pInterlockedFlushSList(&slist_header); - ok(entry != NULL, "not flushed\n"); - while (entry) + entry = InterlockedFlushSList(&slist_header); + for (i = 65536; i > 0; i--) { - next = entry->Next; - HeapFree(GetProcessHeap(), 0, entry); - entry = next; + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == i, "Expected item->value == %u, got %u\n", i, item->value); + entry = item->entry.Next; + HeapFree(GetProcessHeap(), 0, item); } + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + entry = InterlockedPopEntrySList(&slist_header); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); } static void test_event(void)

1 0

Michael Müller : include: Add definitions for Win8 pseudo handles.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: c25f74019ae5b6a341fa11b9e7cad2e118f9d485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25f74019ae5b6a341fa11b9e… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:22:30 2016 +0100 include: Add definitions for Win8 pseudo handles. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e7bbca8fcc5f460c5b7dc43cfaca661bc802f413) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/winbase.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 7216086..09b11e9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2972,6 +2972,10 @@ WINBASEAPI VOID WINAPI SetLastError(DWORD); #define GetCurrentThread() ((HANDLE)~(ULONG_PTR)1) #endif +#define GetCurrentProcessToken() ((HANDLE)~(ULONG_PTR)3) +#define GetCurrentThreadToken() ((HANDLE)~(ULONG_PTR)4) +#define GetCurrentThreadEffectiveToken() ((HANDLE)~(ULONG_PTR)5) + /* WinMain(entry point) must be declared in winbase.h. */ /* If this is not declared, we cannot compile many sources written with C++. */ int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int);

1 0

Michael Müller : msvideo.dll16: Translate 16 bit address in lparam for MCIWNDM_SETTIMEFORMATA message.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 24ac7dcb8aa91b4a6c8df5d59239937a5c481774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ac7dcb8aa91b4a6c8df5d59… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 09:29:23 2016 +0100 msvideo.dll16: Translate 16 bit address in lparam for MCIWNDM_SETTIMEFORMATA message. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 410d7995faea981341f1a0ffef9e03989f90009f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvideo.dll16/msvideo16.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 1b715e4..8f02cc1 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -988,6 +988,7 @@ static LRESULT WINAPI MCIWndProc16(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp switch (msg) { case MCIWNDM_SENDSTRINGA: + case MCIWNDM_SETTIMEFORMATA: lparam = (ULONG_PTR)MapSL(lparam); break;

1 0

Sebastian Lackner : vcomp: Implement 64-bit atomic instructions.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 33fe13211a50d473fc15d32b13541a2bc1902971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33fe13211a50d473fc15d32b1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 07:47:13 2016 +0100 vcomp: Implement 64-bit atomic instructions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b29c072e315ee0440c162574b905e8d768153f93) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vcomp/main.c | 68 ++++++++++++++++++++++++++++++++++++++++++++- dlls/vcomp/vcomp.spec | 22 +++++++-------- dlls/vcomp100/vcomp100.spec | 22 +++++++-------- dlls/vcomp110/vcomp110.spec | 22 +++++++-------- dlls/vcomp120/vcomp120.spec | 22 +++++++-------- dlls/vcomp90/vcomp90.spec | 22 +++++++-------- 6 files changed, 122 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33fe13211a50d473fc15d…

1 0

Jacek Caban : ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: cec6924b2f0398aeca30413dde07778e6182ff01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec6924b2f0398aeca30413dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 12:11:07 2016 +0100 ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls. This is needed by Office 2013, which hooks those functions and expects flag to be set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 443c2a4719cd366a254eaa387417c357935b5634) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/directory.c | 2 +- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/path.c | 2 +- dlls/ntdll/reg.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 715a760..4aa1a72 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2449,7 +2449,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) attr.ObjectName = name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - return NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); + return NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); } static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsigned int extra_len ) @@ -2790,7 +2790,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (!NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { sxs_ai = *ai; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 23ebf48..8a972c8 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -3357,7 +3357,7 @@ NTSTATUS DIR_get_unix_cwd( char **cwd ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &handle, 0, &attr, &io, 0, + status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); RtlFreeUnicodeString( &dirW ); if (status != STATUS_SUCCESS) goto done; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 74feb97..cb9a4e2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2149,7 +2149,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; goto found; } @@ -2184,7 +2184,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; } found: RtlFreeUnicodeString( &nt_name ); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index feaac9e..ae0646a 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -984,7 +984,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - nts = NtOpenFile( &handle, 0, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + nts = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); if (nts != STATUS_SUCCESS) goto out; /* don't keep the directory handle open on removable media */ diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index be95a2a..83749c4 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -660,7 +660,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil TRACE("(%p,%p)\n", attr, file); - ret = NtCreateFile(&hive, GENERIC_READ, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, + ret = NtCreateFile(&hive, GENERIC_READ | SYNCHRONIZE, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, 0, NULL, 0); if (ret) return ret;

1 0

Józef Kucia : wined3d: Validate render state in wined3d_device_set_render_state().
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: bcde1d70adba23b1c3b921a7b75b2deb9592258a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcde1d70adba23b1c3b921a7b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 28 00:17:46 2016 +0100 wined3d: Validate render state in wined3d_device_set_render_state(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99fbc04bfe13bf2471725f88000892f8fee9f526) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/device.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 057ae18..7753e76 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1982,10 +1982,17 @@ static void resolve_depth_buffer(struct wined3d_state *state) void CDECL wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value) { - DWORD old_value = device->state.render_states[state]; + DWORD old_value; TRACE("device %p, state %s (%#x), value %#x.\n", device, debug_d3drenderstate(state), state, value); + if (state > WINEHIGHEST_RENDER_STATE) + { + WARN("Unhandled render state %#x.\n", state); + return; + } + + old_value = device->state.render_states[state]; device->update_state->render_states[state] = value; /* Handle recording of state blocks. */

1 0

Matteo Bruni : wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 160a063c47731e6f88cccbef2c456875bdc6fa9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=160a063c47731e6f88cccbef2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 22:51:29 2016 +0100 wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a25c47f59a600d7da819869b643b0b17720c07c6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4b4209a..76fc04a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4426,7 +4426,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 if (quality_levels) { if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - *quality_levels = gl_info->limits.samples; + *quality_levels = wined3d_log2i(gl_info->limits.samples); else *quality_levels = 1; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 072c0ee..201a0c4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2887,7 +2887,7 @@ static void surface_prepare_rb(struct wined3d_surface *surface, const struct win * AMD has a similar feature called Enhanced Quality Anti-Aliasing (EQAA), * but it does not have an equivalent OpenGL extension. */ if (surface->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - samples = surface->resource.multisample_quality; + samples = 1u << (surface->resource.multisample_quality + 1); else samples = surface->resource.multisample_type;

1 0