June 2017 - Wine-Commits - list.winehq.org

Zebediah Figura : msi: Implement INSTALLMESSAGE_INITIALIZE and INSTALLMESSAGE_TERMINATE.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: bcc4a0475491d7672ffbf4ec7376d1165ad1b6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc4a0475491d7672ffbf4ec7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 20:28:01 2017 -0500 msi: Implement INSTALLMESSAGE_INITIALIZE and INSTALLMESSAGE_TERMINATE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 29 +++++++++++++++++++++-------- dlls/msi/tests/format.c | 3 +++ dlls/msi/tests/package.c | 4 ++-- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7c537d4..00a8283 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -352,6 +352,7 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile ); + MSI_ProcessMessage(NULL, INSTALLMESSAGE_TERMINATE, 0); } static UINT create_temp_property_table(MSIPACKAGE *package) @@ -1477,6 +1478,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) TRACE("%s %p\n", debugstr_w(szPackage), pPackage); + MSI_ProcessMessage(NULL, INSTALLMESSAGE_INITIALIZE, 0); + localfile[0] = 0; if( szPackage[0] == '#' ) { @@ -1638,6 +1641,8 @@ UINT WINAPI MsiOpenPackageExW(LPCWSTR szPackage, DWORD dwOptions, MSIHANDLE *phP ret = ERROR_NOT_ENOUGH_MEMORY; msiobj_release( &package->hdr ); } + else + MSI_ProcessMessage(NULL, INSTALLMESSAGE_TERMINATE, 0); return ret; } @@ -1787,13 +1792,17 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC msi_free(template); } - res = MSI_FormatRecordW(package, record, message, &len); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) - return res; - len++; - message = msi_alloc(len * sizeof(WCHAR)); - if (!message) return ERROR_OUTOFMEMORY; - MSI_FormatRecordW(package, record, message, &len); + if (!package || !record) + message = NULL; + else { + res = MSI_FormatRecordW(package, record, message, &len); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) + return res; + len++; + message = msi_alloc(len * sizeof(WCHAR)); + if (!message) return ERROR_OUTOFMEMORY; + MSI_FormatRecordW(package, record, message, &len); + } /* convert it to ASCII */ len = WideCharToMultiByte( CP_ACP, 0, message, -1, NULL, 0, NULL, NULL ); @@ -1821,7 +1830,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC rc = gUIHandlerA( gUIContext, eMessageType, msg ); } - if (!rc && package->log_file != INVALID_HANDLE_VALUE && + if (!rc && package && package->log_file != INVALID_HANDLE_VALUE && (eMessageType & 0xff000000) != INSTALLMESSAGE_PROGRESS) { DWORD written; @@ -1883,6 +1892,10 @@ INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType, MSIPACKAGE *package = NULL; MSIRECORD *record = NULL; + if ((eMessageType & 0xff000000) == INSTALLMESSAGE_INITIALIZE || + (eMessageType & 0xff000000) == INSTALLMESSAGE_TERMINATE) + return -1; + package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); if( !package ) { diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index b035cfa..d86a252 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2782,6 +2782,9 @@ static void test_processmessage(void) todo_wine ok( r == IDOK, "expected IDOK, got %i\n", r); + r = MsiProcessMessage(package, INSTALLMESSAGE_INITIALIZE, hrec); + ok( r == -1, "expected -1, got %i\n", r); + MsiCloseHandle(hrec); MsiCloseHandle(package); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9934c00..a46bb20 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9384,7 +9384,7 @@ static void test_externalui_message(void) r = MsiOpenPackageA("nonexistent", &hpkg); ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); - ok_sequence(openpackage_nonexistent_sequence, "MsiOpenPackage with nonexistent db", TRUE); + ok_sequence(openpackage_nonexistent_sequence, "MsiOpenPackage with nonexistent db", FALSE); r = package_from_db(hdb, &hpkg); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -9408,7 +9408,7 @@ static void test_externalui_message(void) /* close the package */ MsiCloseHandle(hpkg); - ok_sequence(closehandle_sequence, "MsiCloseHandle()", TRUE); + ok_sequence(closehandle_sequence, "MsiCloseHandle()", FALSE); CoUninitialize(); DeleteFileA(msifile);

1 0

Zebediah Figura : winedbg: Add support for printing SSE (XMM) registers.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: ad79c1eed222f0c52b665dba4c2cd3d1e2787646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad79c1eed222f0c52b665dba4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 14:48:15 2017 -0500 winedbg: Add support for printing SSE (XMM) registers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_i386.c | 60 +++++++++++++++++++++++++++++++++++++++++++- programs/winedbg/be_x86_64.c | 17 +++++++++++++ programs/winedbg/debugger.h | 1 + programs/winedbg/types.c | 9 +++++++ 4 files changed, 86 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 154d4e7..4d22708 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -33,6 +33,30 @@ extern void be_i386_disasm_one_insn(ADDRESS64* addr, int display); #define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) +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 ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD sel) { LDT_ENTRY le; @@ -129,6 +153,9 @@ static void be_i386_single_step(CONTEXT* ctx, BOOL enable) static void be_i386_all_print_context(HANDLE hThread, const CONTEXT* ctx) { + static const char mxcsr_flags[16][4] = { "IE", "DE", "ZE", "OE", "UE", "PE", "DAZ", "IM", + "DM", "ZM", "OM", "UM", "PM", "R-", "R+", "FZ" }; + XMM_SAVE_AREA32 *xmm_area; long double ST[8]; /* These are for floating regs */ int cnt; @@ -192,6 +219,29 @@ static void be_i386_all_print_context(HANDLE hThread, const CONTEXT* ctx) memcpy(&ST[cnt], &ctx->FloatSave.RegisterArea[cnt * 10], 10); dbg_printf(" ST%d:%Lf ", cnt, ST[cnt]); } + + xmm_area = (XMM_SAVE_AREA32 *) &ctx->ExtendedRegisters; + + dbg_printf(" mxcsr: %04x (", xmm_area->MxCsr ); + for (cnt = 0; cnt < 16; cnt++) + if (xmm_area->MxCsr & (1 << cnt)) dbg_printf( " %s", mxcsr_flags[cnt] ); + dbg_printf(" )\n"); + + for (cnt = 0; cnt < 8; cnt++) + { + dbg_printf( " xmm%u: uint=%08x%08x%08x%08x", cnt, + *((unsigned int *)&xmm_area->XmmRegisters[cnt] + 3), + *((unsigned int *)&xmm_area->XmmRegisters[cnt] + 2), + *((unsigned int *)&xmm_area->XmmRegisters[cnt] + 1), + *((unsigned int *)&xmm_area->XmmRegisters[cnt] + 0)); + dbg_printf( " double={%g; %g}", *(double *)&xmm_area->XmmRegisters[cnt].Low, + *(double *)&xmm_area->XmmRegisters[cnt].High ); + dbg_printf( " float={%g; %g; %g; %g}\n", + (double)*((float *)&xmm_area->XmmRegisters[cnt] + 0), + (double)*((float *)&xmm_area->XmmRegisters[cnt] + 1), + (double)*((float *)&xmm_area->XmmRegisters[cnt] + 2), + (double)*((float *)&xmm_area->XmmRegisters[cnt] + 3) ); + } dbg_printf("\n"); } @@ -295,6 +345,14 @@ static struct dbg_internal_var be_i386_ctx[] = {CV_REG_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[50]), dbg_itype_long_real}, {CV_REG_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[60]), dbg_itype_long_real}, {CV_REG_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[70]), dbg_itype_long_real}, + {CV_AMD64_XMM0, "XMM0", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[0])), dbg_itype_m128a}, + {CV_AMD64_XMM0+1, "XMM1", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[1])), dbg_itype_m128a}, + {CV_AMD64_XMM0+2, "XMM2", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[2])), dbg_itype_m128a}, + {CV_AMD64_XMM0+3, "XMM3", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[3])), dbg_itype_m128a}, + {CV_AMD64_XMM0+4, "XMM4", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[4])), dbg_itype_m128a}, + {CV_AMD64_XMM0+5, "XMM5", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[5])), dbg_itype_m128a}, + {CV_AMD64_XMM0+6, "XMM6", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[6])), dbg_itype_m128a}, + {CV_AMD64_XMM0+7, "XMM7", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[7])), dbg_itype_m128a}, {0, NULL, 0, dbg_itype_none} }; @@ -747,7 +805,7 @@ static int be_i386_adjust_pc_for_break(CONTEXT* ctx, BOOL way) static BOOL be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG* ret) { - if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; + if (size != 1 && size != 2 && size != 4 && size != 8 && size != 16) return FALSE; memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ /* FIXME: this assumes that debuggee and debugger use the same diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index abb4140..280cdec 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSSTRUCT #define NONAMELESSUNION #include "debugger.h" @@ -245,6 +246,22 @@ static struct dbg_internal_var be_x86_64_ctx[] = {CV_AMD64_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[5]), dbg_itype_long_real}, {CV_AMD64_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[6]), dbg_itype_long_real}, {CV_AMD64_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[7]), dbg_itype_long_real}, + {CV_AMD64_XMM0, "XMM0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm0), dbg_itype_m128a}, + {CV_AMD64_XMM0+1, "XMM1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm1), dbg_itype_m128a}, + {CV_AMD64_XMM0+2, "XMM2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm2), dbg_itype_m128a}, + {CV_AMD64_XMM0+3, "XMM3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm3), dbg_itype_m128a}, + {CV_AMD64_XMM0+4, "XMM4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm4), dbg_itype_m128a}, + {CV_AMD64_XMM0+5, "XMM5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm5), dbg_itype_m128a}, + {CV_AMD64_XMM0+6, "XMM6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm6), dbg_itype_m128a}, + {CV_AMD64_XMM0+7, "XMM7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm7), dbg_itype_m128a}, + {CV_AMD64_XMM8, "XMM8", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm8), dbg_itype_m128a}, + {CV_AMD64_XMM8+1, "XMM9", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm9), dbg_itype_m128a}, + {CV_AMD64_XMM8+2, "XMM10", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm10), dbg_itype_m128a}, + {CV_AMD64_XMM8+3, "XMM11", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm11), dbg_itype_m128a}, + {CV_AMD64_XMM8+4, "XMM12", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm12), dbg_itype_m128a}, + {CV_AMD64_XMM8+5, "XMM13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm13), dbg_itype_m128a}, + {CV_AMD64_XMM8+6, "XMM14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm14), dbg_itype_m128a}, + {CV_AMD64_XMM8+7, "XMM15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm15), dbg_itype_m128a}, {0, NULL, 0, dbg_itype_none} }; diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index e8a4d73..a4ffd70 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -84,6 +84,7 @@ enum dbg_internal_types dbg_itype_astring, dbg_itype_ustring, dbg_itype_segptr, /* hack for segmented pointers */ + dbg_itype_m128a, /* 128-bit (XMM) registers */ dbg_itype_none = 0xffffffff }; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index f050db5..3268d7e 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -921,6 +921,15 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v default: WINE_FIXME("unsupported %u for long real\n", ti); return FALSE; } break; + case dbg_itype_m128a: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 16; break; + case TI_GET_BASETYPE: X(DWORD) = btUInt; break; + default: WINE_FIXME("unsupported %u for XMM register\n", ti); return FALSE; + } + break; default: WINE_FIXME("unsupported type id 0x%lx\n", type->id); }

1 0

Zebediah Figura : winedbg: Add support for printing floating point registers.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 8314cdc45eeed61629688d0e841090b373e79dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8314cdc45eeed61629688d0e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 14:48:14 2017 -0500 winedbg: Add support for printing floating point registers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_i386.c | 14 +++++++++++--- programs/winedbg/be_x86_64.c | 14 +++++++++++--- programs/winedbg/types.c | 27 +++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 99e3b29..154d4e7 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -287,6 +287,14 @@ static struct dbg_internal_var be_i386_ctx[] = {CV_REG_FLAGS, "FLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_short_int}, {CV_REG_EIP, "EIP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Eip), dbg_itype_unsigned_int}, {CV_REG_EFLAGS, "EFLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_int}, + {CV_REG_ST0, "ST0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[ 0]), dbg_itype_long_real}, + {CV_REG_ST0+1, "ST1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[10]), dbg_itype_long_real}, + {CV_REG_ST0+2, "ST2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[20]), dbg_itype_long_real}, + {CV_REG_ST0+3, "ST3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[30]), dbg_itype_long_real}, + {CV_REG_ST0+4, "ST4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[40]), dbg_itype_long_real}, + {CV_REG_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[50]), dbg_itype_long_real}, + {CV_REG_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[60]), dbg_itype_long_real}, + {CV_REG_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[70]), dbg_itype_long_real}, {0, NULL, 0, dbg_itype_none} }; @@ -767,9 +775,9 @@ static BOOL be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, if (!memory_read_value(lvalue, size, tmp)) return FALSE; /* float & double types have to be promoted to a long double */ - if (size == sizeof(float)) *ret = *(float*)tmp; - else if (size == sizeof(double)) *ret = *(double*)tmp; - else if (size == sizeof(long double)) *ret = *(long double*)tmp; + if (size == 4) *ret = *(float*)tmp; + else if (size == 8) *ret = *(double*)tmp; + else if (size == 10) *ret = *(long double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 17feb88..abb4140 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -237,6 +237,14 @@ static struct dbg_internal_var be_x86_64_ctx[] = {CV_AMD64_R13, "R13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R13), dbg_itype_unsigned_long_int}, {CV_AMD64_R14, "R14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R14), dbg_itype_unsigned_long_int}, {CV_AMD64_R15, "R15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R15), dbg_itype_unsigned_long_int}, + {CV_AMD64_ST0, "ST0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[0]), dbg_itype_long_real}, + {CV_AMD64_ST0+1, "ST1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[1]), dbg_itype_long_real}, + {CV_AMD64_ST0+2, "ST2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[2]), dbg_itype_long_real}, + {CV_AMD64_ST0+3, "ST3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[3]), dbg_itype_long_real}, + {CV_AMD64_ST0+4, "ST4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[4]), dbg_itype_long_real}, + {CV_AMD64_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[5]), dbg_itype_long_real}, + {CV_AMD64_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[6]), dbg_itype_long_real}, + {CV_AMD64_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[7]), dbg_itype_long_real}, {0, NULL, 0, dbg_itype_none} }; @@ -631,9 +639,9 @@ static BOOL be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size if (!memory_read_value(lvalue, size, tmp)) return FALSE; /* float & double types have to be promoted to a long double */ - if (size == sizeof(float)) *ret = *(float*)tmp; - else if (size == sizeof(double)) *ret = *(double*)tmp; - else if (size == sizeof(long double)) *ret = *(long double*)tmp; + if (size == 4) *ret = *(float*)tmp; + else if (size == 8) *ret = *(double*)tmp; + else if (size == 10) *ret = *(long double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 2df7572..f050db5 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -894,6 +894,33 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v default: WINE_FIXME("unsupported %u for seg-ptr\n", ti); return FALSE; } break; + case dbg_itype_short_real: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 4; break; + case TI_GET_BASETYPE: X(DWORD) = btFloat; break; + default: WINE_FIXME("unsupported %u for short real\n", ti); return FALSE; + } + break; + case dbg_itype_real: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 8; break; + case TI_GET_BASETYPE: X(DWORD) = btFloat; break; + default: WINE_FIXME("unsupported %u for real\n", ti); return FALSE; + } + break; + case dbg_itype_long_real: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 10; break; + case TI_GET_BASETYPE: X(DWORD) = btFloat; break; + default: WINE_FIXME("unsupported %u for long real\n", ti); return FALSE; + } + break; default: WINE_FIXME("unsupported type id 0x%lx\n", type->id); }

