June 2016 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Allow creating render targets for some _UNORM/_SNORM formats.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 2f7c3168881a9bfb187073fee26e5c3a8f648b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7c3168881a9bfb187073fee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:07 2016 +0200 wined3d: Allow creating render targets for some _UNORM/_SNORM formats. 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/d3d10core/tests/device.c | 8 ++++++++ dlls/d3d11/tests/d3d11.c | 8 ++++++++ dlls/wined3d/utils.c | 9 +++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 599c1a5..39febe5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -713,6 +713,9 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32G8X24_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 0, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, @@ -724,10 +727,15 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, }; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7191563..5cd9c03 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1025,6 +1025,9 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32G8X24_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 0, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, @@ -1036,10 +1039,15 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, }; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index abe52dd..97c3e19 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1261,7 +1261,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R8G8_UNORM, GL_RG8, GL_RG8, 0, GL_RG, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R16_UNORM, GL_R16, GL_R16, 0, GL_RED, GL_UNSIGNED_SHORT, 0, @@ -1322,7 +1323,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_R8G8_SNORM, GL_RG8_SNORM, GL_RG8_SNORM, 0, GL_RG, GL_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_BUMPMAP, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_BUMPMAP, EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_RGB5, GL_RGB5, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2, @@ -1362,7 +1363,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_R8G8B8A8_SNORM, GL_RGBA8_SNORM, GL_RGBA8_SNORM, 0, GL_RGBA, GL_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_BUMPMAP, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_BUMPMAP, EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R16G16_SNORM, GL_RGB16, GL_RGB16, 0, GL_BGR, GL_UNSIGNED_SHORT, 6, @@ -1377,7 +1378,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_R16G16_SNORM, GL_RG16_SNORM, GL_RG16_SNORM, 0, GL_RG, GL_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_BUMPMAP, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_BUMPMAP, EXT_TEXTURE_SNORM, NULL}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0,

1 0

