January 2008 - Wine-commits

Eric Pouech : dbghelp: In Minidump, change a couple of internal names for consistency.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: b32cfb18cd179d65484532ff155b565d5f9e717c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32cfb18cd179d65484532ff1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 13 17:02:08 2008 +0100 dbghelp: In Minidump, change a couple of internal names for consistency. --- dlls/dbghelp/minidump.c | 82 +++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 2a16a98..364a24f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -57,8 +57,8 @@ struct dump_context void* pcs_buffer; SYSTEM_PROCESS_INFORMATION* spi; /* module information */ - struct dump_module* module; - unsigned num_module; + struct dump_module* modules; + unsigned num_modules; /* exception information */ /* output information */ MINIDUMP_TYPE type; @@ -71,12 +71,12 @@ struct dump_context }; /****************************************************************** - * fetch_process_info + * fetch_processes_info * * reads system wide process information, and make spi point to the record * for process of id 'pid' */ -static BOOL fetch_process_info(struct dump_context* dc) +static BOOL fetch_processes_info(struct dump_context* dc) { ULONG buf_size = 0x1000; NTSTATUS nts; @@ -221,24 +221,24 @@ static BOOL add_module(struct dump_context* dc, const WCHAR* name, DWORD base, DWORD size, DWORD timestamp, DWORD checksum, BOOL is_elf) { - if (!dc->module) - dc->module = HeapAlloc(GetProcessHeap(), 0, - ++dc->num_module * sizeof(*dc->module)); + if (!dc->modules) + dc->modules = HeapAlloc(GetProcessHeap(), 0, + ++dc->num_modules * sizeof(*dc->modules)); else - dc->module = HeapReAlloc(GetProcessHeap(), 0, dc->module, - ++dc->num_module * sizeof(*dc->module)); - if (!dc->module) return FALSE; + dc->modules = HeapReAlloc(GetProcessHeap(), 0, dc->modules, + ++dc->num_modules * sizeof(*dc->modules)); + if (!dc->modules) return FALSE; if (is_elf || !GetModuleFileNameExW(dc->hProcess, (HMODULE)base, - dc->module[dc->num_module - 1].name, - sizeof(dc->module[dc->num_module - 1].name) / sizeof(WCHAR))) - lstrcpynW(dc->module[dc->num_module - 1].name, name, - sizeof(dc->module[dc->num_module - 1].name) / sizeof(WCHAR)); - dc->module[dc->num_module - 1].base = base; - dc->module[dc->num_module - 1].size = size; - dc->module[dc->num_module - 1].timestamp = timestamp; - dc->module[dc->num_module - 1].checksum = checksum; - dc->module[dc->num_module - 1].is_elf = is_elf; + dc->modules[dc->num_modules - 1].name, + sizeof(dc->modules[dc->num_modules - 1].name) / sizeof(WCHAR))) + lstrcpynW(dc->modules[dc->num_modules - 1].name, name, + sizeof(dc->modules[dc->num_modules - 1].name) / sizeof(WCHAR)); + dc->modules[dc->num_modules - 1].base = base; + dc->modules[dc->num_modules - 1].size = size; + dc->modules[dc->num_modules - 1].timestamp = timestamp; + dc->modules[dc->num_modules - 1].checksum = checksum; + dc->modules[dc->num_modules - 1].is_elf = is_elf; return TRUE; } @@ -285,7 +285,7 @@ static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, return TRUE; } -static void fetch_module_info(struct dump_context* dc) +static void fetch_modules_info(struct dump_context* dc) { EnumerateLoadedModulesW64(dc->hProcess, fetch_pe_module_info_cb, dc); /* Since we include ELF modules in a separate stream from the regular PE ones, @@ -410,10 +410,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size RVA rva_base; DWORD flags_out; - for (i = nmod = 0; i < dc->num_module; i++) + for (i = nmod = 0; i < dc->num_modules; i++) { - if ((dc->module[i].is_elf && dump_elf) || - (!dc->module[i].is_elf && !dump_elf)) + if ((dc->modules[i].is_elf && dump_elf) || + (!dc->modules[i].is_elf && !dump_elf)) nmod++; } @@ -425,10 +425,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size */ rva_base = dc->rva; dc->rva += *size = sizeof(mdModuleList.NumberOfModules) + sizeof(mdModule) * nmod; - for (i = 0; i < dc->num_module; i++) + for (i = 0; i < dc->num_modules; i++) { - if ((dc->module[i].is_elf && !dump_elf) || - (!dc->module[i].is_elf && dump_elf)) + if ((dc->modules[i].is_elf && !dump_elf) || + (!dc->modules[i].is_elf && dump_elf)) continue; flags_out = ModuleWriteModule | ModuleWriteMiscRecord | ModuleWriteCvRecord; @@ -438,10 +438,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size flags_out |= ModuleWriteTlsData; if (dc->type & MiniDumpWithCodeSegs) flags_out |= ModuleWriteCodeSegs; - ms->Length = (lstrlenW(dc->module[i].name) + 1) * sizeof(WCHAR); + ms->Length = (lstrlenW(dc->modules[i].name) + 1) * sizeof(WCHAR); if (sizeof(ULONG) + ms->Length > sizeof(tmp)) FIXME("Buffer overflow!!!\n"); - lstrcpyW(ms->Buffer, dc->module[i].name); + lstrcpyW(ms->Buffer, dc->modules[i].name); if (dc->cb) { @@ -453,10 +453,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size cbin.CallbackType = ModuleCallback; cbin.u.Module.FullPath = ms->Buffer; - cbin.u.Module.BaseOfImage = dc->module[i].base; - cbin.u.Module.SizeOfImage = dc->module[i].size; - cbin.u.Module.CheckSum = dc->module[i].checksum; - cbin.u.Module.TimeDateStamp = dc->module[i].timestamp; + cbin.u.Module.BaseOfImage = dc->modules[i].base; + cbin.u.Module.SizeOfImage = dc->modules[i].size; + cbin.u.Module.CheckSum = dc->modules[i].checksum; + cbin.u.Module.TimeDateStamp = dc->modules[i].timestamp; memset(&cbin.u.Module.VersionInfo, 0, sizeof(cbin.u.Module.VersionInfo)); cbin.u.Module.CvRecord = NULL; cbin.u.Module.SizeOfCvRecord = 0; @@ -470,10 +470,10 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size } if (flags_out & ModuleWriteModule) { - mdModule.BaseOfImage = dc->module[i].base; - mdModule.SizeOfImage = dc->module[i].size; - mdModule.CheckSum = dc->module[i].checksum; - mdModule.TimeDateStamp = dc->module[i].timestamp; + mdModule.BaseOfImage = dc->modules[i].base; + mdModule.SizeOfImage = dc->modules[i].size; + mdModule.CheckSum = dc->modules[i].checksum; + mdModule.TimeDateStamp = dc->modules[i].timestamp; mdModule.ModuleNameRva = dc->rva; ms->Length -= sizeof(WCHAR); append(dc, ms, sizeof(ULONG) + ms->Length + sizeof(WCHAR)); @@ -700,16 +700,16 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, dc.hProcess = hProcess; dc.hFile = hFile; dc.pid = pid; - dc.module = NULL; - dc.num_module = 0; + dc.modules = NULL; + dc.num_modules = 0; dc.cb = CallbackParam; dc.type = DumpType; dc.mem = NULL; dc.num_mem = 0; dc.rva = 0; - if (!fetch_process_info(&dc)) return FALSE; - fetch_module_info(&dc); + if (!fetch_processes_info(&dc)) return FALSE; + fetch_modules_info(&dc); /* 1) init */ nStreams = 6 + (ExceptionParam ? 1 : 0) + @@ -806,7 +806,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, HeapFree(GetProcessHeap(), 0, dc.pcs_buffer); HeapFree(GetProcessHeap(), 0, dc.mem); - HeapFree(GetProcessHeap(), 0, dc.module); + HeapFree(GetProcessHeap(), 0, dc.modules); return TRUE; }

1 0

Eric Pouech : winedbg: Workaround broken minidumps with invalid 32-> 64 address conversion.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: bd007a157638bd8fba93aafbfe420f1728af61e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd007a157638bd8fba93aafbf… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 13 17:02:49 2008 +0100 winedbg: Workaround broken minidumps with invalid 32->64 address conversion. --- programs/winedbg/tgt_minidump.c | 46 ++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index c0042fd..26da1e7 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -39,6 +39,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); static struct be_process_io be_process_minidump_io; +static DWORD64 get_addr64(DWORD64 addr) +{ + return addr & 0xFFFFFFFF; +} + void minidump_write(const char* file, const EXCEPTION_RECORD* rec) { HANDLE hFile; @@ -95,12 +100,13 @@ static BOOL WINAPI tgt_process_minidump_read(HANDLE hProcess, const void* addr, for (i = 0; i < mml->NumberOfMemoryRanges; i++, mmd++) { - if (mmd->StartOfMemoryRange <= (DWORD_PTR)addr && - (DWORD_PTR)addr < mmd->StartOfMemoryRange + mmd->Memory.DataSize) + if (get_addr64(mmd->StartOfMemoryRange) <= (DWORD_PTR)addr && + (DWORD_PTR)addr < get_addr64(mmd->StartOfMemoryRange) + mmd->Memory.DataSize) { - len = min(len, mmd->StartOfMemoryRange + mmd->Memory.DataSize - (DWORD_PTR)addr); - memcpy(buffer, - (char*)PRIVATE(dbg_curr_process)->mapping + mmd->Memory.Rva + (DWORD_PTR)addr - mmd->StartOfMemoryRange, + len = min(len, + get_addr64(mmd->StartOfMemoryRange) + mmd->Memory.DataSize - (DWORD_PTR)addr); + memcpy(buffer, + (char*)PRIVATE(dbg_curr_process)->mapping + mmd->Memory.Rva + (DWORD_PTR)addr - get_addr64(mmd->StartOfMemoryRange), len); if (rlen) *rlen = len; return TRUE; @@ -146,8 +152,8 @@ static BOOL is_pe_module_embedded(struct tgt_process_minidump_data* data, for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) { - if (mm->BaseOfImage <= pe_mm->BaseOfImage && - mm->BaseOfImage + mm->SizeOfImage >= pe_mm->BaseOfImage + pe_mm->SizeOfImage) + if (get_addr64(mm->BaseOfImage) <= get_addr64(pe_mm->BaseOfImage) && + get_addr64(mm->BaseOfImage) + mm->SizeOfImage >= get_addr64(pe_mm->BaseOfImage) + pe_mm->SizeOfImage) return TRUE; } } @@ -307,7 +313,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) for (i = 0; i < mtl->NumberOfThreads; i++) { dbg_add_thread(dbg_curr_process, mtl->Threads[i].ThreadId, NULL, - (void*)(DWORD_PTR)mtl->Threads[i].Teb); + (void*)(DWORD_PTR)get_addr64(mtl->Threads[i].Teb)); } } /* first load ELF modules, then do the PE ones */ @@ -324,11 +330,11 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) nameW[mds->Length / sizeof(WCHAR)] = 0; if (SymFindFileInPathW(hProc, NULL, nameW, (void*)(DWORD_PTR)mm->CheckSum, 0, 0, SSRVOPT_DWORD, buffer, validate_file, NULL)) - SymLoadModuleExW(hProc, NULL, buffer, NULL, mm->BaseOfImage, mm->SizeOfImage, - NULL, 0); + SymLoadModuleExW(hProc, NULL, buffer, NULL, get_addr64(mm->BaseOfImage), + mm->SizeOfImage, NULL, 0); else - SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, - NULL, SLMFLAG_VIRTUAL); + SymLoadModuleExW(hProc, NULL, nameW, NULL, get_addr64(mm->BaseOfImage), + mm->SizeOfImage, NULL, SLMFLAG_VIRTUAL); } } if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, &dir, &stream, &size)) @@ -343,14 +349,14 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) nameW[mds->Length / sizeof(WCHAR)] = 0; if (SymFindFileInPathW(hProc, NULL, nameW, (void*)(DWORD_PTR)mm->TimeDateStamp, mm->SizeOfImage, 0, SSRVOPT_DWORD, buffer, validate_file, NULL)) - SymLoadModuleExW(hProc, NULL, buffer, NULL, mm->BaseOfImage, mm->SizeOfImage, - NULL, 0); + SymLoadModuleExW(hProc, NULL, buffer, NULL, get_addr64(mm->BaseOfImage), + mm->SizeOfImage, NULL, 0); else if (is_pe_module_embedded(data, mm)) - SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, - NULL, 0); + SymLoadModuleExW(hProc, NULL, nameW, NULL, get_addr64(mm->BaseOfImage), + mm->SizeOfImage, NULL, 0); else - SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, - NULL, SLMFLAG_VIRTUAL); + SymLoadModuleExW(hProc, NULL, nameW, NULL, get_addr64(mm->BaseOfImage), + mm->SizeOfImage, NULL, SLMFLAG_VIRTUAL); } } if (MiniDumpReadDumpStream(data->mapping, ExceptionStream, &dir, &stream, &size)) @@ -365,8 +371,8 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) dbg_curr_thread->in_exception = TRUE; dbg_curr_thread->excpt_record.ExceptionCode = mes->ExceptionRecord.ExceptionCode; dbg_curr_thread->excpt_record.ExceptionFlags = mes->ExceptionRecord.ExceptionFlags; - dbg_curr_thread->excpt_record.ExceptionRecord = (void*)(DWORD_PTR)mes->ExceptionRecord.ExceptionRecord; - dbg_curr_thread->excpt_record.ExceptionAddress = (void*)(DWORD_PTR)mes->ExceptionRecord.ExceptionAddress; + dbg_curr_thread->excpt_record.ExceptionRecord = (void*)(DWORD_PTR)get_addr64(mes->ExceptionRecord.ExceptionRecord); + dbg_curr_thread->excpt_record.ExceptionAddress = (void*)(DWORD_PTR)get_addr64(mes->ExceptionRecord.ExceptionAddress); dbg_curr_thread->excpt_record.NumberParameters = mes->ExceptionRecord.NumberParameters; for (i = 0; i < dbg_curr_thread->excpt_record.NumberParameters; i++) {

1 0

Eric Pouech : winedbg: Added a way to support differently selector information depending on current target .
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: bce64150eb108ea6c32d1d023e7f214a1fee4d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce64150eb108ea6c32d1d023… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 13 17:02:55 2008 +0100 winedbg: Added a way to support differently selector information depending on current target. --- programs/winedbg/be_i386.c | 4 ++-- programs/winedbg/debugger.h | 1 + programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 1 + programs/winedbg/tgt_minidump.c | 9 +++++++++ programs/winedbg/tgt_module.c | 6 ++++++ 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index fe8b087..a4eb251 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -40,7 +40,7 @@ static ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD s if (IS_VM86_MODE(ctx)) return AddrModeReal; /* null or system selector */ if (!(sel & 4) || ((sel >> 3) < 17)) return AddrModeFlat; - if (GetThreadSelectorEntry(hThread, sel, &le)) + if (dbg_curr_process->process_io->get_selector(hThread, sel, &le)) return le.HighWord.Bits.Default_Big ? AddrMode1632 : AddrMode1616; /* selector doesn't exist */ return -1; @@ -59,7 +59,7 @@ static void* be_i386_linearize(HANDLE hThread, const ADDRESS64* addr) return (void*)(DWORD)addr->Offset; /* fall through */ case AddrMode1616: - if (!GetThreadSelectorEntry(hThread, addr->Segment, &le)) return NULL; + if (!dbg_curr_process->process_io->get_selector(hThread, addr->Segment, &le)) return NULL; return (void*)((le.HighWord.Bits.BaseHi << 24) + (le.HighWord.Bits.BaseMid << 16) + le.BaseLow + (DWORD)addr->Offset); diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 556bc08..cb327fe 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -234,6 +234,7 @@ struct be_process_io BOOL (*close_process)(struct dbg_process*, BOOL); BOOL (WINAPI *read)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); BOOL (WINAPI *write)(HANDLE, void*, const void*, SIZE_T, SIZE_T*); + BOOL (WINAPI *get_selector)(HANDLE, DWORD, LDT_ENTRY*); }; extern struct dbg_process* dbg_curr_process; diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 2c56d8f..fe0292d 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -584,7 +584,7 @@ void info_win32_segments(DWORD start, int length) for (i = start; i < start + length; i++) { - if (!GetThreadSelectorEntry(dbg_curr_thread->handle, (i << 3) | 7, &le)) + if (!dbg_curr_process->process_io->get_selector(dbg_curr_thread->handle, (i << 3) | 7, &le)) continue; if (le.HighWord.Bits.Type & 0x08) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index f75f744..d334d17 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -984,4 +984,5 @@ static struct be_process_io be_process_active_io = tgt_process_active_close_process, ReadProcessMemory, WriteProcessMemory, + GetThreadSelectorEntry, }; diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 26da1e7..db0daf6 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -452,9 +452,18 @@ static BOOL tgt_process_minidump_close_process(struct dbg_process* pcs, BOOL kil return TRUE; } +static BOOL WINAPI tgt_process_minidump_get_selector(HANDLE hThread, DWORD sel, LDT_ENTRY* le) +{ + /* so far, pretend all selectors are valid, and mapped to a 32bit flat address space */ + memset(le, 0, sizeof(*le)); + le->HighWord.Bits.Default_Big = 1; + return TRUE; +} + static struct be_process_io be_process_minidump_io = { tgt_process_minidump_close_process, tgt_process_minidump_read, tgt_process_minidump_write, + tgt_process_minidump_get_selector, }; diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 043d051..ced9d85 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -90,9 +90,15 @@ static BOOL tgt_process_module_close_process(struct dbg_process* pcs, BOOL kill) return TRUE; } +static BOOL WINAPI tgt_process_module_get_selector(HANDLE hThread, DWORD sel, LDT_ENTRY* le) +{ + return FALSE; +} + static struct be_process_io be_process_module_io = { tgt_process_module_close_process, tgt_process_module_read, tgt_process_module_write, + tgt_process_module_get_selector, };

