September 2014 - Wine-commits

Henri Verbeet : dxgi: Get rid of IWineDXGIFactory.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 72aaaac48697fb7f7c84480cde1e27a0d8db4f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=72aaaac48697fb7f7c84480cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 15 11:03:35 2014 +0200 dxgi: Get rid of IWineDXGIFactory. --- dlls/dxgi/adapter.c | 9 ++-- dlls/dxgi/device.c | 65 ++++++++++------------- dlls/dxgi/dxgi_private.h | 9 ++-- dlls/dxgi/factory.c | 128 +++++++++++++++++++--------------------------- dlls/dxgi/output.c | 6 +-- include/wine/winedxgi.idl | 10 ---- 6 files changed, 90 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72aaaac48697fb7f7c844…

1 0

Henri Verbeet : dxgi: Call wined3d_device_init_3d() on device creation.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 810977446a4bd11a5a93c89a173bec4578a620fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=810977446a4bd11a5a93c89a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 15 11:03:36 2014 +0200 dxgi: Call wined3d_device_init_3d() on device creation. --- dlls/dxgi/Makefile.in | 2 +- dlls/dxgi/device.c | 27 ++++++++++++------------ dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 54 ++++++++++++++++++++++------------------------- dlls/dxgi/swapchain.c | 14 +----------- include/wine/winedxgi.idl | 1 - 6 files changed, 43 insertions(+), 57 deletions(-) diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index 0082a6c..ce76b8e 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -1,6 +1,6 @@ MODULE = dxgi.dll IMPORTLIB = dxgi -IMPORTS = dxguid uuid wined3d +IMPORTS = dxguid uuid wined3d user32 C_SRCS = \ adapter.c \ diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index ac3bbfc..7976a91 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -80,6 +80,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) { if (This->child_layer) IUnknown_Release(This->child_layer); EnterCriticalSection(&dxgi_cs); + wined3d_device_uninit_3d(This->wined3d_device); wined3d_device_decref(This->wined3d_device); LeaveCriticalSection(&dxgi_cs); IDXGIFactory1_Release(This->factory); @@ -248,18 +249,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IWineDXGIDevic /* IWineDXGIDevice methods */ -static struct wined3d_device * STDMETHODCALLTYPE dxgi_device_get_wined3d_device(IWineDXGIDevice *iface) -{ - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - - TRACE("iface %p\n", iface); - - EnterCriticalSection(&dxgi_cs); - wined3d_device_incref(This->wined3d_device); - LeaveCriticalSection(&dxgi_cs); - return This->wined3d_device; -} - static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, const DXGI_SURFACE_DESC *desc, DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) { @@ -338,7 +327,6 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_SetGPUThreadPriority, dxgi_device_GetGPUThreadPriority, /* IWineDXGIAdapter methods */ - dxgi_device_get_wined3d_device, dxgi_device_create_surface, dxgi_device_create_swapchain, }; @@ -347,6 +335,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l IDXGIFactory *factory, IDXGIAdapter *adapter) { struct wined3d_device_parent *wined3d_device_parent; + struct wined3d_swapchain_desc swapchain_desc; IWineDXGIDeviceParent *dxgi_device_parent; struct dxgi_adapter *dxgi_adapter; struct dxgi_factory *dxgi_factory; @@ -411,6 +400,18 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return hr; } + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); + swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + swapchain_desc.device_window = dxgi_factory_get_device_window(dxgi_factory); + swapchain_desc.windowed = TRUE; + if (FAILED(hr = wined3d_device_init_3d(device->wined3d_device, &swapchain_desc))) + { + ERR("Failed to initialize 3D, hr %#x.\n", hr); + wined3d_device_decref(device->wined3d_device); + IUnknown_Release(device->child_layer); + return hr; + } + device->factory = &dxgi_factory->IDXGIFactory1_iface; IDXGIFactory1_AddRef(device->factory); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b4815ab..278137d 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -86,9 +86,11 @@ struct dxgi_factory UINT adapter_count; IDXGIAdapter1 **adapters; BOOL extended; + HWND device_window; }; HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; +HWND dxgi_factory_get_device_window(struct dxgi_factory *factory) DECLSPEC_HIDDEN; struct dxgi_factory *unsafe_impl_from_IDXGIFactory1(IDXGIFactory1 *iface) DECLSPEC_HIDDEN; /* IDXGIDevice */ diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index c0e9197..9dbcb3e 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -72,6 +72,8 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory1 *iface) { UINT i; + if (factory->device_window) + DestroyWindow(factory->device_window); for (i = 0; i < factory->adapter_count; ++i) { IDXGIAdapter1_Release(factory->adapters[i]); @@ -179,9 +181,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa { struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain_desc wined3d_desc; - struct wined3d_device *wined3d_device; IWineDXGIDevice *dxgi_device; - UINT count; HRESULT hr; FIXME("iface %p, device %p, desc %p, swapchain %p partial stub!\n", iface, device, desc, swapchain); @@ -193,17 +193,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa return hr; } - wined3d_device = IWineDXGIDevice_get_wined3d_device(dxgi_device); - IWineDXGIDevice_Release(dxgi_device); - - count = wined3d_device_get_swapchain_count(wined3d_device); - if (count) - { - FIXME("Only a single swapchain supported.\n"); - wined3d_device_decref(wined3d_device); - return E_FAIL; - } - if (!desc->OutputWindow) { FIXME("No output window, should use factory output window\n"); @@ -234,29 +223,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa wined3d_desc.refresh_rate = dxgi_rational_to_uint(&desc->BufferDesc.RefreshRate); wined3d_desc.swap_interval = WINED3DPRESENT_INTERVAL_DEFAULT; - hr = wined3d_device_init_3d(wined3d_device, &wined3d_desc); + hr = IWineDXGIDevice_create_swapchain(dxgi_device, &wined3d_desc, &wined3d_swapchain); + IWineDXGIDevice_Release(dxgi_device); if (FAILED(hr)) { - WARN("Failed to initialize 3D, returning %#x\n", hr); - wined3d_device_decref(wined3d_device); + WARN("Failed to create swapchain, hr %#x.\n", hr); return hr; } - wined3d_swapchain = wined3d_device_get_swapchain(wined3d_device, 0); - wined3d_device_decref(wined3d_device); - if (!wined3d_swapchain) - { - WARN("Failed to get swapchain.\n"); - return E_FAIL; - } - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); - /* FIXME? The swapchain is created with refcount 1 by the wined3d device, - * but the wined3d device can't hold a real reference. */ - - TRACE("Created IDXGISwapChain %p\n", *swapchain); - return S_OK; } @@ -395,3 +371,23 @@ HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) return hr; } + +HWND dxgi_factory_get_device_window(struct dxgi_factory *factory) +{ + EnterCriticalSection(&dxgi_cs); + + if (!factory->device_window) + { + if (!(factory->device_window = CreateWindowA("static", "DXGI device window", + WS_DISABLED, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + { + ERR("Failed to create a window.\n"); + return NULL; + } + TRACE("Created device window %p for factory %p.\n", factory->device_window, factory); + } + + LeaveCriticalSection(&dxgi_cs); + + return factory->device_window; +} diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0c27007..437537a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -72,19 +72,7 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) - { - struct wined3d_device *wined3d_device; - HRESULT hr; - - FIXME("Only a single swapchain is supported\n"); - - wined3d_device = wined3d_swapchain_get_device(This->wined3d_swapchain); - hr = wined3d_device_uninit_3d(wined3d_device); - if (FAILED(hr)) - { - ERR("Uninit3D failed, hr %#x\n", hr); - } - } + wined3d_swapchain_decref(This->wined3d_swapchain); return refcount; } diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 88be8db..4980588 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -25,7 +25,6 @@ import "dxgi.idl"; ] interface IWineDXGIDevice : IDXGIDevice { - struct wined3d_device *get_wined3d_device(); HRESULT create_surface( [in] const DXGI_SURFACE_DESC *desc, [in] DXGI_USAGE usage,

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateWicBitmapRenderTarget().
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: c8f758a099efcec3656b2ccb7ef049bf070c7014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f758a099efcec3656b2ccb7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 15 11:03:37 2014 +0200 d2d1: Implement d2d_factory_CreateWicBitmapRenderTarget(). --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 18 + dlls/d2d1/factory.c | 20 +- dlls/d2d1/wic_render_target.c | 898 ++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/d2d1.idl | 1 + include/d2derr.h | 26 ++ 7 files changed, 964 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8f758a099efcec3656b2…

1 0

Sebastian Lackner : glu32: Fix wrapper function for glu[Begin|End] Polygon and gluNextContour.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 912035f9c8b1a76741d3f2c6821a573159edf6dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=912035f9c8b1a76741d3f2c68… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 14 07:07:13 2014 +0200 glu32: Fix wrapper function for glu[Begin|End]Polygon and gluNextContour. --- dlls/glu32/glu.c | 55 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 46a2336..4f0d0e2 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -352,30 +352,6 @@ int WINAPI wine_gluNurbsCallback(void *arg0,int arg1,void *arg2) { } /*********************************************************************** - * gluBeginPolygon (GLU32.@) - */ -extern int gluBeginPolygon(void *arg0); -int WINAPI wine_gluBeginPolygon(void *arg0) { - return gluBeginPolygon(arg0); -} - -/*********************************************************************** - * gluEndPolygon (GLU32.@) - */ -extern int gluEndPolygon(void *arg0); -int WINAPI wine_gluEndPolygon(void *arg0) { - return gluEndPolygon(arg0); -} - -/*********************************************************************** - * gluNextContour (GLU32.@) - */ -extern int gluNextContour(void *arg0,int arg1); -int WINAPI wine_gluNextContour(void *arg0,int arg1) { - return gluNextContour(arg0,arg1); -} - -/*********************************************************************** * gluGetString (GLU32.@) */ extern int gluGetString(int arg0); @@ -617,3 +593,34 @@ void WINAPI wine_gluTessNormal(void *tess, double arg1, double arg2, double arg3 wine_tess_t *wine_tess = tess; gluTessNormal(wine_tess->tess, arg1, arg2, arg3); } + +/*********************************************************************** + * gluBeginPolygon (GLU32.@) + */ +void WINAPI wine_gluBeginPolygon(void *tess) +{ + wine_tess_t *wine_tess = tess; + wine_tess->polygon_data = NULL; + gluTessBeginPolygon(wine_tess->tess, wine_tess); + gluTessBeginContour(wine_tess->tess); +} + +/*********************************************************************** + * gluEndPolygon (GLU32.@) + */ +void WINAPI wine_gluEndPolygon(void *tess) +{ + wine_tess_t *wine_tess = tess; + gluTessEndContour(wine_tess->tess); + gluTessEndPolygon(wine_tess->tess); +} + +/*********************************************************************** + * gluNextContour (GLU32.@) + */ +void WINAPI wine_gluNextContour(void *tess, int arg1) +{ + wine_tess_t *wine_tess = tess; + gluTessEndContour(wine_tess->tess); + gluTessBeginContour(wine_tess->tess); +}

1 0

Hans Leidekker : winhttp: Verify the async parameter type in IWinHttpRequest::Open.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 0b366dca3c05121204ab751ac597ccb45af262a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b366dca3c05121204ab751ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 15 16:36:44 2014 +0200 winhttp: Verify the async parameter type in IWinHttpRequest::Open. --- dlls/winhttp/request.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1f9b4aa..d497d7a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2992,7 +2992,7 @@ static HRESULT WINAPI winhttp_request_Open( path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (!(verb = strdupW( method ))) goto error; - if (V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; + if (V_VT( &async ) == VT_BOOL && V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) { err = get_last_error(); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 51fcc86..27fb212 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2561,6 +2561,8 @@ static void test_IWinHttpRequest(void) method = SysAllocString( method1W ); SysFreeString( url ); url = SysAllocString( url1W ); + V_VT( &async ) = VT_ERROR; + V_ERROR( &async ) = DISP_E_PARAMNOTFOUND; hr = IWinHttpRequest_Open( req, method, url, async ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Hans Leidekker : rsaenh: Fix typos in SHA-384/SHA-512 OIDs.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 2884053a28959a5950bafabb387fc9c96f625cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2884053a28959a5950bafabb3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 15 16:37:26 2014 +0200 rsaenh: Fix typos in SHA-384/SHA-512 OIDs. --- dlls/rsaenh/rsaenh.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fa9071d..7123ffb 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -248,7 +248,7 @@ static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = {CALG_AES_256, 256,256, 256,0, 8,"AES-256", 39,"Advanced Encryption Standard (AES-256)"}, {CALG_SHA, 160,160, 160,CRYPT_FLAG_SIGNING, 6,"SHA-1", 30,"Secure Hash Algorithm (SHA-1)"}, {CALG_SHA_256, 256,256, 256,CRYPT_FLAG_SIGNING, 6,"SHA-256", 30,"Secure Hash Algorithm (SHA-256)"}, - {CALG_SHA_384, 384,384, 384,CRYPT_FLAG_SIGNING, 6,"SHA-384", 30,"Secure Hash Algorithm (SHA-284)"}, + {CALG_SHA_384, 384,384, 384,CRYPT_FLAG_SIGNING, 6,"SHA-384", 30,"Secure Hash Algorithm (SHA-384)"}, {CALG_SHA_512, 512,512, 512,CRYPT_FLAG_SIGNING, 6,"SHA-512", 30,"Secure Hash Algorithm (SHA-512)"}, {CALG_MD2, 128,128, 128,CRYPT_FLAG_SIGNING, 4,"MD2", 23,"Message Digest 2 (MD2)"}, {CALG_MD4, 128,128, 128,CRYPT_FLAG_SIGNING, 4,"MD4", 23,"Message Digest 4 (MD4)"}, @@ -1483,10 +1483,10 @@ static BOOL build_hash_signature(BYTE *pbSignature, DWORD dwLen, ALG_ID aiAlgid, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20 } }, { CALG_SHA_384, 19, { 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, - 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30 } }, - { CALG_SHA_384, 19, { 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, - 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, + { CALG_SHA_512, 19, { 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40 } }, { CALG_SSL3_SHAMD5, 0, { 0 } }, { 0, 0, { 0 } }

1 0

Michael Müller : bcrypt: Add semi-stub for BCryptGetFipsAlgorithmMode.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: f808da266b4c9192602a929a3298c0631944b8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f808da266b4c9192602a929a3… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Aug 16 00:18:06 2014 +0200 bcrypt: Add semi-stub for BCryptGetFipsAlgorithmMode. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 11 +++++++++++ dlls/bcrypt/tests/bcrypt.c | 21 +++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 3b154f5..83cdbea 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -27,7 +27,7 @@ @ stdcall BCryptGenRandom(ptr ptr long long) @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey -@ stub BCryptGetFipsAlgorithmMode +@ stdcall BCryptGetFipsAlgorithmMode(ptr) @ stub BCryptGetProperty @ stub BCryptHashData @ stub BCryptImportKey diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 5ccb9f1..35a640a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -97,3 +97,14 @@ NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE algorithm, DWORD return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled) +{ + FIXME("%p - semi-stub\n", enabled); + + if (!enabled) + return STATUS_INVALID_PARAMETER; + + *enabled = FALSE; + return STATUS_SUCCESS; +} diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 288e745..9e659d6 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE hAlgorithm, PUCHAR pbBuffer, ULONG cbBuffer, ULONG dwFlags); +static NTSTATUS (WINAPI *pBCryptGetFipsAlgorithmMode)(BOOLEAN *enabled); static BOOL Init(void) { @@ -38,6 +39,7 @@ static BOOL Init(void) } pBCryptGenRandom = (void *)GetProcAddress(hbcrypt, "BCryptGenRandom"); + pBCryptGetFipsAlgorithmMode = (void *)GetProcAddress(hbcrypt, "BCryptGetFipsAlgorithmMode"); return TRUE; } @@ -78,10 +80,29 @@ static void test_BCryptGenRandom(void) ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); } +static void test_BCryptGetFipsAlgorithmMode(void) +{ + NTSTATUS ret; + BOOLEAN enabled; + + if (!pBCryptGetFipsAlgorithmMode) + { + win_skip("BCryptGetFipsAlgorithmMode is not available\n"); + return; + } + + ret = pBCryptGetFipsAlgorithmMode(&enabled); + ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); + + ret = pBCryptGetFipsAlgorithmMode(NULL); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); +} + START_TEST(bcrypt) { if (!Init()) return; test_BCryptGenRandom(); + test_BCryptGetFipsAlgorithmMode(); }