1 0

Dmitry Timoshkov : windowscodecs/tests: Add more tests for IWICMetadataQueryReader::GetMetadataByName.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: ad76bbec2264f6b759fb7c64e9e358aee7b2ad30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad76bbec2264f6b759fb7c64e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Jun 25 13:24:30 2017 +0800 windowscodecs/tests: Add more tests for IWICMetadataQueryReader::GetMetadataByName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/Makefile.in | 2 +- dlls/windowscodecs/tests/metadata.c | 619 +++++++++++++++++++++++++++++++++++ po/ar.po | 480 ++++++++++++++++++++++++++- po/bg.po | 437 ++++++++++++++++++++++++- po/ca.po | 482 ++++++++++++++++++++++++++- po/cs.po | 478 ++++++++++++++++++++++++++- po/da.po | 482 ++++++++++++++++++++++++++- po/de.po | 482 ++++++++++++++++++++++++++- po/el.po | 422 +++++++++++++++++++++++- po/en.po | 402 ++++++++++++++++++++++- po/en_US.po | 402 ++++++++++++++++++++++- po/eo.po | 456 +++++++++++++++++++++++++- po/es.po | 482 ++++++++++++++++++++++++++- po/fa.po | 415 ++++++++++++++++++++++- po/fi.po | 482 ++++++++++++++++++++++++++- po/fr.po | 482 ++++++++++++++++++++++++++- po/he.po | 455 ++++++++++++++++++++++++- po/hi.po | 410 ++++++++++++++++++++++- po/hr.po | 476 ++++++++++++++++++++++++++- po/hu.po | 482 ++++++++++++++++++++++++++- po/it.po | 482 ++++++++++++++++++++++++++- po/ja.po | 482 ++++++++++++++++++++++++++- po/ko.po | 482 ++++++++++++++++++++++++++- po/lt.po | 482 ++++++++++++++++++++++++++- po/ml.po | 410 ++++++++++++++++++++++- po/nb_NO.po | 482 ++++++++++++++++++++++++++- po/nl.po | 482 ++++++++++++++++++++++++++- po/or.po | 410 ++++++++++++++++++++++- po/pa.po | 410 ++++++++++++++++++++++- po/pl.po | 482 ++++++++++++++++++++++++++- po/pt_BR.po | 482 ++++++++++++++++++++++++++- po/pt_PT.po | 482 ++++++++++++++++++++++++++- po/rm.po | 416 ++++++++++++++++++++++- po/ro.po | 479 ++++++++++++++++++++++++++- po/ru.po | 482 ++++++++++++++++++++++++++- po/sk.po | 450 ++++++++++++++++++++++++- po/sl.po | 482 ++++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 443 ++++++++++++++++++++++++- po/sr_RS(a)latin.po | 458 +++++++++++++++++++++++++- po/sv.po | 482 ++++++++++++++++++++++++++- po/te.po | 410 ++++++++++++++++++++++- po/th.po | 423 +++++++++++++++++++++++- po/tr.po | 482 ++++++++++++++++++++++++++- po/uk.po | 480 ++++++++++++++++++++++++++- po/wa.po | 419 +++++++++++++++++++++++- po/wine.pot | 402 ++++++++++++++++++++++- po/zh_CN.po | 482 ++++++++++++++++++++++++++- po/zh_TW.po | 482 ++++++++++++++++++++++++++- 48 files changed, 21253 insertions(+), 415 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad76bbec2264f6b759fb7…

