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

Ken Thomases : dbghelp: Add partial support for version 3 of DWARF CIEs which are generated by Clang /LLVM.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 500df92108ce726c177f62d8c18b4de9747b22a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500df92108ce726c177f62d8c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:17:48 2015 -0500 dbghelp: Add partial support for version 3 of DWARF CIEs which are generated by Clang/LLVM. --- dlls/dbghelp/dwarf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index fa9e559..03eb43b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2629,7 +2629,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* /* parse the CIE first */ version = dwarf2_parse_byte(ctx); - if (version != 1) + if (version != 1 && version != 3) { FIXME("unknown CIE version %u at %p\n", version, ctx->data - 1); return FALSE; @@ -2639,7 +2639,10 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* info->code_align = dwarf2_leb128_as_unsigned(ctx); info->data_align = dwarf2_leb128_as_signed(ctx); - info->retaddr_reg = dwarf2_parse_byte(ctx); + if (version == 1) + info->retaddr_reg = dwarf2_parse_byte(ctx); + else + info->retaddr_reg = dwarf2_leb128_as_unsigned(ctx); info->state.cfa_rule = RULE_CFA_OFFSET; end = NULL;

1 0

Ken Thomases : dbghelp: Remove the unused arch_size field of struct macho_file_map.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 41d741761f47d8aa2af8268b4ed5ef35f23b479b URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d741761f47d8aa2af8268b4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:57 2015 -0500 dbghelp: Remove the unused arch_size field of struct macho_file_map. It was set, but never read. --- dlls/dbghelp/macho_module.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 54801ef..0e353e7 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -129,7 +129,6 @@ struct macho_file_map /* The portion of the file which is this architecture. mach_header was * read from arch_offset. */ unsigned arch_offset; - unsigned arch_size; /* The range of address space covered by all segments. */ size_t segs_start; @@ -501,7 +500,6 @@ static BOOL macho_map_file(const WCHAR* filenameW, struct macho_file_map* fmap) if (swap_ulong_be_to_host(fat_arch.cputype) == TARGET_CPU_TYPE) { fmap->arch_offset = swap_ulong_be_to_host(fat_arch.offset); - fmap->arch_size = swap_ulong_be_to_host(fat_arch.size); break; } } @@ -511,7 +509,6 @@ static BOOL macho_map_file(const WCHAR* filenameW, struct macho_file_map* fmap) else { fmap->arch_offset = 0; - fmap->arch_size = statbuf.st_size; TRACE("... not a fat header\n"); }

1 0

Ken Thomases : dbghelp: Enable enumerating and loading 64-bit Mach-O modules.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 4923f9afd54a761b1f7598e274f617d0e8c102f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4923f9afd54a761b1f7598e27… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:56 2015 -0500 dbghelp: Enable enumerating and loading 64-bit Mach-O modules. --- dlls/dbghelp/macho_module.c | 129 +++++++++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4923f9afd54a761b1f759…

1 0

Ken Thomases : dbghelp: Eliminate an unnecessary parameter from macho_load_debug_info().
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 8430ebc6b535a3550a72a01422f0d50825ae8a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8430ebc6b535a3550a72a0142… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:54 2015 -0500 dbghelp: Eliminate an unnecessary parameter from macho_load_debug_info(). >From outside of macho_module.c, it's only called with NULL. When it's called with a non-NULL parameter, it's just a thin wrapper around macho_load_debug_info_from_map(), so the code can just call that directly. --- dlls/dbghelp/dbghelp_private.h | 3 +-- dlls/dbghelp/macho_module.c | 20 ++++++++------------ dlls/dbghelp/module.c | 2 +- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 56a5bb8..b620020 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -572,8 +572,7 @@ extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_th #define MACHO_NO_MAP ((const void*)-1) extern BOOL macho_enum_modules(HANDLE hProc, enum_modules_cb, void*) DECLSPEC_HIDDEN; extern BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) DECLSPEC_HIDDEN; -struct macho_file_map; -extern BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) DECLSPEC_HIDDEN; +extern BOOL macho_load_debug_info(struct module* module) DECLSPEC_HIDDEN; extern struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsigned long) DECLSPEC_HIDDEN; extern BOOL macho_read_wine_loader_dbg_info(struct process* pcs) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index bb49aa5..31beafa 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -901,12 +901,12 @@ static BOOL macho_load_debug_info_from_map(struct module* module, * * Loads Mach-O debugging information from the module image file. */ -BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) +BOOL macho_load_debug_info(struct module* module) { BOOL ret = TRUE; - struct macho_file_map my_fmap; + struct macho_file_map fmap; - TRACE("(%p, %p/%d)\n", module, fmap, fmap ? fmap->fd : -1); + TRACE("(%p)\n", module); if (module->type != DMT_MACHO || !module->format_info[DFI_MACHO]->u.macho_info) { @@ -914,15 +914,11 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) return FALSE; } - if (!fmap) - { - fmap = &my_fmap; - ret = macho_map_file(module->module.LoadedImageName, fmap); - } + ret = macho_map_file(module->module.LoadedImageName, &fmap); if (ret) - ret = macho_load_debug_info_from_map(module, fmap); + ret = macho_load_debug_info_from_map(module, &fmap); - if (fmap == &my_fmap) macho_unmap_file(fmap); + macho_unmap_file(&fmap); return ret; } @@ -1048,7 +1044,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, if (dbghelp_options & SYMOPT_DEFERRED_LOADS) macho_info->module->module.SymType = SymDeferred; - else if (!macho_load_debug_info(macho_info->module, &fmap)) + else if (!macho_load_debug_info_from_map(macho_info->module, &fmap)) ret = FALSE; macho_info->module->format_info[DFI_MACHO]->u.macho_info->in_use = 1; @@ -1480,7 +1476,7 @@ struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsign return NULL; } -BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) +BOOL macho_load_debug_info(struct module* module) { return FALSE; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 15769e8..10b0107 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -366,7 +366,7 @@ BOOL module_get_debug(struct module_pair* pair) &idslW64); break; case DMT_MACHO: - ret = macho_load_debug_info(pair->effective, NULL); + ret = macho_load_debug_info(pair->effective); break; default: ret = FALSE;

