wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Michael Stefaniuc : qedit: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 47513d955184d0c5fe263671f410cfb766a019f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47513d955184d0c5fe263671f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 21 22:35:30 2012 +0100 qedit: "Fix" DllCanUnloadNow() implementation. --- dlls/qedit/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 40514d5..d8d02a3 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -139,7 +139,7 @@ static const IClassFactoryVtbl DSCF_Vtbl = */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; } /*******************************************************************************

1 0

Michael Stefaniuc : pstorec: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 3131a9f831dcdc385bebbf226ae3ad6b28cc3f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3131a9f831dcdc385bebbf226… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 21 22:29:55 2012 +0100 pstorec: "Fix" DllCanUnloadNow() implementation. --- dlls/pstorec/pstorec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 0a6a6c1..4d7b691 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -394,5 +394,5 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; }

1 0

Michael Stefaniuc : olepro32: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 7178228d52199c452eaabc640c0e2f8604cf272f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7178228d52199c452eaabc640… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 21 22:28:48 2012 +0100 olepro32: "Fix" DllCanUnloadNow() implementation. --- dlls/olepro32/olepro32stubs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c index a93c24c..70bf5c8 100644 --- a/dlls/olepro32/olepro32stubs.c +++ b/dlls/olepro32/olepro32stubs.c @@ -53,7 +53,7 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; } /***********************************************************************

1 0

Michael Stefaniuc : msisys.ocx: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 0be5ad8ece66a1c7c3e66710139a4ead033c87c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be5ad8ece66a1c7c3e667101… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 21 22:27:24 2012 +0100 msisys.ocx: "Fix" DllCanUnloadNow() implementation. --- dlls/msisys.ocx/msisys.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msisys.ocx/msisys.c b/dlls/msisys.ocx/msisys.c index 3863fba..056699e 100644 --- a/dlls/msisys.ocx/msisys.c +++ b/dlls/msisys.ocx/msisys.c @@ -87,7 +87,7 @@ BOOL WINAPI DllMain( */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; } /***********************************************************************

1 0

Michael Stefaniuc : hlink: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: a0e266972cb3d1c47d0614bd9c419076152c3419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e266972cb3d1c47d0614bd9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 21 22:26:08 2012 +0100 hlink: "Fix" DllCanUnloadNow() implementation. --- dlls/hlink/hlink_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 9823a5d..3bf9d27 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -64,7 +64,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) */ HRESULT WINAPI DllCanUnloadNow( void ) { - return S_OK; + return S_FALSE; } /***********************************************************************

1 0

Michael Stefaniuc : dpnhpast: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 9bf8bd52cf33d1114d8f3df7ffdeb70b8f63e01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf8bd52cf33d1114d8f3df7f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 21 22:25:12 2012 +0100 dpnhpast: "Fix" DllCanUnloadNow() implementation. --- dlls/dpnhpast/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 9a94a33..5ff5f72 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -81,7 +81,7 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; }

1 0

Andrew Talbot : kernel32: Remove unused variables.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 1973a808c26f294bd0fad0023c1115c2c231353c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1973a808c26f294bd0fad0023… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 21:16:44 2012 +0000 kernel32: Remove unused variables. --- dlls/kernel32/profile.c | 7 +++---- dlls/kernel32/resource.c | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 3d00c29..87c3cd7 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1236,12 +1236,11 @@ UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry, { WCHAR buffer[30]; UNICODE_STRING bufferW; - INT len; ULONG result; - if (!(len = GetPrivateProfileStringW( section, entry, emptystringW, - buffer, sizeof(buffer)/sizeof(WCHAR), - filename ))) + if (GetPrivateProfileStringW( section, entry, emptystringW, + buffer, sizeof(buffer)/sizeof(WCHAR), + filename ) == 0) return def_val; /* FIXME: if entry can be found but it's empty, then Win16 is diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index b9a93c4..0235b3c 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -830,7 +830,6 @@ static IMAGE_NT_HEADERS *get_nt_header( void *base, DWORD mapping_size ) static IMAGE_SECTION_HEADER *get_section_header( void *base, DWORD mapping_size, DWORD *num_sections ) { IMAGE_NT_HEADERS *nt; - IMAGE_SECTION_HEADER *sec; DWORD section_ofs; nt = get_nt_header( base, mapping_size ); @@ -839,7 +838,7 @@ static IMAGE_SECTION_HEADER *get_section_header( void *base, DWORD mapping_size, /* check that we don't go over the end of the file accessing the sections */ section_ofs = FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + nt->FileHeader.SizeOfOptionalHeader; - if ((nt->FileHeader.NumberOfSections * sizeof (*sec) + section_ofs) > mapping_size) + if ((nt->FileHeader.NumberOfSections * sizeof (IMAGE_SECTION_HEADER) + section_ofs) > mapping_size) return NULL; if (num_sections)

1 0

