January 2008 - Wine-commits

Austin English : Misc spelling fixes.
by Alexandre Julliard 18 Jan '08

18 Jan '08

Module: wine Branch: master Commit: f6caf1be814407171f547e20622ac879db40fcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6caf1be814407171f547e206… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 16 17:04:38 2008 -0600 Misc spelling fixes. --- dlls/advapi32/tests/registry.c | 2 +- dlls/advpack/files.c | 2 +- dlls/advpack/reg.c | 2 +- dlls/avifil32/avifile.c | 10 +++++----- dlls/avifil32/editstream.c | 4 ++-- dlls/avifil32/icmstream.c | 2 +- dlls/avifil32/wavfile.c | 2 +- dlls/browseui/progressdlg.c | 2 +- dlls/cabinet/fci.c | 18 +++++++++--------- dlls/cabinet/tests/extract.c | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6caf1be814407171f547…

1 0

Andrew Talbot : rsaenh: Remove unneeded casts.
by Alexandre Julliard 18 Jan '08

18 Jan '08

Module: wine Branch: master Commit: 303bff281c01b17e2472173154cfe25e4c3cd026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=303bff281c01b17e247217315… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 17 22:06:36 2008 +0000 rsaenh: Remove unneeded casts. --- dlls/rsaenh/handle.c | 4 ++-- dlls/rsaenh/mpi.c | 25 ++++++++++++------------- dlls/rsaenh/rsaenh.c | 22 +++++++++++----------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index fc4c717..0773813 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -193,10 +193,10 @@ int alloc_handle_table(HANDLETABLE **lplpTable) int release_handle_table(HANDLETABLE *lpTable) { TRACE("(lpTable=%p)\n", lpTable); - + release_all_handles(lpTable); destroy_handle_table(lpTable); - return (int)HeapFree(GetProcessHeap(), 0, lpTable); + return HeapFree(GetProcessHeap(), 0, lpTable); } /****************************************************************************** diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index c6f083b..e06d2ee 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -1069,7 +1069,7 @@ int mp_div (const mp_int * a, const mp_int * b, mp_int * c, mp_int * d) /* normalize both x and y, ensure that y >= b/2, [b == 2**DIGIT_BIT] */ norm = mp_count_bits(&y) % DIGIT_BIT; - if (norm < (int)(DIGIT_BIT-1)) { + if (norm < DIGIT_BIT-1) { norm = (DIGIT_BIT-1) - norm; if ((res = mp_mul_2d (&x, norm, &x)) != MP_OKAY) { goto __Y; @@ -1285,7 +1285,7 @@ int mp_div_2d (const mp_int * a, int b, mp_int * c, mp_int * d) } /* shift by as many digits in the bit count */ - if (b >= (int)DIGIT_BIT) { + if (b >= DIGIT_BIT) { mp_rshd (c, b / DIGIT_BIT); } @@ -1390,9 +1390,9 @@ int mp_div_d (const mp_int * a, mp_digit b, mp_int * c, mp_digit * d) } else { t = 0; } - q.dp[ix] = (mp_digit)t; + q.dp[ix] = t; } - + if (d != NULL) { *d = (mp_digit)w; } @@ -1710,11 +1710,11 @@ mp_exptmod_fast (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y, int } /* read next digit and reset bitcnt */ buf = X->dp[digidx--]; - bitcnt = (int)DIGIT_BIT; + bitcnt = DIGIT_BIT; } /* grab the next msb from the exponent */ - y = (mp_digit)(buf >> (DIGIT_BIT - 1)) & 1; + y = (buf >> (DIGIT_BIT - 1)) & 1; buf <<= (mp_digit)1; /* if the bit is zero and mode == 0 then we ignore it @@ -2609,7 +2609,7 @@ mp_mod_2d (const mp_int * a, int b, mp_int * c) } /* if the modulus is larger than the value than return */ - if (b > (int) (a->used * DIGIT_BIT)) { + if (b > a->used * DIGIT_BIT) { res = mp_copy (a, c); return res; } @@ -2624,8 +2624,7 @@ mp_mod_2d (const mp_int * a, int b, mp_int * c) c->dp[x] = 0; } /* clear the digit that is not completely outside/inside the modulus */ - c->dp[b / DIGIT_BIT] &= - (mp_digit) ((((mp_digit) 1) << (((mp_digit) b) % DIGIT_BIT)) - ((mp_digit) 1)); + c->dp[b / DIGIT_BIT] &= (1 << ((mp_digit)b % DIGIT_BIT)) - 1; mp_clamp (c); return MP_OKAY; } @@ -2661,7 +2660,7 @@ int mp_montgomery_calc_normalization (mp_int * a, const mp_int * b) /* now compute C = A * B mod b */ - for (x = bits - 1; x < (int)DIGIT_BIT; x++) { + for (x = bits - 1; x < DIGIT_BIT; x++) { if ((res = mp_mul_2 (a, a)) != MP_OKAY) { return res; } @@ -2907,14 +2906,14 @@ int mp_mul_2d (const mp_int * a, int b, mp_int * c) } } - if (c->alloc < (int)(c->used + b/DIGIT_BIT + 1)) { + if (c->alloc < c->used + b/DIGIT_BIT + 1) { if ((res = mp_grow (c, c->used + b / DIGIT_BIT + 1)) != MP_OKAY) { return res; } } /* shift by as many digits in the bit count */ - if (b >= (int)DIGIT_BIT) { + if (b >= DIGIT_BIT) { if ((res = mp_lshd (c, b / DIGIT_BIT)) != MP_OKAY) { return res; } @@ -4068,7 +4067,7 @@ int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y) } /* read next digit and reset the bitcnt */ buf = X->dp[digidx--]; - bitcnt = (int) DIGIT_BIT; + bitcnt = DIGIT_BIT; } /* grab the next msb from the exponent */ diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 29e072c..1f0e0b2 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -828,8 +828,8 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK } } - hCryptKey = (HCRYPTKEY)new_object(&handle_table, sizeof(CRYPTKEY), RSAENH_MAGIC_KEY, - destroy_key, (OBJECTHDR**)&pCryptKey); + hCryptKey = new_object(&handle_table, sizeof(CRYPTKEY), RSAENH_MAGIC_KEY, + destroy_key, (OBJECTHDR**)&pCryptKey); if (hCryptKey != (HCRYPTKEY)INVALID_HANDLE_VALUE) { pCryptKey->aiAlgid = aiAlgid; @@ -1095,8 +1095,8 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const KEYCONTAINER *pKeyContainer; HCRYPTPROV hKeyContainer; - hKeyContainer = (HCRYPTPROV)new_object(&handle_table, sizeof(KEYCONTAINER), RSAENH_MAGIC_CONTAINER, - destroy_key_container, (OBJECTHDR**)&pKeyContainer); + hKeyContainer = new_object(&handle_table, sizeof(KEYCONTAINER), RSAENH_MAGIC_CONTAINER, + destroy_key_container, (OBJECTHDR**)&pKeyContainer); if (hKeyContainer != (HCRYPTPROV)INVALID_HANDLE_VALUE) { lstrcpynA(pKeyContainer->szName, pszContainerName, MAX_PATH); @@ -1670,10 +1670,10 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, } } - *phHash = (HCRYPTHASH)new_object(&handle_table, sizeof(CRYPTHASH), RSAENH_MAGIC_HASH, - destroy_hash, (OBJECTHDR**)&pCryptHash); + *phHash = new_object(&handle_table, sizeof(CRYPTHASH), RSAENH_MAGIC_HASH, + destroy_hash, (OBJECTHDR**)&pCryptHash); if (!pCryptHash) return FALSE; - + pCryptHash->aiAlgid = Algid; pCryptHash->hKey = hKey; pCryptHash->hProv = hProv; @@ -1834,8 +1834,8 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw return FALSE; } - *phHash = (HCRYPTHASH)new_object(&handle_table, sizeof(CRYPTHASH), RSAENH_MAGIC_HASH, - destroy_hash, (OBJECTHDR**)&pDestHash); + *phHash = new_object(&handle_table, sizeof(CRYPTHASH), RSAENH_MAGIC_HASH, + destroy_hash, (OBJECTHDR**)&pDestHash); if (*phHash != (HCRYPTHASH)INVALID_HANDLE_VALUE) { memcpy(pDestHash, pSrcHash, sizeof(CRYPTHASH)); @@ -1890,8 +1890,8 @@ BOOL WINAPI RSAENH_CPDuplicateKey(HCRYPTPROV hUID, HCRYPTKEY hKey, DWORD *pdwRes return FALSE; } - *phKey = (HCRYPTKEY)new_object(&handle_table, sizeof(CRYPTKEY), RSAENH_MAGIC_KEY, destroy_key, - (OBJECTHDR**)&pDestKey); + *phKey = new_object(&handle_table, sizeof(CRYPTKEY), RSAENH_MAGIC_KEY, destroy_key, + (OBJECTHDR**)&pDestKey); if (*phKey != (HCRYPTKEY)INVALID_HANDLE_VALUE) { memcpy(pDestKey, pSrcKey, sizeof(CRYPTKEY));

1 0

Eric van Beurden : dbghelp: Prevent huge minidumps by ensuring the memory range is clamped.
by Alexandre Julliard 18 Jan '08

18 Jan '08

Module: wine Branch: master Commit: cb9596484d37dc4ea3027851c88a048405cd35c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9596484d37dc4ea3027851c… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Jan 17 17:31:49 2008 -0500 dbghelp: Prevent huge minidumps by ensuring the memory range is clamped. --- dlls/dbghelp/minidump.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 3dd69cf..9ae5307 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -119,20 +119,50 @@ static void fetch_thread_stack(struct dump_context* dc, const void* teb_addr, { #ifdef __i386__ /* limiting the stack dumping to the size actually used */ - if (ctx->Esp) - mmd->StartOfMemoryRange = (ctx->Esp - 4); + if (ctx->Esp){ + + /* make sure ESP is within the established range of the stack. It could have + been clobbered by whatever caused the original exception. */ + if (ctx->Esp - 4 < (ULONG_PTR)tib.StackLimit || ctx->Esp - 4 > (ULONG_PTR)tib.StackBase) + mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; + + else + mmd->StartOfMemoryRange = (ctx->Esp - 4); + } + else mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; + #elif defined(__powerpc__) - if (ctx->Iar) - mmd->StartOfMemoryRange = ctx->Iar - 4; + if (ctx->Iar){ + + /* make sure IAR is within the established range of the stack. It could have + been clobbered by whatever caused the original exception. */ + if (ctx->Iar - 4 < (ULONG_PTR)tib.StackLimit || ctx->Iar - 4 > (ULONG_PTR)tib.StackBase) + mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; + + else + mmd->StartOfMemoryRange = (ctx->Iar - 4); + } + else mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; + #elif defined(__x86_64__) - if (ctx->Rsp) - mmd->StartOfMemoryRange = (ctx->Rsp - 8); + if (ctx->Rsp){ + + /* make sure RSP is within the established range of the stack. It could have + been clobbered by whatever caused the original exception. */ + if (ctx->Rsp - 8 < (ULONG_PTR)tib.StackLimit || ctx->Rsp - 8 > (ULONG_PTR)tib.StackBase) + mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; + + else + mmd->StartOfMemoryRange = (ctx->Rsp - 8); + } + else mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; + #else #error unsupported CPU #endif

1 0

Eric van Beurden : dbghelp: Fix file searching to search only listed directories instead of the whole HD .
by Alexandre Julliard 18 Jan '08

18 Jan '08

Module: wine Branch: master Commit: 692998292c3f68a03a01d893563a3919735704f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=692998292c3f68a03a01d8935… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Jan 17 17:21:00 2008 -0500 dbghelp: Fix file searching to search only listed directories instead of the whole HD. --- dlls/dbghelp/path.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 2e191af..7057e26 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -57,7 +57,7 @@ HANDLE WINAPI FindDebugInfoFile(PCSTR FileName, PCSTR SymbolPath, PSTR DebugFile { HANDLE h; - h = CreateFileA(DebugFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, + h = CreateFileA(FileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { @@ -79,7 +79,7 @@ HANDLE WINAPI FindDebugInfoFileEx(PCSTR FileName, PCSTR SymbolPath, PVOID CallerData) { FIXME("(%s %s %p %p %p): stub\n", - FileName, SymbolPath, DebugFilePath, Callback, CallerData); + debugstr_a(FileName), debugstr_a(SymbolPath), debugstr_a(DebugFilePath), Callback, CallerData); return NULL; } @@ -191,7 +191,7 @@ BOOL WINAPI SymMatchFileName(PCSTR file, PCSTR match, PCSTR fptr; PCSTR mptr; - TRACE("(%s %s %p %p)\n", file, match, filestop, matchstop); + TRACE("(%s %s %p %p)\n", debugstr_a(file), debugstr_a(match), filestop, matchstop); fptr = file + strlen(file) - 1; mptr = match + strlen(match) - 1; @@ -217,7 +217,7 @@ static BOOL do_searchW(PCWSTR file, PWSTR buffer, BOOL recurse, BOOL found = FALSE; static const WCHAR S_AllW[] = {'*','.','*','\0'}; static const WCHAR S_DotW[] = {'.','\0'}; - static const WCHAR S_DotDotW[] = {'.','\0'}; + static const WCHAR S_DotDotW[] = {'.','.','\0'}; pos = strlenW(buffer); if (buffer[pos - 1] != '\\') buffer[pos++] = '\\'; @@ -478,7 +478,7 @@ BOOL WINAPI SymFindFileInPathW(HANDLE hProcess, PCWSTR searchPath, PCWSTR full_p WCHAR* ptr; const WCHAR* filename; - TRACE("(%p %s %s %p %08x %08x %08x %p %p %p)\n", + TRACE("(hProcess = %p, searchPath = %s, full_path = %s, id = %p, two = 0x%08x, three = 0x%08x, flags = 0x%08x, buffer = %p, cb = %p, user = %p)\n", hProcess, debugstr_w(searchPath), debugstr_w(full_path), id, two, three, flags, buffer, cb, user);

1 0

Eric van Beurden : dbghelp: Some minidump corrections so that windbg can read our minidump files.
by Alexandre Julliard 18 Jan '08

18 Jan '08

Module: wine Branch: master Commit: ebc35e688c6b0c53511257df3da2c2b21844b76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc35e688c6b0c53511257df3… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Jan 17 16:59:22 2008 -0500 dbghelp: Some minidump corrections so that windbg can read our minidump files. --- dlls/dbghelp/minidump.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 364a24f..3dd69cf 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -182,7 +182,6 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, if (tid != GetCurrentThreadId() && (mdThd->SuspendCount = SuspendThread(hThread)) != (DWORD)-1) { - mdThd->SuspendCount--; ctx->ContextFlags = CONTEXT_FULL; if (!GetThreadContext(hThread, ctx)) memset(ctx, 0, sizeof(*ctx)); @@ -204,6 +203,8 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, pctx = &lctx; } else pctx = except->ExceptionPointers->ContextRecord; + + memcpy(ctx, pctx, sizeof(*ctx)); fetch_thread_stack(dc, tbi.TebBaseAddress, pctx, &mdThd->Stack); } } @@ -423,6 +424,11 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size * size of mdModuleList * FIXME: if we don't ask for all modules in cb, we'll get a hole in the file */ + + /* the stream size is just the size of the module index. It does not include the data for the + names of each module. *Technically* the names are supposed to go into the common string table + in the minidump file. Since each string is referenced by RVA they can all safely be located + anywhere between streams in the file, so the end of this stream is sufficient. */ rva_base = dc->rva; dc->rva += *size = sizeof(mdModuleList.NumberOfModules) + sizeof(mdModule) * nmod; for (i = 0; i < dc->num_modules; i++) @@ -523,12 +529,16 @@ static void dump_system_info(struct dump_context* dc, DWORD *size) mdSysInfo.CSDVersionRva = dc->rva + sizeof(mdSysInfo); mdSysInfo.u1.Reserved1 = 0; + mdSysInfo.u1.s.SuiteMask = VER_SUITE_TERMINAL; + FIXME("fill in CPU vendorID and feature set\n"); memset(&mdSysInfo.Cpu, 0, sizeof(mdSysInfo.Cpu)); append(dc, &mdSysInfo, sizeof(mdSysInfo)); *size = sizeof(mdSysInfo); + /* write the service pack version string after this stream. It is referenced within the + stream by its RVA in the file. */ slen = lstrlenW(osInfo.szCSDVersion) * sizeof(WCHAR); WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); WriteFile(dc->hFile, osInfo.szCSDVersion, slen, &written, NULL); @@ -678,6 +688,10 @@ static void dump_misc_info(struct dump_context* dc, DWORD* size) mmi.Flags1 = MINIDUMP_MISC1_PROCESS_ID; mmi.ProcessId = dc->pid; /* FIXME: create/user/kernel time */ + mmi.ProcessCreateTime = 0; + mmi.ProcessKernelTime = 0; + mmi.ProcessUserTime = 0; + append(dc, &mmi, sizeof(mmi)); *size = sizeof(mmi); } @@ -692,6 +706,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, PMINIDUMP_CALLBACK_INFORMATION CallbackParam) { + static const MINIDUMP_DIRECTORY emptyDir = {UnusedStream, {0, 0}}; MINIDUMP_HEADER mdHead; MINIDUMP_DIRECTORY mdDir; DWORD i, nStreams, idx_stream; @@ -715,6 +730,9 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, nStreams = 6 + (ExceptionParam ? 1 : 0) + (UserStreamParam ? UserStreamParam->UserStreamCount : 0); + /* pad the directory size to a multiple of 4 for alignment purposes */ + nStreams = (nStreams + 3) & ~3; + if (DumpType & MiniDumpWithDataSegs) FIXME("NIY MiniDumpWithDataSegs\n"); if (DumpType & MiniDumpWithFullMemory) @@ -728,8 +746,9 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, /* 2) write header */ mdHead.Signature = MINIDUMP_SIGNATURE; - mdHead.Version = MINIDUMP_VERSION; + mdHead.Version = MINIDUMP_VERSION; /* NOTE: native puts in an 'implementation specific' value in the high order word of this member */ mdHead.NumberOfStreams = nStreams; + mdHead.CheckSum = 0; /* native sets a 0 checksum in its files */ mdHead.StreamDirectoryRva = sizeof(mdHead); mdHead.u.TimeDateStamp = time(NULL); mdHead.Flags = DumpType; @@ -804,6 +823,11 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, } } + /* fill the remaining directory entries with 0's (unused stream types) */ + /* NOTE: this should always come last in the dump! */ + for (i = idx_stream; i < nStreams; i++) + writeat(&dc, mdHead.StreamDirectoryRva + i * sizeof(emptyDir), &emptyDir, sizeof(emptyDir)); + HeapFree(GetProcessHeap(), 0, dc.pcs_buffer); HeapFree(GetProcessHeap(), 0, dc.mem); HeapFree(GetProcessHeap(), 0, dc.modules);

1 0

Eric van Beurden : dbghelp: Wrap TRACE strings using the debugstr functions and update some type casting .
by Alexandre Julliard 18 Jan '08

18 Jan '08

Module: wine Branch: master Commit: e254a1d929d0df3d676e889d8f875e2ada88f704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e254a1d929d0df3d676e889d8… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Jan 17 15:57:12 2008 -0500 dbghelp: Wrap TRACE strings using the debugstr functions and update some type casting. --- dlls/dbghelp/pe_module.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 6676f29..c072a24 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); * its debugging information) */ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, - const void* mapping, IMAGE_NT_HEADERS* nth) + void* mapping, IMAGE_NT_HEADERS* nth) { IMAGE_SECTION_HEADER* section; int i, stabsize = 0, stabstrsize = 0; @@ -67,11 +67,13 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, { ret = stabs_parse(module, module->module.BaseOfImage - nth->OptionalHeader.ImageBase, - RtlImageRvaToVa(nth, (void*)mapping, stabs, NULL), + RtlImageRvaToVa(nth, mapping, stabs, NULL), stabsize, - RtlImageRvaToVa(nth, (void*)mapping, stabstr, NULL), + RtlImageRvaToVa(nth, mapping, stabstr, NULL), stabstrsize); } + + TRACE("%s the STABS debug info\n", ret ? "successfully loaded" : "failed to load"); return ret; } @@ -96,7 +98,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, const IMAGE_DEBUG_DIRECTORY* dbg; BOOL ret = FALSE; - WINE_TRACE("Processing DBG file %s\n", dbg_name); + WINE_TRACE("Processing DBG file %s\n", debugstr_a(dbg_name)); if (SymFindFileInPath(pcs->handle, NULL, dbg_name, NULL, 0, 0, 0, tmp, dbg_match, NULL) && (hFile = CreateFileA(tmp, GENERIC_READ, FILE_SHARE_READ, NULL, @@ -108,7 +110,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, if (hdr->TimeDateStamp != timestamp) { WINE_ERR("Warning - %s has incorrect internal timestamp\n", - dbg_name); + debugstr_a(dbg_name)); /* * Well, sometimes this happens to DBG files which ARE REALLY the * right .DBG files but nonetheless this check fails. Anyway, @@ -136,7 +138,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, ERR("Wrong signature in .DBG file %s\n", debugstr_a(tmp)); } else - WINE_ERR("-Unable to peruse .DBG file %s (%s)\n", dbg_name, debugstr_a(tmp)); + WINE_ERR("-Unable to peruse .DBG file %s (%s)\n", debugstr_a(dbg_name), debugstr_a(tmp)); if (dbg_mapping) UnmapViewOfFile(dbg_mapping); if (hMap) CloseHandle(hMap); @@ -151,7 +153,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, */ static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* module, - const void* mapping, IMAGE_NT_HEADERS* nth) + void* mapping, IMAGE_NT_HEADERS* nth) { BOOL ret = FALSE; const IMAGE_DATA_DIRECTORY* dir; @@ -163,7 +165,7 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs, nDbg = dir->Size / sizeof(IMAGE_DEBUG_DIRECTORY); if (!nDbg) return FALSE; - dbg = RtlImageRvaToVa(nth, (void*)mapping, dir->VirtualAddress, NULL); + dbg = RtlImageRvaToVa(nth, mapping, dir->VirtualAddress, NULL); /* Parse debug directory */ if (nth->FileHeader.Characteristics & IMAGE_FILE_DEBUG_STRIPPED) @@ -199,7 +201,7 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs, */ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* module, - const void* mapping, IMAGE_NT_HEADERS* nth) + void* mapping, IMAGE_NT_HEADERS* nth) { unsigned int i; const IMAGE_EXPORT_DIRECTORY* exports; @@ -229,13 +231,13 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) { symt_new_public(module, NULL, section->Name, - RtlImageRvaToVa(nth, (void*)mapping, section->VirtualAddress, NULL), + RtlImageRvaToVa(nth, mapping, section->VirtualAddress, NULL), 1, TRUE /* FIXME */, TRUE /* FIXME */); } #endif /* Add exported functions */ - if ((exports = RtlImageDirectoryEntryToData((void*)mapping, FALSE, + if ((exports = RtlImageDirectoryEntryToData(mapping, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, &size))) { const WORD* ordinals = NULL; @@ -244,9 +246,9 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, unsigned int j; char buffer[16]; - functions = RtlImageRvaToVa(nth, (void*)mapping, exports->AddressOfFunctions, NULL); - ordinals = RtlImageRvaToVa(nth, (void*)mapping, exports->AddressOfNameOrdinals, NULL); - names = RtlImageRvaToVa(nth, (void*)mapping, exports->AddressOfNames, NULL); + functions = RtlImageRvaToVa(nth, mapping, exports->AddressOfFunctions, NULL); + ordinals = RtlImageRvaToVa(nth, mapping, exports->AddressOfNameOrdinals, NULL); + names = RtlImageRvaToVa(nth, mapping, exports->AddressOfNames, NULL); if (functions && ordinals && names) { @@ -254,7 +256,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, { if (!names[i]) continue; symt_new_public(module, NULL, - RtlImageRvaToVa(nth, (void*)mapping, names[i], NULL), + RtlImageRvaToVa(nth, mapping, names[i], NULL), base + functions[ordinals[i]], 1, TRUE /* FIXME */, TRUE /* FIXME */); } @@ -369,6 +371,8 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, else pe_load_debug_info(pcs, module); } + else + ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); } UnmapViewOfFile(mapping); }

1 0

Eric van Beurden : dbghelp: Return TRUE in SymInitializeW if process is already initialized and add an ERR to SymCleanup .
by Alexandre Julliard 18 Jan '08

18 Jan '08

Module: wine Branch: master Commit: a5a35ec211cadeae2319607931d32aa23547adbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a35ec211cadeae231960793… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Jan 17 15:47:55 2008 -0500 dbghelp: Return TRUE in SymInitializeW if process is already initialized and add an ERR to SymCleanup. --- dlls/dbghelp/dbghelp.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index dc3b86a..fba22d0 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -268,8 +268,14 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP TRACE("(%p %s %u)\n", hProcess, debugstr_w(UserSearchPath), fInvadeProcess); - if (process_find_by_handle(hProcess)) - FIXME("what to do ??\n"); + if (process_find_by_handle(hProcess)){ + WARN("the symbols for this process have already been initialized!\n"); + + /* MSDN says to only call this function once unless SymCleanup() has been called since the last call. + It also says to call SymRefreshModuleList() instead if you just want the module list refreshed. + Native still returns TRUE even if the process has already been initialized. */ + return TRUE; + } pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); if (!pcs) return FALSE; @@ -379,6 +385,8 @@ BOOL WINAPI SymCleanup(HANDLE hProcess) return TRUE; } } + + ERR("this process has not had SymInitialize() called for it!\n"); return FALSE; }

