January 2018 - Wine-commits

Alexandre Julliard : ntdll: Use DWORDs for ARM assembly instructions.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 8a62752fe9bd0937329e8218cd5915e85fcd7484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a62752fe9bd0937329e8218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 19:20:10 2018 +0100 ntdll: Use DWORDs for ARM assembly instructions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 75 +++++++++++++++++------------------------------------ 1 file changed, 24 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 53280a4..fe02b6c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -230,10 +230,10 @@ struct stub #elif defined(__arm__) struct stub { - BYTE ldr_r0[4]; /* ldr r0, $dll */ - BYTE ldr_r1[4]; /* ldr r1, $name */ - BYTE mov_r2_lr[4]; /* mov r2, lr */ - BYTE ldr_pc_pc[4]; /* ldr pc, [pc, #4] */ + DWORD ldr_r0; /* ldr r0, $dll */ + DWORD ldr_r1; /* ldr r1, $name */ + DWORD mov_r2_lr; /* mov r2, lr */ + DWORD ldr_pc_pc; /* ldr pc, [pc, #4] */ const char *dll; const char *name; const void* entry; @@ -241,11 +241,11 @@ struct stub #elif defined(__aarch64__) struct stub { - BYTE ldr_x0[4]; /* ldr x0, $dll */ - BYTE ldr_x1[4]; /* ldr x1, $name */ - BYTE mov_x2_lr[4]; /* mov x2, lr */ - BYTE ldr_x16[4]; /* ldr x16, $entry */ - BYTE br_x16[4]; /* br x16 */ + DWORD ldr_x0; /* ldr x0, $dll */ + DWORD ldr_x1; /* ldr x1, $name */ + DWORD mov_x2_lr; /* mov x2, lr */ + DWORD ldr_x16; /* ldr x16, $entry */ + DWORD br_x16; /* br x16 */ const char *dll; const char *name; const void *entry; @@ -295,49 +295,22 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) stub->call = 0xe8; /* call stub_entry_point */ stub->entry = (BYTE *)stub_entry_point - (BYTE *)(&stub->entry + 1); #elif defined(__arm__) - stub->ldr_r0[0] = 0x08; /* ldr r0, [pc, #8] ($dll) */ - stub->ldr_r0[1] = 0x00; - stub->ldr_r0[2] = 0x9f; - stub->ldr_r0[3] = 0xe5; - stub->ldr_r1[0] = 0x08; /* ldr r1, [pc, #8] ($name) */ - stub->ldr_r1[1] = 0x10; - stub->ldr_r1[2] = 0x9f; - stub->ldr_r1[3] = 0xe5; - stub->mov_r2_lr[0] = 0x0e; /* mov r2, lr */ - stub->mov_r2_lr[1] = 0x20; - stub->mov_r2_lr[2] = 0xa0; - stub->mov_r2_lr[3] = 0xe1; - stub->ldr_pc_pc[0] = 0x04; /* ldr pc, [pc, #4] */ - stub->ldr_pc_pc[1] = 0xf0; - stub->ldr_pc_pc[2] = 0x9f; - stub->ldr_pc_pc[3] = 0xe5; - stub->dll = dll; - stub->name = name; - stub->entry = stub_entry_point; + stub->ldr_r0 = 0xe59f0008; /* ldr r0, [pc, #8] ($dll) */ + stub->ldr_r1 = 0xe59f1008; /* ldr r1, [pc, #8] ($name) */ + stub->mov_r2_lr = 0xe1a0200e; /* mov r2, lr */ + stub->ldr_pc_pc = 0xe59ff004; /* ldr pc, [pc, #4] */ + stub->dll = dll; + stub->name = name; + stub->entry = stub_entry_point; #elif defined(__aarch64__) - stub->ldr_x0[0] = 0xa0; /* ldr x0, #20 ($dll) */ - stub->ldr_x0[1] = 0x00; - stub->ldr_x0[2] = 0x00; - stub->ldr_x0[3] = 0x58; - stub->ldr_x1[0] = 0xc1; /* ldr x1, #24 ($name) */ - stub->ldr_x1[1] = 0x00; - stub->ldr_x1[2] = 0x00; - stub->ldr_x1[3] = 0x58; - stub->mov_x2_lr[0] = 0xe2; /* mov x2, lr */ - stub->mov_x2_lr[1] = 0x03; - stub->mov_x2_lr[2] = 0x1e; - stub->mov_x2_lr[3] = 0xaa; - stub->ldr_x16[0] = 0xd0; /* ldr x16, #24 ($entry) */ - stub->ldr_x16[1] = 0x00; - stub->ldr_x16[2] = 0x00; - stub->ldr_x16[3] = 0x58; - stub->br_x16[0] = 0x00; /* br x16 */ - stub->br_x16[1] = 0x02; - stub->br_x16[2] = 0x1f; - stub->br_x16[3] = 0xd6; - stub->dll = dll; - stub->name = name; - stub->entry = stub_entry_point; + stub->ldr_x0 = 0x580000a0; /* ldr x0, #20 ($dll) */ + stub->ldr_x1 = 0x580000c1; /* ldr x1, #24 ($name) */ + stub->mov_x2_lr = 0xaa1e03e2; /* mov x2, lr */ + stub->ldr_x16 = 0x580000d0; /* ldr x16, #24 ($entry) */ + stub->br_x16 = 0xd61f0200; /* br x16 */ + stub->dll = dll; + stub->name = name; + stub->entry = stub_entry_point; #else stub->movq_rdi[0] = 0x48; /* movq $dll,%rdi */ stub->movq_rdi[1] = 0xbf;

