wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Michael Müller : bcrypt/tests: Add tests for AES GCM mode.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 3fe621b6e54b68383c5c71a0409143e657a0899f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fe621b6e54b68383c5c71a0… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Mar 19 11:16:08 2018 +0000 bcrypt/tests: Add tests for AES GCM mode. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 155 ++++++++++++++++++++++++++++++++++++++++++++- include/bcrypt.h | 24 ++++++- 2 files changed, 177 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3fe621b6e54b68383c5c…

1 0

Martin Storsjo : ntdll: Update the ARM64 CONTEXT struct to match Win SDK 10.0.16299.0.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: e0780c258f905ed28269e3223593752d3b25ffa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0780c258f905ed28269e322… Author: Martin Storsjo <martin(a)martin.st> Date: Sun Mar 18 21:11:18 2018 +0200 ntdll: Update the ARM64 CONTEXT struct to match Win SDK 10.0.16299.0. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_arm64.c | 14 +++++++------- dlls/ntdll/signal_arm64.c | 20 ++++++++++---------- include/winnt.h | 6 +++--- programs/winedbg/be_arm64.c | 10 +++++----- programs/winedbg/gdbproxy.c | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index dd2ccfb..dea19f8 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -41,7 +41,7 @@ static BOOL arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, #ifdef __aarch64__ case cpu_addr_pc: addr->Offset = ctx->Pc; return TRUE; case cpu_addr_stack: addr->Offset = ctx->Sp; return TRUE; - case cpu_addr_frame: addr->Offset = ctx->Fp; return TRUE; + case cpu_addr_frame: addr->Offset = ctx->u.s.Fp; return TRUE; #endif default: addr->Mode = -1; return FALSE; @@ -69,7 +69,7 @@ static BOOL fetch_next_frame(struct cpu_stack_walk* csw, CONTEXT* context, DWORD_PTR curr_pc) { DWORD_PTR xframe; - DWORD_PTR oldReturn = context->Lr; + DWORD_PTR oldReturn = context->u.s.Lr; if (dwarf2_virtual_unwind(csw, curr_pc, context, &xframe)) { @@ -78,7 +78,7 @@ static BOOL fetch_next_frame(struct cpu_stack_walk* csw, return TRUE; } - if (context->Pc == context->Lr) return FALSE; + if (context->Pc == context->u.s.Lr) return FALSE; context->Pc = oldReturn; return TRUE; @@ -123,8 +123,8 @@ static BOOL arm64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, C /* set frame information */ frame->AddrStack.Offset = context->Sp; - frame->AddrReturn.Offset = context->Lr; - frame->AddrFrame.Offset = context->Fp; + frame->AddrReturn.Offset = context->u.s.Lr; + frame->AddrFrame.Offset = context->u.s.Fp; frame->AddrPC.Offset = context->Pc; frame->Far = TRUE; @@ -198,8 +198,8 @@ static void* arm64_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* siz case CV_ARM64_X0 + 27: case CV_ARM64_X0 + 28: *size = sizeof(ctx->u.X[0]); return &ctx->u.X[regno - CV_ARM64_X0]; case CV_ARM64_PSTATE: *size = sizeof(ctx->Cpsr); return &ctx->Cpsr; - case CV_ARM64_FP: *size = sizeof(ctx->Fp); return &ctx->Fp; - case CV_ARM64_LR: *size = sizeof(ctx->Lr); return &ctx->Lr; + case CV_ARM64_FP: *size = sizeof(ctx->u.s.Fp); return &ctx->u.s.Fp; + case CV_ARM64_LR: *size = sizeof(ctx->u.s.Lr); return &ctx->u.s.Lr; case CV_ARM64_SP: *size = sizeof(ctx->Sp); return &ctx->Sp; case CV_ARM64_PC: *size = sizeof(ctx->Pc); return &ctx->Pc; } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c461e88..def1071 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -123,8 +123,8 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) DWORD i; context->ContextFlags = CONTEXT_FULL; - context->Fp = FP_sig(sigcontext); /* Frame pointer */ - context->Lr = LR_sig(sigcontext); /* Link register */ + context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ + context->u.s.Lr = LR_sig(sigcontext); /* Link register */ context->Sp = SP_sig(sigcontext); /* Stack pointer */ context->Pc = PC_sig(sigcontext); /* Program Counter */ context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ @@ -141,8 +141,8 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) { DWORD i; - FP_sig(sigcontext) = context->Fp; /* Frame pointer */ - LR_sig(sigcontext) = context->Lr; /* Link register */ + FP_sig(sigcontext) = context->u.s.Fp; /* Frame pointer */ + LR_sig(sigcontext) = context->u.s.Lr; /* Link register */ SP_sig(sigcontext) = context->Sp; /* Stack pointer */ PC_sig(sigcontext) = context->Pc; /* Program Counter */ PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ @@ -241,8 +241,8 @@ static void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) flags &= ~CONTEXT_ARM64; /* get rid of CPU id */ if (flags & CONTEXT_CONTROL) { - to->Fp = from->Fp; - to->Lr = from->Lr; + to->u.s.Fp = from->u.s.Fp; + to->u.s.Lr = from->u.s.Lr; to->Sp = from->Sp; to->Pc = from->Pc; to->Cpsr = from->Cpsr; @@ -281,8 +281,8 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) if (flags & CONTEXT_CONTROL) { to->flags |= SERVER_CTX_CONTROL; - to->integer.arm64_regs.x[29] = from->Fp; - to->integer.arm64_regs.x[30] = from->Lr; + to->integer.arm64_regs.x[29] = from->u.s.Fp; + to->integer.arm64_regs.x[30] = from->u.s.Lr; to->ctl.arm64_regs.sp = from->Sp; to->ctl.arm64_regs.pc = from->Pc; to->ctl.arm64_regs.pstate = from->Cpsr; @@ -326,8 +326,8 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) if (from->flags & SERVER_CTX_CONTROL) { to->ContextFlags |= CONTEXT_CONTROL; - to->Fp = from->integer.arm64_regs.x[29]; - to->Lr = from->integer.arm64_regs.x[30]; + to->u.s.Fp = from->integer.arm64_regs.x[29]; + to->u.s.Lr = from->integer.arm64_regs.x[30]; to->Sp = from->ctl.arm64_regs.sp; to->Pc = from->ctl.arm64_regs.pc; to->Cpsr = from->ctl.arm64_regs.pstate; diff --git a/include/winnt.h b/include/winnt.h index e602c1f..3c19af9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1850,12 +1850,12 @@ typedef struct _CONTEXT DWORD64 X26; /* 0d8 */ DWORD64 X27; /* 0e0 */ DWORD64 X28; /* 0e8 */ + DWORD64 Fp; /* 0f0 */ + DWORD64 Lr; /* 0f8 */ } DUMMYSTRUCTNAME; - DWORD64 X[29]; /* 008 */ + DWORD64 X[31]; /* 008 */ } DUMMYUNIONNAME; /* CONTEXT_CONTROL */ - DWORD64 Fp; /* 0f0 */ - DWORD64 Lr; /* 0f8 */ DWORD64 Sp; /* 100 */ DWORD64 Pc; /* 108 */ /* CONTEXT_FLOATING_POINT */ diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index b1952f6..dfeb552 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -32,7 +32,7 @@ static BOOL be_arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, case be_cpu_addr_stack: return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->Sp); case be_cpu_addr_frame: - return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->Fp); + return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->u.s.Fp); break; } return FALSE; @@ -81,7 +81,7 @@ static void be_arm64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_r buf[i] = '-'; dbg_printf(" Pc:%016lx Sp:%016lx Lr:%016lx Cpsr:%08x(%s)\n", - ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr, buf); + ctx->Pc, ctx->Sp, ctx->u.s.Lr, ctx->Cpsr, buf); dbg_printf(" x0: %016lx x1: %016lx x2: %016lx x3: %016lx x4: %016lx\n", ctx->u.s.X0, ctx->u.s.X1, ctx->u.s.X2, ctx->u.s.X3, ctx->u.s.X4); dbg_printf(" x5: %016lx x6: %016lx x7: %016lx x8: %016lx x9: %016lx\n", @@ -93,7 +93,7 @@ static void be_arm64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_r dbg_printf(" x20:%016lx x21:%016lx x22:%016lx x23:%016lx x24:%016lx\n", ctx->u.s.X20, ctx->u.s.X21, ctx->u.s.X22, ctx->u.s.X23, ctx->u.s.X24); dbg_printf(" x25:%016lx x26:%016lx x27:%016lx x28:%016lx Fp:%016lx\n", - ctx->u.s.X25, ctx->u.s.X26, ctx->u.s.X27, ctx->u.s.X28, ctx->Fp); + ctx->u.s.X25, ctx->u.s.X26, ctx->u.s.X27, ctx->u.s.X28, ctx->u.s.Fp); if (all_regs) dbg_printf( "Floating point ARM64 dump not implemented\n" ); } @@ -134,8 +134,8 @@ static struct dbg_internal_var be_arm64_ctx[] = {CV_ARM64_X0 + 26, "x26", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X26), dbg_itype_unsigned_long_int}, {CV_ARM64_X0 + 27, "x27", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X27), dbg_itype_unsigned_long_int}, {CV_ARM64_X0 + 28, "x28", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X28), dbg_itype_unsigned_long_int}, - {CV_ARM64_FP, "fp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Fp), dbg_itype_unsigned_long_int}, - {CV_ARM64_LR, "lr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Lr), dbg_itype_unsigned_long_int}, + {CV_ARM64_FP, "fp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Fp), dbg_itype_unsigned_long_int}, + {CV_ARM64_LR, "lr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Lr), dbg_itype_unsigned_long_int}, {CV_ARM64_SP, "sp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Sp), dbg_itype_unsigned_long_int}, {CV_ARM64_PC, "pc", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Pc), dbg_itype_unsigned_long_int}, {0, NULL, 0, dbg_itype_none} diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 618c5df..376bf37 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -495,8 +495,8 @@ static struct cpu_register cpu_register_map[] = { REG(u.s.X26, 8, CONTEXT_INTEGER), REG(u.s.X27, 8, CONTEXT_INTEGER), REG(u.s.X28, 8, CONTEXT_INTEGER), - REG(Fp, 8, CONTEXT_INTEGER), - REG(Lr, 8, CONTEXT_INTEGER), + REG(u.s.Fp, 8, CONTEXT_INTEGER), + REG(u.s.Lr, 8, CONTEXT_INTEGER), REG(Sp, 8, CONTEXT_CONTROL), REG(Pc, 8, CONTEXT_CONTROL), };

