wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Hans Leidekker : msi/tests: Properly clean up test services.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 6f463db5b0d477e4a76038a8158292680c3a553b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f463db5b0d477e4a76038a81… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:05 2016 +0100 msi/tests: Properly clean up test services. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index c281d3b..d51a3d5 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5427,28 +5427,23 @@ static void test_start_stop_services(void) DeleteFileA(msifile); } -static void delete_TestService(void) +static void delete_test_service(const char *name) { BOOL ret; SC_HANDLE manager, service; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); ok(manager != NULL, "can't open service manager\n"); - if (!manager) - return; - - service = OpenServiceA(manager, "TestService", GENERIC_ALL); - ok(service != NULL, "TestService doesn't exist\n"); + if (!manager) return; + service = OpenServiceA(manager, name, GENERIC_ALL); if (service) { ret = DeleteService( service ); ok( ret, "failed to delete service %u\n", GetLastError() ); - CloseServiceHandle(service); } CloseServiceHandle(manager); - } static void test_delete_services(void) @@ -5473,7 +5468,7 @@ static void test_delete_services(void) ok(service != NULL, "can't create service %u\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); - if (!service) goto error; + if (!service) return; create_test_files(); create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table)); @@ -5516,7 +5511,9 @@ static void test_delete_services(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: - delete_TestService(); + delete_test_service("TestService"); + delete_test_service("TestService2"); + delete_test_service("TestService3"); delete_test_files(); DeleteFileA(msifile); } @@ -5558,7 +5555,6 @@ static void test_install_services(void) service = OpenServiceA(manager, "TestService4", GENERIC_ALL); ok(service == NULL, "TestService4 installed\n"); - CloseServiceHandle(manager); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\TestService", &hKey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -5576,6 +5572,11 @@ static void test_install_services(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(service != NULL, "TestService deleted\n"); + CloseServiceHandle(service); + CloseServiceHandle(manager); + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); @@ -5591,7 +5592,7 @@ static void test_install_services(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: - delete_TestService(); + delete_test_service("TestService"); delete_test_files(); DeleteFileA(msifile); }

1 0

Hans Leidekker : msi: Handle descriptors without component in MsiProvideQualifiedComponentEx.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: dea323dcecc2de2e66df04b48eaf3858fdddb426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea323dcecc2de2e66df04b48… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:04 2016 +0100 msi: Handle descriptors without component in MsiProvideQualifiedComponentEx. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 79 +++++++++++++++++++++-------- dlls/msi/tests/msi.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dea323dcecc2de2e66df0…

1 0

Hans Leidekker : msi/tests: Fix some test failures on Windows 10.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: f6c4f87d32cce6271c2ebf7e1474f40ed562980f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c4f87d32cce6271c2ebf7e1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:03 2016 +0100 msi/tests: Fix some test failures on Windows 10. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index feeb1ff..49d8f28 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -559,6 +559,18 @@ static const char property_dat[] = "UpgradeCode\t{9574448F-9B86-4E07-B6F6-8D199DA12127}\n" "MSIFASTINSTALL\t1\n"; +static const char ci2_property_dat[] = + "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "INSTALLLEVEL\t3\n" + "Manufacturer\tWine\n" + "ProductCode\t{FF4AFE9C-6AC2-44F9-A060-9EA6BD16C75E}\n" + "ProductName\tMSITEST2\n" + "ProductVersion\t1.1.1\n" + "UpgradeCode\t{6B60C3CA-B8CA-4FB7-A395-092D98FF5D2A}\n" + "MSIFASTINSTALL\t1\n"; + static const char mcp_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" @@ -830,22 +842,26 @@ static const char ci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" "CostInitialize\t\t800\n" "FileCost\t\t900\n" - "InstallFiles\t\t4000\n" - "InstallServices\t\t5000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "RunInstall\t\t1600\n" + "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100"; + "InstallInitialize\t\t1500\n" + "RunInstall\tnot Installed\t1550\n" + "ProcessComponents\t\t1600\n" + "UnpublishFeatures\t\t1800\n" + "RemoveFiles\t\t3500\n" + "InstallFiles\t\t4000\n" + "RegisterProduct\t\t6100\n" + "PublishFeatures\t\t6300\n" + "PublishProduct\t\t6400\n" + "InstallFinalize\t\t6600\n"; static const char ci_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" "s72\ti2\tS64\tS0\tS255\n" "CustomAction\tAction\n" - "RunInstall\t87\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; + "RunInstall\t23\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; static const char ci_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" @@ -1011,7 +1027,7 @@ static const msi_table ci2_tables[] = ADD_TABLE(ci2_file), ADD_TABLE(install_exec_seq), ADD_TABLE(lus0_media), - ADD_TABLE(property), + ADD_TABLE(ci2_property), }; static const msi_table cl_tables[] = @@ -14183,22 +14199,23 @@ static void test_concurrentinstall(void) if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); - DeleteFileA(path); goto error; } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (!delete_pf("msitest\\augustus", TRUE)) - trace("concurrent installs not supported\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); r = MsiConfigureProductA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(r == ERROR_SUCCESS, "got %u\n", r); - DeleteFileA(path); + r = MsiConfigureProductA("{FF4AFE9C-6AC2-44F9-A060-9EA6BD16C75E}", INSTALLLEVEL_DEFAULT, + INSTALLSTATE_ABSENT); + ok(r == ERROR_SUCCESS, "got %u\n", r); error: + DeleteFileA(path); DeleteFileA(msifile); DeleteFileA("msitest\\msitest\\augustus"); DeleteFileA("msitest\\maximus");

1 0

Huw Davies : dssenh/tests: Use a non-crippled algorithm in the key exchange tests.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 07115ab98fef3d2256fc004459072408c36945b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07115ab98fef3d2256fc00445… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 4 11:20:10 2016 +0000 dssenh/tests: Use a non-crippled algorithm in the key exchange tests. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index a054003..f07b0d3 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1317,11 +1317,11 @@ static void test_keyExchange_dssDH(HCRYPTPROV hProv, const struct keyExchange_te ok(result, "Failed to import key for user 2, got %x\n", GetLastError()); /* Set the shared key parameters to matching cipher type */ - algid = CALG_RC4; + algid = CALG_3DES; result = CryptSetKeyParam(sessionKey1, KP_ALGID, (BYTE *)&algid, 0); ok(result, "Failed to set session key for user 1, got %x\n", GetLastError()); - algid = CALG_RC4; + algid = CALG_3DES; result = CryptSetKeyParam(sessionKey2, KP_ALGID, (BYTE *)&algid, 0); ok(result, "Failed to set session key for user 2, got %x\n", GetLastError());

1 0

Huw Davies : dssenh/tests: RC4 has been crippled in recent Windows versions.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 25b744b0afc411a7e31a50dacd9e08338894db76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b744b0afc411a7e31a50dac… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 4 11:20:09 2016 +0000 dssenh/tests: RC4 has been crippled in recent Windows versions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index df5a1d1..a054003 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -639,7 +639,8 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) ok(result, "Expected data decryption.\n"); /* Verify we have received expected decrypted data */ - ok(!memcmp(pbData, tests[i].decrypted, dataLen), "Incorrect decrypted data.\n"); + ok(!memcmp(pbData, tests[i].decrypted, dataLen) || + broken(tests[i].algid == CALG_RC4), "Incorrect decrypted data.\n"); result = CryptDestroyKey(pKey); ok(result, "Expected no DestroyKey errors.\n");

1 0

Huw Davies : dssenh/tests: The default container may already exist.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 43204a0d926093cd22e395bd3cebfc21cc540a22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43204a0d926093cd22e395bd3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 4 11:20:08 2016 +0000 dssenh/tests: The default container may already exist. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index feb9a30..df5a1d1 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -86,10 +86,13 @@ static void test_acquire_context(void) result = CryptAcquireContextA( &hProv, NULL, MS_DEF_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_NEWKEYSET); - ok(result, "Expected no errors.\n"); + ok(result || GetLastError() == NTE_EXISTS, "Expected no errors or NTE_EXISTS\n"); - result = CryptReleaseContext(hProv, 0); - ok(result, "Expected release of the provider.\n"); + if (result) + { + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + } result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); ok(result, "Expected no errors.\n");

