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

Robert Reif : advapi32: Add some more well known SIDs.
by Alexandre Julliard 12 Aug '06

12 Aug '06

Module: wine Branch: master Commit: da44bfc02db5758d99634470eec1bc5e145e0dde URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da44bfc02db5758d9963447… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Aug 11 23:51:21 2006 -0400 advapi32: Add some more well known SIDs. --- dlls/advapi32/security.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2eade3e..4e54c72 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -115,6 +115,13 @@ static const WELLKNOWNSID WellKnownSids[ { {'R','U'}, WinBuiltinPreWindows2000CompatibleAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_PREW2KCOMPACCESS } } }, { {'R','D'}, WinBuiltinRemoteDesktopUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS } } }, { {'N','O'}, WinBuiltinNetworkConfigurationOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS } } }, + { {0,0}, WinNTLMAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_NTLM_RID } } }, + { {0,0}, WinDigestAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_DIGEST_RID } } }, + { {0,0}, WinSChannelAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_SCHANNEL_RID } } }, + { {0,0}, WinThisOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_THIS_ORGANIZATION_RID } } }, + { {0,0}, WinOtherOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_OTHER_ORGANIZATION_RID } } }, + { {0,0}, WinBuiltinPerfMonitoringUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_MONITORING_USERS } } }, + { {0,0}, WinBuiltinPerfLoggingUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_LOGGING_USERS } } }, }; static SID const sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; @@ -140,6 +147,7 @@ static const WCHAR CREATOR_GROUP_SERVER[ static const WCHAR CREATOR_OWNER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',0 }; static const WCHAR CREATOR_OWNER_SERVER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',' ','S','E','R','V','E','R',0 }; static const WCHAR DIALUP[] = { 'D','I','A','L','U','P',0 }; +static const WCHAR Digest_Authentication[] = { 'D','i','g','e','s','t',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; static const WCHAR DOMAIN[] = {'D','O','M','A','I','N',0}; static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; @@ -153,19 +161,26 @@ static const WCHAR Network_Configuration static const WCHAR NETWORK_SERVICE[] = { 'N','E','T','W','O','R','K',' ','S','E','R','V','I','C','E',0 }; static const WCHAR NT_AUTHORITY[] = { 'N','T',' ','A','U','T','H','O','R','I','T','Y',0 }; static const WCHAR NT_Pseudo_Domain[] = { 'N','T',' ','P','s','e','u','d','o',' ','D','o','m','a','i','n',0 }; +static const WCHAR NTML_Authentication[] = { 'N','T','M','L',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; static const WCHAR NULL_SID[] = { 'N','U','L','L',' ','S','I','D',0 }; +static const WCHAR Other_Organization[] = { 'O','t','h','e','r',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; +static const WCHAR Performance_Log_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','L','o','g',' ','U','s','e','r','s',0 }; +static const WCHAR Performance_Monitor_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','M','o','n','i','t','o','r',' ','U','s','e','r','s',0 }; static const WCHAR Power_Users[] = { 'P','o','w','e','r',' ','U','s','e','r','s',0 }; +static const WCHAR Pre_Windows_2000_Compatible_Access[] = { 'P','r','e','-','W','i','n','d','o','w','s',' ','2','0','0','0',' ','C','o','m','p','a','t','i','b','l','e',' ','A','c','c','e','s','s',0 }; static const WCHAR Print_Operators[] = { 'P','r','i','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; static const WCHAR PROXY[] = { 'P','R','O','X','Y',0 }; static const WCHAR Remote_Desktop_Users[] = { 'R','e','m','o','t','e',' ','D','e','s','k','t','o','p',' ','U','s','e','r','s',0 }; static const WCHAR REMOTE_INTERACTIVE_LOGON[] = { 'R','E','M','O','T','E',' ','I','N','T','E','R','A','C','T','I','V','E',' ','L','O','G','O','N',0 }; static const WCHAR Replicators[] = { 'R','e','p','l','i','c','a','t','o','r','s',0 }; static const WCHAR RESTRICTED[] = { 'R','E','S','T','R','I','C','T','E','D',0 }; +static const WCHAR SChannel_Authentication[] = { 'S','C','h','a','n','n','e','l',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; static const WCHAR SELF[] = { 'S','E','L','F',0 }; static const WCHAR Server_Operators[] = { 'S','e','r','v','e','r',' ','O','p','e','r','a','t','o','r','s',0 }; static const WCHAR SERVICE[] = { 'S','E','R','V','I','C','E',0 }; static const WCHAR SYSTEM[] = { 'S','Y','S','T','E','M',0 }; static const WCHAR TERMINAL_SERVER_USER[] = { 'T','E','R','M','I','N','A','L',' ','S','E','R','V','E','R',' ','U','S','E','R',0 }; +static const WCHAR This_Organization[] = { 'T','h','i','s',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; static const WCHAR Users[] = { 'U','s','e','r','s',0 }; static const AccountSid ACCOUNT_SIDS[] = { @@ -203,8 +218,16 @@ static const AccountSid ACCOUNT_SIDS[] = { WinBuiltinPrintOperatorsSid, Print_Operators, BUILTIN, SidTypeAlias }, { WinBuiltinBackupOperatorsSid, Backup_Operators, BUILTIN, SidTypeAlias }, { WinBuiltinReplicatorSid, Replicators, BUILTIN, SidTypeAlias }, + { WinBuiltinPreWindows2000CompatibleAccessSid, Pre_Windows_2000_Compatible_Access, BUILTIN, SidTypeAlias }, { WinBuiltinRemoteDesktopUsersSid, Remote_Desktop_Users, BUILTIN, SidTypeAlias }, { WinBuiltinNetworkConfigurationOperatorsSid, Network_Configuration_Operators, BUILTIN, SidTypeAlias }, + { WinNTLMAuthenticationSid, NTML_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinDigestAuthenticationSid, Digest_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinSChannelAuthenticationSid, SChannel_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinThisOrganizationSid, This_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinOtherOrganizationSid, Other_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinBuiltinPerfMonitoringUsersSid, Performance_Monitor_Users, BUILTIN, SidTypeAlias }, + { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, }; /* * ACE access rights

1 0

Dan Hipschman : widl: Use ref_type to simplify some code.
by Alexandre Julliard 12 Aug '06

12 Aug '06

Module: wine Branch: master Commit: 06497dd44c2d9cacbfabe3384d2e7433675dc0e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06497dd44c2d9cacbfabe33… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Aug 11 17:32:47 2006 -0700 widl: Use ref_type to simplify some code. --- tools/widl/parser.y | 5 +---- tools/widl/typegen.c | 2 +- tools/widl/widltypes.h | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ca5db5c..73ccf25 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1235,10 +1235,7 @@ static unsigned char get_pointer_type( t int t; if (is_attr( type->attrs, ATTR_STRING )) { - type_t *t = type; - while( t->type == 0 && t->ref ) - t = t->ref; - switch( t->type ) + switch( ref_type( type ) ) { case RPC_FC_CHAR: return RPC_FC_C_CSTRING; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index badf124..83af2eb 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -165,7 +165,7 @@ static inline int is_base_type(unsigned } } -static unsigned char ref_type(const type_t *type) +unsigned char ref_type(const type_t *type) { while (type_has_ref(type)) type = type->ref; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7bf2229..926a3e2 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -297,4 +297,7 @@ struct _typelib_t { importlib_t *importlibs; }; +/* Get the actual type field for a type (chase down typedef references). */ +unsigned char ref_type(const type_t *type); + #endif

1 0

Alexandre Julliard : winebuild: Added output() function to properly deal with write errors.
by Alexandre Julliard 12 Aug '06

12 Aug '06

Module: wine Branch: master Commit: 715804999e2e363bf6dc88cfe858b8e9324d7e56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=715804999e2e363bf6dc88c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 11 20:41:29 2006 +0200 winebuild: Added output() function to properly deal with write errors. --- tools/winebuild/build.h | 33 +- tools/winebuild/import.c | 512 ++++++++++++++--------------- tools/winebuild/main.c | 16 - tools/winebuild/relay.c | 824 +++++++++++++++++++++++----------------------- tools/winebuild/res16.c | 52 +-- tools/winebuild/res32.c | 60 ++- tools/winebuild/spec16.c | 420 ++++++++++++----------- tools/winebuild/spec32.c | 345 ++++++++++--------- tools/winebuild/utils.c | 40 +- 9 files changed, 1154 insertions(+), 1148 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=715804999e2e363bf6d…

1 0

Juan Lang : msi: Use wide char strings for token values to avoid an unnecessary WideCharToMultiByte .
by Alexandre Julliard 12 Aug '06

12 Aug '06

Module: wine Branch: master Commit: 5c850c6a4071c75dfcd707c98d5c7d5db21371e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c850c6a4071c75dfcd707c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Aug 11 11:31:41 2006 -0700 msi: Use wide char strings for token values to avoid an unnecessary WideCharToMultiByte. --- dlls/msi/tokenize.c | 333 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 218 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5c850c6a4071c75dfcd…

1 0

Juan Lang : crypt32: Improve undocumented functions.
by Alexandre Julliard 12 Aug '06

12 Aug '06

Module: wine Branch: master Commit: 5bc1b8ac3150c45636c72ead3d8cfae11690b362 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5bc1b8ac3150c45636c72ea… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Aug 11 20:37:04 2006 -0700 crypt32: Improve undocumented functions. - Test and implement I_CryptGetDefaultCryptProv (and correct its parameter list) - I_CryptReadTrustedPublisherDWORDValueFromRegistry always initializes its out parameter, correct and show with a test. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/main.c | 17 ++++++++++++++--- dlls/crypt32/tests/main.c | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 64f10e7..99e4750 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -186,7 +186,7 @@ @ stdcall I_CryptFlushLruCache(ptr long long) @ stdcall I_CryptFreeLruCache(ptr long long) @ stdcall I_CryptFreeTls(long long) -@ stdcall I_CryptGetDefaultCryptProv(long long long) +@ stdcall I_CryptGetDefaultCryptProv(long) @ stub I_CryptGetDefaultCryptProvForEncrypt @ stdcall I_CryptGetOssGlobal(long) @ stdcall I_CryptGetTls(long) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 47bb8fc..9b94adf 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -271,10 +271,20 @@ BOOL WINAPI I_CryptGetOssGlobal(DWORD x) return FALSE; } -BOOL WINAPI I_CryptGetDefaultCryptProv(DWORD x, DWORD y, DWORD z) +HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(DWORD reserved) { - FIXME("%08lx %08lx %08lx\n", x, y, z); - return FALSE; + HCRYPTPROV ret; + + TRACE("(%08lx)\n", reserved); + + if (reserved) + { + SetLastError(E_INVALIDARG); + return (HCRYPTPROV)0; + } + ret = CRYPT_GetDefaultProvider(); + CryptContextAddRef(ret, NULL, 0); + return ret; } BOOL WINAPI I_CryptReadTrustedPublisherDWORDValueFromRegistry(LPCWSTR name, @@ -292,6 +302,7 @@ BOOL WINAPI I_CryptReadTrustedPublisherD TRACE("(%s, %p)\n", debugstr_w(name), value); + *value = 0; rc = RegCreateKeyW(HKEY_LOCAL_MACHINE, safer, &key); if (rc == ERROR_SUCCESS) { diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 128120b..8b980ce 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -295,7 +295,7 @@ static void test_readTrustedPublisherDWO static const WCHAR authenticodeFlags[] = { 'A','u','t','h','e','n', 't','i','c','o','d','e','F','l','a','g','s',0 }; BOOL ret, exists = FALSE; - DWORD size, readFlags, returnedFlags; + DWORD size, readFlags = 0, returnedFlags; HKEY key; LONG rc; @@ -308,14 +308,41 @@ static void test_readTrustedPublisherDWO if (rc == ERROR_SUCCESS) exists = TRUE; } + returnedFlags = 0xdeadbeef; ret = pReadDWORD(authenticodeFlags, &returnedFlags); ok(ret == exists, "Unexpected return value\n"); - if (exists) - ok(readFlags == returnedFlags, - "Expected flags %08lx, got %08lx\n", readFlags, returnedFlags); + ok(readFlags == returnedFlags, + "Expected flags %08lx, got %08lx\n", readFlags, returnedFlags); } } +typedef HCRYPTPROV (WINAPI *I_CryptGetDefaultCryptProvFunc)(DWORD w); + +static void test_getDefaultCryptProv(void) +{ + I_CryptGetDefaultCryptProvFunc pI_CryptGetDefaultCryptProv; + HCRYPTPROV prov; + + if (!hCrypt) return; + + pI_CryptGetDefaultCryptProv = (I_CryptGetDefaultCryptProvFunc) + GetProcAddress(hCrypt, "I_CryptGetDefaultCryptProv"); + if (!pI_CryptGetDefaultCryptProv) return; + + prov = pI_CryptGetDefaultCryptProv(0xdeadbeef); + ok(prov == 0 && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); + prov = pI_CryptGetDefaultCryptProv(PROV_RSA_FULL); + ok(prov == 0 && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); + prov = pI_CryptGetDefaultCryptProv(1); + ok(prov == 0 && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); + prov = pI_CryptGetDefaultCryptProv(0); + ok(prov != 0, "I_CryptGetDefaultCryptProv failed: %08lx\n", GetLastError()); + CryptReleaseContext(prov, 0); +} + START_TEST(main) { hCrypt = LoadLibraryA("crypt32.dll"); @@ -326,4 +353,5 @@ START_TEST(main) test_cryptAllocate(); test_cryptTls(); test_readTrustedPublisherDWORD(); + test_getDefaultCryptProv(); }

1 0

James Hawkins : msi: If a component's state is not local, source, or default, default to the local state.
by Alexandre Julliard 12 Aug '06

12 Aug '06

Module: wine Branch: master Commit: 3cb82ab8d29561637fe46a532ebca0d300cbfce2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3cb82ab8d29561637fe46a5… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Aug 11 16:29:59 2006 -0700 msi: If a component's state is not local, source, or default, default to the local state. --- dlls/msi/action.c | 4 +- dlls/msi/tests/package.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a90096e..ce47d31 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1134,8 +1134,8 @@ static UINT load_component( MSIRECORD *r comp->ActionRequest = INSTALLSTATE_DEFAULT; break; default: - comp->Action = INSTALLSTATE_UNKNOWN; - comp->ActionRequest = INSTALLSTATE_UNKNOWN; + comp->Action = INSTALLSTATE_LOCAL; + comp->ActionRequest = INSTALLSTATE_LOCAL; } return ERROR_SUCCESS; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 29b9d3f..7aca319 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1333,6 +1333,10 @@ static void test_states(void) r = add_component_entry( hdb, "'gamma', '{C271E2A4-DE2E-4F70-86D1-6984AF7DE2CA}', 'TARGETDIR', 2, '', 'gamma_file'" ); ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + /* msidbFeatureAttributesFavorLocal:msidbComponentAttributesSharedDllRefCount */ + r = add_component_entry( hdb, "'theta', '{4EB3129D-81A8-48D5-9801-75600FED3DD9}', 'TARGETDIR', 8, '', 'theta_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + /* msidbFeatureAttributesFavorSource */ r = add_feature_entry( hdb, "'two', '', '', '', 2, 1, '', 1" ); ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); @@ -1349,6 +1353,10 @@ static void test_states(void) r = add_component_entry( hdb, "'zeta', '{377D33AB-2FAA-42B9-A629-0C0DAE9B9C7A}', 'TARGETDIR', 2, '', 'zeta_file'" ); ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + /* msidbFeatureAttributesFavorSource:msidbComponentAttributesSharedDllRefCount */ + r = add_component_entry( hdb, "'iota', '{5D36F871-B5ED-4801-9E0F-C46B9E5C9669}', 'TARGETDIR', 8, '', 'iota_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + /* msidbFeatureAttributesFavorSource */ r = add_feature_entry( hdb, "'three', '', '', '', 2, 1, '', 1" ); ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); @@ -1369,6 +1377,9 @@ static void test_states(void) r = add_feature_components_entry( hdb, "'one', 'gamma'" ); ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + r = add_feature_components_entry( hdb, "'one', 'theta'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + r = add_feature_components_entry( hdb, "'two', 'delta'" ); ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); @@ -1378,6 +1389,9 @@ static void test_states(void) r = add_feature_components_entry( hdb, "'two', 'zeta'" ); ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + r = add_feature_components_entry( hdb, "'two', 'iota'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + r = add_feature_components_entry( hdb, "'three', 'eta'" ); ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); @@ -1393,6 +1407,9 @@ static void test_states(void) r = add_file_entry( hdb, "'gamma_file', 'gamma', 'gamma.txt', 0, '', '1033', 8192, 1" ); ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + r = add_file_entry( hdb, "'theta_file', 'theta', 'theta.txt', 0, '', '1033', 8192, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + r = add_file_entry( hdb, "'delta_file', 'delta', 'delta.txt', 0, '', '1033', 8192, 1" ); ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); @@ -1402,6 +1419,9 @@ static void test_states(void) r = add_file_entry( hdb, "'zeta_file', 'zeta', 'zeta.txt', 0, '', '1033', 8192, 1" ); ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + r = add_file_entry( hdb, "'iota_file', 'iota', 'iota.txt', 0, '', '1033', 8192, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + /* compressed file */ r = add_file_entry( hdb, "'eta_file', 'eta', 'eta.txt', 0, '', '1033', 16384, 1" ); ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); @@ -1453,6 +1473,13 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "theta", &state, &action); + ok( r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r ); + ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); + ok( action == 0xdeadbee, "Expected 0xdeadbee, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "delta", &state, &action); ok( r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r ); ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); @@ -1474,6 +1501,13 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "iota", &state, &action); + ok( r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r ); + ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); + ok( action == 0xdeadbee, "Expected 0xdeadbee, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "eta", &state, &action); ok( r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r ); ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); @@ -1544,6 +1578,16 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "theta", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + todo_wine + { + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + } + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "delta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); todo_wine @@ -1574,6 +1618,16 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "iota", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + todo_wine + { + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + } + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "eta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); todo_wine @@ -1647,6 +1701,16 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "theta", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + todo_wine + { + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + } + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "delta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); todo_wine @@ -1677,6 +1741,16 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "iota", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + todo_wine + { + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + } + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "eta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); todo_wine @@ -1732,6 +1806,13 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "theta", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "delta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); @@ -1753,6 +1834,13 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "iota", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "eta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);