1 0

Alexandre Julliard : comdlg32: Add a helper function to select a combo box item.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 77d65c39486ffc2b4c17aec958e361b180a029a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77d65c39486ffc2b4c17aec9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 19:51:06 2018 +0100 comdlg32: Add a helper function to select a combo box item. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 60 ++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 82992cb..768ca4a 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -483,6 +483,16 @@ static inline void CFn_ReleaseDC(const CHOOSEFONTW *lpcf, HDC hdc) ReleaseDC(0, hdc); } +/************************************************************************* + * select_combo_item [internal] + */ +static void select_combo_item( HWND dialog, int id, int sel ) +{ + HWND combo = GetDlgItem( dialog, id ); + SendMessageW( combo, CB_SETCURSEL, sel, 0 ); + SendMessageW( dialog, WM_COMMAND, MAKEWPARAM( id, CBN_SELCHANGE ), (LPARAM)combo ); +} + /*********************************************************************** * AddFontStyle [internal] */ @@ -543,10 +553,7 @@ static void CFn_FitFontSize( HWND hDlg, int points) if (points == (int)SendDlgItemMessageW (hDlg,cmb3, CB_GETITEMDATA,i,0)) { - SendDlgItemMessageW(hDlg,cmb3,CB_SETCURSEL,i,0); - SendMessageW(hDlg, WM_COMMAND, - MAKEWPARAM(cmb3, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb3)); + select_combo_item( hDlg, cmb3, i ); return; } } @@ -559,21 +566,17 @@ static BOOL CFn_FitFontStyle( HWND hDlg, LONG packedstyle ) { LONG id; int i; - BOOL ret = FALSE; /* look for fitting font style in combobox2 */ for (i=0;i<TEXT_EXTRAS;i++) { id = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, i, 0); if (packedstyle == id) { - SendDlgItemMessageW(hDlg, cmb2, CB_SETCURSEL, i, 0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb2, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb2)); - ret = TRUE; - break; + select_combo_item( hDlg, cmb2, i ); + return TRUE; } } - return ret; + return FALSE; } @@ -587,16 +590,12 @@ static BOOL CFn_FitCharSet( HWND hDlg, int charset ) cs =SendDlgItemMessageW(hDlg, cmb5, CB_GETITEMDATA, i, 0); if (charset == cs) { - SendDlgItemMessageW(hDlg, cmb5, CB_SETCURSEL, i, 0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb2)); + select_combo_item( hDlg, cmb5, i ); return TRUE; } } /* no charset fits: select the first one in the list */ - SendDlgItemMessageW(hDlg, cmb5, CB_SETCURSEL, 0, 0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb2)); + select_combo_item( hDlg, cmb5, 0 ); return FALSE; } @@ -729,9 +728,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) points = MulDiv( height, 72, GetScreenDPI()); pstyle = MAKELONG(lpxx->lfWeight > FW_MEDIUM ? FW_BOLD: FW_NORMAL,lpxx->lfItalic !=0); - SendDlgItemMessageW(hDlg, cmb1, CB_SETCURSEL, j, 0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb1)); + select_combo_item( hDlg, cmb1, j ); init = TRUE; /* look for fitting font style in combobox2 */ CFn_FitFontStyle(hDlg, pstyle); @@ -742,18 +739,10 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) } if (!init) { - SendDlgItemMessageW(hDlg,cmb1,CB_SETCURSEL,0,0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb1)); - SendDlgItemMessageW(hDlg,cmb2,CB_SETCURSEL,0,0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb2, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb1)); - SendDlgItemMessageW(hDlg,cmb3,CB_SETCURSEL,0,0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb3, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb3)); - SendDlgItemMessageW(hDlg,cmb5,CB_SETCURSEL,0,0); - SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE), - (LPARAM)GetDlgItem(hDlg,cmb5)); + select_combo_item( hDlg, cmb1, 0 ); + select_combo_item( hDlg, cmb2, 0 ); + select_combo_item( hDlg, cmb3, 0 ); + select_combo_item( hDlg, cmb5, 0 ); } /* limit text length user can type in as font size */ SendDlgItemMessageW(hDlg, cmb3, CB_LIMITTEXT, 5, 0); @@ -761,12 +750,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) if ((lpcf->Flags & CF_USESTYLE) && lpcf->lpszStyle) { j=SendDlgItemMessageW(hDlg,cmb2,CB_FINDSTRING,-1,(LPARAM)lpcf->lpszStyle); - if (j!=CB_ERR) - { - j=SendDlgItemMessageW(hDlg,cmb2,CB_SETCURSEL,j,0); - SendMessageW(hDlg,WM_COMMAND,cmb2, - MAKELONG(LOWORD(GetDlgItem(hDlg,cmb2)),CBN_SELCHANGE)); - } + if (j!=CB_ERR) select_combo_item( hDlg, cmb2, j ); } CFn_ReleaseDC(lpcf, hdc); SetCursor(hcursor);

