wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Henri Verbeet : wined3d: Set all render targets to NULL in IWineD3DDeviceImpl_Uninit3D().
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 1b726498ed97c2b424916200ae0c64c65e3b7cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b726498ed97c2b424916200a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 20:11:10 2011 +0100 wined3d: Set all render targets to NULL in IWineD3DDeviceImpl_Uninit3D(). --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92bc151..676eafc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2218,6 +2218,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, } } + for (i = 1; i < gl_info->limits.buffers; ++i) + { + IWineD3DDevice_SetRenderTarget(iface, i, NULL, FALSE); + } + TRACE("Releasing the render target at %p\n", This->render_targets[0]); IWineD3DSurface_Release((IWineD3DSurface *)This->render_targets[0]);

1 0

Alexandre Julliard : dbghelp: Use wine64 as loader name on 64-bit.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 16a2ea5c8f008c583fe6309fe330e24469e6b9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a2ea5c8f008c583fe6309fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 11:54:56 2011 +0100 dbghelp: Use wine64 as loader name on 64-bit. --- dlls/dbghelp/module.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 50cf114..ce5e63e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -108,23 +108,39 @@ void module_set_module(struct module* module, const WCHAR* name) const WCHAR *get_wine_loader_name(void) { + static const int is_win64 = sizeof(void *) > sizeof(int); /* FIXME: should depend on target process */ static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR suffixW[] = {'6','4',0}; static const WCHAR *loader; - const char *ptr; if (!loader) { + WCHAR *p, *buffer; + const char *ptr; + /* All binaries are loaded with WINELOADER (if run from tree) or by the * main executable */ if ((ptr = getenv("WINELOADER"))) { - DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); - WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + DWORD len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); + buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); - loader = buffer; } - else loader = wineW; + else + { + buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(wineW) + 2 * sizeof(WCHAR) ); + strcpyW( buffer, wineW ); + } + p = buffer + strlenW( buffer ) - strlenW( suffixW ); + if (p > buffer && !strcmpW( p, suffixW )) + { + if (!is_win64) *p = 0; + } + else if (is_win64) strcatW( buffer, suffixW ); + + TRACE( "returning %s\n", debugstr_w(buffer) ); + loader = buffer; } return loader; }

1 0

