January 2012 - Wine-commits

Dmitry Timoshkov : server: Store correct protection for an image mapping.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 29b91206a85878b43a31a7ab2dba7d62e33f7457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b91206a85878b43a31a7ab2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 24 17:44:56 2012 +0800 server: Store correct protection for an image mapping. --- server/mapping.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index f37016f..90956e9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -395,7 +395,7 @@ static int build_shared_mapping( struct mapping *mapping, int fd, } /* retrieve the mapping parameters for an executable (PE) image */ -static int get_image_params( struct mapping *mapping, int unix_fd ) +static int get_image_params( struct mapping *mapping, int unix_fd, int protect ) { IMAGE_DOS_HEADER dos; IMAGE_SECTION_HEADER *sec = NULL; @@ -453,7 +453,7 @@ static int get_image_params( struct mapping *mapping, int unix_fd ) if (mapping->shared_file) list_add_head( &shared_list, &mapping->shared_entry ); - mapping->protect = VPROT_IMAGE; + mapping->protect = protect; free( sec ); return 1; @@ -523,7 +523,7 @@ static struct object *create_mapping( struct directory *root, const struct unico if ((unix_fd = get_unix_fd( mapping->fd )) == -1) goto error; if (protect & VPROT_IMAGE) { - if (!get_image_params( mapping, unix_fd )) goto error; + if (!get_image_params( mapping, unix_fd, protect )) goto error; return &mapping->obj; } if (fstat( unix_fd, &st ) == -1)

1 0

Dmitry Timoshkov : ntdll: Use PAGE_EXECUTE_READ protection for an image section.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 0e85fc66deef8524fa079d0906f4ff3728448bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e85fc66deef8524fa079d090… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 24 17:45:21 2012 +0800 ntdll: Use PAGE_EXECUTE_READ protection for an image section. --- dlls/ntdll/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 98e3dfb..381e2ac 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1486,12 +1486,12 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, size.QuadPart = 0; status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, - NULL, &size, PAGE_READONLY, SEC_IMAGE, file ); + NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, file ); if (status != STATUS_SUCCESS) return status; module = NULL; status = NtMapViewOfSection( mapping, NtCurrentProcess(), - &module, 0, 0, &size, &len, ViewShare, 0, PAGE_READONLY ); + &module, 0, 0, &size, &len, ViewShare, 0, PAGE_EXECUTE_READ ); if (status < 0) goto done; /* create the MODREF */

1 0

