February 2012 - Wine-Commits

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 527e1ae1ac1ebf5c02be3b8978d823d7d6eedb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=527e1ae1ac1ebf5c02be3b897… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 5 23:18:46 2012 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c4820b1..bac4bd9 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -719,7 +719,7 @@ static void test_surface_interface_mismatch(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - surface_desc.dwZBufferBitDepth = z_depth; + U2(surface_desc).dwZBufferBitDepth = z_depth; surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &ds, NULL); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 10c065a..005136c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -758,7 +758,7 @@ static void test_surface_interface_mismatch(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - surface_desc.dwZBufferBitDepth = z_depth; + U2(surface_desc).dwZBufferBitDepth = z_depth; surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &ds, NULL); @@ -931,7 +931,7 @@ static void test_depth_blit(void) ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; ddsd_new.dwHeight = ddsd_existing.dwHeight; - U4(ddsd_new).ddpfPixelFormat = U4(ddsd_existing).ddpfPixelFormat; + ddsd_new.ddpfPixelFormat = ddsd_existing.ddpfPixelFormat; hr = IDirectDraw2_CreateSurface(ddraw, &ddsd_new, &ds2, NULL); ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); hr = IDirectDraw2_CreateSurface(ddraw, &ddsd_new, &ds3, NULL); @@ -1028,7 +1028,7 @@ static void test_depth_blit(void) * a reliable result(z = 0.0) */ memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); - fx.dwFillDepth = 0; + U5(fx).dwFillDepth = 0; hr = IDirectDrawSurface_Blt(ds2, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Failed to clear the source z buffer, hr %#x.\n", hr);

1 0

Nikolay Sivov : shell32: Use string comparison as autocompletion check.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: c91e9db0cc76ce82600553ac301a2b894cb802ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91e9db0cc76ce82600553ac3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 00:51:15 2012 +0300 shell32: Use string comparison as autocompletion check. --- dlls/shell32/autocomplete.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 8823262..5381f13 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -121,6 +121,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); case WM_KEYUP: + { + int len; + GetWindowTextW( hwnd, hwndText, sizeof(hwndText)/sizeof(WCHAR)); switch(wParam) { @@ -208,7 +211,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0); HeapFree(GetProcessHeap(), 0, This->txtbackup); - This->txtbackup = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(hwndText)+1)*sizeof(WCHAR)); + len = strlenW(hwndText); + This->txtbackup = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); lstrcpyW(This->txtbackup, hwndText); /* Returns if there is no text to search and we doesn't want to display all the entries */ @@ -223,15 +227,14 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (hr != S_OK) break; - if (StrStrIW(strs, hwndText) == strs) { + if (!strncmpiW(hwndText, strs, len)) { if (!filled && (This->options & ACO_AUTOAPPEND)) { - INT typed_length = strlenW(hwndText); WCHAR buffW[255]; strcpyW(buffW, hwndText); - strcatW(buffW, &strs[typed_length]); + strcatW(buffW, &strs[len]); SetWindowTextW(hwnd, buffW); - SendMessageW(hwnd, EM_SETSEL, typed_length, strlenW(strs)); + SendMessageW(hwnd, EM_SETSEL, len, strlenW(strs)); if (!(This->options & ACO_AUTOSUGGEST)) break; } @@ -262,6 +265,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } break; + } case WM_DESTROY: { WNDPROC proc = This->wpOrigEditProc;

1 0

Eric Pouech : msvcrt: Fix TRACE format modifier for wfreopen.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: f8b29a06857e1bf5110648cafde1fe05e0dfd86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b29a06857e1bf5110648caf… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Feb 5 22:07:51 2012 +0100 msvcrt: Fix TRACE format modifier for wfreopen. --- dlls/msvcrt/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index cde8a81..b27a40f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3232,7 +3232,7 @@ MSVCRT_FILE* CDECL MSVCRT__wfreopen(const MSVCRT_wchar_t *path, const MSVCRT_wch { int open_flags, stream_flags, fd; - TRACE(":path (%p) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); + TRACE(":path (%s) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); LOCK_FILES(); if (!file || ((fd = file->_file) < 0) || fd > MSVCRT_fdend)

1 0

Nikolay Sivov : msxml3: Fix element data leak on error.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: f39209cd2e2fab6728b583f0d2651f4914f74b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39209cd2e2fab6728b583f0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 22:44:44 2012 +0300 msxml3: Fix element data leak on error. --- dlls/msxml3/saxreader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fb41c10..d80c256 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1346,6 +1346,7 @@ static void libxmlEndElementNS( if (sax_callback_failed(This, hr)) { format_error_message_from_id(This, hr); + free_element_entry(element); return; }

1 0

Hans Leidekker : msi: Use the return value of IXMLDOMNode_get_text (clang).
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 98c621c1bf1a4af545802f2c2a0fcb955cbf38cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c621c1bf1a4af545802f2c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 13:05:14 2012 +0100 msi: Use the return value of IXMLDOMNode_get_text (clang). --- dlls/msi/msi.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f34bfc9..4022b3a 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -613,8 +613,11 @@ static UINT MSI_ApplicablePatchXML( MSIPACKAGE *package, IXMLDOMDocument *desc ) { hr = IXMLDOMNode_get_text( node, &s ); IXMLDOMNode_Release( node ); - if (!strcmpW( s, product_code )) r = ERROR_SUCCESS; - SysFreeString(s); + if (hr == S_OK) + { + if (!strcmpW( s, product_code )) r = ERROR_SUCCESS; + SysFreeString( s ); + } } IXMLDOMNodeList_Release( list );

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

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

Laura Leinonen : po: Update Finnish translation.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

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 : ddraw: Implement get_window_region() on top of GetRandomRgn ().
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

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 : msvcmaker: "MODULE = none" is obsolete.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

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

André Hentschel : winemaker: Print the invocation command line to the Makefile.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

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

Aric Stewart : quartz: Do not report a position unless the filter graph is running or has been paused .
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 10b2a21c3b1fffa8d69bcd667d221be21cf7ab4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b2a21c3b1fffa8d69bcd667… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 3 14:24:06 2012 -0600 quartz: Do not report a position unless the filter graph is running or has been paused. --- dlls/quartz/filtergraph.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 911e68c..683877f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2457,12 +2457,14 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG hr = all_renderers_seek(This, FoundCurrentPosition, (DWORD_PTR)pCurrent); if (hr == E_NOTIMPL) { LONGLONG time = 0; - if (This->refClock) + if (This->state == State_Running && This->refClock && This->start_time >= 0) { IReferenceClock_GetTime(This->refClock, &time); if (time) time -= This->start_time; } + if (This->pause_time > 0) + time += This->pause_time; *pCurrent = time; hr = S_OK; }

1 0

Andrew Eikum : hlink: Don' t query the IHlinkSite if the IMoniker is a system moniker.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: d1f6a5a376515654636c1aa51cedb4f2ec6de318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f6a5a376515654636c1aa51… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 3 13:17:49 2012 -0600 hlink: Don't query the IHlinkSite if the IMoniker is a system moniker. --- dlls/hlink/link.c | 13 ++++++ dlls/hlink/tests/hlink.c | 108 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 89 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1f6a5a376515654636c1…

1 0

Dmitry Timoshkov : psapi: Add a test for NtQueryVirtualMemory( MemorySectionName).
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

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 Feb. 6, 2012

Feb. 6, 2012

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

Henri Verbeet : wined3d: Complain when the hardware may not be able to run a shader.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

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

Hans Leidekker : msi: Avoid a null pointer dereference in MsiGetFileVersionW (clang).
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: bb0b4673669ebf93337bf34eb89251fdc8f25608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb0b4673669ebf93337bf34eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 3 10:49:00 2012 +0100 msi: Avoid a null pointer dereference in MsiGetFileVersionW (clang). --- dlls/msi/msi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index cc83e39..f34bfc9 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3201,18 +3201,18 @@ UINT WINAPI MsiGetFileVersionW( LPCWSTR path, LPWSTR verbuf, LPDWORD verlen, return ERROR_INVALID_PARAMETER; ret = get_file_version( path, verbuf, verlen, langbuf, langlen ); - if (ret == ERROR_RESOURCE_DATA_NOT_FOUND) + if (ret == ERROR_RESOURCE_DATA_NOT_FOUND && verlen) { int len; WCHAR *version = msi_font_version_from_file( path ); if (!version) return ERROR_FILE_INVALID; len = strlenW( version ); - if (*verlen > len) + if (len >= *verlen) ret = ERROR_MORE_DATA; + else if (verbuf) { strcpyW( verbuf, version ); ret = ERROR_SUCCESS; } - else ret = ERROR_MORE_DATA; *verlen = len; msi_free( version ); }

1 0

Hans Leidekker : mscms/tests: Pass profiles names as parameters instead of using global variables.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 2cbb384440a4e4df9b5c9aa282fd18ca38815152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cbb384440a4e4df9b5c9aa28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 3 10:48:17 2012 +0100 mscms/tests: Pass profiles names as parameters instead of using global variables. --- dlls/mscms/tests/profile.c | 97 +++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 54 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index d4293ff..b5bf5aa 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -131,12 +131,6 @@ static const unsigned char rgbheader[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xf6, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x2d, 0xd3, 0x00, 0x00, 0x20, 0x20, 0x50, 0x48 }; -static LPSTR standardprofile; -static LPWSTR standardprofileW; - -static LPSTR testprofile; -static LPWSTR testprofileW; - #define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') static void MSCMS_basenameA( LPCSTR path, LPSTR name ) @@ -227,7 +221,7 @@ static void test_GetColorDirectoryW(void) ok( ret && size > 0, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); } -static void test_GetColorProfileElement(void) +static void test_GetColorProfileElement( char *standardprofile ) { if (standardprofile) { @@ -277,7 +271,7 @@ static void test_GetColorProfileElement(void) } } -static void test_GetColorProfileElementTag(void) +static void test_GetColorProfileElementTag( char *standardprofile ) { if (standardprofile) { @@ -318,7 +312,7 @@ static void test_GetColorProfileElementTag(void) } } -static void test_GetColorProfileFromHandle(void) +static void test_GetColorProfileFromHandle( char *testprofile ) { if (testprofile) { @@ -376,7 +370,7 @@ static void test_GetColorProfileFromHandle(void) } } -static void test_GetColorProfileHeader(void) +static void test_GetColorProfileHeader( char *testprofile ) { if (testprofile) { @@ -417,7 +411,7 @@ static void test_GetColorProfileHeader(void) } } -static void test_GetCountColorProfileElements(void) +static void test_GetCountColorProfileElements( char *standardprofile ) { if (standardprofile) { @@ -453,7 +447,7 @@ static void test_GetCountColorProfileElements(void) } } -static void test_GetStandardColorSpaceProfileA(void) +static void test_GetStandardColorSpaceProfileA( char *standardprofile ) { BOOL ret; DWORD size; @@ -538,7 +532,7 @@ static void test_GetStandardColorSpaceProfileA(void) ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); } -static void test_GetStandardColorSpaceProfileW(void) +static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) { BOOL ret; DWORD size; @@ -644,7 +638,7 @@ static void test_GetStandardColorSpaceProfileW(void) ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); } -static void test_EnumColorProfilesA(void) +static void test_EnumColorProfilesA( char *standardprofile ) { BOOL ret; DWORD total, size, number; @@ -698,7 +692,7 @@ static void test_EnumColorProfilesA(void) HeapFree( GetProcessHeap(), 0, buffer ); } -static void test_EnumColorProfilesW(void) +static void test_EnumColorProfilesW( WCHAR *standardprofileW ) { BOOL ret; DWORD total, size, number; @@ -751,7 +745,7 @@ static void test_EnumColorProfilesW(void) HeapFree( GetProcessHeap(), 0, buffer ); } -static void test_InstallColorProfileA(void) +static void test_InstallColorProfileA( char *standardprofile, char *testprofile ) { BOOL ret; @@ -808,7 +802,7 @@ static void test_InstallColorProfileA(void) } } -static void test_InstallColorProfileW(void) +static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofileW ) { BOOL ret; @@ -865,7 +859,7 @@ static void test_InstallColorProfileW(void) } } -static void test_IsColorProfileTagPresent(void) +static void test_IsColorProfileTagPresent( char *standardprofile ) { if (standardprofile) { @@ -905,7 +899,7 @@ static void test_IsColorProfileTagPresent(void) } } -static void test_OpenColorProfileA(void) +static void test_OpenColorProfileA( char *standardprofile ) { PROFILE profile; HPROFILE handle; @@ -965,7 +959,7 @@ static void test_OpenColorProfileA(void) } } -static void test_OpenColorProfileW(void) +static void test_OpenColorProfileW( WCHAR *standardprofileW ) { PROFILE profile; HPROFILE handle; @@ -1015,7 +1009,7 @@ static void test_OpenColorProfileW(void) } } -static void test_SetColorProfileElement(void) +static void test_SetColorProfileElement( char *testprofile ) { if (testprofile) { @@ -1077,7 +1071,7 @@ static void test_SetColorProfileElement(void) } } -static void test_SetColorProfileHeader(void) +static void test_SetColorProfileHeader( char *testprofile ) { if (testprofile) { @@ -1148,7 +1142,7 @@ static void test_SetColorProfileHeader(void) } } -static void test_UninstallColorProfileA(void) +static void test_UninstallColorProfileA( char *testprofile ) { BOOL ret; @@ -1196,7 +1190,7 @@ static void test_UninstallColorProfileA(void) } } -static void test_UninstallColorProfileW(void) +static void test_UninstallColorProfileW( WCHAR *testprofileW ) { BOOL ret; @@ -1248,7 +1242,7 @@ static void test_UninstallColorProfileW(void) } } -static void test_AssociateColorProfileWithDeviceA(void) +static void test_AssociateColorProfileWithDeviceA( char *testprofile ) { BOOL ret; char profile[MAX_PATH], basename[MAX_PATH]; @@ -1331,10 +1325,10 @@ START_TEST(profile) { UINT len; HANDLE handle; - char path[MAX_PATH], file[MAX_PATH]; - char profilefile1[MAX_PATH], profilefile2[MAX_PATH]; - WCHAR profilefile1W[MAX_PATH], profilefile2W[MAX_PATH]; - WCHAR fileW[MAX_PATH]; + char path[MAX_PATH], file[MAX_PATH], profilefile1[MAX_PATH], profilefile2[MAX_PATH]; + WCHAR profilefile1W[MAX_PATH], profilefile2W[MAX_PATH], fileW[MAX_PATH]; + char *standardprofile = NULL, *testprofile = NULL; + WCHAR *standardprofileW = NULL, *testprofileW = NULL; UINT ret; hmscms = LoadLibraryA( "mscms.dll" ); @@ -1395,10 +1389,8 @@ START_TEST(profile) if (CopyFileA( standardprofile, file, FALSE )) { testprofile = (LPSTR)&file; - len = MultiByteToWideChar( CP_ACP, 0, testprofile, -1, NULL, 0 ); MultiByteToWideChar( CP_ACP, 0, testprofile, -1, fileW, len ); - testprofileW = (LPWSTR)&fileW; } } @@ -1407,40 +1399,37 @@ START_TEST(profile) test_GetColorDirectoryA(); test_GetColorDirectoryW(); - test_GetColorProfileElement(); - test_GetColorProfileElementTag(); + test_GetColorProfileElement( standardprofile ); + test_GetColorProfileElementTag( standardprofile ); - test_GetColorProfileFromHandle(); - test_GetColorProfileHeader(); + test_GetColorProfileFromHandle( testprofile ); + test_GetColorProfileHeader( testprofile ); - test_GetCountColorProfileElements(); + test_GetCountColorProfileElements( standardprofile ); - test_GetStandardColorSpaceProfileA(); - test_GetStandardColorSpaceProfileW(); + test_GetStandardColorSpaceProfileA( standardprofile ); + test_GetStandardColorSpaceProfileW( standardprofileW ); - test_EnumColorProfilesA(); - test_EnumColorProfilesW(); + test_EnumColorProfilesA( standardprofile ); + test_EnumColorProfilesW( standardprofileW ); - test_InstallColorProfileA(); - test_InstallColorProfileW(); + test_InstallColorProfileA( standardprofile, testprofile ); + test_InstallColorProfileW( standardprofileW, testprofileW ); - test_IsColorProfileTagPresent(); + test_IsColorProfileTagPresent( standardprofile ); - test_OpenColorProfileA(); - test_OpenColorProfileW(); + test_OpenColorProfileA( standardprofile ); + test_OpenColorProfileW( standardprofileW ); - test_SetColorProfileElement(); - test_SetColorProfileHeader(); + test_SetColorProfileElement( testprofile ); + test_SetColorProfileHeader( testprofile ); - test_UninstallColorProfileA(); - test_UninstallColorProfileW(); + test_UninstallColorProfileA( testprofile ); + test_UninstallColorProfileW( testprofileW ); - test_AssociateColorProfileWithDeviceA(); + test_AssociateColorProfileWithDeviceA( testprofile ); - /* Clean up */ - if (testprofile) - DeleteFileA( testprofile ); - + if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); FreeLibrary( hmscms ); }

1 0

Hans Leidekker : msi: Follow the parent state for preselected features unless the parent is an advertised feature .
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: bca0fd6a5522933c1dcc5dd87c495091ab16eb7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca0fd6a5522933c1dcc5dd87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 3 10:48:33 2012 +0100 msi: Follow the parent state for preselected features unless the parent is an advertised feature. --- dlls/msi/action.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 663a917..87fc906 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1793,6 +1793,9 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } else if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) { + TRACE("feature %s (level %d request %d) follows parent %s (level %d request %d)\n", + debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, + debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); fl->feature->Action = feature->Action; fl->feature->ActionRequest = feature->ActionRequest; } @@ -1819,6 +1822,23 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + FeatureList *fl; + + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) + { + if (fl->feature->Attributes & msidbFeatureAttributesFollowParent && + (!(feature->Attributes & msidbFeatureAttributesFavorAdvertise))) + { + TRACE("feature %s (level %d request %d) follows parent %s (level %d request %d)\n", + debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, + debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); + fl->feature->Action = feature->Action; + fl->feature->ActionRequest = feature->ActionRequest; + } + } + } } /* now we want to set component state based based on feature state */ @@ -1826,7 +1846,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { ComponentList *cl; - TRACE("Examining Feature %s (Level %d Installed %d Request %d Action %d)\n", + TRACE("examining feature %s (level %d installed %d request %d action %d)\n", debugstr_w(feature->Feature), feature->Level, feature->Installed, feature->ActionRequest, feature->Action); @@ -1941,7 +1961,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) component->ActionRequest = INSTALLSTATE_UNKNOWN; } - TRACE("Result: Component %s (Installed %d Request %d Action %d)\n", + TRACE("component %s (installed %d request %d action %d)\n", debugstr_w(component->Component), component->Installed, component->ActionRequest, component->Action); }

