November 2009 - Wine-Commits

Henri Verbeet : d3d10core: Add a separate function for device initialization.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: ccbcf8f2919f5d85955f70b48e5b4d1d2b4b34a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccbcf8f2919f5d85955f70b48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 19 11:41:24 2009 +0100 d3d10core: Add a separate function for device initialization. --- dlls/d3d10core/d3d10core_main.c | 8 +------- dlls/d3d10core/d3d10core_private.h | 5 ++--- dlls/d3d10core/device.c | 15 ++++++++++++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 273f15d..4151dd0 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -81,13 +81,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba } object = *layer_base; - - object->vtbl = &d3d10_device_vtbl; - object->inner_unknown_vtbl = &d3d10_device_inner_unknown_vtbl; - object->device_parent_vtbl = &d3d10_wined3d_device_parent_vtbl; - object->refcount = 1; - - object->outer_unknown = device_object; + d3d10_device_init(object, device_object); *device_layer = &object->inner_unknown_vtbl; TRACE("Created d3d10 device at %p\n", object); diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index f4535ce..35d5ed3 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -67,9 +67,6 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; /* IDirect3D10Device */ -extern const struct ID3D10DeviceVtbl d3d10_device_vtbl DECLSPEC_HIDDEN; -extern const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl DECLSPEC_HIDDEN; -extern const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl DECLSPEC_HIDDEN; struct d3d10_device { const struct ID3D10DeviceVtbl *vtbl; @@ -81,6 +78,8 @@ struct d3d10_device IWineD3DDevice *wined3d_device; }; +void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; + /* ID3D10Texture2D */ struct d3d10_texture2d { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index b3da2ed..4898a09 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1117,7 +1117,7 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device *iface FIXME("iface %p, width %p, height %p stub!\n", iface, width, height); } -const struct ID3D10DeviceVtbl d3d10_device_vtbl = +static const struct ID3D10DeviceVtbl d3d10_device_vtbl = { /* IUnknown methods */ d3d10_device_QueryInterface, @@ -1221,7 +1221,7 @@ const struct ID3D10DeviceVtbl d3d10_device_vtbl = d3d10_device_GetTextFilterSize, }; -const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = +static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = { /* IUnknown methods */ d3d10_device_inner_QueryInterface, @@ -1425,7 +1425,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar return S_OK; } -const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl = +static const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl = { /* IUnknown methods */ device_parent_QueryInterface, @@ -1439,3 +1439,12 @@ const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl = device_parent_CreateVolume, device_parent_CreateSwapChain, }; + +void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) +{ + device->vtbl = &d3d10_device_vtbl; + device->inner_unknown_vtbl = &d3d10_device_inner_unknown_vtbl; + device->device_parent_vtbl = &d3d10_wined3d_device_parent_vtbl; + device->refcount = 1; + device->outer_unknown = outer_unknown; +}

1 0