Andrew Talbot : msi: Remove unused variables.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: b1d4793344c08ca3722e15dc17c4c8d9b40bf0a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d4793344c08ca3722e15dc1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 21:16:50 2012 +0000 msi: Remove unused variables. --- dlls/msi/files.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d831313..7202fb6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -69,7 +69,6 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil VS_FIXEDFILEINFO *file_version; WCHAR *font_version; msi_file_state state; - DWORD file_size; comp->Action = msi_get_component_action( package, comp ); if (comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) @@ -118,7 +117,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil return state; } } - if ((file_size = msi_get_disk_file_size( file->TargetPath )) != file->FileSize) + if (msi_get_disk_file_size( file->TargetPath ) != file->FileSize) { return msifs_overwrite; } @@ -781,7 +780,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) LPWSTR sourcedir, destname = NULL, destdir = NULL, source = NULL, dest = NULL; int options; DWORD size; - BOOL ret, wildcards; + BOOL wildcards; component = MSI_RecordGetString(rec, 2); comp = msi_get_loaded_component(package, component); @@ -863,7 +862,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) if (GetFileAttributesW(destdir) == INVALID_FILE_ATTRIBUTES) { - if (!(ret = msi_create_full_path(destdir))) + if (!msi_create_full_path(destdir)) { WARN("failed to create directory %u\n", GetLastError()); goto done;

1 0

Andrew Talbot : msxml3: Remove unused variable.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 6256379a967ee862bfb342bf12c945934eb95c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6256379a967ee862bfb342bf1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 21:16:55 2012 +0000 msxml3: Remove unused variable. --- dlls/msxml3/element.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index eee737e..4892920 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -736,7 +736,7 @@ static HRESULT encode_base64(const BYTE *buf, int len, BSTR *ret) { static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; const BYTE *d = buf; - int bytes, pad_bytes, div, i; + int bytes, pad_bytes, div; DWORD needed; WCHAR *ptr; @@ -753,7 +753,6 @@ static HRESULT encode_base64(const BYTE *buf, int len, BSTR *ret) div = len / 3; ptr = *ret; - i = 0; while (div > 0) { /* first char is the first 6 bits of the first byte*/ @@ -766,7 +765,6 @@ static HRESULT encode_base64(const BYTE *buf, int len, BSTR *ret) *ptr++ = b64[ ((d[1] << 2) & 0x3c) | (d[2] >> 6 & 0x03)]; /* fourth char is the remaining 6 bits of the third byte */ *ptr++ = b64[ d[2] & 0x3f]; - i += 4; d += 3; div--; }

1 0

Andrew Talbot : quartz: Remove unused variables.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 17cc65a0df2f277cb1573cacc337e6c8a0054b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=17cc65a0df2f277cb1573cacc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 21:16:59 2012 +0000 quartz: Remove unused variables. --- dlls/quartz/filesource.c | 3 +-- dlls/quartz/videorenderer.c | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index e5a5d3c..f518ec7 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -306,9 +306,8 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, DWORD dwValueNameLen = sizeof(wszValueName) / sizeof(wszValueName[0]); /* remember this is in chars */ DWORD dwDataLen = maxValueLen; /* remember this is in bytes */ static const WCHAR wszSourceFilter[] = {'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; - LONG temp; - if ((temp = RegEnumValueW(hkeyMinor, indexValue, wszValueName, &dwValueNameLen, NULL, &dwType, (LPBYTE)wszPatternString, &dwDataLen)) != ERROR_SUCCESS) + if (RegEnumValueW(hkeyMinor, indexValue, wszValueName, &dwValueNameLen, NULL, &dwType, (LPBYTE)wszPatternString, &dwDataLen) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, wszPatternString); break; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index d6b87fa..a7f0a59 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -207,12 +207,10 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, { AM_MEDIA_TYPE amt; HRESULT hr = S_OK; - DDSURFACEDESC sdesc; BITMAPINFOHEADER *bmiHeader; TRACE("(%p)->(%p, %d)\n", This, data, size); - sdesc.dwSize = sizeof(sdesc); hr = IPin_ConnectionMediaType(&This->renderer.pInputPin->pin.IPin_iface, &amt); if (FAILED(hr)) { ERR("Unable to retrieve media type\n");

1 0

Andrew Talbot : shell32: Remove unused variable.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: cade59aab7b80ede7e8ff1e4310dd4d886c31573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cade59aab7b80ede7e8ff1e43… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 21:17:03 2012 +0000 shell32: Remove unused variable. --- dlls/shell32/brsfolder.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 0e7b9d3..d48666f 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -410,7 +410,6 @@ static HTREEITEM InsertTreeViewItem( browse_info *info, IShellFolder * lpsf, static void FillTreeView( browse_info *info, IShellFolder * lpsf, LPITEMIDLIST pidl, HTREEITEM hParent, IEnumIDList* lpe) { - HTREEITEM hPrev = 0; LPITEMIDLIST pidlTemp = 0; ULONG ulFetched; HRESULT hr; @@ -450,7 +449,7 @@ static void FillTreeView( browse_info *info, IShellFolder * lpsf, } } - if (!(hPrev = InsertTreeViewItem(info, lpsf, pidlTemp, pidl, pEnumIL, hParent))) + if (!InsertTreeViewItem(info, lpsf, pidlTemp, pidl, pEnumIL, hParent)) goto done; SHFree(pidlTemp); /* Finally, free the pidl that the shell gave us... */ pidlTemp=NULL;

1 0

Nikolay Sivov : msxml3: Properly update node to doc link when cloning.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 2b5ddbfe9a39b7c16fb20b33b0201252c51532cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5ddbfe9a39b7c16fb20b33b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 21 19:50:32 2012 -0500 msxml3: Properly update node to doc link when cloning. --- dlls/msxml3/node.c | 2 +- dlls/msxml3/tests/domdoc.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 30ce1b9..7b6e1ab 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -595,7 +595,7 @@ HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) clone = xmlCopyNode(This->node, deep ? 1 : 2); if (clone) { - clone->doc = This->node->doc; + xmlSetTreeDoc(clone, This->node->doc); xmldoc_add_orphan(clone->doc, clone); node = create_node(clone); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4b894b0..3a62c95 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6073,7 +6073,7 @@ static void test_cloneNode(void ) IXMLDOMNamedNodeMap *mapAttr; LONG length, length1; LONG attr_cnt, attr_cnt1; - IXMLDOMNode *node; + IXMLDOMNode *node, *attr; IXMLDOMNode *node_clone; IXMLDOMNode *node_first; HRESULT hr; @@ -6134,6 +6134,11 @@ static void test_cloneNode(void ) hr = IXMLDOMNamedNodeMap_get_length(mapAttr, &attr_cnt1); ok( hr == S_OK, "ret %08x\n", hr ); ok(attr_cnt1 == 3, "got %d\n", attr_cnt1); + /* now really get some attributes from cloned element */ + attr = NULL; + hr = IXMLDOMNamedNodeMap_getNamedItem(mapAttr, _bstr_("id"), &attr); + ok(hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(attr); IXMLDOMNamedNodeMap_Release(mapAttr); ok(length == length1, "wrong Child count (%d, %d)\n", length, length1);

1 0

Jacek Caban : mshtml: Added nsIURI::GetOriginCharset implementation.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 2f5123cbbc8655fc410ed47b0e7dff51d857a3ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5123cbbc8655fc410ed47b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 15:06:46 2012 +0100 mshtml: Added nsIURI::GetOriginCharset implementation. --- dlls/mshtml/nsio.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e3520d1..89a7fe8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -63,6 +63,7 @@ struct nsWineURI { nsChannelBSC *channel_bsc; IUri *uri; IUriBuilder *uri_builder; + char *origin_charset; BOOL is_doc_uri; BOOL is_mutable; DWORD scheme; @@ -140,7 +141,7 @@ static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) return ret; } -static nsresult create_nsuri(IUri*,HTMLOuterWindow*,NSContainer*,nsWineURI**); +static nsresult create_nsuri(IUri*,HTMLOuterWindow*,NSContainer*,const char*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -1847,6 +1848,7 @@ static nsrefcnt NSAPI nsURI_Release(nsIFileURL *iface) nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); if(This->uri) IUri_Release(This->uri); + heap_free(This->origin_charset); heap_free(This); } @@ -2309,7 +2311,8 @@ static nsresult NSAPI nsURI_Clone(nsIFileURL *iface, nsIURI **_retval) if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; - nsres = create_nsuri(This->uri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(This->uri, This->window_ref ? This->window_ref->window : NULL, + This->container, This->origin_charset, &wine_uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); return nsres; @@ -2384,8 +2387,11 @@ static nsresult NSAPI nsURI_GetAsciiHost(nsIFileURL *iface, nsACString *aAsciiHo static nsresult NSAPI nsURI_GetOriginCharset(nsIFileURL *iface, nsACString *aOriginCharset) { nsWineURI *This = impl_from_nsIFileURL(iface); - FIXME("(%p)->(%p)\n", This, aOriginCharset); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)->(%p)\n", This, aOriginCharset); + + nsACString_SetData(aOriginCharset, This->origin_charset); + return NS_OK; } static nsresult NSAPI nsURL_GetRef(nsIFileURL *iface, nsACString *aRef) @@ -2481,7 +2487,8 @@ static nsresult NSAPI nsURI_CloneIgnoreRef(nsIFileURL *iface, nsIURI **_retval) if(!uri) return NS_ERROR_FAILURE; - nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->container, + This->origin_charset, &wine_uri); IUri_Release(uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); @@ -2850,7 +2857,8 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { nsStandardURL_Init }; -static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, nsWineURI **_retval) +static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, + const char *origin_charset, nsWineURI **_retval) { nsWineURI *ret; HRESULT hres; @@ -2874,6 +2882,14 @@ static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *c if(FAILED(hres)) ret->scheme = URL_SCHEME_UNKNOWN; + if(origin_charset && *origin_charset && strcmp(origin_charset, "UTF-8")) { + ret->origin_charset = heap_strdupA(origin_charset); + if(!ret->origin_charset) { + nsIFileURL_Release(&ret->nsIFileURL_iface); + return NS_ERROR_OUT_OF_MEMORY; + } + } + TRACE("retval=%p\n", ret); *_retval = ret; return NS_OK; @@ -2890,7 +2906,7 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, const WCHAR *url, nsWineURI **re if(FAILED(hres)) return hres; - nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, &uri); + nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, NULL, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -2942,7 +2958,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(orig_channel->uri->window_ref) window = orig_channel->uri->window_ref->window; - nsres = create_nsuri(iuri, window, NULL, &uri); + nsres = create_nsuri(iuri, window, NULL, NULL, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3257,7 +3273,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(FAILED(hres)) return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); - nsres = create_nsuri(urlmon_uri, window, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, window, NULL, NULL, &wine_uri); IUri_Release(urlmon_uri); if(base_wine_uri) nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface);

1 0

Jacek Caban : mshtml: Always use UTF-8 encoding in nsWineURL.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: d202daa1829f60bc5c05a8c4cf8a2ad57e7eb792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d202daa1829f60bc5c05a8c4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 15:06:34 2012 +0100 mshtml: Always use UTF-8 encoding in nsWineURL. --- dlls/mshtml/mshtml_private.h | 30 ++++++++++++++++++++++++++++++ dlls/mshtml/nsio.c | 34 +++++++++++++++++----------------- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f9c05f0..d2c7b28 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1102,6 +1102,36 @@ static inline char *heap_strdupWtoA(LPCWSTR str) return ret; } +static inline WCHAR *heap_strdupUtoW(const char *str) +{ + WCHAR *ret = NULL; + + if(str) { + size_t len; + + len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_UTF8, 0, str, -1, ret, len); + } + + return ret; +} + +static inline char *heap_strdupWtoU(const WCHAR *str) +{ + char *ret = NULL; + + if(str) { + size_t size = WideCharToMultiByte(CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL); + ret = heap_alloc(size); + if(ret) + WideCharToMultiByte(CP_UTF8, 0, str, -1, ret, size, NULL, NULL); + } + + return ret; +} + static inline void windowref_addref(windowref_t *ref) { InterlockedIncrement(&ref->ref); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 90543df..e3520d1 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -162,12 +162,12 @@ static nsresult return_wstr_nsacstr(nsACString *ret_str, const WCHAR *str, int l return NS_OK; } - lena = WideCharToMultiByte(CP_ACP, 0, str, len, NULL, 0, NULL, NULL); + lena = WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL); stra = heap_alloc(lena+1); if(!stra) return NS_ERROR_OUT_OF_MEMORY; - WideCharToMultiByte(CP_ACP, 0, str, len, stra, lena, NULL, NULL); + WideCharToMultiByte(CP_UTF8, 0, str, len, stra, lena, NULL, NULL); stra[lena] = 0; nsACString_SetData(ret_str, stra); @@ -1769,7 +1769,7 @@ static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *r return NS_ERROR_UNEXPECTED; } - vala = heap_strdupWtoA(val); + vala = heap_strdupWtoU(val); SysFreeString(val); if(!vala) return NS_ERROR_OUT_OF_MEMORY; @@ -1876,7 +1876,7 @@ static nsresult NSAPI nsURI_SetSpec(nsIFileURL *iface, const nsACString *aSpec) return NS_ERROR_UNEXPECTED; nsACString_GetData(aSpec, &speca); - spec = heap_strdupAtoW(speca); + spec = heap_strdupUtoW(speca); if(!spec) return NS_ERROR_OUT_OF_MEMORY; @@ -1942,7 +1942,7 @@ static nsresult NSAPI nsURI_SetScheme(nsIFileURL *iface, const nsACString *aSche return NS_ERROR_UNEXPECTED; nsACString_GetData(aScheme, &schemea); - scheme = heap_strdupAtoW(schemea); + scheme = heap_strdupUtoW(schemea); if(!scheme) return NS_ERROR_OUT_OF_MEMORY; @@ -2002,7 +2002,7 @@ static nsresult NSAPI nsURI_SetUserPass(nsIFileURL *iface, const nsACString *aUs if(*user_pass) { WCHAR *ptr; - buf = heap_strdupAtoW(user_pass); + buf = heap_strdupUtoW(user_pass); if(!buf) return NS_ERROR_OUT_OF_MEMORY; @@ -2049,7 +2049,7 @@ static nsresult NSAPI nsURI_SetUsername(nsIFileURL *iface, const nsACString *aUs return NS_ERROR_UNEXPECTED; nsACString_GetData(aUsername, &usera); - user = heap_strdupAtoW(usera); + user = heap_strdupUtoW(usera); if(!user) return NS_ERROR_OUT_OF_MEMORY; @@ -2083,7 +2083,7 @@ static nsresult NSAPI nsURI_SetPassword(nsIFileURL *iface, const nsACString *aPa return NS_ERROR_UNEXPECTED; nsACString_GetData(aPassword, &passa); - pass = heap_strdupAtoW(passa); + pass = heap_strdupUtoW(passa); if(!pass) return NS_ERROR_OUT_OF_MEMORY; @@ -2118,7 +2118,7 @@ static nsresult NSAPI nsURI_GetHostPort(nsIFileURL *iface, nsACString *aHostPort if(!ptr) ptr = val; - vala = heap_strdupWtoA(ptr); + vala = heap_strdupWtoU(ptr); SysFreeString(val); if(!vala) return NS_ERROR_OUT_OF_MEMORY; @@ -2161,7 +2161,7 @@ static nsresult NSAPI nsURI_SetHost(nsIFileURL *iface, const nsACString *aHost) return NS_ERROR_UNEXPECTED; nsACString_GetData(aHost, &hosta); - host = heap_strdupAtoW(hosta); + host = heap_strdupUtoW(hosta); if(!host) return NS_ERROR_OUT_OF_MEMORY; @@ -2230,7 +2230,7 @@ static nsresult NSAPI nsURI_SetPath(nsIFileURL *iface, const nsACString *aPath) return NS_ERROR_UNEXPECTED; nsACString_GetData(aPath, &patha); - path = heap_strdupAtoW(patha); + path = heap_strdupUtoW(patha); if(!path) return NS_ERROR_OUT_OF_MEMORY; @@ -2292,7 +2292,7 @@ static nsresult NSAPI nsURI_SchemeIs(nsIFileURL *iface, const char *scheme, cpp_ if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR)); *_retval = !strcmpW(scheme_name, buf); SysFreeString(scheme_name); return NS_OK; @@ -2336,7 +2336,7 @@ static nsresult NSAPI nsURI_Resolve(nsIFileURL *iface, const nsACString *aRelati return NS_ERROR_UNEXPECTED; nsACString_GetData(aRelativePath, &patha); - path = heap_strdupAtoW(patha); + path = heap_strdupUtoW(patha); if(!path) return NS_ERROR_OUT_OF_MEMORY; @@ -2352,7 +2352,7 @@ static nsresult NSAPI nsURI_Resolve(nsIFileURL *iface, const nsACString *aRelati if(FAILED(hres)) return NS_ERROR_FAILURE; - reta = heap_strdupWtoA(ret); + reta = heap_strdupWtoU(ret); SysFreeString(ret); if(!reta) return NS_ERROR_OUT_OF_MEMORY; @@ -2404,7 +2404,7 @@ static nsresult NSAPI nsURL_GetRef(nsIFileURL *iface, nsACString *aRef) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - refa = heap_strdupWtoA(ref); + refa = heap_strdupWtoU(ref); SysFreeString(ref); if(ref && !refa) return NS_ERROR_OUT_OF_MEMORY; @@ -2427,7 +2427,7 @@ static nsresult NSAPI nsURL_SetRef(nsIFileURL *iface, const nsACString *aRef) return NS_ERROR_UNEXPECTED; nsACString_GetData(aRef, &refa); - ref = heap_strdupAtoW(refa); + ref = heap_strdupUtoW(refa); if(!ref) return NS_ERROR_OUT_OF_MEMORY; @@ -2563,7 +2563,7 @@ static nsresult NSAPI nsURL_SetQuery(nsIFileURL *iface, const nsACString *aQuery return NS_ERROR_UNEXPECTED; nsACString_GetData(aQuery, &querya); - query = heap_strdupAtoW(querya); + query = heap_strdupUtoW(querya); if(!query) return NS_ERROR_OUT_OF_MEMORY;

1 0

Alexandre Julliard : user32: Don' t check for driver events before normal messages in PeekMessage.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 841214ddb4d4dc620e6b51dfe6655b585d423edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=841214ddb4d4dc620e6b51dfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 21 19:20:27 2012 +0100 user32: Don't check for driver events before normal messages in PeekMessage. --- dlls/user32/message.c | 15 ++++++++++----- dlls/user32/tests/msg.c | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2ffbf6e..ba37a3a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3681,14 +3681,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, USER_CheckNotLock(); - /* check for graphics events */ - USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); - if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { + DWORD ret; + flush_window_surfaces( !(flags & PM_NOYIELD) ); - if (!(flags & PM_NOYIELD)) wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); - return FALSE; + + if (flags & PM_NOYIELD) + ret = USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); + else + ret = wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); + + /* if we received driver events, check again for a pending message */ + if (ret == WAIT_TIMEOUT || !peek_message( &msg, hwnd, first, last, flags, 0 )) return FALSE; } /* copy back our internal safe copy of message data to msg_out. diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bfc3830..9816f13 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6795,6 +6795,7 @@ static void test_interthread_messages(void) wnd_event.hwnd = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); ok (wnd_event.hwnd != 0, "Failed to create parent window\n"); + flush_events(); flush_sequence(); log_all_parent_messages++; wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL );

1 0

Alexandre Julliard : user32: Don' t check for driver events before normal messages in GetMessage.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 8ba4c316f2a65354783a03e0559abee2082b813f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba4c316f2a65354783a03e05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 21 19:20:09 2012 +0100 user32: Don't check for driver events before normal messages in GetMessage. --- dlls/user32/message.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 6d45671..2ffbf6e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3727,9 +3727,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT USER_CheckNotLock(); - /* check for graphics events */ - USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); - if (first || last) { if ((first <= WM_KEYLAST) && (last >= WM_KEYFIRST)) mask |= QS_KEY;

1 0

Dmitry Timoshkov : windowscodecs: Implement QueryCapability in the TIFF decoder.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: a3711295dad197c55ec5c0f6756dde6097a25c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3711295dad197c55ec5c0f67… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 21 17:12:47 2012 +0800 windowscodecs: Implement QueryCapability in the TIFF decoder. --- dlls/windowscodecs/tests/tiffformat.c | 7 ------- dlls/windowscodecs/tiffformat.c | 19 +++++++++++++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 4cbda4d..d8cb10a 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -212,31 +212,25 @@ static void test_QueryCapability(void) capability = 0xdeadbeef; hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); -todo_wine ok(hr == S_OK, "QueryCapability error %#x\n", hr); -todo_wine ok(capability == exp_caps || capability == exp_caps_xp, "expected %#x, got %#x\n", exp_caps, capability); frame_count = 0xdeadbeef; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok(hr == S_OK, "GetFrameCount error %#x\n", hr); -todo_wine ok(frame_count == 1, "expected 1, got %u\n", frame_count); pos.QuadPart = 0; hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); -todo_wine ok(cur_pos.QuadPart > 4 && cur_pos.QuadPart < sizeof(tiff_1bpp_data), "current stream pos is at %x/%x\n", cur_pos.u.LowPart, cur_pos.u.HighPart); hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); -todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); -todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); IWICBitmapDecoder_Release(decoder); @@ -261,7 +255,6 @@ todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); -todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); IWICBitmapDecoder_Release(decoder); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f22d9f6..bacc9c5 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -550,11 +550,22 @@ static ULONG WINAPI TiffDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI TiffDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI TiffDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, + DWORD *capability) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, stream, capability); + + if (!stream || !capability) return E_INVALIDARG; + + hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); + if (hr != S_OK) return hr; + + *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages | + WICBitmapDecoderCapabilityCanEnumerateMetadata; + return S_OK; } static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream,