1 0

Alistair Leslie-Hughes : oledb32: Support DB/DATE/TIME/ TIMESTAMP in GetConversionSize for W/STR.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 9d11f0f9624b03c1148922180429cf43923567da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d11f0f9624b03c1148922180… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 26 00:48:29 2017 +0000 oledb32: Support DB/DATE/TIME/TIMESTAMP in GetConversionSize for W/STR. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 6 ++++ dlls/oledb32/tests/convert.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index d959f65..91de291 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1409,6 +1409,9 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, case DBTYPE_I8: case DBTYPE_UI8: case DBTYPE_R4: + case DBTYPE_DBDATE: + case DBTYPE_DBTIMESTAMP: + case DBTYPE_DBTIME: break; default: FIXME("unimplemented for %04x -> DBTYPE_STR\n", src_type); @@ -1453,6 +1456,9 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, case DBTYPE_I8: case DBTYPE_UI8: case DBTYPE_R4: + case DBTYPE_DBDATE: + case DBTYPE_DBTIMESTAMP: + case DBTYPE_DBTIME: break; default: FIXME("unimplemented for %04x -> DBTYPE_WSTR\n", src_type); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 82afb59..813c72a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2722,6 +2722,9 @@ static void test_getconversionsize(void) LONGLONG i8 = 202; DATE dbdate; DECIMAL dec; + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; + DBTIME dbtime; + DBDATE dbdate1; /* same way as CanConvert fails here */ dst_len = 0; @@ -2993,6 +2996,39 @@ static void test_getconversionsize(void) ok(dst_len == 110, "%ld\n", dst_len); dst_len = 0; + src_len = sizeof(ts); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIMESTAMP, DBTYPE_WSTR, &src_len, &dst_len, &ts); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIMESTAMP, DBTYPE_WSTR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + src_len = sizeof(dbtime); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIME, DBTYPE_WSTR, &src_len, &dst_len, &dbtime); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIME, DBTYPE_WSTR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + src_len = sizeof(dbdate1); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBDATE, DBTYPE_WSTR, &src_len, &dst_len, &dbdate1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBDATE, DBTYPE_WSTR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; src_len = sizeof(i4); hr = IDataConvert_GetConversionSize(convert, DBTYPE_I4, DBTYPE_STR, &src_len, &dst_len, &i4); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3112,6 +3148,39 @@ static void test_getconversionsize(void) hr = IDataConvert_GetConversionSize(convert, DBTYPE_EMPTY, DBTYPE_STR, NULL, &dst_len, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + src_len = sizeof(ts); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIMESTAMP, DBTYPE_STR, &src_len, &dst_len, &ts); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIMESTAMP, DBTYPE_STR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + src_len = sizeof(dbtime); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIME, DBTYPE_STR, &src_len, &dst_len, &dbtime); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIME, DBTYPE_STR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + src_len = sizeof(dbdate1); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBDATE, DBTYPE_STR, &src_len, &dst_len, &dbdate1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBDATE, DBTYPE_STR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); } static void test_converttobytes(void)

