wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Alexandre Julliard : winegcc: Avoid including Windows headers in the Mingw unicode stub.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 5adfd065bbcd56f1c177f85d955b0d50d7ccc90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5adfd065bbcd56f1c177f85d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 17:38:19 2011 +0200 winegcc: Avoid including Windows headers in the Mingw unicode stub. --- tools/winegcc/winegcc.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index adb1873..7d03119 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -648,16 +648,17 @@ static const char *mingw_unicode_hack( struct options *opts ) char *main_stub = get_temp_file( opts->output_name, ".c" ); create_file( main_stub, 0644, - "#include <stdarg.h>\n" - "#include <windef.h>\n" - "#include <winbase.h>\n" + "typedef unsigned short wchar_t;\n" + "extern void * __stdcall LoadLibraryA(const char *);\n" + "extern void * __stdcall GetProcAddress(void *,const char *);\n" + "extern int wmain( int argc, wchar_t *argv[] );\n\n" "int main( int argc, char *argv[] )\n{\n" " int wargc;\n" " wchar_t **wargv, **wenv;\n" - " HMODULE msvcrt = LoadLibraryA( \"msvcrt.dll\" );\n" - " void __cdecl (*__wgetmainargs)(int *argc, wchar_t** *wargv, wchar_t** *wenvp, int expand_wildcards,\n" - " int *new_mode) = (void *)GetProcAddress( msvcrt, \"__wgetmainargs\" );\n" - " __wgetmainargs( &wargc, &wargv, &wenv, 0, NULL );\n" + " void *msvcrt = LoadLibraryA( \"msvcrt.dll\" );\n" + " void (*__wgetmainargs)(int *argc, wchar_t** *wargv, wchar_t** *wenvp, int expand_wildcards,\n" + " int *new_mode) = GetProcAddress( msvcrt, \"__wgetmainargs\" );\n" + " __wgetmainargs( &wargc, &wargv, &wenv, 0, 0 );\n" " return wmain( wargc, wargv );\n}\n" ); return compile_to_object( opts, main_stub, NULL ); }

1 0

Bruno Jesus : shell32: Don' t parse command line if numargs is NULL in CommandLineToArgvW.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: f621f8ea787df007b55e4369563502eb69cc421b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f621f8ea787df007b55e43695… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 25 23:35:13 2011 -0200 shell32: Don't parse command line if numargs is NULL in CommandLineToArgvW. --- dlls/shell32/shell32_main.c | 12 ++++++++---- dlls/shell32/tests/shlexec.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 981a245..2561f8c 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -92,6 +92,12 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) LPWSTR cmdline; int in_quotes,bcount; + if(!numargs) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (*lpCmdline==0) { /* Return the path to the executable */ @@ -113,8 +119,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) LocalFree( argv ); } argv[0]=(LPWSTR)(argv+1); - if (numargs) - *numargs=1; + *numargs=1; return argv; } @@ -228,8 +233,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) *d='\0'; argv[argc++]=arg; } - if (numargs) - *numargs=argc; + *numargs=argc; return argv; } diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5542ea5..1c5fe7f 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2157,6 +2157,7 @@ static void test_commandline(void) LPWSTR *args = (LPWSTR*)0xdeadcafe, pbuf; INT numargs = -1; size_t buflen; + DWORD lerror; wsprintfW(cmdline,fmt1,one,two,three,four); args=CommandLineToArgvW(cmdline,&numargs); @@ -2171,6 +2172,15 @@ static void test_commandline(void) ok(lstrcmpW(args[2],three)==0,"arg2 is not as expected\n"); ok(lstrcmpW(args[3],four)==0,"arg3 is not as expected\n"); + SetLastError(0xdeadbeef); + args=CommandLineToArgvW(cmdline,NULL); + lerror=GetLastError(); + ok(args == NULL && lerror == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %d\n",args,lerror); + SetLastError(0xdeadbeef); + args=CommandLineToArgvW(NULL,NULL); + lerror=GetLastError(); + ok(args == NULL && lerror == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %d\n",args,lerror); + wsprintfW(cmdline,fmt2,one,two,three,four); args=CommandLineToArgvW(cmdline,&numargs); ok(numargs == 5, "expected 5 args, got %i\n",numargs);

1 0

