December 2014 - Wine-commits

Bruno Jesus : ws2_32: Ensure an IPv6 is not recognized as IPv4 in WSAStringToAddress.
by Alexandre Julliard 31 Dec '14

31 Dec '14

Module: wine Branch: master Commit: 9d9e1cc9aebd0dd86967cc6fbb30f836259c9ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9e1cc9aebd0dd86967cc6fb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Dec 31 01:59:52 2014 -0200 ws2_32: Ensure an IPv6 is not recognized as IPv4 in WSAStringToAddress. --- dlls/ws2_32/socket.c | 6 ++++++ dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b6aad67..a9ab0a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7081,6 +7081,12 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, ptrPort = strchr(workBuffer, ':'); if(ptrPort) { + /* User may have entered an IPv6 and asked to parse as IPv4 */ + if(strchr(ptrPort + 1, ':')) + { + res = WSAEINVAL; + break; + } ((LPSOCKADDR_IN)lpAddress)->sin_port = htons(atoi(ptrPort+1)); *ptrPort = '\0'; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 49ebbf5..d87f326 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3010,6 +3010,7 @@ static void test_WSAStringToAddressA(void) CHAR address6[] = "::1"; CHAR address7[] = "[::1]"; CHAR address8[] = "[::1]:65535"; + CHAR address9[] = "2001::1"; len = 0; sockaddr.sin_family = AF_INET; @@ -3093,6 +3094,12 @@ static void test_WSAStringToAddressA(void) (ret == SOCKET_ERROR && GLE == WSAEINVAL), "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); + len = sizeof(sockaddr); + + ret = WSAStringToAddressA( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressA() should have failed with %d\n", GLE ); } static void test_WSAStringToAddressW(void) @@ -3113,6 +3120,7 @@ static void test_WSAStringToAddressW(void) WCHAR address6[] = {':',':','1','\0'}; WCHAR address7[] = {'[',':',':','1',']','\0'}; WCHAR address8[] = {'[',':',':','1',']',':','6','5','5','3','5','\0'}; + WCHAR address9[] = {'2','0','0','1',':',':','1','\0'}; len = 0; sockaddr.sin_family = AF_INET; @@ -3209,6 +3217,12 @@ static void test_WSAStringToAddressW(void) (ret == SOCKET_ERROR && GLE == WSAEINVAL), "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); + len = sizeof(sockaddr); + + ret = WSAStringToAddressW( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() should have failed with %d\n", GLE ); } static DWORD WINAPI SelectReadThread(void *param)

1 0

Bruno Jesus : wininet: Handle CERT_TRUST_IS_NOT_SIGNATURE_VALID in netconn_verify_cert().
by Alexandre Julliard 31 Dec '14

31 Dec '14

Module: wine Branch: master Commit: d654ff6dfcabdfbe3fe8edd196a6578cb9c4c1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d654ff6dfcabdfbe3fe8edd19… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Dec 31 03:47:00 2014 -0200 wininet: Handle CERT_TRUST_IS_NOT_SIGNATURE_VALID in netconn_verify_cert(). --- dlls/wininet/netconnection.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 483dba4..debc271 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -112,6 +112,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN | + CERT_TRUST_IS_NOT_SIGNATURE_VALID | CERT_TRUST_IS_NOT_VALID_FOR_USAGE; TRACE("verifying %s\n", debugstr_w(conn->server->name)); @@ -178,6 +179,17 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; } + if(errors & CERT_TRUST_IS_NOT_SIGNATURE_VALID) { + WARN("CERT_TRUST_IS_NOT_SIGNATURE_VALID\n"); + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) { + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + if(!conn->mask_errors) + break; + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + } + errors &= ~CERT_TRUST_IS_NOT_SIGNATURE_VALID; + } + if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) {

1 0

Nikolay Sivov : msdmo: Fix DMOUnregister() when running on clean wineprefix.
by Alexandre Julliard 31 Dec '14

31 Dec '14

Module: wine Branch: master Commit: 89837cb04e75329c0a4fa1e7b086c7d09608b3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89837cb04e75329c0a4fa1e7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 31 11:48:00 2014 +0300 msdmo: Fix DMOUnregister() when running on clean wineprefix. --- dlls/msdmo/dmoreg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 0abbea0..25480e5 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -286,7 +286,7 @@ HRESULT WINAPI DMOUnregister(REFCLSID dmo, REFGUID category) ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_WRITE, &rootkey); if (ret) - return HRESULT_FROM_WIN32(ret); + return S_FALSE; GUIDToString(dmoW, dmo); RegDeleteKeyW(rootkey, dmoW);