1 0

Dmitry Timoshkov : windowscodecs: Add some tests for IWICMetadataQueryReader.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: c092f1a45ab75eeda06f6fff26352c54d4ae25af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c092f1a45ab75eeda06f6fff2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Jun 25 13:24:26 2017 +0800 windowscodecs: Add some tests for IWICMetadataQueryReader. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 201 +++++++++++++++++++++++++++++++++++- 1 file changed, 197 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c092f1a45ab75eeda06f6…

1 0

Dmitry Timoshkov : windowscodecs: Add initial implementation of IWICMetadataQueryReader::GetMetadataByName.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 2271ba87132b588492175d89f532b147e4e8b358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2271ba87132b588492175d89f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Jun 25 13:24:23 2017 +0800 windowscodecs: Add initial implementation of IWICMetadataQueryReader::GetMetadataByName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 490 ++++++++++++++++++++++++++++++++++++- include/propidl.idl | 2 + 2 files changed, 488 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2271ba87132b588492175…

1 0

Jeremy Newman : update to RSVP form for 2017
by Jeremy Newman June 27, 2017

June 27, 2017

Module: website Branch: master Commit: b63e46bfc436d0d7aa628b74253bf1e5a225b5c0 URL: http://source.winehq.org/git/website.git/?a=commit;h=b63e46bfc436d0d7aa628b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 27 10:05:30 2017 -0500 update to RSVP form for 2017 --- templates/en/wineconf/rsvp.template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 7df2564..5891b75 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,4 +1,3 @@ - - -<iframe id="rsvp" src="https://docs.google.com/forms/d/15RugGIfd1gU-BguHWyfDvhjF2PSkdDpS1-pOkgDrh5…" frameborder="0" marginheight="0" marginwidth="0" width="90%" height="900">Loading...</iframe> + +<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSf5eAdYjHyQg13cndWcQFTIS4Wym5fyjV0…" width="90%" height="1200" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe>