1 0

Huw Davies : rpcrt4/tests: Register the proxies to fix a crash on Windows 8 and 10.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: eb3ceac1ddc07feaf8f38427f93f82a4356f8760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3ceac1ddc07feaf8f38427f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 3 17:49:22 2016 +0000 rpcrt4/tests: Register the proxies to fix a crash on Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 7c71d60..606107f 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -627,6 +627,19 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) ok(r == S_OK, "ret %08x\n", r); ok(ppsf != NULL, "ppsf == NULL\n"); + /* Because this PS factory is not loaded as a dll in the normal way, Windows 8 / 10 + get confused and will crash when one of the proxies for the delegated ifaces is created. + Registering the ifaces fixes this (in fact calling CoRegisterPSClsid() with any IID / CLSID is enough). */ + + r = CoRegisterPSClsid(&IID_if1, &CLSID_psfact); + ok(r == S_OK, "ret %08x\n", r); + r = CoRegisterPSClsid(&IID_if2, &CLSID_psfact); + ok(r == S_OK, "ret %08x\n", r); + r = CoRegisterPSClsid(&IID_if3, &CLSID_psfact); + ok(r == S_OK, "ret %08x\n", r); + r = CoRegisterPSClsid(&IID_if4, &CLSID_psfact); + ok(r == S_OK, "ret %08x\n", r); + return ppsf; }