Alexandre Julliard : dbghelp: Add a helper function to determine the name of the wine loader.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 3bae7d03836bc57ccd602c40586e00609a6d9585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bae7d03836bc57ccd602c405… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 11:41:14 2011 +0100 dbghelp: Add a helper function to determine the name of the wine loader. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 18 +----------------- dlls/dbghelp/macho_module.c | 20 +------------------- dlls/dbghelp/module.c | 35 +++++++++++++++++++++++++++++++---- 4 files changed, 34 insertions(+), 41 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 388908a..b2b13c0 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -528,7 +528,6 @@ extern BOOL macho_synchronize_module_list(struct process* pcs); /* module.c */ extern const WCHAR S_ElfW[]; extern const WCHAR S_WineLoaderW[]; -extern const WCHAR S_WineW[]; extern const WCHAR S_SlashW[]; extern struct module* @@ -555,6 +554,7 @@ extern void module_reset_debug_info(struct module* module); extern BOOL module_remove(struct process* pcs, struct module* module); extern void module_set_module(struct module* module, const WCHAR* name); +extern const WCHAR *get_wine_loader_name(void); /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a64fe9f..e2391bd 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1458,23 +1458,7 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, */ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) { - BOOL ret; - const char* ptr; - - /* All binaries are loaded with WINELOADER (if run from tree) or by the - * main executable - */ - if ((ptr = getenv("WINELOADER"))) - { - WCHAR tmp[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, ptr, -1, tmp, sizeof(tmp) / sizeof(WCHAR)); - ret = elf_search_and_load_file(pcs, tmp, 0, 0, elf_info); - } - else - { - ret = elf_search_and_load_file(pcs, S_WineW, 0, 0, elf_info); - } - return ret; + return elf_search_and_load_file(pcs, get_wine_loader_name(), 0, 0, elf_info); } /****************************************************************** diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index ae67188..6b03fee 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1274,25 +1274,7 @@ BOOL macho_synchronize_module_list(struct process* pcs) */ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_info) { - BOOL ret; - const char* ptr; - - TRACE("(%p/%p, %p)\n", pcs, pcs->handle, macho_info); - - /* All binaries are loaded with WINELOADER (if run from tree) or by the - * main executable - */ - if ((ptr = getenv("WINELOADER"))) - { - WCHAR tmp[MAX_PATH]; - MultiByteToWideChar(CP_UNIXCP, 0, ptr, -1, tmp, sizeof(tmp) / sizeof(WCHAR)); - ret = macho_search_and_load_file(pcs, tmp, 0, macho_info); - } - else - { - ret = macho_search_and_load_file(pcs, S_WineW, 0, macho_info); - } - return ret; + return macho_search_and_load_file(pcs, get_wine_loader_name(), 0, macho_info); } /****************************************************************** diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index debfd5d..50cf114 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -38,7 +38,6 @@ static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; static const WCHAR S_DotDylibW[] = {'.','d','y','l','i','b','\0'}; static const WCHAR S_DotPdbW[] = {'.','p','d','b','\0'}; static const WCHAR S_DotDbgW[] = {'.','d','b','g','\0'}; -const WCHAR S_WineW[] = {'w','i','n','e',0}; const WCHAR S_SlashW[] = {'/','\0'}; static const WCHAR S_AcmW[] = {'.','a','c','m','\0'}; @@ -78,6 +77,7 @@ static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { + const WCHAR *loader = get_wine_loader_name(); const WCHAR *ptr, *endptr; size_t len, l; @@ -87,7 +87,7 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) out[len] = '\0'; if (len > 4 && (l = match_ext(out, len))) out[len - l] = '\0'; - else if (len > 4 && !strcmpiW(out + len - 4, S_WineW)) + else if (len > strlenW(loader) && !strcmpiW(out + len - strlenW(loader), loader)) lstrcpynW(out, S_WineLoaderW, size); else { @@ -106,6 +106,29 @@ void module_set_module(struct module* module, const WCHAR* name) NULL, NULL); } +const WCHAR *get_wine_loader_name(void) +{ + static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR *loader; + const char *ptr; + + if (!loader) + { + /* All binaries are loaded with WINELOADER (if run from tree) or by the + * main executable + */ + if ((ptr = getenv("WINELOADER"))) + { + DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); + WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); + loader = buffer; + } + else loader = wineW; + } + return loader; +} + static const char* get_module_type(enum module_type type, BOOL virtual) { switch (type) @@ -417,7 +440,8 @@ static BOOL module_is_container_loaded(const struct process* pcs, */ enum module_type module_get_type_by_name(const WCHAR* name) { - int len = strlenW(name); + int loader_len, len = strlenW(name); + const WCHAR *loader; /* Skip all version extensions (.[digits]) regex: "(\.\d+)*$" */ do @@ -452,7 +476,10 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_DBG; /* wine is also a native module (Mach-O on Mac OS X, ELF elsewhere) */ - if (((len > 4 && name[len - 5] == '/') || len == 4) && !strcmpiW(name + len - 4, S_WineW)) + loader = get_wine_loader_name(); + loader_len = strlenW( loader ); + if ((len == loader_len || (len > loader_len && name[len - loader_len - 1] == '/')) && + !strcmpiW(name + len - loader_len, loader)) { #ifdef __APPLE__ return DMT_MACHO;

1 0

Alexandre Julliard : winedbg: Add dumping of floating point registers for x86_64.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 22cd7e0e5e44af14271d35cd59a9c8431f4f1f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cd7e0e5e44af14271d35cd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 21:08:45 2011 +0100 winedbg: Add dumping of floating point registers for x86_64. --- programs/winedbg/be_x86_64.c | 83 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 82 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index bd7a00a..253b4ac 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -73,6 +73,8 @@ static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable) static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { + static const char mxcsr_flags[16][4] = { "IE", "DE", "ZE", "OE", "UE", "PE", "DAZ", "IM", + "DM", "ZM", "OM", "UM", "PM", "R-", "R+", "FZ" }; static const char flags[] = "aVR-N--ODITSZ-A-P-C"; char buf[33]; int i; @@ -92,7 +94,86 @@ static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, dbg_printf(" r11:%016lx r12:%016lx r13:%016lx r14:%016lx r15:%016lx\n", ctx->R11, ctx->R12, ctx->R13, ctx->R14, ctx->R15 ); - if (all_regs) dbg_printf( "Floating point x86_64 dump not implemented\n" ); + if (!all_regs) return; + + dbg_printf(" cs:%04x ds:%04x es:%04x fs:%04x gs:%04x ss:%04x\n", + ctx->SegCs, ctx->SegDs, ctx->SegEs, ctx->SegFs, ctx->SegGs, ctx->SegSs ); + + dbg_printf("Debug:\n"); + dbg_printf(" dr0:%016lx dr1:%016lx dr2:%016lx dr3:%016lx\n", + ctx->Dr0, ctx->Dr1, ctx->Dr2, ctx->Dr3 ); + dbg_printf(" dr6:%016lx dr7:%016lx\n", ctx->Dr6, ctx->Dr7 ); + + dbg_printf("Floating point:\n"); + dbg_printf(" flcw:%04x ", LOWORD(ctx->u.FltSave.ControlWord)); + dbg_printf(" fltw:%04x ", LOWORD(ctx->u.FltSave.TagWord)); + dbg_printf(" flsw:%04x", LOWORD(ctx->u.FltSave.StatusWord)); + + dbg_printf("(cc:%d%d%d%d", (ctx->u.FltSave.StatusWord & 0x00004000) >> 14, + (ctx->u.FltSave.StatusWord & 0x00000400) >> 10, + (ctx->u.FltSave.StatusWord & 0x00000200) >> 9, + (ctx->u.FltSave.StatusWord & 0x00000100) >> 8); + + dbg_printf(" top:%01x", (unsigned int) (ctx->u.FltSave.StatusWord & 0x00003800) >> 11); + + if (ctx->u.FltSave.StatusWord & 0x00000001) /* Invalid Fl OP */ + { + if (ctx->u.FltSave.StatusWord & 0x00000040) /* Stack Fault */ + { + if (ctx->u.FltSave.StatusWord & 0x00000200) /* C1 says Overflow */ + dbg_printf(" #IE(Stack Overflow)"); + else + dbg_printf(" #IE(Stack Underflow)"); /* Underflow */ + } + else dbg_printf(" #IE(Arithmetic error)"); /* Invalid Fl OP */ + } + if (ctx->u.FltSave.StatusWord & 0x00000002) dbg_printf(" #DE"); /* Denormalised OP */ + if (ctx->u.FltSave.StatusWord & 0x00000004) dbg_printf(" #ZE"); /* Zero Divide */ + if (ctx->u.FltSave.StatusWord & 0x00000008) dbg_printf(" #OE"); /* Overflow */ + if (ctx->u.FltSave.StatusWord & 0x00000010) dbg_printf(" #UE"); /* Underflow */ + if (ctx->u.FltSave.StatusWord & 0x00000020) dbg_printf(" #PE"); /* Precision error */ + if (ctx->u.FltSave.StatusWord & 0x00000040) + if (!(ctx->u.FltSave.StatusWord & 0x00000001)) + dbg_printf(" #SE"); /* Stack Fault (don't think this can occur) */ + if (ctx->u.FltSave.StatusWord & 0x00000080) dbg_printf(" #ES"); /* Error Summary */ + if (ctx->u.FltSave.StatusWord & 0x00008000) dbg_printf(" #FB"); /* FPU Busy */ + dbg_printf(")\n"); + dbg_printf(" flerr:%04x:%08x fldata:%04x:%08x\n", + ctx->u.FltSave.ErrorSelector, ctx->u.FltSave.ErrorOffset, + ctx->u.FltSave.DataSelector, ctx->u.FltSave.DataOffset ); + + for (i = 0; i < 4; i++) + { + long double st; + memcpy(&st, &ctx->u.FltSave.FloatRegisters[i * 10], 10); + dbg_printf(" st%u:%-16Lg ", i, st); + } + dbg_printf("\n"); + for (i = 4; i < 8; i++) + { + long double st; + memcpy(&st, &ctx->u.FltSave.FloatRegisters[i * 10], 10); + dbg_printf(" st%u:%-16Lg ", i, st); + } + dbg_printf("\n"); + + dbg_printf(" mxcsr: %04x (", ctx->u.FltSave.MxCsr ); + for (i = 0; i < 16; i++) + if (ctx->u.FltSave.MxCsr & (1 << i)) dbg_printf( " %s", mxcsr_flags[i] ); + dbg_printf(" )\n"); + + for (i = 0; i < 16; i++) + { + dbg_printf( " %sxmm%u: uint=%016lx%016lx", (i > 9) ? "" : " ", i, + ctx->u.FltSave.XmmRegisters[i].High, ctx->u.FltSave.XmmRegisters[i].Low ); + dbg_printf( " double={%g; %g}", *(double *)&ctx->u.FltSave.XmmRegisters[i].Low, + *(double *)&ctx->u.FltSave.XmmRegisters[i].High ); + dbg_printf( " float={%g; %g; %g; %g}\n", + (double)*((float *)&ctx->u.FltSave.XmmRegisters[i] + 0), + (double)*((float *)&ctx->u.FltSave.XmmRegisters[i] + 1), + (double)*((float *)&ctx->u.FltSave.XmmRegisters[i] + 2), + (double)*((float *)&ctx->u.FltSave.XmmRegisters[i] + 3) ); + } } static void be_x86_64_print_segment_info(HANDLE hThread, const CONTEXT* ctx)

1 0

Jacek Caban : jscript: Fixed some clang warnings.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 020245bba10e15e2a1b415f4a4a08d43f9fb1025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020245bba10e15e2a1b415f4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 27 13:38:36 2011 +0100 jscript: Fixed some clang warnings. --- dlls/jscript/array.c | 3 +++ dlls/jscript/engine.c | 2 +- dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.c | 3 ++- dlls/jscript/lex.c | 1 - dlls/jscript/number.c | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index b8fabe1..f99fe01 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -133,6 +133,9 @@ static HRESULT Array_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP HRESULT hres; hres = to_number(ctx, get_arg(dp, 0), ei, &num); + if(FAILED(hres)) + return hres; + if(V_VT(&num) == VT_I4) len = V_I4(&num); else diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9a5ecbc..1b56e63 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2415,7 +2415,7 @@ static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t } VariantClear(&val); - return S_OK; + return hres; } HRESULT typeof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ff5364a..765fade 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -441,7 +441,8 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI } } - hres = call_function(ctx, function, this_obj, &args, retv, ei, caller); + if(SUCCEEDED(hres)) + hres = call_function(ctx, function, this_obj, &args, retv, ei, caller); if(this_obj) IDispatch_Release(this_obj); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index a17b456..e5123b4 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -522,7 +522,8 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, item->flags = dwFlags; item->name = heap_strdupW(pstrName); if(!item->name) { - IDispatch_Release(disp); + if(disp) + IDispatch_Release(disp); heap_free(item); return E_OUTOFMEMORY; } diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 723f0ef..6dfe937 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -249,7 +249,6 @@ static BOOL unescape(WCHAR *str) } p++; - c = 0; switch(*p) { case '\'': diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index f95a19a..82dd5bc 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -150,7 +150,7 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D if(exp) { if(log_radix==0) - buf[idx++] = '\0'; + buf[idx] = 0; else { static const WCHAR formatW[] = {'(','e','%','c','%','d',')',0}; WCHAR ch;

1 0

Alexander Morozov : shell32/tests: Fix test failure on some NT4.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: c0ab36949db19b92b1f323eef1004596bb2f58df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ab36949db19b92b1f323eef… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Jan 27 14:44:02 2011 +0300 shell32/tests: Fix test failure on some NT4. --- dlls/shell32/tests/shelldispatch.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 34dbdb5..1c31736 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -83,7 +83,9 @@ static void test_namespace(void) V_I4(&var) = ssfPROGRAMFILES; r = IShellDispatch_NameSpace(sd, var, &folder); todo_wine - ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + ok(r == S_OK || + broken(r == S_FALSE), /* NT4 */ + "IShellDispatch::NameSpace failed: %08x\n", r); if (r == S_OK) { r = Folder_get_Title(folder, &title);

1 0

Hans Leidekker : winhttp/tests: Test a return value (clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 1549088da0681b675c965b3dd8530e8abb3a85c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1549088da0681b675c965b3dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:57:03 2011 +0100 winhttp/tests: Test a return value (clang). --- dlls/winhttp/tests/notification.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 6c9142b..7ceede7 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -295,6 +295,7 @@ static void test_redirect( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL );

1 0

Hans Leidekker : msi: Skip rollback custom actions.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 08c3d2a5ab76221af4f5bd56b30f2ad2394a7025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c3d2a5ab76221af4f5bd56b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:56:50 2011 +0100 msi: Skip rollback custom actions. --- dlls/msi/custom.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 5e0cbe0..80e1938 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -236,7 +236,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL } else if (type & msidbCustomActionTypeRollback) { - FIXME("Deferring rollback only action... rollbacks not supported yet\n"); + FIXME("Deferring rollback only action\n"); schedule_action(package, ROLLBACK_SCRIPT, deferred); } else @@ -274,6 +274,12 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL msi_free(actiondata); } + if (type & msidbCustomActionTypeRollback) + { + FIXME("Rollbacks not supported yet\n"); + rc = ERROR_SUCCESS; + goto end; + } } else if (!check_execution_scheduling_options(package,action,type)) {

1 0

Hans Leidekker : msi: Initialize a variable in get_patch_product_codes ( clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: aae1b210920435268673343d83004043d66411b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae1b210920435268673343d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:56:39 2011 +0100 msi: Initialize a variable in get_patch_product_codes (clang). --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 948ae35..325a5b0 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -306,7 +306,7 @@ static UINT get_patch_product_codes( LPCWSTR szPatchPackage, WCHAR ***product_co UINT r, type; DWORD size; static WCHAR empty[] = {0}; - WCHAR *codes; + WCHAR *codes = NULL; r = MsiOpenDatabaseW( szPatchPackage, MSIDBOPEN_READONLY, &patch ); if (r != ERROR_SUCCESS)

1 0

Hans Leidekker : msi: Return the correct disk prompt size from MsiSourceListEnumMediaDisksW ( clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: eb4e5d602458a14953cb8c17abd6de9962aa5dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4e5d602458a14953cb8c17a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:56:23 2011 +0100 msi: Return the correct disk prompt size from MsiSourceListEnumMediaDisksW (clang). --- dlls/msi/source.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 9b7a9ea..881f3d2 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -330,7 +330,6 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, else size = lstrlenW(ptr); - size = lstrlenW(ptr); if (size >= *pcchDiskPrompt) r = ERROR_MORE_DATA; else if (szDiskPrompt)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011