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

Zebediah Figura : winedbg: Add support for printing SSE (XMM) registers.
by Alexandre Julliard 27 Jun '17

27 Jun '17

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

Alistair Leslie-Hughes : oledb32: Support DB/DATE/TIME/ TIMESTAMP in GetConversionSize for W/STR.
by Alexandre Julliard 27 Jun '17

27 Jun '17

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

Zebediah Figura : msi/tests: Add tests for external UI callback.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 358ed0d8367338c05fdafa86fb322f04f0313e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=358ed0d8367338c05fdafa86f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 27 00:05:34 2017 -0500 msi/tests: Add tests for external UI callback. 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/tests/package.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 240 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 146d1fc..1196412 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -21,6 +21,7 @@ #define COBJMACROS +#include <assert.h> #include <stdio.h> #include <windows.h> #include <msidefs.h> @@ -841,18 +842,27 @@ static UINT package_from_db(MSIHANDLE hdb, MSIHANDLE *handle) return ERROR_SUCCESS; } -static void create_test_file(const CHAR *name) +static void create_file_data(LPCSTR name, LPCSTR data) { HANDLE file; DWORD written; file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); - WriteFile(file, name, strlen(name), &written, NULL); + if (file == INVALID_HANDLE_VALUE) + return; + + WriteFile(file, data, strlen(data), &written, NULL); WriteFile(file, "\n", strlen("\n"), &written, NULL); + CloseHandle(file); } +static void create_test_file(const CHAR *name) +{ + create_file_data(name, name); +} + typedef struct _tagVS_VERSIONINFO { WORD wLength; @@ -9179,6 +9189,232 @@ static void test_externalui(void) DeleteFileA(msifile); } +struct externalui_message { + UINT message; + int field_count; + char field[4][100]; + int match[4]; /* should we test for a match */ + int optional; +}; + +static struct externalui_message *sequence; +static int sequence_count, sequence_size; + +static void add_message(const struct externalui_message *msg) +{ + if (!sequence) + { + sequence_size = 10; + sequence = HeapAlloc(GetProcessHeap(), 0, sequence_size * sizeof(*sequence)); + } + if (sequence_count == sequence_size) + { + sequence_size *= 2; + sequence = HeapReAlloc(GetProcessHeap(), 0, sequence, sequence_size * sizeof(*sequence)); + } + + assert(sequence); + + sequence[sequence_count++] = *msg; +} + +static void flush_sequence(void) +{ + HeapFree(GetProcessHeap(), 0, sequence); + sequence = NULL; + sequence_count = sequence_size = 0; +} + +static void ok_sequence_(const struct externalui_message *expected, const char *context, BOOL todo, + const char *file, int line) +{ + static const struct externalui_message end_of_sequence = {0}; + const struct externalui_message *actual; + int failcount = 0; + int i; + + add_message(&end_of_sequence); + + actual = sequence; + + while (expected->message && actual->message) + { + if (expected->message == actual->message) + { + if (expected->field_count != actual->field_count) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: in msg 0x%08x expecting field count %d got %d\n", + context, expected->message, expected->field_count, actual->field_count); + failcount++; + } + + for (i = 0; i <= actual->field_count; i++) + { + if (expected->match[i] && strcmp(expected->field[i], actual->field[i])) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: in msg 0x%08x field %d: expected \"%s\", got \"%s\"\n", + context, expected->message, i, expected->field[i], actual->field[i]); + failcount++; + } + } + + expected++; + actual++; + } + else + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: the msg 0x%08x was expected, but got msg 0x%08x instead\n", + context, expected->message, actual->message); + failcount++; + if (todo) + goto done; + expected++; + actual++; + } + } + + if (expected->message || actual->message) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %08x - actual %08x\n", + context, expected->message, actual->message); + failcount++; + } + + if(todo && !failcount) /* succeeded yet marked todo */ + { + todo_wine + ok_(file, line)(TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + } + +done: + flush_sequence(); +} + +#define ok_sequence(exp, contx, todo) \ + ok_sequence_((exp), (contx), (todo), __FILE__, __LINE__) + +static const struct externalui_message empty_sequence[] = { + {0} +}; + +static const struct externalui_message openpackage_nonexistent_sequence[] = { + {INSTALLMESSAGE_INITIALIZE, -1}, + {INSTALLMESSAGE_TERMINATE, -1}, + {0} +}; + +static const struct externalui_message openpackage_sequence[] = { + {INSTALLMESSAGE_INITIALIZE, -1}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "0", "1033", "1252"}, {1, 1, 1, 1}}, + {INSTALLMESSAGE_INFO|MB_ICONHAND, 0, {""}, {0}}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "0", "1033", "1252"}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "1", "", ""}, {0, 1, 0, 0}}, + {0} +}; + +static const struct externalui_message doaction_costinitialize_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "CostInitialize", "", ""}, {0, 1, 0, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", ""}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", "1"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_custom_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "0"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message closehandle_sequence[] = { + {INSTALLMESSAGE_TERMINATE, -1}, + {0} +}; + +static INT CALLBACK externalui_message_callback(void *context, UINT message, MSIHANDLE hrecord) +{ + struct externalui_message msg; + char buffer[100]; + DWORD length = 100; + int i; + + msg.message = message; + msg.field_count = MsiRecordGetFieldCount(hrecord); + for (i = 0; i <= msg.field_count; i++) + { + length = 100; + MsiRecordGetStringA(hrecord, i, buffer, &length); + memcpy(msg.field[i], buffer, length+1); + } + + add_message(&msg); + + return 1; +} + +static void test_externalui_message(void) +{ + /* test that events trigger the correct sequence of messages */ + + INSTALLUI_HANDLER_RECORD prev; + const struct externalui_message *sequence = NULL; + MSIHANDLE hdb, hpkg; + UINT r; + + r = pMsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS, &sequence, &prev); + + flush_sequence(); + + CoInitialize(NULL); + + hdb = create_package_db(); + ok(hdb, "failed to create database\n"); + + create_file_data("forcecodepage.idt", "\r\n\r\n1252\t_ForceCodepage\r\n"); + r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d", r); + + r = MsiOpenPackageA(NULL, &hpkg); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok_sequence(empty_sequence, "MsiOpenPackage with NULL db", FALSE); + + 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); + + r = package_from_db(hdb, &hpkg); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFileA(msifile); + return; + } + ok(r == ERROR_SUCCESS, "failed to create package %u\n", r); + ok_sequence(openpackage_sequence, "MsiOpenPackage with valid db", TRUE); + + /* Test a standard action */ + r = MsiDoActionA(hpkg, "CostInitialize"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok_sequence(doaction_costinitialize_sequence, "MsiDoAction(\"CostInitialize\")", TRUE); + + /* Test a standard action */ + r = MsiDoActionA(hpkg, "custom"); + ok(r == ERROR_FUNCTION_NOT_CALLED, "Expected ERROR_FUNCTION_NOT_CALLED, got %d\n", r); + ok_sequence(doaction_custom_sequence, "MsiDoAction(\"custom\")", TRUE); + + /* close the package */ + MsiCloseHandle(hpkg); + ok_sequence(closehandle_sequence, "MsiCloseHandle()", TRUE); + + CoUninitialize(); + DeleteFileA(msifile); + DeleteFileA("forcecodepage.idt"); +} + START_TEST(package) { STATEMGRSTATUS status; @@ -9237,6 +9473,8 @@ START_TEST(package) test_MsiEnumComponentCosts(); test_MsiDatabaseCommit(); test_externalui(); + if (pMsiSetExternalUIRecord) + test_externalui_message(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0

