January 2013 - Wine-Commits

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_GetId.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: fc8dfe60ea517d63f8ea01584b26bda1fe36f0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8dfe60ea517d63f8ea01584… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 14 10:21:03 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_GetId. --- dlls/d3dx9_36/xfile.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 63d85b6..234e071 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -160,9 +160,19 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name static HRESULT WINAPI ID3DXFileDataImpl_GetId(ID3DXFileData *iface, GUID *guid) { - FIXME("(%p)->(%p): stub\n", iface, guid); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + HRESULT ret; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, guid); + + if (!guid) + return E_POINTER; + + ret = IDirectXFileData_GetId(This->dxfile_data, guid); + if (ret != DXFILE_OK) + return error_dxfile_to_d3dxfile(ret); + + return S_OK; }

1 0

Huw Davies : usp10: Don't invert the y-offsets in RTL mode.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: a66efc263187851e9e88bc45b04afcf053290cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66efc263187851e9e88bc45b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 13:17:15 2013 +0000 usp10: Don't invert the y-offsets in RTL mode. --- dlls/usp10/usp10.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b25e956..23ba4f5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3282,15 +3282,15 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (i == 0) { x += pGoffset[orig_index].du * dir; - y += pGoffset[orig_index].dv * dir; + y += pGoffset[orig_index].dv; } else { lpDx[(i - 1) * 2] += pGoffset[orig_index].du * dir; - lpDx[(i - 1) * 2 + 1] += pGoffset[orig_index].dv * dir; + lpDx[(i - 1) * 2 + 1] += pGoffset[orig_index].dv; } lpDx[i * 2] -= pGoffset[orig_index].du * dir; - lpDx[i * 2 + 1] -= pGoffset[orig_index].dv * dir; + lpDx[i * 2 + 1] -= pGoffset[orig_index].dv; } }

1 0