1 0

Francois Gouget : testbot: Rerun the task in case of a TestBot error.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: tools Branch: master Commit: 8cce3d3bad2a581403ae2ee7814825b8db1a8eca URL: http://source.winehq.org/git/tools.git/?a=commit;h=8cce3d3bad2a581403ae2ee7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 26 19:00:44 2017 +0200 testbot: Rerun the task in case of a TestBot error. This improves the robustness in the face of network or virtualization errors. Set the $MaxTaskTries setting to configure the number of attempts. Note that this does not impact regular failures and thus flaky tests, these should be handled in TestLauncher. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 52 +++++++++++++++++++++++++++-------- testbot/bin/WineRunReconfig.pl | 57 +++++++++++++++++++++++++++++--------- testbot/bin/WineRunTask.pl | 58 +++++++++++++++++++++++++++------------ testbot/lib/WineTestBot/Config.pm | 8 ++++-- testbot/lib/WineTestBot/Tasks.pm | 6 ++++ 5 files changed, 138 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=8cce3d3bad2a581403ae…

1 0

Hugh McMaster : reg/tests: Use verify_key() for consistency with the verify_reg*() functions.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: ceebbfc1ca75f002973c94bf955555f312efef65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceebbfc1ca75f002973c94bf9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:52 2017 +0000 reg/tests: Use verify_key() for consistency with the verify_reg*() functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e23586c..1161914 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -91,8 +91,8 @@ static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) (value && *value) ? value : "(Default)", err); } -#define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s) -static void verify_key_exist_(unsigned line, HKEY key_base, const char *subkey) +#define verify_key(k,s) verify_key_(__LINE__,k,s) +static void verify_key_(unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -1643,14 +1643,14 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1c "); + todo_wine verify_key(hkey, "Subkey1c "); err = RegDeleteKeyA(hkey, "Subkey1c "); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1d\t"); + todo_wine verify_key(hkey, "Subkey1d\t"); err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1659,28 +1659,28 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -1694,8 +1694,8 @@ static void test_import(void) "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + todo_wine verify_key(hkey, "Subkey3a"); + todo_wine verify_key(hkey, "Subkey3b"); test_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" @@ -2649,14 +2649,14 @@ static void test_unicode_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1c "); + todo_wine verify_key(hkey, "Subkey1c "); todo_wine err = RegDeleteKeyA(hkey, "Subkey1c "); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1d\t"); + todo_wine verify_key(hkey, "Subkey1d\t"); todo_wine err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2665,28 +2665,28 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -2700,8 +2700,8 @@ static void test_unicode_import(void) "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + todo_wine verify_key(hkey, "Subkey3a"); + todo_wine verify_key(hkey, "Subkey3b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n"

1 0