November 2016 - Wine-Commits

Huw Davies : dssenh/tests: The default container may already exist.
by Alexandre Julliard Nov. 4, 2016

Nov. 4, 2016

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

Hans Leidekker : msi/tests: Properly clean up test services.
by Alexandre Julliard Nov. 4, 2016

Nov. 4, 2016

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

Huw Davies : dssenh/tests: Use a non-crippled algorithm in the key exchange tests.
by Alexandre Julliard Nov. 4, 2016

Nov. 4, 2016

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

Hans Leidekker : msi: Also roll back changes made in PublishProduct.
by Alexandre Julliard Nov. 4, 2016

Nov. 4, 2016

Module: wine Branch: master Commit: d4814f98c81c42257cc47bd6f579b8cc7278aacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4814f98c81c42257cc47bd6f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:10 2016 +0100 msi: Also roll back changes made in PublishProduct. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 57 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 34d1a25..751462b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -145,6 +145,8 @@ static const WCHAR szUnpublishComponents[] = {'U','n','p','u','b','l','i','s','h', 'C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szUnpublishFeatures[] = {'U','n','p','u','b','l','i','s','h','F','e','a','t','u','r','e','s',0}; +static const WCHAR szUnpublishProduct[] = + {'U','n','p','u','b','l','i','s','h','P','r','o','d','u','c','t',0}; static const WCHAR szUnregisterComPlus[] = {'U','n','r','e','g','i','s','t','e','r','C','o','m','P','l','u','s',0}; static const WCHAR szUnregisterTypeLibraries[] = @@ -5283,28 +5285,10 @@ static UINT msi_unpublish_icons( MSIPACKAGE *package ) return ERROR_SUCCESS; } -static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) +static UINT ACTION_UnpublishProduct(MSIPACKAGE *package) { - static const WCHAR szUpgradeCode[] = {'U','p','g','r','a','d','e','C','o','d','e',0}; - WCHAR *upgrade, **features; - BOOL full_uninstall = TRUE; - MSIFEATURE *feature; + WCHAR *upgrade; MSIPATCHINFO *patch; - UINT i; - - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - if (feature->Action == INSTALLSTATE_LOCAL) full_uninstall = FALSE; - } - features = msi_split_string( remove, ',' ); - for (i = 0; features && features[i]; i++) - { - if (!strcmpW( features[i], szAll )) full_uninstall = TRUE; - } - msi_free(features); - - if (!full_uninstall) - return ERROR_SUCCESS; MSIREG_DeleteProductKey(package->ProductCode); MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); @@ -5340,10 +5324,32 @@ static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) return ERROR_SUCCESS; } +static BOOL is_full_uninstall( MSIPACKAGE *package ) +{ + WCHAR **features, *remove = msi_dup_property( package->db, szRemove ); + MSIFEATURE *feature; + BOOL ret = TRUE; + UINT i; + + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + if (feature->Action == INSTALLSTATE_LOCAL) ret = FALSE; + } + + features = msi_split_string( remove, ',' ); + for (i = 0; features && features[i]; i++) + { + if (!strcmpW( features[i], szAll )) ret = TRUE; + } + + msi_free(features); + msi_free(remove); + return ret; +} + static UINT ACTION_InstallFinalize(MSIPACKAGE *package) { UINT rc; - WCHAR *remove; /* first do the same as an InstallExecute */ rc = execute_script(package, SCRIPT_INSTALL); @@ -5355,9 +5361,9 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) return rc; - remove = msi_dup_property(package->db, szRemove); - rc = msi_unpublish_product(package, remove); - msi_free(remove); + if (is_full_uninstall(package)) + rc = ACTION_UnpublishProduct(package); + return rc; } @@ -7673,7 +7679,7 @@ StandardActions[] = { szProcessComponents, ACTION_ProcessComponents, szProcessComponents }, { szPublishComponents, ACTION_PublishComponents, szUnpublishComponents }, { szPublishFeatures, ACTION_PublishFeatures, szUnpublishFeatures }, - { szPublishProduct, ACTION_PublishProduct, NULL }, + { szPublishProduct, ACTION_PublishProduct, szUnpublishProduct }, { szRegisterClassInfo, ACTION_RegisterClassInfo, szUnregisterClassInfo }, { szRegisterComPlus, ACTION_RegisterComPlus, szUnregisterComPlus }, { szRegisterExtensionInfo, ACTION_RegisterExtensionInfo, szUnregisterExtensionInfo }, @@ -7702,6 +7708,7 @@ StandardActions[] = { szStopServices, ACTION_StopServices, szStartServices }, { szUnpublishComponents, ACTION_UnpublishComponents, szPublishComponents }, { szUnpublishFeatures, ACTION_UnpublishFeatures, szPublishFeatures }, + { szUnpublishProduct, ACTION_UnpublishProduct, NULL }, /* for rollback only */ { szUnregisterClassInfo, ACTION_UnregisterClassInfo, szRegisterClassInfo }, { szUnregisterComPlus, ACTION_UnregisterComPlus, szRegisterComPlus }, { szUnregisterExtensionInfo, ACTION_UnregisterExtensionInfo, szRegisterExtensionInfo },

1 0

Hans Leidekker : msi: Handle descriptors without component in MsiProvideQualifiedComponentEx.
by Alexandre Julliard Nov. 4, 2016

Nov. 4, 2016

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

Huw Davies : dssenh/tests: RC4 has been crippled in recent Windows versions.
by Alexandre Julliard Nov. 4, 2016

Nov. 4, 2016

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 : rpcrt4/tests: Register the proxies to fix a crash on Windows 8 and 10.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

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

Józef Kucia : d3d8/tests: Port test_check_device_format() from d3d9.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: 606cd128aec41a3fabafffd14db512f16cfe2c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=606cd128aec41a3fabafffd14… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:10 2016 +0100 d3d8/tests: Port test_check_device_format() from d3d9. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 95567ca..a912592 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7903,6 +7903,37 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } +static void test_check_device_format(void) +{ + IDirect3D8 *d3d; + HRESULT hr; + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3D8_Release(d3d); +} + static void test_miptree_layout(void) { unsigned int pool_idx, format_idx, base_dimension, level_count, offset, i, j; @@ -8152,6 +8183,7 @@ START_TEST(device) test_lost_device(); test_resource_priority(); test_swapchain_parameters(); + test_check_device_format(); test_miptree_layout(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL));

