February 2014 - Wine-commits

Dmitry Timoshkov : taskschd: Add ITaskSettings stub implementation.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 12e8a31e725478365d4854d90d4d4e43b0db2d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e8a31e725478365d4854d90… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:20:26 2014 +0900 taskschd: Add ITaskSettings stub implementation. --- dlls/taskschd/task.c | 392 ++++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 12 +- 2 files changed, 396 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12e8a31e725478365d485…

1 0

Dmitry Timoshkov : taskschd: Implement most of ITaskSettings get methods.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 7b089951417ab4e8743f81f4ef4ea5eb91c09f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b089951417ab4e8743f81f4e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:21:25 2014 +0900 taskschd: Implement most of ITaskSettings get methods. --- dlls/taskschd/task.c | 248 +++++++++++++++++++++++++++++++++------ dlls/taskschd/tests/scheduler.c | 5 +- 2 files changed, 216 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b089951417ab4e8743f8…

1 0

Francois Gouget : atl/registrar: Skip the test_registrar() tests if we don 't have elevated privileges.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 07ac635d287d0d0de1b6431c9242db37bccc441c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ac635d287d0d0de1b6431c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 17:07:09 2014 +0100 atl/registrar: Skip the test_registrar() tests if we don't have elevated privileges. --- dlls/atl/tests/registrar.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index 68a8dd8..b9b62e7 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -37,6 +37,34 @@ #include <initguid.h> #include <atliface.h> + +static BOOL is_process_limited(void) +{ + static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; + HANDLE token; + + if (!pOpenProcessToken) + { + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); + if (!pOpenProcessToken) + return FALSE; + } + + if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + { + BOOL ret; + TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; + DWORD size; + + ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + CloseHandle(token); + return (ret && type == TokenElevationTypeLimited); + } + return FALSE; +} + + static const char textA[] = "HKCR \n" "{ \n" @@ -84,7 +112,15 @@ static void test_registrar(void) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, count); hr = IRegistrar_StringRegister(registrar, textW); - ok(SUCCEEDED(hr), "IRegistrar_StringRegister failed, hr = 0x%08X\n", hr); + if (FAILED(hr)) + { + int is_limited = is_process_limited(); + ok(hr == DISP_E_EXCEPTION && is_limited, + "IRegistrar_StringRegister failed, hr = 0x%08X, is_limited=%d\n", hr, is_limited); + skip("Skipping registrar tests\n"); + IRegistrar_Release(registrar); + return; + } lret = RegOpenKeyA(HKEY_CLASSES_ROOT, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); ok(lret == ERROR_SUCCESS, "error %d opening registry key\n", lret);

1 0