1 0

Dan Kegel : gdiplus/tests: Don't free if alloc failed.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: cee693108aa95bccbf7f4c26fe906e2b8105411b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee693108aa95bccbf7f4c26f… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jan 13 17:42:28 2008 -0800 gdiplus/tests: Don't free if alloc failed. --- dlls/gdiplus/tests/image.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 7068509..0364962 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -34,7 +34,8 @@ static void test_Scan0(void) stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, NULL, &bm); expect(Ok, stat); ok(NULL != bm, "Expected bitmap to be initialized\n"); - GdipDisposeImage((GpImage*)bm); + if (stat == Ok) + GdipDisposeImage((GpImage*)bm); bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, -10, 10, PixelFormat24bppRGB, NULL, &bm); @@ -58,7 +59,8 @@ static void test_Scan0(void) stat = GdipCreateBitmapFromScan0(10, 10, 12, PixelFormat24bppRGB, buff, &bm); expect(Ok, stat); ok(NULL != bm, "Expected bitmap to be initialized\n"); - GdipDisposeImage((GpImage*)bm); + if (stat == Ok) + GdipDisposeImage((GpImage*)bm); bm = (GpBitmap*) 0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, buff, &bm);

1 0

Dan Kegel : hlink/tests: Skip tests if hlink couldn't be created.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 39f3e15bb475b50cbb4341d95685addb4716d79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f3e15bb475b50cbb4341d95… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jan 13 18:40:40 2008 -0800 hlink/tests: Skip tests if hlink couldn't be created. --- dlls/hlink/tests/hlink.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index a2d7360..271f584 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -293,6 +293,10 @@ static void test_persist(void) hr = HlinkCreateFromString(url, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); + if (!lnk) { + skip("Can't create lnk, skipping test_persist. Was wineprefixcreate run properly?\n"); + return; + } test_persist_save_data("url only", lnk, expected_hlink_data, sizeof(expected_hlink_data)); IHlink_Release(lnk);