1 0

Nikolay Sivov : shell32/tests: Add a basic test for SHLimitInputEdit().
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 04ec181c6c5f0c6e9ff5faf16c70dc0b71da8df4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ec181c6c5f0c6e9ff5faf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 19 10:10:12 2018 +0300 shell32/tests: Add a basic test for SHLimitInputEdit(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 29 +++++++++++++++++++++++++++++ include/shlobj.h | 1 + include/shobjidl.idl | 14 ++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1b140c0..95ebb92 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5217,6 +5217,34 @@ static void test_GetDefaultSearchGUID(void) CoUninitialize(); } +static void test_SHLimitInputEdit(void) +{ + IShellFolder *desktop; + HRESULT hr; + HWND hwnd; + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "Failed to get desktop folder, hr %#x.\n", hr); + + hr = SHLimitInputEdit(NULL, desktop); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hwnd = CreateWindowA("EDIT", NULL, WS_VISIBLE, 0, 0, 100, 30, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "Failed to create Edit control.\n"); + + hr = SHLimitInputEdit(hwnd, desktop); +todo_wine + ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); + + hr = SHLimitInputEdit(hwnd, desktop); +todo_wine + ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); + + DestroyWindow(hwnd); + IShellFolder_Release(desktop); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5258,6 +5286,7 @@ START_TEST(shlfolder) test_DataObject(); test_GetDefaultColumn(); test_GetDefaultSearchGUID(); + test_SHLimitInputEdit(); OleUninitialize(); } diff --git a/include/shlobj.h b/include/shlobj.h index 09efc18..7cdb4f8 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1801,6 +1801,7 @@ HRESULT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST pidlFolder, HWND hwnd, UINT IContextMenu **ppcm); int WINAPI PickIconDlg(HWND owner, WCHAR *path, UINT path_len, int *index); +HRESULT WINAPI SHLimitInputEdit(HWND hwnd, IShellFolder *folder); #include <poppack.h> diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 5e4da5d..e0fe01c 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3699,6 +3699,20 @@ typedef enum ASSOC_FILTER } ASSOC_FILTER; cpp_quote("HRESULT WINAPI SHAssocEnumHandlers(PCWSTR extra, ASSOC_FILTER filter, IEnumAssocHandlers **handlersenum);") +[ + uuid(1df0d7f1-b267-4d28-8b10-12e23202a5c4), +] +interface IItemNameLimits : IUnknown +{ + HRESULT GetValidCharacters( + [out, string] LPWSTR *validchars, + [out, string] LPWSTR *invalidchars); + + HRESULT GetMaxLength( + [in, string] LPCWSTR name, + [out] int *max_length); +} + /***************************************************************************** * ShellObjects typelibrary */

