August 2019 - Wine-Commits - list.winehq.org

Isira Seneviratne : jscript: Replace '%pure-parser' with '%define api.pure '.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: e0e57b140a02c4a665510cba7fc8c32084c00f68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0e57b140a02c4a665510cba… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sun Aug 18 16:47:06 2019 +0530 jscript: Replace '%pure-parser' with '%define api.pure'. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/parser.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 18c1cb1..4bc6260 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } -%pure-parser +%define api.pure %start CCExpr %union { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 138b6f3..ca83b6f 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -141,7 +141,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } -%pure-parser +%define api.pure %start Program %union {

1 0

Jacek Caban : jscript: Support properties argument in Object.create.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: e458e706360f8556367202174953a716cab5e0e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e458e706360f855636720217… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:31:33 2019 +0200 jscript: Support properties argument in Object.create. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 7794f1d..123541e 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -598,11 +598,6 @@ static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("(%s)\n", debugstr_jsval(argv[0])); - if(argc > 1) { - FIXME("Unsupported properties argument %s\n", debugstr_jsval(argv[1])); - return E_NOTIMPL; - } - if(argc && is_object_instance(argv[0])) { if(get_object(argv[0])) proto = to_jsdisp(get_object(argv[0])); @@ -615,13 +610,18 @@ static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return E_INVALIDARG; } - if(r) { - hres = create_dispex(ctx, NULL, proto, &obj); - if(FAILED(hres)) - return hres; + hres = create_dispex(ctx, NULL, proto, &obj); + if(FAILED(hres)) + return hres; + + if(argc >= 2 && !is_undefined(argv[1])) + hres = jsdisp_define_properties(ctx, obj, argv[1]); + + if(SUCCEEDED(hres) && r) *r = jsval_obj(obj); - } - return S_OK; + else + jsdisp_release(obj); + return hres; } static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,

1 0