1 0

Alistair Leslie-Hughes : dpnet: Initialize winsock.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: db003d4a0860516219efe5bcb6624de2c97f8e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db003d4a0860516219efe5bcb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 2 09:13:49 2016 +0000 dpnet: Initialize winsock. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/Makefile.in | 2 +- dlls/dpnet/client.c | 4 ++++ dlls/dpnet/dpnet_main.c | 43 +++++++++++++++++++++++++++++++++++++------ dlls/dpnet/dpnet_private.h | 2 ++ dlls/dpnet/lobbiedapp.c | 2 ++ dlls/dpnet/peer.c | 2 ++ dlls/dpnet/server.c | 2 ++ 7 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 880b7bd..541e104 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = dpnet.dll IMPORTLIB = dpnet -IMPORTS = dxguid uuid ole32 advapi32 +IMPORTS = dxguid uuid ole32 advapi32 ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index de338d8..9692e38 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -115,6 +115,8 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(IDirectPlay8Client *ifac This->msghandler = pfn; This->flags = dwFlags; + init_winsock(); + return DPN_OK; } @@ -443,6 +445,8 @@ static HRESULT WINAPI lobbyclient_Initialize(IDirectPlay8LobbyClient *iface, voi This->msghandler = msghandler; This->flags = flags; + init_winsock(); + return DPN_OK; } diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 042b95a..cc80ebc 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -40,15 +40,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); static HINSTANCE instance; +static BOOL winsock_loaded = FALSE; + +static BOOL WINAPI winsock_startup(INIT_ONCE *once, void *param, void **context) +{ + WSADATA wsa_data; + DWORD res; + + res = WSAStartup(MAKEWORD(1,1), &wsa_data); + if(res == ERROR_SUCCESS) + winsock_loaded = TRUE; + else + ERR("WSAStartup failed: %u\n", res); + return TRUE; +} + +void init_winsock(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, winsock_startup, NULL, NULL); +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved); - if (fdwReason == DLL_PROCESS_ATTACH) { - instance = hInstDLL; - DisableThreadLibraryCalls(hInstDLL); - } - return TRUE; + TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + instance = hInstDLL; + DisableThreadLibraryCalls(hInstDLL); + break; + + case DLL_PROCESS_DETACH: + if (lpvReserved) break; + if(winsock_loaded) + WSACleanup(); + break; + } + return TRUE; } /*********************************************************************** diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index dc6a4f1..89e0777 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -26,6 +26,7 @@ #endif #include <wine/list.h> +#include "winsock2.h" #include "wine/unicode.h" #include "dplay8.h" @@ -135,6 +136,7 @@ extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN extern HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) DECLSPEC_HIDDEN; +extern void init_winsock(void) DECLSPEC_HIDDEN; /* used for generic dumping (copied from ddraw) */ typedef struct { diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index 507a895..8ec9ad1 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -101,6 +101,8 @@ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Initialize(IDirectPlay8 This->usercontext = pvUserContext; This->connection = pdpnhConnection; + init_winsock(); + return DPN_OK; } diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 4862e67..fe62d59 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -122,6 +122,8 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, This->msghandler = pfn; This->flags = dwFlags; + init_winsock(); + return DPN_OK; } diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index cd54ba4..d91822e 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -118,6 +118,8 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_Initialize(IDirectPlay8Server *ifac This->msghandler = pfn; This->flags = dwFlags; + init_winsock(); + return DPN_OK; }

1 0

Józef Kucia : d3d9/tests: Add test for evicting bound resources.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: 5b0cd6fa3e67f9799829bd5769f078351b00dd27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0cd6fa3e67f9799829bd576… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:12 2016 +0100 d3d9/tests: Add test for evicting bound resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 20e3eb9..e25e85c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -21931,6 +21931,143 @@ done: DestroyWindow(window); } +static void test_evict_bound_resources(void) +{ + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + D3DCOLOR color; + HWND window; + void *data; + HRESULT hr; + + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + }; + static const unsigned short indices[] = {0, 1, 2, 3, 2, 1}; + + window = create_window(); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib, NULL); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(green_quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), (void **)&data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, green_quad, sizeof(green_quad)); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), (void **)&data, 0); + ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Failed to unlock index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 4 * sizeof(DWORD)); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_EvictManagedResources(device); + ok(hr == D3D_OK, "Failed to evict managed resources, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + IDirect3DIndexBuffer9_Release(ib); + IDirect3DVertexBuffer9_Release(vb); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -22056,4 +22193,5 @@ START_TEST(visual) test_color_clamping(); test_line_antialiasing_blending(); test_dsy(); + test_evict_bound_resources(); }

1 0