1 0

Dan Kegel : urlmon: Fix unlikely free of uninitialized pointer.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 95fbd7f46bb579e5aba2f8ec2a345ea6ea7710bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fbd7f46bb579e5aba2f8ec2… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jan 13 22:21:41 2008 -0800 urlmon: Fix unlikely free of uninitialized pointer. --- dlls/urlmon/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 9617aed..3056feb 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -306,7 +306,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl LPWSTR host = 0, path = 0, user = 0, pass = 0, addl_header = 0, post_cookie = 0, optional = 0; BYTE security_id[512]; - LPOLESTR user_agent, accept_mimes[257]; + LPOLESTR user_agent = NULL, accept_mimes[257]; HRESULT hres; static const WCHAR wszHttp[] = {'h','t','t','p',':'};

1 0

Dan Kegel : winealsa.drv: Don't return garbage if can't find active channel .
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 3c070b22ef6ea1b16fbb3cd9f9391d132129df85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c070b22ef6ea1b16fbb3cd9f… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jan 13 22:51:24 2008 -0800 winealsa.drv: Don't return garbage if can't find active channel. --- dlls/winealsa.drv/mixer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index fb989dc..cc38f8f 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -985,6 +985,12 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW break; } + if (chn > SND_MIXER_SCHN_LAST) + { + TRACE("can't find active channel\n"); + return MMSYSERR_INVALPARAM; /* fixme: what's right error? */ + } + mcdb->fValue = !ival; TRACE("=> %s\n", mcdb->fValue ? "on" : "off"); return MMSYSERR_NOERROR;