1 0

Dmitry Timoshkov : windowscodecs: Make GetFrameCount in the TIFF decoder not fail without an image stream.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 9e5ecdb74532e0d2a503d26d16de98376c17f7f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5ecdb74532e0d2a503d26d1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 21 17:11:15 2012 +0800 windowscodecs: Make GetFrameCount in the TIFF decoder not fail without an image stream. --- dlls/windowscodecs/tests/tiffformat.c | 3 --- dlls/windowscodecs/tiffformat.c | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 9b5db52..4cbda4d 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -203,9 +203,7 @@ static void test_QueryCapability(void) frame_count = 0xdeadbeef; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); -todo_wine ok(hr == S_OK || broken(hr == E_POINTER) /* XP */, "GetFrameCount error %#x\n", hr); -todo_wine ok(frame_count == 0, "expected 0, got %u\n", frame_count); pos.QuadPart = 4; @@ -222,7 +220,6 @@ todo_wine frame_count = 0xdeadbeef; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); -todo_wine ok(hr == S_OK, "GetFrameCount error %#x\n", hr); todo_wine ok(frame_count == 1, "expected 1, got %u\n", frame_count); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index cf93540..f22d9f6 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -668,14 +668,10 @@ static HRESULT WINAPI TiffDecoder_GetFrameCount(IWICBitmapDecoder *iface, { TiffDecoder *This = impl_from_IWICBitmapDecoder(iface); - if (!This->tiff) - { - WARN("(%p) <-- WINCODEC_ERR_WRONGSTATE\n", iface); - return WINCODEC_ERR_WRONGSTATE; - } + if (!pCount) return E_INVALIDARG; EnterCriticalSection(&This->lock); - *pCount = pTIFFNumberOfDirectories(This->tiff); + *pCount = This->tiff ? pTIFFNumberOfDirectories(This->tiff) : 0; LeaveCriticalSection(&This->lock); TRACE("(%p) <-- %i\n", iface, *pCount);

1 0

Qian Hong : usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: dd2be15118fa368c18ee9fe300f91c1ba8f9ab3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2be15118fa368c18ee9fe30… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Nov 21 18:14:30 2012 +0800 usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida. --- dlls/usp10/tests/usp10.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ff757ee..d6786cd 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1804,11 +1804,64 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ok (!psc, "psc is not null after ScriptFreeCache\n"); } +#define MAX_ENUM_FONTS 4096 + +struct enum_font_data +{ + int total; + ENUMLOGFONT elf[MAX_ENUM_FONTS]; +}; + +static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efnd = (struct enum_font_data *)lParam; + + if (type & (TRUETYPE_FONTTYPE | DEVICE_FONTTYPE)) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + { + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + } + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + +static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efnd = (struct enum_font_data *)lParam; + + if (!(type & (TRUETYPE_FONTTYPE | DEVICE_FONTTYPE))) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + { + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + } + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + static void test_ScriptGetFontProperties(HDC hdc) { HRESULT hr; SCRIPT_CACHE psc,old_psc; SCRIPT_FONTPROPERTIES sfp; + HFONT font, oldfont; + LOGFONT lf; + struct enum_font_data efnd; + TEXTMETRICA tmA; + WORD gi[3]; + WCHAR str[3]; + DWORD i, ret; + WORD system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); + static const WCHAR invalids[] = {0x0020, 0x200B, 0xF71B}; + /* U+0020: numeric space + U+200B: zero width space + U+F71B: unkown, found by black box testing */ + BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); /* Some sanity checks for ScriptGetFontProperties */ @@ -1866,6 +1919,109 @@ static void test_ScriptGetFontProperties(HDC hdc) ok( psc == old_psc, "Expected psc not to be changed, was %p is now %p\n", old_psc, psc); ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + pGetGlyphIndicesW = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetGlyphIndicesW"); + if (!pGetGlyphIndicesW) + { + win_skip("Skip on WINNT4\n"); + return; + } + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + efnd.total = 0; + EnumFontFamiliesA(hdc, NULL, enum_bitmap_font_proc, (LPARAM)&efnd); + + for (i = 0; i < efnd.total; i++) + { + lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); + font = CreateFontIndirect(&lf); + oldfont = SelectObject(hdc, font); + + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc, &psc, &sfp); + ok(hr == S_OK, "ScriptGetFontProperties expected S_OK, got %08x\n", hr); + if (winetest_interactive) + { + trace("bitmap font %s\n", lf.lfFaceName); + trace("wgBlank %04x\n", sfp.wgBlank); + trace("wgDefault %04x\n", sfp.wgDefault); + trace("wgInvalid %04x\n", sfp.wgInvalid); + trace("wgKashida %04x\n", sfp.wgKashida); + trace("iKashidaWidth %d\n", sfp.iKashidaWidth); + } + + ret = GetTextMetricsA(hdc, &tmA); + ok(ret != 0, "GetTextMetricsA failed!\n"); + + is_terminal = !(lstrcmpA(lf.lfFaceName, "Terminal") && lstrcmpA(lf.lfFaceName, "@Terminal")); + ok(sfp.wgBlank == tmA.tmBreakChar || broken(is_terminal) || broken(is_arabic), "bitmap font %s wgBlank %04x tmBreakChar %04x\n", lf.lfFaceName, sfp.wgBlank, tmA.tmBreakChar); + + ok(sfp.wgDefault == tmA.tmDefaultChar || broken(is_arabic), "bitmap font %s wgDefault %04x, tmDefaultChar %04x\n", lf.lfFaceName, sfp.wgDefault, tmA.tmDefaultChar); + + ok(sfp.wgInvalid == sfp.wgBlank || broken(is_arabic), "bitmap font %s wgInvalid %02x wgBlank %02x\n", lf.lfFaceName, sfp.wgInvalid, sfp.wgBlank); + + ok(sfp.wgKashida == 0xFFFF || broken(is_arabic), "bitmap font %s wgKashida %02x\n", lf.lfFaceName, sfp.wgKashida); + + ScriptFreeCache(&psc); + + SelectObject(hdc, oldfont); + DeleteObject(font); + } + + efnd.total = 0; + EnumFontFamiliesA(hdc, NULL, enum_truetype_proc, (LPARAM)&efnd); + + for (i = 0; i < efnd.total; i++) + { + lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); + font = CreateFontIndirect(&lf); + oldfont = SelectObject(hdc, font); + + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc, &psc, &sfp); + ok(hr == S_OK, "ScriptGetFontProperties expected S_OK, got %08x\n", hr); + if (winetest_interactive) + { + trace("truetype font %s\n", lf.lfFaceName); + trace("wgBlank %04x\n", sfp.wgBlank); + trace("wgDefault %04x\n", sfp.wgDefault); + trace("wgInvalid %04x\n", sfp.wgInvalid); + trace("wgKashida %04x\n", sfp.wgKashida); + trace("iKashidaWidth %d\n", sfp.iKashidaWidth); + } + + str[0] = 0x0020; /* U+0020: numeric space */ + ret = pGetGlyphIndicesW(hdc, str, 1, gi, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + ok(sfp.wgBlank == gi[0], "truetype font %s wgBlank %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgBlank, gi[0]); + + ok(sfp.wgDefault == 0 || broken(is_arabic), "truetype font %s wgDefault %04x\n", lf.lfFaceName, sfp.wgDefault); + + ret = pGetGlyphIndicesW(hdc, invalids, 3, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + if (gi[2] != 0xFFFF) /* index of default non exist char */ + ok(sfp.wgInvalid == gi[2], "truetype font %s wgInvalid %04x gi[2] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[2]); + else if (gi[1] != 0xFFFF) + ok(sfp.wgInvalid == gi[1], "truetype font %s wgInvalid %04x gi[1] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[1]); + else if (gi[0] != 0xFFFF) + ok(sfp.wgInvalid == gi[0], "truetype font %s wgInvalid %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[0]); + else + ok(sfp.wgInvalid == 0, "truetype font %s wgInvalid %04x expect 0\n", lf.lfFaceName, sfp.wgInvalid); + + str[0] = 0x0640; /* U+0640: kashida */ + ret = pGetGlyphIndicesW(hdc, str, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + is_arial = !lstrcmpA(lf.lfFaceName, "Arial"); + is_times_new_roman= !lstrcmpA(lf.lfFaceName, "Times New Roman"); + ok(sfp.wgKashida == gi[0] || broken(is_arial || is_times_new_roman) || broken(is_arabic), "truetype font %s wgKashida %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgKashida, gi[0]); + + ScriptFreeCache(&psc); + + SelectObject(hdc, oldfont); + DeleteObject(font); + } } static void test_ScriptTextOut(HDC hdc)

1 0

Qian Hong : usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 33cefcf8ea8f8570b02e7190cc0866b0325021f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33cefcf8ea8f8570b02e7190c… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Nov 21 18:13:14 2012 +0800 usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida. --- dlls/usp10/usp10.c | 68 +++++++++++++++++++++++++++++++++++++----- dlls/usp10/usp10_internal.h | 1 + 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 7f181d0..6ff640e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -729,9 +729,61 @@ static inline BOOL heap_free(LPVOID mem) return HeapFree(GetProcessHeap(), 0, mem); } -static inline WCHAR get_cache_default_char(SCRIPT_CACHE *psc) +/* TODO Fix font properties on Arabic locale */ +static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) { - return ((ScriptCache *)*psc)->tm.tmDefaultChar; + if (!sc->sfnt) + { + sc->sfp.wgBlank = sc->tm.tmBreakChar; + sc->sfp.wgDefault = sc->tm.tmDefaultChar; + sc->sfp.wgInvalid = sc->sfp.wgBlank; + sc->sfp.wgKashida = 0xFFFF; + sc->sfp.iKashidaWidth = 0; + } + else + { + static const WCHAR chars[4] = {0x0020, 0x200B, 0xF71B, 0x0640}; + /* U+0020: numeric space + U+200B: zero width space + U+F71B: unknow char found by black box testing + U+0640: kashida */ + WORD gi[4]; + + if (GetGlyphIndicesW(hdc, chars, 4, gi, GGI_MARK_NONEXISTING_GLYPHS) != GDI_ERROR) + { + if(gi[0] != 0xFFFF) /* 0xFFFF: index of default non exist char */ + sc->sfp.wgBlank = gi[0]; + else + sc->sfp.wgBlank = 0; + + sc->sfp.wgDefault = 0; + + if (gi[2] != 0xFFFF) + sc->sfp.wgInvalid = gi[2]; + else if (gi[1] != 0xFFFF) + sc->sfp.wgInvalid = gi[1]; + else if (gi[0] != 0xFFFF) + sc->sfp.wgInvalid = gi[0]; + else + sc->sfp.wgInvalid = 0; + + sc->sfp.wgKashida = gi[3]; + + sc->sfp.iKashidaWidth = 0; /* TODO */ + } + else + return FALSE; + } + return TRUE; +} + +static inline void get_cache_font_properties(SCRIPT_FONTPROPERTIES *sfp, ScriptCache *sc) +{ + sfp->wgBlank = sc->sfp.wgBlank; + sfp->wgDefault = sc->sfp.wgDefault; + sfp->wgInvalid = sc->sfp.wgInvalid; + sfp->wgKashida = sc->sfp.wgKashida; + sfp->iKashidaWidth = sc->sfp.iKashidaWidth; } static inline LONG get_cache_height(SCRIPT_CACHE *psc) @@ -813,6 +865,11 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) return E_INVALIDARG; } sc->sfnt = (GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0)!=GDI_ERROR); + if (!set_cache_font_properties(hdc, sc)) + { + heap_free(sc); + return E_INVALIDARG; + } *psc = sc; TRACE("<- %p\n", sc); return S_OK; @@ -1063,12 +1120,7 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR if (sfp->cBytes != sizeof(SCRIPT_FONTPROPERTIES)) return E_INVALIDARG; - /* return something sensible? */ - sfp->wgBlank = 0; - sfp->wgDefault = get_cache_default_char(psc); - sfp->wgInvalid = 0; - sfp->wgKashida = 0xffff; - sfp->iKashidaWidth = 0; + get_cache_font_properties(sfp, *psc); return S_OK; } diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 674db89..e92648c 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -160,6 +160,7 @@ typedef struct { LOGFONTW lf; TEXTMETRICW tm; OUTLINETEXTMETRICW *otm; + SCRIPT_FONTPROPERTIES sfp; BOOL sfnt; CacheGlyphPage *page[0x10]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE];

