August 2021 - Wine-commits - list.winehq.org

Jacek Caban : conhost: Use dedicated ioctl for GetConsoleWindow.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 365e99c022b96b903b615b66f54592e6121dcac7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=365e99c022b96b903b615b66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 12:29:09 2021 +0200 conhost: Use dedicated ioctl for GetConsoleWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 6 +++--- include/wine/condrv.h | 2 +- programs/conhost/conhost.c | 11 ++++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 8c61d28e8c6..6f12ddfe7b2 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -54,12 +54,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(console); */ HWND WINAPI GetConsoleWindow(void) { - struct condrv_input_info info; + condrv_handle_t win; BOOL ret; ret = DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, - IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ); - return ret ? LongToHandle( info.win ) : NULL; + IOCTL_CONDRV_GET_WINDOW, NULL, 0, &win, sizeof(win), NULL, NULL ); + return ret ? LongToHandle( win ) : NULL; } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index add08be20c8..4d2332a1ee9 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -42,6 +42,7 @@ #define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 19, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_CONDRV_BEEP CTL_CODE(FILE_DEVICE_CONSOLE, 20, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_CONDRV_FLUSH CTL_CODE(FILE_DEVICE_CONSOLE, 21, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_CONDRV_GET_WINDOW CTL_CODE(FILE_DEVICE_CONSOLE, 22, METHOD_BUFFERED, FILE_ANY_ACCESS) /* console output ioctls */ #define IOCTL_CONDRV_WRITE_CONSOLE CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_WRITE_ACCESS) @@ -87,7 +88,6 @@ struct condrv_input_info unsigned int input_cp; /* console input codepage */ unsigned int output_cp; /* console output codepage */ unsigned int input_count; /* number of available input records */ - condrv_handle_t win; /* renderer window handle */ }; /* IOCTL_CONDRV_SET_INPUT_INFO params */ diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index ecfdd082a81..eeca9e62a3f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2519,11 +2519,20 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, if (!(info = alloc_ioctl_buffer( sizeof(*info )))) return STATUS_NO_MEMORY; info->input_cp = console->input_cp; info->output_cp = console->output_cp; - info->win = condrv_handle( console->win ); info->input_count = console->record_count; return STATUS_SUCCESS; } + case IOCTL_CONDRV_GET_WINDOW: + { + condrv_handle_t *result; + TRACE( "get window\n" ); + if (in_size || *out_size != sizeof(*result)) return STATUS_INVALID_PARAMETER; + if (!(result = alloc_ioctl_buffer( sizeof(*result )))) return STATUS_NO_MEMORY; + *result = condrv_handle( console->win ); + return STATUS_SUCCESS; + } + case IOCTL_CONDRV_SET_INPUT_INFO: { const struct condrv_input_info_params *params = in_data;

1 0

Jacek Caban : conhost: Use message window to return a window for windowless consoles.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: da86e50e2936789c9e9a963d67e1207504c16784 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da86e50e2936789c9e9a963d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 12:29:23 2021 +0200 conhost: Use message window to return a window for windowless consoles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38640 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 +++ programs/conhost/conhost.c | 7 ++--- programs/conhost/conhost.h | 1 + programs/conhost/window.c | 71 +++++++++++++++++++++++++++++++------------ 4 files changed, 60 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da86e50e2936789c9e9a…

1 0

Francois Gouget : kernel32/tests: Don't skip the sorting tests on Windows.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 01d513da8f2339e9f28483e3c010b07de441cef6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d513da8f2339e9f28483e3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 17 17:32:50 2021 +0200 kernel32/tests: Don't skip the sorting tests on Windows. Only skip them in Wine since it's missing a compatible collation table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 75c86bbaf21..c65c2cce3f2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3093,6 +3093,13 @@ static void test_sorting(void) assert(sizeof(buf) >= sizeof(strings)); + /* this requires the collation table patch to make it MS compatible */ + if (strcmp(winetest_platform, "wine") == 0) + { + skip("in Wine due to the lack of a compatible collation table\n"); + return; + } + /* 1. sort using lstrcmpA */ memcpy(buf, strings, sizeof(strings)); qsort(buf, ARRAY_SIZE(strings), sizeof(strings[0]), compare_string1); @@ -7183,6 +7190,5 @@ START_TEST(locale) test_SpecialCasing(); test_NLSVersion(); test_geo_name(); - /* this requires collation table patch to make it MS compatible */ - if (0) test_sorting(); + test_sorting(); }

