March 2012 - Wine-Commits - list.winehq.org

Piotr Caban : shell32: Prepare QueryAssociations helper functions to work on non LPWSTR data.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: d55061b9da47465fab8179d735e6ddaa851de836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55061b9da47465fab8179d73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:04:55 2012 +0200 shell32: Prepare QueryAssociations helper functions to work on non LPWSTR data. --- dlls/shell32/assoc.c | 62 ++++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index d7161ca..8364e9f 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -215,27 +215,28 @@ static HRESULT WINAPI IQueryAssociations_fnInit( return E_INVALIDARG; } -static HRESULT ASSOC_GetValue(HKEY hkey, WCHAR ** pszText) +static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD *data_size) { - DWORD len; + DWORD size; LONG ret; - assert(pszText); - ret = RegQueryValueExW(hkey, NULL, 0, NULL, NULL, &len); + assert(data); + ret = RegQueryValueExW(hkey, name, 0, NULL, NULL, &size); if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); - if (!len) + if (!size) return E_FAIL; - *pszText = HeapAlloc(GetProcessHeap(), 0, len); - if (!*pszText) + *data = HeapAlloc(GetProcessHeap(), 0, size); + if (!*data) return E_OUTOFMEMORY; - ret = RegQueryValueExW(hkey, NULL, 0, NULL, (LPBYTE)*pszText, - &len); + ret = RegQueryValueExW(hkey, name, 0, NULL, (LPBYTE)*data, &size); if (ret != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, *pszText); + HeapFree(GetProcessHeap(), 0, *data); return HRESULT_FROM_WIN32(ret); } + if(data_size) + *data_size = size; return S_OK; } @@ -253,7 +254,7 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, static const WCHAR commandW[] = { 'c','o','m','m','a','n','d',0 }; static const WCHAR shellW[] = { 's','h','e','l','l',0 }; - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); if (FAILED(hr)) return hr; ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); @@ -268,7 +269,7 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, if (!pszExtra) { - hr = ASSOC_GetValue(hkeyShell, &pszExtraFromReg); + hr = ASSOC_GetValue(hkeyShell, NULL, (void**)&pszExtraFromReg, NULL); /* if no default action */ if (hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) { @@ -311,7 +312,7 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, RegCloseKey(hkeyVerb); if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); - hr = ASSOC_GetValue(hkeyCommand, ppszCommand); + hr = ASSOC_GetValue(hkeyCommand, NULL, (void**)ppszCommand, NULL); RegCloseKey(hkeyCommand); return hr; } @@ -361,7 +362,7 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, return S_OK; } -static HRESULT ASSOC_ReturnData(LPWSTR out, DWORD *outlen, LPCWSTR data, +static HRESULT ASSOC_ReturnData(void *out, DWORD *outlen, const void *data, DWORD datalen) { assert(outlen); @@ -374,7 +375,7 @@ static HRESULT ASSOC_ReturnData(LPWSTR out, DWORD *outlen, LPCWSTR data, return E_POINTER; } *outlen = datalen; - lstrcpynW(out, data, datalen); + memcpy(out, data, datalen); return S_OK; } else @@ -384,6 +385,19 @@ static HRESULT ASSOC_ReturnData(LPWSTR out, DWORD *outlen, LPCWSTR data, } } +static HRESULT ASSOC_ReturnString(LPWSTR out, DWORD *outlen, LPCWSTR data, + DWORD datalen) +{ + HRESULT hres; + + assert(outlen); + + *outlen *= sizeof(WCHAR); + hres = ASSOC_ReturnData(out, outlen, data, datalen*sizeof(WCHAR)); + *outlen /= sizeof(WCHAR); + return hres; +} + /************************************************************************** * IQueryAssociations_GetString * @@ -432,7 +446,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( hr = ASSOC_GetCommand(This, pszExtra, &command); if (SUCCEEDED(hr)) { - hr = ASSOC_ReturnData(pszOut, pcchOut, command, strlenW(command) + 1); + hr = ASSOC_ReturnString(pszOut, pcchOut, command, strlenW(command) + 1); HeapFree(GetProcessHeap(), 0, command); } return hr; @@ -444,7 +458,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( if (FAILED(hr)) return hr; len++; - return ASSOC_ReturnData(pszOut, pcchOut, path, len); + return ASSOC_ReturnString(pszOut, pcchOut, path, len); } case ASSOCSTR_FRIENDLYDOCNAME: @@ -453,7 +467,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( DWORD ret; DWORD size; - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); if (FAILED(hr)) return hr; size = 0; @@ -465,7 +479,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( { ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, docName, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnData(pszOut, pcchOut, docName, strlenW(docName) + 1); + hr = ASSOC_ReturnString(pszOut, pcchOut, docName, strlenW(docName) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, docName); @@ -521,7 +535,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( /* Does strlenW(bufW) == 0 mean we use the filename? */ len = strlenW(bufW) + 1; TRACE("found FileDescription: %s\n", debugstr_w(bufW)); - hr = ASSOC_ReturnData(pszOut, pcchOut, bufW, len); + hr = ASSOC_ReturnString(pszOut, pcchOut, bufW, len); HeapFree(GetProcessHeap(), 0, verinfoW); return hr; } @@ -531,7 +545,7 @@ get_friendly_name_fail: PathRemoveExtensionW(path); PathStripPathW(path); TRACE("using filename: %s\n", debugstr_w(path)); - hr = ASSOC_ReturnData(pszOut, pcchOut, path, strlenW(path) + 1); + hr = ASSOC_ReturnString(pszOut, pcchOut, path, strlenW(path) + 1); HeapFree(GetProcessHeap(), 0, verinfoW); return hr; } @@ -552,7 +566,7 @@ get_friendly_name_fail: { ret = RegGetValueW(This->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, contentType, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnData(pszOut, pcchOut, contentType, strlenW(contentType) + 1); + hr = ASSOC_ReturnString(pszOut, pcchOut, contentType, strlenW(contentType) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, contentType); @@ -570,7 +584,7 @@ get_friendly_name_fail: DWORD size; HKEY hkeyFile; - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); if (FAILED(hr)) return hr; ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); @@ -585,7 +599,7 @@ get_friendly_name_fail: { ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnData(pszOut, pcchOut, icon, strlenW(icon) + 1); + hr = ASSOC_ReturnString(pszOut, pcchOut, icon, strlenW(icon) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, icon);

1 0

André Hentschel : kernel32: Handle LOCALE_NAME_USER_DEFAULT with tests.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 21b6d994d2ebd09026208b04ea58e44f331f53a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b6d994d2ebd09026208b04e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:28:41 2012 +0100 kernel32: Handle LOCALE_NAME_USER_DEFAULT with tests. --- dlls/kernel32/locale.c | 4 ++++ dlls/kernel32/tests/locale.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/winnls.h | 19 +++++++++++++++++++ include/winnt.h | 1 + 4 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2c3760c..20451ff 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -976,6 +976,10 @@ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) if (flags) FIXME( "unsupported flags %x\n", flags ); + if (name == LOCALE_NAME_USER_DEFAULT) + return GetUserDefaultLCID(); + + /* string parsing */ parse_locale_name( name, &locale_name ); TRACE( "found lcid %x for %s, matches %d\n", diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f5b77f7..49678ce 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -71,6 +71,8 @@ static BOOL (WINAPI *pEnumSystemLanguageGroupsA)(LANGUAGEGROUP_ENUMPROC, DWORD, static BOOL (WINAPI *pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROC, LGRPID, DWORD, LONG_PTR); static BOOL (WINAPI *pEnumUILanguagesA)(UILANGUAGE_ENUMPROC, DWORD, LONG_PTR); static BOOL (WINAPI *pEnumSystemLocalesEx)(LOCALE_ENUMPROCEX, DWORD, LPARAM, LPVOID); +static LCID (WINAPI *pLocaleNameToLCID)(LPCWSTR, DWORD); +static INT (WINAPI *pLCIDToLocaleName)(LCID, LPWSTR, INT, DWORD); static INT (WINAPI *pFoldStringA)(DWORD, LPCSTR, INT, LPSTR, INT); static INT (WINAPI *pFoldStringW)(DWORD, LPCWSTR, INT, LPWSTR, INT); static BOOL (WINAPI *pIsValidLanguageGroup)(LGRPID, DWORD); @@ -80,6 +82,8 @@ static void InitFunctionPointers(void) hKernel32 = GetModuleHandleA("kernel32"); pEnumSystemLanguageGroupsA = (void*)GetProcAddress(hKernel32, "EnumSystemLanguageGroupsA"); pEnumLanguageGroupLocalesA = (void*)GetProcAddress(hKernel32, "EnumLanguageGroupLocalesA"); + pLocaleNameToLCID = (void*)GetProcAddress(hKernel32, "LocaleNameToLCID"); + pLCIDToLocaleName = (void*)GetProcAddress(hKernel32, "LCIDToLocaleName"); pFoldStringA = (void*)GetProcAddress(hKernel32, "FoldStringA"); pFoldStringW = (void*)GetProcAddress(hKernel32, "FoldStringW"); pIsValidLanguageGroup = (void*)GetProcAddress(hKernel32, "IsValidLanguageGroup"); @@ -1637,6 +1641,43 @@ static void test_LCMapStringW(void) "unexpected error code %d\n", GetLastError()); } +static void test_LocaleNames(void) +{ + LCID lcid; + INT ret; + WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; + + if (!pLocaleNameToLCID) + { + win_skip( "LocaleNameToLCID not available\n" ); + return; + } + + /* special cases */ + buffer[0] = 0; + lcid = pLocaleNameToLCID(LOCALE_NAME_USER_DEFAULT, 0); + ok(lcid == GetUserDefaultLCID() || broken(GetLastError() == ERROR_INVALID_PARAMETER /* Vista */), + "Expected lcid == %08x, got %08x, error %d\n", lcid, GetUserDefaultLCID(), GetLastError()); + ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); + ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); + trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); + + buffer[0] = 0; + lcid = pLocaleNameToLCID(LOCALE_NAME_SYSTEM_DEFAULT, 0); + todo_wine ok(!lcid && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected lcid != 0, got %08x, error %d\n", lcid, GetLastError()); + ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); + ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); + trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); + + buffer[0] = 0; + lcid = pLocaleNameToLCID(LOCALE_NAME_INVARIANT, 0); + todo_wine ok(lcid == 0x7F, "Expected lcid = 0x7F, got %08x, error %d\n", lcid, GetLastError()); + ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); + ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); + trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); +} + /* this requires collation table patch to make it MS compatible */ static const char * const strings_sorted[] = { @@ -2782,6 +2823,7 @@ START_TEST(locale) test_CompareStringA(); test_LCMapStringA(); test_LCMapStringW(); + test_LocaleNames(); test_FoldStringA(); test_FoldStringW(); test_ConvertDefaultLocale(); diff --git a/include/winnls.h b/include/winnls.h index de6f875..c7da119 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -321,6 +321,25 @@ extern "C" { #define LOCALE_SSORTNAME 0x1013 #define LOCALE_IDIGITSUBSTITUTION 0x1014 +/* Locale name special values */ +#if defined(__GNUC__) +# define LOCALE_NAME_INVARIANT (const WCHAR []){ 0 } +#elif defined(_MSC_VER) +# define LOCALE_NAME_INVARIANT L"" +#else +static const WCHAR LOCALE_NAME_INVARIANT[] = { 0 }; +#endif + +#if defined(__GNUC__) +# define LOCALE_NAME_SYSTEM_DEFAULT (const WCHAR []){'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0} +#elif defined(_MSC_VER) +# define LOCALE_NAME_SYSTEM_DEFAULT L"!sys-default-locale" +#else +static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0}; +#endif + +#define LOCALE_NAME_USER_DEFAULT NULL + #define LOCALE_IDEFAULTUNIXCODEPAGE 0x1030 /* Wine extension */ #define NORM_IGNORECASE 0x00001 diff --git a/include/winnt.h b/include/winnt.h index fc471b8..5cde0f4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1985,6 +1985,7 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define LOCALE_CUSTOM_DEFAULT (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_CUSTOM_DEFAULT),SORT_DEFAULT)) #define LOCALE_CUSTOM_UNSPECIFIED (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_CUSTOM_UNSPECIFIED),SORT_DEFAULT)) #define LOCALE_CUSTOM_UI_DEFAULT (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_UI_CUSTOM_DEFAULT),SORT_DEFAULT)) +#define LOCALE_NAME_MAX_LENGTH 85 #define UNREFERENCED_PARAMETER(u) (void)(u)

1 0

André Hentschel : vcomp100: Add new stub dll.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 4078b0f1ab4cfd624ece4f2c70568e7ec95a43a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4078b0f1ab4cfd624ece4f2c7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:29:23 2012 +0100 vcomp100: Add new stub dll. --- configure | 1 + configure.ac | 1 + dlls/vcomp100/Makefile.in | 6 ++ dlls/vcomp100/main.c | 48 ++++++++++++++++++ dlls/vcomp100/vcomp100.spec | 112 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 168 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 8f0ed91..1a810b9 100755 --- a/configure +++ b/configure @@ -15351,6 +15351,7 @@ wine_fn_config_test dlls/uxtheme/tests uxtheme_test wine_fn_config_dll vbscript enable_vbscript wine_fn_config_test dlls/vbscript/tests vbscript_test wine_fn_config_dll vcomp enable_vcomp +wine_fn_config_dll vcomp100 enable_vcomp100 wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib wine_fn_config_dll ver.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index a0e785b..bebbb91 100644 --- a/configure.ac +++ b/configure.ac @@ -2858,6 +2858,7 @@ WINE_CONFIG_TEST(dlls/uxtheme/tests) WINE_CONFIG_DLL(vbscript) WINE_CONFIG_TEST(dlls/vbscript/tests) WINE_CONFIG_DLL(vcomp) +WINE_CONFIG_DLL(vcomp100) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) WINE_CONFIG_DLL(ver.dll16,enable_win16) diff --git a/dlls/vcomp100/Makefile.in b/dlls/vcomp100/Makefile.in new file mode 100644 index 0000000..c79f7be --- /dev/null +++ b/dlls/vcomp100/Makefile.in @@ -0,0 +1,6 @@ +MODULE = vcomp100.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/vcomp100/main.c b/dlls/vcomp100/main.c new file mode 100644 index 0000000..a5105d3 --- /dev/null +++ b/dlls/vcomp100/main.c @@ -0,0 +1,48 @@ +/* + * + * vcomp100 implementation + * + * Copyright 2012 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vcomp100); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec new file mode 100644 index 0000000..cd5a964 --- /dev/null +++ b/dlls/vcomp100/vcomp100.spec @@ -0,0 +1,112 @@ +@ stub _vcomp_atomic_add_i1 +@ stub _vcomp_atomic_add_i2 +@ stub _vcomp_atomic_add_i4 +@ stub _vcomp_atomic_add_i8 +@ stub _vcomp_atomic_add_r4 +@ stub _vcomp_atomic_add_r8 +@ stub _vcomp_atomic_and_i1 +@ stub _vcomp_atomic_and_i2 +@ stub _vcomp_atomic_and_i4 +@ stub _vcomp_atomic_and_i8 +@ stub _vcomp_atomic_div_i1 +@ stub _vcomp_atomic_div_i2 +@ stub _vcomp_atomic_div_i4 +@ stub _vcomp_atomic_div_i8 +@ stub _vcomp_atomic_div_r4 +@ stub _vcomp_atomic_div_r8 +@ stub _vcomp_atomic_div_ui1 +@ stub _vcomp_atomic_div_ui2 +@ stub _vcomp_atomic_div_ui4 +@ stub _vcomp_atomic_div_ui8 +@ stub _vcomp_atomic_mul_i1 +@ stub _vcomp_atomic_mul_i2 +@ stub _vcomp_atomic_mul_i4 +@ stub _vcomp_atomic_mul_i8 +@ stub _vcomp_atomic_mul_r4 +@ stub _vcomp_atomic_mul_r8 +@ stub _vcomp_atomic_or_i1 +@ stub _vcomp_atomic_or_i2 +@ stub _vcomp_atomic_or_i4 +@ stub _vcomp_atomic_or_i8 +@ stub _vcomp_atomic_shl_i1 +@ stub _vcomp_atomic_shl_i2 +@ stub _vcomp_atomic_shl_i4 +@ stub _vcomp_atomic_shl_i8 +@ stub _vcomp_atomic_shr_i1 +@ stub _vcomp_atomic_shr_i2 +@ stub _vcomp_atomic_shr_i4 +@ stub _vcomp_atomic_shr_i8 +@ stub _vcomp_atomic_shr_ui1 +@ stub _vcomp_atomic_shr_ui2 +@ stub _vcomp_atomic_shr_ui4 +@ stub _vcomp_atomic_shr_ui8 +@ stub _vcomp_atomic_sub_i1 +@ stub _vcomp_atomic_sub_i2 +@ stub _vcomp_atomic_sub_i4 +@ stub _vcomp_atomic_sub_i8 +@ stub _vcomp_atomic_sub_r4 +@ stub _vcomp_atomic_sub_r8 +@ stub _vcomp_atomic_xor_i1 +@ stub _vcomp_atomic_xor_i2 +@ stub _vcomp_atomic_xor_i4 +@ stub _vcomp_atomic_xor_i8 +@ stub _vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ stub _vcomp_enter_critsect +@ stub _vcomp_flush +@ stub _vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ stub _vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ stub _vcomp_for_static_end +@ stub _vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ stub _vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ stub _vcomp_fork +@ stub _vcomp_get_thread_num +@ stub _vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ stub _vcomp_master_begin +@ stub _vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ stub _vcomp_sections_init +@ stub _vcomp_sections_next +@ stub _vcomp_set_num_threads +@ stub _vcomp_single_begin +@ stub _vcomp_single_end +@ stub omp_destroy_lock +@ stub omp_destroy_nest_lock +@ stub omp_get_dynamic +@ stub omp_get_max_threads +@ stub omp_get_nested +@ stub omp_get_num_procs +@ stub omp_get_num_threads +@ stub omp_get_thread_num +@ stub omp_get_wtick +@ stub omp_get_wtime +@ stub omp_in_parallel +@ stub omp_init_lock +@ stub omp_init_nest_lock +@ stub omp_set_dynamic +@ stub omp_set_lock +@ stub omp_set_nest_lock +@ stub omp_set_nested +@ stub omp_set_num_threads +@ stub omp_test_lock +@ stub omp_test_nest_lock +@ stub omp_unset_lock +@ stub omp_unset_nest_lock

1 0

André Hentschel : make_specfiles: Add vcomp group.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 41c4357f1523000ae93104ea1b79893f0b4296b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c4357f1523000ae93104ea1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:30:10 2012 +0100 make_specfiles: Add vcomp group. --- tools/make_specfiles | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 89af185..619c8ad 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -106,6 +106,10 @@ my @dll_groups = "setupapi", "cfgmgr32", ], + [ + "vcomp", + "vcomp100", + ], ); my $update_flags = 0;

1 0

Detlef Riekenberg : comdlg32: Use a helper to get the printer info.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: d0f5397b9e95579317ee6d930d574d507c9e774f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f5397b9e95579317ee6d930… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 18 22:14:20 2012 +0100 comdlg32: Use a helper to get the printer info. --- dlls/comdlg32/printdlg.c | 72 ++++++++++++++++++++++++++++++++------------- 1 files changed, 51 insertions(+), 21 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index b2edda9..2d563ca 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -161,6 +161,52 @@ static LPWSTR strdupW(LPCWSTR p) return ret; } +/*********************************************************************** + * get_printer_info [internal] + * + * get PRINTER_INFO_2W for the current printer handle, + * alloc the buffer, when needed + */ +static PRINTER_INFO_2W * get_printer_infoW(HANDLE hprn) +{ + PRINTER_INFO_2W *pi2 = NULL; + DWORD needed = 0; + BOOL res; + + res = GetPrinterW(hprn, 2, NULL, 0, &needed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + pi2 = HeapAlloc(GetProcessHeap(), 0, needed); + res = GetPrinterW(hprn, 2, (LPBYTE)pi2, needed, &needed); + } + + if (res) + return pi2; + + TRACE("GetPrinterW failed with %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pi2); + return NULL; +} + +static PRINTER_INFO_2A * get_printer_infoA(HANDLE hprn) +{ + PRINTER_INFO_2A *pi2 = NULL; + DWORD needed = 0; + BOOL res; + + res = GetPrinterA(hprn, 2, NULL, 0, &needed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + pi2 = HeapAlloc(GetProcessHeap(), 0, needed); + res = GetPrinterA(hprn, 2, (LPBYTE)pi2, needed, &needed); + } + + if (res) + return pi2; + + TRACE("GetPrinterA failed with %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pi2); + return NULL; +} + /*********************************************************** * convert_to_devmodeA * @@ -3820,22 +3866,13 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) return E_FAIL; } - pbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterA(hprn, 2, (LPBYTE)pbuf, needed, &needed); - if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) - { - HeapFree(GetProcessHeap(), 0, pbuf); - pbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterA(hprn, 2, (LPBYTE)pbuf, needed, &needed); - } - if (!bRet) + pbuf = get_printer_infoA(hprn); + if (!pbuf) { - HeapFree(GetProcessHeap(), 0, pbuf); ClosePrinter(hprn); return E_FAIL; } - needed = 1024; dbuf = HeapAlloc(GetProcessHeap(), 0, needed); bRet = GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) @@ -3955,20 +3992,13 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) return E_FAIL; } - pbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterW(hprn, 2, (LPBYTE)pbuf, needed, &needed); - if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { - HeapFree(GetProcessHeap(), 0, pbuf); - pbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterW(hprn, 2, (LPBYTE)pbuf, needed, &needed); - } - if (!bRet) { - HeapFree(GetProcessHeap(), 0, pbuf); + pbuf = get_printer_infoW(hprn); + if (!pbuf) + { ClosePrinter(hprn); return E_FAIL; } - needed = 1024; dbuf = HeapAlloc(GetProcessHeap(), 0, needed); bRet = GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) {

1 0

Piotr Caban : shell32: Handle ASSOCDATA_EDITFLAGS in IQueryAssociations: GetData function.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 924538f22a7a42434845015e17288bf19e5e8c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=924538f22a7a42434845015e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:05:38 2012 +0200 shell32: Handle ASSOCDATA_EDITFLAGS in IQueryAssociations:GetData function. --- dlls/shell32/assoc.c | 42 +++++++++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 8364e9f..0131da7 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -670,19 +670,39 @@ static HRESULT WINAPI IQueryAssociations_fnGetKey( * Success: S_OK. pszOut contains the data, pcbOut contains its length. * Failure: An HRESULT error code indicating the error. */ -static HRESULT WINAPI IQueryAssociations_fnGetData( - IQueryAssociations *iface, - ASSOCF cfFlags, - ASSOCDATA assocdata, - LPCWSTR pszExtra, - LPVOID pvOut, - DWORD *pcbOut) +static HRESULT WINAPI IQueryAssociations_fnGetData(IQueryAssociations *iface, + ASSOCF cfFlags, ASSOCDATA assocdata, LPCWSTR pszExtra, LPVOID pvOut, + DWORD *pcbOut) { - IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); + static const WCHAR edit_flags[] = {'E','d','i','t','F','l','a','g','s',0}; - FIXME("(%p,0x%8x,0x%8x,%s,%p,%p)-stub!\n", This, cfFlags, assocdata, - debugstr_w(pszExtra), pvOut, pcbOut); - return E_NOTIMPL; + IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); + void *data; + DWORD size; + HRESULT hres; + + TRACE("(%p,0x%8x,0x%8x,%s,%p,%p)\n", This, cfFlags, assocdata, + debugstr_w(pszExtra), pvOut, pcbOut); + + if(cfFlags) + FIXME("Unsupported flags: %x\n", cfFlags); + + switch(assocdata) { + case ASSOCDATA_EDITFLAGS: + if(!This->hkeyProgID) + return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + + hres = ASSOC_GetValue(This->hkeyProgID, edit_flags, &data, &size); + if(FAILED(hres) || !pcbOut) + return hres; + + hres = ASSOC_ReturnData(pvOut, pcbOut, data, size); + HeapFree(GetProcessHeap(), 0, data); + return hres; + default: + FIXME("Unsupported ASSOCDATA value: %d\n", assocdata); + return E_NOTIMPL; + } } /**************************************************************************

1 0

Detlef Riekenberg : comdlg32/tests: Test more parameters for PrintDlgEx.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 164a76fde30633d872f39262eb8502bc54d5f3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=164a76fde30633d872f39262e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 18 22:14:19 2012 +0100 comdlg32/tests: Test more parameters for PrintDlgEx. --- dlls/comdlg32/tests/printdlg.c | 81 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 8597d5f..2eaf9d4 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -212,7 +212,9 @@ static void test_PrintDlgA(void) static void test_PrintDlgExW(void) { + PRINTPAGERANGE pagerange[2]; LPPRINTDLGEXW pDlg; + DEVNAMES *dn; HRESULT res; /* PrintDlgEx not present before w2k */ @@ -262,6 +264,85 @@ static void test_PrintDlgExW(void) "got 0x%x with %u and %u (expected 'E_HANDLE')\n", res, GetLastError(), CommDlgExtendedError()); + /* nStartPage must be START_PAGE_GENERAL for the general page or a valid property sheet index */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING | PD_NOPAGENUMS; + res = pPrintDlgExW(pDlg); + ok((res == E_INVALIDARG), "got 0x%x (expected 'E_INVALIDARG')\n", res); + + /* Use PD_NOPAGENUMS or set nMaxPageRanges and lpPageRanges */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok((res == E_INVALIDARG), "got 0x%x (expected 'E_INVALIDARG')\n", res); + + /* this is invalid: a valid lpPageRanges with 0 for nMaxPageRanges */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING; + pDlg->lpPageRanges = pagerange; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok((res == E_INVALIDARG), "got 0x%x (expected 'E_INVALIDARG')\n", res); + + /* this is invalid: NULL for lpPageRanges with a valid nMaxPageRanges */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING; + pDlg->nMaxPageRanges = 1; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok((res == E_INVALIDARG), "got 0x%x (expected 'E_INVALIDARG')\n", res); + + /* this works: lpPageRanges with a valid nMaxPageRanges */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING; + pDlg->nMaxPageRanges = 1; + pDlg->lpPageRanges = pagerange; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + if (res == E_FAIL) + { + skip("No printer configured.\n"); + HeapFree(GetProcessHeap(), 0, pDlg); + return; + } + + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + + dn = GlobalLock(pDlg->hDevNames); + ok(dn != NULL, "expected '!= NULL' for GlobalLock(%p)\n",pDlg->hDevNames); + if (dn) + { + ok(dn->wDriverOffset, "(expected '!= 0' for wDriverOffset)\n"); + ok(dn->wDeviceOffset, "(expected '!= 0' for wDeviceOffset)\n"); + ok(dn->wOutputOffset, "(expected '!= 0' for wOutputOffset)\n"); + ok(dn->wDefault == DN_DEFAULTPRN, "got 0x%x (expected DN_DEFAULTPRN)\n", dn->wDefault); + + GlobalUnlock(pDlg->hDevNames); + } + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + + /* this works also: PD_NOPAGENUMS */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING | PD_NOPAGENUMS; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); HeapFree(GetProcessHeap(), 0, pDlg); return;