Zhiyi Zhang : winex11.drv: Make screen helpers independent of Xinerama.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 25167fb286822c93582457815bcf069fef040976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25167fb286822c9358245781… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 14 16:23:55 2019 +0800 winex11.drv: Make screen helpers independent of Xinerama. So that other display device handlers such as XRandR can be introduced because they might report a virtual screen size with different top-left corner and the primary screen may be different as well. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xinerama.c | 33 --------------------- 2 files changed, 70 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a0f8489..f96fd93 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -104,6 +104,34 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; +static RECT virtual_screen_rect; +static RECT primary_monitor_rect; + +POINT virtual_screen_to_root(INT x, INT y) +{ + POINT pt; + pt.x = x - virtual_screen_rect.left; + pt.y = y - virtual_screen_rect.top; + return pt; +} + +POINT root_to_virtual_screen(INT x, INT y) +{ + POINT pt; + pt.x = x + virtual_screen_rect.left; + pt.y = y + virtual_screen_rect.top; + return pt; +} + +RECT get_virtual_screen_rect(void) +{ + return virtual_screen_rect; +} + +RECT get_primary_monitor_rect(void) +{ + return primary_monitor_rect; +} void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) { @@ -293,6 +321,9 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; + UnionRect(&virtual_screen_rect, &virtual_screen_rect, &monitor->rc_monitor); + if (video_index == 0) + primary_monitor_rect = monitor->rc_monitor; /* RcWork */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) @@ -317,6 +348,9 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; + SetRectEmpty(&virtual_screen_rect); + SetRectEmpty(&primary_monitor_rect); + /* Remove all monitors */ devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) @@ -365,6 +399,36 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } +/* Initialize virtual screen rect and primary monitor rect for current process */ +static void init_screen_rects(void) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD type; + DWORD i = 0; + RECT rect; + + /* Already initialized */ + if (!IsRectEmpty(&virtual_screen_rect)) + return; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&rect, + sizeof(rect), NULL, 0)) + ERR("Failed to get monitor size property\n"); + + UnionRect(&virtual_screen_rect, &virtual_screen_rect, &rect); + if (i == 1) + primary_monitor_rect = rect; + } + SetupDiDestroyDeviceInfoList(devinfo); + + TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), + wine_dbgstr_rect(&primary_monitor_rect)); +} + void X11DRV_DisplayDevices_Init(BOOL force) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; @@ -393,7 +457,10 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Avoid unnecessary reinit */ if (!force && disposition != REG_CREATED_NEW_KEY) + { + init_screen_rects(); goto done; + } TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -440,6 +507,9 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } + TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), + wine_dbgstr_rect(&primary_monitor_rect)); + done: cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 75ef3a2..370d34e 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -35,8 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -static RECT virtual_screen_rect; - static MONITORINFOEXW default_monitor = { sizeof(default_monitor), /* cbSize */ @@ -161,32 +159,6 @@ static inline int query_screens(void) #endif /* SONAME_LIBXINERAMA */ -POINT virtual_screen_to_root( INT x, INT y ) -{ - POINT pt; - pt.x = x - virtual_screen_rect.left; - pt.y = y - virtual_screen_rect.top; - return pt; -} - -POINT root_to_virtual_screen( INT x, INT y ) -{ - POINT pt; - pt.x = x + virtual_screen_rect.left; - pt.y = y + virtual_screen_rect.top; - return pt; -} - -RECT get_virtual_screen_rect(void) -{ - return virtual_screen_rect; -} - -RECT get_primary_monitor_rect(void) -{ - return get_primary()->rcMonitor; -} - static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; @@ -349,7 +321,6 @@ void xinerama_init( unsigned int width, unsigned int height ) } primary = get_primary(); - SetRectEmpty( &virtual_screen_rect ); /* coordinates (0,0) have to point to the primary monitor origin */ OffsetRect( &rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); @@ -357,7 +328,6 @@ void xinerama_init( unsigned int width, unsigned int height ) { OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); - UnionRect( &virtual_screen_rect, &virtual_screen_rect, &monitors[i].rcMonitor ); TRACE( "monitor 0x%x: %s work %s%s\n", i, wine_dbgstr_rect(&monitors[i].rcMonitor), wine_dbgstr_rect(&monitors[i].rcWork), @@ -373,7 +343,4 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.pFreeAdapters = xinerama_free_adapters; handler.pFreeMonitors = xinerama_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); - - TRACE( "virtual size: %s primary: %s\n", - wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); }

1 0

Jacek Caban : vbscript: Add Asc implementation.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: c9a606faf6d3950b0e300780485ee6a2b48e7936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9a606faf6d3950b0e300780… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 20:22:33 2019 +0200 vbscript: Add Asc implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 28 ++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 61df982..17759b8 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1371,8 +1371,32 @@ static HRESULT Global_ChrB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Asc(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR conv_str = NULL, str; + HRESULT hres = S_OK; + + TRACE("(%s)\n", debugstr_variant(arg)); + + switch(V_VT(arg)) { + case VT_NULL: + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + case VT_EMPTY: + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + case VT_BSTR: + str = V_BSTR(arg); + break; + default: + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + if(!SysStringLen(str) || *str >= 0x100) + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + else if(res) + hres = return_short(res, *str); + SysFreeString(conv_str); + return hres; } /* The function supports only single-byte and double-byte character sets. It diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index b252d58..cbffcf4 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1453,4 +1453,40 @@ Call testRGBError(&h4d&, -2, &h2f&, 5) Call ok(getVT(Timer) = "VT_R4", "getVT(Timer) = " & getVT(Timer)) +sub testAsc(arg, expected) + dim x + x = Asc(arg) + call ok(x = expected, "x = " & x & " expected " & expected) + call ok(getVT(x) = "VT_I2*", "getVT = " & getVT(x)) +end sub + +sub testAscError() + on error resume next + call Err.clear() + call Asc(null) + Call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Asc(empty) + Call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Asc() + Call ok(Err.number = 450, "Err.number = " & Err.number) + call Err.clear() + call Asc(Chr(260)) + Call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Asc("") + Call ok(Err.number = 5, "Err.number = " & Err.number) +end sub + +call testAsc("T", 84) +call testAsc("test", 116) +call testAsc("3", 51) +call testAsc(3, 51) +call testAsc(" ", 32) +call testAsc(Chr(255), 255) +call testAsc(Chr(0), 0) +if isEnglishLang then testAsc true, 84 +call testAscError() + Call reportSuccess()

1 0

Alexandre Julliard : vcomp: Add .seh annotations for x86_64.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 451c8592b97388d7f243f0f3b5c0861ae3121694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=451c8592b97388d7f243f0f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 11:28:32 2019 +0200 vcomp: Add .seh annotations for x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 288806b..fe87ca0 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -157,13 +157,18 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "pushq %rsi\n\t" + __ASM_SEH(".seh_pushreg %rsi\n\t") __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") "pushq %rdi\n\t" + __ASM_SEH(".seh_pushreg %rdi\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") "movq %rcx,%rax\n\t" "movq $4,%rcx\n\t"

1 0

Alexandre Julliard : rpcrt4: Add .seh annotations for x86_64.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 7592b406d2e1f426cbc65421fe4f0b4bd8da6a08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7592b406d2e1f426cbc65421… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 11:28:26 2019 +0200 rpcrt4: Add .seh annotations for x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cproxy.c | 16 +++++++++------- dlls/rpcrt4/ndr_stubless.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 36612be..3b94677 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -104,19 +104,21 @@ static inline void init_thunk( struct thunk *thunk, unsigned int index ) extern void call_stubless_func(void); __ASM_GLOBAL_FUNC(call_stubless_func, - "movq %rcx,0x8(%rsp)\n\t" - "movq %rdx,0x10(%rsp)\n\t" - "movq %r8,0x18(%rsp)\n\t" - "movq %r9,0x20(%rsp)\n\t" - "leaq 0x8(%rsp),%r8\n\t" /* &This */ + "subq $0x38,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x38\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x38\n\t") + "movq %rcx,0x40(%rsp)\n\t" + "movq %rdx,0x48(%rsp)\n\t" + "movq %r8,0x50(%rsp)\n\t" + "movq %r9,0x58(%rsp)\n\t" + "leaq 0x40(%rsp),%r8\n\t" /* &This */ "movq (%rcx),%rcx\n\t" /* This->lpVtbl */ "movq -0x10(%rcx),%rcx\n\t" /* MIDL_STUBLESS_PROXY_INFO */ "movq 0x10(%rcx),%rdx\n\t" /* info->FormatStringOffset */ "movzwq (%rdx,%r10,2),%rdx\n\t" /* FormatStringOffset[index] */ "addq 8(%rcx),%rdx\n\t" /* info->ProcFormatString + offset */ "movq (%rcx),%rcx\n\t" /* info->pStubDesc */ - "subq $0x38,%rsp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 0x38\n\t") "movq %xmm1,0x20(%rsp)\n\t" "movq %xmm2,0x28(%rsp)\n\t" "movq %xmm3,0x30(%rsp)\n\t" diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 287b0fa..b47ffa9 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1092,13 +1092,18 @@ __ASM_GLOBAL_FUNC(call_server_func, LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned int stack_size); __ASM_GLOBAL_FUNC( call_server_func, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "pushq %rsi\n\t" + __ASM_SEH(".seh_pushreg %rsi\n\t") __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") "pushq %rdi\n\t" + __ASM_SEH(".seh_pushreg %rdi\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") "movq %rcx,%rax\n\t" /* function to call */ "movq $32,%rcx\n\t" /* allocate max(32,stack_size) bytes of stack space */ @@ -1854,11 +1859,13 @@ cleanup: #ifdef __x86_64__ __ASM_GLOBAL_FUNC( NdrAsyncClientCall, - "movq %r8,0x18(%rsp)\n\t" - "movq %r9,0x20(%rsp)\n\t" - "leaq 0x18(%rsp),%r8\n\t" "subq $0x28,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x28\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "movq %r8,0x40(%rsp)\n\t" + "movq %r9,0x48(%rsp)\n\t" + "leaq 0x40(%rsp),%r8\n\t" "call " __ASM_NAME("ndr_async_client_call") "\n\t" "addq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")