1 0

Nikolay Sivov : shell32: Use ARRAY_SIZE macro.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 612a1941331485725952d34f3dcd5866fc318dc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=612a1941331485725952d34f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 19 10:11:27 2018 +0300 shell32: Use ARRAY_SIZE macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/assoc.c | 2 +- dlls/shell32/autocomplete.c | 2 +- dlls/shell32/brsfolder.c | 6 ++---- dlls/shell32/classes.c | 2 +- dlls/shell32/control.c | 34 +++++++++++++---------------- dlls/shell32/dde.c | 2 +- dlls/shell32/dialogs.c | 4 ++-- dlls/shell32/recyclebin.c | 18 ++++++---------- dlls/shell32/shell32_main.c | 6 +++--- dlls/shell32/shell32_main.h | 2 ++ dlls/shell32/shelldispatch.c | 2 +- dlls/shell32/shelllink.c | 13 +++++------- dlls/shell32/shellole.c | 4 ++-- dlls/shell32/shellord.c | 8 +++---- dlls/shell32/shellpath.c | 47 ++++++++++++++++++++++------------------- dlls/shell32/shfldr_desktop.c | 16 ++++++-------- dlls/shell32/shfldr_fs.c | 10 ++++----- dlls/shell32/shfldr_netplaces.c | 9 +++----- dlls/shell32/shfldr_unixfs.c | 10 ++++----- dlls/shell32/shlexec.c | 16 +++++++------- dlls/shell32/shlfileop.c | 11 +++++----- dlls/shell32/shlmenu.c | 2 +- dlls/shell32/shlview.c | 2 +- dlls/shell32/systray.c | 11 +++++----- dlls/shell32/xdg.c | 6 ++---- 25 files changed, 114 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=612a1941331485725952…