Nikolay Sivov : xmllite: Add a stub function for DTD parsing.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 617a70f6c7985b35d2af8c8f0ef7788c1c9c7f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=617a70f6c7985b35d2af8c8f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 13 01:09:32 2013 +0400 xmllite: Add a stub function for DTD parsing. --- dlls/xmllite/reader.c | 41 ++++++++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9c14899..4e99f1d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -49,7 +49,9 @@ typedef enum XmlReadInState_Initial, XmlReadInState_XmlDecl, XmlReadInState_Misc_DTD, - XmlReadInState_DTD + XmlReadInState_DTD, + XmlReadInState_DTD_Misc, + XmlReadInState_Element } XmlReaderInternalState; typedef enum @@ -1117,12 +1119,22 @@ static HRESULT reader_parse_misc(xmlreader *reader) else break; - if (FAILED(hr)) return hr; + if (hr != S_FALSE) return hr; } return hr; } +/* [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? ('[' intSubset ']' S?)? '>' */ +static HRESULT reader_parse_dtd(xmlreader *reader) +{ + static const WCHAR doctypeW[] = {'D','O','C','T','Y','P','E',0}; + /* check if we have "<!DOCTYPE" */ + if (reader_cmp(reader, doctypeW)) return S_FALSE; + FIXME("DTD parsing not implemented\n"); + return E_NOTIMPL; +} + static HRESULT reader_parse_nextnode(xmlreader *reader) { HRESULT hr; @@ -1158,15 +1170,30 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) case XmlReadInState_Misc_DTD: hr = reader_parse_misc(reader); if (FAILED(hr)) return hr; - if (hr == S_FALSE) - { + if (hr == S_FALSE) { reader->instate = XmlReadInState_DTD; - return S_OK; + continue; } + else if (hr == S_OK) return hr; break; case XmlReadInState_DTD: - FIXME("DTD parsing not supported\n"); - return E_NOTIMPL; + hr = reader_parse_dtd(reader); + if (FAILED(hr)) return hr; + if (hr == S_FALSE) { + reader->instate = XmlReadInState_DTD_Misc; + continue; + } + else if (hr == S_OK) return hr; + break; + case XmlReadInState_DTD_Misc: + hr = reader_parse_misc(reader); + if (FAILED(hr)) return hr; + if (hr == S_FALSE) { + reader->instate = XmlReadInState_Element; + continue; + } + else if (hr == S_OK) return hr; + break; default: FIXME("internal state %d not handled\n", reader->instate); return E_NOTIMPL;

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_GetName.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: f8d908938a4d282ee3cc48fa58e2c55b0e610bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d908938a4d282ee3cc48fa5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 14 10:20:54 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_GetName. --- dlls/d3dx9_36/xfile.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 8fa20ff..63d85b6 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -137,9 +137,24 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetEnum(ID3DXFileData *iface, ID3DXFileE static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name, SIZE_T *size) { - FIXME("(%p)->(%p, %p): stub\n", iface, name, size); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + DWORD dxfile_size; + HRESULT ret; - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", iface, name, size); + + if (!name || !size) + return E_POINTER; + + dxfile_size = *size; + + ret = IDirectXFileData_GetName(This->dxfile_data, name, &dxfile_size); + if (ret != DXFILE_OK) + return error_dxfile_to_d3dxfile(ret); + + *size = dxfile_size; + + return S_OK; }

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::GetServer.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 19f9420f62f8de530901742b9349b451b74d0b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f9420f62f8de530901742b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 14 10:52:05 2013 +0100 wmiutils: Implement IWbemPath::GetServer. --- dlls/wmiutils/path.c | 15 ++++++++++--- dlls/wmiutils/tests/path.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 5075bfc..abdf0a5 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -421,11 +421,18 @@ static HRESULT WINAPI path_SetServer( static HRESULT WINAPI path_GetServer( IWbemPath *iface, - ULONG *puNameBufLength, - LPWSTR pName) + ULONG *len, + LPWSTR name) { - FIXME("%p, %p, %p\n", iface, puNameBufLength, pName); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %p, %p\n", iface, len, name); + + if (!len || (*len && !name)) return WBEM_E_INVALID_PARAMETER; + if (!path->class) return WBEM_E_NOT_AVAILABLE; + if (*len > path->len_server) strcpyW( name, path->server ); + *len = path->len_server + 1; + return S_OK; } static HRESULT WINAPI path_GetNamespaceCount( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index affd408..2d435f0 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -323,6 +323,53 @@ static void test_IWbemPath_GetClassName(void) IWbemPath_Release( path ); } +static void test_IWbemPath_GetServer(void) +{ + static const WCHAR dotW[] = {'.',0}; + IWbemPath *path; + HRESULT hr; + WCHAR buf[32]; + ULONG len; + + if (!(path = create_path())) return; + + hr = IWbemPath_GetServer( path, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetServer( path, &len, NULL ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, buf ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetServer( path, &len, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, dotW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( dotW ) + 1, "unexpected length %u\n", len ); + + IWbemPath_Release( path ); +} + START_TEST (path) { CoInitialize( NULL ); @@ -330,6 +377,7 @@ START_TEST (path) test_IWbemPath_SetText(); test_IWbemPath_GetText(); test_IWbemPath_GetClassName(); + test_IWbemPath_GetServer(); CoUninitialize(); }

1 0

Huw Davies : usp10: Fix pair adjustment for RTL text.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 464bf22fdf9840bba3b1b50e1c4c64f2ceaa4595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464bf22fdf9840bba3b1b50e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 13:17:19 2013 +0000 usp10: Fix pair adjustment for RTL text. --- dlls/usp10/opentype.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index d054e32..978c1d2 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1699,11 +1699,13 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c double devX, devY; int index; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + int offset_sign = (analysis->fRTL && analysis->fLogicalOrder) ? -1 : 1; + index = GPOS_apply_PairAdjustment(look, analysis, glyphs, glyph_index, glyph_count, ppem, adjust, advance); if (adjust[0].x || adjust[0].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust[0].x, adjust[0].y, &devX, &devY); - pGoffset[glyph_index].du += round(devX); + pGoffset[glyph_index].du += round(devX) * offset_sign; pGoffset[glyph_index].dv += round(devY); } if (advance[0].x || advance[0].y) @@ -1714,7 +1716,7 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c if (adjust[1].x || adjust[1].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust[1].x, adjust[1].y, &devX, &devY); - pGoffset[glyph_index + write_dir].du += round(devX); + pGoffset[glyph_index + write_dir].du += round(devX) * offset_sign; pGoffset[glyph_index + write_dir].dv += round(devY); } if (advance[1].x || advance[1].y)

1 0

Huw Davies : usp10: Propagate the script analysis to the GPOS lookup functions.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: b864b4aae24e745e03a144e089e750bccf89e2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b864b4aae24e745e03a144e08… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 13:17:16 2013 +0000 usp10: Propagate the script analysis to the GPOS lookup functions. --- dlls/usp10/opentype.c | 50 ++++++++++++++++++++++++++++-------------- dlls/usp10/shape.c | 13 +++------- dlls/usp10/usp10_internal.h | 3 +- 3 files changed, 39 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b864b4aae24e745e03a14…

1 0

Jacek Caban : atl100: Added AtlComModuleUnregisterServer implementation.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: ca5ded28734fad465bd9a435e2544ce395fbf0a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5ded28734fad465bd9a435e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 14 13:03:13 2013 +0100 atl100: Added AtlComModuleUnregisterServer implementation. --- dlls/atl100/atl.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 1 + 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 099513a..28b8cbc 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -454,6 +454,56 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, } /*********************************************************************** + * AtlComModuleUnregisterServer [atl100.22] + */ +HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) +{ + const struct _ATL_CATMAP_ENTRY *catmap; + _ATL_OBJMAP_ENTRY **iter; + HRESULT hres; + + TRACE("(%p %x %s)\n", mod, bRegTypeLib, debugstr_guid(clsid)); + + for(iter = mod->m_ppAutoObjMapFirst; iter < mod->m_ppAutoObjMapLast; iter++) { + if(!*iter || (clsid && !IsEqualCLSID((*iter)->pclsid, clsid))) + continue; + + TRACE("Unregistering clsid %s\n", debugstr_guid((*iter)->pclsid)); + + catmap = (*iter)->pfnGetCategoryMap(); + if(catmap) { + hres = AtlRegisterClassCategoriesHelper((*iter)->pclsid, catmap, FALSE); + if(FAILED(hres)) + return hres; + } + + hres = (*iter)->pfnUpdateRegistry(FALSE); + if(FAILED(hres)) + return hres; + } + + if(bRegTypeLib) { + ITypeLib *typelib; + TLIBATTR *attr; + BSTR path; + + hres = AtlLoadTypeLib(mod->m_hInstTypeLib, NULL, &path, &typelib); + if(FAILED(hres)) + return hres; + + SysFreeString(path); + hres = ITypeLib_GetLibAttr(typelib, &attr); + if(SUCCEEDED(hres)) + hres = UnRegisterTypeLib(&attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, attr->lcid, attr->syskind); + ITypeLib_Release(typelib); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} + +/*********************************************************************** * AtlRegisterClassCategoriesHelper [atl100.49] */ HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const struct _ATL_CATMAP_ENTRY *catmap, BOOL reg) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index b30b839..1eae2ed 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -6,7 +6,7 @@ 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) 17 stub AtlComModuleRegisterClassObjects 20 stub AtlComModuleRevokeClassObjects -22 stub AtlComModuleUnregisterServer +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 7719257..bf36bbc 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -8,7 +8,7 @@ 18 stdcall AtlComModuleRegisterServer(ptr long ptr) 19 stdcall AtlRegisterTypeLib(ptr wstr) 20 stub AtlComModuleRevokeClassObjects -22 stub AtlComModuleUnregisterServer +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD 24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo diff --git a/include/atlbase.h b/include/atlbase.h index d0dd96c..84a22b4 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -255,6 +255,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE,LPCOLESTR,BSTR*,ITypeLib**); HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE,LPCOLESTR); HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID,const struct _ATL_CATMAP_ENTRY*,BOOL); HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void**); +HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); #endif /* __WINE_ATLBASE_H__ */