1 0

Ken Thomases : dbghelp: Fix STABS support for 64-bit on OS X.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 604ce29cb3b31c71496d581a415f8e41f4d026a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604ce29cb3b31c71496d581a4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 16:31:14 2015 -0500 dbghelp: Fix STABS support for 64-bit on OS X. OS X uses a struct nlist_64 for 64-bit images, where the n_value field is a 64-bit unsigned integer. --- dlls/dbghelp/stabs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 1d0d858..177c6bc 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -111,7 +111,11 @@ struct stab_nlist unsigned char n_type; char n_other; short n_desc; +#if defined(__APPLE__) && defined(_WIN64) + unsigned long n_value; +#else unsigned n_value; +#endif }; static void stab_strcpy(char* dest, int sz, const char* source) @@ -1465,7 +1469,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case 35: case 36: loc.reg = CV_REG_MM0 + stab_ptr->n_value - 29; break; default: - FIXME("Unknown register value (%u)\n", stab_ptr->n_value); + FIXME("Unknown register value (%lu)\n", (unsigned long)stab_ptr->n_value); loc.reg = CV_REG_NONE; break; } @@ -1615,7 +1619,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case N_EXCL: if (stabs_add_include(stabs_find_include(ptr, stab_ptr->n_value)) < 0) { - ERR("Excluded header not found (%s,%d)\n", ptr, stab_ptr->n_value); + ERR("Excluded header not found (%s,%ld)\n", ptr, (unsigned long)stab_ptr->n_value); module_reset_debug_info(module); ret = FALSE; goto done; @@ -1661,8 +1665,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, break; } stabbuff[0] = '\0'; - TRACE("0x%02x %x %s\n", - stab_ptr->n_type, stab_ptr->n_value, debugstr_a(strs + stab_ptr->n_strx)); + TRACE("0x%02x %lx %s\n", + stab_ptr->n_type, (unsigned long)stab_ptr->n_value, debugstr_a(strs + stab_ptr->n_strx)); } module->module.SymType = SymDia; module->module.CVSig = 'S' | ('T' << 8) | ('A' << 16) | ('B' << 24);

1 0

