June 2012 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Return true in IOmNavigator::javaEnabled.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: d0012f8fc6c8f708f8ab07ec64828973083f5344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0012f8fc6c8f708f8ab07ec6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 18 17:52:01 2012 +0200 mshtml: Return true in IOmNavigator::javaEnabled. --- dlls/mshtml/omnavigator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index ff64a63..73bb0bb 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -689,7 +689,7 @@ static HRESULT WINAPI OmNavigator_javaEnabled(IOmNavigator *iface, VARIANT_BOOL FIXME("(%p)->(%p) semi-stub\n", This, enabled); - *enabled = VARIANT_FALSE; + *enabled = VARIANT_TRUE; return S_OK; }

1 0

Jacek Caban : wininet: Added support for more certificate error types.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: e2a9511b30e5b68eb328c08ffecf56dcc91bce0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a9511b30e5b68eb328c08ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 18 17:42:18 2012 +0200 wininet: Added support for more certificate error types. --- dlls/wininet/netconnection.c | 143 ++++++++++++++++++++++++------------------ 1 files changed, 82 insertions(+), 61 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a705cce..c944ff3 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -245,76 +245,97 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors = chain->TrustStatus.dwErrorStatus; - if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { - WARN("error status %x\n", chain->TrustStatus.dwErrorStatus & ~supportedErrors); - if(conn->mask_errors) - WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; - errors &= supportedErrors; - } + do { + /* This seems strange, but that's what tests show */ + if(errors & (CERT_TRUST_IS_PARTIAL_CHAIN|CERT_TRUST_IS_OFFLINE_REVOCATION)) { + WARN("ERROR_INTERNET_SEC_CERT_REV_FAILED\n"); + err = ERROR_INTERNET_SEC_CERT_REV_FAILED; + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) + break; + } - if(errors & CERT_TRUST_IS_NOT_TIME_VALID) { - WARN("CERT_TRUST_IS_NOT_TIME_VALID\n"); - if(conn->mask_errors) - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_DATE; - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_DATE_INVALID; - errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; - } + if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { + WARN("error status %x\n", chain->TrustStatus.dwErrorStatus & ~supportedErrors); + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; + errors &= supportedErrors; + if(!conn->mask_errors) + break; + WARN("unknown error flags\n"); + } - if(errors & CERT_TRUST_IS_UNTRUSTED_ROOT) { - WARN("CERT_TRUST_IS_UNTRUSTED_ROOT\n"); - if(conn->mask_errors) - WARN("CERT_TRUST_IS_UNTRUSTED_ROOT, unknown flags\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; - errors &= ~CERT_TRUST_IS_UNTRUSTED_ROOT; - } + if(errors & CERT_TRUST_IS_NOT_TIME_VALID) { + WARN("CERT_TRUST_IS_NOT_TIME_VALID\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_DATE_INVALID; + if(!conn->mask_errors) + break; + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_DATE; + } + errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; + } - /* This seems strange, but that's what tests show */ - if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { - WARN("CERT_TRUST_IS_PARTIAL_CHAIN\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) { - if(!(conn->security_flags & _SECURITY_FLAG_CERT_REV_FAILED)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REV_FAILED; - else - err = conn->mask_errors ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + if(errors & CERT_TRUST_IS_UNTRUSTED_ROOT) { + WARN("CERT_TRUST_IS_UNTRUSTED_ROOT\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + if(!conn->mask_errors) + break; + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + } + errors &= ~CERT_TRUST_IS_UNTRUSTED_ROOT; } - if(conn->mask_errors) { - if(!(conn->security_flags & _SECURITY_FLAG_CERT_REV_FAILED)) - conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; - else + + if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { + WARN("CERT_TRUST_IS_PARTIAL_CHAIN\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + if(!conn->mask_errors) + break; conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + } + errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; } - errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; - } - if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { - WARN("CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN\n"); - if(conn->mask_errors) - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_NO_REV; - errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); - } + if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { + WARN("CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_NO_REV; + if(!conn->mask_errors) + break; + conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; + } + errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); + } - if(errors & CERT_TRUST_IS_REVOKED) { - WARN("CERT_TRUST_IS_REVOKED\n"); - if(conn->mask_errors) - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REVOKED; - errors &= ~CERT_TRUST_IS_REVOKED; - } + if(errors & CERT_TRUST_IS_REVOKED) { + WARN("CERT_TRUST_IS_REVOKED\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REVOKED; + if(!conn->mask_errors) + break; + WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); + } + errors &= ~CERT_TRUST_IS_REVOKED; + } - if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { - WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); - if(conn->mask_errors) - WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; - errors &= ~CERT_TRUST_IS_NOT_VALID_FOR_USAGE; - } + if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { + WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; + if(!conn->mask_errors) + break; + WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); + } + errors &= ~CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + } + + if(err == ERROR_INTERNET_SEC_CERT_REV_FAILED) { + assert(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION); + err = ERROR_SUCCESS; + } + }while(0); if(!err || conn->mask_errors) { CERT_CHAIN_POLICY_PARA policyPara;

1 0

Henri Verbeet : wined3d: Rename WINED3DLOCK_* to WINED3D_MAP_*.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: a6ffab3bf57b36cd67434feff646f12ccfac5bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ffab3bf57b36cd67434feff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 18 17:19:42 2012 +0200 wined3d: Rename WINED3DLOCK_* to WINED3D_MAP_*. --- dlls/ddraw/vertexbuffer.c | 8 +++--- dlls/wined3d/buffer.c | 56 +++++++++++++++++++++++++-------------------- dlls/wined3d/device.c | 11 ++++----- dlls/wined3d/surface.c | 14 +++++------ dlls/wined3d/volume.c | 2 +- include/wine/wined3d.h | 12 +++++----- 6 files changed, 53 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6ffab3bf57b36cd67434…

1 0

Henri Verbeet : d3d8/tests: Add a test for resource bindings after reset.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 60ff5906ae44ca0e7606596de07f06bf4673fda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ff5906ae44ca0e7606596de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 18 17:19:41 2012 +0200 d3d8/tests: Add a test for resource bindings after reset. --- dlls/d3d8/tests/device.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a34ba47..ddb72c6 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3163,6 +3163,70 @@ done: if (hwnd) DestroyWindow(hwnd); } +static void test_reset_resources(void) +{ + IDirect3DSurface8 *surface, *rt; + IDirect3DTexture8 *texture; + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_DEPTHSTENCIL, + D3DFMT_D24S8, D3DPOOL_DEFAULT, &texture); + ok(SUCCEEDED(hr), "Failed to create depth/stencil texture, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + IDirect3DTexture8_Release(texture); + + hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture); + ok(SUCCEEDED(hr), "Failed to create render target texture, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &rt); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + IDirect3DTexture8_Release(texture); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, surface); + ok(SUCCEEDED(hr), "Failed to set render target surface, hr %#x.\n", hr); + IDirect3DSurface8_Release(rt); + IDirect3DSurface8_Release(surface); + + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device.\n"); + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &rt); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderTarget(device, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + ok(surface == rt, "Got unexpected surface %p for render target.\n", surface); + IDirect3DSurface8_Release(surface); + IDirect3DSurface8_Release(rt); + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -3217,6 +3281,7 @@ START_TEST(device) test_wrong_shader(); test_mode_change(); test_device_window_reset(); + test_reset_resources(); depth_blit_test(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL));