1 0

Zhiyi Zhang : comctl32/datetime: Implement DTM_GETIDEALSIZE message.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: ad698fc7be29427b50b772c1f35cccbb0559b95d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad698fc7be29427b50b772c1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 19 16:17:55 2018 +0800 comctl32/datetime: Implement DTM_GETIDEALSIZE message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/datetime.c | 41 +++++++++++++++++++++++++++++++ include/commctrl.h | 2 ++ 3 files changed, 98 insertions(+) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 46ac3e5..6231070 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1454,6 +1454,58 @@ DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRU return 0; } +static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size) +{ + SIZE field_size; + RECT rect; + SHORT width; + WCHAR txt[80]; + HDC hdc; + HFONT oldFont; + int i; + + size->cx = size->cy = 0; + + hdc = GetDC(infoPtr->hwndSelf); + oldFont = SelectObject(hdc, infoPtr->hFont); + + /* Get text font height */ + DATETIME_ReturnTxt(infoPtr, 0, txt, ARRAY_SIZE(txt)); + GetTextExtentPoint32W(hdc, txt, strlenW(txt), &field_size); + size->cy = field_size.cy; + + /* Get text font width */ + for (i = 0; i < infoPtr->nrFields; i++) + { + DATETIME_ReturnFieldWidth(infoPtr, hdc, i, &width); + size->cx += width; + } + + SelectObject(hdc, oldFont); + ReleaseDC(infoPtr->hwndSelf, hdc); + + if (infoPtr->dwStyle & DTS_UPDOWN) + { + GetWindowRect(infoPtr->hUpdown, &rect); + size->cx += rect.right - rect.left; + } + else + { + size->cx += infoPtr->calbutton.right - infoPtr->calbutton.left; + } + + if (infoPtr->dwStyle & DTS_SHOWNONE) + { + size->cx += infoPtr->checkbox.right - infoPtr->checkbox.left; + } + + /* Add space between controls for them not to get too close */ + size->cx += 12; + size->cy += 4; + + TRACE("cx=%d cy=%d\n", size->cx, size->cy); + return TRUE; +} static LRESULT DATETIME_SetFont (DATETIME_INFO *infoPtr, HFONT font, BOOL repaint) @@ -1585,6 +1637,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case DTM_GETMCFONT: return SendMessageW (infoPtr->hMonthCal, WM_GETFONT, wParam, lParam); + case DTM_GETIDEALSIZE: + return DATETIME_GetIdealSize(infoPtr, (SIZE *)lParam); + case WM_NOTIFY: return DATETIME_Notify (infoPtr, (LPNMHDR)lParam); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 7742dc5..88abce9 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -721,6 +721,46 @@ static void test_dtm_set_and_get_systemtime_with_limits(void) DestroyWindow(hWnd); } +static void test_dtm_get_ideal_size(void) +{ + HWND hwnd; + HDC hdc; + HFONT hfont; + LOGFONTA lf; + TEXTMETRICA tm; + SIZE size; + BOOL r; + + hwnd = create_datetime_control(0); + r = SendMessageA(hwnd, DTM_GETIDEALSIZE, 0, (LPARAM)&size); + if (!r) + { + win_skip("DTM_GETIDEALSIZE is not available\n"); + DestroyWindow(hwnd); + return; + } + + /* Set font so that the test is consistent on Wine and Windows */ + ZeroMemory(&lf, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfHeight = 20; + lstrcpyA(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + + hdc = GetDC(hwnd); + GetTextMetricsA(hdc, &tm); + ReleaseDC(hwnd, hdc); + + r = SendMessageA(hwnd, DTM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(r, "Expect DTM_GETIDEALSIZE message to return true\n"); + ok(size.cx > 0 && size.cy >= tm.tmHeight, + "Expect size.cx > 0 and size.cy >= %d, got cx:%d cy:%d\n", tm.tmHeight, size.cx, size.cy); + + DestroyWindow(hwnd); + DeleteObject(hfont); +} + static void test_wm_set_get_text(void) { static const CHAR a_str[] = "a"; @@ -821,6 +861,7 @@ START_TEST(datetime) test_dtm_set_and_get_mccolor(); test_dtm_set_and_get_mcfont(); test_dtm_get_monthcal(); + test_dtm_get_ideal_size(); test_wm_set_get_text(); test_dts_shownone(); diff --git a/include/commctrl.h b/include/commctrl.h index 6890b50..ae70cfd 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5009,6 +5009,8 @@ DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMATQUERY) SNDMSG (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) #define DateTime_GetMonthCalFont(hdp) \ SNDMSG (hdp, DTM_GETMCFONT, 0, 0) +#define DateTime_GetIdealSize(hdp, sz) \ + (BOOL) SNDMSG (hdp, DTM_GETIDEALSIZE, 0, (LPARAM)sz) #define DA_LAST (0x7fffffff) #define DPA_APPEND (0x7fffffff)

1 0

Zhiyi Zhang : comctl32/datetime: Fix length passed to GetLocaleInfoW().
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: b683b541fa7c4ffd671807c5c463369c420bb7e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b683b541fa7c4ffd671807c5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 19 16:17:10 2018 +0800 comctl32/datetime: Fix length passed to GetLocaleInfoW(). Fix fullday not being rendered when long date format is used. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index aa02357..46ac3e5 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -697,7 +697,7 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO for (i = 0; i < max_count; i++) { if(GetLocaleInfoW(LOCALE_USER_DEFAULT, lctype + i, - buffer, lstrlenW(buffer))) + buffer, ARRAY_SIZE(buffer))) { GetTextExtentPoint32W(hdc, buffer, lstrlenW(buffer), &size); if (size.cx > cx) cx = size.cx;

1 0

Zhiyi Zhang : comctl32/datetime: Fix wrong format for DTS_SHORTDATECENTURYFORMAT.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 46dcf0c7cb35a2d7cb46eae722a9e5d161fc5aee URL: https://source.winehq.org/git/wine.git/?a=commit;h=46dcf0c7cb35a2d7cb46eae7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 19 16:16:24 2018 +0800 comctl32/datetime: Fix wrong format for DTS_SHORTDATECENTURYFORMAT. DTS_SHORTDATECENTURYFORMAT should use short date format Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 97f8226..aa02357 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -322,10 +322,12 @@ DATETIME_SetFormatW (DATETIME_INFO *infoPtr, LPCWSTR format) if (!format) { DWORD format_item; - if (infoPtr->dwStyle & DTS_LONGDATEFORMAT) - format_item = LOCALE_SLONGDATE; - else if ((infoPtr->dwStyle & DTS_TIMEFORMAT) == DTS_TIMEFORMAT) - format_item = LOCALE_STIMEFORMAT; + if ((infoPtr->dwStyle & DTS_SHORTDATECENTURYFORMAT) == DTS_SHORTDATECENTURYFORMAT) + format_item = LOCALE_SSHORTDATE; + else if ((infoPtr->dwStyle & DTS_LONGDATEFORMAT) == DTS_LONGDATEFORMAT) + format_item = LOCALE_SLONGDATE; + else if ((infoPtr->dwStyle & DTS_TIMEFORMAT) == DTS_TIMEFORMAT) + format_item = LOCALE_STIMEFORMAT; else /* DTS_SHORTDATEFORMAT */ format_item = LOCALE_SSHORTDATE; GetLocaleInfoW(LOCALE_USER_DEFAULT, format_item, format_buf, ARRAY_SIZE(format_buf));

1 0

Nikolay Sivov : comdlg32: Implement Places toolbar for file dialogs.
by Alexandre Julliard 19 Mar '18

19 Mar '18

1 0

Jacek Caban : vbscript: Added support for script context in ParseScriptText.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 7e109410836f18a67418209a4b73dcdb513532f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e109410836f18a67418209a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 16 23:34:52 2018 +0100 vbscript: Added support for script context in ParseScriptText. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 15 +++---------- dlls/vbscript/interp.c | 10 +++++++++ dlls/vbscript/tests/run.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 12 +++++++++++ dlls/vbscript/vbscript.h | 1 + 5 files changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c8189d6..302804f 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1746,6 +1746,8 @@ void release_vbscode(vbscode_t *code) for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); + if(code->context) + IDispatch_Release(code->context); heap_pool_free(&code->heap); heap_free(code->bstr_pool); @@ -1758,7 +1760,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) { vbscode_t *ret; - ret = heap_alloc(sizeof(*ret)); + ret = heap_alloc_zero(sizeof(*ret)); if(!ret) return NULL; @@ -1780,19 +1782,8 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->option_explicit = ctx->parser.option_explicit; - ret->bstr_pool = NULL; - ret->bstr_pool_size = 0; - ret->bstr_cnt = 0; - ret->pending_exec = FALSE; - ret->main_code.type = FUNC_GLOBAL; - ret->main_code.name = NULL; ret->main_code.code_ctx = ret; - ret->main_code.vars = NULL; - ret->main_code.var_cnt = 0; - ret->main_code.array_cnt = 0; - ret->main_code.arg_cnt = 0; - ret->main_code.args = NULL; list_init(&ret->entry); return ret; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4f746c7..b46bd01 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -154,6 +154,16 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } + if(ctx->func->code_ctx->context) { + hres = disp_get_id(ctx->func->code_ctx->context, name, invoke_type, TRUE, &id); + if(SUCCEEDED(hres)) { + ref->type = REF_DISP; + ref->u.d.disp = ctx->func->code_ctx->context; + ref->u.d.id = id; + return S_OK; + } + } + if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index ee811c6..9172add 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1804,6 +1804,59 @@ static HRESULT parse_script_ar(const char *src) return hres; } +static void test_parse_context(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + static const WCHAR xW[] = {'x',0}; + static const WCHAR yW[] = {'y',0}; + + engine = create_and_init_script(0); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + /* unknown identifier context is not a valid argument */ + str = a2bstr("Call reportSuccess()\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, yW, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("class Cl\n" + " Public Sub ClMethod\n" + " Call reportSuccess()\n" + " End Sub\n" + "End Class\n" + "Dim x\n" + "set x = new Cl\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + /* known global variable is not a valid context */ + str = a2bstr("Call reportSuccess()\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, xW, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + str = a2bstr("Call reportSuccess()\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, testW, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScriptParse_Release(parser); + close_script(engine); +} + static void parse_script_a(const char *src) { parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); @@ -2334,6 +2387,7 @@ static void run_tests(void) test_procedures(); test_gc(); test_msgbox(); + test_parse_context(); } static BOOL check_vbscript(void) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 054d53b..b97cf5a 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -636,6 +636,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { VBScript *This = impl_from_IActiveScriptParse(iface); + IDispatch *context = NULL; vbscode_t *code; HRESULT hres; @@ -646,10 +647,21 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; + if(pstrItemName) { + context = lookup_named_item(This->ctx, pstrItemName, 0); + if(!context) { + WARN("Inknown context %s\n", debugstr_w(pstrItemName)); + return E_INVALIDARG; + } + } + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); if(FAILED(hres)) return hres; + if(context) + IDispatch_AddRef(code->context = context); + if(!is_started(This)) { code->pending_exec = TRUE; return S_OK; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 42b3cd1..5877762 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -342,6 +342,7 @@ struct _vbscode_t { BOOL pending_exec; function_t main_code; + IDispatch *context; BSTR *bstr_pool; unsigned bstr_pool_size;

1 0

Jacek Caban : vbscript: Split named item lookup into a helper function.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: aa5b68ac400726132aa61a6e590e33d17f087f94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa5b68ac400726132aa61a6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 16 23:34:41 2018 +0100 vbscript: Split named item lookup into a helper function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 29 ++++++----------------------- dlls/vbscript/vbscript.c | 32 ++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9ec3299..4f746c7 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -99,6 +99,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ { named_item_t *item; function_t *func; + IDispatch *disp; unsigned i; DISPID id; HRESULT hres; @@ -178,29 +179,11 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { - if((item->flags & SCRIPTITEM_ISVISIBLE) && !strcmpiW(item->name, name)) { - if(!item->disp) { - IUnknown *unk; - - hres = IActiveScriptSite_GetItemInfo(ctx->script->site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); - if(FAILED(hres)) { - WARN("GetItemInfo failed: %08x\n", hres); - continue; - } - - hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); - IUnknown_Release(unk); - if(FAILED(hres)) { - WARN("object does not implement IDispatch\n"); - continue; - } - } - - ref->type = REF_OBJ; - ref->u.obj = item->disp; - return S_OK; - } + disp = lookup_named_item(ctx->script, name, SCRIPTITEM_ISVISIBLE); + if(disp) { + ref->type = REF_OBJ; + ref->u.obj = disp; + return S_OK; } LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 645068e..054d53b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -96,6 +96,38 @@ static void exec_queued_code(script_ctx_t *ctx) } } +IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flags) +{ + named_item_t *item; + HRESULT hres; + + LIST_FOR_EACH_ENTRY(item, &ctx->named_items, named_item_t, entry) { + if((item->flags & flags) == flags && !strcmpiW(item->name, name)) { + if(!item->disp) { + IUnknown *unk; + + hres = IActiveScriptSite_GetItemInfo(ctx->site, item->name, + SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hres)) { + WARN("GetItemInfo failed: %08x\n", hres); + continue; + } + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); + IUnknown_Release(unk); + if(FAILED(hres)) { + WARN("object does not implement IDispatch\n"); + continue; + } + } + + return item->disp; + } + } + + return NULL; +} + static HRESULT set_ctx_site(VBScript *This) { HRESULT hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5e935ff..42b3cd1 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -355,6 +355,7 @@ void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; +IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; typedef struct { UINT16 len;

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018