1 0

Stefan Dösinger : d3d8: Return D3D_OK from the palette setters.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: d70ab45fc5e3d607b304237803e428e86eadafd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d70ab45fc5e3d607b30423780… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 14 11:56:54 2013 +0100 d3d8: Return D3D_OK from the palette setters. --- dlls/d3d8/device.c | 8 +++--- dlls/d3d8/tests/device.c | 66 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7a13344..e92be20 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1839,12 +1839,12 @@ static HRESULT WINAPI d3d8_device_GetInfo(IDirect3DDevice8 *iface, static HRESULT WINAPI d3d8_device_SetPaletteEntries(IDirect3DDevice8 *iface, UINT palette_idx, const PALETTEENTRY *entries) { - FIXME("iface %p, palette_idx %u, entries %p unimplemented\n", iface, palette_idx, entries); + WARN("iface %p, palette_idx %u, entries %p unimplemented\n", iface, palette_idx, entries); /* GPUs stopped supporting palettized textures with the Shader Model 1 generation. Wined3d * does not have a d3d8/9-style palette API */ - return D3DERR_INVALIDCALL; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetPaletteEntries(IDirect3DDevice8 *iface, @@ -1857,9 +1857,9 @@ static HRESULT WINAPI d3d8_device_GetPaletteEntries(IDirect3DDevice8 *iface, static HRESULT WINAPI d3d8_device_SetCurrentTexturePalette(IDirect3DDevice8 *iface, UINT palette_idx) { - FIXME("iface %p, palette_idx %u unimplemented.\n", iface, palette_idx); + WARN("iface %p, palette_idx %u unimplemented.\n", iface, palette_idx); - return D3DERR_INVALIDCALL; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetCurrentTexturePalette(IDirect3DDevice8 *iface, UINT *palette_idx) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2c8cbbf..17c3443 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3,7 +3,7 @@ * Copyright (C) 2006 Chris Robinson * Copyright (C) 2006 Louis Lenders * Copyright 2006-2007 Henri Verbeet - * Copyright 2010, 2011 Stefan Dösinger for CodeWeavers + * Copyright 2006-2007, 2011-2013 Stefan Dösinger for CodeWeavers * Copyright 2013 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -4469,6 +4469,69 @@ static void test_surface_lockrect_blocks(void) DestroyWindow(window); } +static void test_set_palette(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + UINT refcount; + HWND window; + HRESULT hr; + PALETTEENTRY pal[256]; + unsigned int i; + D3DCAPS8 caps; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create d3d8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + for (i = 0; i < sizeof(pal) / sizeof(*pal); i++) + { + pal[i].peRed = i; + pal[i].peGreen = i; + pal[i].peBlue = i; + pal[i].peFlags = 0xff; + } + hr = IDirect3DDevice8_SetPaletteEntries(device, 0, pal); + ok(SUCCEEDED(hr), "Failed to set palette entries, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + for (i = 0; i < sizeof(pal) / sizeof(*pal); i++) + { + pal[i].peRed = i; + pal[i].peGreen = i; + pal[i].peBlue = i; + pal[i].peFlags = i; + } + if (caps.TextureCaps & D3DPTEXTURECAPS_ALPHAPALETTE) + { + hr = IDirect3DDevice8_SetPaletteEntries(device, 0, pal); + ok(SUCCEEDED(hr), "Failed to set palette entries, hr %#x.\n", hr); + } + else + { + hr = IDirect3DDevice8_SetPaletteEntries(device, 0, pal); + ok(hr == D3DERR_INVALIDCALL, "SetPaletteEntries returned %#x, expected D3DERR_INVALIDCALL.\n", hr); + } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -4542,6 +4605,7 @@ START_TEST(device) test_surface_format_null(); test_surface_double_unlock(); test_surface_lockrect_blocks(); + test_set_palette(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d9: Return D3D_OK from the palette setters.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: c57511ce4adede3a248ae89fc8ea6fd7257b92f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57511ce4adede3a248ae89fc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 14 11:56:53 2013 +0100 d3d9: Return D3D_OK from the palette setters. --- dlls/d3d9/device.c | 13 ++++++--- dlls/d3d9/tests/device.c | 65 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d79ad62..67f9906 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1832,9 +1832,14 @@ static HRESULT WINAPI d3d9_device_ValidateDevice(IDirect3DDevice9Ex *iface, DWOR static HRESULT WINAPI d3d9_device_SetPaletteEntries(IDirect3DDevice9Ex *iface, UINT palette_idx, const PALETTEENTRY *entries) { - FIXME("iface %p, palette_idx %u, entries %p unimplemented.\n", iface, palette_idx, entries); + WARN("iface %p, palette_idx %u, entries %p unimplemented.\n", iface, palette_idx, entries); - return D3DERR_INVALIDCALL; + /* The d3d9 palette API is non-functional on Windows. Getters and setters are implemented, + * and some drivers allow the creation of P8 surfaces. These surfaces can be copied to + * other P8 surfaces with StretchRect, but cannot be converted to (A)RGB. + * + * Some older(dx7) cards may have support for P8 textures, but games cannot rely on this. */ + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetPaletteEntries(IDirect3DDevice9Ex *iface, @@ -1847,9 +1852,9 @@ static HRESULT WINAPI d3d9_device_GetPaletteEntries(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_SetCurrentTexturePalette(IDirect3DDevice9Ex *iface, UINT palette_idx) { - FIXME("iface %p, palette_idx %u unimplemented.\n", iface, palette_idx); + WARN("iface %p, palette_idx %u unimplemented.\n", iface, palette_idx); - return D3DERR_INVALIDCALL; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetCurrentTexturePalette(IDirect3DDevice9Ex *iface, UINT *palette_idx) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c81047a..7e7fe40 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2006 Vitaliy Margolen * Copyright (C) 2006 Chris Robinson - * Copyright 2006-2007, 2010, 2011 Stefan Dösinger for CodeWeavers + * Copyright 2006-2008, 2010-2011, 2013 Stefan Dösinger for CodeWeavers * Copyright 2005, 2006, 2007 Henri Verbeet * Copyright 2013 Henri Verbeet for CodeWeavers * Copyright (C) 2008 Rico Schüller @@ -5968,6 +5968,68 @@ static void test_surface_lockrect_blocks(void) DestroyWindow(window); } +static void test_set_palette(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + UINT refcount; + HWND window; + HRESULT hr; + PALETTEENTRY pal[256]; + unsigned int i; + D3DCAPS9 caps; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + for (i = 0; i < sizeof(pal) / sizeof(*pal); i++) + { + pal[i].peRed = i; + pal[i].peGreen = i; + pal[i].peBlue = i; + pal[i].peFlags = 0xff; + } + hr = IDirect3DDevice9_SetPaletteEntries(device, 0, pal); + ok(SUCCEEDED(hr), "Failed to set palette entries, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + for (i = 0; i < sizeof(pal) / sizeof(*pal); i++) + { + pal[i].peRed = i; + pal[i].peGreen = i; + pal[i].peBlue = i; + pal[i].peFlags = i; + } + if (caps.TextureCaps & D3DPTEXTURECAPS_ALPHAPALETTE) + { + hr = IDirect3DDevice9_SetPaletteEntries(device, 0, pal); + ok(SUCCEEDED(hr), "Failed to set palette entries, hr %#x.\n", hr); + } + else + { + hr = IDirect3DDevice9_SetPaletteEntries(device, 0, pal); + ok(hr == D3DERR_INVALIDCALL, "SetPaletteEntries returned %#x, expected D3DERR_INVALIDCALL.\n", hr); + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6053,6 +6115,7 @@ START_TEST(device) test_surface_format_null(); test_surface_double_unlock(); test_surface_lockrect_blocks(); + test_set_palette(); } out:

1 0