1 0

Bruno Jesus : avifil32: Remove the 1024 frame limit when recording AVI files.
by Alexandre Julliard 31 Dec '14

31 Dec '14

Module: wine Branch: master Commit: d28c40da3bc685241363370f4b486bd975396afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28c40da3bc685241363370f4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Dec 31 02:19:26 2014 -0200 avifil32: Remove the 1024 frame limit when recording AVI files. --- dlls/avifil32/avifile.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index af0315d..f5abc1c 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1424,11 +1424,21 @@ static HRESULT AVIFILE_AddRecord(IAVIFileImpl *This) /* pre-conditions */ assert(This != NULL && This->ppStreams[0] != NULL); - if (This->idxRecords == NULL || This->cbIdxRecords == 0) { - This->cbIdxRecords += 1024 * sizeof(AVIINDEXENTRY); - This->idxRecords = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->cbIdxRecords); - if (This->idxRecords == NULL) + if (This->idxRecords == NULL || This->cbIdxRecords / sizeof(AVIINDEXENTRY) <= This->nIdxRecords) { + DWORD new_count = This->cbIdxRecords + 1024 * sizeof(AVIINDEXENTRY); + void *mem; + if (!This->idxRecords) + mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, new_count); + else + mem = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxRecords, new_count); + if (mem) { + This->cbIdxRecords = new_count; + This->idxRecords = mem; + } else { + HeapFree(GetProcessHeap(), 0, This->idxRecords); + This->idxRecords = NULL; return AVIERR_MEMORY; + } } assert(This->nIdxRecords < This->cbIdxRecords/sizeof(AVIINDEXENTRY));

1 0

Gerald Pfeifer : wordpad: Avoid an out-of-bounds array access in registry_set_filelist.
by Alexandre Julliard 31 Dec '14

31 Dec '14

