wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Rémi Bernon : dinput: Fix invalid use of post-incremented device_count value.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 50f889fd19d329bef7c001f9eafd1030fc1e3a56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50f889fd19d329bef7c001f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 22:31:44 2021 +0200 dinput: Fix invalid use of post-incremented device_count value. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index b385cc7503c..bc35d6d77b3 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -833,7 +833,8 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( if (enumSuccess == S_OK && should_enumerate_device(ptszUserName, dwFlags, &This->device_players, &didevi.guidInstance)) { - didevis = realloc( didevis, sizeof(DIDEVICEINSTANCEW) * device_count++ ); + device_count++; + didevis = realloc( didevis, sizeof(DIDEVICEINSTANCEW) * device_count ); didevis[device_count-1] = didevi; } }

1 0

Eric Pouech : winedbg: Use proper width when printing addresses with leading 0.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 01ddc2f8e4e9e11655d6752b829316c033298abb URL: https://source.winehq.org/git/wine.git/?a=commit;h=01ddc2f8e4e9e11655d6752b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 12 18:11:04 2021 +0200 winedbg: Use proper width when printing addresses with leading 0. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 16 ++++++++-------- programs/winedbg/symbol.c | 4 ++-- programs/winedbg/types.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 477438d83e3..b7f45086c5c 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -791,8 +791,8 @@ void info_win32_virtual(DWORD pid) type = ""; prot[0] = '\0'; } - dbg_printf("%08lx %08lx %s %s %s\n", - (DWORD_PTR)addr, (DWORD_PTR)addr + mbi.RegionSize - 1, state, type, prot); + dbg_printf("%0*lx %0*lx %s %s %s\n", + ADDRWIDTH, (DWORD_PTR)addr, ADDRWIDTH, (DWORD_PTR)addr + mbi.RegionSize - 1, state, type, prot); if (addr + mbi.RegionSize < addr) /* wrap around ? */ break; addr += mbi.RegionSize; @@ -893,10 +893,10 @@ void info_win32_exception(void) break; case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) - dbg_printf("page fault on %s access to 0x%08lx", + dbg_printf("page fault on %s access to 0x%0*lx", rec->ExceptionInformation[0] == EXCEPTION_WRITE_FAULT ? "write" : rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT ? "execute" : "read", - rec->ExceptionInformation[1]); + ADDRWIDTH, rec->ExceptionInformation[1]); else dbg_printf("page fault"); break; @@ -961,15 +961,15 @@ void info_win32_exception(void) break; case EXCEPTION_WINE_CXX_EXCEPTION: if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == EXCEPTION_WINE_CXX_FRAME_MAGIC) - dbg_printf("C++ exception(object = 0x%08lx, type = 0x%08lx)", - rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + dbg_printf("C++ exception(object = 0x%0*lx, type = 0x%0*lx)", + ADDRWIDTH, rec->ExceptionInformation[1], ADDRWIDTH, rec->ExceptionInformation[2]); else if(rec->NumberParameters == 4 && rec->ExceptionInformation[0] == EXCEPTION_WINE_CXX_FRAME_MAGIC) dbg_printf("C++ exception(object = %p, type = %p, base = %p)", (void*)rec->ExceptionInformation[1], (void*)rec->ExceptionInformation[2], (void*)rec->ExceptionInformation[3]); else - dbg_printf("C++ exception with strange parameter count %d or magic 0x%08lx", - rec->NumberParameters, rec->ExceptionInformation[0]); + dbg_printf("C++ exception with strange parameter count %d or magic 0x%0*lx", + rec->NumberParameters, ADDRWIDTH, rec->ExceptionInformation[0]); break; default: dbg_printf("0x%08x", rec->ExceptionCode); diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index b0ef59e49f0..7067b886f44 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -755,7 +755,7 @@ BOOL symbol_info_locals(void) addr.Mode = AddrModeFlat; addr.Offset = ihsf.InstructionOffset; print_address(&addr, FALSE); - dbg_printf(": (%08lx)\n", (DWORD_PTR)ihsf.FrameOffset); + dbg_printf(": (%0*lx)\n", ADDRWIDTH, (DWORD_PTR)ihsf.FrameOffset); SymEnumSymbols(dbg_curr_process->handle, 0, NULL, info_locals_cb, (void*)(DWORD_PTR)ihsf.FrameOffset); return TRUE; @@ -778,7 +778,7 @@ static BOOL CALLBACK symbols_info_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) mi.ModuleName[len - 5] = '\0'; } - dbg_printf("%08lx: %s!%s", (ULONG_PTR)sym->Address, mi.ModuleName, sym->Name); + dbg_printf("%0*lx: %s!%s", ADDRWIDTH, (ULONG_PTR)sym->Address, mi.ModuleName, sym->Name); type.id = sym->TypeIndex; type.module = sym->ModBase; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 1fd40932557..5751ce095cc 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -571,7 +571,7 @@ static BOOL CALLBACK print_types_cb(PSYMBOL_INFO sym, ULONG size, void* ctx) struct dbg_type type; type.module = sym->ModBase; type.id = sym->TypeIndex; - dbg_printf("Mod: %08lx ID: %08x\n", type.module, type.id); + dbg_printf("Mod: %0*lx ID: %08x\n", ADDRWIDTH, type.module, type.id); types_print_type(&type, TRUE); dbg_printf("\n"); return TRUE;