Nikolay Sivov : oledb32: IErrorInfo methods are stubs.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: f5f6cfb0f708c512adbc174607e0fd89b8fe503c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f6cfb0f708c512adbc17460… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 3 09:55:36 2016 +0300 oledb32: IErrorInfo methods are stubs. There's no way to set error info for this object Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 62 ++++++++----------- dlls/oledb32/tests/database.c | 134 +++++++++++++++++++++++++++--------------- 2 files changed, 110 insertions(+), 86 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 4a2a1e2..4a56b46 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -53,12 +53,6 @@ typedef struct ErrorInfoImpl IErrorRecords IErrorRecords_iface; LONG ref; - GUID m_Guid; - BSTR source; - BSTR description; - BSTR help_file; - DWORD help_context; - struct list errors; } ErrorInfoImpl; @@ -115,10 +109,6 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) if (!ref) { - SysFreeString(This->source); - SysFreeString(This->description); - SysFreeString(This->help_file); - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->errors, struct ErrorEntry, entry) { list_remove(&cursor->entry); @@ -132,74 +122,74 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) return ref; } -static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID * pGUID) +static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID *guid) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)\n",This); + TRACE("(%p)->(%p)\n", This, guid); - if(!pGUID ) + if (!guid) return E_INVALIDARG; - *pGUID = This->m_Guid; + *guid = GUID_NULL; return S_OK; } -static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *pBstrSource) +static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *source) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(%p)\n",This, pBstrSource); + TRACE("(%p)->(%p)\n", This, source); - if (pBstrSource == NULL) + if (!source) return E_INVALIDARG; - *pBstrSource = SysAllocString(This->source); + *source = NULL; - return S_OK; + return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *pBstrDescription) +static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *description) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(%p)\n",This, pBstrDescription); + TRACE("(%p)->(%p)\n", This, description); - if (pBstrDescription == NULL) + if (!description) return E_INVALIDARG; - *pBstrDescription = SysAllocString(This->description); + *description = NULL; - return S_OK; + return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *pBstrHelpFile) +static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *helpfile) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(%p)\n",This, pBstrHelpFile); + TRACE("(%p)->(%p)\n", This, helpfile); - if (pBstrHelpFile == NULL) + if (!helpfile) return E_INVALIDARG; - *pBstrHelpFile = SysAllocString(This->help_file); + *helpfile = NULL; - return S_OK; + return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *pdwHelpContext) +static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *context) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(%p)\n",This, pdwHelpContext); + TRACE("(%p)->(%p)\n", This, context); - if (pdwHelpContext == NULL) + if (!context) return E_INVALIDARG; - *pdwHelpContext = This->help_context; + *context = 0; - return S_OK; + return E_FAIL; } static const IErrorInfoVtbl ErrorInfoVtbl = @@ -371,10 +361,6 @@ HRESULT create_error_info(IUnknown *outer, void **obj) This->IErrorInfo_iface.lpVtbl = &ErrorInfoVtbl; This->IErrorRecords_iface.lpVtbl = &ErrorRecordsVtbl; This->ref = 1; - This->source = NULL; - This->description = NULL; - This->help_file = NULL; - This->help_context = 0; list_init(&This->errors); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index fdf4220..442e57e 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -312,71 +312,109 @@ static void test_database(void) static void test_errorinfo(void) { - HRESULT hr; + ICreateErrorInfo *createerror; + ERRORINFO info, info2, info3; + IErrorInfo *errorinfo; + IErrorRecords *errrecs; IUnknown *unk = NULL; + DWORD context; + ULONG cnt = 0; + HRESULT hr; + GUID guid; + BSTR str; - hr = CoCreateInstance(&CSLID_MSDAER, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown,(void**)&unk); + hr = CoCreateInstance(&CSLID_MSDAER, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - { - IErrorInfo *errorinfo; - IErrorRecords *errrecs; - hr = IUnknown_QueryInterface(unk, &IID_IErrorInfo, (void**)&errorinfo); - ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - { - IErrorInfo_Release(errorinfo); - } + hr = IUnknown_QueryInterface(unk, &IID_IErrorInfo, (void**)&errorinfo); + ok(hr == S_OK, "got %08x\n", hr); - hr = IUnknown_QueryInterface(unk, &IID_IErrorRecords, (void**)&errrecs); - ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - { - ERRORINFO info, info2, info3; - ULONG cnt = 0; + hr = IErrorInfo_GetGUID(errorinfo, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); - memset(&info, 0, sizeof(ERRORINFO)); - info.dwMinor = 1; - memset(&info2, 0, sizeof(ERRORINFO)); - info2.dwMinor = 2; - memset(&info3, 0, sizeof(ERRORINFO)); + hr = IErrorInfo_GetSource(errorinfo, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); - hr = IErrorRecords_AddErrorRecord(errrecs, NULL, 268435456, NULL, NULL, 0); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + hr = IErrorInfo_GetDescription(errorinfo, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); - hr = IErrorRecords_AddErrorRecord(errrecs, &info, 1, NULL, NULL, 0); - ok(hr == S_OK, "got %08x\n", hr); + hr = IErrorInfo_GetHelpFile(errorinfo, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); - hr = IErrorRecords_GetRecordCount(errrecs, &cnt); - ok(hr == S_OK, "got %08x\n", hr); - ok(cnt == 1, "expected 1 got %d\n", cnt); + hr = IErrorInfo_GetHelpContext(errorinfo, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); - hr = IErrorRecords_AddErrorRecord(errrecs, &info2, 2, NULL, NULL, 0); - ok(hr == S_OK, "got %08x\n", hr); + memset(&guid, 0xac, sizeof(guid)); + hr = IErrorInfo_GetGUID(errorinfo, &guid); + ok(hr == S_OK, "got %08x\n", hr); + ok(IsEqualGUID(&guid, &GUID_NULL), "got wrong guid\n"); - hr = IErrorRecords_GetRecordCount(errrecs, &cnt); - ok(hr == S_OK, "got %08x\n", hr); - ok(cnt == 2, "expected 2 got %d\n", cnt); + str = (BSTR)0x1; + hr = IErrorInfo_GetSource(errorinfo, &str); + ok(hr == E_FAIL, "got %08x\n", hr); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); - hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + str = (BSTR)0x1; + hr = IErrorInfo_GetDescription(errorinfo, &str); + ok(hr == E_FAIL, "got %08x\n", hr); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); - hr = IErrorRecords_GetBasicErrorInfo(errrecs, 100, &info3); - ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); + str = (BSTR)0x1; + hr = IErrorInfo_GetHelpFile(errorinfo, &str); + ok(hr == E_FAIL, "got %08x\n", hr); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); - hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, &info3); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - { - ok(info3.dwMinor == 2, "expected 2 got %d\n", info3.dwMinor); - } + context = 1; + hr = IErrorInfo_GetHelpContext(errorinfo, &context); + ok(hr == E_FAIL, "got %08x\n", hr); + ok(context == 0, "got %d\n", context); - IErrorRecords_Release(errrecs); - } + IErrorInfo_Release(errorinfo); + + hr = IErrorInfo_QueryInterface(errorinfo, &IID_ICreateErrorInfo, (void**)&createerror); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IErrorRecords, (void**)&errrecs); + ok(hr == S_OK, "got %08x\n", hr); + + memset(&info, 0, sizeof(ERRORINFO)); + info.dwMinor = 1; + memset(&info2, 0, sizeof(ERRORINFO)); + info2.dwMinor = 2; + memset(&info3, 0, sizeof(ERRORINFO)); + + hr = IErrorRecords_AddErrorRecord(errrecs, NULL, 268435456, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IErrorRecords_AddErrorRecord(errrecs, &info, 1, NULL, NULL, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IErrorRecords_GetRecordCount(errrecs, &cnt); + ok(hr == S_OK, "got %08x\n", hr); + ok(cnt == 1, "expected 1 got %d\n", cnt); - IUnknown_Release(unk); + hr = IErrorRecords_AddErrorRecord(errrecs, &info2, 2, NULL, NULL, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IErrorRecords_GetRecordCount(errrecs, &cnt); + ok(hr == S_OK, "got %08x\n", hr); + ok(cnt == 2, "expected 2 got %d\n", cnt); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 100, &info3); + ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, &info3); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + ok(info3.dwMinor == 2, "expected 2 got %d\n", info3.dwMinor); } + + IErrorRecords_Release(errrecs); + IUnknown_Release(unk); } static void test_initializationstring(void)