1 0

Henri Verbeet : ddraw/tests: Use correct COM macros in a couple of places.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 98bd3ef8038611f886e9dbf08ae4622ce88d19cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bd3ef8038611f886e9dbf08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 2 19:26:37 2012 +0100 ddraw/tests: Use correct COM macros in a couple of places. --- dlls/ddraw/tests/ddraw1.c | 14 +++++++------- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3bdce43..c4820b1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -784,15 +784,15 @@ static void test_surface_interface_mismatch(void) cleanup: if (viewport) { - IDirect3DDevice2_DeleteViewport(device, viewport); - IDirect3DViewport2_Release(viewport); + IDirect3DDevice_DeleteViewport(device, viewport); + IDirect3DViewport_Release(viewport); } - if (background) IDirect3DMaterial2_Release(background); + if (background) IDirect3DMaterial_Release(background); if (surface3) IDirectDrawSurface3_Release(surface3); - if (surface) IDirectDrawSurface7_Release(surface); - if (device) IDirect3DDevice2_Release(device); - if (d3d) IDirect3D7_Release(d3d); - if (ddraw) IDirectDraw7_Release(ddraw); + if (surface) IDirectDrawSurface_Release(surface); + if (device) IDirect3DDevice_Release(device); + if (d3d) IDirect3D_Release(d3d); + if (ddraw) IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3bd6e95..73ae501 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -814,10 +814,10 @@ cleanup: } if (background) IDirect3DMaterial2_Release(background); if (surface3) IDirectDrawSurface3_Release(surface3); - if (surface) IDirectDrawSurface7_Release(surface); + if (surface) IDirectDrawSurface_Release(surface); if (device) IDirect3DDevice2_Release(device); - if (d3d) IDirect3D7_Release(d3d); - if (ddraw) IDirectDraw7_Release(ddraw); + if (d3d) IDirect3D2_Release(d3d); + if (ddraw) IDirectDraw2_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d727bee..07509b9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -976,8 +976,8 @@ static void test_surface_interface_mismatch(void) cleanup: if (viewport) { - IDirect3DDevice2_DeleteViewport(device, viewport); - IDirect3DViewport2_Release(viewport); + IDirect3DDevice3_DeleteViewport(device, viewport); + IDirect3DViewport3_Release(viewport); } if (surface3) IDirectDrawSurface3_Release(surface3); if (surface) IDirectDrawSurface4_Release(surface);