1 0

Henri Verbeet : wined3d: Unset the depth/ stencil surface before checking resources in wined3d_device_reset().
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 130f232d2049cab5fcdf2c773a7255ff94cc6d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130f232d2049cab5fcdf2c773… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 18 17:19:38 2012 +0200 wined3d: Unset the depth/stencil surface before checking resources in wined3d_device_reset(). --- dlls/wined3d/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index be22421..c934ced 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5254,6 +5254,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); stateblock_unbind_resources(device->stateBlock); + wined3d_device_set_depth_stencil(device, NULL); if (device->onscreen_depth_stencil) { @@ -5362,8 +5363,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, /* Reset the depth stencil */ if (swapchain_desc->enable_auto_depth_stencil) wined3d_device_set_depth_stencil(device, device->auto_depth_stencil); - else - wined3d_device_set_depth_stencil(device, NULL); TRACE("Resetting stateblock\n"); wined3d_stateblock_decref(device->updateStateBlock);

1 0

Piotr Caban : msvcp90: Added codecvt<wchar> implementation.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: a03dfefbc1d3959a9f270126b4fb585d125b79d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03dfefbc1d3959a9f270126b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 18 17:00:24 2012 +0200 msvcp90: Added codecvt<wchar> implementation. --- dlls/msvcp90/locale.c | 197 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 160 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a03dfefbc1d3959a9f270…

1 0

Piotr Caban : msvcp90: Added codecvt<wchar> class stub.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: f387c63319bcbc9f4e0d62528b80776891e837fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f387c63319bcbc9f4e0d62528… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 18 16:59:56 2012 +0200 msvcp90: Added codecvt<wchar> class stub. --- dlls/msvcp90/locale.c | 310 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 23 ++- dlls/msvcp90/msvcp90.spec | 148 +++++++++++----------- 3 files changed, 399 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f387c63319bcbc9f4e0d6…

1 0

Francois Gouget : kernel32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: dc2956206fc030c6cae13546a6f3621a43093ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2956206fc030c6cae13546a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 18 11:38:38 2012 +0200 kernel32/tests: Add a trailing '\n' to an ok() call. --- dlls/kernel32/tests/pipe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 1a33e10..bd196fe 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -872,7 +872,7 @@ static DWORD CALLBACK serverThreadMain5(LPVOID arg) } ok(completion_called == 1, "completion routine called %i times\n", completion_called); ok(completion_errorcode == ERROR_SUCCESS, "completion routine got error %d\n", completion_errorcode); - ok(completion_num_bytes != 0, "read 0 bytes"); + ok(completion_num_bytes != 0, "read 0 bytes\n"); ok(completion_lpoverlapped == &oOverlap, "got wrong overlapped pointer %p\n", completion_lpoverlapped); readden = completion_num_bytes; trace("Server done reading.\n");