Juan Lang : crypt32: Add support for CRL_FIND_ISSUED_BY_AKI_FLAG to CertFindCRLInStore.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 8fcaa52d5d6523d22f01d781c8b1149b20e36477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcaa52d5d6523d22f01d781c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 16:54:49 2009 -0800 crypt32: Add support for CRL_FIND_ISSUED_BY_AKI_FLAG to CertFindCRLInStore. --- dlls/crypt32/crl.c | 25 +++++++++++++++++++++++++ dlls/crypt32/tests/crl.c | 2 -- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 4f69a9d..03f9b78 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -121,6 +121,31 @@ static BOOL compare_crl_issued_by(PCCRL_CONTEXT pCrlContext, DWORD dwType, issuer->dwCertEncodingType, CRYPT_VERIFY_CERT_SIGN_SUBJECT_CRL, (void *)pCrlContext, CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)issuer, 0, NULL); + if (ret && (dwFlags & CRL_FIND_ISSUED_BY_AKI_FLAG)) + { + PCERT_EXTENSION aki = CertFindExtension( + szOID_AUTHORITY_KEY_IDENTIFIER2, pCrlContext->pCrlInfo->cExtension, + pCrlContext->pCrlInfo->rgExtension); + + if (aki) + { + CERT_EXTENSION *ski; + + if ((ski = CertFindExtension(szOID_SUBJECT_KEY_IDENTIFIER, + issuer->pCertInfo->cExtension, + issuer->pCertInfo->rgExtension))) + { + if (aki->Value.cbData == ski->Value.cbData) + ret = !memcmp(aki->Value.pbData, ski->Value.pbData, + aki->Value.cbData); + else + ret = FALSE; + } + else + ret = FALSE; + } + /* else: a CRL without an AKI matches any cert */ + } } else ret = TRUE; diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index d50d996..b012db1 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -683,11 +683,9 @@ static void testFindCRL(void) revoked_count++; } } while (context); - todo_wine { ok(count == 0, "expected 0 matching CRLs, got %d\n", count); ok(revoked_count == 0, "expected 0 matching CRL entries, got %d\n", revoked_count); - } count = revoked_count = 0; do { context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG,

1 0

Hans Leidekker : secur32: Handle EOF from gnutls_record_recv.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: aeb161f13f5119d5647a5cb8775cf13719444e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb161f13f5119d5647a5cb87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 19 09:30:33 2009 +0100 secur32: Handle EOF from gnutls_record_recv. --- dlls/secur32/schannel.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index af94024..27cb1b7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1203,6 +1203,9 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle return SEC_E_INTERNAL_ERROR; } } + else if (!ret) + break; + received += ret; }

1 0

Henri Verbeet : ntdll/tests: Add a FileNameInformation test with filesystem redirection.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 893b3382681b87be874697558bc924f8257d1016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=893b3382681b87be874697558… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 19 11:41:23 2009 +0100 ntdll/tests: Add a FileNameInformation test with filesystem redirection. --- dlls/ntdll/tests/file.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ac19d2e..8eff7d3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -41,6 +41,7 @@ #endif static BOOL (WINAPI * pGetVolumePathNameW)(LPCWSTR, LPWSTR, DWORD); +static UINT (WINAPI *pGetSystemWow64DirectoryW)( LPWSTR, UINT ); static NTSTATUS (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); @@ -947,7 +948,7 @@ static void test_file_name_information(void) { WCHAR *file_name, *volume_prefix, *expected; FILE_NAME_INFORMATION *info; - ULONG old_redir, tmp; + ULONG old_redir = 1, tmp; UINT file_name_size; IO_STATUS_BLOCK io; UINT info_size; @@ -1026,6 +1027,51 @@ static void test_file_name_information(void) HeapFree( GetProcessHeap(), 0, info ); HeapFree( GetProcessHeap(), 0, expected ); HeapFree( GetProcessHeap(), 0, volume_prefix ); + + if (old_redir || !pGetSystemWow64DirectoryW || !(file_name_size = pGetSystemWow64DirectoryW( NULL, 0 ))) + { + skip("Not running on WoW64, skipping test.\n"); + HeapFree( GetProcessHeap(), 0, file_name ); + return; + } + + h = CreateFileW( file_name, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); + ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); + HeapFree( GetProcessHeap(), 0, file_name ); + + file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); + volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); + expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*expected) ); + + len = pGetSystemWow64DirectoryW( file_name, file_name_size ); + ok(len == file_name_size - 1, + "GetSystemWow64DirectoryW returned %u, expected %u.\n", + len, file_name_size - 1); + + len = pGetVolumePathNameW( file_name, volume_prefix, file_name_size ); + ok(len, "GetVolumePathNameW failed.\n"); + + len = lstrlenW( volume_prefix ); + if (len && volume_prefix[len - 1] == '\\') --len; + memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); + expected[file_name_size - len - 1] = '\0'; + + info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); + info = HeapAlloc( GetProcessHeap(), 0, info_size ); + + memset( info, 0xcc, info_size ); + hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); + ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); + info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; + ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", + wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); + + CloseHandle( h ); + HeapFree( GetProcessHeap(), 0, info ); + HeapFree( GetProcessHeap(), 0, expected ); + HeapFree( GetProcessHeap(), 0, volume_prefix ); HeapFree( GetProcessHeap(), 0, file_name ); } @@ -1040,6 +1086,7 @@ START_TEST(file) } pGetVolumePathNameW = (void *)GetProcAddress(hkernel32, "GetVolumePathNameW"); + pGetSystemWow64DirectoryW = (void *)GetProcAddress(hkernel32, "GetSystemWow64DirectoryW"); pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString");