1 0

Huw Davies : rpcrt4/tests: Extend the tests for NdrDllGetClassObject().
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: f4d598ae0844c3a8f6fdc532080e9c014135c4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d598ae0844c3a8f6fdc5320… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 3 17:49:21 2016 +0000 rpcrt4/tests: Extend the tests for NdrDllGetClassObject(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index d098d60..7c71d60 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -44,6 +44,7 @@ static GUID IID_if1 = {0x12345678, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if2 = {0x12345679, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if3 = {0x1234567a, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if4 = {0x1234567b, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; +static CLSID CLSID_psfact = {0x1234567c, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static int my_alloc_called; static int my_free_called; @@ -458,7 +459,6 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) IPSFactoryBuffer *ppsf = NULL; const PCInterfaceProxyVtblList* proxy_vtbl; const PCInterfaceStubVtblList* stub_vtbl; - const CLSID PSDispatch = {0x20420, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46}}; const CLSID CLSID_Unknown = {0x45678, 0x1234, 0x6666, {0xff, 0x67, 0x45, 0x98, 0x76, 0x12, 0x34, 0x56}}; static const GUID * const interfaces[] = { &IID_if1, &IID_if2, &IID_if3, &IID_if4 }; UINT i; @@ -475,13 +475,13 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) void *CStd_DebugServerQueryInterface = GetProcAddress(hmod, "CStdStubBuffer_DebugServerQueryInterface"); void *CStd_DebugServerRelease = GetProcAddress(hmod, "CStdStubBuffer_DebugServerRelease"); - r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, - &CLSID_Unknown, &PSFactoryBuffer); + r = NdrDllGetClassObject(&CLSID_Unknown, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); ok(r == CLASS_E_CLASSNOTAVAILABLE, "NdrDllGetClassObject with unknown clsid should have returned CLASS_E_CLASSNOTAVAILABLE instead of 0x%x\n", r); ok(ppsf == NULL, "NdrDllGetClassObject should have set ppsf to NULL on failure\n"); - r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, - &PSDispatch, &PSFactoryBuffer); + r = NdrDllGetClassObject(&CLSID_psfact, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); ok(r == S_OK, "ret %08x\n", r); ok(ppsf != NULL, "ppsf == NULL\n"); @@ -603,10 +603,29 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) ok(PSFactoryBuffer.RefCount == 1, "ref count %d\n", PSFactoryBuffer.RefCount); IPSFactoryBuffer_Release(ppsf); + /* One can also search by IID */ + r = NdrDllGetClassObject(&IID_if3, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); + ok(r == S_OK, "ret %08x\n", r); + ok(ppsf != NULL, "ppsf == NULL\n"); + IPSFactoryBuffer_Release(ppsf); + r = NdrDllGetClassObject(&IID_if3, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, NULL, &PSFactoryBuffer); ok(r == S_OK, "ret %08x\n", r); ok(ppsf != NULL, "ppsf == NULL\n"); + IPSFactoryBuffer_Release(ppsf); + + /* but only if the PS factory implements it */ + r = NdrDllGetClassObject(&IID_IDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); + ok(r == CLASS_E_CLASSNOTAVAILABLE, "ret %08x\n", r); + + /* Create it again to return */ + r = NdrDllGetClassObject(&CLSID_psfact, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); + ok(r == S_OK, "ret %08x\n", r); + ok(ppsf != NULL, "ppsf == NULL\n"); return ppsf; }