Frédéric Delanoy : setupapi: Use BOOL type where appropriate.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 9c76ccfda124ca471b3de4d8a04aed1e15a6b9f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c76ccfda124ca471b3de4d8a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 13 12:07:19 2014 +0100 setupapi: Use BOOL type where appropriate. --- dlls/setupapi/devinst.c | 2 +- dlls/setupapi/misc.c | 4 ++-- dlls/setupapi/parser.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5eaffd6..33dea82 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2887,7 +2887,7 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) } } - if (ret == FALSE) + if (!ret) SetLastError(ERROR_INVALID_HANDLE); return ret; diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 5f341cc..22e55d9 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1458,7 +1458,7 @@ static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target ) struct callback_context { - int has_extracted; + BOOL has_extracted; LPCWSTR target; }; @@ -1477,7 +1477,7 @@ static UINT CALLBACK decompress_or_copy_callback( PVOID context, UINT notificati TRACE("Requesting extraction of cabinet file %s\n", wine_dbgstr_w(info->NameInCabinet)); strcpyW( info->FullTargetName, context_info->target ); - context_info->has_extracted = 1; + context_info->has_extracted = TRUE; return FILEOP_DOIT; } default: return NO_ERROR; diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index cd101b7..e8c8fd3 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -370,7 +370,7 @@ static unsigned int PARSER_string_substW( const struct inf_file *file, const WCH { const WCHAR *start, *subst, *p; unsigned int len, total = 0; - int inside = 0; + BOOL inside = FALSE; if (!buffer) size = MAX_STRING_LEN + 1; for (p = start = text; *p; p++)

1 0

Nikolay Sivov : advapi32/tests: Accept another error code returned on some WinXP systems.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 9756550c25e29745dba4c9ca81deba7916fd8854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9756550c25e29745dba4c9ca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 13 16:45:13 2014 +0400 advapi32/tests: Accept another error code returned on some WinXP systems. --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 907c73b..e2e9cd5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2679,8 +2679,8 @@ static void test_impersonation_level(void) /* can't perform access check when opening object against an anonymous impersonation token */ todo_wine { error = RegOpenKeyExA(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hkey); - ok(error == ERROR_INVALID_HANDLE || error == ERROR_CANT_OPEN_ANONYMOUS, - "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE or ERROR_CANT_OPEN_ANONYMOUS instead of %d\n", error); + ok(error == ERROR_INVALID_HANDLE || error == ERROR_CANT_OPEN_ANONYMOUS || error == ERROR_BAD_IMPERSONATION_LEVEL, + "RegOpenKeyEx failed with %d\n", error); } RevertToSelf();

1 0

Jacek Caban : urlmon: Added IsInternetESCEnabledLocal implementation.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 8f07fbcd534ff38b00359cffb1651019d06db492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f07fbcd534ff38b00359cffb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 13:49:58 2014 +0100 urlmon: Added IsInternetESCEnabledLocal implementation. --- dlls/urlmon/sec_mgr.c | 35 +++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 1 + 2 files changed, 36 insertions(+) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index eaad546..dc57c88 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -49,6 +49,12 @@ static const WCHAR wszZonesKey[] = {'S','o','f','t','w','a','r','e','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', 'Z','o','n','e','s','\\',0}; +static const WCHAR zone_map_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', + 'Z','o','n','e','M','a','p',0}; static const WCHAR wszZoneMapDomainsKey[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\', @@ -2067,3 +2073,32 @@ HRESULT WINAPI CompareSecurityIds(BYTE *secid1, DWORD size1, BYTE *secid2, DWORD FIXME("(%p %d %p %d %x)\n", secid1, size1, secid2, size2, reserved); return E_NOTIMPL; } + +/******************************************************************** + * IsInternetESCEnabledLocal (URLMON.108) + * + * Undocumented, returns if IE is running in Enhanced Security Configuration. + */ +BOOL WINAPI IsInternetESCEnabledLocal(void) +{ + static BOOL esc_initialized, esc_enabled; + + TRACE("()\n"); + + if(!esc_initialized) { + DWORD type, size, val; + HKEY zone_map; + + static const WCHAR iehardenW[] = {'I','E','H','a','r','d','e','n',0}; + + if(RegOpenKeyExW(HKEY_CURRENT_USER, zone_map_keyW, 0, KEY_QUERY_VALUE, &zone_map) == ERROR_SUCCESS) { + size = sizeof(DWORD); + if(RegQueryValueExW(zone_map, iehardenW, NULL, &type, (BYTE*)&val, &size) == ERROR_SUCCESS) + esc_enabled = type == REG_DWORD && val != 0; + RegCloseKey(zone_map); + } + esc_initialized = TRUE; + } + + return esc_enabled; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index e66fff7..96ba40a 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -95,6 +95,7 @@ @ stub WriteHitLogging @ stub ZonesReInit +108 stdcall @() IsInternetESCEnabledLocal 111 stdcall @(wstr) IsProtectedModeURL 328 stdcall @(ptr ptr) propsys.VariantCompare 329 stdcall @(ptr ptr) propsys.VariantToGUID

1 0

Frédéric Delanoy : msi: Fix typo in a field name.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: f21225a41b3c2e507b90efc8cff3a3951109b0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21225a41b3c2e507b90efc8c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 13 14:25:39 2014 +0100 msi: Fix typo in a field name. --- dlls/msi/action.c | 6 +++--- dlls/msi/msipriv.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 73aae35..07322fe 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1887,7 +1887,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) component->anyAbsent = 1; break; case INSTALLSTATE_ADVERTISED: - component->hasAdvertiseFeature = 1; + component->hasAdvertisedFeature = 1; break; case INSTALLSTATE_SOURCE: component->hasSourceFeature = 1; @@ -1897,7 +1897,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) break; case INSTALLSTATE_DEFAULT: if (feature->Attributes & msidbFeatureAttributesFavorAdvertise) - component->hasAdvertiseFeature = 1; + component->hasAdvertisedFeature = 1; else if (feature->Attributes & msidbFeatureAttributesFavorSource) component->hasSourceFeature = 1; else @@ -1942,7 +1942,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) component->ActionRequest = INSTALLSTATE_SOURCE; continue; } - if (component->hasAdvertiseFeature) + if (component->hasAdvertisedFeature) { component->Action = INSTALLSTATE_ADVERTISED; component->ActionRequest = INSTALLSTATE_ADVERTISED; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 3780d48..c585b43 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -487,7 +487,7 @@ typedef struct tagMSICOMPONENT int num_clients; unsigned int anyAbsent:1; - unsigned int hasAdvertiseFeature:1; + unsigned int hasAdvertisedFeature:1; unsigned int hasLocalFeature:1; unsigned int hasSourceFeature:1; } MSICOMPONENT;