1 0

Eric Pouech : winedbg: Simplify some printing of addresses.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 3a869c1f9ba8a35eb0781fc5cb0b6684a9a7960b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a869c1f9ba8a35eb0781fc5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 12 18:10:58 2021 +0200 winedbg: Simplify some printing of addresses. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/db_disasm64.c | 5 +---- programs/winedbg/info.c | 2 +- programs/winedbg/memory.c | 6 ++---- programs/winedbg/stack.c | 6 +++--- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 07faed0d146..3c0d55ee218 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -1603,10 +1603,7 @@ db_disasm(db_addr_t loc, boolean_t altfmt) case Ilq: len = db_lengths[rex & REX_W ? QUAD : LONG]; get_value_inc(imm64, loc, len, FALSE); - if (imm64 >> 32) - db_printf("$0x%x%08x", (DWORD)(imm64 >> 32), (DWORD)imm64); - else - db_printf("$%#x", (DWORD)imm64); + db_printf("$%#I64x", imm64); break; case O: diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index dc0e6591f1f..477438d83e3 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -284,7 +284,7 @@ void info_win32_module(DWORD64 base) HeapFree(GetProcessHeap(), 0, im.modules); if (base && !num_printed) - dbg_printf("'0x%x%08x' is not a valid module address\n", (DWORD)(base >> 32), (DWORD)base); + dbg_printf("'0x%0*I64x' is not a valid module address\n", ADDRWIDTH, base); } struct class_walker diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 3d6534a973f..6cd90b236eb 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -336,10 +336,8 @@ static void dbg_print_hex(DWORD size, ULONGLONG sv) { if (!sv) dbg_printf("0"); - else if (size > 4 && (sv >> 32)) - dbg_printf("0x%x%08x", (DWORD)(sv >> 32), (DWORD)sv); else - dbg_printf("0x%x", (DWORD)sv); + dbg_printf("%#I64x", sv); } static void print_typed_basic(const struct dbg_lvalue* lvalue) @@ -595,7 +593,7 @@ void print_address(const ADDRESS64* addr, BOOLEAN with_line) si->MaxNameLen = 256; if (!SymFromAddr(dbg_curr_process->handle, (DWORD_PTR)lin, &disp64, si)) return; dbg_printf(" %s", si->Name); - if (disp64) dbg_printf("+0x%lx", (DWORD_PTR)disp64); + if (disp64) dbg_printf("+0x%I64x", disp64); if (with_line) { IMAGEHLP_LINE64 il; diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 1aa681bf7a6..396caf11edd 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -286,7 +286,7 @@ static void stack_print_addr_and_args(int nf) DWORD disp; dbg_printf(" %s", si->Name); - if (disp64) dbg_printf("+0x%lx", (DWORD_PTR)disp64); + if (disp64) dbg_printf("+0x%I64x", disp64); SymSetContext(dbg_curr_process->handle, &ihsf, NULL); se.first = TRUE; @@ -301,8 +301,8 @@ static void stack_print_addr_and_args(int nf) dbg_printf(" [%s:%u]", il.FileName, il.LineNumber); dbg_printf(" in %s", im.ModuleName); } - else dbg_printf(" in %s (+0x%lx)", - im.ModuleName, (DWORD_PTR)(ihsf.InstructionOffset - im.BaseOfImage)); + else dbg_printf(" in %s (+0x%I64x)", + im.ModuleName, ihsf.InstructionOffset - im.BaseOfImage); } /******************************************************************

1 0

Eric Pouech : winedbg: Use proper modifier when using sscanf for a DWORD_PTR.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: ad8b107441246b8bc9b8dd50ec3121cc00e60313 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8b107441246b8bc9b8dd50… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 12 18:10:52 2021 +0200 winedbg: Use proper modifier when using sscanf for a DWORD_PTR. Regression introduced in 0ea9fe999c1ed3a8b645476d97d2e0221be17bb5. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debug.l | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index b841048360f..875688f774f 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -154,11 +154,11 @@ STRING \"[^\n"]+\" "[" { return *yytext; } "]" { return *yytext; } -"0x"{HEXDIGIT}+ { sscanf(yytext, "%lx", &dbg_lval.integer); return tNUM; } -{DIGIT}+ { sscanf(yytext, "%ld", &dbg_lval.integer); return tNUM; } +"0x"{HEXDIGIT}+ { sscanf(yytext, "%Ix", &dbg_lval.integer); return tNUM; } +{DIGIT}+ { sscanf(yytext, "%Id", &dbg_lval.integer); return tNUM; } "'\\''" { dbg_lval.integer = '\''; return tNUM;} -"'\\0"{OCTDIGIT}*"'" { sscanf(yytext + 3, "%lo", &dbg_lval.integer); return tNUM;} -"'\\x"{HEXDIGIT}+"'" { sscanf(yytext + 3, "%lx", &dbg_lval.integer); return tNUM;} +"'\\0"{OCTDIGIT}*"'" { sscanf(yytext + 3, "%Io", &dbg_lval.integer); return tNUM;} +"'\\x"{HEXDIGIT}+"'" { sscanf(yytext + 3, "%Ix", &dbg_lval.integer); return tNUM;} "'\\"[a-z]"'" { dbg_lval.integer = yytext[2] - 'a'; return tNUM;} "'"."'" { dbg_lval.integer = yytext[1]; return tNUM;}

1 0

Eric Pouech : winedbg: Fix result type in expression's computation.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: e3fc699afa8a7712272a16d20ac5880db74b46be URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3fc699afa8a7712272a16d2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 12 18:10:45 2021 +0200 winedbg: Fix result type in expression's computation. All internal computation are made with DWORD_PTR and LONG_PTR, so use corresponding internal type for the result. Regression introduced in 0ea9fe999c1ed3a8b645476d97d2e0221be17bb5. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/expr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index e58d394be35..f03ab25c003 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -476,7 +476,7 @@ struct dbg_lvalue expr_eval(struct expr* exp) exp2 = expr_eval(exp->un.binop.exp2); if (exp1.type.id == dbg_itype_none || exp2.type.id == dbg_itype_none) RaiseException(DEBUG_STATUS_BAD_TYPE, 0, 0, NULL); - rtn.type.id = dbg_itype_signed_int; + rtn.type.id = dbg_itype_signed_long_int; rtn.type.module = 0; rtn.addr.Offset = (ULONG_PTR)&exp->un.binop.result; type1 = exp1.type; @@ -609,7 +609,7 @@ struct dbg_lvalue expr_eval(struct expr* exp) exp1 = expr_eval(exp->un.unop.exp1); if (exp1.type.id == dbg_itype_none) RaiseException(DEBUG_STATUS_BAD_TYPE, 0, 0, NULL); rtn.addr.Offset = (ULONG_PTR)&exp->un.unop.result; - rtn.type.id = dbg_itype_signed_int; + rtn.type.id = dbg_itype_signed_long_int; rtn.type.module = 0; switch (exp->un.unop.unop_type) {

1 0

Eric Pouech : winedbg: Properly print 64bit integers.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 22c1619409d87ed9e79a8e39a363b0e888efc13e URL: https://source.winehq.org/git/wine.git/?a=commit;h=22c1619409d87ed9e79a8e39… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 12 18:10:39 2021 +0200 winedbg: Properly print 64bit integers. Regression introduced in 0ea9fe999c1ed3a8b645476d97d2e0221be17bb5. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm64.c | 14 +++++++------- programs/winedbg/be_x86_64.c | 17 ++++++++--------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index d22f254013b..9ceb9291d54 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -80,19 +80,19 @@ static void be_arm64_print_context(HANDLE hThread, const dbg_ctx_t *ctx, int all if (!((ctx->ctx.Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) buf[i] = '-'; - dbg_printf(" Pc:%016lx Sp:%016lx Lr:%016lx Cpsr:%08x(%s)\n", + dbg_printf(" Pc:%016I64x Sp:%016I64x Lr:%016I64x Cpsr:%08x(%s)\n", ctx->ctx.Pc, ctx->ctx.Sp, ctx->ctx.u.s.Lr, ctx->ctx.Cpsr, buf); - dbg_printf(" x0: %016lx x1: %016lx x2: %016lx x3: %016lx x4: %016lx\n", + dbg_printf(" x0: %016I64x x1: %016I64x x2: %016I64x x3: %016I64x x4: %016I64x\n", ctx->ctx.u.s.X0, ctx->ctx.u.s.X1, ctx->ctx.u.s.X2, ctx->ctx.u.s.X3, ctx->ctx.u.s.X4); - dbg_printf(" x5: %016lx x6: %016lx x7: %016lx x8: %016lx x9: %016lx\n", + dbg_printf(" x5: %016I64x x6: %016I64x x7: %016I64x x8: %016I64x x9: %016I64x\n", ctx->ctx.u.s.X5, ctx->ctx.u.s.X6, ctx->ctx.u.s.X7, ctx->ctx.u.s.X8, ctx->ctx.u.s.X9); - dbg_printf(" x10:%016lx x11:%016lx x12:%016lx x13:%016lx x14:%016lx\n", + dbg_printf(" x10:%016I64x x11:%016I64x x12:%016I64x x13:%016I64x x14:%016I64x\n", ctx->ctx.u.s.X10, ctx->ctx.u.s.X11, ctx->ctx.u.s.X12, ctx->ctx.u.s.X13, ctx->ctx.u.s.X14); - dbg_printf(" x15:%016lx ip0:%016lx ip1:%016lx x18:%016lx x19:%016lx\n", + dbg_printf(" x15:%016I64x ip0:%016I64x ip1:%016I64x x18:%016I64x x19:%016I64x\n", ctx->ctx.u.s.X15, ctx->ctx.u.s.X16, ctx->ctx.u.s.X17, ctx->ctx.u.s.X18, ctx->ctx.u.s.X19); - dbg_printf(" x20:%016lx x21:%016lx x22:%016lx x23:%016lx x24:%016lx\n", + dbg_printf(" x20:%016I64x x21:%016I64x x22:%016I64x x23:%016I64x x24:%016I64x\n", ctx->ctx.u.s.X20, ctx->ctx.u.s.X21, ctx->ctx.u.s.X22, ctx->ctx.u.s.X23, ctx->ctx.u.s.X24); - dbg_printf(" x25:%016lx x26:%016lx x27:%016lx x28:%016lx Fp:%016lx\n", + dbg_printf(" x25:%016I64x x26:%016I64x x27:%016I64x x28:%016I64x Fp:%016I64x\n", ctx->ctx.u.s.X25, ctx->ctx.u.s.X26, ctx->ctx.u.s.X27, ctx->ctx.u.s.X28, ctx->ctx.u.s.Fp); if (all_regs) dbg_printf( "Floating point ARM64 dump not implemented\n" ); diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 74481645081..c2839cf4097 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -89,13 +89,13 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, buf[i] = ' '; dbg_printf("Register dump:\n"); - dbg_printf(" rip:%016lx rsp:%016lx rbp:%016lx eflags:%08x (%s)\n", + dbg_printf(" rip:%016I64x rsp:%016I64x rbp:%016I64x eflags:%08x (%s)\n", ctx->Rip, ctx->Rsp, ctx->Rbp, ctx->EFlags, buf); - dbg_printf(" rax:%016lx rbx:%016lx rcx:%016lx rdx:%016lx\n", + dbg_printf(" rax:%016I64x rbx:%016I64x rcx:%016I64x rdx:%016I64x\n", ctx->Rax, ctx->Rbx, ctx->Rcx, ctx->Rdx); - dbg_printf(" rsi:%016lx rdi:%016lx r8:%016lx r9:%016lx r10:%016lx\n", + dbg_printf(" rsi:%016I64x rdi:%016I64x r8:%016I64x r9:%016I64x r10:%016I64x\n", ctx->Rsi, ctx->Rdi, ctx->R8, ctx->R9, ctx->R10 ); - dbg_printf(" r11:%016lx r12:%016lx r13:%016lx r14:%016lx r15:%016lx\n", + dbg_printf(" r11:%016I64x r12:%016I64x r13:%016I64x r14:%016I64x r15:%016I64x\n", ctx->R11, ctx->R12, ctx->R13, ctx->R14, ctx->R15 ); if (!all_regs) return; @@ -104,9 +104,9 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, ctx->SegCs, ctx->SegDs, ctx->SegEs, ctx->SegFs, ctx->SegGs, ctx->SegSs ); dbg_printf("Debug:\n"); - dbg_printf(" dr0:%016lx dr1:%016lx dr2:%016lx dr3:%016lx\n", + dbg_printf(" dr0:%016I64x dr1:%016I64x dr2:%016I64x dr3:%016I64x\n", ctx->Dr0, ctx->Dr1, ctx->Dr2, ctx->Dr3 ); - dbg_printf(" dr6:%016lx dr7:%016lx\n", ctx->Dr6, ctx->Dr7 ); + dbg_printf(" dr6:%016I64x dr7:%016I64x\n", ctx->Dr6, ctx->Dr7 ); dbg_printf("Floating point:\n"); dbg_printf(" flcw:%04x ", LOWORD(ctx->u.FltSave.ControlWord)); @@ -150,8 +150,7 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, { M128A reg = ctx->u.FltSave.FloatRegisters[i]; if (i == 4) dbg_printf("\n"); - dbg_printf(" ST%u:%08x%08x%08x%08x ", i, - (DWORD)(reg.High >> 32), (DWORD)reg.High, (DWORD)(reg.Low >> 32), (DWORD)reg.Low ); + dbg_printf(" ST%u:%016I64x%16I64x ", i, reg.High, reg.Low ); } dbg_printf("\n"); @@ -162,7 +161,7 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, for (i = 0; i < 16; i++) { - dbg_printf( " %sxmm%u: uint=%016lx%016lx", (i > 9) ? "" : " ", i, + dbg_printf( " %sxmm%u: uint=%016I64x%016I64x", (i > 9) ? "" : " ", i, ctx->u.FltSave.XmmRegisters[i].High, ctx->u.FltSave.XmmRegisters[i].Low ); dbg_printf( " double={%g; %g}", *(double *)&ctx->u.FltSave.XmmRegisters[i].Low, *(double *)&ctx->u.FltSave.XmmRegisters[i].High );

1 0

Gabriel Ivăncescu : mshtml/tests: Add tests for mimeTypes and plugins objects' names.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 671fe6f62a7ece621a239a93e03fdf4698174d2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=671fe6f62a7ece621a239a93… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 8 20:30:55 2021 +0300 mshtml/tests: Add tests for mimeTypes and plugins objects' names. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 7f7fe879662..3307f2c1848 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -216,10 +216,12 @@ sync_test("builtin_toString", function() { test("implementation", document.implementation, "DOMImplementation"); if(localStorage) test("localStorage", localStorage, "Storage"); test("location", window.location, "Object", window.location.href); + if(v >= 11 /* todo_wine */) test("mimeTypes", window.navigator.mimeTypes, v < 11 ? "MSMimeTypesCollection" : "MimeTypeArray"); test("navigator", window.navigator, "Navigator"); test("performance", window.performance, "Performance"); test("performanceNavigation", window.performance.navigation, "PerformanceNavigation"); test("performanceTiming", window.performance.timing, "PerformanceTiming"); + if(v >= 11 /* todo_wine */) test("plugins", window.navigator.plugins, v < 11 ? "MSPluginsCollection" : "PluginArray"); test("screen", window.screen, "Screen"); test("sessionStorage", window.sessionStorage, "Storage"); test("style", document.body.style, "MSStyleCSSProperties");