1 0

Rob Walker : setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 10058e7c4efb472a372b09705c16d312d62d6b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10058e7c4efb472a372b09705… Author: Rob Walker <bob.mt.wya(a)gmail.com> Date: Thu Jun 2 18:08:11 2016 +0100 setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index f442157..90a05ab 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -60,8 +60,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) setupapi.CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA @ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 9bfaadd..897572d 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -71,8 +71,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) @ stdcall CM_Get_Device_IDA(ptr ptr long long) @ stdcall CM_Get_Device_IDW(ptr ptr long long) @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index ffc766b..6ecf240 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -419,6 +419,26 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO } /*********************************************************************** + * CM_Get_DevNode_Status (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev, + ULONG flags) +{ + FIXME("%p %p 0x%08x 0x%08x: stub\n", status, problem, dev, flags); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_Status_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST dev, + ULONG flags, HMACHINE machine) +{ + FIXME("%p %p 0x%08x 0x%08x %p: stub\n", status, problem, dev, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Enumerate_Classes (SETUPAPI.@) */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)

1 0

Hugh McMaster : reg: Recognise hyphen and forward slash help switches.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 6ce8524271a0290c805b3f2fcb3442995b1943ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce8524271a0290c805b3f2fc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:23:17 2016 +0000 reg: Recognise hyphen and forward slash help switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e3c2fdc..71c1b89 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -877,6 +877,17 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL return ret; } +static BOOL is_help_switch(const WCHAR *s) +{ + if (strlenW(s) > 2) + return FALSE; + + if ((s[0] == '/' || s[0] == '-') && (s[1] == 'h' || s[1] == '?')) + return TRUE; + + return FALSE; +} + int wmain(int argc, WCHAR *argvW[]) { int i; @@ -886,13 +897,11 @@ int wmain(int argc, WCHAR *argvW[]) static const WCHAR queryW[] = {'q','u','e','r','y',0}; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; - static const WCHAR slashHW[] = {'/','h',0}; static const WCHAR slashSW[] = {'/','s',0}; static const WCHAR slashTW[] = {'/','t',0}; static const WCHAR slashVW[] = {'/','v',0}; static const WCHAR slashVAW[] = {'/','v','a',0}; static const WCHAR slashVEW[] = {'/','v','e',0}; - static const WCHAR slashHelpW[] = {'/','?',0}; if (argc == 1) { @@ -901,7 +910,7 @@ int wmain(int argc, WCHAR *argvW[]) return 1; } - if (!lstrcmpW(argvW[1], slashHelpW) || !lstrcmpiW(argvW[1], slashHW)) + if (is_help_switch(argvW[1])) { output_message(STRING_USAGE); return 0; @@ -918,8 +927,7 @@ int wmain(int argc, WCHAR *argvW[]) output_message(STRING_FUNC_HELP, struprW(argvW[1])); return 1; } - else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || - !lstrcmpiW(argvW[2], slashHW))) + else if (argc == 3 && is_help_switch(argvW[2])) { output_message(STRING_ADD_USAGE); return 0; @@ -976,8 +984,7 @@ int wmain(int argc, WCHAR *argvW[]) output_message(STRING_FUNC_HELP, struprW(argvW[1])); return 1; } - else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || - !lstrcmpiW(argvW[2], slashHW))) + else if (argc == 3 && is_help_switch(argvW[2])) { output_message(STRING_DELETE_USAGE); return 0; @@ -1014,8 +1021,7 @@ int wmain(int argc, WCHAR *argvW[]) output_message(STRING_FUNC_HELP, struprW(argvW[1])); return 1; } - else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || - !lstrcmpiW(argvW[2], slashHW))) + else if (argc == 3 && is_help_switch(argvW[2])) { output_message(STRING_QUERY_USAGE); return 0;

1 0

Thomas Faber : wininet: Avoid buffer overrun in alloc_object.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 877a628aa620d034cf0195e43ac0f3c19f1beac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=877a628aa620d034cf0195e43… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Jun 2 14:36:53 2016 +0200 wininet: Avoid buffer overrun in alloc_object. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5c41664..d3d6a38 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -152,7 +152,7 @@ void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t si handle_table[handle] = ret; ret->valid_handle = TRUE; - while(handle_table[next_handle] && next_handle < handle_table_size) + while(next_handle < handle_table_size && handle_table[next_handle]) next_handle++; }