1 0

Alexandre Julliard : rpcrt4: Include ntstatus.h before headers that may need it.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 38b57b30fe2b0a0c7d5eb0e0f2222b1dec824167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b57b30fe2b0a0c7d5eb0e0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 18:06:22 2016 +0100 rpcrt4: Include ntstatus.h before headers that may need it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 67a0220..2537a3f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -33,6 +33,9 @@ #include <stdlib.h> #include <sys/types.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS + #if defined(__MINGW32__) || defined (_MSC_VER) # include <ws2tcpip.h> # ifndef EADDRINUSE @@ -77,8 +80,6 @@ # define ioctlsocket ioctl #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ -#include "ntstatus.h" -#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winnls.h"

1 0

Donat Enikeev : secur32: AddSecurityPackage stub.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: ede761b166e3ea56418ff3c1f3565f35ea9481b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede761b166e3ea56418ff3c1f… Author: Donat Enikeev <donat(a)enikeev.net> Date: Tue Nov 1 13:21:52 2016 +0300 secur32: AddSecurityPackage stub. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 12 ++++++++++++ dlls/secur32/secur32.spec | 4 ++-- include/sspi.h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 5035ec36..c7e353f 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1057,6 +1057,18 @@ BOOLEAN WINAPI GetComputerObjectNameW( return status; } +SECURITY_STATUS WINAPI AddSecurityPackageA(LPSTR name, SECURITY_PACKAGE_OPTIONS *options) +{ + FIXME("(%s %p)\n", debugstr_a(name), options); + return E_NOTIMPL; +} + +SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR name, SECURITY_PACKAGE_OPTIONS *options) +{ + FIXME("(%s %p)\n", debugstr_w(name), options); + return E_NOTIMPL; +} + /*********************************************************************** * GetUserNameExA (SECUR32.@) */ diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index 623ffe5..8135958 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -6,8 +6,8 @@ @ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) @ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) @ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) -@ stub AddSecurityPackageA -@ stub AddSecurityPackageW +@ stdcall AddSecurityPackageA(str ptr) +@ stdcall AddSecurityPackageW(wstr ptr) @ stdcall ApplyControlToken(ptr ptr) @ stdcall CompleteAuthToken(ptr ptr) @ stdcall DecryptMessage(ptr ptr long ptr) diff --git a/include/sspi.h b/include/sspi.h index 501406f..9e44a6d 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -130,6 +130,18 @@ typedef struct _SecPkgInfoW SEC_WCHAR *Comment; } SecPkgInfoW, *PSecPkgInfoW; +typedef struct _SECURITY_PACKAGE_OPTIONS { + ULONG Size; + ULONG Type; + ULONG Flags; + ULONG SignatureSize; + void *Signature; +} SECURITY_PACKAGE_OPTIONS, *PSECURITY_PACKAGE_OPTIONS; + +SECURITY_STATUS WINAPI AddSecurityPackageA(LPSTR,SECURITY_PACKAGE_OPTIONS*); +SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR,SECURITY_PACKAGE_OPTIONS*); +#define AddSecurityPackage WINELIB_NAME_AW(AddSecurityPackage) + #define SecPkgInfo WINELIB_NAME_AW(SecPkgInfo) #define PSecPkgInfo WINELIB_NAME_AW(PSecPkgInfo)

1 0

← Newer
1
...
40
41
42
43
44
45
46
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2016