1 0

Christian Costa : winegstreamer: Turn some FIXME into TRACE.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 20e1f8a0278dd7cd7866f9d2e9d32533ccdd4943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e1f8a0278dd7cd7866f9d2e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 21 09:49:01 2012 +0100 winegstreamer: Turn some FIXME into TRACE. --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3f70ae3..dd160eb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -515,7 +515,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { if (This->initial) { gst_buffer_unref(buf); - FIXME("Triggering %p %p\n", pad, pin->caps_event); + TRACE("Triggering %p %p\n", pad, pin->caps_event); SetEvent(pin->caps_event); return GST_FLOW_NOT_LINKED; } @@ -539,7 +539,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { ERR("Didn't get a GST_APP_BUFFER, and could not get a delivery buffer (%x), returning GST_FLOW_WRONG_STATE\n", hr); return GST_FLOW_WRONG_STATE; } - FIXME("Did not get a GST_APP_BUFFER, creating a sample\n"); + TRACE("Did not get a GST_APP_BUFFER, creating a sample\n"); IMediaSample_GetPointer(sample, &ptr); memcpy(ptr, GST_BUFFER_DATA(buf), GST_BUFFER_SIZE(buf)); } @@ -759,7 +759,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS gst_segment_init(pin->segment, GST_FORMAT_TIME); ret = gst_pad_link(pad, mypad); gst_pad_activate_push(mypad, 1); - FIXME("Linking: %i\n", ret); + TRACE("Linking: %i\n", ret); if (ret >= 0) { pin->their_src = pad; gst_object_ref(pin->their_src); @@ -859,7 +859,7 @@ static gboolean activate_push(GstPad *pad, gboolean activate) { } static void no_more_pads(GstElement *decodebin, GSTImpl *This) { - FIXME("Done\n"); + TRACE("Done\n"); SetEvent(This->event); }

1 0

Christian Costa : winegstreamer: Remove left over FIXME.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 1fcce23f34a70441311b0c34e79228c9c9c255e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcce23f34a70441311b0c34e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 21 09:48:42 2012 +0100 winegstreamer: Remove left over FIXME. --- dlls/winegstreamer/gsttffilter.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 03b854b..4222008 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -398,7 +398,6 @@ static HRESULT WINAPI Gstreamer_transform_Cleanup(TransformFilter *tf, PIN_DIREC gst_object_unref(This->my_sink); } This->my_sink = This->my_src = This->their_sink = This->their_src = NULL; - FIXME("%p stub\n", This); } return S_OK; }