1 0

Nikolay Sivov : msxml3: Do not depend on libxml2 for XMLHTTP object.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 6d09e450154df3d6e17f76d0f431a8087e545e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d09e450154df3d6e17f76d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 17 16:18:53 2021 +0300 msxml3: Do not depend on libxml2 for XMLHTTP object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 4 ++-- dlls/msxml3/factory.c | 4 ++-- dlls/msxml3/httprequest.c | 32 +++----------------------------- dlls/msxml3/msxml_dispex.h | 3 +++ dlls/msxml3/msxml_private.h | 2 -- dlls/msxml3/schema.c | 4 ++-- dlls/msxml3/stylesheet.c | 2 +- dlls/msxml3/xmlview.c | 4 ++-- 8 files changed, 15 insertions(+), 40 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 61fbbf9f20b..10892d40757 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -3801,7 +3801,7 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) return S_OK; } -HRESULT DOMDocument_create(MSXML_VERSION version, void **ppObj) +HRESULT dom_document_create(MSXML_VERSION version, void **ppObj) { xmlDocPtr xmldoc; HRESULT hr; @@ -3842,7 +3842,7 @@ IUnknown* create_domdoc( xmlNodePtr document ) #else -HRESULT DOMDocument_create(MSXML_VERSION version, void **ppObj) +HRESULT dom_document_create(MSXML_VERSION version, void **ppObj) { MESSAGE("This program tried to use a DOMDocument object, but\n" "libxml2 support was not present at compile time.\n"); diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 445cfbf730d..197f72cd13f 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -302,7 +302,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) IsEqualCLSID( rclsid, &CLSID_DOMDocument40 )|| /* Version dep. v 4.0 */ IsEqualCLSID( rclsid, &CLSID_DOMDocument60 )) /* Version dep. v 6.0 */ { - return DOMClassFactory_Create(rclsid, riid, ppv, DOMDocument_create); + return DOMClassFactory_Create(rclsid, riid, ppv, dom_document_create); } else if( IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache ) || IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache26 ) || @@ -323,7 +323,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument40 ) || IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument60 )) { - return DOMClassFactory_Create(rclsid, riid, ppv, DOMDocument_create); + return DOMClassFactory_Create(rclsid, riid, ppv, dom_document_create); } else if( IsEqualCLSID( rclsid, &CLSID_SAXXMLReader) || IsEqualCLSID( rclsid, &CLSID_SAXXMLReader30 ) || diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 20ec389739e..15a1f888ebd 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -22,14 +22,7 @@ #define COBJMACROS #define NONAMELESSUNION -#include "config.h" - #include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -# include <libxml/xmlerror.h> -# include <libxml/encoding.h> -#endif #include "windef.h" #include "winbase.h" @@ -44,11 +37,10 @@ #include "docobj.h" #include "shlwapi.h" -#include "msxml_private.h" +#include "msxml_dispex.h" #include "wine/debug.h" - -#ifdef HAVE_LIBXML2 +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -1238,7 +1230,7 @@ static HRESULT httprequest_get_responseXML(httprequest *This, IDispatch **body) if (!body) return E_INVALIDARG; if (This->state != READYSTATE_COMPLETE) return E_FAIL; - hr = DOMDocument_create(MSXML_DEFAULT, (void**)&doc); + hr = dom_document_create(MSXML_DEFAULT, (void**)&doc); if (hr != S_OK) return hr; hr = httprequest_get_responseText(This, &str); @@ -2151,21 +2143,3 @@ HRESULT ServerXMLHTTP_create(void **obj) return S_OK; } - -#else - -HRESULT XMLHTTPRequest_create(void **ppObj) -{ - MESSAGE("This program tried to use a XMLHTTPRequest object, but\n" - "libxml2 support was not present at compile time.\n"); - return E_NOTIMPL; -} - -HRESULT ServerXMLHTTP_create(void **obj) -{ - MESSAGE("This program tried to use a ServerXMLHTTP object, but\n" - "libxml2 support was not present at compile time.\n"); - return E_NOTIMPL; -} - -#endif diff --git a/dlls/msxml3/msxml_dispex.h b/dlls/msxml3/msxml_dispex.h index ec3860c2754..2f9c53144ef 100644 --- a/dlls/msxml3/msxml_dispex.h +++ b/dlls/msxml3/msxml_dispex.h @@ -144,4 +144,7 @@ static inline HRESULT return_bstrn(const WCHAR *value, int len, BSTR *p) return S_OK; } +extern HRESULT dom_document_create(MSXML_VERSION class_version, void **document) DECLSPEC_HIDDEN; +IUri *get_base_uri(IUnknown *site) DECLSPEC_HIDDEN; + #endif /* __MSXML_DISPEX__ */ diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 43c6de6454e..12ef1dcedf8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -385,7 +385,6 @@ static inline HRESULT return_var_false(VARIANT_BOOL *p) extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, LONG line, LONG linepos, LONG filepos ) DECLSPEC_HIDDEN; -extern HRESULT DOMDocument_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN; extern HRESULT SchemaCache_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN; extern HRESULT XMLDocument_create(void**) DECLSPEC_HIDDEN; extern HRESULT SAXXMLReader_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN; @@ -404,7 +403,6 @@ HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; HRESULT create_uri(IUri *base, const WCHAR *, IUri **) DECLSPEC_HIDDEN; HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; -IUri *get_base_uri(IUnknown *) DECLSPEC_HIDDEN; /* Error Codes - not defined anywhere in the public headers */ #define E_XML_ELEMENT_UNDECLARED 0xC00CE00D diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index e385b9b5635..26e54c8728c 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -942,7 +942,7 @@ static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI, MSXM cache_entry* entry; IXMLDOMDocument3* domdoc = NULL; xmlDocPtr doc = NULL; - HRESULT hr = DOMDocument_create(version, (void**)&domdoc); + HRESULT hr = dom_document_create(version, (void **)&domdoc); VARIANT_BOOL b = VARIANT_FALSE; CacheEntryType type = CacheEntryType_Invalid; @@ -1266,7 +1266,7 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri BSTR xml; IXMLDOMNode_get_xml(domnode, &xml); - DOMDocument_create(This->version, (void**)&domdoc); + dom_document_create(This->version, (void **)&domdoc); IXMLDOMDocument_loadXML(domdoc, xml, &b); SysFreeString(xml); doc = xmlNodePtr_from_domnode((IXMLDOMNode*)domdoc, XML_DOCUMENT_NODE)->doc; diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 9863ed7aa4b..3ff3aa0146e 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -404,7 +404,7 @@ static HRESULT WINAPI xslprocessor_put_input( IXSLProcessor *iface, VARIANT inpu { IXMLDOMDocument *doc; - hr = DOMDocument_create(MSXML_DEFAULT, (void**)&doc); + hr = dom_document_create(MSXML_DEFAULT, (void **)&doc); if (hr == S_OK) { VARIANT_BOOL b; diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c index f1299ef957e..d7bc77b10f3 100644 --- a/dlls/msxml3/xmlview.c +++ b/dlls/msxml3/xmlview.c @@ -399,7 +399,7 @@ static inline HRESULT handle_xml_load(BindStatusCallback *This) if(FAILED(hres)) return display_error_page(This); - hres = DOMDocument_create(MSXML_DEFAULT, (void**)&xml); + hres = dom_document_create(MSXML_DEFAULT, (void **)&xml); if(FAILED(hres)) return display_error_page(This); @@ -475,7 +475,7 @@ static inline HRESULT handle_xml_load(BindStatusCallback *This) return display_error_page(This); } - hres = DOMDocument_create(MSXML_DEFAULT, (void**)&xsl); + hres = dom_document_create(MSXML_DEFAULT, (void **)&xsl); if(FAILED(hres)) { VariantClear(&var); IXMLDOMDocument3_Release(xml);

1 0

Nikolay Sivov : msxml3: Do not depend on libxml2 for XMLVIEW object.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: f48d1f79db4ea96c2856662ba24fd664add8f17c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f48d1f79db4ea96c2856662b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 17 16:18:54 2021 +0300 msxml3: Do not depend on libxml2 for XMLVIEW object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/xmlview.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c index d7bc77b10f3..f9b38e5e9b7 100644 --- a/dlls/msxml3/xmlview.c +++ b/dlls/msxml3/xmlview.c @@ -16,17 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define COBJMACROS #define NONAMELESSUNION -#ifdef HAVE_LIBXML2 -#include <libxml/parser.h> -#endif - #include "windef.h" #include "winbase.h" #include "ole2.h" @@ -37,10 +31,9 @@ #include "docobj.h" #include "wine/debug.h" +#include "wine/unicode.h" -#include "msxml_private.h" - -#ifdef HAVE_LIBXML2 +#include "msxml_dispex.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -1451,14 +1444,3 @@ HRESULT XMLView_create(void **ppObj) *ppObj = &This->IPersistMoniker_iface; return S_OK; } - -#else - -HRESULT XMLView_create(void **ppObj) -{ - MESSAGE("This program tried to use a XMLView object, but\n" - "libxml2 support was not present at compile time.\n"); - return E_NOTIMPL; -} - -#endif /* HAVE_LIBXML2 */

1 0

Nikolay Sivov : msxml3: Do not depend on libxml2 for urlmon integration code.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 7db3593a735c2fa6b4cf38d0053f38450122be5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7db3593a735c2fa6b4cf38d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 17 16:18:55 2021 +0300 msxml3: Do not depend on libxml2 for urlmon integration code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/bsc.c | 8 +------- dlls/msxml3/msxml_dispex.h | 7 +++++++ dlls/msxml3/msxml_private.h | 7 ------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index 5cebe09333b..3455fd675aa 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -19,13 +19,7 @@ #define COBJMACROS #define NONAMELESSUNION -#include "config.h" - #include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -# include <libxml/xmlerror.h> -#endif #include "windef.h" #include "winbase.h" @@ -39,7 +33,7 @@ #include "wine/debug.h" -#include "msxml_private.h" +#include "msxml_dispex.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/dlls/msxml3/msxml_dispex.h b/dlls/msxml3/msxml_dispex.h index 2f9c53144ef..b4eb02117bb 100644 --- a/dlls/msxml3/msxml_dispex.h +++ b/dlls/msxml3/msxml_dispex.h @@ -145,6 +145,13 @@ static inline HRESULT return_bstrn(const WCHAR *value, int len, BSTR *p) } extern HRESULT dom_document_create(MSXML_VERSION class_version, void **document) DECLSPEC_HIDDEN; + +typedef struct bsc_t bsc_t; + +HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; +HRESULT create_uri(IUri *base, const WCHAR *, IUri **) DECLSPEC_HIDDEN; +HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; +HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; IUri *get_base_uri(IUnknown *site) DECLSPEC_HIDDEN; #endif /* __MSXML_DISPEX__ */ diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 12ef1dcedf8..d578d5de560 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -397,13 +397,6 @@ extern HRESULT MXNamespaceManager_create(void**) DECLSPEC_HIDDEN; extern HRESULT XMLParser_create(void**) DECLSPEC_HIDDEN; extern HRESULT XMLView_create(void**) DECLSPEC_HIDDEN; -typedef struct bsc_t bsc_t; - -HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; -HRESULT create_uri(IUri *base, const WCHAR *, IUri **) DECLSPEC_HIDDEN; -HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; -HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; - /* Error Codes - not defined anywhere in the public headers */ #define E_XML_ELEMENT_UNDECLARED 0xC00CE00D #define E_XML_ELEMENT_ID_NOT_FOUND 0xC00CE00E

1 0

Nikolay Sivov : d3dx10: Add a stub sprite object.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: c2be6fa691e7bba22f9a1111d18b06461cc2d5f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2be6fa691e7bba22f9a1111… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 12 10:26:04 2021 +0300 d3dx10: Add a stub sprite object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 3 +- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/sprite.c | 205 ++++++++++++++++++++++++++++++++++++++++++ include/d3dx10core.h | 1 + 4 files changed, 209 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 1fae34191ee..6d74f586841 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 -IMPORTS = d3d10_1 d3dcompiler dxguid +IMPORTS = d3d10_1 d3dcompiler dxguid uuid DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native @@ -9,6 +9,7 @@ C_SRCS = \ async.c \ compiler.c \ d3dx10_43_main.c \ + sprite.c \ texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index a00b3402a5a..99b142f34d5 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -41,7 +41,7 @@ @ stub D3DX10CreateShaderResourceViewFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stub D3DX10CreateSkinInfo(ptr) -@ stub D3DX10CreateSprite(ptr long ptr) +@ stdcall D3DX10CreateSprite(ptr long ptr) @ stub D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/sprite.c b/dlls/d3dx10_43/sprite.c new file mode 100644 index 00000000000..c90185e0c0a --- /dev/null +++ b/dlls/d3dx10_43/sprite.c @@ -0,0 +1,205 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define COBJMACROS +#include "d3dx10.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +#define D3DERR_INVALIDCALL 0x8876086c + +struct d3dx10_sprite +{ + ID3DX10Sprite ID3DX10Sprite_iface; + LONG refcount; + + ID3D10Device *device; +}; + +static inline struct d3dx10_sprite *impl_from_ID3DX10Sprite(ID3DX10Sprite *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx10_sprite, ID3DX10Sprite_iface); +} + +static HRESULT WINAPI d3dx10_sprite_QueryInterface(ID3DX10Sprite *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DX10Sprite) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx10_sprite_AddRef(ID3DX10Sprite *iface) +{ + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); + ULONG refcount = InterlockedIncrement(&sprite->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx10_sprite_Release(ID3DX10Sprite *iface) +{ + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); + ULONG refcount = InterlockedDecrement(&sprite->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + ID3D10Device_Release(sprite->device); + heap_free(sprite); + } + + return refcount; +} + +static HRESULT WINAPI d3dx10_sprite_Begin(ID3DX10Sprite *iface, UINT flags) +{ + FIXME("iface %p, flags %#x stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_DrawSpritesBuffered(ID3DX10Sprite *iface, + D3DX10_SPRITE *sprites, UINT count) +{ + FIXME("iface %p, sprites %p, count %u stub!\n", iface, sprites, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_Flush(ID3DX10Sprite *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_DrawSpritesImmediate(ID3DX10Sprite *iface, + D3DX10_SPRITE *sprites, UINT count, UINT size, UINT flags) +{ + FIXME("iface %p, sprites %p, count %u, size %u, flags %#x stub!\n", + iface, sprites, count, size, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_End(ID3DX10Sprite *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_GetViewTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("iface %p, transform %p stub!\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_SetViewTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("iface %p, transform %p stub!\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_GetProjectionTransform(ID3DX10Sprite *iface, + D3DXMATRIX *transform) +{ + FIXME("iface %p, transform %p stub!\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_SetProjectionTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("iface %p, transform %p stub!\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_GetDevice(ID3DX10Sprite *iface, ID3D10Device **device) +{ + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = sprite->device; + ID3D10Device_AddRef(*device); + + return S_OK; +} + +static const ID3DX10SpriteVtbl d3dx10_sprite_vtbl = +{ + d3dx10_sprite_QueryInterface, + d3dx10_sprite_AddRef, + d3dx10_sprite_Release, + d3dx10_sprite_Begin, + d3dx10_sprite_DrawSpritesBuffered, + d3dx10_sprite_Flush, + d3dx10_sprite_DrawSpritesImmediate, + d3dx10_sprite_End, + d3dx10_sprite_GetViewTransform, + d3dx10_sprite_SetViewTransform, + d3dx10_sprite_GetProjectionTransform, + d3dx10_sprite_SetProjectionTransform, + d3dx10_sprite_GetDevice, +}; + +HRESULT WINAPI D3DX10CreateSprite(ID3D10Device *device, UINT size, ID3DX10Sprite **sprite) +{ + struct d3dx10_sprite *object; + + TRACE("device %p, size %u, sprite %p.\n", device, size, sprite); + + if (!device || !sprite) + return D3DERR_INVALIDCALL; + + *sprite = NULL; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3DX10Sprite_iface.lpVtbl = &d3dx10_sprite_vtbl; + object->refcount = 1; + object->device = device; + ID3D10Device_AddRef(device); + + *sprite = &object->ID3DX10Sprite_iface; + + return S_OK; +} diff --git a/include/d3dx10core.h b/include/d3dx10core.h index 3ed6f6f2443..fa6ef2381b6 100644 --- a/include/d3dx10core.h +++ b/include/d3dx10core.h @@ -289,3 +289,4 @@ HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVE ID3D10Device **device); typedef interface ID3D10Device1 ID3D10Device1; HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1); +HRESULT WINAPI D3DX10CreateSprite(ID3D10Device *device, UINT size, ID3DX10Sprite **sprite);

1 0

Nikolay Sivov : d3dx10: Add a stub font object.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 6177af8b1e137150d9f3d7d99f618c50c4015403 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6177af8b1e137150d9f3d7d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 17 19:17:29 2021 +0200 d3dx10: Add a stub font object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43.spec | 8 +- dlls/d3dx10_43/font.c | 353 ++++++++++++++++++++++++++++++++++++++++++ include/d3dx10core.h | 8 + 4 files changed, 366 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6177af8b1e137150d9f3…

1 0

Nikolay Sivov : d3dx10/tests: Add some tests for font object.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: c40896d26905f1af8472d2d8bc816b64928bffea URL: https://source.winehq.org/git/wine.git/?a=commit;h=c40896d26905f1af8472d2d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 17 19:17:30 2021 +0200 d3dx10/tests: Add some tests for font object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/d3dx10.c | 943 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 944 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c40896d26905f1af8472…

1 0

Alex Henrie : ws2_32: Always set error in setsockopt when the option is unrecognized.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 1f63b16bb22f0f0ffba029436c1b6745961e240b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f63b16bb22f0f0ffba02943… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 16 22:58:28 2021 -0600 ws2_32: Always set error in setsockopt when the option is unrecognized. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3d88e45c66e..9a45124cd9e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2842,6 +2842,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int default: FIXME("opt_name:%x\n", optname); + SetLastError(WSAENOPROTOOPT); return SOCKET_ERROR; } break; /* case NSPROTO_IPX */ @@ -2854,6 +2855,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); + SetLastError(WSAENOPROTOOPT); return SOCKET_ERROR; } break; @@ -2911,6 +2913,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int default: FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); + SetLastError(WSAENOPROTOOPT); return SOCKET_ERROR; } break; @@ -2960,6 +2963,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int default: FIXME("Unknown IPPROTO_IPV6 optname 0x%08x\n", optname); + SetLastError(WSAENOPROTOOPT); return SOCKET_ERROR; } break;

1 0