Piotr Caban : msvcrt: Don' t search for LCID in _setmbcp_l if it was already done.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 698afdca98dd6e1525edaec73b78a60aebc1556b URL: http://source.winehq.org/git/wine.git/?a=commit;h=698afdca98dd6e1525edaec73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 14:10:22 2011 +0200 msvcrt: Don't search for LCID in _setmbcp_l if it was already done. --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 13 +++++++++---- dlls/msvcrt/msvcrt.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b196cee..017d358 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -842,7 +842,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } } - _setmbcp_l(loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage, loc->mbcinfo); + _setmbcp_l(loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage, lcid[MSVCRT_LC_CTYPE], loc->mbcinfo); if(lcid[MSVCRT_LC_MONETARY] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_MONETARY)) { if(update_threadlocinfo_category(lcid[MSVCRT_LC_MONETARY], loc, MSVCRT_LC_MONETARY)) { diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 737f690..e9adbd8 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -184,7 +184,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) /********************************************************************* * INTERNAL: _setmbcp_l */ -int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) +int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) { const char format[] = ".%d"; @@ -222,8 +222,13 @@ int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) break; } - sprintf(bufA, format, newcp); - mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA); + if(lcid == -1) { + sprintf(bufA, format, newcp); + mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA); + } else { + mbcinfo->mblcid = lcid; + } + if(mbcinfo->mblcid == -1) { WARN("Can't assign LCID to codepage (%d)\n", mbcinfo->mblcid); @@ -347,7 +352,7 @@ int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) */ int CDECL _setmbcp(int cp) { - return _setmbcp_l(cp, NULL); + return _setmbcp_l(cp, -1, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 14bf972..671eb5b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -888,7 +888,7 @@ MSVCRT_pthreadmbcinfo get_mbcinfo(void); void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo); void free_mbcinfo(MSVCRT_pthreadmbcinfo); -int _setmbcp_l(int, MSVCRT_pthreadmbcinfo); +int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo); #ifndef __WINE_MSVCRT_TEST int __cdecl MSVCRT__write(int,const void*,unsigned int);

1 0