1 0

Zebediah Figura : ntoskrnl.exe: Use a manual-reset event for remove locks.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 83493a72bc1bc36dd6776c0b45f51afdcc471ade URL: https://source.winehq.org/git/wine.git/?a=commit;h=83493a72bc1bc36dd6776c0b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 20 22:05:53 2019 -0500 ntoskrnl.exe: Use a manual-reset event for remove locks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 4ab8b49..7aed1d0 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1205,7 +1205,7 @@ void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag, TRACE("lock %p, tag %#x, max_minutes %u, max_count %u, size %u.\n", lock, tag, max_minutes, max_count, size); - KeInitializeEvent( &lock->Common.RemoveEvent, SynchronizationEvent, FALSE ); + KeInitializeEvent( &lock->Common.RemoveEvent, NotificationEvent, FALSE ); lock->Common.Removed = FALSE; lock->Common.IoCount = 0; }

1 0

Zebediah Figura : widl: Check for redefinition of named user types.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: a58e4cc07cfa3c521f1cb6708f48d2755f369938 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a58e4cc07cfa3c521f1cb670… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 20 22:28:24 2019 -0500 widl: Check for redefinition of named user types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index faa5820..524d005 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -285,6 +285,8 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined t->details.enumeration->enums = enums; t->defined = TRUE; } + else if (defined) + error_loc("redefinition of enum %s\n", name); return t; } @@ -311,6 +313,8 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va t->details.structure->fields = fields; t->defined = TRUE; } + else if (defined) + error_loc("redefinition of struct %s\n", name); return t; } @@ -336,6 +340,8 @@ type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t t->details.structure->fields = fields; t->defined = TRUE; } + else if (defined) + error_loc("redefinition of union %s\n", name); return t; } @@ -367,6 +373,8 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio t->details.structure->fields = append_var(t->details.structure->fields, union_field); t->defined = TRUE; } + else + error_loc("redefinition of union %s\n", name); return t; }