1 0

Eric van Beurden : dbghelp: Update some mscvpdb. h definitions and descriptions.
by Alexandre Julliard 18 Jan '08

18 Jan '08

Module: wine Branch: master Commit: 5184b49fe04b442834d35df8e65f8e112130cbfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5184b49fe04b442834d35df8e… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Jan 17 15:40:41 2008 -0500 dbghelp: Update some mscvpdb.h definitions and descriptions. --- include/wine/mscvpdb.h | 334 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 300 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5184b49fe04b442834d35…

1 0

Alexandre Julliard : widl: Use the real argument names in the C method macros.
by Alexandre Julliard 18 Jan '08

18 Jan '08

Module: wine Branch: master Commit: ba5336175cb9d873d46d0480943912520c587d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5336175cb9d873d46d04809… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 12:03:22 2008 +0100 widl: Use the real argument names in the C method macros. --- tools/widl/header.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index fd89534..0f697b8 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -578,23 +578,21 @@ static void write_method_macro(const type_t *iface, const char *name) var_t *def = cur->def; if (!is_callas(def->attrs)) { const var_t *arg; - int argc = 0; - int c; - - if (cur->args) LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) argc++; fprintf(header, "#define %s_", name); write_name(header,def); - fprintf(header, "(p"); - for (c=0; c<argc; c++) - fprintf(header, ",%c", c+'a'); + fprintf(header, "(This"); + if (cur->args) + LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) + fprintf(header, ",%s", arg->name); fprintf(header, ") "); - fprintf(header, "(p)->lpVtbl->"); + fprintf(header, "(This)->lpVtbl->"); write_name(header, def); - fprintf(header, "(p"); - for (c=0; c<argc; c++) - fprintf(header, ",%c", c+'a'); + fprintf(header, "(This"); + if (cur->args) + LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) + fprintf(header, ",%s", arg->name); fprintf(header, ")\n"); } }

1 0

Alexandre Julliard : ntdll: Don' t try to restore extended fpu context if not supported.
by Alexandre Julliard 18 Jan '08

18 Jan '08

Module: wine Branch: master Commit: 2cba11aa6f929e749a2876da8fbb6f235e0d849d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cba11aa6f929e749a2876da8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 12:02:31 2008 +0100 ntdll: Don't try to restore extended fpu context if not supported. Remove an extra fpu context save left over from testing. --- dlls/ntdll/signal_i386.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 03729ed..172d362 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -792,7 +792,6 @@ static inline void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, } if (fpux) { - save_fpux( context ); context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); fpux_support = 1; @@ -873,7 +872,7 @@ void set_cpu_context( const CONTEXT *context ) { DWORD flags = context->ContextFlags & ~CONTEXT_i386; - if (flags & CONTEXT_EXTENDED_REGISTERS) restore_fpux( context ); + if ((flags & CONTEXT_EXTENDED_REGISTERS) && fpux_support) restore_fpux( context ); else if (flags & CONTEXT_FLOATING_POINT) restore_fpu( context ); if (flags & CONTEXT_DEBUG_REGISTERS)

1 0