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

Jacek Caban : vbscript: Rename OP_long expression to OP_int.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: 9b18772c0b8de4b14a165d254551dbdbcfd0f1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b18772c0b8de4b14a165d25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 19:31:49 2019 +0200 vbscript: Rename OP_long expression to OP_int. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 6 +++--- dlls/vbscript/interp.c | 2 +- dlls/vbscript/lex.c | 4 ++-- dlls/vbscript/parse.h | 2 +- dlls/vbscript/parser.y | 10 +++++----- dlls/vbscript/vbscript.h | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 6fe01ab..1f4a7d3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -536,8 +536,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); case EXPR_SUB: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); - case EXPR_ULONG: - return push_instr_int(ctx, OP_long, ((int_expression_t*)expr)->value); + case EXPR_INT: + return push_instr_int(ctx, OP_int, ((int_expression_t*)expr)->value); case EXPR_XOR: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); default: @@ -779,7 +779,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(!push_instr(ctx, OP_val)) return E_OUTOFMEMORY; }else { - hres = push_instr_int(ctx, OP_long, 1); + hres = push_instr_int(ctx, OP_int, 1); if(FAILED(hres)) return hres; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d9bf79a..629e833 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1315,7 +1315,7 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } -static HRESULT interp_long(exec_ctx_t *ctx) +static HRESULT interp_int(exec_ctx_t *ctx) { const LONG arg = ctx->instr->arg1.lng; VARIANT v; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 5c7ed25..c628934 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -335,7 +335,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) if(use_int && (LONG)d == d) { *(LONG*)ret = d; - return tLong; + return tInt; } r = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); @@ -376,7 +376,7 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) ctx->ptr++; *ret = l; - return tLong; + return tInt; } static void skip_spaces(parser_ctx_t *ctx) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 39ebf3b..867d45f 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -32,6 +32,7 @@ typedef enum { EXPR_GTEQ, EXPR_IDIV, EXPR_IMP, + EXPR_INT, EXPR_IS, EXPR_LT, EXPR_LTEQ, @@ -49,7 +50,6 @@ typedef enum { EXPR_OR, EXPR_STRING, EXPR_SUB, - EXPR_ULONG, EXPR_XOR } expression_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8add9c9..4c8c6e3 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -97,7 +97,7 @@ static statement_t *link_statements(statement_t*,statement_t*); const_decl_t *const_decl; case_clausule_t *case_clausule; unsigned uint; - LONG lng; + LONG integer; BOOL boolean; double dbl; } @@ -119,7 +119,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <string> tNEXT tON tRESUME tGOTO %token <string> tIdentifier tString %token <string> tDEFAULT tERROR tEXPLICIT tPROPERTY tSTEP -%token <lng> tLong +%token <integer> tInt %token <dbl> tDouble %type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt @@ -381,13 +381,13 @@ LiteralExpression | tNOTHING { $$ = new_expression(ctx, EXPR_NOTHING, 0); CHECK_ERROR; } NumericLiteralExpression - : '0' { $$ = new_long_expression(ctx, EXPR_ULONG, 0); CHECK_ERROR; } - | tLong { $$ = new_long_expression(ctx, EXPR_ULONG, $1); CHECK_ERROR; } + : '0' { $$ = new_long_expression(ctx, EXPR_INT, 0); CHECK_ERROR; } + | tInt { $$ = new_long_expression(ctx, EXPR_INT, $1); CHECK_ERROR; } | tDouble { $$ = new_double_expression(ctx, $1); CHECK_ERROR; } IntegerValue : '0' { $$ = 0; } - | tLong { $$ = $1; } + | tInt { $$ = $1; } PrimaryExpression : '(' Expression ')' { $$ = new_unary_expression(ctx, EXPR_BRACKETS, $2); } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 0d8b0ed..2d78d5a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -248,11 +248,11 @@ typedef enum { X(idiv, 1, 0, 0) \ X(imp, 1, 0, 0) \ X(incc, 1, ARG_BSTR, 0) \ + X(int, 1, ARG_INT, 0) \ X(is, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(jmp_true, 0, ARG_ADDR, 0) \ - X(long, 1, ARG_INT, 0) \ X(lt, 1, 0, 0) \ X(lteq, 1, 0, 0) \ X(mcall, 1, ARG_BSTR, ARG_UINT) \

1 0

Jacek Caban : vbscript: Support unary + expressions.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: 17c5a25091dba697fff2b02e1ac34c48124c8485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c5a25091dba697fff2b02e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 19:31:55 2019 +0200 vbscript: Support unary + expressions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4c8c6e3..11a8f9d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -366,6 +366,7 @@ UnaryExpression | CallExpression { $$ = $1; } | tNEW Identifier { $$ = new_new_expression(ctx, $2); CHECK_ERROR; } | '-' UnaryExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } + | '+' UnaryExpression { $$ = $2; } CallExpression : PrimaryExpression { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index afd7c24..49c673a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1093,6 +1093,14 @@ Call ok(getVT(cs) = "VT_BSTR", "getVT(cs) = " & getVT(cs)) Call ok(isNull(cnull), "cnull = " & cnull) Call ok(getVT(cnull) = "VT_NULL", "getVT(cnull) = " & getVT(cnull)) +Call ok(+1 = 1, "+1 != 1") +Call ok(+true = true, "+1 != 1") +Call ok(getVT(+true) = "VT_BOOL", "getVT(+true) = " & getVT(+true)) +Call ok(+"true" = "true", """+true"" != true") +Call ok(getVT(+"true") = "VT_BSTR", "getVT(+""true"") = " & getVT(+"true")) +Call ok(+obj is obj, "+obj != obj") +Call ok(+--+-+1 = -1, "+--+-+1 != -1") + if false then Const conststr = "str" Call ok(conststr = "str", "conststr = " & conststr) Call ok(getVT(conststr) = "VT_BSTR", "getVT(conststr) = " & getVT(conststr))

1 0

Jacek Caban : vbscript: Fix handling null argument in CStr.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: fb5b0c64639c056d55e14011a3b4e6f2d83e7cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5b0c64639c056d55e14011… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 20:22:46 2019 +0200 vbscript: Fix handling null argument in CStr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/api.vbs | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 17759b8..0797403 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -528,6 +528,9 @@ static HRESULT Global_CStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI TRACE("%s\n", debugstr_variant(arg)); + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_string(arg, &str); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index cbffcf4..93cf7f8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -129,6 +129,14 @@ TestCStr 3, "3" if isEnglishLang then TestCStr 3.5, "3.5" if isEnglishLang then TestCStr true, "True" +sub testCStrError() + on error resume next + Error.clear() + CStr(null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call testCStrError() + Call ok(getVT(Chr(120)) = "VT_BSTR", "getVT(Chr(120)) = " & getVT(Chr(120))) Call ok(getVT(Chr(255)) = "VT_BSTR", "getVT(Chr(255)) = " & getVT(Chr(255))) Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120))

1 0

Alexandre Julliard : vcomp: Add .seh annotations for x86_64.
by Alexandre Julliard 21 Aug '19

21 Aug '19

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 : msvcrt: Simplify stack layout in __crtCapturePreviousContext().
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: ed6aa17d9880f5c5e1fe47fe725bfe96d4ed681f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed6aa17d9880f5c5e1fe47fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 13:54:46 2019 +0200 msvcrt: Simplify stack layout in __crtCapturePreviousContext(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 1aa04ab..09eddfb 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -732,9 +732,6 @@ void __cdecl get_prev_context(CONTEXT *ctx, DWORD64 rip) TRACE("(%p)\n", ctx); - ctx->Rip = rip; - ctx->Rsp += 3*8; /* Rip, Rcx, return address */ - rf = RtlLookupFunctionEntry(ctx->Rip, &image_base, NULL); if(!rf) { FIXME("RtlLookupFunctionEntry failed\n"); @@ -746,16 +743,14 @@ void __cdecl get_prev_context(CONTEXT *ctx, DWORD64 rip) } __ASM_GLOBAL_FUNC( __crtCapturePreviousContext, - "pushq (%rsp)\n\t" /* save Rip */ - __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") - "pushq %rcx\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") - "call " __ASM_NAME("RtlCaptureContext") "\n\t" - "popq %rcx\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") - "popq %rdx\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") - "jmp " __ASM_NAME("get_prev_context") ); + "movq %rcx,8(%rsp)\n\t" + "call " __ASM_NAME("RtlCaptureContext") "\n\t" + "movq 8(%rsp),%rcx\n\t" /* context */ + "leaq 8(%rsp),%rax\n\t" + "movq %rax,0x98(%rcx)\n\t" /* context->Rsp */ + "movq (%rsp),%rax\n\t" + "movq %rax,0xf8(%rcx)\n\t" /* context->Rip */ + "jmp " __ASM_NAME("get_prev_context") ) #endif #endif /* __x86_64__ */

1 0

Zhiyi Zhang : user32: Wait for graphics driver to be ready in EnumDisplayDevicesW.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 8f45d9a991cbc739fafde55811524eaf742282b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f45d9a991cbc739fafde558… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 14 16:21:06 2019 +0800 user32: Wait for graphics driver to be ready in EnumDisplayDevicesW. It's possible that EnumDisplayDevicesW gets called before graphics driver is loaded. 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/user32/sysparams.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index cdeea65..09cebc2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -736,6 +736,18 @@ static void release_display_device_init_mutex( HANDLE mutex ) CloseHandle( mutex ); } +/* Wait until graphics driver is loaded by explorer */ +static void wait_graphics_driver_ready(void) +{ + static BOOL ready = FALSE; + + if (!ready) + { + SendMessageW( GetDesktopWindow(), WM_NULL, 0, 0 ); + ready = TRUE; + } +} + /* map value from system dpi to standard 96 dpi for storing in the registry */ static int map_from_system_dpi( int val ) { @@ -4048,6 +4060,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i TRACE("%s %d %p %#x\n", debugstr_w( device ), index, info, flags); + wait_graphics_driver_ready(); mutex = get_display_device_init_mutex(); /* Find adapter */

1 0

Zhiyi Zhang : winex11.drv: Add xrandr_get_screen_resources() helper.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 95a0a5c755cecdedd111c57f128a0150280316f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a0a5c755cecdedd111c57f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 14 16:22:01 2019 +0800 winex11.drv: Add xrandr_get_screen_resources() helper. Getting screen resources will be used in multiple places. So put it in a function. 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/xrandr.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 9f63310..288b83f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -274,6 +274,20 @@ static void xrandr10_init_modes(void) #ifdef HAVE_XRRGETSCREENRESOURCES +static XRRScreenResources *xrandr_get_screen_resources(void) +{ + XRRScreenResources *resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ); + if (resources && !resources->ncrtc) + { + pXRRFreeScreenResources( resources ); + resources = pXRRGetScreenResources( gdi_display, root_window ); + } + + if (!resources) + ERR("Failed to get screen resources.\n"); + return resources; +} + static int xrandr12_get_current_mode(void) { XRRScreenResources *resources; @@ -448,21 +462,8 @@ static int xrandr12_init_modes(void) int ret = -1; int i, j; - if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) - { - ERR("Failed to get screen resources.\n"); + if (!(resources = xrandr_get_screen_resources())) return ret; - } - - if (!resources->ncrtc) - { - pXRRFreeScreenResources( resources ); - if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) - { - ERR("Failed to get screen resources.\n"); - return ret; - } - } if (!(crtc_info = xrandr12_get_primary_crtc_info( resources, &primary_crtc ))) {

1 0

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

21 Aug '19

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 : jscript: Support enumerating own properties.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 9b4267b04d4f84042931c0cfb7c848fd22a6dbc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b4267b04d4f84042931c0cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:31:08 2019 +0200 jscript: Support enumerating own properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 54 +++++++++++++++++++++++++++++--------------------- dlls/jscript/jscript.h | 1 + 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b1f2914..da23d18 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -870,34 +870,14 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { jsdisp_t *This = impl_from_IDispatchEx(iface); - dispex_prop_t *iter; HRESULT hres; TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); - if(id == DISPID_STARTENUM) { - hres = fill_protrefs(This); - if(FAILED(hres)) - return hres; - } - - if(id+1>=0 && id+1<This->prop_cnt) { - iter = &This->props[id+1]; - }else { + hres = jsdisp_next_prop(This, id, FALSE, pid); + if(hres == S_FALSE) *pid = DISPID_STARTENUM; - return S_FALSE; - } - - while(iter < This->props + This->prop_cnt) { - if(iter->name && (get_flags(This, iter) & PROPF_ENUMERABLE) && iter->type!=PROP_DELETED) { - *pid = prop_to_id(This, iter); - return S_OK; - } - iter++; - } - - *pid = DISPID_STARTENUM; - return S_FALSE; + return hres; } static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) @@ -1563,6 +1543,34 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) return S_OK; } +HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, BOOL own_only, DISPID *ret) +{ + dispex_prop_t *iter; + HRESULT hres; + + if(id == DISPID_STARTENUM && !own_only) { + hres = fill_protrefs(obj); + if(FAILED(hres)) + return hres; + } + + if(id + 1 < 0 || id+1 >= obj->prop_cnt) + return S_FALSE; + + for(iter = &obj->props[id + 1]; iter < obj->props + obj->prop_cnt; iter++) { + if(!iter->name || iter->type == PROP_DELETED) + continue; + if(own_only && iter->type == PROP_PROTREF) + continue; + if(!(get_flags(obj, iter) & PROPF_ENUMERABLE)) + continue; + *ret = prop_to_id(obj, iter); + return S_OK; + } + + return S_FALSE; +} + HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL *ret) { IDispatchEx *dispex; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 1fbd957..2dd73d6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -297,6 +297,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; +HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Add Object.defineProperties implementation.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 34d4a9c75188093675b97bc142f2ff6e6489a268 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d4a9c75188093675b97bc1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:31:18 2019 +0200 jscript: Add Object.defineProperties implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 619356b..7794f1d 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -409,6 +409,57 @@ static HRESULT to_property_descriptor(script_ctx_t *ctx, jsdisp_t *attr_obj, pro return hres; } +static HRESULT jsdisp_define_properties(script_ctx_t *ctx, jsdisp_t *obj, jsval_t list_val) +{ + DISPID id = DISPID_STARTENUM; + property_desc_t prop_desc; + IDispatch *list_disp; + jsdisp_t *list_obj, *desc_obj; + jsval_t desc_val; + BSTR name; + HRESULT hres; + + hres = to_object(ctx, list_val, &list_disp); + if(FAILED(hres)) + return hres; + + if(!(list_obj = to_jsdisp(list_disp))) { + FIXME("non-JS list obj\n"); + IDispatch_Release(list_disp); + return E_NOTIMPL; + } + + while(1) { + hres = jsdisp_next_prop(list_obj, id, TRUE, &id); + if(hres != S_OK) + break; + + hres = jsdisp_propget(list_obj, id, &desc_val); + if(FAILED(hres)) + break; + + if(!is_object_instance(desc_val) || !get_object(desc_val) || !(desc_obj = to_jsdisp(get_object(desc_val)))) { + jsval_release(desc_val); + break; + } + + hres = to_property_descriptor(ctx, desc_obj, &prop_desc); + jsdisp_release(desc_obj); + if(FAILED(hres)) + break; + + hres = IDispatchEx_GetMemberName(&list_obj->IDispatchEx_iface, id, &name); + if(SUCCEEDED(hres)) + hres = jsdisp_define_property(obj, name, &prop_desc); + release_property_descriptor(&prop_desc); + if(FAILED(hres)) + break; + } + + jsdisp_release(list_obj); + return FAILED(hres) ? hres : S_OK; +} + static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -455,8 +506,20 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl static HRESULT Object_defineProperties(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsdisp_t *obj; + HRESULT hres; + + if(argc < 1 || !is_object_instance(argv[0]) || !get_object(argv[0]) || !(obj = to_jsdisp(get_object(argv[0])))) { + FIXME("not an object\n"); + return E_NOTIMPL; + } + + TRACE("%p\n", obj); + + hres = jsdisp_define_properties(ctx, obj, argc >= 2 ? argv[1] : jsval_undefined()); + if(SUCCEEDED(hres) && r) + *r = jsval_obj(jsdisp_addref(obj)); + return hres; } static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,

1 0