1 0

Hans Leidekker : wbemprox: Add tests for IWbemServices.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: bde60cb95193a8309e0d839b9e99517f957ee073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde60cb95193a8309e0d839b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 14:00:58 2012 +0200 wbemprox: Add tests for IWbemServices. --- dlls/wbemprox/tests/Makefile.in | 3 +- dlls/wbemprox/tests/services.c | 92 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/tests/Makefile.in b/dlls/wbemprox/tests/Makefile.in index f88fa58..fdff192 100644 --- a/dlls/wbemprox/tests/Makefile.in +++ b/dlls/wbemprox/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = wbemprox.dll IMPORTS = uuid oleaut32 ole32 C_SRCS = \ - query.c + query.c \ + services.c @MAKE_TEST_RULES@ diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c new file mode 100644 index 0000000..64be978 --- /dev/null +++ b/dlls/wbemprox/tests/services.c @@ -0,0 +1,92 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> +#include "windows.h" +#include "objidl.h" +#include "wbemcli.h" +#include "wine/test.h" + +static void test_IClientSecurity(void) +{ + static const WCHAR rootW[] = {'R','O','O','T','\\','C','I','M','V','2',0}; + HRESULT hr; + IWbemLocator *locator; + IWbemServices *services; + IClientSecurity *security; + BSTR path = SysAllocString( rootW ); + ULONG refs; + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void **)&locator ); + if (hr != S_OK) + { + win_skip("can't create instance of WbemLocator\n"); + return; + } + ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + + refs = IWbemLocator_Release( locator ); + ok( refs == 0, "unexpected refcount %u\n", refs ); + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void **)&locator ); + ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + refs = IWbemServices_Release( services ); + ok( refs == 0, "unexpected refcount %u\n", refs ); + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + hr = IWbemServices_QueryInterface( services, &IID_IClientSecurity, (void **)&security ); + ok( hr == S_OK, "failed to query IClientSecurity interface %08x\n", hr ); + ok( (void *)services != (void *)security, "expected pointers to be different\n" ); + + refs = IClientSecurity_Release( security ); + ok( refs == 1, "unexpected refcount %u\n", refs ); + + refs = IWbemServices_Release( services ); + ok( refs == 0, "unexpected refcount %u\n", refs ); + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + hr = IWbemServices_QueryInterface( services, &IID_IClientSecurity, (void **)&security ); + ok( hr == S_OK, "failed to query IClientSecurity interface %08x\n", hr ); + ok( (void *)services != (void *)security, "expected pointers to be different\n" ); + + refs = IWbemServices_Release( services ); + todo_wine ok( refs == 1, "unexpected refcount %u\n", refs ); + + refs = IWbemServices_Release( security ); + todo_wine ok( refs == 0, "unexpected refcount %u\n", refs ); + + IWbemLocator_Release( locator ); + SysFreeString( path ); +} + +START_TEST(services) +{ + CoInitialize( NULL ); + test_IClientSecurity(); + CoUninitialize(); +}

1 0