1 0

Zebediah Figura : httpapi/tests: Add tests for version 1 request queues.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 8a125eb000c21d80554722c9e0402177a2993131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a125eb000c21d80554722c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 20 22:05:18 2019 -0500 httpapi/tests: Add tests for version 1 request queues. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/Makefile.in | 2 +- dlls/httpapi/tests/httpapi.c | 852 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 834 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a125eb000c21d805547…

1 0

Alexandre Julliard : include: Add support for .seh asm annotations.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: f1bd0cadd10d25a793261318112503bf68c8506b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1bd0cadd10d25a793261318… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 10:40:24 2019 +0200 include: Add support for .seh asm annotations. Based on a patch by Rémi Bernon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index c1a6819..01dfdb1 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -39,6 +39,12 @@ # define __ASM_CFI(str) #endif +#ifdef __SEH__ +# define __ASM_SEH(str) str +#else +# define __ASM_SEH(str) +#endif + #ifdef _WIN32 # define __ASM_FUNC_TYPE(name) ".def " name "; .scl 2; .type 32; .endef" #elif defined(__APPLE__) @@ -51,12 +57,12 @@ #ifdef __GNUC__ # define __ASM_DEFINE_FUNC(name,code) \ - asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") ); + asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ + __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); #else # define __ASM_DEFINE_FUNC(name,code) void __asm_dummy_##__LINE__(void) { \ - asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") ); } + asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ + __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); } #endif #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code)

1 0