November 2015 - Wine-Commits

Dmitry Timoshkov : widl: Avoid adding duplicate type definitions if tag and typedef names are the same.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: f7581c763d5789a165527c12d1bc2bf1368c4f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7581c763d5789a165527c12d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:28:53 2015 +0800 widl: Avoid adding duplicate type definitions if tag and typedef names are the same. Fix handing of the following .idl snippet: typedef [uuid(b14b6bb5-904e-4ff9-b247-bd361f7a0001)] struct g { int g1; } g; [uuid(b14b6bb5-904e-4ff9-b247-bd361f7a0002)] interface test_iface : IUnknown { HRESULT test([in] g *ptr); } Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index daa0366..3cbae92 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2181,7 +2181,7 @@ static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) { msft_typeinfo_t *msft_typeinfo = NULL; - int alignment, datatype1, datatype2, size; + int alignment, datatype1, datatype2, size, duplicate = 0; type_t *type; if (-1 < tdef->typelib_idx) @@ -2194,6 +2194,8 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); } + else + duplicate = 1; encode_type(typelib, get_type_vt(type), type, &datatype1, &size, &alignment, &datatype2); @@ -2205,6 +2207,10 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) msft_typeinfo->typeinfo->datatype2 = datatype2; msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); } + + /* avoid adding duplicate type definitions */ + if (duplicate) + tdef->typelib_idx = type->typelib_idx; } static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls)

1 0