Hans Leidekker : wbemprox: Add query tests.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 9614ddb5496a1ac94d97914c249e33b2da35053c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9614ddb5496a1ac94d97914c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 09:32:22 2012 +0200 wbemprox: Add query tests. --- configure | 1 + configure.ac | 1 + dlls/wbemprox/tests/Makefile.in | 7 ++ dlls/wbemprox/tests/query.c | 158 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 167 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4e0982f..0849b84 100755 --- a/configure +++ b/configure @@ -15524,6 +15524,7 @@ wine_fn_config_dll vwin32.vxd enable_win16 wine_fn_config_dll w32skrnl enable_win16 wine_fn_config_dll w32sys.dll16 enable_win16 wine_fn_config_dll wbemprox enable_wbemprox +wine_fn_config_test dlls/wbemprox/tests wbemprox_test wine_fn_config_dll wer enable_wer implib wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wevtapi enable_wevtapi diff --git a/configure.ac b/configure.ac index c9623ff..a9b52f9 100644 --- a/configure.ac +++ b/configure.ac @@ -2940,6 +2940,7 @@ WINE_CONFIG_DLL(vwin32.vxd,enable_win16) WINE_CONFIG_DLL(w32skrnl,enable_win16) WINE_CONFIG_DLL(w32sys.dll16,enable_win16) WINE_CONFIG_DLL(wbemprox) +WINE_CONFIG_TEST(dlls/wbemprox/tests) WINE_CONFIG_DLL(wer,,[implib]) WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wevtapi) diff --git a/dlls/wbemprox/tests/Makefile.in b/dlls/wbemprox/tests/Makefile.in new file mode 100644 index 0000000..f88fa58 --- /dev/null +++ b/dlls/wbemprox/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = wbemprox.dll +IMPORTS = uuid oleaut32 ole32 + +C_SRCS = \ + query.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c new file mode 100644 index 0000000..6916443 --- /dev/null +++ b/dlls/wbemprox/tests/query.c @@ -0,0 +1,158 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> +#include "windows.h" +#include "ocidl.h" +#include "initguid.h" +#include "objidl.h" +#include "wbemcli.h" +#include "wine/test.h" + +static const WCHAR wqlW[] = {'w','q','l',0}; + +static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemClassObject **result ) +{ + static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; + static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; + HRESULT hr; + IWbemClassObject *obj; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( str ); + LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY; + ULONG count; + + hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, result ); + if (hr == S_OK) + { + trace("%s\n", wine_dbgstr_w(str)); + for (;;) + { + VARIANT var; + + IEnumWbemClassObject_Next( *result, WBEM_INFINITE, 1, &obj, &count ); + if (!count) break; + + if (IWbemClassObject_Get( obj, captionW, 0, &var, NULL, NULL ) == WBEM_S_NO_ERROR) + { + trace("caption: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear( &var ); + } + if (IWbemClassObject_Get( obj, descriptionW, 0, &var, NULL, NULL ) == WBEM_S_NO_ERROR) + { + trace("description: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear( &var ); + } + IWbemClassObject_Release( obj ); + } + } + SysFreeString( wql ); + SysFreeString( query ); + return hr; +} + +static void test_select(void) +{ + static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; + static const WCHAR sqlW[] = {'S','Q','L',0}; + static const WCHAR query1[] = + {'S','E','L','E','C','T',' ','H','O','T','F','I','X','I','D',' ','F','R','O','M',' ', + 'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',0}; + static const WCHAR query2[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S',0}; + static const WCHAR query3[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k',' ','W','H','E','R','E',' ', + '\"','N','T','F','S','\"',' ','=',' ','F','i','l','e','S','y','s','t','e','m',0}; + static const WCHAR query4[] = + {'S','E','L','E','C','T',' ','a',' ','F','R','O','M',' ','b',0}; + static const WCHAR query5[] = + {'S','E','L','E','C','T',' ','a',' ','F','R','O','M',' ','W','i','n','3','2','_','B','i','o','s',0}; + static const WCHAR query6[] = + {'S','E','L','E','C','T',' ','D','e','s','c','r','i','p','t','i','o','n',' ','F','R','O','M',' ', + 'W','i','n','3','2','_','B','i','o','s',0}; + static const WCHAR query7[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ', + 'L','I','K','E',' ','\'','%','%','R','E','G','E','D','I','T','%','\'',0}; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 }; + HRESULT hr; + IWbemLocator *locator; + IWbemServices *services; + IEnumWbemClassObject *result; + BSTR path = SysAllocString( cimv2W ); + BSTR wql = SysAllocString( wqlW ); + BSTR sql = SysAllocString( sqlW ); + BSTR query = SysAllocString( query1 ); + UINT i; + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, + (void **)&locator ); + if (hr != S_OK) + { + win_skip("can't create instance of WbemLocator\n"); + return; + } + ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + hr = IWbemServices_ExecQuery( services, NULL, NULL, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + + hr = IWbemServices_ExecQuery( services, NULL, query, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + + hr = IWbemServices_ExecQuery( services, wql, NULL, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + + hr = IWbemServices_ExecQuery( services, sql, query, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_QUERY_TYPE, "query failed %08x\n", hr ); + + hr = IWbemServices_ExecQuery( services, sql, NULL, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + hr = exec_query( services, test[i], &result ); + ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + if (result) IEnumWbemClassObject_Release( result ); + } + + IWbemServices_Release( services ); + IWbemLocator_Release( locator ); + SysFreeString( path ); + SysFreeString( wql ); + SysFreeString( sql ); + SysFreeString( query ); +} + +START_TEST(query) +{ + CoInitialize( NULL ); + CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, + RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL ); + test_select(); + CoUninitialize(); +}

1 0