Dmitry Timoshkov : ntdll: Add an access check for file mappings.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 3a5ee02735d49a808f3f3fc3a3f39d8e14089a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5ee02735d49a808f3f3fc3a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 24 17:45:54 2012 +0800 ntdll: Add an access check for file mappings. --- dlls/kernel32/tests/loader.c | 2 +- dlls/kernel32/tests/virtual.c | 1 - dlls/ntdll/virtual.c | 48 +++++++++++++++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 398e5f5..0b67bb6 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -639,7 +639,7 @@ static void test_VirtualProtect(void *base, void *section) ret = VirtualProtect(section, si.dwPageSize, td[i].prot_set, &old_prot); if (td[i].prot_get) { - ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); + ok(ret, "%d: VirtualProtect error %d, requested prot %#x\n", i, GetLastError(), td[i].prot_set); ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 915f92d..d502bbf 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2207,7 +2207,6 @@ static void test_mapping(void) /* NT4 doesn't fail on incompatible map and view */ if (ret) { - todo_wine ok(broken(ret), "VirtualProtect should fail, map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]); skip("Incompatible map and view are not properly handled on this platform\n"); break; /* NT4 won't pass remaining tests */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 344a81a..717917d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -73,6 +73,7 @@ struct file_view void *base; /* Base address */ size_t size; /* Size in bytes */ HANDLE mapping; /* Handle to the file mapping */ + unsigned int map_protect; /* Mapping protection */ unsigned int protect; /* Protection for all pages at allocation time */ BYTE prot[1]; /* Protection byte for each page */ }; @@ -474,6 +475,7 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz view->base = base; view->size = size; view->mapping = 0; + view->map_protect = 0; view->protect = vprot; memset( view->prot, vprot, size >> page_shift ); @@ -1116,7 +1118,7 @@ static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st ) * Map an executable (PE format) image into memory. */ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_size, SIZE_T mask, - SIZE_T header_size, int shared_fd, HANDLE dup_mapping, PVOID *addr_ptr ) + SIZE_T header_size, int shared_fd, HANDLE dup_mapping, unsigned int map_vprot, PVOID *addr_ptr ) { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; @@ -1363,6 +1365,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz done: view->mapping = dup_mapping; + view->map_protect = map_vprot; server_leave_uninterrupted_section( &csVirtual, &sigset ); *addr_ptr = ptr; @@ -2039,6 +2042,34 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si return status; } +static ULONG map_protection_to_access( ULONG vprot ) +{ + vprot &= VPROT_READ | VPROT_WRITE | VPROT_EXEC | VPROT_WRITECOPY; + if (vprot & VPROT_EXEC) + { + if (vprot & VPROT_WRITE) vprot |= VPROT_WRITECOPY; + } + else vprot &= ~VPROT_WRITECOPY; + return vprot; +} + +static BOOL is_compatible_protection( const struct file_view *view, ULONG new_prot ) +{ + ULONG view_prot, map_prot; + + view_prot = map_protection_to_access( view->protect ); + new_prot = map_protection_to_access( new_prot ); + + if (view_prot == new_prot) return TRUE; + if (!view_prot) return FALSE; + + if ((view_prot & new_prot) != new_prot) return FALSE; + + map_prot = map_protection_to_access( view->map_protect ); + if ((map_prot & new_prot) == new_prot) return TRUE; + + return FALSE; +} /*********************************************************************** * NtProtectVirtualMemory (NTDLL.@) @@ -2099,9 +2130,13 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T status = STATUS_INVALID_PAGE_PROTECTION; else { - new_vprot |= VPROT_COMMITTED; - if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); - if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; + if (!view->mapping || is_compatible_protection( view, new_vprot )) + { + new_vprot |= VPROT_COMMITTED; + if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); + if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; + } + else status = STATUS_INVALID_PAGE_PROTECTION; } } } @@ -2571,14 +2606,14 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p if ((res = server_get_unix_fd( shared_file, FILE_READ_DATA|FILE_WRITE_DATA, &shared_fd, &shared_needs_close, NULL, NULL ))) goto done; res = map_image( handle, unix_handle, base, size, mask, header_size, - shared_fd, dup_mapping, addr_ptr ); + shared_fd, dup_mapping, map_vprot, addr_ptr ); if (shared_needs_close) close( shared_fd ); NtClose( shared_file ); } else { res = map_image( handle, unix_handle, base, size, mask, header_size, - -1, dup_mapping, addr_ptr ); + -1, dup_mapping, map_vprot, addr_ptr ); } if (needs_close) close( unix_handle ); if (res >= 0) *size_ptr = size; @@ -2628,6 +2663,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p *addr_ptr = view->base; *size_ptr = size; view->mapping = dup_mapping; + view->map_protect = map_vprot; dup_mapping = 0; /* don't close it */ } else

1 0

Dan Kegel : include: ntddcdvd.h structure naming, packing fixes.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: b94fabfb5bfe9a19af22b9e28f7b6176ab1de00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94fabfb5bfe9a19af22b9e28… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Jan 23 09:13:13 2012 -0800 include: ntddcdvd.h structure naming, packing fixes. --- include/ddk/ntddcdvd.h | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/ddk/ntddcdvd.h b/include/ddk/ntddcdvd.h index 53e164f..5313496 100644 --- a/include/ddk/ntddcdvd.h +++ b/include/ddk/ntddcdvd.h @@ -49,6 +49,8 @@ typedef enum { typedef ULONG DVD_SESSION_ID, *PDVD_SESSION_ID; +#include <pshpack1.h> + typedef struct _DVD_COPY_PROTECT_KEY { ULONG KeyLength; DVD_SESSION_ID SessionId; @@ -97,7 +99,7 @@ typedef enum _DVD_STRUCTURE_FORMAT DvdMaxDescriptor } DVD_STRUCTURE_FORMAT, *PDVD_STRUCTURE_FORMAT; -typedef struct _DVD_READ_STRUCTURE { +typedef struct DVD_READ_STRUCTURE { /* Contains an offset to the logical block address of the descriptor to be retrieved. */ LARGE_INTEGER BlockByteOffset; @@ -151,8 +153,6 @@ typedef struct _DVD_LAYER_DESCRIPTOR /* 0 indicates no BCA data */ UCHAR BCAFlag : 1; - - UCHAR Reserved6; }DVD_LAYER_DESCRIPTOR, * PDVD_LAYER_DESCRIPTOR; typedef struct _DVD_COPYRIGHT_DESCRIPTOR @@ -186,4 +186,6 @@ typedef struct _DVD_MANUFACTURER_DESCRIPTOR #define DVD_DISCKEY_SIZE 2048 #define DVD_SECTOR_PROTECTED 0x00000020 +#include <poppack.h> + #endif /* __NTDDCDVD_H */

1 0

Gerald Pfeifer : configure: Use the -Wignored-qualifiers compiler option if available.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 2505dfcc57fd3bc3b3b1d33d9940a5d790303059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2505dfcc57fd3bc3b3b1d33d9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jan 23 21:58:35 2012 +0100 configure: Use the -Wignored-qualifiers compiler option if available. --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/configure b/configure index fa17bcc..ef5fb31 100755 --- a/configure +++ b/configure @@ -12062,6 +12062,31 @@ $as_echo "$ac_cv_cflags__Wempty_body" >&6; } if test $ac_cv_cflags__Wempty_body = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wempty-body" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wignored-qualifiers" >&5 +$as_echo_n "checking whether the compiler supports -Wignored-qualifiers... " >&6; } +if ${ac_cv_cflags__Wignored_qualifiers+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wignored-qualifiers" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wignored_qualifiers=yes +else + ac_cv_cflags__Wignored_qualifiers=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wignored_qualifiers" >&5 +$as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } +if test $ac_cv_cflags__Wignored_qualifiers = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wstrict-prototypes" >&5 $as_echo_n "checking whether the compiler supports -Wstrict-prototypes... " >&6; } if ${ac_cv_cflags__Wstrict_prototypes+:} false; then : diff --git a/configure.ac b/configure.ac index 5810111..9a4848b 100644 --- a/configure.ac +++ b/configure.ac @@ -1705,6 +1705,7 @@ then WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) + WINE_TRY_CFLAGS([-Wignored-qualifiers]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits]) WINE_TRY_CFLAGS([-Wunused-but-set-parameter])

1 0

Eric Pouech : winedbg, winedump: Embed wine build-id information info minidump, and display it.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 2ce0e940181a04470f9937a92ae7640fe0e54646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce0e940181a04470f9937a92… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 23 21:36:59 2012 +0100 winedbg, winedump: Embed wine build-id information info minidump, and display it. --- dlls/dbghelp/minidump.c | 42 ++++++++++++++++++++++++++++++++++++++- programs/winedbg/tgt_minidump.c | 18 +++++++++++++++- tools/winedump/minidump.c | 15 +++++++++++++ 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index fd7eb1ac..b7e098b 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -615,11 +615,29 @@ static unsigned dump_system_info(struct dump_context* dc) OSVERSIONINFOW osInfo; DWORD written; ULONG slen; + DWORD wine_extra = 0; + + const char *(CDECL *wine_get_build_id)(void); + void (CDECL *wine_get_host_version)(const char **sysname, const char **release); + const char* build_id = NULL; + const char* sys_name = NULL; + const char* release_name = NULL; GetSystemInfo(&sysInfo); osInfo.dwOSVersionInfoSize = sizeof(osInfo); GetVersionExW(&osInfo); + wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); + wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); + if (wine_get_build_id && wine_get_host_version) + { + /* cheat minidump system information by adding specific wine information */ + wine_extra = 4 + 4 * sizeof(slen); + build_id = wine_get_build_id(); + wine_get_host_version(&sys_name, &release_name); + wine_extra += strlen(build_id) + 1 + strlen(sys_name) + 1 + strlen(release_name) + 1; + } + mdSysInfo.ProcessorArchitecture = sysInfo.u.s.wProcessorArchitecture; mdSysInfo.ProcessorLevel = sysInfo.wProcessorLevel; mdSysInfo.ProcessorRevision = sysInfo.wProcessorRevision; @@ -630,7 +648,7 @@ static unsigned dump_system_info(struct dump_context* dc) mdSysInfo.BuildNumber = osInfo.dwBuildNumber; mdSysInfo.PlatformId = osInfo.dwPlatformId; - mdSysInfo.CSDVersionRva = dc->rva + sizeof(mdSysInfo); + mdSysInfo.CSDVersionRva = dc->rva + sizeof(mdSysInfo) + wine_extra; mdSysInfo.u1.Reserved1 = 0; mdSysInfo.u1.s.SuiteMask = VER_SUITE_TERMINAL; @@ -672,6 +690,28 @@ static unsigned dump_system_info(struct dump_context* dc) } append(dc, &mdSysInfo, sizeof(mdSysInfo)); + /* write Wine specific system information just behind the structure, and before any string */ + if (wine_extra) + { + char code[] = {'W','I','N','E'}; + + WriteFile(dc->hFile, code, 4, &written, NULL); + /* number of sub-info, so that we can extend structure if needed */ + slen = 3; + WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); + /* we store offsets from just after the WINE marker */ + slen = 4 * sizeof(DWORD); + WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); + slen += strlen(build_id) + 1; + WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); + slen += strlen(sys_name) + 1; + WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); + WriteFile(dc->hFile, build_id, strlen(build_id) + 1, &written, NULL); + WriteFile(dc->hFile, sys_name, strlen(sys_name) + 1, &written, NULL); + WriteFile(dc->hFile, release_name, strlen(release_name) + 1, &written, NULL); + dc->rva += wine_extra; + } + /* 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); diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index f5750e8..afa41d8 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -174,6 +174,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) MINIDUMP_MODULE_LIST* mml; MINIDUMP_MODULE* mm; MINIDUMP_STRING* mds; + MINIDUMP_DIRECTORY* dir; WCHAR exec_name[1024]; WCHAR nameW[1024]; unsigned len; @@ -212,7 +213,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } } - if (MiniDumpReadDumpStream(data->mapping, SystemInfoStream, NULL, &stream, NULL)) + if (MiniDumpReadDumpStream(data->mapping, SystemInfoStream, &dir, &stream, NULL)) { MINIDUMP_SYSTEM_INFO* msi = stream; const char *str; @@ -305,6 +306,21 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } dbg_printf(" on Windows %s (%u)\n", str, msi->BuildNumber); /* FIXME CSD: msi->CSDVersionRva */ + + if (sizeof(MINIDUMP_SYSTEM_INFO) + 4 > dir->Location.DataSize && + msi->CSDVersionRva >= dir->Location.Rva + sizeof(MINIDUMP_SYSTEM_INFO) + 4) + { + const char* code = (const char*)stream + sizeof(MINIDUMP_SYSTEM_INFO); + const DWORD* wes; + + if (code[0] == 'W' && code[1] == 'I' && code[2] == 'N' && code[3] == 'E' && + *(wes = (const DWORD*)(code += 4)) >= 3) + { + /* assume we have wine extensions */ + dbg_printf(" [on %s, on top of %s (%s)]\n", + code + wes[1], code + wes[2], code + wes[3]); + } + } } dbg_curr_process = dbg_add_process(&be_process_minidump_io, pid, hProc); diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 4cd04f3..ddd0ed6 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -341,6 +341,21 @@ void mdmp_dump(void) printf(" x86.AMDExtendedCpuFeatures: %x\n", msi->Cpu.X86CpuInfo.AMDExtendedCpuFeatures); } + if (sizeof(MINIDUMP_SYSTEM_INFO) + 4 > dir->Location.DataSize && + msi->CSDVersionRva >= dir->Location.Rva + 4) + { + const char* code = PRD(dir->Location.Rva + sizeof(MINIDUMP_SYSTEM_INFO), 4); + const DWORD* wes; + if (code && code[0] == 'W' && code[1] == 'I' && code[2] == 'N' && code[3] == 'E' && + *(wes = (const DWORD*)(code += 4)) >= 3) + { + /* assume we have wine extensions */ + printf(" Wine details:\n"); + printf(" build-id: %s\n", code + wes[1]); + printf(" system: %s\n", code + wes[2]); + printf(" release: %s\n", code + wes[3]); + } + } } break; case MiscInfoStream:

1 0

Eric Pouech : dbghelp: Add our own thread data gathering struct for minidump internals instead on relying on SYSTEM_PROCESS_INFO .
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: d02295d998d63579ec5faa963a438fb6d58f40c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02295d998d63579ec5faa963… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 23 21:37:05 2012 +0100 dbghelp: Add our own thread data gathering struct for minidump internals instead on relying on SYSTEM_PROCESS_INFO. --- dlls/dbghelp/minidump.c | 78 ++++++++++++++++++++++++++++++---------------- 1 files changed, 51 insertions(+), 27 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index b7e098b..757e21d 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -49,13 +49,21 @@ struct dump_module WCHAR name[MAX_PATH]; }; +struct dump_thread +{ + ULONG tid; + ULONG prio_class; + ULONG curr_prio; +}; + struct dump_context { /* process & thread information */ HANDLE hProcess; DWORD pid; - void* pcs_buffer; - SYSTEM_PROCESS_INFORMATION* spi; + /* thread information */ + struct dump_thread* threads; + unsigned num_threads; /* module information */ struct dump_module* modules; unsigned num_modules; @@ -73,41 +81,55 @@ struct dump_context }; /****************************************************************** - * fetch_processes_info + * fetch_process_info * - * reads system wide process information, and make spi point to the record + * reads system wide process information, and gather from it the threads information * for process of id 'pid' */ -static BOOL fetch_processes_info(struct dump_context* dc) +static BOOL fetch_process_info(struct dump_context* dc) { ULONG buf_size = 0x1000; NTSTATUS nts; + void* pcs_buffer = NULL; - dc->pcs_buffer = NULL; - if (!(dc->pcs_buffer = HeapAlloc(GetProcessHeap(), 0, buf_size))) return FALSE; + if (!(pcs_buffer = HeapAlloc(GetProcessHeap(), 0, buf_size))) return FALSE; for (;;) { - nts = NtQuerySystemInformation(SystemProcessInformation, - dc->pcs_buffer, buf_size, NULL); + nts = NtQuerySystemInformation(SystemProcessInformation, + pcs_buffer, buf_size, NULL); if (nts != STATUS_INFO_LENGTH_MISMATCH) break; - dc->pcs_buffer = HeapReAlloc(GetProcessHeap(), 0, dc->pcs_buffer, - buf_size *= 2); - if (!dc->pcs_buffer) return FALSE; + pcs_buffer = HeapReAlloc(GetProcessHeap(), 0, pcs_buffer, buf_size *= 2); + if (!pcs_buffer) return FALSE; } if (nts == STATUS_SUCCESS) { - dc->spi = dc->pcs_buffer; + SYSTEM_PROCESS_INFORMATION* spi = pcs_buffer; + unsigned i; + for (;;) { - if (HandleToUlong(dc->spi->UniqueProcessId) == dc->pid) return TRUE; - if (!dc->spi->NextEntryOffset) break; - dc->spi = (SYSTEM_PROCESS_INFORMATION*)((char*)dc->spi + dc->spi->NextEntryOffset); + if (HandleToUlong(spi->UniqueProcessId) == dc->pid) + { + dc->num_threads = spi->dwThreadCount; + dc->threads = HeapAlloc(GetProcessHeap(), 0, + dc->num_threads * sizeof(dc->threads[0])); + if (!dc->threads) goto failed; + for (i = 0; i < dc->num_threads; i++) + { + dc->threads[i].tid = HandleToULong(spi->ti[i].ClientId.UniqueThread); + dc->threads[i].prio_class = spi->ti[i].dwBasePriority; /* FIXME */ + dc->threads[i].curr_prio = spi->ti[i].dwCurrentPriority; + } + HeapFree(GetProcessHeap(), 0, pcs_buffer); + return TRUE; + } + if (!spi->NextEntryOffset) break; + spi = (SYSTEM_PROCESS_INFORMATION*)((char*)spi + spi->NextEntryOffset); } } - HeapFree(GetProcessHeap(), 0, dc->pcs_buffer); - dc->pcs_buffer = NULL; - dc->spi = NULL; +failed: + HeapFree(GetProcessHeap(), 0, pcs_buffer); return FALSE; } @@ -147,7 +169,7 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, const MINIDUMP_EXCEPTION_INFORMATION* except, MINIDUMP_THREAD* mdThd, CONTEXT* ctx) { - DWORD tid = HandleToUlong(dc->spi->ti[thd_idx].ClientId.UniqueThread); + DWORD tid = dc->threads[thd_idx].tid; HANDLE hThread; THREAD_BASIC_INFORMATION tbi; @@ -161,8 +183,8 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, mdThd->Stack.Memory.Rva = 0; mdThd->ThreadContext.DataSize = 0; mdThd->ThreadContext.Rva = 0; - mdThd->PriorityClass = dc->spi->ti[thd_idx].dwBasePriority; /* FIXME */ - mdThd->Priority = dc->spi->ti[thd_idx].dwCurrentPriority; + mdThd->PriorityClass = dc->threads[thd_idx].prio_class; + mdThd->Priority = dc->threads[thd_idx].curr_prio; if ((hThread = OpenThread(THREAD_ALL_ACCESS, FALSE, tid)) == NULL) { @@ -740,9 +762,9 @@ static unsigned dump_threads(struct dump_context* dc, mdThdList.NumberOfThreads = 0; rva_base = dc->rva; - dc->rva += sz = sizeof(mdThdList.NumberOfThreads) + dc->spi->dwThreadCount * sizeof(mdThd); + dc->rva += sz = sizeof(mdThdList.NumberOfThreads) + dc->num_threads * sizeof(mdThd); - for (i = 0; i < dc->spi->dwThreadCount; i++) + for (i = 0; i < dc->num_threads; i++) { fetch_thread_info(dc, i, except, &mdThd, &ctx); @@ -761,7 +783,7 @@ static unsigned dump_threads(struct dump_context* dc, cbin.ProcessId = dc->pid; cbin.ProcessHandle = dc->hProcess; cbin.CallbackType = ThreadCallback; - cbin.u.Thread.ThreadId = HandleToUlong(dc->spi->ti[i].ClientId.UniqueThread); + cbin.u.Thread.ThreadId = dc->threads[i].tid; cbin.u.Thread.ThreadHandle = 0; /* FIXME */ cbin.u.Thread.Context = ctx; cbin.u.Thread.SizeOfContext = sizeof(CONTEXT); @@ -896,6 +918,8 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, dc.modules = NULL; dc.num_modules = 0; dc.alloc_modules = 0; + dc.threads = NULL; + dc.num_threads = 0; dc.cb = CallbackParam; dc.type = DumpType; dc.mem = NULL; @@ -903,7 +927,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, dc.alloc_mem = 0; dc.rva = 0; - if (!fetch_processes_info(&dc)) return FALSE; + if (!fetch_process_info(&dc)) return FALSE; fetch_modules_info(&dc); /* 1) init */ @@ -1007,9 +1031,9 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, 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); + HeapFree(GetProcessHeap(), 0, dc.threads); return TRUE; }

1 0

Eric Pouech : dbghelp: Allow CPU backends to add specific information into a minidump.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 1c5450f91f73e2a209067f21b36d800546c8ad1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5450f91f73e2a209067f21b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 23 21:37:10 2012 +0100 dbghelp: Allow CPU backends to add specific information into a minidump. Use it to add a 256 byte block around current program counter. --- dlls/dbghelp/cpu_arm.c | 7 ++++ dlls/dbghelp/cpu_i386.c | 15 ++++++++ dlls/dbghelp/cpu_ppc.c | 7 ++++ dlls/dbghelp/cpu_sparc.c | 7 ++++ dlls/dbghelp/cpu_x86_64.c | 15 ++++++++ dlls/dbghelp/dbghelp_private.h | 55 ++++++++++++++++++++++++++++++ dlls/dbghelp/minidump.c | 72 +++++----------------------------------- 7 files changed, 115 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5450f91f73e2a209067…

1 0

Nikolay Sivov : msxml3: Internally call methods with interface macros.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: e983db851888b900873153ce42921aee85b40b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e983db851888b900873153ce4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 11:02:35 2012 +0300 msxml3: Internally call methods with interface macros. --- dlls/msxml3/domdoc.c | 40 ++++++++++++++++++++-------------------- dlls/msxml3/pi.c | 22 +++++++++++----------- dlls/msxml3/text.c | 8 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8aa1a21..1ae0d56 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -672,28 +672,28 @@ static inline domdoc *impl_from_IConnectionPointContainer(IConnectionPointContai /************************************************************************ * domdoc implementation of IPersistStream. */ -static HRESULT WINAPI domdoc_IPersistStreamInit_QueryInterface( +static HRESULT WINAPI PersistStreamInit_QueryInterface( IPersistStreamInit *iface, REFIID riid, void **ppvObj) { domdoc* This = impl_from_IPersistStreamInit(iface); return IXMLDOMDocument3_QueryInterface(&This->IXMLDOMDocument3_iface, riid, ppvObj); } -static ULONG WINAPI domdoc_IPersistStreamInit_AddRef( +static ULONG WINAPI PersistStreamInit_AddRef( IPersistStreamInit *iface) { domdoc* This = impl_from_IPersistStreamInit(iface); return IXMLDOMDocument3_AddRef(&This->IXMLDOMDocument3_iface); } -static ULONG WINAPI domdoc_IPersistStreamInit_Release( +static ULONG WINAPI PersistStreamInit_Release( IPersistStreamInit *iface) { domdoc* This = impl_from_IPersistStreamInit(iface); return IXMLDOMDocument3_Release(&This->IXMLDOMDocument3_iface); } -static HRESULT WINAPI domdoc_IPersistStreamInit_GetClassID( +static HRESULT WINAPI PersistStreamInit_GetClassID( IPersistStreamInit *iface, CLSID *classid) { domdoc* This = impl_from_IPersistStreamInit(iface); @@ -707,7 +707,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_GetClassID( return S_OK; } -static HRESULT WINAPI domdoc_IPersistStreamInit_IsDirty( +static HRESULT WINAPI PersistStreamInit_IsDirty( IPersistStreamInit *iface) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -715,7 +715,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_IsDirty( return S_FALSE; } -static HRESULT WINAPI domdoc_IPersistStreamInit_Load( +static HRESULT WINAPI PersistStreamInit_Load( IPersistStreamInit *iface, LPSTREAM pStm) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -768,7 +768,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Load( return attach_xmldoc(This, xmldoc); } -static HRESULT WINAPI domdoc_IPersistStreamInit_Save( +static HRESULT WINAPI PersistStreamInit_Save( IPersistStreamInit *iface, IStream *stream, BOOL clr_dirty) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -791,7 +791,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Save( return hr; } -static HRESULT WINAPI domdoc_IPersistStreamInit_GetSizeMax( +static HRESULT WINAPI PersistStreamInit_GetSizeMax( IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -799,7 +799,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_GetSizeMax( return E_NOTIMPL; } -static HRESULT WINAPI domdoc_IPersistStreamInit_InitNew( +static HRESULT WINAPI PersistStreamInit_InitNew( IPersistStreamInit *iface) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -809,15 +809,15 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_InitNew( static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable = { - domdoc_IPersistStreamInit_QueryInterface, - domdoc_IPersistStreamInit_AddRef, - domdoc_IPersistStreamInit_Release, - domdoc_IPersistStreamInit_GetClassID, - domdoc_IPersistStreamInit_IsDirty, - domdoc_IPersistStreamInit_Load, - domdoc_IPersistStreamInit_Save, - domdoc_IPersistStreamInit_GetSizeMax, - domdoc_IPersistStreamInit_InitNew + PersistStreamInit_QueryInterface, + PersistStreamInit_AddRef, + PersistStreamInit_Release, + PersistStreamInit_GetClassID, + PersistStreamInit_IsDirty, + PersistStreamInit_Load, + PersistStreamInit_Save, + PersistStreamInit_GetSizeMax, + PersistStreamInit_InitNew }; /* IXMLDOMDocument3 interface */ @@ -2665,7 +2665,7 @@ static HRESULT WINAPI domdoc_validateNode( int validated = 0; TRACE("(%p)->(%p, %p)\n", This, node, err); - domdoc_get_readyState(iface, &state); + IXMLDOMDocument3_get_readyState(iface, &state); if (state != READYSTATE_COMPLETE) { if (err) @@ -2760,7 +2760,7 @@ static HRESULT WINAPI domdoc_validate( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); TRACE("(%p)->(%p)\n", This, err); - return domdoc_validateNode(iface, (IXMLDOMNode*)iface, err); + return IXMLDOMDocument3_validateNode(iface, (IXMLDOMNode*)iface, err); } static HRESULT WINAPI domdoc_setProperty( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 332d97c..36ff563 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -222,23 +222,23 @@ static HRESULT WINAPI dom_pi_put_nodeValue( VARIANT value) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - BSTR sTarget; + BSTR target; HRESULT hr; TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); /* Cannot set data to a PI node whose target is 'xml' */ - hr = dom_pi_get_nodeName(iface, &sTarget); + hr = IXMLDOMProcessingInstruction_get_nodeName(iface, &target); if(hr == S_OK) { static const WCHAR xmlW[] = {'x','m','l',0}; - if(lstrcmpW( sTarget, xmlW) == 0) + if(!strcmpW(target, xmlW)) { - SysFreeString(sTarget); + SysFreeString(target); return E_FAIL; } - SysFreeString(sTarget); + SysFreeString(target); } return node_put_value(&This->node, &value); @@ -637,24 +637,24 @@ static HRESULT WINAPI dom_pi_put_data( BSTR data) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - HRESULT hr; VARIANT val; - BSTR sTarget; + BSTR target; + HRESULT hr; TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); /* Cannot set data to a PI node whose target is 'xml' */ - hr = dom_pi_get_nodeName(iface, &sTarget); + hr = IXMLDOMProcessingInstruction_get_nodeName(iface, &target); if(hr == S_OK) { static const WCHAR xmlW[] = {'x','m','l',0}; - if(lstrcmpW( sTarget, xmlW) == 0) + if(!strcmpW(target, xmlW)) { - SysFreeString(sTarget); + SysFreeString(target); return E_FAIL; } - SysFreeString(sTarget); + SysFreeString(target); } V_VT(&val) = VT_BSTR; diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index abf11b3..74de8e5 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -406,7 +406,7 @@ static HRESULT WINAPI domtext_get_nodeTypedValue( if (!var1) return E_INVALIDARG; - hr = domtext_get_parentNode(iface, &parent); + hr = IXMLDOMText_get_parentNode(iface, &parent); if (hr == S_OK) { @@ -433,7 +433,7 @@ static HRESULT WINAPI domtext_put_nodeTypedValue( TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); - hr = domtext_get_parentNode(iface, &parent); + hr = IXMLDOMText_get_parentNode(iface, &parent); if (hr == S_OK) { @@ -461,7 +461,7 @@ static HRESULT WINAPI domtext_get_dataType( if (!dtName) return E_INVALIDARG; - hr = domtext_get_parentNode(iface, &parent); + hr = IXMLDOMText_get_parentNode(iface, &parent); if (hr == S_OK) { @@ -491,7 +491,7 @@ static HRESULT WINAPI domtext_put_dataType( if (!dtName) return E_INVALIDARG; - hr = domtext_get_parentNode(iface, &parent); + hr = IXMLDOMText_get_parentNode(iface, &parent); if (hr == S_OK) {

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetBoolArray() test.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: a90eacab1ab21fefc17aa213dd90b40d3b4eb95f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90eacab1ab21fefc17aa213d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 24 09:48:32 2012 +0100 d3dx9/tests: Add effect parameter value SetBoolArray() test. --- dlls/d3dx9_36/tests/effect.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 6e60e2e..ed08485 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1635,7 +1635,9 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) D3DXHANDLE parameter; D3DXPARAMETER_DESC pdesc; BOOL bvalue; + DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + UINT l; parameter = effect->lpVtbl->GetParameterByName(effect, NULL, res_full_name); ok(parameter != NULL, "%u - %s: GetParameterByName failed\n", i, res_full_name); @@ -1693,6 +1695,32 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetBoolArray */ + *input_value = 1; + for (l = 1; l < res_desc->Bytes / sizeof(*input_value); ++l) + { + *(input_value + l) = *(input_value + l - 1) + 1; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetBoolArray(effect, parameter, (BOOL *)input_value, res_desc->Bytes / sizeof(*input_value)); + if (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR + || res_desc->Class == D3DXPC_MATRIX_ROWS) + { + for (l = 0; l < res_desc->Bytes / sizeof(*input_value); ++l) + { + set_number(expected_value + l, res_desc->Type, input_value + l, D3DXPT_BOOL); + } + ok(hr == D3D_OK, "%u - %s: SetBoolArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetBoolArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0