1 0

Henri Verbeet : dxgi: Add a separate function for device initialization.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 15b6bc6135a6365352c95df9bdf9aafafcb6aca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b6bc6135a6365352c95df9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 19 11:41:25 2009 +0100 dxgi: Add a separate function for device initialization. --- dlls/dxgi/device.c | 79 +++++++++++++++++++++++++++++++++++++++++++++- dlls/dxgi/dxgi_main.c | 75 ++++--------------------------------------- dlls/dxgi/dxgi_private.h | 68 ++++++++++++++++++++------------------- 3 files changed, 120 insertions(+), 102 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index bf079d5..9741d0e 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -312,7 +312,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i return S_OK; } -const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = +static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = { /* IUnknown methods */ dxgi_device_QueryInterface, @@ -334,3 +334,80 @@ const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_create_surface, dxgi_device_create_swapchain, }; + +HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, + IDXGIFactory *factory, IDXGIAdapter *adapter) +{ + IWineD3DDeviceParent *wined3d_device_parent; + IWineDXGIAdapter *wine_adapter; + UINT adapter_ordinal; + IWineD3D *wined3d; + void *layer_base; + HRESULT hr; + + device->vtbl = &dxgi_device_vtbl; + device->refcount = 1; + + layer_base = device + 1; + + hr = layer->create(layer->id, &layer_base, 0, + device, &IID_IUnknown, (void **)&device->child_layer); + if (FAILED(hr)) + { + WARN("Failed to create device, returning %#x.\n", hr); + goto fail; + } + + hr = IDXGIFactory_QueryInterface(factory, &IID_IWineDXGIFactory, (void **)&device->factory); + if (FAILED(hr)) + { + WARN("This is not the factory we're looking for, returning %#x.\n", hr); + goto fail; + } + wined3d = IWineDXGIFactory_get_wined3d(device->factory); + + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IWineDXGIAdapter, (void **)&wine_adapter); + if (FAILED(hr)) + { + WARN("This is not the adapter we're looking for, returning %#x.\n", hr); + EnterCriticalSection(&dxgi_cs); + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + goto fail; + } + adapter_ordinal = IWineDXGIAdapter_get_ordinal(wine_adapter); + IWineDXGIAdapter_Release(wine_adapter); + + hr = IUnknown_QueryInterface((IUnknown *)device, &IID_IWineD3DDeviceParent, (void **)&wined3d_device_parent); + if (FAILED(hr)) + { + ERR("DXGI device should implement IWineD3DDeviceParent.\n"); + goto fail; + } + + FIXME("Ignoring adapter type.\n"); + EnterCriticalSection(&dxgi_cs); + hr = IWineD3D_CreateDevice(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, NULL, 0, + (IUnknown *)device, wined3d_device_parent, &device->wined3d_device); + IWineD3DDeviceParent_Release(wined3d_device_parent); + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + if (FAILED(hr)) + { + WARN("Failed to create a wined3d device, returning %#x.\n", hr); + goto fail; + } + + return S_OK; + +fail: + if (device->wined3d_device) + { + EnterCriticalSection(&dxgi_cs); + IWineD3DDevice_Release(device->wined3d_device); + LeaveCriticalSection(&dxgi_cs); + } + if (device->factory) IWineDXGIFactory_Release(device->factory); + if (device->child_layer) IUnknown_Release(device->child_layer); + return hr; +} diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index fcc6c07..3b153ab 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -226,14 +226,9 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags, DWORD unknown0, void **device) { - IWineD3DDeviceParent *wined3d_device_parent; struct layer_get_size_args get_size_args; struct dxgi_device *dxgi_device; struct dxgi_device_layer d3d10_layer; - IWineDXGIAdapter *wine_adapter; - UINT adapter_ordinal; - IWineD3D *wined3d; - void *layer_base; UINT device_size; DWORD count; HRESULT hr; @@ -282,75 +277,19 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I return E_OUTOFMEMORY; } - dxgi_device->vtbl = &dxgi_device_vtbl; - dxgi_device->refcount = 1; - - layer_base = dxgi_device + 1; - - hr = d3d10_layer.create(d3d10_layer.id, &layer_base, 0, - dxgi_device, &IID_IUnknown, (void **)&dxgi_device->child_layer); - if (FAILED(hr)) - { - WARN("Failed to create device, returning %#x\n", hr); - goto fail; - } - - hr = IDXGIFactory_QueryInterface(factory, &IID_IWineDXGIFactory, (void **)&dxgi_device->factory); - if (FAILED(hr)) - { - WARN("This is not the factory we're looking for, returning %#x\n", hr); - goto fail; - } - wined3d = IWineDXGIFactory_get_wined3d(dxgi_device->factory); - - hr = IDXGIAdapter_QueryInterface(adapter, &IID_IWineDXGIAdapter, (void **)&wine_adapter); - if (FAILED(hr)) - { - WARN("This is not the adapter we're looking for, returning %#x\n", hr); - EnterCriticalSection(&dxgi_cs); - IWineD3D_Release(wined3d); - LeaveCriticalSection(&dxgi_cs); - goto fail; - } - adapter_ordinal = IWineDXGIAdapter_get_ordinal(wine_adapter); - IWineDXGIAdapter_Release(wine_adapter); - - hr = IUnknown_QueryInterface((IUnknown *)dxgi_device, &IID_IWineD3DDeviceParent, (void **)&wined3d_device_parent); + hr = dxgi_device_init(dxgi_device, &d3d10_layer, factory, adapter); if (FAILED(hr)) { - ERR("DXGI device should implement IWineD3DDeviceParent\n"); - goto fail; - } - - FIXME("Ignoring adapter type\n"); - EnterCriticalSection(&dxgi_cs); - hr = IWineD3D_CreateDevice(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, NULL, 0, - (IUnknown *)dxgi_device, wined3d_device_parent, &dxgi_device->wined3d_device); - IWineD3DDeviceParent_Release(wined3d_device_parent); - IWineD3D_Release(wined3d); - LeaveCriticalSection(&dxgi_cs); - if (FAILED(hr)) - { - WARN("Failed to create a WineD3D device, returning %#x\n", hr); - goto fail; + WARN("Failed to initialize device, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, dxgi_device); + *device = NULL; + return hr; } + TRACE("Created device %p.\n", dxgi_device); *device = dxgi_device; - return hr; - -fail: - if (dxgi_device->wined3d_device) - { - EnterCriticalSection(&dxgi_cs); - IWineD3DDevice_Release(dxgi_device->wined3d_device); - LeaveCriticalSection(&dxgi_cs); - } - if (dxgi_device->factory) IWineDXGIFactory_Release(dxgi_device->factory); - if (dxgi_device->child_layer) IUnknown_Release(dxgi_device->child_layer); - HeapFree(GetProcessHeap(), 0, dxgi_device); - *device = NULL; - return hr; + return S_OK; } HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, UINT layer_count) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 0e4593d..46b6f43 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -36,6 +36,38 @@ extern CRITICAL_SECTION dxgi_cs DECLSPEC_HIDDEN; +/* Layered device */ +enum dxgi_device_layer_id +{ + DXGI_DEVICE_LAYER_DEBUG1 = 0x8, + DXGI_DEVICE_LAYER_THREAD_SAFE = 0x10, + DXGI_DEVICE_LAYER_DEBUG2 = 0x20, + DXGI_DEVICE_LAYER_SWITCH_TO_REF = 0x30, + DXGI_DEVICE_LAYER_D3D10_DEVICE = 0xffffffff, +}; + +struct layer_get_size_args +{ + DWORD unknown0; + DWORD unknown1; + DWORD *unknown2; + DWORD *unknown3; + IDXGIAdapter *adapter; + WORD interface_major; + WORD interface_minor; + WORD version_build; + WORD version_revision; +}; + +struct dxgi_device_layer +{ + enum dxgi_device_layer_id id; + HRESULT (WINAPI *init)(enum dxgi_device_layer_id id, DWORD *count, DWORD *values); + UINT (WINAPI *get_size)(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0); + HRESULT (WINAPI *create)(enum dxgi_device_layer_id id, void **layer_base, DWORD unknown0, + void *device_object, REFIID riid, void **device_layer); +}; + /* TRACE helper functions */ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; @@ -53,7 +85,6 @@ struct dxgi_factory }; /* IDXGIDevice */ -extern const struct IWineDXGIDeviceVtbl dxgi_device_vtbl DECLSPEC_HIDDEN; struct dxgi_device { const struct IWineDXGIDeviceVtbl *vtbl; @@ -63,6 +94,9 @@ struct dxgi_device IWineDXGIFactory *factory; }; +HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, + IDXGIFactory *factory, IDXGIAdapter *adapter) DECLSPEC_HIDDEN; + /* IDXGIOutput */ struct dxgi_output { @@ -104,36 +138,4 @@ struct dxgi_surface LONG refcount; }; -/* Layered device */ -enum dxgi_device_layer_id -{ - DXGI_DEVICE_LAYER_DEBUG1 = 0x8, - DXGI_DEVICE_LAYER_THREAD_SAFE = 0x10, - DXGI_DEVICE_LAYER_DEBUG2 = 0x20, - DXGI_DEVICE_LAYER_SWITCH_TO_REF = 0x30, - DXGI_DEVICE_LAYER_D3D10_DEVICE = 0xffffffff, -}; - -struct layer_get_size_args -{ - DWORD unknown0; - DWORD unknown1; - DWORD *unknown2; - DWORD *unknown3; - IDXGIAdapter *adapter; - WORD interface_major; - WORD interface_minor; - WORD version_build; - WORD version_revision; -}; - -struct dxgi_device_layer -{ - enum dxgi_device_layer_id id; - HRESULT (WINAPI *init)(enum dxgi_device_layer_id id, DWORD *count, DWORD *values); - UINT (WINAPI *get_size)(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0); - HRESULT (WINAPI *create)(enum dxgi_device_layer_id id, void **layer_base, DWORD unknown0, - void *device_object, REFIID riid, void **device_layer); -}; - #endif /* __WINE_DXGI_PRIVATE_H */

1 0

Henri Verbeet : ntdll/tests: Disable filesystem redirection for test_file_name_information().
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 832aacd86601d9854b88c79e038feae617fb236d URL: http://source.winehq.org/git/wine.git/?a=commit;h=832aacd86601d9854b88c79e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 19 11:41:22 2009 +0100 ntdll/tests: Disable filesystem redirection for test_file_name_information(). Otherwise we get the syswow64 directory instead on 64-bit Windows. --- dlls/ntdll/tests/file.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 06e35b4..ac19d2e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -45,6 +45,8 @@ static BOOL (WINAPI * pGetVolumePathNameW)(LPCWSTR, LPWSTR, DWORD); static NTSTATUS (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); +static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG, ULONG * ); + static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ULONG, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG, ULONG, PLARGE_INTEGER ); static NTSTATUS (WINAPI *pNtDeleteFile)(POBJECT_ATTRIBUTES ObjectAttributes); @@ -945,6 +947,7 @@ static void test_file_name_information(void) { WCHAR *file_name, *volume_prefix, *expected; FILE_NAME_INFORMATION *info; + ULONG old_redir, tmp; UINT file_name_size; IO_STATUS_BLOCK io; UINT info_size; @@ -980,9 +983,11 @@ static void test_file_name_information(void) info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); info = HeapAlloc( GetProcessHeap(), 0, info_size ); + if (pRtlWow64EnableFsRedirectionEx) pRtlWow64EnableFsRedirectionEx( TRUE, &old_redir ); h = CreateFileW( file_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); + if (pRtlWow64EnableFsRedirectionEx) pRtlWow64EnableFsRedirectionEx( old_redir, &tmp ); ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation ); @@ -1039,6 +1044,7 @@ START_TEST(file) pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); + pRtlWow64EnableFsRedirectionEx = (void *)GetProcAddress(hntdll, "RtlWow64EnableFsRedirectionEx"); pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile"); pNtDeleteFile = (void *)GetProcAddress(hntdll, "NtDeleteFile"); pNtReadFile = (void *)GetProcAddress(hntdll, "NtReadFile");

1 0

Hans Leidekker : msi: Sign extend the value when converting from a small integer.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 83e7a1214a009b133a031898a884ee72f74880ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e7a1214a009b133a031898a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 19 09:30:04 2009 +0100 msi: Sign extend the value when converting from a small integer. --- dlls/msi/table.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 33d1fce..fa32a04 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1201,7 +1201,7 @@ static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, LPWSTR *pstname ) switch( n ) { case 2: - sprintfW( number, fmt, ival^0x8000 ); + sprintfW( number, fmt, ival-0x8000 ); break; case 4: sprintfW( number, fmt, ival^0x80000000 ); @@ -2573,7 +2573,7 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string case 2: val = read_raw_int(rawdata, ofs, n); if (val) - MSI_RecordSetInteger( rec, i+1, val^0x8000 ); + MSI_RecordSetInteger( rec, i+1, val-0x8000 ); TRACE(" field %d [0x%04x]\n", i+1, val ); break; case 4:

1 0

Juan Lang : crypt32: Add more tests for CertFindCRLInStore.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: b278155616d3147f6695b55b77345e70894a9624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b278155616d3147f6695b55b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 16:36:15 2009 -0800 crypt32: Add more tests for CertFindCRLInStore. --- dlls/crypt32/tests/crl.c | 237 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 236 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b278155616d3147f6695b…

1 0

Juan Lang : crypt32: More fully implement CertIsValidCRLForCertificate.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: c84c53b1a6fba37a1619bc099d379f8f0c86723a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84c53b1a6fba37a1619bc099… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 16:21:09 2009 -0800 crypt32: More fully implement CertIsValidCRLForCertificate. --- dlls/crypt32/crl.c | 148 +++++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/crl.c | 2 +- 2 files changed, 148 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index f483256..f71e6a8 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -19,10 +19,12 @@ #include <assert.h> #include <stdarg.h> +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wincrypt.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -484,11 +486,155 @@ BOOL WINAPI CertSetCRLContextProperty(PCCRL_CONTEXT pCRLContext, return ret; } +static BOOL compare_dist_point_name(const CRL_DIST_POINT_NAME *name1, + const CRL_DIST_POINT_NAME *name2) +{ + BOOL match; + + if (name1->dwDistPointNameChoice == name2->dwDistPointNameChoice) + { + match = TRUE; + if (name1->dwDistPointNameChoice == CRL_DIST_POINT_FULL_NAME) + { + if (name1->u.FullName.cAltEntry == name2->u.FullName.cAltEntry) + { + DWORD i; + + for (i = 0; match && i < name1->u.FullName.cAltEntry; i++) + { + const CERT_ALT_NAME_ENTRY *entry1 = + &name1->u.FullName.rgAltEntry[i]; + const CERT_ALT_NAME_ENTRY *entry2 = + &name2->u.FullName.rgAltEntry[i]; + + if (entry1->dwAltNameChoice == entry2->dwAltNameChoice) + { + switch (entry1->dwAltNameChoice) + { + case CERT_ALT_NAME_URL: + match = !strcmpiW(entry1->u.pwszURL, + entry2->u.pwszURL); + break; + case CERT_ALT_NAME_DIRECTORY_NAME: + match = (entry1->u.DirectoryName.cbData == + entry2->u.DirectoryName.cbData) && + !memcmp(entry1->u.DirectoryName.pbData, + entry2->u.DirectoryName.pbData, + entry1->u.DirectoryName.cbData); + break; + default: + FIXME("unimplemented for type %d\n", + entry1->dwAltNameChoice); + match = FALSE; + } + } + else + match = FALSE; + } + } + else + match = FALSE; + } + } + else + match = FALSE; + return match; +} + +static BOOL match_dist_point_with_issuing_dist_point( + const CRL_DIST_POINT *distPoint, const CRL_ISSUING_DIST_POINT *idp) +{ + BOOL match; + + /* While RFC 5280, section 4.2.1.13 recommends against segmenting + * CRL distribution points by reasons, it doesn't preclude doing so. + * "This profile RECOMMENDS against segmenting CRLs by reason code." + * If the issuing distribution point for this CRL is only valid for + * some reasons, only match if the reasons covered also match the + * reasons in the CRL distribution point. + */ + if (idp->OnlySomeReasonFlags.cbData) + { + if (idp->OnlySomeReasonFlags.cbData == distPoint->ReasonFlags.cbData) + { + DWORD i; + + match = TRUE; + for (i = 0; match && i < distPoint->ReasonFlags.cbData; i++) + if (idp->OnlySomeReasonFlags.pbData[i] != + distPoint->ReasonFlags.pbData[i]) + match = FALSE; + } + else + match = FALSE; + } + else + match = TRUE; + if (match) + match = compare_dist_point_name(&idp->DistPointName, + &distPoint->DistPointName); + return match; +} + BOOL WINAPI CertIsValidCRLForCertificate(PCCERT_CONTEXT pCert, PCCRL_CONTEXT pCrl, DWORD dwFlags, void *pvReserved) { + PCERT_EXTENSION ext; + BOOL ret; + TRACE("(%p, %p, %08x, %p)\n", pCert, pCrl, dwFlags, pvReserved); - return TRUE; + + if (!pCert) + return TRUE; + + if ((ext = CertFindExtension(szOID_ISSUING_DIST_POINT, + pCrl->pCrlInfo->cExtension, pCrl->pCrlInfo->rgExtension))) + { + CRL_ISSUING_DIST_POINT *idp; + DWORD size; + + if ((ret = CryptDecodeObjectEx(pCrl->dwCertEncodingType, + X509_ISSUING_DIST_POINT, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &idp, &size))) + { + if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, + pCert->pCertInfo->cExtension, pCert->pCertInfo->rgExtension))) + { + CRL_DIST_POINTS_INFO *distPoints; + + if ((ret = CryptDecodeObjectEx(pCert->dwCertEncodingType, + X509_CRL_DIST_POINTS, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &distPoints, &size))) + { + DWORD i; + + ret = FALSE; + for (i = 0; !ret && i < distPoints->cDistPoint; i++) + ret = match_dist_point_with_issuing_dist_point( + &distPoints->rgDistPoint[i], idp); + if (!ret) + SetLastError(CRYPT_E_NO_MATCH); + LocalFree(distPoints); + } + } + else + { + /* no CRL dist points extension in cert, compare CRL's issuer + * to cert's issuer. + */ + if (!CertCompareCertificateName(pCrl->dwCertEncodingType, + &pCrl->pCrlInfo->Issuer, &pCert->pCertInfo->Issuer)) + { + ret = FALSE; + SetLastError(CRYPT_E_NO_MATCH); + } + } + LocalFree(idp); + } + } + else + ret = TRUE; + return ret; } static PCRL_ENTRY CRYPT_FindCertificateInCRL(PCERT_INFO cert, const CRL_INFO *crl) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index bc6c862..cec233f 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -755,10 +755,10 @@ static void testIsValidCRLForCert(void) ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + } ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); - } /* With a CRL_ISSUING_DIST_POINT in the CRL, it matches the cert containing * a CRL_DIST_POINTS_INFO extension.

1 0

Juan Lang : crypt32: Add basic flags tests flags for CertFindCRLInStore with find type CRL_FIND_ISSUED_BY .
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 8beed85a2cda2824cdfa5d7f38fc5f92d4180433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8beed85a2cda2824cdfa5d7f3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 18 16:26:48 2009 -0800 crypt32: Add basic flags tests flags for CertFindCRLInStore with find type CRL_FIND_ISSUED_BY. --- dlls/crypt32/tests/crl.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index cec233f..2d361a5 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -379,6 +379,18 @@ static void testFindCRL(void) if (context) CertFreeCRLContext(context); + /* Try various find flags */ + context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_SIGNATURE_FLAG, + CRL_FIND_ISSUED_BY, cert, NULL); + todo_wine + ok(!context, "unexpected context\n"); + /* The CRL doesn't have an AKI extension, so it matches any cert */ + context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG, + CRL_FIND_ISSUED_BY, cert, NULL); + ok(context != NULL, "Expected a context\n"); + if (context) + CertFreeCRLContext(context); + if (0) { /* Crash or return NULL/STATUS_ACCESS_VIOLATION */

1 0