1 0

Dan Hipschman : widl: Don't generate indentation spaces on empty lines.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: 05001b1ca8bce4dce7c958e4732779706372cb62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=05001b1ca8bce4dce7c958e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Aug 11 10:15:55 2006 -0700 widl: Don't generate indentation spaces on empty lines. --- tools/widl/client.c | 5 +++-- tools/widl/proxy.c | 5 +++-- tools/widl/server.c | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index c52fe98..79a4283 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -50,8 +50,9 @@ static int print_client( const char *for int i, r; va_start(va, format); - for (i = 0; i < indent; i++) - fprintf(client, " "); + if (format[0] != '\n') + for (i = 0; i < indent; i++) + fprintf(client, " "); r = vfprintf(client, format, va); va_end(va); return r; diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index c308ab8..5750159 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -56,8 +56,9 @@ static int print_proxy( const char *form int i, r; va_start( va, format ); - for( i=0; i<indent; i++ ) - fprintf( proxy, " " ); + if ( format[0] != '\n' ) + for( i=0; i<indent; i++ ) + fprintf( proxy, " " ); r = vfprintf( proxy, format, va ); va_end( va ); return r; diff --git a/tools/widl/server.c b/tools/widl/server.c index 19a4a2b..7a4aed9 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -52,8 +52,9 @@ static int print_server(const char *form int i, r; va_start(va, format); - for (i = 0; i < indent; i++) - fprintf(server, " "); + if (format[0] != '\n') + for (i = 0; i < indent; i++) + fprintf(server, " "); r = vfprintf(server, format, va); va_end(va); return r;

1 0

Alexandre Julliard : loader: Exit the whole process when killing the last thread.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: 5da3e551a22cf38c16fb837171f80928e4db9ef0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5da3e551a22cf38c16fb837… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 11 19:27:32 2006 +0200 loader: Exit the whole process when killing the last thread. --- loader/pthread.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/loader/pthread.c b/loader/pthread.c index 526633e..9a7834e 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -39,6 +39,7 @@ #include "wine/library.h" #include "wine/pthread.h" static int init_done; +static int nb_threads = 1; #ifndef __i386__ static pthread_key_t teb_key; @@ -107,7 +108,12 @@ static int create_thread( struct wine_pt pthread_attr_setstacksize( &attr, info->stack_size ); pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED ); pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread on Solaris */ - if (pthread_create( &id, &attr, (void * (*)(void *))info->entry, info )) ret = -1; + interlocked_xchg_add( &nb_threads, 1 ); + if (pthread_create( &id, &attr, (void * (*)(void *))info->entry, info )) + { + interlocked_xchg_add( &nb_threads, -1 ); + ret = -1; + } pthread_attr_destroy( &attr ); return ret; } @@ -164,6 +170,7 @@ #endif */ static void DECLSPEC_NORETURN exit_thread( struct wine_pthread_thread_info *info ) { + if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) exit( info->exit_status ); wine_ldt_free_fs( info->teb_sel ); if (info->teb_size) munmap( info->teb_base, info->teb_size ); pthread_exit( (void *)info->exit_status ); @@ -175,6 +182,7 @@ static void DECLSPEC_NORETURN exit_threa */ static void DECLSPEC_NORETURN abort_thread( long status ) { + if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status ); pthread_exit( (void *)status ); }

1 0

Kirill K. Smirnov : winhelp: Fix LZ77 decompressor.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: 27681bdfaf6878dbbf4b25f3b468e682dd2c253a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27681bdfaf6878dbbf4b25f… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Aug 11 19:28:49 2006 +0400 winhelp: Fix LZ77 decompressor. --- programs/winhelp/hlpfile.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 92cc565..53f1a10 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1498,8 +1498,16 @@ static BYTE *HLPFILE_UncompressLZ77(BYTE int code = GET_USHORT(ptr, 0); int len = 3 + (code >> 12); int offset = code & 0xfff; - memcpy(newptr, newptr - offset - 1, len); - newptr += len; + /* + * We must copy byte-by-byte here. We cannot use memcpy nor + * memmove here. Just example: + * a[]={1,2,3,4,5,6,7,8,9,10} + * newptr=a+2; + * offset=1; + * We expect: + * {1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 11, 12} + */ + for (; len>0; len--, newptr++) *newptr = *(newptr-offset-1); ptr += 2; } else *newptr++ = *ptr++;

1 0

Andrew Talbot : msi/tests: Write-strings warnings fix.
by Alexandre Julliard 11 Aug '06

11 Aug '06

Module: wine Branch: master Commit: 4aaf1f0b9ea88f88961ab2df72c0b8d634d085e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4aaf1f0b9ea88f88961ab2d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Aug 11 16:29:02 2006 +0100 msi/tests: Write-strings warnings fix. --- dlls/msi/tests/install.c | 8 +++++--- dlls/msi/tests/package.c | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6ed3a4b..33f34b3 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -316,7 +316,7 @@ static int fci_delete(char *pszFile, int return 0; } -static BOOL check_record(MSIHANDLE rec, UINT field, LPSTR val) +static BOOL check_record(MSIHANDLE rec, UINT field, LPCSTR val) { CHAR buffer[0x20]; UINT r; @@ -403,6 +403,8 @@ static void create_cab_file(const CHAR * CCAB cabParams; HFCI hfci; ERF erf; + static CHAR four_txt[] = "four.txt", + five_txt[] = "five.txt"; BOOL res; set_cab_parameters(&cabParams, name); @@ -413,8 +415,8 @@ static void create_cab_file(const CHAR * ok(hfci != NULL, "Failed to create an FCI context\n"); - add_file(hfci, "four.txt"); - add_file(hfci, "five.txt"); + add_file(hfci, four_txt); + add_file(hfci, five_txt); res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); ok(res, "Failed to flush the cabinet\n"); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 55b2e1c..29b9d3f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1765,6 +1765,7 @@ static void test_getproperty(void) { MSIHANDLE hPackage = 0; char prop[100]; + static CHAR empty[] = ""; DWORD size; UINT r; @@ -1783,7 +1784,7 @@ static void test_getproperty(void) /* retrieve the size, empty string */ size = 0; - r = MsiGetProperty(hPackage, "Name", "", &size); + r = MsiGetProperty(hPackage, "Name", empty, &size); ok( r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok( size == 5, "Expected 5, got %ld\n", size);

1 0