1 0

Jactry Zeng : riched20: Implement ITextRange::GetChar.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 0aa433438d520df0bc2f3ec65589dbe7311405f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa433438d520df0bc2f3ec65… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 16 00:13:30 2014 +0800 riched20: Implement ITextRange::GetChar. --- dlls/riched20/richole.c | 19 +++++++++++-- dlls/riched20/tests/richole.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 194f471..6a00016 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -567,14 +567,29 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR bstr) return E_NOTIMPL; } +static HRESULT range_GetChar(ME_TextEditor *editor, ME_Cursor *cursor, LONG *pch) +{ + WCHAR wch[2]; + + ME_GetTextW(editor, wch, 1, cursor, 1, FALSE, cursor->pRun->next->type == diTextEnd); + *pch = wch[0]; + + return S_OK; +} + static HRESULT WINAPI ITextRange_fnGetChar(ITextRange *me, LONG *pch) { ITextRangeImpl *This = impl_from_ITextRange(me); + ME_Cursor cursor; + if (!This->reOle) return CO_E_RELEASED; + TRACE("%p\n", pch); + if (!pch) + return E_INVALIDARG; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + ME_CursorFromCharOfs(This->reOle->editor, This->start, &cursor); + return range_GetChar(This->reOle->editor, &cursor, pch); } static HRESULT WINAPI ITextRange_fnSetChar(ITextRange *me, LONG ch) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f56a14a..f85de2d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -518,6 +518,71 @@ static void test_ITextDocument_Range(void) ITextRange_Release(txtRge); } +static void test_ITextRange_GetChar(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + LONG pch = 0xdeadbeef; + int first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + first = 0, lim = 4; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 0, lim = 0; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 12, lim = 12; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 13, lim = 13; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + first = 12, lim = 12; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_GetChar(txtRge, NULL); + ok(hres == E_INVALIDARG, "ITextRange_GetChar\n"); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -529,4 +594,5 @@ START_TEST(richole) test_ITextDocument_Open(); test_ITextSelection_GetText(); test_ITextDocument_Range(); + test_ITextRange_GetChar(); }