1 0

Hans Leidekker : mscms: Use the return values of GetStandardColorSpaceProfileW and GetColorDirectoryW (clang).
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 0cf1bdf96e1049bd9fda3bdaeaaf486a7505c201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf1bdf96e1049bd9fda3bdae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 3 10:48:03 2012 +0100 mscms: Use the return values of GetStandardColorSpaceProfileW and GetColorDirectoryW (clang). --- dlls/mscms/profile.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index c4eae9d..54e4afd 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -253,13 +253,12 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size ) { ret = GetColorDirectoryW( NULL, NULL, &sizeW ); *size = sizeW / sizeof(WCHAR); - return FALSE; + return ret; } sizeW = *size * sizeof(WCHAR); bufferW = HeapAlloc( GetProcessHeap(), 0, sizeW ); - if (bufferW) { if ((ret = GetColorDirectoryW( NULL, bufferW, &sizeW ))) @@ -594,11 +593,10 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile { ret = GetStandardColorSpaceProfileW( NULL, id, NULL, &sizeW ); *size = sizeW / sizeof(WCHAR); - return FALSE; + return ret; } profileW = HeapAlloc( GetProcessHeap(), 0, sizeW ); - if (profileW) { if ((ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW )))

1 0

Henri Verbeet : ddraw/tests: Move some helper functions up with the rest of the helper functions.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 7fda67d74a3ce1a328bdfb84a3c648d89ac8f314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fda67d74a3ce1a328bdfb84a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 2 19:26:38 2012 +0100 ddraw/tests: Move some helper functions up with the rest of the helper functions. --- dlls/ddraw/tests/ddraw2.c | 28 ++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 28 ++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 28 ++++++++++++++-------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 73ae501..10c065a 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -95,6 +95,20 @@ static void destroy_window_thread(struct create_window_thread_param *p) CloseHandle(p->thread); } +static IDirectDrawSurface *get_depth_stencil(IDirect3DDevice2 *device) +{ + IDirectDrawSurface *rt, *ret; + DDSCAPS caps = {DDSCAPS_ZBUFFER}; + HRESULT hr; + + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface_Release(rt); + return ret; +} + static D3DCOLOR get_surface_color(IDirectDrawSurface *surface, UINT x, UINT y) { RECT rect = {x, y, x + 1, y + 1}; @@ -841,20 +855,6 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } -static IDirectDrawSurface *get_depth_stencil(IDirect3DDevice2 *device) -{ - IDirectDrawSurface *rt, *ret; - DDSCAPS caps = {DDSCAPS_ZBUFFER}; - HRESULT hr; - - hr = IDirect3DDevice2_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - hr = IDirectDrawSurface_GetAttachedSurface(rt, &caps, &ret); - ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); - IDirectDrawSurface_Release(rt); - return ret; -} - static void test_depth_blit(void) { static D3DLVERTEX quad1[] = diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 07509b9..8d80da6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -130,6 +130,20 @@ static void destroy_window_thread(struct create_window_thread_param *p) CloseHandle(p->thread); } +static IDirectDrawSurface4 *get_depth_stencil(IDirect3DDevice3 *device) +{ + IDirectDrawSurface4 *rt, *ret; + DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; + HRESULT hr; + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface4_Release(rt); + return ret; +} + static D3DCOLOR get_surface_color(IDirectDrawSurface4 *surface, UINT x, UINT y) { RECT rect = {x, y, x + 1, y + 1}; @@ -1007,20 +1021,6 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } -static IDirectDrawSurface4 *get_depth_stencil(IDirect3DDevice3 *device) -{ - IDirectDrawSurface4 *rt, *ret; - DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; - HRESULT hr; - - hr = IDirect3DDevice3_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); - hr = IDirectDrawSurface4_GetAttachedSurface(rt, &caps, &ret); - ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); - IDirectDrawSurface4_Release(rt); - return ret; -} - static void test_depth_blit(void) { static struct diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ecafcec..e542a27 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -139,6 +139,20 @@ static void destroy_window_thread(struct create_window_thread_param *p) CloseHandle(p->thread); } +static IDirectDrawSurface7 *get_depth_stencil(IDirect3DDevice7 *device) +{ + IDirectDrawSurface7 *rt, *ret; + DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; + HRESULT hr; + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface7_Release(rt); + return ret; +} + static D3DCOLOR get_surface_color(IDirectDrawSurface7 *surface, UINT x, UINT y) { RECT rect = {x, y, x + 1, y + 1}; @@ -946,20 +960,6 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } -static IDirectDrawSurface7 *get_depth_stencil(IDirect3DDevice7 *device) -{ - IDirectDrawSurface7 *rt, *ret; - DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; - HRESULT hr; - - hr = IDirect3DDevice7_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); - hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &ret); - ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); - IDirectDrawSurface7_Release(rt); - return ret; -} - static void test_depth_blit(void) { IDirect3DDevice7 *device;

1 0

Hans Leidekker : dnsapi: Remove a dead assignment (clang).
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 06cd0e2a498dd1008550aea2f9a19cd8f69ea617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06cd0e2a498dd1008550aea2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 3 10:47:42 2012 +0100 dnsapi: Remove a dead assignment (clang). --- dlls/dnsapi/query.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 8de33e6..72490c5 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -159,8 +159,7 @@ static char *dns_dname_from_msg( ns_msg msg, const unsigned char *pos ) char *str, dname[NS_MAXDNAME] = "."; /* returns *compressed* length, ignore it */ - len = dns_ns_name_uncompress( ns_msg_base( msg ), ns_msg_end( msg ), - pos, dname, sizeof(dname) ); + dns_ns_name_uncompress( ns_msg_base(msg), ns_msg_end(msg), pos, dname, sizeof(dname) ); len = strlen( dname ); str = heap_alloc( len + 1 );

1 0

Joerg Schiermeier : Add lost image file for 'Paypal donate'
by Jeremy Newman Feb. 6, 2012

Feb. 6, 2012

Module: website Branch: master Commit: 6d993167868a03e63c067548f193d384118f40c7 URL: http://source.winehq.org/git/website.git/?a=commit;h=6d993167868a03e63c0675… Author: Joerg Schiermeier <mywine(a)Schiermeier-Software.de> Date: Fri Feb 3 14:32:19 2012 +0100 Add lost image file for 'Paypal donate' The clickable button for 'Donate Paypal' is missing. This is restored from wine-devel mailinglist archive at 2005-01-19: <http://www.winehq.org/pipermail/wine-devel/2005-January/032957.html> exactly: the attached file <http://www.winehq.org/pipermail/wine-devel/attachments/20050119/ecdf48fe/pp…> Joerg Schiermeier --- images/ppdonate.png | Bin 0 -> 2498 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/ppdonate.png b/images/ppdonate.png new file mode 100644 index 0000000..7ddcdfd Binary files /dev/null and b/images/ppdonate.png differ

1 0