Piotr Caban : msxml3/tests: Added element attributes tests when SAXXMLReader is used.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: df5d3e348a8036f3f8b536c9ccf4fb4ca964fb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5d3e348a8036f3f8b536c9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 13:25:52 2011 +0200 msxml3/tests: Added element attributes tests when SAXXMLReader is used. --- dlls/msxml3/tests/saxreader.c | 130 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 129 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ca9c4aa..973381b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -121,6 +121,11 @@ static const CHAR szTestXML[] = " <Name>Captain Ahab</Name>\n" "</BankAccount>\n"; +static const CHAR szTestAttributes[] = +"<?xml version=\"1.0\" ?>\n" +"<document xmlns:test=\"prefix_test\" xmlns=\"prefix\" test:arg1=\"arg1\" arg2=\"arg2\">\n" +"</document>\n"; + typedef struct _contenthandlercheck { CH id; int line; @@ -202,6 +207,34 @@ static content_handler_test contentHandlerTestCallbackResult6[] = { { CH_ENDTEST } }; +static content_handler_test contentHandlerTestAttributes[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, 1, 0 }, + { CH_STARTDOCUMENT, 0, 0, 1, 22 }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "test", "prefix_test" }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "", "prefix" }, + { CH_STARTELEMENT, 2, 80, 2, 79, "prefix", "document", "document" }, + { CH_CHARACTERS, 2, 80, 3, 1, "\n" }, + { CH_ENDELEMENT, 3, 3, 3, 11, "prefix", "document", "document" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "test" }, + { CH_ENDDOCUMENT, 0, 0, 4, 0 }, + { CH_ENDTEST } +}; + +static content_handler_test contentHandlerTestAttributes6[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, 1, 0 }, + { CH_STARTDOCUMENT, 0, 0, 1, 22 }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "test", "prefix_test" }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "", "prefix" }, + { CH_STARTELEMENT, 2, 80, 2, 79, "prefix", "document", "document" }, + { CH_CHARACTERS, 2, 80, 3, 1, "\n" }, + { CH_ENDELEMENT, 3, 3, 3, 11, "prefix", "document", "document" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "test" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "" }, + { CH_ENDDOCUMENT, 0, 0, 4, 0 }, + { CH_ENDTEST } +}; + static content_handler_test *expectCall; static ISAXLocator *locator; int msxml_version; @@ -321,7 +354,7 @@ static HRESULT WINAPI contentHandler_startPrefixMapping( const WCHAR *pUri, int nUri) { - if(!test_expect_call(CH_ENDDOCUMENT)) + if(!test_expect_call(CH_STARTPREFIXMAPPING)) return E_FAIL; test_saxstr(__LINE__, pPrefix, nPrefix, expectCall->arg1); @@ -357,6 +390,9 @@ static HRESULT WINAPI contentHandler_startElement( int nQName, ISAXAttributes *pAttr) { + int len; + HRESULT hres; + if(!test_expect_call(CH_STARTELEMENT)) return E_FAIL; @@ -366,6 +402,79 @@ static HRESULT WINAPI contentHandler_startElement( test_locator(__LINE__, msxml_version>=6 ? expectCall->line_v6 : expectCall->line, msxml_version>=6 ? expectCall->column_v6 : expectCall->column); + if(expectCall == contentHandlerTestAttributes+4) { + int i; + /* msxml3 returns attributes and namespaces in the input order */ + hres = ISAXAttributes_getLength(pAttr, &len); + ok(hres == S_OK, "getLength returned %x\n", hres); + ok(len == 4, "Incorrect number of attributes: %d\n", len); + ok(msxml_version < 6, "wrong msxml_version: %d\n", msxml_version); + + for(i=0; i<len; i++) { + hres = ISAXAttributes_getName(pAttr, i, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + + if(nQName == 4) { + todo_wine ok(i==3, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg2"); + test_saxstr(__LINE__, pQName, nQName, "arg2"); + } else if(nQName == 5) { + todo_wine ok(i==1, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns"); + } else if(nQName == 9) { + todo_wine ok(i==2, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "prefix_test"); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg1"); + test_saxstr(__LINE__, pQName, nQName, "test:arg1"); + } else if(nQName == 10) { + todo_wine ok(i==0, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns:test"); + } else { + ok(0, "Unexpected attribute\n"); + } + } + } else if(expectCall == contentHandlerTestAttributes6+4) { + /* msxml6 returns attributes first and then namespaces */ + hres = ISAXAttributes_getLength(pAttr, &len); + ok(hres == S_OK, "getLength returned %x\n", hres); + ok(len == 4, "Incorrect number of attributes: %d\n", len); + ok(msxml_version >= 6, "wrong msxml_version: %d\n", msxml_version); + + hres = ISAXAttributes_getName(pAttr, 0, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "prefix_test"); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg1"); + test_saxstr(__LINE__, pQName, nQName, "test:arg1"); + + hres = ISAXAttributes_getName(pAttr, 1, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg2"); + test_saxstr(__LINE__, pQName, nQName, "arg2"); + + hres = ISAXAttributes_getName(pAttr, 2, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "http://www.w3.org/2000/xmlns/"); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns:test"); + + hres = ISAXAttributes_getName(pAttr, 3, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "http://www.w3.org/2000/xmlns/"); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns"); + } + return (expectCall++)->ret; } @@ -1182,6 +1291,25 @@ static void test_saxreader(int version) IStream_Release(iStream); + CreateStreamOnHGlobal(NULL, TRUE, &iStream); + liSize.QuadPart = strlen(szTestAttributes); + IStream_SetSize(iStream, liSize); + IStream_Write(iStream, szTestAttributes, strlen(szTestAttributes), &bytesWritten); + liPos.QuadPart = 0; + IStream_Seek(iStream, liPos, STREAM_SEEK_SET, NULL); + V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_UNKNOWN(&var) = (IUnknown*)iStream; + + if(version >= 6) + expectCall = contentHandlerTestAttributes6; + else + expectCall = contentHandlerTestAttributes; + hr = ISAXXMLReader_parse(reader, var); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + + IStream_Release(iStream); + V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(szCarriageRetTest);

1 0

Piotr Caban : msxml3: Fix attributes handling when msxml6 is used.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 685be40c332b88b5faaa1d3008a0b0c9dafe39d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=685be40c332b88b5faaa1d300… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 13:25:27 2011 +0200 msxml3: Fix attributes handling when msxml6 is used. --- dlls/msxml3/saxreader.c | 93 +++++++++++++++++++++++++++++++---------------- 1 files changed, 62 insertions(+), 31 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 344393a..29ab60e 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1088,13 +1088,16 @@ static const struct ISAXAttributesVtbl isaxattributes_vtbl = isaxattributes_getValueFromQName }; -static HRESULT SAXAttributes_create(saxattributes **attr, +static HRESULT SAXAttributes_create(saxattributes **attr, MSXML_VERSION version, int nb_namespaces, const xmlChar **xmlNamespaces, int nb_attributes, const xmlChar **xmlAttributes) { saxattributes *attributes; int index; static const xmlChar xmlns[] = "xmlns"; + static const WCHAR xmlnsW[] = { 'x','m','l','n','s',0 }; + static const WCHAR w3xmlns[] = { 'h','t','t','p',':','/','/', 'w','w','w','.','w','3','.', + 'o','r','g','/','2','0','0','0','/','x','m','l','n','s','/',0 }; attributes = heap_alloc(sizeof(*attributes)); if(!attributes) @@ -1124,23 +1127,26 @@ static HRESULT SAXAttributes_create(saxattributes **attr, for(index=0; index<nb_namespaces; index++) { - attributes->szLocalname[index] = SysAllocStringLen(NULL, 0); - attributes->szURI[index] = SysAllocStringLen(NULL, 0); - attributes->szValue[index] = bstr_from_xmlChar(xmlNamespaces[2*index+1]); - attributes->szQName[index] = QName_from_xmlChar(xmlns, xmlNamespaces[2*index]); + attributes->szLocalname[nb_attributes+index] = SysAllocStringLen(NULL, 0); + if(version >= MSXML6) + attributes->szURI[nb_attributes+index] = SysAllocString(w3xmlns); + else + attributes->szURI[nb_attributes+index] = SysAllocStringLen(NULL, 0); + attributes->szValue[nb_attributes+index] = bstr_from_xmlChar(xmlNamespaces[2*index+1]); + if(!xmlNamespaces[2*index]) + attributes->szQName[nb_attributes+index] = SysAllocString(xmlnsW); + else + attributes->szQName[nb_attributes+index] = QName_from_xmlChar(xmlns, xmlNamespaces[2*index]); } for(index=0; index<nb_attributes; index++) { - attributes->szLocalname[nb_namespaces+index] = - bstr_from_xmlChar(xmlAttributes[index*5]); - attributes->szURI[nb_namespaces+index] = - bstr_from_xmlChar(xmlAttributes[index*5+2]); - attributes->szValue[nb_namespaces+index] = - bstr_from_xmlCharN(xmlAttributes[index*5+3], - xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); - attributes->szQName[nb_namespaces+index] = - QName_from_xmlChar(xmlAttributes[index*5+1], xmlAttributes[index*5]); + attributes->szLocalname[index] = bstr_from_xmlChar(xmlAttributes[index*5]); + attributes->szURI[index] = bstr_from_xmlChar(xmlAttributes[index*5+2]); + attributes->szValue[index] = bstr_from_xmlCharN(xmlAttributes[index*5+3], + xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); + attributes->szQName[index] = QName_from_xmlChar(xmlAttributes[index*5+1], + xmlAttributes[index*5]); } *attr = attributes; @@ -1259,7 +1265,8 @@ static void libxmlStartElementNS( LocalName = pooled_bstr_from_xmlChar(&This->saxreader->pool, localname); QName = pooled_QName_from_xmlChar(&This->saxreader->pool, prefix, localname); - hr = SAXAttributes_create(&attr, nb_namespaces, namespaces, nb_attributes, attributes); + hr = SAXAttributes_create(&attr, This->saxreader->version, + nb_namespaces, namespaces, nb_attributes, attributes); if(hr == S_OK) { if(This->vbInterface) @@ -1326,25 +1333,49 @@ static void libxmlEndElementNS( return; } - for(index=This->pParserCtxt->nsNr-2; - index>=This->pParserCtxt->nsNr-nsNr*2; index-=2) + if(This->saxreader->version >= MSXML6) { - Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); + for(index=This->pParserCtxt->nsNr-nsNr*2; + index<This->pParserCtxt->nsNr; index+=2) + { + Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); - if(This->vbInterface) - hr = IVBSAXContentHandler_endPrefixMapping( - This->saxreader->vbcontentHandler, &Prefix); - else - hr = ISAXContentHandler_endPrefixMapping( - This->saxreader->contentHandler, - Prefix, SysStringLen(Prefix)); + if(This->vbInterface) + hr = IVBSAXContentHandler_endPrefixMapping( + This->saxreader->vbcontentHandler, &Prefix); + else + hr = ISAXContentHandler_endPrefixMapping( + This->saxreader->contentHandler, + Prefix, SysStringLen(Prefix)); - if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) - { - format_error_message_from_id(This, hr); - return; + if(FAILED(hr)) + { + format_error_message_from_id(This, hr); + return; + } } + } + else + { + for(index=This->pParserCtxt->nsNr-2; + index>=This->pParserCtxt->nsNr-nsNr*2; index-=2) + { + Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); + if(This->vbInterface) + hr = IVBSAXContentHandler_endPrefixMapping( + This->saxreader->vbcontentHandler, &Prefix); + else + hr = ISAXContentHandler_endPrefixMapping( + This->saxreader->contentHandler, + Prefix, SysStringLen(Prefix)); + + if(hr != S_OK) + { + format_error_message_from_id(This, hr); + return; + } + } } }

1 0

Alexandre Julliard : gdi32: Always use a polygon to draw text strike-outs and underlines.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: ba2ea235748730d0cfe7fe9488272e1544859816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2ea235748730d0cfe7fe948… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 18:14:04 2011 +0200 gdi32: Always use a polygon to draw text strike-outs and underlines. --- dlls/gdi32/font.c | 113 +++++++++++++++++----------------------------------- 1 files changed, 37 insertions(+), 76 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cda41dc..f9e690c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2094,6 +2094,11 @@ done: int underlineWidth, strikeoutWidth; UINT size = GetOutlineTextMetricsW(hdc, 0, NULL); OUTLINETEXTMETRICW* otm = NULL; + POINT pts[5]; + HPEN hpen = SelectObject(hdc, GetStockObject(NULL_PEN)); + HBRUSH hbrush = CreateSolidBrush(GetTextColor(hdc)); + + hbrush = SelectObject(hdc, hbrush); if(!size) { @@ -2113,86 +2118,42 @@ done: HeapFree(GetProcessHeap(), 0, otm); } - if (PATH_IsPathOpen(dc->path)) - { - POINT pts[5]; - HPEN hpen; - HBRUSH hbrush = CreateSolidBrush(GetTextColor(hdc)); - - hbrush = SelectObject(hdc, hbrush); - hpen = SelectObject(hdc, GetStockObject(NULL_PEN)); - - if (lf.lfUnderline) - { - pts[0].x = x - underlinePos * sinEsc; - pts[0].y = y - underlinePos * cosEsc; - pts[1].x = x + width.x - underlinePos * sinEsc; - pts[1].y = y + width.y - underlinePos * cosEsc; - pts[2].x = pts[1].x + underlineWidth * sinEsc; - pts[2].y = pts[1].y + underlineWidth * cosEsc; - pts[3].x = pts[0].x + underlineWidth * sinEsc; - pts[3].y = pts[0].y + underlineWidth * cosEsc; - pts[4].x = pts[0].x; - pts[4].y = pts[0].y; - DPtoLP(hdc, pts, 5); - Polygon(hdc, pts, 5); - } - - if (lf.lfStrikeOut) - { - pts[0].x = x - strikeoutPos * sinEsc; - pts[0].y = y - strikeoutPos * cosEsc; - pts[1].x = x + width.x - strikeoutPos * sinEsc; - pts[1].y = y + width.y - strikeoutPos * cosEsc; - pts[2].x = pts[1].x + strikeoutWidth * sinEsc; - pts[2].y = pts[1].y + strikeoutWidth * cosEsc; - pts[3].x = pts[0].x + strikeoutWidth * sinEsc; - pts[3].y = pts[0].y + strikeoutWidth * cosEsc; - pts[4].x = pts[0].x; - pts[4].y = pts[0].y; - DPtoLP(hdc, pts, 5); - Polygon(hdc, pts, 5); - } - SelectObject(hdc, hpen); - hbrush = SelectObject(hdc, hbrush); - DeleteObject(hbrush); - } - else + if (lf.lfUnderline) { - POINT pts[2], oldpt; - HPEN hpen; - - if (lf.lfUnderline) - { - hpen = CreatePen(PS_SOLID, underlineWidth, GetTextColor(hdc)); - hpen = SelectObject(hdc, hpen); - pts[0].x = x; - pts[0].y = y; - pts[1].x = x + width.x; - pts[1].y = y + width.y; - DPtoLP(hdc, pts, 2); - MoveToEx(hdc, pts[0].x - underlinePos * sinEsc, pts[0].y - underlinePos * cosEsc, &oldpt); - LineTo(hdc, pts[1].x - underlinePos * sinEsc, pts[1].y - underlinePos * cosEsc); - MoveToEx(hdc, oldpt.x, oldpt.y, NULL); - DeleteObject(SelectObject(hdc, hpen)); - } + pts[0].x = x - underlinePos * sinEsc; + pts[0].y = y - underlinePos * cosEsc; + pts[1].x = x + width.x - underlinePos * sinEsc; + pts[1].y = y + width.y - underlinePos * cosEsc; + pts[2].x = pts[1].x + underlineWidth * sinEsc; + pts[2].y = pts[1].y + underlineWidth * cosEsc; + pts[3].x = pts[0].x + underlineWidth * sinEsc; + pts[3].y = pts[0].y + underlineWidth * cosEsc; + pts[4].x = pts[0].x; + pts[4].y = pts[0].y; + DPtoLP(hdc, pts, 5); + Polygon(hdc, pts, 5); + } - if (lf.lfStrikeOut) - { - hpen = CreatePen(PS_SOLID, strikeoutWidth, GetTextColor(hdc)); - hpen = SelectObject(hdc, hpen); - pts[0].x = x; - pts[0].y = y; - pts[1].x = x + width.x; - pts[1].y = y + width.y; - DPtoLP(hdc, pts, 2); - MoveToEx(hdc, pts[0].x - strikeoutPos * sinEsc, pts[0].y - strikeoutPos * cosEsc, &oldpt); - LineTo(hdc, pts[1].x - strikeoutPos * sinEsc, pts[1].y - strikeoutPos * cosEsc); - MoveToEx(hdc, oldpt.x, oldpt.y, NULL); - DeleteObject(SelectObject(hdc, hpen)); - } + if (lf.lfStrikeOut) + { + pts[0].x = x - strikeoutPos * sinEsc; + pts[0].y = y - strikeoutPos * cosEsc; + pts[1].x = x + width.x - strikeoutPos * sinEsc; + pts[1].y = y + width.y - strikeoutPos * cosEsc; + pts[2].x = pts[1].x + strikeoutWidth * sinEsc; + pts[2].y = pts[1].y + strikeoutWidth * cosEsc; + pts[3].x = pts[0].x + strikeoutWidth * sinEsc; + pts[3].y = pts[0].y + strikeoutWidth * cosEsc; + pts[4].x = pts[0].x; + pts[4].y = pts[0].y; + DPtoLP(hdc, pts, 5); + Polygon(hdc, pts, 5); } + + SelectObject(hdc, hpen); + hbrush = SelectObject(hdc, hbrush); + DeleteObject(hbrush); } return ret;

1 0

Alexandre Julliard : gdi32: Move internal path functions to the top of the file to avoid forward declarations .
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: ef34c47c4be511e4da4a824ce7b40739e4384dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef34c47c4be511e4da4a824ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 14:14:17 2011 +0200 gdi32: Move internal path functions to the top of the file to avoid forward declarations. --- dlls/gdi32/path.c | 746 +++++++++++++++++++++++++---------------------------- 1 files changed, 357 insertions(+), 389 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef34c47c4be511e4da4a8…

1 0

Alexandre Julliard : gdi32/tests: Add tests for path open/closed states.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: f44c1e653317ffaed2c752d1345df56153360eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44c1e653317ffaed2c752d13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 15:06:05 2011 +0200 gdi32/tests: Add tests for path open/closed states. --- dlls/gdi32/path.c | 4 +- dlls/gdi32/tests/path.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 235 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 277d167..2fc998e 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2240,7 +2240,7 @@ BOOL nulldrv_FlattenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); - if (dc->path.state == PATH_Closed) + if (dc->path.state != PATH_Closed) { SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; @@ -2252,7 +2252,7 @@ BOOL nulldrv_WidenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); - if (dc->path.state == PATH_Open) + if (dc->path.state != PATH_Closed) { SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 18dffa3..8399b19 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -33,6 +33,238 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +static void test_path_state(void) +{ + BYTE buffer[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bi = (BITMAPINFO *)buffer; + HDC hdc; + HBITMAP orig, dib; + void *bits; + BOOL ret; + + hdc = CreateCompatibleDC( 0 ); + memset( buffer, 0, sizeof(buffer) ); + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biHeight = 256; + bi->bmiHeader.biWidth = 256; + bi->bmiHeader.biBitCount = 32; + bi->bmiHeader.biPlanes = 1; + bi->bmiHeader.biCompression = BI_RGB; + dib = CreateDIBSection( 0, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0 ); + orig = SelectObject( hdc, dib ); + + BeginPath( hdc ); + LineTo( hdc, 100, 100 ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + + /* selecting another bitmap doesn't affect the path */ + SelectObject( hdc, orig ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + + SelectObject( hdc, dib ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + + ret = EndPath( hdc ); + ok( ret, "EndPath failed error %u\n", GetLastError() ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + SelectObject( hdc, orig ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + BeginPath( hdc ); + LineTo( hdc, 100, 100 ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + SaveDC( hdc ); + SelectObject( hdc, dib ); + ret = EndPath( hdc ); + ok( ret, "EndPath failed error %u\n", GetLastError() ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + /* path should be open again after RestoreDC */ + RestoreDC( hdc, -1 ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + ret = EndPath( hdc ); + ok( ret, "EndPath failed error %u\n", GetLastError() ); + + SaveDC( hdc ); + BeginPath( hdc ); + RestoreDC( hdc, -1 ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + /* test all functions with no path at all */ + AbortPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = FlattenPath( hdc ); + ok( !ret, "FlattenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = StrokePath( hdc ); + ok( !ret, "StrokePath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = FillPath( hdc ); + ok( !ret, "FillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = StrokeAndFillPath( hdc ); + ok( !ret, "StrokeAndFillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SelectClipPath( hdc, RGN_OR ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = EndPath( hdc ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = CloseFigure( hdc ); + ok( !ret, "CloseFigure succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + /* test all functions with an open path */ + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = FlattenPath( hdc ); + ok( !ret, "FlattenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = StrokePath( hdc ); + ok( !ret, "StrokePath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = FillPath( hdc ); + ok( !ret, "FillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = StrokeAndFillPath( hdc ); + ok( !ret, "StrokeAndFillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ + SetLastError( 0xdeadbeef ); + ret = SelectClipPath( hdc, RGN_OR ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + ret = CloseFigure( hdc ); + ok( ret, "CloseFigure failed\n" ); + + /* test all functions with a closed path */ + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = FlattenPath( hdc ); + ok( ret, "FlattenPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = StrokePath( hdc ); + ok( ret, "StrokePath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = FillPath( hdc ); + ok( ret, "FillPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = StrokeAndFillPath( hdc ); + ok( ret, "StrokeAndFillPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ + EndPath( hdc ); + ret = SelectClipPath( hdc, RGN_OR ); + ok( ret, "SelectClipPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = CloseFigure( hdc ); + ok( !ret, "CloseFigure succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = EndPath( hdc ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + DeleteDC( hdc ); + DeleteObject( dib ); +} + static void test_widenpath(void) { HDC hdc = GetDC(0); @@ -504,6 +736,7 @@ static void test_linedda(void) START_TEST(path) { + test_path_state(); test_widenpath(); test_arcto(); test_anglearc();

1 0

Matteo Bruni : wined3d: Refuse to create a shader unsupported by the backend.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 095a9a68937a04949a04d707f81fe7b3d75840b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=095a9a68937a04949a04d707f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:47 2011 +0200 wined3d: Refuse to create a shader unsupported by the backend. --- dlls/d3d9/tests/shader.c | 22 ++++++++++++++++++++-- dlls/wined3d/device.c | 2 ++ dlls/wined3d/shader.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index f5a2bcb..ab05289 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -233,6 +233,14 @@ static void test_wrong_shader(IDirect3DDevice9 *device_ptr) 0x0000ffff /* END */ }; + const DWORD vs_3_0[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x0000ffff /* end */ + }; + #if 0 float4 main(const float4 color : COLOR) : SV_TARGET { @@ -263,9 +271,10 @@ float4 main(const float4 color : COLOR) : SV_TARGET 0x00000000, 0x00000000, }; - IDirect3DVertexShader9 *vs; - IDirect3DPixelShader9 *ps; + IDirect3DVertexShader9 *vs = NULL; + IDirect3DPixelShader9 *ps = NULL; HRESULT hret; + D3DCAPS9 caps; hret = IDirect3DDevice9_CreateVertexShader(device_ptr, simple_ps, &vs); ok(hret == D3DERR_INVALIDCALL, "CreateVertexShader returned: hret 0x%x, shader_ptr %p.\n", hret, vs); @@ -274,6 +283,15 @@ float4 main(const float4 color : COLOR) : SV_TARGET hret = IDirect3DDevice9_CreatePixelShader(device_ptr, ps_4_0, &ps); ok(hret == D3DERR_INVALIDCALL, "CreatePixelShader returned: hret 0x%x, shader_ptr %p.\n", hret, ps); + + IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps); + if (caps.VertexShaderVersion < D3DVS_VERSION(3, 0)) + { + hret = IDirect3DDevice9_CreateVertexShader(device_ptr, vs_3_0, &vs); + ok(hret == D3DERR_INVALIDCALL, "CreateVertexShader returned: hret 0x%x, shader_ptr %p.\n", hret, vs); + } + else + skip("This GPU supports SM3, skipping unsupported shader test.\n"); } START_TEST(shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5aace82..05a0ad8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5938,6 +5938,8 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, if (device->shader_backend) { device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); + device->vshader_version = shader_caps.VertexShaderVersion; + device->pshader_version = shader_caps.PixelShaderVersion; device->d3d_vshader_constantF = shader_caps.MaxVertexShaderConst; device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; device->vs_clipping = shader_caps.VSClipping; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 69bd69d..50ecc2c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1559,6 +1559,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_frontend *fe; HRESULT hr; + unsigned int backend_version; TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u.\n", shader, byte_code, output_signature, float_const_count); @@ -1602,6 +1603,24 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b WARN("Shader version %d not supported by this D3D API version.\n", reg_maps->shader_version.major); return WINED3DERR_INVALIDCALL; } + switch (type) + { + case WINED3D_SHADER_TYPE_VERTEX: + backend_version = shader->device->vshader_version; + break; + case WINED3D_SHADER_TYPE_PIXEL: + backend_version = shader->device->pshader_version; + break; + default: + FIXME("No backend version-checking for this shader type\n"); + backend_version = 0; + } + if (reg_maps->shader_version.major > backend_version) + { + WARN("Shader version %d.%d not supported by your GPU with the current shader backend.\n", + reg_maps->shader_version.major, reg_maps->shader_version.minor); + return WINED3DERR_INVALIDCALL; + } shader->function = HeapAlloc(GetProcessHeap(), 0, shader->functionLength); if (!shader->function) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b86580..9b510c4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1668,6 +1668,7 @@ struct wined3d_device const struct blit_shader *blitter; unsigned int max_ffp_textures; + DWORD vshader_version, pshader_version; DWORD d3d_vshader_constantF, d3d_pshader_constantF; /* Advertised d3d caps, not GL ones */ DWORD vs_clipping;

1 0

Matteo Bruni : dxgi: Refuse to create a D3D10 wined3d device if it is not supported by the GPU.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 8af1c6ee19200d572f9c0311efb1bc41717ff112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af1c6ee19200d572f9c0311e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:46 2011 +0200 dxgi: Refuse to create a D3D10 wined3d device if it is not supported by the GPU. --- dlls/dxgi/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 9c94434..6b20235 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -353,6 +353,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l struct wined3d *wined3d; void *layer_base; HRESULT hr; + WINED3DCAPS caps; device->IWineDXGIDevice_iface.lpVtbl = &dxgi_device_vtbl; device->refcount = 1; @@ -398,6 +399,16 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l wined3d_device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); FIXME("Ignoring adapter type.\n"); + + hr = wined3d_get_device_caps(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, &caps); + if (FAILED(hr) || caps.VertexShaderVersion < 4 || caps.PixelShaderVersion < 4) + { + WARN("Direct3D 10 is not supported on this GPU with the current shader backend.\n"); + if (SUCCEEDED(hr)) + hr = E_FAIL; + goto fail; + } + EnterCriticalSection(&dxgi_cs); hr = wined3d_device_create(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, NULL, 0, 4, wined3d_device_parent, &device->wined3d_device);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011