January 2012 - Wine-Commits

Francois Gouget : po: Fix the accelerator key specifications in the Chinese (PRC) translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 008b170568512d1d767fcd188cd5fbfb2c157d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=008b170568512d1d767fcd188… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:41:00 2012 +0100 po: Fix the accelerator key specifications in the Chinese (PRC) translation. --- po/zh_CN.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 955ae2e..713a08f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10150,7 +10150,7 @@ msgstr "" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "全选(&A)" +msgstr "全选(&A)\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5" @@ -10162,7 +10162,7 @@ msgstr "自动换行(&W)" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "搜索(&S)..." +msgstr "搜索(&S)...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3"

1 0

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

Jan. 24, 2012

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

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

Jan. 24, 2012

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

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

Jan. 24, 2012

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

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

Jan. 24, 2012

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

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

Jan. 24, 2012

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

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

Jan. 24, 2012

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

Francois Gouget : po: A small Slovenian translation update.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 8adea4836848690347255355a0aa69f532ec5ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adea4836848690347255355a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 09:19:23 2012 +0100 po: A small Slovenian translation update. --- po/sl.po | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/po/sl.po b/po/sl.po index b7839bf..209b011 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2179,13 +2179,12 @@ msgid "B&rowse..." msgstr "B&rskaj ..." #: cryptui.rc:294 -#, fuzzy msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" msgstr "" -"Opomba: naslednje vrste datotek lahko vsebujejo več kot eno potrdilo, seznam " -"preklicanih potrdil ali seznam zaupana vrednih potrdil:" +"Opomba: Naslednje vrste datotek lahko vsebujejo več kot eno potrdilo, seznam " +"preklicanih potrdil ali seznam zaupanja vrednih potrdil:" #: cryptui.rc:296 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" @@ -8222,21 +8221,19 @@ msgstr "Ra_zpni" #: user32.rc:33 #, fuzzy msgid "&Close\tAlt+F4" -msgstr "&Zapri\tAlt-F4" +msgstr "&Zapri\tAlt+F4" #: user32.rc:35 msgid "&About Wine" msgstr "&O Wine" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl+F4" -msgstr "&Zapri\tCtrl-F4" +msgstr "&Zapri\tCtrl+F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "Na&prej\tCtrl-F6" +msgstr "Na&prej\tCtrl+F6" #: user32.rc:79 msgid "&Abort" @@ -9857,9 +9854,8 @@ msgid "No open command associated with file type '%1'\n" msgstr "Noben ukaz za odprtje ni povezan z vrsto datotek '%1'\n" #: cmd.rc:295 -#, fuzzy msgid "Overwrite %1?" -msgstr "Prepiši %1" +msgstr "Prepiši %1?" #: cmd.rc:296 msgid "More..." @@ -9916,12 +9912,11 @@ msgstr "Klic paketne oznake zunaj paketnega skripta ni mogoč\n" #: cmd.rc:311 xcopy.rc:42 msgctxt "All key" msgid "A" -msgstr "A" +msgstr "V" #: cmd.rc:312 -#, fuzzy msgid "Delete %1?" -msgstr "Izbriši" +msgstr "Izbriši %1?" #: cmd.rc:313 msgid "Echo is %1\n" @@ -9984,14 +9979,12 @@ msgid "Volume in drive %1!c! has no label.\n" msgstr "Nosilec v pogonu %1!c! nima oznake.\n" #: cmd.rc:327 -#, fuzzy msgid " (Yes|No)" -msgstr "%1 (Da|Ne)\n" +msgstr " (Da|Ne)" #: cmd.rc:328 -#, fuzzy msgid " (Yes|No|All)" -msgstr "%1 (Da|Ne)\n" +msgstr " (Da|Ne|Vse)" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -13658,7 +13651,7 @@ msgstr "Uve&ljavi\tCtrl+Y" #: wordpad.rc:47 #, fuzzy msgid "&Clear\tDel" -msgstr "Po&čisti\tDEL" +msgstr "Po&čisti\tDel" #: wordpad.rc:48 msgid "&Select all\tCtrl+A" @@ -13989,11 +13982,11 @@ msgstr "Neveljavno število parametrov - za pomoč uporabite xcopy /?\n" #: xcopy.rc:28 #, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Neveljaven parameter '%1' - za pomoč uporabite xcopy /?\n" +msgstr "Neveljaven parameter '%1' - za pomoč uporabite xcopy /?\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" -msgstr "Za začetek kopiranja pritisnite <enter>\n" +msgstr "Pritisnite <enter> za začetek kopiranja\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n"

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetInt() test.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 51b96991348018cfd4df774a0b45c7e9820019db URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b96991348018cfd4df774a0… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 24 09:48:41 2012 +0100 d3dx9/tests: Add effect parameter value SetInt() test. --- dlls/d3dx9_36/tests/effect.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ed08485..3af1d14 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -888,6 +888,7 @@ test_effect_parameter_value_data[] = #define EFFECT_PARAMETER_VALUE_ARRAY_SIZE 48 /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f +#define INT_FLOAT_MULTI_INVERSE (1/INT_FLOAT_MULTI) static void test_effect_parameter_value_GetValue(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) @@ -1635,6 +1636,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) D3DXHANDLE parameter; D3DXPARAMETER_DESC pdesc; BOOL bvalue; + INT ivalue; DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; UINT l; @@ -1721,6 +1723,39 @@ 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); + + /* SetInt */ + ivalue = 0x1fbf02ff; + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetInt(effect, parameter, ivalue); + if (!res_desc->Elements && res_desc->Rows == 1 && res_desc->Columns == 1) + { + set_number(expected_value, res_desc->Type, &ivalue, D3DXPT_INT); + ok(hr == D3D_OK, "%u - %s: SetInt failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else if(!res_desc->Elements && res_desc->Type == D3DXPT_FLOAT && + ((res_desc->Class == D3DXPC_VECTOR && res_desc->Columns != 2) || + (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Rows != 2 && res_desc->Columns == 1))) + { + FLOAT tmp = ((ivalue & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + set_number(expected_value, res_desc->Type, &tmp, D3DXPT_FLOAT); + tmp = ((ivalue & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + set_number(expected_value + 1, res_desc->Type, &tmp, D3DXPT_FLOAT); + tmp = (ivalue & 0xff) * INT_FLOAT_MULTI_INVERSE; + set_number(expected_value + 2, res_desc->Type, &tmp, D3DXPT_FLOAT); + tmp = ((ivalue & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + set_number(expected_value + 3, res_desc->Type, &tmp, D3DXPT_FLOAT); + + ok(hr == D3D_OK, "%u - %s: SetInt failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetInt 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

Rico Schüller : d3dx9/tests: Add effect parameter value SetFloatArray() test.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 483ae58ef2a01b7c771fee57049506dd8ea2fff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483ae58ef2a01b7c771fee570… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 24 09:48:56 2012 +0100 d3dx9/tests: Add effect parameter value SetFloatArray() test. --- dlls/d3dx9_36/tests/effect.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 4788517..cd0423d 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1800,6 +1800,33 @@ 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); + + /* SetFloatArray */ + fvalue = 1.33; + for (l = 0; l < res_desc->Bytes / sizeof(fvalue); ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetFloatArray(effect, parameter, (FLOAT *)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_FLOAT); + } + ok(hr == D3D_OK, "%u - %s: SetFloatArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetFloatArray 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