1 0

Zebediah Figura : winedbg/gdbproxy: Add support for floating-point registers on x86 and x86_64.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: d1e9694edabe6ef803f1b98de288982e5d03ab29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1e9694edabe6ef803f1b98d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 14 19:01:14 2018 -0600 winedbg/gdbproxy: Add support for floating-point registers on x86 and x86_64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 71 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 2561702..c02ad3b 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -214,6 +214,30 @@ struct cpu_register #define REG(r,gs,m) {FIELD_OFFSET(CONTEXT, r), sizeof(((CONTEXT*)NULL)->r), gs, m} #ifdef __i386__ +typedef struct DECLSPEC_ALIGN(16) _M128A { + ULONGLONG Low; + LONGLONG High; +} M128A, *PM128A; + +typedef struct _XMM_SAVE_AREA32 { + WORD ControlWord; /* 000 */ + WORD StatusWord; /* 002 */ + BYTE TagWord; /* 004 */ + BYTE Reserved1; /* 005 */ + WORD ErrorOpcode; /* 006 */ + DWORD ErrorOffset; /* 008 */ + WORD ErrorSelector; /* 00c */ + WORD Reserved2; /* 00e */ + DWORD DataOffset; /* 010 */ + WORD DataSelector; /* 014 */ + WORD Reserved3; /* 016 */ + DWORD MxCsr; /* 018 */ + DWORD MxCsr_Mask; /* 01c */ + M128A FloatRegisters[8]; /* 020 */ + M128A XmmRegisters[16]; /* 0a0 */ + BYTE Reserved4[96]; /* 1a0 */ +} XMM_SAVE_AREA32, *PXMM_SAVE_AREA32; + static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(Eax, 4, CONTEXT_INTEGER), @@ -248,6 +272,15 @@ static struct cpu_register cpu_register_map[] = { { FIELD_OFFSET(CONTEXT, FloatSave.DataSelector), 2, 4, CONTEXT_FLOATING_POINT }, REG(FloatSave.DataOffset, 4, CONTEXT_FLOATING_POINT ), { FIELD_OFFSET(CONTEXT, FloatSave.ErrorSelector)+2, 2, 4, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[0]), 16, 16, CONTEXT_EXTENDED_REGISTERS }, + { FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[1]), 16, 16, CONTEXT_EXTENDED_REGISTERS }, + { FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[2]), 16, 16, CONTEXT_EXTENDED_REGISTERS }, + { FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[3]), 16, 16, CONTEXT_EXTENDED_REGISTERS }, + { FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[4]), 16, 16, CONTEXT_EXTENDED_REGISTERS }, + { FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[5]), 16, 16, CONTEXT_EXTENDED_REGISTERS }, + { FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[6]), 16, 16, CONTEXT_EXTENDED_REGISTERS }, + { FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[7]), 16, 16, CONTEXT_EXTENDED_REGISTERS }, + { FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, MxCsr), 4, 4, CONTEXT_EXTENDED_REGISTERS }, }; #elif defined(__powerpc__) static const char target_xml[] = ""; @@ -353,6 +386,39 @@ static struct cpu_register cpu_register_map[] = { REG(SegEs, 4, CONTEXT_SEGMENTS), REG(SegFs, 4, CONTEXT_SEGMENTS), REG(SegGs, 4, CONTEXT_SEGMENTS), + { FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[ 0]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[ 1]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[ 2]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[ 3]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[ 4]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[ 5]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[ 6]), 10, 10, CONTEXT_FLOATING_POINT }, + { FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[ 7]), 10, 10, CONTEXT_FLOATING_POINT }, + REG(u.FltSave.ControlWord, 4, CONTEXT_FLOATING_POINT), + REG(u.FltSave.StatusWord, 4, CONTEXT_FLOATING_POINT), + REG(u.FltSave.TagWord, 4, CONTEXT_FLOATING_POINT), + REG(u.FltSave.ErrorSelector, 4, CONTEXT_FLOATING_POINT), + REG(u.FltSave.ErrorOffset, 4, CONTEXT_FLOATING_POINT), + REG(u.FltSave.DataSelector, 4, CONTEXT_FLOATING_POINT), + REG(u.FltSave.DataOffset, 4, CONTEXT_FLOATING_POINT), + REG(u.FltSave.ErrorOpcode, 4, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm0, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm1, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm2, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm3, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm4, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm5, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm6, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm7, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm8, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm9, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm10, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm11, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm12, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm13, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm14, 16, CONTEXT_FLOATING_POINT), + REG(u.s.Xmm15, 16, CONTEXT_FLOATING_POINT), + REG(u.FltSave.MxCsr, 4, CONTEXT_FLOATING_POINT), }; #elif defined(__arm__) static const char target_xml[] = @@ -496,7 +562,7 @@ static BOOL fetch_context(struct gdb_context* gdbctx, HANDLE h, CONTEXT* ctx) { ctx->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER -#if defined(__powerpc__) || defined(__i386__) +#if defined(__powerpc__) || defined(__i386__) || defined(__x86_64__) | CONTEXT_FLOATING_POINT #endif #ifdef CONTEXT_SEGMENTS @@ -505,6 +571,9 @@ static BOOL fetch_context(struct gdb_context* gdbctx, HANDLE h, CONTEXT* ctx) #ifdef CONTEXT_DEBUG_REGISTERS | CONTEXT_DEBUG_REGISTERS #endif +#ifdef CONTEXT_EXTENDED_REGISTERS + | CONTEXT_EXTENDED_REGISTERS +#endif ; if (!GetThreadContext(h, ctx)) {