1 0

Aric Stewart : imm32/tests: Test showing that communication to the IME window is done via SendMessage.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 203b4fbff09a95c7ac1c51b65144f5f7b6110848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203b4fbff09a95c7ac1c51b65… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 20 14:07:07 2012 -0600 imm32/tests: Test showing that communication to the IME window is done via SendMessage. --- dlls/imm32/tests/imm32.c | 73 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 6eb8a41..5aff7f7 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -33,11 +33,16 @@ static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); /* * msgspy - record and analyse message traces sent to a certain window */ +typedef struct _msgs { + CWPSTRUCT msg; + BOOL post; +} imm_msgs; + static struct _msg_spy { HWND hwnd; HHOOK get_msg_hook; HHOOK call_wnd_proc_hook; - CWPSTRUCT msgs[32]; + imm_msgs msgs[32]; unsigned int i_msg; } msg_spy; @@ -46,13 +51,14 @@ static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) if (HC_ACTION == nCode) { MSG *msg = (MSG*)lParam; - if ((msg->hwnd == msg_spy.hwnd) && + if ((msg->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL) && (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) { - msg_spy.msgs[msg_spy.i_msg].hwnd = msg->hwnd; - msg_spy.msgs[msg_spy.i_msg].message = msg->message; - msg_spy.msgs[msg_spy.i_msg].wParam = msg->wParam; - msg_spy.msgs[msg_spy.i_msg].lParam = msg->lParam; + msg_spy.msgs[msg_spy.i_msg].msg.hwnd = msg->hwnd; + msg_spy.msgs[msg_spy.i_msg].msg.message = msg->message; + msg_spy.msgs[msg_spy.i_msg].msg.wParam = msg->wParam; + msg_spy.msgs[msg_spy.i_msg].msg.lParam = msg->lParam; + msg_spy.msgs[msg_spy.i_msg].post = TRUE; msg_spy.i_msg++; } } @@ -66,10 +72,11 @@ static LRESULT CALLBACK call_wnd_proc_filter(int nCode, WPARAM wParam, if (HC_ACTION == nCode) { CWPSTRUCT *cwp = (CWPSTRUCT*)lParam; - if ((cwp->hwnd == msg_spy.hwnd) && + if (((cwp->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL)) && (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) { - memcpy(&msg_spy.msgs[msg_spy.i_msg], cwp, sizeof(msg_spy.msgs[0])); + memcpy(&msg_spy.msgs[msg_spy.i_msg].msg, cwp, sizeof(msg_spy.msgs[0].msg)); + msg_spy.msgs[msg_spy.i_msg].post = FALSE; msg_spy.i_msg++; } } @@ -93,7 +100,7 @@ static void msg_spy_flush_msgs(void) { msg_spy.i_msg = 0; } -static CWPSTRUCT* msg_spy_find_msg(UINT message) { +static imm_msgs* msg_spy_find_next_msg(UINT message, UINT *start) { UINT i; msg_spy_pump_msg_queue(); @@ -102,13 +109,22 @@ static CWPSTRUCT* msg_spy_find_msg(UINT message) { fprintf(stdout, "%s:%d: msg_spy: message buffer overflow!\n", __FILE__, __LINE__); - for (i = 0; i < msg_spy.i_msg; i++) - if (msg_spy.msgs[i].message == message) + for (i = *start; i < msg_spy.i_msg; i++) + if (msg_spy.msgs[i].msg.message == message) + { + *start = i+1; return &msg_spy.msgs[i]; + } return NULL; } +static imm_msgs* msg_spy_find_msg(UINT message) { + UINT i = 0; + + return msg_spy_find_next_msg(message, &i); +} + static void msg_spy_init(HWND hwnd) { msg_spy.hwnd = hwnd; msg_spy.get_msg_hook = @@ -655,6 +671,36 @@ static void test_ImmDefaultHwnd(void) DestroyWindow(hwnd); } +static void test_ImmMessages(void) +{ + CANDIDATEFORM cf; + imm_msgs *msg; + HWND defwnd; + HIMC imc; + UINT idx = 0; + + HWND hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + + ShowWindow(hwnd, SW_SHOWNORMAL); + defwnd = ImmGetDefaultIMEWnd(hwnd); + imc = ImmGetContext(hwnd); + + ImmSetOpenStatus(imc, TRUE); + msg_spy_flush_msgs(); + SendMessage(defwnd, WM_IME_CONTROL, IMC_GETCANDIDATEPOS, (LPARAM)&cf ); + do + { + msg = msg_spy_find_next_msg(WM_IME_CONTROL,&idx); + if (msg) ok(!msg->post, "Message should not be posted\n"); + } while (msg); + msg_spy_flush_msgs(); + ImmSetOpenStatus(imc, FALSE); + ImmReleaseContext(hwnd, imc); + DestroyWindow(hwnd); +} + START_TEST(imm32) { if (init()) { @@ -668,6 +714,11 @@ START_TEST(imm32) { test_ImmGetContext(); test_ImmGetDescription(); test_ImmDefaultHwnd(); + msg_spy_cleanup(); + /* Reinitialize the hooks to capture all windows */ + msg_spy_init(NULL); + test_ImmMessages(); + msg_spy_cleanup(); } cleanup(); }

1 0

Aric Stewart : imm32: Use SendMessage not PostMessage for the default IME winproc.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: ad6272486ba56fd609af537213f30affb7c6463b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6272486ba56fd609af53721… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 20 14:07:01 2012 -0600 imm32: Use SendMessage not PostMessage for the default IME winproc. --- dlls/imm32/imm.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 6bca604..1ade13a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2906,8 +2906,9 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); if (immHkl->UIWnd) - PostMessageW(immHkl->UIWnd,uMsg,wParam,lParam); - return TRUE; + return SendMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + else + return FALSE; } default: if ((uMsg == WM_MSIME_RECONVERTOPTIONS) || @@ -2920,8 +2921,9 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); if (immHkl->UIWnd) - PostMessageW(immHkl->UIWnd,uMsg,wParam,lParam); - return TRUE; + return SendMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + else + return FALSE; } return DefWindowProcW(hwnd, uMsg, wParam, lParam); }

1 0

Jacek Caban : mshtml: Fixed leak in fill_props.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 720c0c810d9ef4e3fac3c0a235cdaf5cc7b9172e URL: http://source.winehq.org/git/wine.git/?a=commit;h=720c0c810d9ef4e3fac3c0a23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 12:00:48 2012 +0100 mshtml: Fixed leak in fill_props. --- dlls/mshtml/propbag.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c index f7bcf28..716f383 100644 --- a/dlls/mshtml/propbag.c +++ b/dlls/mshtml/propbag.c @@ -288,7 +288,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) nsres = nsIDOMNodeList_GetLength(params, &length); if(NS_FAILED(nsres)) - return S_OK; + length = 0; for(i=0; i < length; i++) { nsres = nsIDOMNodeList_Item(params, i, &nsnode); @@ -330,6 +330,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) } } + nsIDOMNodeList_Release(params); return hres; }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
29
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 November 2012