1 0

Gabriel Ivăncescu : mshtml: Implement HTMLDocument's toString using dispex_to_string.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 6f78047199ca709724427e4a68d715ae01965da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f78047199ca709724427e4a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 8 20:30:54 2021 +0300 mshtml: Implement HTMLDocument's toString using dispex_to_string. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 7 +------ dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 12fce6d3015..d2caaef2741 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1703,12 +1703,7 @@ static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String) TRACE("(%p)->(%p)\n", This, String); - if(!String) - return E_INVALIDARG; - - *String = SysAllocString(L"[object]"); - return *String ? S_OK : E_OUTOFMEMORY; - + return dispex_to_string(&This->doc_node->node.event_target.dispex, String); } static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR bstrHref, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 2c11744c848..7f7fe879662 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -210,6 +210,7 @@ sync_test("builtin_toString", function() { if(clientRects) test("clientRect", clientRects[0], "ClientRect"); if(clientRects) test("clientRects", clientRects, "ClientRectList"); if(currentStyle) test("currentStyle", currentStyle, "MSCurrentStyleCSSProperties"); + if(v >= 11 /* todo_wine */) test("document", document, v < 11 ? "Document" : "HTMLDocument"); test("elements", document.getElementsByTagName("body"), "HTMLCollection"); test("history", window.history, "History"); test("implementation", document.implementation, "DOMImplementation");

1 0

Jacek Caban : win32u/tests: Add NtUserCloseWindowStation test.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: c05704c7130370c54b85c1c387a6da30bc16c7eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c05704c7130370c54b85c1c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 15:33:30 2021 +0200 win32u/tests: Add NtUserCloseWindowStation test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/win32u/tests/Makefile.in | 5 +++++ dlls/win32u/tests/win32u.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/configure b/configure index 7f863aa38c0..d9dfe3e9c89 100755 --- a/configure +++ b/configure @@ -20773,6 +20773,7 @@ wine_fn_config_makefile dlls/wiaservc/tests enable_tests wine_fn_config_makefile dlls/wimgapi enable_wimgapi wine_fn_config_makefile dlls/win32s16.dll16 enable_win16 wine_fn_config_makefile dlls/win32u enable_win32u +wine_fn_config_makefile dlls/win32u/tests enable_tests wine_fn_config_makefile dlls/win87em.dll16 enable_win16 wine_fn_config_makefile dlls/winaspi.dll16 enable_win16 wine_fn_config_makefile dlls/windebug.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 1821feefa49..44f8a1e2af6 100644 --- a/configure.ac +++ b/configure.ac @@ -3659,6 +3659,7 @@ WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests) WINE_CONFIG_MAKEFILE(dlls/wimgapi) WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/win32u) +WINE_CONFIG_MAKEFILE(dlls/win32u/tests) WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) diff --git a/dlls/win32u/tests/Makefile.in b/dlls/win32u/tests/Makefile.in new file mode 100644 index 00000000000..c0fa70e4e08 --- /dev/null +++ b/dlls/win32u/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = win32u.dll +IMPORTS = user32 win32u + +C_SRCS = \ + win32u.c diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c new file mode 100644 index 00000000000..2f5014b80b4 --- /dev/null +++ b/dlls/win32u/tests/win32u.c @@ -0,0 +1,42 @@ +/* + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" + +#include "winbase.h" +#include "ntuser.h" + + +static void test_NtUserCloseWindowStation(void) +{ + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = NtUserCloseWindowStation( 0 ); + ok( !ret && GetLastError() == ERROR_INVALID_HANDLE, + "NtUserCloseWindowStation returned %x %u\n", ret, GetLastError() ); +} + + +START_TEST(win32u) +{ + /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ + GetDesktopWindow(); + + test_NtUserCloseWindowStation(); +}

1 0

Jacek Caban : win32u: Move NtUserCloseWindowStation from user32.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: d7ae3591ec29a86b263f376c05311edd48a5d812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7ae3591ec29a86b263f376c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 16:42:35 2021 +0200 win32u: Move NtUserCloseWindowStation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/winstation.c | 16 ---------------- dlls/win32u/Makefile.in | 1 + dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/Makefile.in | 3 ++- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 35 +++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/ntuser.h | 27 +++++++++++++++++++++++++++ 13 files changed, 119 insertions(+), 22 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 6f0f58a5f3f..7e6b660b8af 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4335,7 +4335,7 @@ static BOOL CALLBACK bcast_winsta( LPWSTR winsta, LPARAM lp ) return TRUE; ((BroadcastParm *)lp)->winsta = hwinsta; ret = EnumDesktopsW( hwinsta, bcast_desktop, lp ); - CloseWindowStation( hwinsta ); + NtUserCloseWindowStation( hwinsta ); TRACE("-->%d\n", ret); return ret; } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8d5f1bc4145..21b45c911d1 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -77,7 +77,7 @@ @ stdcall CloseDesktop(long) @ stdcall CloseTouchInputHandle(long) @ stdcall CloseWindow(long) -@ stdcall CloseWindowStation(long) +@ stdcall CloseWindowStation(long) NtUserCloseWindowStation @ stdcall CopyAcceleratorTableA(long ptr long) @ stdcall CopyAcceleratorTableW(long ptr long) @ stdcall CopyIcon(long) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 0be02919bbe..5c01006565c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -25,7 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winuser.h" +#include "ntuser.h" #include "winreg.h" #include "winternl.h" #include "hidusage.h" diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 95a9eb85099..057f0d75cb8 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -203,22 +203,6 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces } -/*********************************************************************** - * CloseWindowStation (USER32.@) - */ -BOOL WINAPI CloseWindowStation( HWINSTA handle ) -{ - BOOL ret; - SERVER_START_REQ( close_winstation ) - { - req->handle = wine_server_obj_handle( handle ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} - - /****************************************************************************** * GetProcessWindowStation (USER32.@) */ diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 38109f8bc11..feb1e6a3eb2 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -37,6 +37,7 @@ C_SRCS = \ syscall.c \ vertical.c \ vulkan.c \ + winstation.c \ wrappers.c font_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\" diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index eaff8cb639a..596ec6bbba3 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winnt.h" #include "ntgdi_private.h" +#include "ntuser.h" #include "wine/unixlib.h" @@ -93,6 +94,7 @@ static void * const syscalls[] = NtGdiSetVirtualResolution, NtGdiSwapBuffers, NtGdiTransformPoints, + NtUserCloseWindowStation, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 396b67ede5a..92f9a143800 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -795,7 +795,7 @@ @ stub NtUserClipCursor @ stub NtUserCloseClipboard @ stub NtUserCloseDesktop -@ stub NtUserCloseWindowStation +@ stdcall -syscall NtUserCloseWindowStation(long) @ stub NtUserCompositionInputSinkLuidFromPoint @ stub NtUserCompositionInputSinkViewInstanceIdFromPoint @ stub NtUserConfigureActivationObject diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c new file mode 100644 index 00000000000..f50464f856d --- /dev/null +++ b/dlls/win32u/winstation.c @@ -0,0 +1,45 @@ +/* + * Window stations and desktops + * + * Copyright 2002 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "ntuser.h" +#include "winternl.h" +#include "wine/server.h" + +/*********************************************************************** + * NtUserCloseWindowStation (win32u.@) + */ +BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ) +{ + BOOL ret; + SERVER_START_REQ( close_winstation ) + { + req->handle = wine_server_obj_handle( handle ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/wow64win/Makefile.in b/dlls/wow64win/Makefile.in index 9445182af5c..99301c4edf1 100644 --- a/dlls/wow64win/Makefile.in +++ b/dlls/wow64win/Makefile.in @@ -5,4 +5,5 @@ EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f200000 C_SRCS = \ gdi.c \ - syscall.c + syscall.c \ + user.c diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 880c840ea02..276c83474fe 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -80,6 +80,7 @@ SYSCALL_ENTRY( NtGdiSetTextJustification ) \ SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \ SYSCALL_ENTRY( NtGdiSwapBuffers ) \ - SYSCALL_ENTRY( NtGdiTransformPoints ) + SYSCALL_ENTRY( NtGdiTransformPoints ) \ + SYSCALL_ENTRY( NtUserCloseWindowStation ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c new file mode 100644 index 00000000000..7370a3d4940 --- /dev/null +++ b/dlls/wow64win/user.c @@ -0,0 +1,35 @@ +/* + * WoW64 User functions + * + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "ntuser.h" +#include "wow64win_private.h" + +NTSTATUS WINAPI wow64_NtUserCloseWindowStation( UINT *args ) +{ + HWINSTA handle = get_handle( &args ); + + return NtUserCloseWindowStation( handle ); +} diff --git a/include/Makefile.in b/include/Makefile.in index eac1c2e0570..ef4a6d55558 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -551,6 +551,7 @@ SOURCES = \ ntsecapi.h \ ntsecpkg.h \ ntstatus.h \ + ntuser.h \ oaidl.idl \ objbase.h \ objectarray.idl \ diff --git a/include/ntuser.h b/include/ntuser.h new file mode 100644 index 00000000000..8b09f732ecd --- /dev/null +++ b/include/ntuser.h @@ -0,0 +1,27 @@ +/* + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NTUSER_ +#define _NTUSER_ + +#include <winuser.h> +#include <winternl.h> + +BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); + +#endif /* _NTUSER_ */

1 0

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 October 2021