Zebediah Figura : msi: Send the correct UI messages upon calling MsiDoAction().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: a388906a1a963b77125dc0f184484c0993b9fb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a388906a1a963b77125dc0f18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 20:28:00 2017 -0500 msi: Send the correct UI messages upon calling MsiDoAction(). 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/action.c | 218 ++++++++++++++++++++++++----------------------- dlls/msi/msi.rc | 140 ++++++++++++++++++++++++++++++ dlls/msi/package.c | 73 +++++++++------- dlls/msi/resource.h | 140 ++++++++++++++++++++++++++++++ dlls/msi/tests/format.c | 1 + dlls/msi/tests/package.c | 2 +- 6 files changed, 437 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a388906a1a963b77125dc…

1 0

Zebediah Figura : msi: Implement INSTALLMESSAGE_INITIALIZE and INSTALLMESSAGE_TERMINATE.
by Alexandre Julliard 27 Jun '17

27 Jun '17

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

Dmitry Timoshkov : windowscodecs: Add initial implementation of IWICMetadataQueryReader::GetMetadataByName.
by Alexandre Julliard 27 Jun '17

27 Jun '17

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

Dmitry Timoshkov : windowscodecs: Add some tests for IWICMetadataQueryReader.
by Alexandre Julliard 27 Jun '17