1 0

Zebediah Figura : winedbg/gdbproxy: Replace memory read over a breakpoint with the real value.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: eb63a5f3c3c1851f212bd14f91da329bf3166e42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb63a5f3c3c1851f212bd14f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 14 19:01:15 2018 -0600 winedbg/gdbproxy: Replace memory read over a breakpoint with the real value. Normally, when we hit a breakpoint, we remove it before stopping and add it after continuing. gdb, however, reads the process memory before requesting that the breakpoint be removed, and apparently caches it until the `stepi` instruction is executed; as a result, it thinks that the interrupt byte that is present in the code is an actual interrupt and not a breakpoint, and so tries to step over it as one byte instead of executing the real instruction at that location. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c02ad3b..7b9a476 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1568,6 +1568,28 @@ static enum packet_return packet_thread(struct gdb_context* gdbctx) } } +static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SIZE_T blk_len, SIZE_T *r) +{ + /* Wrapper around process_io->read() that replaces values displaced by breakpoints. */ + + BOOL ret; + + ret = gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, r); + if (ret) + { + struct gdb_ctx_Xpoint *xpt; + + for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) + { + char *xpt_addr = xpt->addr; + + if (xpt->type != -1 && xpt_addr >= addr && xpt_addr < addr + blk_len) + buffer[xpt_addr - addr] = xpt->val; + } + } + return ret; +} + static enum packet_return packet_read_memory(struct gdb_context* gdbctx) { char *addr; @@ -1584,8 +1606,7 @@ static enum packet_return packet_read_memory(struct gdb_context* gdbctx) for (nread = 0; nread < len; nread += r, addr += r) { blk_len = min(sizeof(buffer), len - nread); - if (!gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, &r) || - r == 0) + if (!read_memory(gdbctx, addr, buffer, blk_len, &r) || r == 0) { /* fail at first address, return error */ if (nread == 0) return packet_reply_error(gdbctx, EFAULT);

1 0

Gijs Vermeulen : compobj.dll16: Add StringFromIID.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 85820f5e402eea8f78eba9390dae35f60f278891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85820f5e402eea8f78eba939… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Jan 14 23:47:36 2018 +0100 compobj.dll16: Add StringFromIID. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 1 + dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index af69bf8..4eddace 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -434,6 +434,7 @@ _xmalloc16(DWORD size, SEGPTR *ptr) { /****************************************************************************** * StringFromCLSID [COMPOBJ.19] + * StringFromIID [COMPOBJ.14] * Converts a GUID into the respective string representation. * The target string is allocated using the OLE IMalloc. * diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 71dba80..2ef011f 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -11,7 +11,7 @@ 11 stub COFREELIBRARY 12 stub COFREEALLLIBRARIES 13 pascal CoCreateInstance(ptr ptr long ptr ptr) CoCreateInstance16 -14 stub STRINGFROMIID +14 pascal StringFromIID(ptr ptr) StringFromCLSID16 15 pascal CoDisconnectObject(ptr long) CoDisconnectObject16 16 stub CORELEASEMARSHALDATA 17 pascal -ret16 CoFreeUnusedLibraries() CoFreeUnusedLibraries16

1 0

Nikolay Sivov : user32: Add SysLink to known classes list.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 71d8edebb98201d1b74275b565e5c01d68c32e6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d8edebb98201d1b74275b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 19 00:04:12 2018 +0300 user32: Add SysLink to known classes list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 1 + dlls/user32/tests/class.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 0b3582e..fae88f2 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -139,6 +139,7 @@ static BOOL is_comctl32_class( const WCHAR *name ) {'S','y','s','D','a','t','e','T','i','m','e','P','i','c','k','3','2',0}, {'S','y','s','H','e','a','d','e','r','3','2',0}, {'S','y','s','I','P','A','d','d','r','e','s','s','3','2',0}, + {'S','y','s','L','i','n','k',0}, {'S','y','s','L','i','s','t','V','i','e','w','3','2',0}, {'S','y','s','M','o','n','t','h','C','a','l','3','2',0}, {'S','y','s','P','a','g','e','r',0}, diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 88bf376..dd8f266 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1093,6 +1093,7 @@ static void test_comctl32_classes(void) PROGRESS_CLASSA, REBARCLASSNAMEA, STATUSCLASSNAMEA, + "SysLink", WC_TABCONTROLA, TOOLBARCLASSNAMEA, TOOLTIPS_CLASSA,

1 0

Anton Romanov : ole32: Make CoWaitForMultipleHandles peek at all posted messages.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 90a094cc24a900687347af8f490c46617f9782df URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a094cc24a900687347af8f… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Thu Jan 18 22:17:06 2018 -0800 ole32: Make CoWaitForMultipleHandles peek at all posted messages. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 6 ++++++ dlls/ole32/tests/compobj.c | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d136ee6..3da3c2f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4547,6 +4547,12 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } } + if (!apt->win) + { + /* If window is NULL on apartment, peek at messages so that it will not trigger + * MsgWaitForMultipleObjects next time. */ + PeekMessageW(NULL, NULL, 0, 0, PM_QS_POSTMESSAGE | PM_NOREMOVE | PM_NOYIELD); + } /* some apps (e.g. Visio 2010) don't handle WM_PAINT properly and loop forever, * so after processing 100 messages we go back to checking the wait handles */ while (count++ < 100 && COM_PeekMessage(apt, &msg)) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b46ff03..83595cb 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2648,7 +2648,9 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) DWORD index; HRESULT hr; HWND hWnd; + UINT uMSG = 0xc065; MSG msg; + int ret; hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); @@ -2672,6 +2674,23 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) success = PeekMessageA(&msg, hWnd, WM_USER, WM_USER, PM_REMOVE); ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + /* Even if CoWaitForMultipleHandles does not pump a message it peeks + * at ALL of them */ + index = 0xdeadbeef; + PostMessageA(NULL, uMSG, 0, 0); + + hr = CoWaitForMultipleHandles(COWAIT_ALERTABLE, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + + /* Make sure message was peeked at */ + ret = MsgWaitForMultipleObjectsEx(0, NULL, 2, QS_ALLPOSTMESSAGE, MWMO_ALERTABLE); + ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret); + + /* But not pumped */ + success = PeekMessageA(&msg, NULL, uMSG, uMSG, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + DestroyWindow(hWnd); CoUninitialize(); return 0;

1 0

Aric Stewart : joy.cpl: Add parameters for Condition FF effects.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: afb9de281e9214a9ae45c2bdf98b7595236198b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afb9de281e9214a9ae45c2bd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 18 13:56:23 2018 -0600 joy.cpl: Add parameters for Condition FF effects. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index fbf6135..51c2fdf 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -724,6 +724,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) DIRAMPFORCE rforce; DICONSTANTFORCE cforce; DIPERIODIC pforce; + DICONDITION cdforce; if (joystick->effects == NULL) { @@ -777,6 +778,22 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) dieffect.lpvTypeSpecificParams = &pforce; dieffect.dwFlags |= DIEP_TYPESPECIFICPARAMS; } + else if (IsEqualGUID(&pdei->guid, &GUID_Spring) || + IsEqualGUID(&pdei->guid, &GUID_Damper) || + IsEqualGUID(&pdei->guid, &GUID_Inertia) || + IsEqualGUID(&pdei->guid, &GUID_Friction)) + { + cdforce.dwPositiveSaturation = 10000; + cdforce.dwNegativeSaturation = 10000; + cdforce.lPositiveCoefficient = 10000; + cdforce.lNegativeCoefficient = 10000; + cdforce.lDeadBand = 0; + cdforce.lOffset = 0; + + dieffect.cbTypeSpecificParams = sizeof(cdforce); + dieffect.lpvTypeSpecificParams = &cdforce; + dieffect.dwFlags |= DIEP_TYPESPECIFICPARAMS; + } hr = IDirectInputDevice2_CreateEffect( joystick->device, &pdei->guid, &dieffect, &joystick->effects[joystick->cur_effect].effect, NULL);