Module: wine Branch: master Commit: c7482ad1c1baa8c7cf9d1a4a3034e76592386d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7482ad1c1baa8c7cf9d1a4a3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 27 09:57:41 2014 +0100 wordpad: Avoid an out-of-bounds array access in registry_set_filelist. --- programs/wordpad/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 5b570e7..22b5c06 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -318,7 +318,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd) pFiles[0] = newFile; } - for(i = 0; pFiles[i] && i < FILELIST_ENTRIES; i++) + for(i = 0; i < FILELIST_ENTRIES && pFiles[i]; i++) { wsprintfW(buffer, var_file, i+1); RegSetValueExW(hKey, (LPWSTR)&buffer, 0, REG_SZ, (const BYTE*)pFiles[i],

1 0

Nikolay Sivov : ntdll: Skip context dependencies that have allowDelayedBinding attribute set.
by Alexandre Julliard 31 Dec '14

31 Dec '14

Module: wine Branch: master Commit: 7a612654dc12d82429405ecf71c525fb4460b597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a612654dc12d82429405ecf7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 31 20:55:55 2014 +0300 ntdll: Skip context dependencies that have allowDelayedBinding attribute set. --- dlls/kernel32/tests/actctx.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ntdll/actctx.c | 21 +++++++++++++++++---- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index e30d985..60763b1 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -222,6 +222,17 @@ static const char manifest4[] = "</dependency>" "</assembly>"; +static const char manifest5[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\">" +"</assemblyIdentity>" +"<dependency>" +" <dependentAssembly dependencyType=\"preRequisite\" allowDelayedBinding=\"true\">" +" <assemblyIdentity name=\"Missing.Assembly\" version=\"1.0.0.0\" />" +" </dependentAssembly>" +"</dependency>" +"</assembly>"; + static const char testdep_manifest1[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\"/>" @@ -1728,6 +1739,29 @@ static void test_typelib_section(void) pReleaseActCtx(handle); } +static void test_allowDelayedBinding(void) +{ + HANDLE handle; + + if (!create_manifest_file("test5.manifest", manifest5, -1, NULL, NULL)) { + skip("Could not create manifest file\n"); + return; + } + + handle = test_create("test5.manifest"); + if (handle == INVALID_HANDLE_VALUE) { + win_skip("allowDelayedBinding attribute is not supported.\n"); + return; + } + + DeleteFileA("test5.manifest"); + DeleteFileA("testdep.manifest"); + if (handle != INVALID_HANDLE_VALUE) { + test_basic_info(handle, __LINE__); + pReleaseActCtx(handle); + } +} + static void test_actctx(void) { ULONG_PTR cookie; @@ -1993,6 +2027,7 @@ static void test_actctx(void) test_wndclass_section(); test_dllredirect_section(); test_typelib_section(); + test_allowDelayedBinding(); } static void test_app_manifest(void) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index ba6378e..20a98ec 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -129,6 +129,7 @@ struct assembly_identity WCHAR *type; struct assembly_version version; BOOL optional; + BOOL delayed; }; struct strsection_header @@ -2027,13 +2028,25 @@ static BOOL parse_clr_surrogate_elem(xmlbuf_t* xmlbuf, struct assembly* assembly static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, BOOL optional) { struct assembly_identity ai; - xmlstr_t elem; - BOOL end = FALSE, ret = TRUE; + xmlstr_t elem, attr_name, attr_value; + BOOL end = FALSE, error = FALSE, ret = TRUE, delayed = FALSE; - if (!parse_expect_no_attr(xmlbuf, &end) || end) return end; + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + static const WCHAR allowDelayedBindingW[] = {'a','l','l','o','w','D','e','l','a','y','e','d','B','i','n','d','i','n','g',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + + if (xmlstr_cmp(&attr_name, allowDelayedBindingW)) + delayed = xmlstr_cmp(&attr_value, trueW); + else + WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value)); + } + + if (error || end) return end; memset(&ai, 0, sizeof(ai)); ai.optional = optional; + ai.delayed = delayed; if (!parse_expect_elem(xmlbuf, assemblyIdentityW, asmv1W) || !parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai)) @@ -2914,7 +2927,7 @@ static NTSTATUS parse_depend_manifests(struct actctx_loader* acl) { if (lookup_assembly(acl, &acl->dependencies[i]) != STATUS_SUCCESS) { - if (!acl->dependencies[i].optional) + if (!acl->dependencies[i].optional && !acl->dependencies[i].delayed) { FIXME( "Could not find dependent assembly %s (%s)\n", debugstr_w(acl->dependencies[i].name),

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 31 Dec '14

31 Dec '14

Module: wine Branch: master Commit: b336694dbb040c33b3493ce1466b51b523f422d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b336694dbb040c33b3493ce14… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Dec 31 16:43:23 2014 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 628abf2..a3cda01 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -851,7 +851,7 @@ msgstr "O arquivo não existe" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "A seleção contêm um objeto que não é diretório" #: comdlg32.rc:45 msgid "Up One Level" @@ -7188,7 +7188,7 @@ msgstr "pressionado" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "marcado" #: oleacc.rc:103 msgctxt "object state" @@ -7213,27 +7213,27 @@ msgstr "padrão" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "expandido" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "reduzido" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "ocupado" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "flutuando" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "em movimento" #: oleacc.rc:112 msgctxt "object state" @@ -7243,12 +7243,12 @@ msgstr "animado" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "invisível" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "fora da tela" #: oleacc.rc:115 msgctxt "object state" @@ -7263,7 +7263,7 @@ msgstr "movível" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "voz própria" #: oleacc.rc:118 msgctxt "object state" @@ -7283,7 +7283,7 @@ msgstr "ligado" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "percorrido" #: oleacc.rc:122 msgctxt "object state" @@ -7318,7 +7318,7 @@ msgstr "protegido" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "tem popup" #: oleaut32.rc:30 oleview.rc:147 msgid "True"

1 0

Bruno Jesus : po: Update Portuguese translation.
by Alexandre Julliard 31 Dec '14

31 Dec '14

Module: wine Branch: master Commit: 6bab17313918ec21b196c7e465500f4c239caa5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bab17313918ec21b196c7e46… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Dec 31 17:15:12 2014 -0200 po: Update Portuguese translation. --- po/pt_PT.po | 204 ++++++++++++++++-------------------------------------------- 1 file changed, 55 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bab17313918ec21b196c…

1 0

Jacek Caban : include: Added d3d11_1.idl.
by Alexandre Julliard 30 Dec '14

30 Dec '14

Module: wine Branch: master Commit: d4afbf5bd8616712583255ccb22cac11e22a4cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4afbf5bd8616712583255ccb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 30 13:02:21 2014 +0100 include: Added d3d11_1.idl. --- include/Makefile.in | 1 + include/d3d11_1.idl | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index dcee132..40367eb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -27,6 +27,7 @@ PUBLIC_IDL_H_SRCS = \ d3d10.idl \ d3d10_1.idl \ d3d11.idl \ + d3d11_1.idl \ d3d11sdklayers.idl \ d3dcommon.idl \ ddstream.idl \ diff --git a/include/d3d11_1.idl b/include/d3d11_1.idl new file mode 100644 index 0000000..928548f --- /dev/null +++ b/include/d3d11_1.idl @@ -0,0 +1,179 @@ +/* + * Copyright 2014 Jacek Caban 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "dxgi1_2.idl"; +import "d3dcommon.idl"; +import "d3d11.idl"; + +[ + uuid(5c1e0d8a-7c23-48f9-8c59-a92958ceff11), + object, + local, + pointer_default(unique) +] +interface ID3DDeviceContextState : ID3D11DeviceChild +{ +} + +[ + uuid(bb2c6faa-b5fb-4082-8e6b-388b8cfa90e1), + object, + local, + pointer_default(unique) +] +interface ID3D11DeviceContext1 : ID3D11DeviceContext +{ + void CopySubresourceRegion1( + ID3D11Resource *pDstResource, + UINT DstSubresource, + UINT DstX, + UINT DstY, + UINT DstZ, + ID3D11Resource *pSrcResource, + UINT SrcSubresource, + const D3D11_BOX *pSrcBox, + UINT CopyFlags); + + void UpdateSubresource1( + ID3D11Resource *pDstResource, + UINT DstSubresource, + const D3D11_BOX *pDstBox, + const void *pSrcData, + UINT SrcRowPitch, + UINT SrcDepthPitch, + UINT CopyFlags); + + void DiscardResource(ID3D11Resource *pResource); + + void DiscardView(ID3D11View *pResourceView); + + void VSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants); + + void HSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants); + + void DSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants); + + void GSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants); + + void PSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants); + + void CSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants); + + void VSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants); + + void HSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants); + + void DSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants); + + void GSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants); + + void PSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants); + + void CSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants); + + void SwapDeviceContextState( + ID3DDeviceContextState *pState, + ID3DDeviceContextState **ppPreviousState); + + void ClearView( + ID3D11View *pView, + FLOAT Color[4], + const D3D11_RECT *pRect, + UINT NumRects); + + void DiscardView1( + ID3D11View *pResourceView, + const D3D11_RECT *pRects, + UINT NumRects); +} + +[ + uuid(b2daad8b-03d4-4dbf-95eb-32ab4b63d0ab), + object, + local, + pointer_default(unique) +] +interface ID3DUserDefinedAnnotation : IUnknown +{ + INT BeginEvent(LPCWSTR Name); + INT EndEvent(); + void SetMarker(LPCWSTR Name); + BOOL GetStatus(); +}

1 0

Jacek Caban : mshtml: Use document encoding for scripts.
by Alexandre Julliard 30 Dec '14

30 Dec '14

Module: wine Branch: master Commit: 127aa62a7030f07bea46ae8cb629f3ca2acd1aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=127aa62a7030f07bea46ae8cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 30 15:22:08 2014 +0100 mshtml: Use document encoding for scripts. --- dlls/mshtml/htmldoc.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/script.c | 12 ++++++++---- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ea56f5c..77af21f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -115,6 +115,38 @@ HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement * return hres; } +UINT get_document_charset(HTMLDocumentNode *doc) +{ + nsAString charset_str; + UINT ret = 0; + nsresult nsres; + + if(doc->charset) + return doc->charset; + + nsAString_Init(&charset_str, NULL); + nsres = nsIDOMHTMLDocument_GetCharacterSet(doc->nsdoc, &charset_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *charset; + + nsAString_GetData(&charset_str, &charset); + + if(*charset) { + BSTR str = SysAllocString(charset); + ret = cp_from_charset_string(str); + SysFreeString(str); + } + }else { + ERR("GetCharset failed: %08x\n", nsres); + } + nsAString_Finish(&charset_str); + + if(!ret) + return CP_UTF8; + + return doc->charset = ret; +} + static inline HTMLDocument *impl_from_IHTMLDocument2(IHTMLDocument2 *iface) { return CONTAINING_RECORD(iface, HTMLDocument, IHTMLDocument2_iface); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4076f8d..459be99 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -749,6 +749,8 @@ struct HTMLDocumentNode { BOOL skip_mutation_notif; + UINT charset; + struct list selection_list; struct list range_list; struct list plugin_hosts; @@ -807,6 +809,8 @@ void show_tooltip(HTMLDocumentObj*,DWORD,DWORD,LPCWSTR) DECLSPEC_HIDDEN; void hide_tooltip(HTMLDocumentObj*) DECLSPEC_HIDDEN; HRESULT get_client_disp_property(IOleClientSite*,DISPID,VARIANT*) DECLSPEC_HIDDEN; +UINT get_document_charset(HTMLDocumentNode*) DECLSPEC_HIDDEN; + HRESULT ProtocolFactory_Create(REFCLSID,REFIID,void**) DECLSPEC_HIDDEN; BOOL load_gecko(void) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 54e84e1..757036c 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -904,6 +904,7 @@ static const BSCallbackVtbl ScriptBSCVtbl = { static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement *script_elem, WCHAR **ret) { + UINT cp = CP_UTF8; ScriptBSC *bsc; IMoniker *mon; WCHAR *text; @@ -961,18 +962,21 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScrip text[bsc->bsc.readed/sizeof(WCHAR)] = 0; break; - case BOM_UTF8: - default: { + default: + /* FIXME: Try to use charset from HTTP headers first */ + cp = get_document_charset(window->doc); + /* fall through */ + case BOM_UTF8: { DWORD len; - len = MultiByteToWideChar(CP_UTF8, 0, bsc->buf, bsc->bsc.readed, NULL, 0); + len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, NULL, 0); text = heap_alloc((len+1)*sizeof(WCHAR)); if(!text) { hres = E_OUTOFMEMORY; break; } - MultiByteToWideChar(CP_UTF8, 0, bsc->buf, bsc->bsc.readed, text, len); + MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); text[len] = 0; } }

1 0