August 2015 - Wine-commits - list.winehq.org

Martin Storsjo : api-ms-win-crt-utility-l1-1-0: Add stub dll.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 8741cba354506d348cbfe4683e1c3a168a110bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8741cba354506d348cbfe4683… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:56 2015 +0300 api-ms-win-crt-utility-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-crt-utility-l1-1-0/Makefile.in | 1 + .../api-ms-win-crt-utility-l1-1-0.spec | 30 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 35 insertions(+) diff --git a/configure b/configure index 212c592..4f71ac3 100755 --- a/configure +++ b/configure @@ -929,6 +929,7 @@ enable_api_ms_win_crt_runtime_l1_1_0 enable_api_ms_win_crt_stdio_l1_1_0 enable_api_ms_win_crt_string_l1_1_0 enable_api_ms_win_crt_time_l1_1_0 +enable_api_ms_win_crt_utility_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 enable_api_ms_win_downlevel_normaliz_l1_1_0 @@ -17183,6 +17184,7 @@ wine_fn_config_dll api-ms-win-crt-runtime-l1-1-0 enable_api_ms_win_crt_runtime_l wine_fn_config_dll api-ms-win-crt-stdio-l1-1-0 enable_api_ms_win_crt_stdio_l1_1_0 wine_fn_config_dll api-ms-win-crt-string-l1-1-0 enable_api_ms_win_crt_string_l1_1_0 wine_fn_config_dll api-ms-win-crt-time-l1-1-0 enable_api_ms_win_crt_time_l1_1_0 +wine_fn_config_dll api-ms-win-crt-utility-l1-1-0 enable_api_ms_win_crt_utility_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 diff --git a/configure.ac b/configure.ac index dc6e852..e037688 100644 --- a/configure.ac +++ b/configure.ac @@ -2769,6 +2769,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-runtime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-stdio-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-time-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-crt-utility-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/Makefile.in b/dlls/api-ms-win-crt-utility-l1-1-0/Makefile.in new file mode 100644 index 0000000..cf2b940 --- /dev/null +++ b/dlls/api-ms-win-crt-utility-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-crt-utility-l1-1-0.dll diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec new file mode 100644 index 0000000..b335cf8 --- /dev/null +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -0,0 +1,30 @@ +@ cdecl -ret64 _abs64(int64) ucrtbase._abs64 +@ cdecl _byteswap_uint64(int64) ucrtbase._byteswap_uint64 +@ cdecl _byteswap_ulong(long) ucrtbase._byteswap_ulong +@ cdecl _byteswap_ushort(long) ucrtbase._byteswap_ushort +@ cdecl _lfind(ptr ptr ptr long ptr) ucrtbase._lfind +@ stub _lfind_s +@ cdecl _lrotl(long long) ucrtbase._lrotl +@ cdecl _lrotr(long long) ucrtbase._lrotr +@ cdecl _lsearch(ptr ptr ptr long ptr) ucrtbase._lsearch +@ stub _lsearch_s +@ cdecl _rotl(long long) ucrtbase._rotl +@ cdecl -ret64 _rotl64(int64 long) ucrtbase._rotl64 +@ cdecl _rotr(long long) ucrtbase._rotr +@ cdecl -ret64 _rotr64(int64 long) ucrtbase._rotr64 +@ cdecl _swab(str str long) ucrtbase._swab +@ cdecl abs(long) ucrtbase.abs +@ cdecl bsearch(ptr ptr long long ptr) ucrtbase.bsearch +@ cdecl bsearch_s(ptr ptr long long ptr ptr) ucrtbase.bsearch_s +@ cdecl -ret64 div(long long) ucrtbase.div +@ stub imaxabs +@ stub imaxdiv +@ cdecl labs(long) ucrtbase.labs +@ cdecl ldiv(long long) ucrtbase.ldiv +@ cdecl -ret64 llabs(int64) ucrtbase.llabs +@ stub lldiv +@ cdecl qsort(ptr long long ptr) ucrtbase.qsort +@ cdecl qsort_s(ptr long long ptr ptr) ucrtbase.qsort_s +@ cdecl rand() ucrtbase.rand +@ cdecl rand_s(ptr) ucrtbase.rand_s +@ cdecl srand(long) ucrtbase.srand diff --git a/tools/make_specfiles b/tools/make_specfiles index f62be3c..5d31939 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -65,6 +65,7 @@ my @dll_groups = "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-string-l1-1-0", "api-ms-win-crt-time-l1-1-0", + "api-ms-win-crt-utility-l1-1-0", ], [ "msvcp120",

1 0

Hans Leidekker : advapi32: Add well-known SID WinBuiltinAnyPackageSid.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 3a771b60668f891e61e440321bfa12994eb1cf52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a771b60668f891e61e440321… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 26 08:44:45 2015 +0200 advapi32: Add well-known SID WinBuiltinAnyPackageSid. --- dlls/advapi32/security.c | 6 +++++- dlls/advapi32/tests/security.c | 17 ++++++++--------- include/winnt.h | 12 ++++++++++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a40e639..e8f64d5 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -133,6 +133,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {'M','E'}, WinMediumLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_MEDIUM_RID } } }, { {'H','I'}, WinHighLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } } }, { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, + { {0,0}, WinBuiltinAnyPackageSid, { SID_REVISION, 2, { SECURITY_APP_PACKAGE_AUTHORITY }, { SECURITY_APP_PACKAGE_BASE_RID, SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE } } }, }; /* these SIDs must be constructed as relative to some domain - only the RID is well-known */ @@ -173,7 +174,9 @@ typedef struct _AccountSid { static const WCHAR Account_Operators[] = { 'A','c','c','o','u','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; static const WCHAR Administrator[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r',0 }; static const WCHAR Administrators[] = { 'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0 }; +static const WCHAR ALL_APPLICATION_PACKAGES[] = { 'A','L','L',' ','A','P','P','L','I','C','A','T','I','O','N',' ','P','A','C','K','A','G','E','S',0 }; static const WCHAR ANONYMOUS_LOGON[] = { 'A','N','O','N','Y','M','O','U','S',' ','L','O','G','O','N',0 }; +static const WCHAR APPLICATION_PACKAGE_AUTHORITY[] = { 'A','P','P','L','I','C','A','T','I','O','N',' ','P','A','C','K','A','G','E',' ','A','U','T','H','O','R','I','T','Y',0 }; static const WCHAR Authenticated_Users[] = { 'A','u','t','h','e','n','t','i','c','a','t','e','d',' ','U','s','e','r','s',0 }; static const WCHAR Backup_Operators[] = { 'B','a','c','k','u','p',' ','O','p','e','r','a','t','o','r','s',0 }; static const WCHAR BATCH[] = { 'B','A','T','C','H',0 }; @@ -277,6 +280,7 @@ static const AccountSid ACCOUNT_SIDS[] = { { WinOtherOrganizationSid, Other_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, { WinBuiltinPerfMonitoringUsersSid, Performance_Monitor_Users, BUILTIN, SidTypeAlias }, { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, + { WinBuiltinAnyPackageSid, ALL_APPLICATION_PACKAGES, APPLICATION_PACKAGE_AUTHORITY, SidTypeWellKnownGroup }, }; /* * ACE access rights @@ -2208,7 +2212,7 @@ LookupAccountSidW( } /* check the well known SIDs first */ - for (i = 0; i <= 60; i++) { + for (i = 0; i <= WinAccountProtectedUsersSid; i++) { if (IsWellKnownSid(sid, i)) { for (j = 0; j < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); j++) { if (ACCOUNT_SIDS[j].type == i) { diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 5d52fab..46db49c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1731,7 +1731,9 @@ static const struct well_known_sid_value /* 69 */ {TRUE, "S-1-16-16384"}, {TRUE, "S-1-5-33"}, {TRUE, "S-1-3-4"}, /* 72 */ {FALSE, "S-1-5-21-12-23-34-45-56-571"}, {FALSE, "S-1-5-21-12-23-34-45-56-572"}, /* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"}, -/* 77 */ {FALSE, "S-1-5-21-12-23-34-45-56-498"}, {TRUE, "S-1-5-32-574"}, {TRUE, "S-1-16-8448"} +/* 77 */ {FALSE, "S-1-5-21-12-23-34-45-56-498"}, {TRUE, "S-1-5-32-574"}, {TRUE, "S-1-16-8448"}, +/* 80 */ {FALSE, NULL}, {TRUE, "S-1-2-1"}, {TRUE, "S-1-5-65-1"}, {FALSE, NULL}, +/* 84 */ {TRUE, "S-1-15-2-1"}, }; static void test_CreateWellKnownSid(void) @@ -1780,15 +1782,12 @@ static void test_CreateWellKnownSid(void) if (value->sid_string == NULL) continue; - if (i > WinAccountRasAndIasServersSid) + /* some SIDs aren't implemented by all Windows versions - detect it */ + cb = sizeof(sid_buffer); + if (!pCreateWellKnownSid(i, NULL, sid_buffer, &cb)) { - /* These SIDs aren't implemented by all Windows versions - detect it and break the loop */ - cb = sizeof(sid_buffer); - if (!pCreateWellKnownSid(i, domainsid, sid_buffer, &cb)) - { - skip("Well known SIDs starting from %u are not implemented\n", i); - break; - } + skip("Well known SID %u not implemented\n", i); + continue; } cb = sizeof(sid_buffer); diff --git a/include/winnt.h b/include/winnt.h index 93e216f..ded01f6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4181,6 +4181,18 @@ typedef struct _SID_AND_ATTRIBUTES { #define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS __MSABI_LONG(0x00000207) #define DOMAIN_GROUP_RID_POLICY_ADMINS __MSABI_LONG(0x00000208) +#define SECURITY_APP_PACKAGE_AUTHORITY {0,0,0,0,0,15} +#define SECURITY_APP_PACKAGE_BASE_RID __MSABI_LONG(0x000000002) +#define SECURITY_BUILTIN_APP_PACKAGE_RID_COUNT __MSABI_LONG(0x000000002) +#define SECURITY_APP_PACKAGE_RID_COUNT __MSABI_LONG(0x000000008) +#define SECURITY_CAPABILITY_BASE_RID __MSABI_LONG(0x000000003) +#define SECURITY_CAPABILITY_APP_RID __MSABI_LONG(0x000000400) +#define SECURITY_BUILTIN_CAPABILITY_RID_COUNT __MSABI_LONG(0x000000002) +#define SECURITY_CAPABILITY_RID_COUNT __MSABI_LONG(0x000000005) +#define SECURITY_PARENT_PACKAGE_RID_COUNT SECURITY_APP_PACKAGE_RID_COUNT +#define SECURITY_CHILD_PACKAGE_RID_COUNT __MSABI_LONG(0x00000000c) +#define SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE __MSABI_LONG(0x000000001) + #define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} #define SECURITY_MANDATORY_UNTRUSTED_RID __MSABI_LONG(0x00000000) #define SECURITY_MANDATORY_LOW_RID __MSABI_LONG(0x00001000)

1 0

Hans Leidekker : winhttp: Add support for retrieving the URL codepage.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 58bf3ca17ffd469823063b8e9ff8a0366a81edb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bf3ca17ffd469823063b8e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 26 08:45:07 2015 +0200 winhttp: Add support for retrieving the URL codepage. --- dlls/winhttp/request.c | 21 +++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 6ca3727..d3f4d91 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3999,8 +3999,25 @@ static HRESULT WINAPI winhttp_request_get_Option( WinHttpRequestOption option, VARIANT *value ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + HRESULT hr = S_OK; + + TRACE("%p, %u, %p\n", request, option, value); + + EnterCriticalSection( &request->cs ); + switch (option) + { + case WinHttpRequestOption_URLCodePage: + V_VT( value ) = VT_I4; + V_I4( value ) = request->url_codepage; + break; + default: + FIXME("unimplemented option %u\n", option); + hr = E_NOTIMPL; + break; + } + LeaveCriticalSection( &request->cs ); + return hr; } static HRESULT WINAPI winhttp_request_put_Option( diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index d2f7671..9bda2af 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3043,11 +3043,12 @@ static void test_IWinHttpRequest(void) static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n',0}; static const WCHAR dateW[] = {'D','a','t','e',0}; static const WCHAR test_dataW[] = {'t','e','s','t','d','a','t','a',128,0}; + static const WCHAR utf8W[] = {'u','t','f','-','8',0}; HRESULT hr; IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; BSTR date, today, connection, value = NULL; - VARIANT async, empty, timeout, body, body2, proxy_server, bypass_list, data; + VARIANT async, empty, timeout, body, body2, proxy_server, bypass_list, data, cp; VARIANT_BOOL succeeded; LONG status; WCHAR todayW[WINHTTP_TIME_FORMAT_BUFSIZE]; @@ -3131,6 +3132,39 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_Open( req, method, url, async ); ok( hr == S_OK, "got %08x\n", hr ); + V_VT( &cp ) = VT_ERROR; + V_ERROR( &cp ) = 0xdeadbeef; + hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_UTF8, "got %u\n", V_I4( &cp ) ); + + V_VT( &cp ) = VT_UI4; + V_UI4( &cp ) = CP_ACP; + hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp ); + ok( hr == S_OK, "got %08x\n", hr ); + + V_VT( &cp ) = VT_ERROR; + V_ERROR( &cp ) = 0xdeadbeef; + hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_ACP, "got %u\n", V_I4( &cp ) ); + + value = SysAllocString( utf8W ); + V_VT( &cp ) = VT_BSTR; + V_BSTR( &cp ) = value; + hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( value ); + + V_VT( &cp ) = VT_ERROR; + V_ERROR( &cp ) = 0xdeadbeef; + hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_UTF8, "got %u\n", V_I4( &cp ) ); + hr = IWinHttpRequest_Abort( req ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Hans Leidekker : msi: Don' t add the same environment string more than once.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: ddaba7a3696c687523315a5e78f8704b2a3cbd78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddaba7a3696c687523315a5e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 26 08:45:31 2015 +0200 msi: Don't add the same environment string more than once. --- dlls/msi/action.c | 73 +++++++++++++++++++++++++++++++------------------ dlls/msi/tests/action.c | 8 +++++- 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0fe7d38..93e85c3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6922,13 +6922,13 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; LPCWSTR name, value, component; - LPWSTR data = NULL, newval = NULL, deformatted = NULL, ptr; - DWORD flags, type, size; + WCHAR *data = NULL, *newval = NULL, *deformatted = NULL, *p, *q; + DWORD flags, type, size, len, len_value = 0; UINT res; HKEY env = NULL; MSICOMPONENT *comp; MSIRECORD *uirow; - int action = 0; + int action = 0, found = 0; component = MSI_RecordGetString(rec, 4); comp = msi_get_loaded_component(package, component); @@ -6956,7 +6956,20 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) goto done; } - value = deformatted; + if ((value = deformatted)) + { + if (flags & ENV_MOD_PREFIX) + { + p = strrchrW( value, ';' ); + len_value = p - value; + } + else if (flags & ENV_MOD_APPEND) + { + value = strchrW( value, ';' ) + 1; + len_value = strlenW( value ); + } + else len_value = strlenW( value ); + } res = open_env_key( flags, &env ); if (res != ERROR_SUCCESS) @@ -6982,10 +6995,6 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) res = ERROR_SUCCESS; goto done; } - - /* If we are appending but the string was empty, strip ; */ - if ((flags & ENV_MOD_APPEND) && (value[0] == szSemiColon[0])) value++; - size = (lstrlenW(value) + 1) * sizeof(WCHAR); newval = strdupW(value); if (!newval) @@ -7005,15 +7014,14 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) goto done; } - data = msi_alloc(size); - if (!data) + if (!(p = q = data = msi_alloc( size ))) { msi_free(deformatted); RegCloseKey(env); return ERROR_OUTOFMEMORY; } - res = RegQueryValueExW(env, name, NULL, &type, (LPVOID)data, &size); + res = RegQueryValueExW( env, name, NULL, &type, (BYTE *)data, &size ); if (res != ERROR_SUCCESS) goto done; @@ -7026,20 +7034,28 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) goto done; } - size = (lstrlenW(data) + 1) * sizeof(WCHAR); - if (flags & ENV_MOD_MASK) + for (;;) + { + while (*q && *q != ';') q++; + len = q - p; + if (value && len == len_value && !memcmp( value, p, len * sizeof(WCHAR) ) && + (!p[len] || p[len] == ';')) + { + found = 1; + break; + } + if (!*q) break; + p = ++q; + } + + if (found) { - DWORD mod_size; - int multiplier = 0; - if (flags & ENV_MOD_APPEND) multiplier++; - if (flags & ENV_MOD_PREFIX) multiplier++; - mod_size = lstrlenW(value) * multiplier; - size += mod_size * sizeof(WCHAR); + TRACE("string already set\n"); + goto done; } - newval = msi_alloc(size); - ptr = newval; - if (!newval) + size = (len_value + 1 + strlenW( data ) + 1) * sizeof(WCHAR); + if (!(p = newval = msi_alloc( size ))) { res = ERROR_OUTOFMEMORY; goto done; @@ -7047,21 +7063,24 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) if (flags & ENV_MOD_PREFIX) { - lstrcpyW(newval, value); - ptr = newval + lstrlenW(value); + memcpy( newval, value, len_value * sizeof(WCHAR) ); + newval[len_value] = ';'; + p = newval + len_value + 1; action |= 0x80000000; } - lstrcpyW(ptr, data); + strcpyW( p, data ); if (flags & ENV_MOD_APPEND) { - lstrcatW(newval, value); + p += strlenW( data ); + *p++ = ';'; + memcpy( p, value, (len_value + 1) * sizeof(WCHAR) ); action |= 0x40000000; } } TRACE("setting %s to %s\n", debugstr_w(name), debugstr_w(newval)); - res = RegSetValueExW(env, name, 0, type, (LPVOID)newval, size); + res = RegSetValueExW( env, name, 0, type, (BYTE *)newval, size ); if (res) { WARN("Failed to set %s to %s (%d)\n", debugstr_w(name), debugstr_w(newval), res); diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 9512410..435aeeb 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -218,7 +218,8 @@ static const char environment_dat[] = "Var23\t+-MSITESTVAR19\t1\tOne\n" "Var24\t+-MSITESTVAR19\t[~]2\tOne\n" "Var25\t+-MSITESTVAR20\t1\tOne\n" - "Var26\t+-MSITESTVAR20\t2[~]\tOne\n"; + "Var26\t+-MSITESTVAR20\t2[~]\tOne\n" + "Var27\t+-MSITESTVAR21\t[~];1\tOne\n"; static const char service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" @@ -5145,6 +5146,7 @@ static void test_envvar(void) "1;;2;;", /* MSITESTVAR18 */ "1", /* MSITESTVAR19 */ "1", /* MSITESTVAR20 */ + "1", /* MSITESTVAR21 */ NULL }; UINT r; @@ -5172,6 +5174,9 @@ static void test_envvar(void) res = RegSetValueExA(env, "MSITESTVAR2", 0, REG_SZ, (const BYTE *)"0", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegSetValueExA(env, "MSITESTVAR21", 0, REG_SZ, (const BYTE *)"1", 2); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); @@ -5264,6 +5269,7 @@ static void test_envvar(void) error: RegDeleteValueA(env, "MSITESTVAR1"); RegDeleteValueA(env, "MSITESTVAR2"); + RegDeleteValueA(env, "MSITESTVAR21"); RegCloseKey(env); delete_test_files();

1 0

Hans Leidekker : msi: Implement Installer::SummaryInformation.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: d3ce29449b0caf39ee6e96a2da52cf23a670e956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ce29449b0caf39ee6e96a2d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 26 08:45:53 2015 +0200 msi: Implement Installer::SummaryInformation. --- dlls/msi/automation.c | 36 ++++++++++++++++++++++++++++++++---- dlls/msi/tests/automation.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 5 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 01765cb..e974387 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1832,13 +1832,41 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, EXCEPINFO* pExcepInfo, UINT* puArgErr) { - if (!(wFlags & DISPATCH_METHOD)) + UINT ret; + HRESULT hr; + MSIHANDLE hsuminfo; + IDispatch *dispatch; + VARIANTARG varg0, varg1; + + if (!(wFlags & DISPATCH_PROPERTYGET)) return DISP_E_MEMBERNOTFOUND; - FIXME("\n"); + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; - VariantInit(pVarResult); - return S_OK; + VariantInit(&varg1); + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) + return hr; + + V_VT(pVarResult) = VT_DISPATCH; + + ret = MsiGetSummaryInformationW(0, V_BSTR(&varg0), V_I4(&varg1), &hsuminfo); + if (ret != ERROR_SUCCESS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + + hr = create_summaryinfo(hsuminfo, &dispatch); + if (SUCCEEDED(hr)) + V_DISPATCH(pVarResult) = dispatch; + +done: + VariantClear(&varg0); + return hr; } static HRESULT InstallerImpl_UILevel(WORD wFlags, diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 016b1a2..e31527f 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1128,6 +1128,25 @@ static HRESULT Installer_UILevelPut(int level) return invoke(pInstaller, "UILevel", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } +static HRESULT Installer_SummaryInformation(BSTR PackagePath, int UpdateCount, IDispatch **pSumInfo) +{ + VARIANT varresult; + VARIANTARG vararg[2]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(PackagePath); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = UpdateCount; + + hr = invoke(pInstaller, "SummaryInformation", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_DISPATCH); + *pSumInfo = V_DISPATCH(&varresult); + return hr; +} + static HRESULT Session_Installer(IDispatch *pSession, IDispatch **pInst) { VARIANT varresult; @@ -2602,7 +2621,7 @@ static void test_Installer(void) static const WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; WCHAR szPath[MAX_PATH]; HRESULT hr; - IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL; + IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL, *pSumInfo = NULL; int iValue, iCount; if (!pInstaller) return; @@ -2678,6 +2697,18 @@ static void test_Installer(void) IDispatch_Release(pDatabase); } + /* Installer::SummaryInformation */ + hr = Installer_SummaryInformation(szPath, 0, &pSumInfo); + ok(hr == S_OK, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr); + if (hr == S_OK) + { + test_SummaryInfo(pSumInfo, summary_info, sizeof(summary_info)/sizeof(msi_summary_info), TRUE); + IDispatch_Release(pSumInfo); + } + + hr = Installer_SummaryInformation(NULL, 0, &pSumInfo); + ok(hr == DISP_E_EXCEPTION, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr); + /* Installer::RegistryValue */ test_Installer_RegistryValue();

1 0

Daniel Lehman : wrc: Add support for LANG_INVARIANT.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 42724f3d5030cd4364aba1d590a19724a50c7cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42724f3d5030cd4364aba1d59… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 17 15:48:37 2015 -0700 wrc: Add support for LANG_INVARIANT. --- tools/wrc/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 4dc3364..5360b95 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -453,6 +453,7 @@ static const struct lang2cp lang2cps[] = { LANG_INDONESIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_INUKTITUT, SUBLANG_NEUTRAL, 0 }, { LANG_INUKTITUT, SUBLANG_INUKTITUT_CANADA_LATIN, 0 }, + { LANG_INVARIANT, SUBLANG_NEUTRAL, 0 }, { LANG_IRISH, SUBLANG_NEUTRAL, 1252 }, { LANG_ITALIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_JAPANESE, SUBLANG_NEUTRAL, 932 },

1 0

Erich E. Hoover : winspool.drv: Allow spooling directly to a postscript file.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 126f0601e2e5e19dd7bff7af7b4ddb8dc3cb711f URL: http://source.winehq.org/git/wine.git/?a=commit;h=126f0601e2e5e19dd7bff7af7… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Tue Aug 25 16:44:18 2015 -0600 winspool.drv: Allow spooling directly to a postscript file. Required for PDF printing in OrCAD 16.6. --- dlls/winspool.drv/info.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4549034..ca2c34d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8432,6 +8432,11 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) { ret = schedule_file(job->filename); } + else if(isalpha(portname[0]) && portname[1] == ':') + { + TRACE("copying to %s\n", debugstr_w(portname)); + ret = CopyFileW(job->filename, portname, FALSE); + } else { FIXME("can't schedule to port %s\n", debugstr_w(portname));

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::Play.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 8a317d89cf1c81c798c938ea7d1586052f1faad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a317d89cf1c81c798c938ea7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 25 14:28:46 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::Play. --- dlls/xaudio2_7/xaudio_dll.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 52ac747..6cfef9b 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -140,6 +140,8 @@ typedef struct _XA2SourceImpl { DWORD nsends; XAUDIO2_SEND_DESCRIPTOR *sends; + BOOL running; + struct list entry; } XA2SourceImpl; @@ -429,6 +431,8 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) This->in_use = FALSE; + This->running = FALSE; + HeapFree(GetProcessHeap(), 0, This->fmt); LeaveCriticalSection(&This->lock); @@ -438,7 +442,15 @@ static HRESULT WINAPI XA2SRC_Start(IXAudio2SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p, 0x%x, 0x%x\n", This, Flags, OperationSet); + + EnterCriticalSection(&This->lock); + + This->running = TRUE; + + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -446,7 +458,15 @@ static HRESULT WINAPI XA2SRC_Stop(IXAudio2SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p, 0x%x, 0x%x\n", This, Flags, OperationSet); + + EnterCriticalSection(&This->lock); + + This->running = FALSE; + + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -1324,6 +1344,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, } src->in_use = TRUE; + src->running = FALSE; LeaveCriticalSection(&This->lock);

1 0

Andrew Eikum : xaudio2: Implement device activation.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 1c643f39e2814dca59e284092aa3fb47f6280791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c643f39e2814dca59e284092… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 25 14:28:37 2015 -0500 xaudio2: Implement device activation. This adds a build-time dependency on openal, and a run-time dependency on openal-soft's ALC_SOFT_loopback extension. --- configure | 5 +- configure.ac | 3 +- dlls/xaudio2_7/Makefile.in | 1 + dlls/xaudio2_7/xaudio_dll.c | 274 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 277 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c643f39e2814dca59e28…

1 0

Andrew Eikum : xaudio2: Zero the returned struct GetPerformanceData.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: a79f050355b98d2bb2df62c6e2f07c1f27aa9aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79f050355b98d2bb2df62c6e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 25 14:28:54 2015 -0500 xaudio2: Zero the returned struct GetPerformanceData. Some applications use this for debug logging. Better to return zero than uninitialized data. --- dlls/xaudio2_7/xaudio_dll.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 6cfef9b..0438fcf 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1669,6 +1669,8 @@ static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, IXAudio2Impl *This = impl_from_IXAudio2(iface); FIXME("(%p)->(%p): stub!\n", This, pPerfData); + + memset(pPerfData, 0, sizeof(*pPerfData)); } static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface,

1 0