1 0

Andrey Gusev : odbccu32: Correct filename string.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: e41a5422b0b06c5bb25f7b11635a6b540a86f43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41a5422b0b06c5bb25f7b116… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 13 16:05:46 2014 +0200 odbccu32: Correct filename string. --- dlls/odbccu32/version.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccu32/version.rc b/dlls/odbccu32/version.rc index bc1e6f2..f951271 100644 --- a/dlls/odbccu32/version.rc +++ b/dlls/odbccu32/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine ODBC Cursor Library" -#define WINE_FILENAME_STR "odbcu32.dll" +#define WINE_FILENAME_STR "odbccu32.dll" #define WINE_FILEVERSION 6,1,7601,17632 #define WINE_FILEVERSION_STR "6.1.7601.17632" #define WINE_PRODUCTVERSION 6,1,7601,17632

1 0

Ken Thomases : d3d8/tests: Ignore broken CheckDeviceType() behavior on 64-bit Windows 8.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: bdb9a9e4f0f5394dffbdb40f113dacf8cca98c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb9a9e4f0f5394dffbdb40f1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 12 13:27:02 2014 -0600 d3d8/tests: Ignore broken CheckDeviceType() behavior on 64-bit Windows 8. --- dlls/d3d8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b93acf4..78f6773 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1053,7 +1053,7 @@ static void test_display_formats(void) hr = IDirect3D8_CheckDeviceType(d3d8, D3DADAPTER_DEFAULT, device_type, formats[display].format, formats[backbuffer].format, windowed); - ok(SUCCEEDED(hr) == should_pass, + ok(SUCCEEDED(hr) == should_pass || broken(SUCCEEDED(hr) && !has_modes) /* Win8 64-bit */, "Got unexpected hr %#x for %s / %s, windowed %#x, should_pass %#x.\n", hr, formats[display].name, formats[backbuffer].name, windowed, should_pass); }

1 0

Ken Thomases : d3d9/tests: Ignore broken CheckDeviceType() behavior on 64-bit Windows 8.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: a6f00eb2b9fc3fbf14433930ed6e3555842f7c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6f00eb2b9fc3fbf14433930e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 12 13:27:32 2014 -0600 d3d9/tests: Ignore broken CheckDeviceType() behavior on 64-bit Windows 8. --- dlls/d3d9/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6877a0b..4f94c3b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2347,7 +2347,7 @@ static void test_display_formats(void) hr = IDirect3D9_CheckDeviceType(d3d9, D3DADAPTER_DEFAULT, device_type, formats[display].format, formats[backbuffer].format, windowed); - ok(SUCCEEDED(hr) == should_pass, + ok(SUCCEEDED(hr) == should_pass || broken(SUCCEEDED(hr) && !has_modes) /* Win8 64-bit */, "Got unexpected hr %#x for %s / %s, windowed %#x, should_pass %#x.\n", hr, formats[display].name, formats[backbuffer].name, windowed, should_pass); }

1 0