wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Stefan Dösinger : d3d9/tests: Test multisample mismatch.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 4d8bfe190cd3d214c0f5bdee8bf2ea7535481d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8bfe190cd3d214c0f5bdee8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 22:48:15 2015 +0200 d3d9/tests: Test multisample mismatch. --- dlls/d3d9/tests/visual.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d8bfe190cd3d214c0f5b…

1 0

Stefan Dösinger : wined3d: Disable the depth stencil on multisample mismatch.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 4e53faf77b34387f6e59946f71e57365f3f97e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e53faf77b34387f6e59946f7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 22:48:14 2015 +0200 wined3d: Disable the depth stencil on multisample mismatch. --- dlls/wined3d/context.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 27ce1bf..d88995b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -420,6 +420,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; GLuint read_binding, draw_binding; + struct wined3d_surface *depth_stencil = entry->depth_stencil; if (entry->attached) { @@ -437,10 +438,22 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ context_attach_surface_fbo(context, target, i, entry->render_targets[i], entry->color_location); } - /* Apply depth targets */ - if (entry->depth_stencil) - surface_set_compatible_renderbuffer(entry->depth_stencil, entry->render_targets[0]); - context_attach_depth_stencil_fbo(context, target, entry->depth_stencil, entry->ds_location); + if (depth_stencil && entry->render_targets[0] + && (depth_stencil->resource.multisample_type + != entry->render_targets[0]->resource.multisample_type + || depth_stencil->resource.multisample_quality + != entry->render_targets[0]->resource.multisample_quality)) + { + WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", + entry->render_targets[0]->resource.multisample_quality, + entry->render_targets[0]->resource.multisample_type, + depth_stencil->resource.multisample_quality, depth_stencil->resource.multisample_type); + depth_stencil = NULL; + } + + if (depth_stencil) + surface_set_compatible_renderbuffer(depth_stencil, entry->render_targets[0]); + context_attach_depth_stencil_fbo(context, target, depth_stencil, entry->ds_location); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility * GL contexts requirements. */

1 0

Alexandre Julliard : user32/tests: Add tests for SetClipboardData from a different thread.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: cce57e9e3ee7b9caa29c5f7697d540759be3c20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce57e9e3ee7b9caa29c5f769… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 10 18:37:34 2015 +0900 user32/tests: Add tests for SetClipboardData from a different thread. --- dlls/user32/tests/clipboard.c | 132 +++++++++++++++++++++++++++++++++++------- 1 file changed, 112 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index b9add86..be6c9bf 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -27,26 +27,84 @@ static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); +static int thread_from_line; + static DWORD WINAPI open_clipboard_thread(LPVOID arg) { HWND hWnd = arg; - ok(OpenClipboard(hWnd), "OpenClipboard failed\n"); + ok(OpenClipboard(hWnd), "%u: OpenClipboard failed\n", thread_from_line); return 0; } static DWORD WINAPI empty_clipboard_thread(LPVOID arg) { SetLastError( 0xdeadbeef ); - ok(!EmptyClipboard(), "EmptyClipboard succeeded\n" ); - ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError()); + ok(!EmptyClipboard(), "%u: EmptyClipboard succeeded\n", thread_from_line ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); return 0; } -static void test_ClipboardOwner(void) +static DWORD WINAPI open_and_empty_clipboard_thread(LPVOID arg) +{ + HWND hWnd = arg; + ok(OpenClipboard(hWnd), "%u: OpenClipboard failed\n", thread_from_line); + ok(EmptyClipboard(), "%u: EmptyClipboard failed\n", thread_from_line ); + return 0; +} + +static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) +{ + HWND hwnd = arg; + HANDLE ret; + + SetLastError( 0xdeadbeef ); + if (GetClipboardOwner() == hwnd) + { + SetClipboardData( CF_WAVE, 0 ); + todo_wine ok( IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData failed\n", thread_from_line ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + ok( ret != 0, "%u: SetClipboardData failed err %u\n", thread_from_line, GetLastError() ); + } + else + { + SetClipboardData( CF_WAVE, 0 ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); + ok( !IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData succeeded\n", thread_from_line ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + todo_wine ok( !ret, "%u: SetClipboardData succeeded\n", thread_from_line ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); + } + return 0; +} + +static void run_thread( LPTHREAD_START_ROUTINE func, void *arg, int line ) { + DWORD ret; HANDLE thread; + + thread_from_line = line; + thread = CreateThread(NULL, 0, func, arg, 0, NULL); + ok(thread != NULL, "%u: CreateThread failed with error %d\n", line, GetLastError()); + for (;;) + { + ret = MsgWaitForMultipleObjectsEx( 1, &thread, 1000, QS_ALLINPUT, 0 ); + if (ret == WAIT_OBJECT_0 + 1) + { + MSG msg; + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + } + else break; + } + ok(ret == WAIT_OBJECT_0, "%u: expected WAIT_OBJECT_0, got %u\n", line, ret); + CloseHandle(thread); +} + +static void test_ClipboardOwner(void) +{ HWND hWnd1, hWnd2; - DWORD dwret; BOOL ret; SetLastError(0xdeadbeef); @@ -76,16 +134,9 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); - thread = CreateThread(NULL, 0, open_clipboard_thread, hWnd1, 0, NULL); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - dwret = WaitForSingleObject(thread, 1000); - ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); - CloseHandle(thread); - thread = CreateThread(NULL, 0, empty_clipboard_thread, 0, 0, NULL); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - dwret = WaitForSingleObject(thread, 1000); - ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); - CloseHandle(thread); + run_thread( open_clipboard_thread, hWnd1, __LINE__ ); + run_thread( empty_clipboard_thread, 0, __LINE__ ); + run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -99,6 +150,8 @@ static void test_ClipboardOwner(void) ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); + run_thread( empty_clipboard_thread, 0, __LINE__ ); + run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); @@ -109,12 +162,54 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(GetClipboardOwner() == hWnd1, "clipboard should still be owned\n"); + /* any window will do, even from a different process */ + ret = OpenClipboard( GetDesktopWindow() ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + ret = EmptyClipboard(); + ok( ret, "EmptyClipboard error %d\n", GetLastError()); + ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner %p/%p\n", + GetClipboardOwner(), GetDesktopWindow() ); + run_thread( set_clipboard_data_thread, GetDesktopWindow(), __LINE__ ); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + + ret = OpenClipboard( hWnd1 ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + ret = EmptyClipboard(); + ok( ret, "EmptyClipboard error %d\n", GetLastError()); + ok( GetClipboardOwner() == hWnd1, "wrong owner %p/%p\n", GetClipboardOwner(), hWnd1 ); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + ret = DestroyWindow(hWnd1); ok( ret, "DestroyWindow error %d\n", GetLastError()); ret = DestroyWindow(hWnd2); ok( ret, "DestroyWindow error %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); + + ret = OpenClipboard( 0 ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + + run_thread( open_and_empty_clipboard_thread, 0, __LINE__ ); + + ret = OpenClipboard( 0 ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ret = EmptyClipboard(); + ok( ret, "EmptyClipboard error %d\n", GetLastError()); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + + SetLastError( 0xdeadbeef ); + todo_wine ok( !SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )), + "SetClipboardData succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); + todo_wine ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); + } static void test_RegisterClipboardFormatA(void) @@ -290,12 +385,9 @@ static void test_synthesized(void) ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); - ok(cf == CF_UNICODETEXT || - broken(cf == CF_METAFILEPICT), /* win9x and winME has no CF_UNICODETEXT */ - "cf %08x\n", cf); + ok(cf == CF_UNICODETEXT, "cf %08x\n", cf); - if(cf == CF_UNICODETEXT) - cf = EnumClipboardFormats(cf); + cf = EnumClipboardFormats(cf); ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); data = GetClipboardData(cf); todo_wine ok(data != NULL, "couldn't get data, cf %08x\n", cf);

1 0

Zebediah Figura : include: Add event trace flags and guid to evntrace.h.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 0399b100a78257f7225dd9f1530d9a5356996206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0399b100a78257f7225dd9f15… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 22:56:52 2015 -0500 include: Add event trace flags and guid to evntrace.h. --- include/evntrace.h | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/include/evntrace.h b/include/evntrace.h index cc442dc..191f232 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -38,6 +38,35 @@ extern "C" { #define TRACE_LEVEL_INFORMATION 4 #define TRACE_LEVEL_VERBOSE 5 +#define EVENT_TRACE_FILE_MODE_NONE 0x00000000 +#define EVENT_TRACE_FILE_MODE_SEQUENTIAL 0x00000001 +#define EVENT_TRACE_FILE_MODE_CIRCULAR 0x00000002 +#define EVENT_TRACE_FILE_MODE_APPEND 0x00000004 +#define EVENT_TRACE_FILE_MODE_NEWFILE 0x00000008 +#define EVENT_TRACE_FILE_MODE_PREALLOCATE 0x00000020 +#define EVENT_TRACE_NONSTOPPABLE_MODE 0x00000040 +#define EVENT_TRACE_SECURE_MODE 0x00000080 +#define EVENT_TRACE_REAL_TIME_MODE 0x00000100 +#define EVENT_TRACE_DELAY_OPEN_FILE_MODE 0x00000200 +#define EVENT_TRACE_BUFFERING_MODE 0x00000400 +#define EVENT_TRACE_PRIVATE_LOGGER_MODE 0x00000800 +#define EVENT_TRACE_ADD_HEADER_MODE 0x00001000 +#define EVENT_TRACE_USE_KBYTES_FOR_SIZE 0x00002000 +#define EVENT_TRACE_USE_GLOBAL_SEQUENCE 0x00004000 +#define EVENT_TRACE_USE_LOCAL_SEQUENCE 0x00008000 +#define EVENT_TRACE_RELOG_MODE 0x00010000 +#define EVENT_TRACE_PRIVATE_IN_PROC 0x00020000 +#define EVENT_TRACE_MODE_RESERVED 0x00100000 +#define EVENT_TRACE_STOP_ON_HYBRID_SHUTDOWN 0x00400000 +#define EVENT_TRACE_PERSIST_ON_HYBRID_SHUTDOWN 0x00800000 +#define EVENT_TRACE_USE_PAGED_MEMORY 0x01000000 +#define EVENT_TRACE_SYSTEM_LOGGER_MODE 0x02000000 +#define EVENT_TRACE_INDEPENDENT_SESSION_MODE 0x08000000 +#define EVENT_TRACE_NO_PER_PROCESSOR_BUFFERING 0x10000000 +#define EVENT_TRACE_ADDTO_TRIAGE_DUMP 0x80000000 + +DEFINE_GUID (SystemTraceControlGuid, 0x9e814aad, 0x3204, 0x11d2, 0x9a, 0x82, 0x00, 0x60, 0x08, 0xa8, 0x69, 0x39); + typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; struct _EVENT_TRACE_LOGFILEA; @@ -215,7 +244,7 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG LogBuffersLost; ULONG RealTimeBuffersLost; HANDLE LoggerThreadId; - ULONG LoggerFileNameOffset; + ULONG LogFileNameOffset; ULONG LoggerNameOffset; } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES;

1 0

Zebediah Figura : include: Add WNODE flags to wmistr.h.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: be47a6f59db4a25dbad152e0d84e3053009b3a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be47a6f59db4a25dbad152e0d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 22:54:53 2015 -0500 include: Add WNODE flags to wmistr.h. --- include/wmistr.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/wmistr.h b/include/wmistr.h index 5a806b6..0962fc3 100644 --- a/include/wmistr.h +++ b/include/wmistr.h @@ -19,6 +19,24 @@ #ifndef _WMISTR_ #define _WMISTR_ +#define WNODE_FLAG_ALL_DATA 0x00000001 +#define WNODE_FLAG_SINGLE_INSTANCE 0x00000002 +#define WNODE_FLAG_SINGLE_ITEM 0x00000004 +#define WNODE_FLAG_EVENT_ITEM 0x00000008 +#define WNODE_FLAG_FIXED_INSTANCE_SIZE 0x00000010 +#define WNODE_FLAG_TOO_SMALL 0x00000020 +#define WNODE_FLAG_INSTANCES_SAME 0x00000040 +#define WNODE_FLAG_STATIC_INSTANCE_NAMES 0x00000080 +#define WNODE_FLAG_USE_TIMESTAMP 0x00000200 +#define WNODE_FLAG_EVENT_REFERENCE 0x00002000 +#define WNODE_FLAG_METHOD_ITEM 0x00008000 +#define WNODE_FLAG_PDO_INSTANCE_NAMES 0x00010000 +#define WNODE_FLAG_TRACED_GUID 0x00020000 +#define WNODE_FLAG_LOG_WNODE 0x00040000 +#define WNODE_FLAG_USE_GUID_PTR 0x00080000 +#define WNODE_FLAG_USE_MOF_PTR 0x00100000 +#define WNODE_FLAG_SEVERITY_MASK 0xFF000000 + typedef enum { WMI_GET_ALL_DATA = 0,

1 0

Michael Müller : winebuild: Set a valid major and minor linker version.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 6b4ac9971af18d9851b62b05f3b0d095a2dbc655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4ac9971af18d9851b62b05f… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Aug 21 05:57:24 2014 +0200 winebuild: Set a valid major and minor linker version. Some apps expect a nonzero linker version. --- tools/winebuild/spec32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index c27f0dd..cb56abe 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -529,8 +529,8 @@ void output_module( DLLSPEC *spec ) spec->characteristics ); output( "\t.short 0x%04x\n", /* Magic */ get_ptr_size() == 8 ? IMAGE_NT_OPTIONAL_HDR64_MAGIC : IMAGE_NT_OPTIONAL_HDR32_MAGIC ); - output( "\t.byte 0\n" ); /* MajorLinkerVersion */ - output( "\t.byte 0\n" ); /* MinorLinkerVersion */ + output( "\t.byte 7\n" ); /* MajorLinkerVersion */ + output( "\t.byte 10\n" ); /* MinorLinkerVersion */ output( "\t.long 0\n" ); /* SizeOfCode */ output( "\t.long 0\n" ); /* SizeOfInitializedData */ output( "\t.long 0\n" ); /* SizeOfUninitializedData */ @@ -710,8 +710,8 @@ void output_fake_module( DLLSPEC *spec ) put_word( get_ptr_size() == 8 ? IMAGE_NT_OPTIONAL_HDR64_MAGIC : IMAGE_NT_OPTIONAL_HDR32_MAGIC ); /* Magic */ - put_byte( 0 ); /* MajorLinkerVersion */ - put_byte( 0 ); /* MinorLinkerVersion */ + put_byte( 7 ); /* MajorLinkerVersion */ + put_byte( 10 ); /* MinorLinkerVersion */ put_dword( text_size ); /* SizeOfCode */ put_dword( 0 ); /* SizeOfInitializedData */ put_dword( 0 ); /* SizeOfUninitializedData */

1 0

Austin English : api-ms-win-core-processthreads-l1-1-1: Add advapi32 forwards.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 0a0b0b46e9506b61f46907c33da23af1ba36ea13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0b0b46e9506b61f46907c33… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 9 14:32:31 2015 -0700 api-ms-win-core-processthreads-l1-1-1: Add advapi32 forwards. --- .../api-ms-win-core-processthreads-l1-1-1.spec | 8 ++++---- tools/make_specfiles | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index adc7284..9fb1941 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -1,5 +1,5 @@ @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA -@ stub CreateProcessAsUserW +@ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread @ stub CreateRemoteThreadEx @@ -35,9 +35,9 @@ @ stub InitializeProcThreadAttributeList @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stub OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stub OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @@ -51,7 +51,7 @@ @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee -@ stub SetThreadToken +@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken @ stdcall SuspendThread(long) kernel32.SuspendThread @ stdcall SwitchToThread() kernel32.SwitchToThread @ stdcall TerminateProcess(long long) kernel32.TerminateProcess diff --git a/tools/make_specfiles b/tools/make_specfiles index 0184a9e..179e6d5 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -139,7 +139,6 @@ my @dll_groups = "kernel32", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", - "api-ms-win-core-processthreads-l1-1-1", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-errorhandling-l1-1-0", @@ -195,6 +194,7 @@ my @dll_groups = "advapi32", "api-ms-win-core-namedpipe-l1-1-0", "api-ms-win-core-namedpipe-l1-2-0", + "api-ms-win-core-processthreads-l1-1-1", ], [ "ole32",

1 0

Nikolay Sivov : gdiplus: Implement trivial case of GdipCreateRegionRgnData for empty and infinite regions.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 0a15e163dbfcd568963465c9c56c96023089a5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a15e163dbfcd568963465c9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 09:35:38 2015 +0300 gdiplus: Implement trivial case of GdipCreateRegionRgnData for empty and infinite regions. --- dlls/gdiplus/gdiplus_private.h | 3 +- dlls/gdiplus/region.c | 99 ++++++++++++++++++++++++++++++++++-------- dlls/gdiplus/tests/region.c | 63 +++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 20 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 57b3de3..1f0f47d 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -39,7 +39,8 @@ #define MAX_DASHLEN (16) /* this is a limitation of gdi */ #define INCH_HIMETRIC (2540) -#define VERSION_MAGIC 0xdbc01001 +#define VERSION_MAGIC 0xdbc01001 +#define VERSION_MAGIC2 0xdbc01002 #define TENSION_CONST (0.3) #define GIF_DISPOSE_UNSPECIFIED 0 diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 4ba86eb..572df62 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -522,15 +522,6 @@ GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *rect, return GdipCreateRegionRect(&rectf, region); } -GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) -{ - FIXME("(%p, %d, %p): stub\n", data, size, region); - - *region = NULL; - return NotImplemented; -} - - /****************************************************************************** * GdipCreateRegionHrgn [GDIPLUS.@] */ @@ -787,6 +778,14 @@ static void write_element(const region_element* element, DWORD *buffer, } } +struct region_header +{ + DWORD size; + DWORD checksum; + DWORD magic; + DWORD num_children; +}; + /***************************************************************************** * GdipGetRegionData [GDIPLUS.@] * @@ -823,13 +822,7 @@ static void write_element(const region_element* element, DWORD *buffer, GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, UINT *needed) { - struct _region_header - { - DWORD size; - DWORD checksum; - DWORD magic; - DWORD num_children; - } *region_header; + struct region_header *region_header; INT filled = 0; UINT required; GpStatus status; @@ -847,7 +840,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, return InsufficientBuffer; } - region_header = (struct _region_header *)buffer; + region_header = (struct region_header *)buffer; region_header->size = sizeheader_size + get_element_size(&region->node); region_header->checksum = 0; region_header->magic = VERSION_MAGIC; @@ -863,6 +856,74 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, return Ok; } +static inline GpStatus read_dword(DWORD **buffer, INT *size, DWORD *ret) +{ + if (*size < sizeof(DWORD)) + return GenericError; + + *ret = **buffer; + (*buffer)++; + (*size) -= sizeof(DWORD); + return Ok; +} + +static GpStatus read_element(GpRegion *region, region_element *element, DWORD **buffer, INT *size) +{ + GpStatus status; + + status = read_dword(buffer, size, &element->type); + if (status != Ok) + return status; + + switch (element->type) + { + case RegionDataInfiniteRect: + case RegionDataEmptyRect: + break; + default: + FIXME("region element type 0x%08x not supported\n", element->type); + return NotImplemented; + } + + return Ok; +} + +/***************************************************************************** + * GdipCreateRegionRgnData [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) +{ + struct region_header *region_header; + DWORD *buffer = (DWORD*)data; + GpStatus status; + + TRACE("(%p, %d, %p)\n", data, size, region); + + if (!data || size < sizeof(*region_header) || !region) + return InvalidParameter; + + region_header = (struct region_header *)buffer; + if (region_header->magic != VERSION_MAGIC && region_header->magic != VERSION_MAGIC2) + return InvalidParameter; + + status = GdipCreateRegion(region); + if (status != Ok) + return status; + + /* skip header */ + buffer += 4; + size -= sizeof(*region_header); + + status = read_element(*region, &(*region)->node, &buffer, &size); + if (status != Ok) + { + GdipDeleteRegion(*region); + *region = NULL; + } + + return status; +} + /***************************************************************************** * GdipGetRegionDataSize [GDIPLUS.@] */ @@ -988,7 +1049,7 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap case CombineModeIntersect: return get_region_hrgn(element->elementdata.combine.right, graphics, hrgn); case CombineModeXor: case CombineModeExclude: - left = CreateRectRgn(-4194304, -4194304, 4194304, 4194304); + left = CreateRectRgn(-(1 << 22), -(1 << 22), 1 << 22, 1 << 22); break; case CombineModeUnion: case CombineModeComplement: *hrgn = NULL; @@ -1013,7 +1074,7 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap *hrgn = left; return Ok; case CombineModeXor: case CombineModeComplement: - right = CreateRectRgn(-4194304, -4194304, 4194304, 4194304); + right = CreateRectRgn(-(1 << 22), -(1 << 22), 1 << 22, 1 << 22); break; case CombineModeUnion: case CombineModeExclude: DeleteObject(left); diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 5632e4d..92569c7 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -2132,6 +2132,68 @@ static void test_excludeinfinite(void) GdipDeleteMatrix(identity); } +static void test_GdipCreateRegionRgnData(void) +{ + GpGraphics *graphics = NULL; + GpRegion *region, *region2; + HDC hdc = GetDC(0); + GpStatus status; + BYTE buf[512]; + UINT needed; + BOOL ret; + + status = GdipCreateRegionRgnData(NULL, 0, NULL); + ok(status == InvalidParameter, "status %d\n", status); + + status = GdipCreateFromHDC(hdc, &graphics); + ok(status == Ok, "status %d\n", status); + + status = GdipCreateRegion(&region); + ok(status == Ok, "status %d\n", status); + + /* infinite region */ + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %d\n", status); + expect(20, needed); + + status = GdipCreateRegionRgnData(buf, needed, NULL); + ok(status == InvalidParameter, "status %d\n", status); + + status = GdipCreateRegionRgnData(buf, needed, &region2); + ok(status == Ok, "status %d\n", status); + + ret = FALSE; + status = GdipIsInfiniteRegion(region2, graphics, &ret); + ok(status == Ok, "status %d\n", status); + ok(ret, "got %d\n", ret); + GdipDeleteRegion(region2); + + /* empty region */ + status = GdipSetEmpty(region); + ok(status == Ok, "status %d\n", status); + + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %d\n", status); + expect(20, needed); + + status = GdipCreateRegionRgnData(buf, needed, &region2); + ok(status == Ok, "status %d\n", status); + + ret = FALSE; + status = GdipIsEmptyRegion(region2, graphics, &ret); + ok(status == Ok, "status %d\n", status); + ok(ret, "got %d\n", ret); + GdipDeleteRegion(region2); + + GdipDeleteGraphics(graphics); + GdipDeleteRegion(region); + ReleaseDC(0, hdc); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2158,6 +2220,7 @@ START_TEST(region) test_isvisiblepoint(); test_isvisiblerect(); test_excludeinfinite(); + test_GdipCreateRegionRgnData(); GdiplusShutdown(gdiplusToken); }

1 0

Daniel Lehman : msvcp110: Add wide-char days and months to _LocInfo.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 79118f3543c1ba0920c970acaa79c06bc34322ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=79118f3543c1ba0920c970aca… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jun 8 14:17:39 2015 -0700 msvcp110: Add wide-char days and months to _LocInfo. --- dlls/msvcp110/msvcp110.spec | 12 ++--- dlls/msvcp120/msvcp120.spec | 12 ++--- dlls/msvcp120_app/msvcp120_app.spec | 12 ++--- dlls/msvcp90/locale.c | 92 +++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 5 ++ 5 files changed, 115 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79118f3543c1ba0920c97…

1 0

Daniel Lehman : msvcrt: Add _W_GetMonths.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 1a4db7cdf5c669f0a0c5b0f698eeb8fef831a269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a4db7cdf5c669f0a0c5b0f69… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jun 8 17:10:01 2015 -0700 msvcrt: Add _W_GetMonths. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/locale.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2438b5e..66ec34c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -865,7 +865,7 @@ @ cdecl _Strftime(str long str ptr ptr) @ stub _Unlock_shared_ptr_spin_lock @ cdecl _W_Getdays() -@ stub _W_Getmonths +@ cdecl _W_Getmonths() @ stub _W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dbbf05f..2a3a813 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -847,7 +847,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) @ cdecl _W_Getdays() -@ stub _W_Getmonths +@ cdecl _W_Getmonths() @ stub _W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 6f6a980..0c66cc2 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -843,7 +843,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) msvcr120._Strftime @ cdecl _W_Getdays() msvcr120._W_Getdays -@ stub _W_Getmonths +@ cdecl _W_Getmonths() msvcr120._W_Getmonths @ stub _W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) msvcr120._XcptFilter diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 8a5c110..3e9e99b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -507,6 +507,39 @@ char* CDECL _Getmonths(void) } /********************************************************************* + * _W_Getmonths (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL _W_Getmonths(void) +{ + MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; + MSVCRT_wchar_t *out; + int i, len, size; + + TRACE("\n"); + + size = cur->wstr.names.am-cur->wstr.names.short_mon[0]; + out = MSVCRT_malloc((size+1)*sizeof(*out)); + if(!out) + return NULL; + + size = 0; + for(i=0; i<12; i++) { + out[size++] = ':'; + len = strlenW(cur->wstr.names.short_mon[i]); + memcpy(&out[size], cur->wstr.names.short_mon[i], len*sizeof(*out)); + size += len; + + out[size++] = ':'; + len = strlenW(cur->wstr.names.mon[i]); + memcpy(&out[size], cur->wstr.names.mon[i], len*sizeof(*out)); + size += len; + } + out[size] = '\0'; + + return out; +} + +/********************************************************************* * _Gettnames (MSVCRT.@) */ void* CDECL _Gettnames(void)

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
61
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 June 2015