Alex Henrie : winex11: Avoid double initialization of variables in OpenGL functions.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 6479e32cf0ee235d7dcbd4c353785367c39ca12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6479e32cf0ee235d7dcbd4c35… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 3 22:15:15 2015 -0700 winex11: Avoid double initialization of variables in OpenGL functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7b8ba82..99befde 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -997,7 +997,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) { - int render_type=0, render_type_bit; + int render_type, render_type_bit; pglXGetFBConfigAttrib(display, fbconfig, GLX_RENDER_TYPE, &render_type_bit); switch(render_type_bit) { @@ -1015,6 +1015,7 @@ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) break; default: ERR("Unknown render_type: %x\n", render_type_bit); + render_type = 0; } return render_type; } @@ -1787,7 +1788,7 @@ static BOOL glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *d */ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) { - struct wgl_context *ret = NULL; + struct wgl_context *ret; struct gl_drawable *gl; if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) @@ -2037,7 +2038,7 @@ static const GLubyte *wglGetString(GLenum name) static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wgl_context *hShareContext, const int* attribList ) { - struct wgl_context *ret = NULL; + struct wgl_context *ret; struct gl_drawable *gl; int err = 0; @@ -2134,8 +2135,8 @@ static const char *X11DRV_wglGetExtensionsStringARB(HDC hdc) static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList ) { - struct wgl_pbuffer* object = NULL; - const struct wgl_pixel_format *fmt = NULL; + struct wgl_pbuffer* object; + const struct wgl_pixel_format *fmt; int attribs[256]; int nAttribs = 0; @@ -2507,7 +2508,7 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c { int attribs[256]; int nAttribs = 0; - GLXFBConfig* cfgs = NULL; + GLXFBConfig* cfgs; int nCfgs = 0; int it; int fmt_id; @@ -2613,7 +2614,7 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int UINT nAttributes, const int *piAttributes, int *piValues ) { UINT i; - const struct wgl_pixel_format *fmt = NULL; + const struct wgl_pixel_format *fmt; int hTest; int tmp; int curGLXAttr = 0; @@ -3029,7 +3030,7 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) { struct wgl_context *ctx = NtCurrentTeb()->glContext; struct gl_drawable *gl; - BOOL ret = TRUE; + BOOL ret; TRACE("(%d)\n", interval);

1 0

Alexandre Julliard : makefiles: Generate correct dependencies for included typelib files.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 8e81f6d58234c17f5de6d2219ef47c6d01a4a4a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e81f6d58234c17f5de6d2219… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 14:25:35 2015 +0900 makefiles: Generate correct dependencies for included typelib files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmlparser.idl | 2 +- dlls/msxml3/xmlparser.idl | 2 +- tools/makedep.c | 133 ++++++++++++++++++++++++++++------------ 3 files changed, 96 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e81f6d58234c17f5de6d…

1 0

Dmitry Timoshkov : widl: Avoid generating duplicate typelib entries for structure tag names.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: ded915aa7c450429a74f136efa35a1b58d83a63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded915aa7c450429a74f136ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:01 2015 +0800 widl: Avoid generating duplicate typelib entries for structure tag names. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 5925d40..e316614 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -300,7 +300,12 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields) { type_t *tag_type = name ? find_type(name, namespace, tsSTRUCT) : NULL; - type_t *t = make_type(TYPE_STRUCT); + type_t *t; + + /* avoid creating duplicate typelib type entries */ + if (tag_type && do_typelib) return tag_type; + + t = make_type(TYPE_STRUCT); t->name = name; t->namespace = namespace;

1 0

Jacek Caban : ntdll: Added NtOpenKeyEx implementation.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 4269423ee49046886fa21167f58c325c85fb6be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4269423ee49046886fa21167f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 4 15:28:49 2015 +0100 ntdll: Added NtOpenKeyEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/reg.c | 25 ++++++++++++++++++------- dlls/ntdll/tests/reg.c | 14 ++++++++++++++ include/winternl.h | 1 + 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 38422ae..464b233 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -213,6 +213,7 @@ @ stdcall NtOpenIoCompletion(ptr long ptr) @ stdcall NtOpenJobObject(ptr long ptr) @ stdcall NtOpenKey(ptr long ptr) +@ stdcall NtOpenKeyEx(ptr long ptr long) @ stdcall NtOpenKeyedEvent(ptr long ptr) @ stdcall NtOpenMutant(ptr long ptr) @ stub NtOpenObjectAuditAlarm @@ -1128,6 +1129,7 @@ @ stdcall ZwOpenIoCompletion(ptr long ptr) NtOpenIoCompletion @ stdcall ZwOpenJobObject(ptr long ptr) NtOpenJobObject @ stdcall ZwOpenKey(ptr long ptr) NtOpenKey +@ stdcall ZwOpenKeyEx(ptr long ptr long) NtOpenKeyEx @ stdcall ZwOpenKeyedEvent(ptr long ptr) NtOpenKeyedEvent @ stdcall ZwOpenMutant(ptr long ptr) NtOpenMutant @ stub ZwOpenObjectAuditAlarm diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index a104c2e..c0fc641 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -106,14 +106,10 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJEC } /****************************************************************************** - * NtOpenKey [NTDLL.@] - * ZwOpenKey [NTDLL.@] - * - * OUT HANDLE retkey (returns 0 when failure) - * IN ACCESS_MASK access - * IN POBJECT_ATTRIBUTES attr + * NtOpenKeyEx [NTDLL.@] + * ZwOpenKeyEx [NTDLL.@] */ -NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) { NTSTATUS ret; DWORD len; @@ -123,6 +119,8 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR len = attr->ObjectName->Length; TRACE( "(%p,%s,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), access, retkey ); + if (options) + FIXME("options %x not implemented\n", options); if (len > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW; @@ -141,6 +139,19 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR } /****************************************************************************** + * NtOpenKey [NTDLL.@] + * ZwOpenKey [NTDLL.@] + * + * OUT HANDLE retkey (returns 0 when failure) + * IN ACCESS_MASK access + * IN POBJECT_ATTRIBUTES attr + */ +NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +{ + return NtOpenKeyEx( retkey, access, attr, 0 ); +} + +/****************************************************************************** * RtlpNtOpenKey [NTDLL.@] * * See NtOpenKey. diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 6d04668..ecfe1b2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -123,6 +123,7 @@ static NTSTATUS (WINAPI * pRtlQueryRegistryValues)(IN ULONG, IN PCWSTR,IN PRTL_Q static NTSTATUS (WINAPI * pRtlCheckRegistryKey)(IN ULONG,IN PWSTR); static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, PHANDLE); static NTSTATUS (WINAPI * pNtOpenKey)(PHANDLE, IN ACCESS_MASK, IN POBJECT_ATTRIBUTES); +static NTSTATUS (WINAPI * pNtOpenKeyEx)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI * pNtClose)(IN HANDLE); static NTSTATUS (WINAPI * pNtFlushKey)(HANDLE); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); @@ -195,6 +196,7 @@ static BOOL InitFunctionPtrs(void) /* optional functions */ pNtQueryLicenseValue = (void *)GetProcAddress(hntdll, "NtQueryLicenseValue"); + pNtOpenKeyEx = (void *)GetProcAddress(hntdll, "NtOpenKeyEx"); return TRUE; } @@ -351,6 +353,18 @@ static void test_NtOpenKey(void) attr.Length *= 2; status = pNtOpenKey(&key, am, &attr); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); + + if (!pNtOpenKeyEx) + { + win_skip("NtOpenKeyEx not available\n"); + return; + } + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKeyEx(&key, KEY_WRITE|KEY_READ, &attr, 0); + ok(status == STATUS_SUCCESS, "NtOpenKeyEx Failed: 0x%08x\n", status); + + pNtClose(key); } static void test_NtCreateKey(void) diff --git a/include/winternl.h b/include/winternl.h index 5420391..f3de636 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2169,6 +2169,7 @@ NTSYSAPI NTSTATUS WINAPI NtOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_ NTSYSAPI NTSTATUS WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); NTSYSAPI NTSTATUS WINAPI NtOpenJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); +NTSYSAPI NTSTATUS WINAPI NtOpenKeyEx(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); NTSYSAPI NTSTATUS WINAPI NtOpenKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenMutant(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenObjectAuditAlarm(PUNICODE_STRING,PHANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,ACCESS_MASK,PPRIVILEGE_SET,BOOLEAN,BOOLEAN,PBOOLEAN);

1 0

Alex Henrie : opengl32: Define the 2D identity matrix once, at the top of the file.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 56c045c68e37583414c175199e01644751e76e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c045c68e37583414c175199… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 3 22:03:47 2015 -0700 opengl32: Define the 2D identity matrix once, at the top of the file. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index ee2ae25..42bf920 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -92,6 +92,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION wgl_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; + static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) { struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); @@ -1212,7 +1214,6 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l funcs->gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 4); for (glyph = first; glyph < first + count; glyph++) { - static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; unsigned int needed_size, height, width, width_int; if (unicode) @@ -1479,7 +1480,6 @@ static BOOL wglUseFontOutlines_common(HDC hdc, { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; UINT glyph; - const MAT2 identity = {{0,1},{0,0},{0,0},{0,1}}; GLUtesselator *tess = NULL; LOGFONTW lf; HFONT old_font, unscaled_font;

1 0

Sebastian Lackner : kernel32/tests: Add a test to demonstrate a deadlock by suspending a thread during a system APC.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 659e585166d3440665588de939652294a5fd2e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=659e585166d3440665588de93… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 5 05:41:43 2015 +0100 kernel32/tests: Add a test to demonstrate a deadlock by suspending a thread during a system APC. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 1065d5e..4ac6a99 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -56,6 +56,9 @@ static VOID (WINAPI *pReleaseSRWLockExclusive)(PSRWLOCK); static VOID (WINAPI *pReleaseSRWLockShared)(PSRWLOCK); static BOOLEAN (WINAPI *pTryAcquireSRWLockExclusive)(PSRWLOCK); static BOOLEAN (WINAPI *pTryAcquireSRWLockShared)(PSRWLOCK); + +static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); +static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); static void test_signalandwait(void) @@ -2394,8 +2397,105 @@ static void test_alertable_wait(void) CloseHandle(semaphores[1]); } +struct apc_deadlock_info +{ + PROCESS_INFORMATION *pi; + HANDLE event; + BOOL running; +}; + +static DWORD WINAPI apc_deadlock_thread(void *param) +{ + struct apc_deadlock_info *info = param; + PROCESS_INFORMATION *pi = info->pi; + NTSTATUS status; + SIZE_T size; + void *base; + + while (info->running) + { + base = NULL; + size = 0x1000; + status = pNtAllocateVirtualMemory(pi->hProcess, &base, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); + ok(base != NULL, "expected base != NULL, got %p\n", base); + SetEvent(info->event); + + size = 0; + status = pNtFreeVirtualMemory(pi->hProcess, &base, &size, MEM_RELEASE); + ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); + SetEvent(info->event); + } + + return 0; +} + +static void test_apc_deadlock(void) +{ + struct apc_deadlock_info info; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { sizeof(si) }; + char cmdline[MAX_PATH]; + HANDLE event, thread; + DWORD result; + BOOL success; + char **argv; + int i; + + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" sync apc_deadlock", argv[0]); + success = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(success, "CreateProcess failed with %u\n", GetLastError()); + + event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent failed with %u\n", GetLastError()); + + info.pi = π + info.event = event; + info.running = TRUE; + + thread = CreateThread(NULL, 0, apc_deadlock_thread, &info, 0, NULL); + ok(thread != NULL, "CreateThread failed with %u\n", GetLastError()); + result = WaitForSingleObject(event, 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + + for (i = 0; i < 1000 && info.running; i++) + { + result = SuspendThread(pi.hThread); + ok(result == 0, "expected 0, got %u\n", result); + + WaitForSingleObject(event, 0); /* reset event */ + result = WaitForSingleObject(event, 1000); + if (result == WAIT_TIMEOUT) + { + todo_wine + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + info.running = FALSE; + } + else + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + + result = ResumeThread(pi.hThread); + ok(result == 1, "expected 1, got %u\n", result); + Sleep(1); + } + + info.running = FALSE; + result = WaitForSingleObject(thread, 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + CloseHandle(thread); + CloseHandle(event); + + TerminateProcess(pi.hProcess, 0); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +} + START_TEST(sync) { + char **argv; + int argc; HMODULE hdll = GetModuleHandleA("kernel32.dll"); HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2424,8 +2524,21 @@ START_TEST(sync) pReleaseSRWLockShared = (void *)GetProcAddress(hdll, "ReleaseSRWLockShared"); pTryAcquireSRWLockExclusive = (void *)GetProcAddress(hdll, "TryAcquireSRWLockExclusive"); pTryAcquireSRWLockShared = (void *)GetProcAddress(hdll, "TryAcquireSRWLockShared"); + pNtAllocateVirtualMemory = (void *)GetProcAddress(hntdll, "NtAllocateVirtualMemory"); + pNtFreeVirtualMemory = (void *)GetProcAddress(hntdll, "NtFreeVirtualMemory"); pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); + argc = winetest_get_mainargs( &argv ); + if (argc >= 3) + { + if (!strcmp(argv[2], "apc_deadlock")) + { + HANDLE handle = GetCurrentThread(); + for (;;) WaitForMultipleObjectsEx(1, &handle, FALSE, INFINITE, TRUE); + } + return; + } + test_signalandwait(); test_mutex(); test_slist(); @@ -2442,4 +2555,5 @@ START_TEST(sync) test_srwlock_base(); test_srwlock_example(); test_alertable_wait(); + test_apc_deadlock(); }