1 0

Aric Stewart : winex11.drv: Correct sizes in COMPOSITIONSTRING structure when updating fields.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: a357a29a5541d5c3c08ea484ae3d68d30af1faa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a357a29a5541d5c3c08ea484a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 13:29:24 2016 -0500 winex11.drv: Correct sizes in COMPOSITIONSTRING structure when updating fields. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/ime.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index ee622c1..06576dd 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -217,11 +217,11 @@ static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len) { needed_size += lpcs->dwCompReadAttrLen; needed_size += lpcs->dwCompReadClauseLen; - needed_size += lpcs->dwCompReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultReadClauseLen; - needed_size += lpcs->dwResultReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultClauseLen; - needed_size += lpcs->dwResultStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultStrLen * sizeof(WCHAR); needed_size += lpcs->dwPrivateSize; } rc = ImmCreateIMCC(needed_size); @@ -304,6 +304,8 @@ static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len) *(DWORD*)(&newdata[current_offset]) = len; current_offset += sizeof(DWORD); } + else + new_one->dwCompClauseLen = 0; /* CompStr */ new_one->dwCompStrLen = len; @@ -359,12 +361,12 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) { needed_size += lpcs->dwCompReadAttrLen; needed_size += lpcs->dwCompReadClauseLen; - needed_size += lpcs->dwCompReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwCompAttrLen; needed_size += lpcs->dwCompClauseLen; - needed_size += lpcs->dwCompStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultReadClauseLen; - needed_size += lpcs->dwResultReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwPrivateSize; } rc = ImmCreateIMCC(needed_size); @@ -446,6 +448,8 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) *(DWORD*)(&newdata[current_offset]) = len; current_offset += sizeof(DWORD); } + else + new_one->dwResultClauseLen = 0; /* ResultStr */ new_one->dwResultStrLen = len;

1 0

Aric Stewart : winemac.drv: Correct sizes in COMPOSITIONSTRING structure when updating fields.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 73bb165ba5b7611689034b968405d92fae65a1fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=73bb165ba5b7611689034b968… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 13:29:46 2016 -0500 winemac.drv: Correct sizes in COMPOSITIONSTRING structure when updating fields. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/ime.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 295c6cc..7681e8e 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -178,11 +178,11 @@ static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len, DWORD *flags) { needed_size += lpcs->dwCompReadAttrLen; needed_size += lpcs->dwCompReadClauseLen; - needed_size += lpcs->dwCompReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultReadClauseLen; - needed_size += lpcs->dwResultReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultClauseLen; - needed_size += lpcs->dwResultStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultStrLen * sizeof(WCHAR); needed_size += lpcs->dwPrivateSize; } rc = ImmCreateIMCC(needed_size); @@ -271,6 +271,8 @@ static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len, DWORD *flags) *(DWORD*)&newdata[current_offset] = len; current_offset += sizeof(DWORD); } + else + new_one->dwCompClauseLen = 0; /* CompStr */ new_one->dwCompStrLen = len; @@ -324,12 +326,12 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) { needed_size += lpcs->dwCompReadAttrLen; needed_size += lpcs->dwCompReadClauseLen; - needed_size += lpcs->dwCompReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwCompAttrLen; needed_size += lpcs->dwCompClauseLen; - needed_size += lpcs->dwCompStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultReadClauseLen; - needed_size += lpcs->dwResultReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwPrivateSize; } rc = ImmCreateIMCC(needed_size); @@ -411,6 +413,8 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) *(DWORD*)&newdata[current_offset] = len; current_offset += sizeof(DWORD); } + else + new_one->dwResultClauseLen = 0; /* ResultStr */ new_one->dwResultStrLen = len;