1 0

Jactry Zeng : riched20: Implement ITextSelection::GetChar.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 329252f88b6dc2d93df8f7b0320418b504182639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329252f88b6dc2d93df8f7b03… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 16 00:13:51 2014 +0800 riched20: Implement ITextSelection::GetChar. --- dlls/riched20/richole.c | 9 ++++++-- dlls/riched20/tests/richole.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 6a00016..963368f 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1569,11 +1569,16 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR bstr) static HRESULT WINAPI ITextSelection_fnGetChar(ITextSelection *me, LONG *pch) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ME_Cursor *start = NULL, *end = NULL; + if (!This->reOle) return CO_E_RELEASED; + TRACE("%p\n", pch); + if (!pch) + return E_INVALIDARG; - FIXME("not implemented\n"); - return E_NOTIMPL; + ME_GetSelection(This->reOle->editor, &start, &end); + return range_GetChar(This->reOle->editor, start, pch); } static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f85de2d..2e9b45a 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -583,6 +583,54 @@ static void test_ITextRange_GetChar(void) release_interfaces(&w, &reOle, &txtDoc, NULL); } +static void test_ITextSelection_GetChar(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hres; + LONG pch = 0xdeadbeef; + int first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 0, lim = 4; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + + first = 0, lim = 0; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + + first = 12, lim = 12; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + + first = 13, lim = 13; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + + hres = ITextSelection_GetChar(txtSel, NULL); + ok(hres == E_INVALIDARG, "ITextSelection_GetChar\n"); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -593,6 +641,7 @@ START_TEST(richole) test_Interfaces(); test_ITextDocument_Open(); test_ITextSelection_GetText(); + test_ITextSelection_GetChar(); test_ITextDocument_Range(); test_ITextRange_GetChar(); }

1 0

Hugh McMaster : user32: Fix spelling in a comment.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 0fa8ae7b5280d3acad2c3221f72d91dea9c17f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa8ae7b5280d3acad2c3221f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 15 19:24:10 2014 +1000 user32: Fix spelling in a comment. --- dlls/user32/win.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c9660be..73cad0c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2602,9 +2602,9 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval * SetWindowLong() alters one of a window's attributes or sets a 32-bit (long) * value in a window's extra memory. * - * The _hwnd_ parameter specifies the window. is the handle to a - * window that has extra memory. The _newval_ parameter contains the - * new attribute or extra memory value. If positive, the _offset_ + * The _hwnd_ parameter specifies the handle to a window that + * has extra memory. The _newval_ parameter contains the new + * attribute or extra memory value. If positive, the _offset_ * parameter is the byte-addressed location in the window's extra * memory to set. If negative, _offset_ specifies the window * attribute to set, and should be one of the following values: @@ -2615,7 +2615,7 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval * * GWLP_WNDPROC Pointer to the window's window procedure. * - * GWLP_HINSTANCE The window's pplication instance handle. + * GWLP_HINSTANCE The window's application instance handle. * * GWLP_ID The window's identifier. *

1 0