1 0

Detlef Riekenberg : comdlg32: Validate more parameters in PrintDlgEx.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: c2aeac3cc07b80d67866e66a6c25e7aadaaa2b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2aeac3cc07b80d67866e66a6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 18 22:14:18 2012 +0100 comdlg32: Validate more parameters in PrintDlgEx. --- dlls/comdlg32/printdlg.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 7ce9148..b2edda9 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3785,6 +3785,20 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) if (!IsWindow(lppd->hwndOwner)) return E_HANDLE; + if (lppd->nStartPage != START_PAGE_GENERAL) + { + if (!lppd->nPropertyPages) + return E_INVALIDARG; + + FIXME("custom property sheets (%d at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages); + } + + /* Use PD_NOPAGENUMS or set nMaxPageRanges and lpPageRanges */ + if (!(lppd->Flags & PD_NOPAGENUMS) && (!lppd->nMaxPageRanges || !lppd->lpPageRanges)) + { + return E_INVALIDARG; + } + if (lppd->Flags & PD_RETURNDEFAULT) { PRINTER_INFO_2A *pbuf; @@ -3909,6 +3923,20 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) return E_HANDLE; } + if (lppd->nStartPage != START_PAGE_GENERAL) + { + if (!lppd->nPropertyPages) + return E_INVALIDARG; + + FIXME("custom property sheets (%d at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages); + } + + /* Use PD_NOPAGENUMS or set nMaxPageRanges and lpPageRanges */ + if (!(lppd->Flags & PD_NOPAGENUMS) && (!lppd->nMaxPageRanges || !lppd->lpPageRanges)) + { + return E_INVALIDARG; + } + if (lppd->Flags & PD_RETURNDEFAULT) { PRINTER_INFO_2W *pbuf; DRIVER_INFO_2W *dbuf;

1 0

André Hentschel : wevtapi: Add stubs for EvtGetChannelConfigProperty, EvtSetChannelConfigProperty and EvtSubscribe.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 32612b7de872704bebbf6e5e186fef503cca49ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=32612b7de872704bebbf6e5e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:21:04 2012 +0100 wevtapi: Add stubs for EvtGetChannelConfigProperty, EvtSetChannelConfigProperty and EvtSubscribe. --- dlls/wevtapi/main.c | 30 ++++++++++++++++++++++++++++++ dlls/wevtapi/wevtapi.spec | 6 +++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index a39c7c9..fb673bb 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -46,6 +46,36 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, + EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, + DWORD Flags, + DWORD PropertyValueBufferSize, + PEVT_VARIANT PropertyValueBuffer, + DWORD *PropertyValueBufferUsed) +{ + FIXME("(%p %i %u %u %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize, + PropertyValueBuffer, PropertyValueBufferUsed); + return FALSE; +} + +BOOL WINAPI EvtSetChannelConfigProperty(EVT_HANDLE ChannelConfig, + EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, + DWORD Flags, + PEVT_VARIANT PropertyValue) +{ + FIXME("(%p %i %u %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValue); + return FALSE; +} + +EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR ChannelPath, + LPCWSTR Query, EVT_HANDLE Bookmark, PVOID context, + EVT_SUBSCRIBE_CALLBACK Callback, DWORD Flags) +{ + FIXME("(%p %p %s %s %p %p %p %u) stub\n", Session, SignalEvent, debugstr_w(ChannelPath), + debugstr_w(Query), Bookmark, context, Callback, Flags); + return NULL; +} + EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index adc3706..a493da4 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -6,7 +6,7 @@ @ stub EvtCreateRenderContext @ stub EvtExportLog @ stub EvtFormatMessage -@ stub EvtGetChannelConfigProperty +@ stdcall EvtGetChannelConfigProperty(ptr long long long ptr ptr) @ stub EvtGetEventInfo @ stub EvtGetEventMetadataProperty @ stub EvtGetExtendedStatus @@ -40,7 +40,7 @@ @ stub EvtRender @ stub EvtSaveChannelConfig @ stub EvtSeek -@ stub EvtSetChannelConfigProperty +@ stdcall EvtSetChannelConfigProperty(ptr long long ptr) @ stub EvtSetObjectArrayProperty -@ stub EvtSubscribe +@ stdcall EvtSubscribe(ptr ptr wstr wstr ptr ptr ptr long) @ stub EvtUpdateBookmark

1 0

Henri Verbeet : wined3d: Only update the drawable on surface unmap for the frontbuffer.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: d1e00648ff6aabb5921aaac27f2c697bbe7356a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e00648ff6aabb5921aaac27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:11 2012 +0200 wined3d: Only update the drawable on surface unmap for the frontbuffer. --- dlls/wined3d/surface.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3148473..a96db7c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -953,12 +953,8 @@ static void surface_unmap(struct wined3d_surface *surface) goto done; } - /* FIXME: The ORM_BACKBUFFER case probably isn't needed, but who knows - * what obscure bugs in backbuffer ORM removing it will uncover. Also, - * this should only be needed for the frontbuffer, but that requires - * present calls to call surface_load_location() on the backbuffer. - * Fix both of those after 1.4. */ - if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + if ((surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + && surface->container.u.swapchain->front_buffer == surface) || (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER && device->fb.render_targets && surface == device->fb.render_targets[0])) {

1 0