27 Jun '17

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

Jeremy Newman : update to RSVP form for 2017
by Jeremy Newman 27 Jun '17

27 Jun '17

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 27 Jun '17

27 Jun '17

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

Owen Rudge : wsdapi/tests: Add tests for Get/SetRetransmitParams.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 098ffa244d93002a909723662e12fa83d99e4d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098ffa244d93002a909723662… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:26:18 2017 +0100 wsdapi/tests: Add tests for Get/SetRetransmitParams. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/msgparams.c | 74 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index ba0590f..246cfd6 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -182,6 +182,79 @@ static void RemoteAddress_tests(void) ok(ret == 0, "WSACleanup failed: %d\n", ret); } +static void RetransmitParams_tests(void) +{ + WSDUdpRetransmitParams origParams, returnedParams; + IWSDUdpMessageParameters *udpMessageParams = NULL; + HRESULT rc; + int ret; + + ZeroMemory(&origParams, sizeof(WSDUdpRetransmitParams)); + ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); + + rc = WSDCreateUdpMessageParameters(&udpMessageParams); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); + + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, NULL); + todo_wine ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08x\n", rc); + + /* Check if the default values are returned */ + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); + todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + + ok(returnedParams.ulSendDelay == 0, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + todo_wine ok(returnedParams.ulRepeat == 1, "ulRepeat = %d\n", returnedParams.ulRepeat); + todo_wine ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + todo_wine ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + todo_wine ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + /* Now try setting some custom parameters */ + origParams.ulSendDelay = 100; + origParams.ulRepeat = 7; + origParams.ulRepeatMinDelay = 125; + origParams.ulRepeatMaxDelay = 175; + origParams.ulRepeatUpperDelay = 500; + + rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); + todo_wine ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + + ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); + + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); + todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + + todo_wine ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + todo_wine ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); + todo_wine ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + todo_wine ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + todo_wine ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + /* Now attempt to set some invalid parameters - these appear to be accepted */ + origParams.ulSendDelay = INFINITE; + origParams.ulRepeat = 500; + origParams.ulRepeatMinDelay = 250; + origParams.ulRepeatMaxDelay = 125; + origParams.ulRepeatUpperDelay = 100; + + rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); + todo_wine ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + + ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); + + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); + todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + + todo_wine ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + todo_wine ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); + todo_wine ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + todo_wine ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + todo_wine ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + ret = IWSDUdpMessageParameters_Release(udpMessageParams); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); +} + START_TEST(msgparams) { CoInitialize(NULL); @@ -189,6 +262,7 @@ START_TEST(msgparams) CreateUdpMessageParameters_tests(); LocalAddress_tests(); RemoteAddress_tests(); + RetransmitParams_tests(); CoUninitialize(); }

1 0