1 0

Austin English : fltmgr.sys: Add FltInitializePushLock stub.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: f91a7b2cfe5b44fea333ed70b9fc38a509b7798a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91a7b2cfe5b44fea333ed70b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 4 10:46:50 2015 -0800 fltmgr.sys: Add FltInitializePushLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 7 +++++++ include/ddk/ntifs.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 5310269..ea84d81 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -97,7 +97,7 @@ @ stub FltGetVolumeProperties @ stub FltInitializeFileLock @ stub FltInitializeOplock -@ stub FltInitializePushLock +@ stdcall FltInitializePushLock(ptr) @ stub FltIs32bitProcess @ stub FltIsCallbackDataDirty @ stub FltIsDirectory diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 7341ef2..70ee307 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -25,6 +25,8 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "ddk/ntddk.h" +#include "ddk/ntifs.h" #include "ddk/wdm.h" #include "wine/debug.h" @@ -36,3 +38,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) return STATUS_SUCCESS; } + +void WINAPI FltInitializePushLock( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index a8d90a1..32c9e30 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -19,6 +19,8 @@ #ifndef __NTIFS_H__ #define __NTIFS_H__ +typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; + typedef struct _KQUEUE { DISPATCHER_HEADER Header;

1 0

Dmitry Timoshkov : widl: Attributes of the alias are supposed to replace attributes of a tag in the typelib.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 58b0788a2d0b7303adbafca5e3038455e49f1b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b0788a2d0b7303adbafca5e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:13 2015 +0800 widl: Attributes of the alias are supposed to replace attributes of a tag in the typelib. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 2 +- tools/widl/parser.y | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1d13b89..e8b2cb4 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4297,7 +4297,7 @@ static const type_info info[] = { }, { "cc", - "{00000000-0000-0000-0000-000000000000}", + "{016fe2ec-b2c8-45f8-b23b-39e53a75396c}", /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, /*#vtbl*/ 0, /*#func*/ 0 }, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e7f2ead..7de7567 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1893,6 +1893,10 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at { if (!type->name) type->name = gen_name(); + + /* replace existing attributes when generating a typelib */ + if (do_typelib) + type->attrs = attrs; } LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry )

1 0

Dmitry Timoshkov : widl: Ignore assignment of a duplicate uuid.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 42c328ddf4b12e556ef95853cda6d5fa0328f39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c328ddf4b12e556ef95853c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 13:32:22 2015 +0800 widl: Ignore assignment of a duplicate uuid. MSDN KB285146 article describes this behaviour, and the tests confirm that. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 3cbae92..7396944 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -494,10 +494,22 @@ static int ctl2_alloc_guid( MSFT_GuidEntry *guid_space; int hash_key; + chat("adding uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, + guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], + guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); + hash_key = ctl2_hash_guid(&guid->guid); offset = ctl2_find_guid(typelib, hash_key, &guid->guid); - if (offset != -1) return offset; + if (offset != -1) + { + warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, + guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], + guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); + return -1; + } offset = ctl2_alloc_segment(typelib, MSFT_SEG_GUID, sizeof(MSFT_GuidEntry), 0);

1 0