November 2012 - Wine-Commits

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

Nov. 22, 2012

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 : olepro32: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

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 : pstorec: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

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

Maarten Lankhorst : dsound: Create a primary_pwfx separately from pwfx.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 605cd62c7dc84ef86cbd260139c6875cd0ed8d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605cd62c7dc84ef86cbd26013… Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Date: Fri Nov 16 20:35:51 2012 +0100 dsound: Create a primary_pwfx separately from pwfx. --- dlls/dsound/dsound.c | 35 ++++- dlls/dsound/dsound_main.c | 10 -- dlls/dsound/dsound_private.h | 8 +- dlls/dsound/mixer.c | 1 + dlls/dsound/primary.c | 334 ++++++++++++++++++++++-------------------- 5 files changed, 204 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=605cd62c7dc84ef86cbd2…

1 0

Alexandre Julliard : user32: Fix the wait event mask in PeekMessage.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: a0f039a6049641cc2be8fa32f2afa3c3f394a99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f039a6049641cc2be8fa32f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 22 11:57:15 2012 +0100 user32: Fix the wait event mask in PeekMessage. --- dlls/user32/message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index ba37a3a..8ca259b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3690,7 +3690,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, 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 ); + ret = wow_handlers.wait_message( 0, NULL, 0, QS_ALLINPUT, 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;

1 0

Jacek Caban : advapi32: Added debug trace to RegOverridePredefKey.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: d331118bfd3f71bd8e336e011c3ce2f0afd16ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d331118bfd3f71bd8e336e011… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 22 12:40:40 2012 +0100 advapi32: Added debug trace to RegOverridePredefKey. --- dlls/advapi32/registry.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index d3b8edf..744908f 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -284,6 +284,8 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) HKEY old_key; int idx; + TRACE("(%p %p)\n", hkey, override); + if ((hkey < HKEY_SPECIAL_ROOT_FIRST) || (hkey > HKEY_SPECIAL_ROOT_LAST)) return ERROR_INVALID_PARAMETER; idx = (UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST;

1 0

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

Nov. 21, 2012

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

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

Nov. 21, 2012

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

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

Nov. 21, 2012

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

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

Nov. 21, 2012

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