1 0

Nikolay Sivov : user32/tests: Some tests for EqualRect()/SetRect().
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 54f41ae3ebc58a43aad5efdcecbad3fa7ba65236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f41ae3ebc58a43aad5efdce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 2 20:40:33 2016 +0300 user32/tests: Some tests for EqualRect()/SetRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/uitools.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index 1be709c..0f1cc58 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -112,8 +112,63 @@ static void test_SubtractRect(void) "(dest rect={%d, %d, %d, %d})\n", rect2.left, rect2.top, rect2.right, rect2.bottom); } +static void test_EqualRect(void) +{ + RECT rect1, rect2; + BOOL ret; + + SetRect(&rect1, 0, 0, 0, 0); + SetRect(&rect2, 1, 1, 1, 1); + + ret = EqualRect(NULL, NULL); + ok(!ret, "got %d\n", ret); + + ret = EqualRect(&rect1, NULL); + ok(!ret, "got %d\n", ret); + + ret = EqualRect(NULL, &rect2); + ok(!ret, "got %d\n", ret); + + ret = EqualRect(&rect1, &rect2); + ok(!ret, "got %d\n", ret); + + SetRect(&rect1, 0, 0, 10, 10); + SetRect(&rect2, 10, 10, 0, 0); + + ret = EqualRect(&rect1, &rect2); + ok(!ret, "got %d\n", ret); + + ret = EqualRect(&rect1, &rect1); + ok(ret, "got %d\n", ret); + + rect2 = rect1; + ret = EqualRect(&rect1, &rect2); + ok(ret, "got %d\n", ret); +} + +static void test_SetRect(void) +{ + RECT rect; + BOOL ret; + + ret = SetRect(NULL, 0, 0, 0, 0); + ok(!ret, "got %d\n", ret); + + ret = SetRect(&rect, 1, 2, 3, 4); + ok(ret, "got %d\n", ret); + ok(rect.left == 1 && rect.top == 2 && rect.right == 3 && rect.bottom == 4, + "got wrong rectangle\n"); + + ret = SetRect(&rect, 10, 10, 5, 5); + ok(ret, "got %d\n", ret); + ok(rect.left == 10 && rect.top == 10 && rect.right == 5 && rect.bottom == 5, + "got wrong rectangle\n"); +} + START_TEST(uitools) { test_FillRect(); test_SubtractRect(); + test_EqualRect(); + test_SetRect(); }

1 0

Andrey Gusev : advapi32: Fix a typo in comment.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 2c598e552341bed579de4aae5b3d1d618c6d5955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c598e552341bed579de4aae5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 23:40:12 2016 +0300 advapi32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index b2be5e3..01d5880 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2363,7 +2363,7 @@ BOOL WINAPI SystemFunction035(LPCSTR lpszDllFilePath) * MSDN documents this function as RtlGenRandom and declares it in ntsecapi.h * * PARAMS - * pbBufer [O] Pointer to memory to receive random bytes. + * pbBuffer [O] Pointer to memory to receive random bytes. * dwLen [I] Number of random bytes to fetch. * * RETURNS

1 0

Matteo Bruni : wined3d: Fix FFP vertex shaders with ARB_explicit_attrib_location.
by Alexandre Julliard 02 Jun '16

02 Jun '16

Module: wine Branch: master Commit: 785baaa94bc4bacf04ebceac7290bf55d3fd2a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=785baaa94bc4bacf04ebceac7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 1 23:16:52 2016 +0200 wined3d: Fix FFP vertex shaders with ARB_explicit_attrib_location. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e5a0e69..4e773b6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6363,10 +6363,15 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL)); + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); + for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i) { const char *type = i < ARRAY_SIZE(attrib_info) ? attrib_info[i].type : "vec4"; + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "layout(location = %u) ", i); shader_addline(buffer, "%s %s vs_in%u;\n", get_attribute_keyword(gl_info), type, i); } shader_addline(buffer, "\n");

1 0