February 2012 - Wine-commits

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 6b002f13e1f266a55ed57514fcaccccabb657872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b002f13e1f266a55ed57514f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 3 01:07:50 2012 +0900 po: Update Japanese translation. --- po/ja.po | 257 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 100 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b002f13e1f266a55ed57…

1 0

Laura Leinonen : po: Update Finnish translation.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 55c3cfa46e0440ffa655eb58a2f8702d9d74a60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55c3cfa46e0440ffa655eb58a… Author: Laura Leinonen <leinonen.laura(a)gmail.com> Date: Sat Feb 4 12:30:24 2012 +0200 po: Update Finnish translation. --- po/fi.po | 4475 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 2151 insertions(+), 2324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55c3cfa46e0440ffa655e…

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: e081cc593e0187c11f5e41f5e4a6c9c816fbf2c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e081cc593e0187c11f5e41f5e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 5 13:57:27 2012 +0100 po: Update German translation. --- po/de.po | 143 +++++++++++++++++++++----------------------------------------- 1 files changed, 48 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e081cc593e0187c11f5e4…

1 0

Henri Verbeet : ddraw: Implement get_window_region() on top of GetRandomRgn ().
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 204e53e449474253af6b2d7dc267a5fa37476649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=204e53e449474253af6b2d7dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 3 22:00:27 2012 +0100 ddraw: Implement get_window_region() on top of GetRandomRgn(). Instead of just GetClientRect(). This fixes a regression introduced by 3e9fe3e938f26a8c831f92367a13776d165cfdf8. We also need to clip against e.g. the screen edges instead of just the client rect. --- dlls/ddraw/clipper.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 81e9e8b..89a3bf3 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -99,29 +99,38 @@ static HRESULT WINAPI ddraw_clipper_SetHWnd(IDirectDrawClipper *iface, DWORD fla static HRGN get_window_region(HWND window) { - POINT origin = {0, 0}; - RECT client_rect; + POINT origin; + HRGN rgn; + HDC dc; - if (!GetClientRect(window, &client_rect)) + if (!(dc = GetDC(window))) { - /* This can happen if the window is destroyed, for example. */ - WARN("Failed to get client rect.\n"); + WARN("Failed to get dc.\n"); return NULL; } - if (!ClientToScreen(window, &origin)) + if (!(rgn = CreateRectRgn(0, 0, 0, 0))) { - ERR("Failed to translate origin.\n"); + ERR("Failed to create region.\n"); + ReleaseDC(window, dc); return NULL; } - if (!OffsetRect(&client_rect, origin.x, origin.y)) + if (GetRandomRgn(dc, rgn, SYSRGN) != 1) { - ERR("Failed to translate client rect.\n"); + ERR("Failed to get window region.\n"); + DeleteObject(rgn); + ReleaseDC(window, dc); return NULL; } - return CreateRectRgnIndirect(&client_rect); + if (GetVersion() & 0x80000000) + { + GetDCOrgEx(dc, &origin); + OffsetRgn(rgn, origin.x, origin.y); + } + + return rgn; } /*****************************************************************************

1 0

André Hentschel : winemaker: Print the invocation command line to the Makefile.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: c7c8d3ccfc2707d46c5f29245df1ea24eedf4b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c8d3ccfc2707d46c5f29245… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 5 14:03:32 2012 +0100 winemaker: Print the invocation command line to the Makefile. --- tools/winemaker | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index aaf0d9c..b6e5e7c 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -318,7 +318,7 @@ sub target_init($) ## # This is the path in which this project is located. In other -# words, this is the path to the Makefile. +# words, this is the path to the Makefile. my $P_PATH=0; ## @@ -2376,7 +2376,13 @@ sub generate_project_files($) } print FILEO "### Generated by Winemaker $version\n"; - print FILEO "\n\n"; + print FILEO "###\n"; + print FILEO "### Invocation command line was\n"; + print FILEO "### $0"; + foreach(@ARGV) { + print FILEO " $_"; + } + print FILEO "\n\n\n"; generate_list("SRCDIR",1,[ "." ]); if (@$project[$P_PATH] eq "") { @@ -2653,8 +2659,8 @@ sub usage() target_init(\@global_settings); -while (@ARGV>0) { - my $arg=shift @ARGV; +foreach(@ARGV) { + my $arg=$_; # General options if ($arg eq "--nobanner") { $opt_no_banner=1;

1 0

André Hentschel : msvcmaker: "MODULE = none" is obsolete.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: dbbf8f8adea988e4d52b42f9604d324c03a00a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbf8f8adea988e4d52b42f96… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 5 14:52:10 2012 +0100 msvcmaker: "MODULE = none" is obsolete. --- tools/winapi/msvcmaker | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index d03ce3f..0c82420 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -180,16 +180,6 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { if(/^MODULE\s*=\s*([\w\.]+)$/) { $module = $1; - - if($module eq "none") { - if($makefile_in_file eq "tools/winebuild/Makefile.in") { - $module = "winebuild.exe"; - } elsif ($makefile_in_file eq "include/Makefile.in") { - $module = "include.lib"; - } else { - next MAKEFILE_IN; - } - } } elsif (/^\@MAKE_IMPLIB_RULES\@/) { $type = "lib"; } elsif(/^TOPOBJDIR\s*=\s*(\S+)\s*$/) { @@ -243,8 +233,12 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { close(IN); - if (!$module && $makefile_in_file eq "libs/wine/Makefile.in") { - $module = "wine.lib"; + if (!$module) { + if ($makefile_in_file eq "libs/wine/Makefile.in") { + $module = "wine.lib"; + } elsif ($makefile_in_file eq "tools/winebuild/Makefile.in") { + $module = "winebuild.exe"; + } } next if !$module;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 3c0173d07ff5300c6d9dae20b987b7f0df7733a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c0173d07ff5300c6d9dae20b… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Feb 2 20:33:51 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 61c97e9..d7efdc5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-26 20:28+0300\n" +"PO-Revision-Date: 2012-02-02 20:33+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -7428,7 +7428,6 @@ msgid "&Delete" msgstr "&Šalinti" #: shdoclc.rc:100 shell32.rc:94 -#, fuzzy msgid "&Select" msgstr "&Parinkti"

1 0

Henri Verbeet : wined3d: Complain when the hardware may not be able to run a shader.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 56a4680b695963b9b16bed8f7252cb0b54bbb11d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a4680b695963b9b16bed8f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 3 13:42:47 2012 +0100 wined3d: Complain when the hardware may not be able to run a shader. --- dlls/wined3d/glsl_shader.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8521c7a..682e740 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d_caps); WINE_DECLARE_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_GLSL_SAMPLE_PROJECTED 0x1 #define WINED3D_GLSL_SAMPLE_RECT 0x2 @@ -960,6 +961,17 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont max_constantsF -= count_bits(reg_maps->boolean_constants); /* Set by driver quirks in directx.c */ max_constantsF -= gl_info->reserved_glsl_constants; + + if (max_constantsF < shader->limits.constant_float) + { + static unsigned int once; + + if (!once++) + ERR_(winediag)("The hardware does not support enough uniform components to run this shader," + " it may not render correctly.\n"); + else + WARN("The hardware does not support enough uniform components to run this shader.\n"); + } } else {

1 0

Dmitry Timoshkov : psapi: Add a test for NtQueryVirtualMemory( MemorySectionName).
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 2a0de9484450eead24a2cb4909eb184d97407aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0de9484450eead24a2cb490… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 3 17:23:47 2012 +0800 psapi: Add a test for NtQueryVirtualMemory(MemorySectionName). --- dlls/psapi/tests/psapi_main.c | 68 ++++++++++++++++++++++++++++++++++++++--- include/winternl.h | 5 +++ 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index e6e0cab..09a56f7 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -20,11 +20,21 @@ */ #include <stdarg.h> -#include <stdio.h> -#include "windows.h" -#include "wine/test.h" +/* 0x0600 makes PROCESS_ALL_ACCESS not compatible with pre-Vista versions */ +#define _WIN32_WINNT 0x0500 + +#include "ntstatus.h" +#define WIN32_NO_STATUS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winnt.h" +#include "winternl.h" +#include "winnls.h" #include "psapi.h" +#include "wine/test.h" #define PSAPI_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hpsapi, #func); \ @@ -41,12 +51,14 @@ static DWORD (WINAPI *pGetModuleBaseNameA)(HANDLE, HMODULE, LPSTR, DWORD); static DWORD (WINAPI *pGetModuleFileNameExA)(HANDLE, HMODULE, LPSTR, DWORD); static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD); +static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE, LPVOID, LPWSTR, DWORD); static DWORD (WINAPI *pGetProcessImageFileNameA)(HANDLE, LPSTR, DWORD); static DWORD (WINAPI *pGetProcessImageFileNameW)(HANDLE, LPWSTR, DWORD); static BOOL (WINAPI *pGetProcessMemoryInfo)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD); static BOOL (WINAPI *pGetWsChanges)(HANDLE, PPSAPI_WS_WATCH_INFORMATION, DWORD); static BOOL (WINAPI *pInitializeProcessForWsWatch)(HANDLE); static BOOL (WINAPI *pQueryWorkingSet)(HANDLE, PVOID, DWORD); +static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); static BOOL InitFunctionPtrs(HMODULE hpsapi) { @@ -57,6 +69,7 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) PSAPI_GET_PROC(GetModuleFileNameExA); PSAPI_GET_PROC(GetModuleInformation); PSAPI_GET_PROC(GetMappedFileNameA); + PSAPI_GET_PROC(GetMappedFileNameW); PSAPI_GET_PROC(GetProcessMemoryInfo); PSAPI_GET_PROC(GetWsChanges); PSAPI_GET_PROC(InitializeProcessForWsWatch); @@ -66,6 +79,7 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); pGetProcessImageFileNameW = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); + pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtQueryVirtualMemory"); return TRUE; } @@ -180,6 +194,36 @@ static void test_GetProcessMemoryInfo(void) ok(ret == 1, "failed with %d\n", GetLastError()); } +static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DWORD len) +{ + MEMORY_SECTION_NAME *section_name; + WCHAR *buf; + SIZE_T buf_len; + NTSTATUS status; + + if (!pNtQueryVirtualMemory) return FALSE; + + buf_len = len * sizeof(WCHAR) + sizeof(MEMORY_SECTION_NAME); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf_len); + + status = pNtQueryVirtualMemory(process, addr, MemorySectionName, buf, buf_len, NULL); +todo_wine + ok(!status || broken(status == STATUS_ACCESS_VIOLATION) /* win2k */, "NtQueryVirtualMemory error %x\n", status); + if (status) return FALSE; + + section_name = (MEMORY_SECTION_NAME *)buf; + ok((char *)section_name->SectionFileName.Buffer == (char *)section_name + sizeof(*section_name), "got %p, %p\n", + section_name, section_name->SectionFileName.Buffer); + ok(section_name->SectionFileName.MaximumLength == section_name->SectionFileName.Length + sizeof(WCHAR), "got %u, %u\n", + section_name->SectionFileName.MaximumLength, section_name->SectionFileName.Length); + ok(section_name->SectionFileName.Length == lstrlenW(section_name->SectionFileName.Buffer) * sizeof(WCHAR), "got %u, %u\n", + section_name->SectionFileName.Length, lstrlenW(section_name->SectionFileName.Buffer)); + + memcpy(name, section_name->SectionFileName.Buffer, section_name->SectionFileName.MaximumLength); + HeapFree(GetProcessHeap(), 0, buf); + return TRUE; +} + static void test_GetMappedFileName(void) { HMODULE hMod = GetModuleHandle(NULL); @@ -187,6 +231,7 @@ static void test_GetMappedFileName(void) DWORD ret; char *base; char temp_path[MAX_PATH], file_name[MAX_PATH], map_name[MAX_PATH], device_name[MAX_PATH], drive[3]; + WCHAR map_nameW[MAX_PATH], nt_map_name[MAX_PATH]; HANDLE hfile, hmap; SetLastError(0xdeadbeef); @@ -266,15 +311,28 @@ todo_wine ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); todo_wine { ok(ret, "GetMappedFileName error %d\n", GetLastError()); - ok(ret > strlen(file_name), "map_name should be longer than device_name\n"); + ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); } SetLastError(0xdeadbeef); + ret = pGetMappedFileNameW(GetCurrentProcess(), base, map_nameW, sizeof(map_nameW)/sizeof(map_nameW[0])); +todo_wine { + ok(ret, "GetMappedFileNameW error %d\n", GetLastError()); + ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); +} + if (nt_get_mapped_file_name(GetCurrentProcess(), base, nt_map_name, sizeof(nt_map_name)/sizeof(nt_map_name[0]))) + { + ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); + WideCharToMultiByte(CP_ACP, 0, map_nameW, -1, map_name, MAX_PATH, NULL, NULL); + ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); + } + + SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); todo_wine { ok(ret, "GetMappedFileName error %d\n", GetLastError()); - ok(ret > strlen(file_name), "map_name should be longer than device_name\n"); + ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); } diff --git a/include/winternl.h b/include/winternl.h index d8dd177..bcf18f5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -867,6 +867,11 @@ typedef enum _MEMORY_INFORMATION_CLASS { MemoryBasicVlmInformation } MEMORY_INFORMATION_CLASS; +typedef struct _MEMORY_SECTION_NAME +{ + UNICODE_STRING SectionFileName; +} MEMORY_SECTION_NAME, *PMEMORY_SECTION_NAME; + typedef enum _MUTANT_INFORMATION_CLASS { MutantBasicInformation

1 0

Andrew Eikum : hlink: Always pass a bind context to IMoniker:: GetDisplayName.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 8fa2b2d256467f223131d896d5cbe33bc8780005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa2b2d256467f223131d896d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 3 13:15:27 2012 -0600 hlink: Always pass a bind context to IMoniker::GetDisplayName. --- dlls/hlink/link.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index a929782..6b2d4c7 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -217,9 +217,12 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, This->Moniker = pmkTarget; if (This->Moniker) { + IBindCtx *pbc; LPOLESTR display_name; IMoniker_AddRef(This->Moniker); - IMoniker_GetDisplayName(This->Moniker, NULL, NULL, &display_name); + CreateBindCtx( 0, &pbc); + IMoniker_GetDisplayName(This->Moniker, pbc, NULL, &display_name); + IBindCtx_Release(pbc); This->absolute = display_name && strchrW(display_name, ':'); CoTaskMemFree(display_name); }

1 0