1 0

Huw Davies : hhctrl: Use a helper to free the wintype structure.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 38f72da612e8959b873e137a2202aeb8ba7e5705 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38f72da612e8959b873e137a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 19 08:41:31 2018 +0000 hhctrl: Use a helper to free the wintype structure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/chm.c | 67 +++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 641fe95..39c1eca 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -308,15 +308,31 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) #endif } -static inline WCHAR *ConvertChmString(HHInfo *info, const WCHAR **str) +static inline WCHAR *ConvertChmString(HHInfo *info, DWORD id) { WCHAR *ret = NULL; - if(*str) - *str = ret = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)*str)); + if(id) + ret = strdupAtoW(GetChmString(info->pCHMInfo, id)); return ret; } +static inline void wintype_free(HH_WINTYPEW *wintype) +{ + heap_free((void *)wintype->pszType); + heap_free((void *)wintype->pszCaption); + heap_free(wintype->paInfoTypes); + heap_free((void *)wintype->pszToc); + heap_free((void *)wintype->pszIndex); + heap_free((void *)wintype->pszFile); + heap_free((void *)wintype->pszHome); + heap_free((void *)wintype->pszJump1); + heap_free((void *)wintype->pszJump2); + heap_free((void *)wintype->pszUrlJump1); + heap_free((void *)wintype->pszUrlJump2); + heap_free((void *)wintype->pszCustomTabs); +} + /* Loads the HH_WINTYPE data from the CHM file * * FIXME: There may be more than one window type in the file, so @@ -325,8 +341,6 @@ static inline WCHAR *ConvertChmString(HHInfo *info, const WCHAR **str) BOOL LoadWinTypeFromCHM(HHInfo *info) { LARGE_INTEGER liOffset; - WCHAR *pszType = NULL, *pszFile = NULL, *pszToc = NULL, *pszIndex = NULL, *pszCaption = NULL; - WCHAR *pszHome = NULL, *pszJump1 = NULL, *pszJump2 = NULL, *pszUrlJump1 = NULL, *pszUrlJump2 = NULL; IStorage *pStorage = info->pCHMInfo->pStorage; IStream *pStream = NULL; HH_WINTYPEW wintype; @@ -334,7 +348,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) DWORD cbRead; BOOL ret = FALSE; - static const WCHAR null[] = {0}; + static const WCHAR empty[] = {0}; static const WCHAR toc_extW[] = {'h','h','c',0}; static const WCHAR index_extW[] = {'h','h','k',0}; static const WCHAR windowsW[] = {'#','W','I','N','D','O','W','S',0}; @@ -353,16 +367,16 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) if (FAILED(hr)) goto done; /* convert the #STRINGS offsets to actual strings */ - pszType = ConvertChmString(info, &wintype.pszType); - pszFile = ConvertChmString(info, &wintype.pszFile); - pszToc = ConvertChmString(info, &wintype.pszToc); - pszIndex = ConvertChmString(info, &wintype.pszIndex); - pszCaption = ConvertChmString(info, &wintype.pszCaption); - pszHome = ConvertChmString(info, &wintype.pszHome); - pszJump1 = ConvertChmString(info, &wintype.pszJump1); - pszJump2 = ConvertChmString(info, &wintype.pszJump2); - pszUrlJump1 = ConvertChmString(info, &wintype.pszUrlJump1); - pszUrlJump2 = ConvertChmString(info, &wintype.pszUrlJump2); + wintype.pszType = ConvertChmString(info, (DWORD)wintype.pszType); + wintype.pszFile = ConvertChmString(info, (DWORD)wintype.pszFile); + wintype.pszToc = ConvertChmString(info, (DWORD)wintype.pszToc); + wintype.pszIndex = ConvertChmString(info, (DWORD)wintype.pszIndex); + wintype.pszCaption = ConvertChmString(info, (DWORD)wintype.pszCaption); + wintype.pszHome = ConvertChmString(info, (DWORD)wintype.pszHome); + wintype.pszJump1 = ConvertChmString(info, (DWORD)wintype.pszJump1); + wintype.pszJump2 = ConvertChmString(info, (DWORD)wintype.pszJump2); + wintype.pszUrlJump1 = ConvertChmString(info, (DWORD)wintype.pszUrlJump1); + wintype.pszUrlJump2 = ConvertChmString(info, (DWORD)wintype.pszUrlJump2); } else { @@ -371,9 +385,9 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) memset(&wintype, 0, sizeof(wintype)); wintype.cbStruct = sizeof(wintype); wintype.fUniCodeStrings = TRUE; - wintype.pszType = pszType = strdupW(info->pCHMInfo->defWindow ? info->pCHMInfo->defWindow : defaultwinW); - wintype.pszToc = pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : null); - wintype.pszIndex = pszIndex = strdupW(null); + wintype.pszType = strdupW(info->pCHMInfo->defWindow ? info->pCHMInfo->defWindow : defaultwinW); + wintype.pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : empty); + wintype.pszIndex = strdupW(empty); wintype.fsValidMembers = 0; wintype.fsWinProperties = HHWIN_PROP_TRI_PANE; wintype.dwStyles = WS_POPUP; @@ -385,24 +399,15 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) /* merge the new data with any pre-existing HH_WINTYPE structure */ MergeChmProperties(&wintype, info, FALSE); if (!info->WinType.pszCaption) - info->WinType.pszCaption = info->stringsW.pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null); + info->WinType.pszCaption = info->stringsW.pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : empty); if (!info->WinType.pszFile) - info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); + info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : empty); if (!info->WinType.pszToc) info->WinType.pszToc = info->stringsW.pszToc = FindHTMLHelpSetting(info, toc_extW); if (!info->WinType.pszIndex) info->WinType.pszIndex = info->stringsW.pszIndex = FindHTMLHelpSetting(info, index_extW); - heap_free(pszType); - heap_free(pszFile); - heap_free(pszToc); - heap_free(pszIndex); - heap_free(pszCaption); - heap_free(pszHome); - heap_free(pszJump1); - heap_free(pszJump2); - heap_free(pszUrlJump1); - heap_free(pszUrlJump2); + wintype_free(&wintype); ret = TRUE; done:

1 0

Huw Davies : hhctrl: Fix loading of the wintype data on 64-bit.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: dcd96f5f7a4e40d2ec7f0d6db766a022a856d68b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd96f5f7a4e40d2ec7f0d6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 19 08:41:32 2018 +0000 hhctrl: Fix loading of the wintype data on 64-bit. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/chm.c | 88 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 14 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 39c1eca..8cf2539 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -353,6 +353,52 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) static const WCHAR index_extW[] = {'h','h','k',0}; static const WCHAR windowsW[] = {'#','W','I','N','D','O','W','S',0}; + /* HH_WINTYPE as stored on disk. It's identical to HH_WINTYPE except that the pointer fields + have been changed to DWORDs, so that the layout on 64-bit remains unchanged. */ + struct file_wintype + { + int cbStruct; + BOOL fUniCodeStrings; + DWORD pszType; + DWORD fsValidMembers; + DWORD fsWinProperties; + DWORD pszCaption; + DWORD dwStyles; + DWORD dwExStyles; + RECT rcWindowPos; + int nShowState; + DWORD hwndHelp; + DWORD hwndCaller; + DWORD paInfoTypes; + DWORD hwndToolBar; + DWORD hwndNavigation; + DWORD hwndHTML; + int iNavWidth; + RECT rcHTML; + DWORD pszToc; + DWORD pszIndex; + DWORD pszFile; + DWORD pszHome; + DWORD fsToolBarFlags; + BOOL fNotExpanded; + int curNavType; + int tabpos; + int idNotify; + BYTE tabOrder[HH_MAX_TABS+1]; + int cHistory; + DWORD pszJump1; + DWORD pszJump2; + DWORD pszUrlJump1; + DWORD pszUrlJump2; + RECT rcMinSize; + int cbInfoTypes; + DWORD pszCustomTabs; + } file_wintype; + + memset(&wintype, 0, sizeof(wintype)); + wintype.cbStruct = sizeof(wintype); + wintype.fUniCodeStrings = TRUE; + hr = IStorage_OpenStream(pStorage, windowsW, NULL, STGM_READ, 0, &pStream); if (SUCCEEDED(hr)) { @@ -363,28 +409,42 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) if (FAILED(hr)) goto done; /* read the HH_WINTYPE struct data */ - hr = IStream_Read(pStream, &wintype, sizeof(wintype), &cbRead); + hr = IStream_Read(pStream, &file_wintype, sizeof(file_wintype), &cbRead); if (FAILED(hr)) goto done; /* convert the #STRINGS offsets to actual strings */ - wintype.pszType = ConvertChmString(info, (DWORD)wintype.pszType); - wintype.pszFile = ConvertChmString(info, (DWORD)wintype.pszFile); - wintype.pszToc = ConvertChmString(info, (DWORD)wintype.pszToc); - wintype.pszIndex = ConvertChmString(info, (DWORD)wintype.pszIndex); - wintype.pszCaption = ConvertChmString(info, (DWORD)wintype.pszCaption); - wintype.pszHome = ConvertChmString(info, (DWORD)wintype.pszHome); - wintype.pszJump1 = ConvertChmString(info, (DWORD)wintype.pszJump1); - wintype.pszJump2 = ConvertChmString(info, (DWORD)wintype.pszJump2); - wintype.pszUrlJump1 = ConvertChmString(info, (DWORD)wintype.pszUrlJump1); - wintype.pszUrlJump2 = ConvertChmString(info, (DWORD)wintype.pszUrlJump2); + wintype.pszType = ConvertChmString(info, file_wintype.pszType); + wintype.fsValidMembers = file_wintype.fsValidMembers; + wintype.fsWinProperties = file_wintype.fsWinProperties; + wintype.pszCaption = ConvertChmString(info, file_wintype.pszCaption); + wintype.dwStyles = file_wintype.dwStyles; + wintype.dwExStyles = file_wintype.dwExStyles; + wintype.rcWindowPos = file_wintype.rcWindowPos; + wintype.nShowState = file_wintype.nShowState; + wintype.iNavWidth = file_wintype.iNavWidth; + wintype.rcHTML = file_wintype.rcHTML; + wintype.pszToc = ConvertChmString(info, file_wintype.pszToc); + wintype.pszIndex = ConvertChmString(info, file_wintype.pszIndex); + wintype.pszFile = ConvertChmString(info, file_wintype.pszFile); + wintype.pszHome = ConvertChmString(info, file_wintype.pszHome); + wintype.fsToolBarFlags = file_wintype.fsToolBarFlags; + wintype.fNotExpanded = file_wintype.fNotExpanded; + wintype.curNavType = file_wintype.curNavType; + wintype.tabpos = file_wintype.tabpos; + wintype.idNotify = file_wintype.idNotify; + memcpy(&wintype.tabOrder, file_wintype.tabOrder, sizeof(wintype.tabOrder)); + wintype.cHistory = file_wintype.cHistory; + wintype.pszJump1 = ConvertChmString(info, file_wintype.pszJump1); + wintype.pszJump2 = ConvertChmString(info, file_wintype.pszJump2); + wintype.pszUrlJump1 = ConvertChmString(info, file_wintype.pszUrlJump1); + wintype.pszUrlJump2 = ConvertChmString(info, file_wintype.pszUrlJump2); + wintype.rcMinSize = file_wintype.rcMinSize; + wintype.cbInfoTypes = file_wintype.cbInfoTypes; } else { /* no defined window types so use (hopefully) sane defaults */ static const WCHAR defaultwinW[] = {'d','e','f','a','u','l','t','w','i','n','\0'}; - memset(&wintype, 0, sizeof(wintype)); - wintype.cbStruct = sizeof(wintype); - wintype.fUniCodeStrings = TRUE; wintype.pszType = strdupW(info->pCHMInfo->defWindow ? info->pCHMInfo->defWindow : defaultwinW); wintype.pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : empty); wintype.pszIndex = strdupW(empty);

1 0