1 0

Dmitry Timoshkov : gdi32: Use public FS_xxxxxx defines.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: d9732715665161b86f022d253b7b69ce404a2684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9732715665161b86f022d253… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 14 19:38:59 2008 +0800 gdi32: Use public FS_xxxxxx defines. --- dlls/gdi32/font.c | 65 ++++++++++++------------- dlls/gdi32/freetype.c | 10 ++-- dlls/gdi32/tests/font.c | 123 ++++++++++++++++++++-------------------------- 3 files changed, 91 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9732715665161b86f022…

1 0

Dmitry Timoshkov : gdi32: Initialize more fields in GetEnumStructs.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: c7a6c1af0d1f2ac722f1c0d4f2e518d301d05646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a6c1af0d1f2ac722f1c0d4f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 14 19:39:33 2008 +0800 gdi32: Initialize more fields in GetEnumStructs. --- dlls/gdi32/freetype.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index af5ed9a..562c329 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3290,8 +3290,6 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, font->name = strdupW(face->family->FamilyName); font->ntmFlags = face->ntmFlags; - memset(&pelf->elfLogFont, 0, sizeof(LOGFONTW)); - if (WineEngGetOutlineTextMetrics(font, 0, NULL)) { memcpy(&pntm->ntmTm, &font->potm->otmTextMetrics, sizeof(TEXTMETRICW)); @@ -3315,17 +3313,19 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, pntm->ntmTm.ntmSizeEM = pntm->ntmTm.tmHeight - pntm->ntmTm.tmInternalLeading; lstrcpynW(pelf->elfLogFont.lfFaceName, face->family->FamilyName, LF_FACESIZE); - lstrcpynW(pelf->elfFullName, face->family->FamilyName, LF_FACESIZE); - pelf->elfStyle[0] = '\0'; + lstrcpynW(pelf->elfFullName, face->family->FamilyName, LF_FULLFACESIZE); + lstrcpynW(pelf->elfStyle, face->StyleName, LF_FACESIZE); } pntm->ntmTm.ntmFlags = face->ntmFlags; pntm->ntmTm.ntmCellHeight = pntm->ntmTm.tmHeight; pntm->ntmTm.ntmAvgWidth = pntm->ntmTm.tmAveCharWidth; - memset(&pntm->ntmFontSig, 0, sizeof(FONTSIGNATURE)); + memcpy(&pntm->ntmFontSig, &face->fs, sizeof(FONTSIGNATURE)); pelf->elfScript[0] = '\0'; /* This will get set in WineEngEnumFonts */ + pelf->elfLogFont.lfEscapement = 0; + pelf->elfLogFont.lfOrientation = 0; pelf->elfLogFont.lfHeight = pntm->ntmTm.tmHeight; pelf->elfLogFont.lfWidth = pntm->ntmTm.tmAveCharWidth; pelf->elfLogFont.lfWeight = pntm->ntmTm.tmWeight;

1 0

Eric Pouech : dbghelp: Silence superfluous message (spotted by Robert Reif) .
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 2af9736fbbce2d3b2e123589639bfe0c5f3d1eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af9736fbbce2d3b2e1235896… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 13 17:01:56 2008 +0100 dbghelp: Silence superfluous message (spotted by Robert Reif). --- dlls/dbghelp/dwarf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a03b049..133af66 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1181,6 +1181,7 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_structure_type: case DW_TAG_class_type: case DW_TAG_union_type: + case DW_TAG_typedef: /* FIXME: we need to handle nested udt definitions */ break; default:

1 0