Thomas Faber : msimtf: Add stub implementation for IActiveIMMMessagePumpOwner.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: c4be28ed2605140d3cd9f3908a0f4535ed51c1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4be28ed2605140d3cd9f3908… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jun 23 15:38:16 2015 +0200 msimtf: Add stub implementation for IActiveIMMMessagePumpOwner. --- dlls/msimtf/activeimmapp.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index a9c259a..5749735 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimtf); typedef struct tagActiveIMMApp { IActiveIMMApp IActiveIMMApp_iface; + IActiveIMMMessagePumpOwner IActiveIMMMessagePumpOwner_iface; LONG refCount; } ActiveIMMApp; @@ -66,6 +67,10 @@ static HRESULT WINAPI ActiveIMMApp_QueryInterface (IActiveIMMApp* iface, { *ppvOut = This; } + else if (IsEqualIID(iid, &IID_IActiveIMMMessagePumpOwner)) + { + *ppvOut = &This->IActiveIMMMessagePumpOwner_iface; + } if (*ppvOut) { @@ -812,6 +817,80 @@ static const IActiveIMMAppVtbl ActiveIMMAppVtbl = ActiveIMMApp_EnumInputContext }; +static inline ActiveIMMApp *impl_from_IActiveIMMMessagePumpOwner(IActiveIMMMessagePumpOwner *iface) +{ + return CONTAINING_RECORD(iface, ActiveIMMApp, IActiveIMMMessagePumpOwner_iface); +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_QueryInterface(IActiveIMMMessagePumpOwner* iface, + REFIID iid, LPVOID *ppvOut) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_QueryInterface(&This->IActiveIMMApp_iface, iid, ppvOut); +} + +static ULONG WINAPI ActiveIMMMessagePumpOwner_AddRef(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_AddRef(&This->IActiveIMMApp_iface); +} + +static ULONG WINAPI ActiveIMMMessagePumpOwner_Release(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_Release(&This->IActiveIMMApp_iface); +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Start(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_End(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_OnTranslateMessage(IActiveIMMMessagePumpOwner* iface, + const MSG *msg) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%p): stub\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Pause(IActiveIMMMessagePumpOwner* iface, + DWORD *cookie) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%p): stub\n", This, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Resume(IActiveIMMMessagePumpOwner* iface, + DWORD cookie) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%u): stub\n", This, cookie); + return E_NOTIMPL; +} + +static const IActiveIMMMessagePumpOwnerVtbl ActiveIMMMessagePumpOwnerVtbl = +{ + ActiveIMMMessagePumpOwner_QueryInterface, + ActiveIMMMessagePumpOwner_AddRef, + ActiveIMMMessagePumpOwner_Release, + ActiveIMMMessagePumpOwner_Start, + ActiveIMMMessagePumpOwner_End, + ActiveIMMMessagePumpOwner_OnTranslateMessage, + ActiveIMMMessagePumpOwner_Pause, + ActiveIMMMessagePumpOwner_Resume, +}; + DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ActiveIMMApp *This; @@ -823,6 +902,7 @@ DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown * return E_OUTOFMEMORY; This->IActiveIMMApp_iface.lpVtbl = &ActiveIMMAppVtbl; + This->IActiveIMMMessagePumpOwner_iface.lpVtbl = &ActiveIMMMessagePumpOwnerVtbl; This->refCount = 1; TRACE("returning %p\n",This);

1 0

Thomas Faller : cmd: Fix invalid "else if" execution.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 3cda870469cc457766f677f51afe352285db437b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cda870469cc457766f677f51… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Wed Jun 24 20:10:04 2015 +0200 cmd: Fix invalid "else if" execution. --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 40 +++++++++++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 30b8684..5309bc0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1561,7 +1561,7 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, (*cmdList)->command)) { /* Swap between if and else processing */ - processThese = !processThese; + processThese = !executecmds; /* Process the ELSE part */ if (processThese) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 16fdd43..5351e9c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -667,7 +667,45 @@ if /c==/c ( ) else ( echo parameter detection seems to be broken ) - +SET elseIF=0 +if 1 == 1 ( + SET /a elseIF=%elseIF%+1 +) else if 1 == 1 ( + SET /a elseIF=%elseIF%+2 +) else ( + SET /a elseIF=%elseIF%+2 +) +if %elseIF% == 1 ( + echo else if seems to work +) else ( + echo else if seems to be broken +) +SET elseIF=0 +if 1 == 2 ( + SET /a elseIF=%elseIF%+2 +) else if 1 == 1 ( + SET /a elseIF=%elseIF%+1 +) else ( + SET /a elseIF=%elseIF%+2 +) +if %elseIF% == 1 ( + echo else if seems to work +) else ( + echo else if seems to be broken +) +SET elseIF=0 +if 1 == 2 ( + SET /a elseIF=%elseIF%+2 +) else if 1 == 2 ( + SET /a elseIF=%elseIF%+2 +) else ( + SET /a elseIF=%elseIF%+1 +) +if %elseIF% == 1 ( + echo else if seems to work +) else ( + echo else if seems to be broken +) echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 828a651..4dddc71 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -438,6 +438,9 @@ Passed: file size check on subdir\a.a [8]@or_broken(a)Skipping file size check on if seems to work else seems to work if seems not to detect /c as parameter +else if seems to work +else if seems to work +else if seems to work --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work

1 0

Michael Müller : wininet/tests: Add tests for overriding host header.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 1b53917ece1a3b0fb3f8422c9798453ef84f85ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b53917ece1a3b0fb3f8422c9… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 12:27:30 2015 +0200 wininet/tests: Add tests for overriding host header. --- dlls/wininet/tests/http.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index df7dd07..b841795 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2051,6 +2051,7 @@ static DWORD CALLBACK server_thread(LPVOID param) WSADATA wsaData; int last_request = 0; char host_header[22]; + char host_header_override[30]; static BOOL test_b = FALSE; static int test_no_cache = 0; @@ -2077,6 +2078,7 @@ static DWORD CALLBACK server_thread(LPVOID param) SetEvent(si->hEvent); sprintf(host_header, "Host: localhost:%d", si->port); + sprintf(host_header_override, "Host: test.local:%d\r\n", si->port); do { @@ -2351,6 +2353,13 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "/test_host_override")) + { + if (strstr(buffer, host_header_override)) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -2946,6 +2955,105 @@ static void test_connection_header(int port) InternetCloseHandle(ses); } +static void test_header_override(int port) +{ + char buffer[128], host_header_override[30], full_url[128]; + HINTERNET ses, con, req; + DWORD size, count, err; + BOOL ret; + + sprintf(host_header_override, "Host: test.local:%d\r\n", port); + sprintf(full_url, "http://localhost:%d/test_host_override", port); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + size = sizeof(buffer) - 1; + count = 0; + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); + err = GetLastError(); + todo_wine ok(!ret, "HttpQueryInfo succeeded\n"); + todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + size = sizeof(buffer) - 1; + memset(buffer, 0, sizeof(buffer)); + ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); + ok(ret, "InternetQueryOption failed\n"); + ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + size = sizeof(buffer) - 1; + count = 0; + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); + ok(ret, "HttpQueryInfo failed\n"); + + size = sizeof(buffer) - 1; + memset(buffer, 0, sizeof(buffer)); + ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); + ok(ret, "InternetQueryOption failed\n"); + todo_wine ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code_todo(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 400); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_REPLACE); + err = GetLastError(); + todo_wine ok(!ret, "HttpAddRequestHeaders succeeded\n"); + todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code_todo(req, 400); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_http1_1(int port) { HINTERNET ses, con, req; @@ -4322,6 +4430,7 @@ static void test_http_connection(void) test_basic_request(si.port, "GET", "/test6"); test_basic_request(si.port, "GET", "/testF"); test_connection_header(si.port); + test_header_override(si.port); test_http1_1(si.port); test_cookie_header(si.port); test_basic_authentication(si.port);

1 0

Michael Stefaniuc : dmcompos: Move struct definitions to the files that need them.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: bf117ec5f418b1e9caa669fb79945938f8e00cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf117ec5f418b1e9caa669fb7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:41:01 2015 +0200 dmcompos: Move struct definitions to the files that need them. --- dlls/dmcompos/chordmaptrack.c | 8 ++++++++ dlls/dmcompos/dmcompos_private.h | 34 ---------------------------------- dlls/dmcompos/signposttrack.c | 8 ++++++++ 3 files changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index c282d9d..6773b9d 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTST /***************************************************************************** * IDirectMusicChordMapTrack implementation */ +typedef struct IDirectMusicChordMapTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicChordMapTrack; + /* IDirectMusicChordMapTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface); diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 6a80445..8e67a18 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -43,12 +43,6 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack; -typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI create_dmchordmap(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; @@ -56,34 +50,6 @@ extern HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_ extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -/***************************************************************************** - * IDirectMusicChordMapTrack implementation structure - */ -struct IDirectMusicChordMapTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicChordMapTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicSignPostTrack implementation structure - */ -struct IDirectMusicSignPostTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicSignPostTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmcompos.dll */ diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 0fe9c4b..ed7b706 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTST /***************************************************************************** * IDirectMusicSignPostTrack implementation */ +typedef struct IDirectMusicSignPostTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicSignPostTrack; + /* IDirectMusicSignPostTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface);

1 0

Ken Thomases : dbghelp: Fix a leak of the Mach-O module structure by adding a module_remove callback.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 378d557d77cb32d6855201b5fcbdf4dff460fb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378d557d77cb32d6855201b5f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:55 2015 -0500 dbghelp: Fix a leak of the Mach-O module structure by adding a module_remove callback. --- dlls/dbghelp/macho_module.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 31beafa..73beb57 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -943,6 +943,14 @@ BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, } /****************************************************************** + * macho_module_remove + */ +static void macho_module_remove(struct process* pcs, struct module_format* modfmt) +{ + HeapFree(GetProcessHeap(), 0, modfmt); +} + +/****************************************************************** * macho_load_file * * Loads the information for Mach-O module stored in 'filename'. @@ -1036,7 +1044,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, macho_info->module->format_info[DFI_MACHO] = modfmt; modfmt->module = macho_info->module; - modfmt->remove = NULL; + modfmt->remove = macho_module_remove; modfmt->loc_compute = NULL; modfmt->u.macho_info = macho_module_info;

1 0