December 2014 - Wine-commits

Austin English : kernel32: Add a stub for GetUserPreferredUILanguages.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 76dc45aa1aaa75d271c70fe1f8da9918217e26f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dc45aa1aaa75d271c70fe1f… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 8 20:29:47 2014 -0600 kernel32: Add a stub for GetUserPreferredUILanguages. --- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index 7b3c86f..e2a7bed 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -32,7 +32,7 @@ @ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID @ stdcall GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName @ stdcall GetUserGeoID(long) kernel32.GetUserGeoID -@ stub GetUserPreferredUILanguages +@ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) kernel32.GetUserPreferredUILanguages @ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii @ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode @ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index ccba739..32d2c76 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -33,7 +33,7 @@ @ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID @ stdcall GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName @ stdcall GetUserGeoID(long) kernel32.GetUserGeoID -@ stub GetUserPreferredUILanguages +@ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) kernel32.GetUserPreferredUILanguages @ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii @ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode @ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 80c7a87..886eb42 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -595,6 +595,7 @@ @ stdcall GetNumberOfConsoleMouseButtons(ptr) @ stdcall GetOEMCP() @ stdcall GetOverlappedResult(long ptr ptr long) +@ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) @ stdcall GetPriorityClass(long) @ stdcall GetPrivateProfileIntA(str str long str) @ stdcall GetPrivateProfileIntW(wstr wstr long wstr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 171f14c..5fee723 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5035,3 +5035,13 @@ INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, return out; } + + +/****************************************************************************** + * GetUserPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI GetUserPreferredUILanguages(DWORD flags, PULONG numlangs, PZZWSTR langbuffer, PULONG bufferlen) +{ + FIXME( "stub: %u %p %p %p\n", flags, numlangs, langbuffer, bufferlen ); + return FALSE; +}

1 0

Jacek Caban : mshtml: Mark mousedown event as cancelable.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 55ce76c181bf48a385ad590e4dad7dd608c2516e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ce76c181bf48a385ad590e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 10 16:05:40 2014 +0100 mshtml: Mark mousedown event as cancelable. --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9963293..91e48d9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -201,7 +201,7 @@ static const event_info_t event_info[] = { {loadW, onloadW, EVENTT_HTML, DISPID_EVMETH_ONLOAD, EVENT_BIND_TO_BODY}, {mousedownW, onmousedownW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, - EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE}, {mousemoveW, onmousemoveW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEMOVE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mouseoutW, onmouseoutW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEOUT,

1 0

Jacek Caban : mshtml: Added support for copy, paste and cut commands in execCommand.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 6b463d85099b8da81ea234884dea27e048e65ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b463d85099b8da81ea234884… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 10 18:59:04 2014 +0100 mshtml: Added support for copy, paste and cut commands in execCommand. --- dlls/mshtml/htmldoc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7a577d9..2d89b45 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1096,6 +1096,10 @@ static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface) return S_OK; } +static const WCHAR copyW[] = + {'c','o','p','y',0}; +static const WCHAR cutW[] = + {'c','u','t',0}; static const WCHAR fontnameW[] = {'f','o','n','t','n','a','m','e',0}; static const WCHAR indentW[] = @@ -1106,6 +1110,8 @@ static const WCHAR insertunorderedlistW[] = {'i','n','s','e','r','t','u','n','o','r','d','e','r','e','d','l','i','s','t',0}; static const WCHAR outdentW[] = {'o','u','t','d','e','n','t',0}; +static const WCHAR pasteW[] = + {'p','a','s','t','e',0}; static const WCHAR respectvisibilityindesignW[] = {'r','e','s','p','e','c','t','v','i','s','i','b','i','l','i','t','y','i','n','d','e','s','i','g','n',0}; @@ -1113,11 +1119,14 @@ static const struct { const WCHAR *name; OLECMDID id; }command_names[] = { + {copyW, IDM_COPY}, + {cutW, IDM_CUT}, {fontnameW, IDM_FONTNAME}, {indentW, IDM_INDENT}, {insertorderedlistW, IDM_ORDERLIST}, {insertunorderedlistW, IDM_UNORDERLIST}, {outdentW, IDM_OUTDENT}, + {pasteW, IDM_PASTE}, {respectvisibilityindesignW, IDM_RESPECTVISIBILITY_INDESIGN} };

1 0

Jacek Caban : mshtml: Added support for IDM_PASTE command in browser mode.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 935e7f059efb4565dcbb201b03d7e71a9e5147a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935e7f059efb4565dcbb201b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 10 19:02:31 2014 +0100 mshtml: Added support for IDM_PASTE command in browser mode. --- dlls/mshtml/nsiface.idl | 23 +++++++++++++++++++++++ dlls/mshtml/olecmd.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 3bb5020..1d8e263 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3548,6 +3548,29 @@ interface nsIHTMLEditor : nsISupports [ object, + uuid(b8100c90-73be-11d2-92a5-00105a1b0d64), + local +] +interface nsIClipboardCommands : nsISupports +{ + nsresult CanCutSelection(bool *_retval); + nsresult CanCopySelection(bool *_retval); + nsresult CanCopyLinkLocation(bool *_retval); + nsresult CanCopyImageLocation(bool *_retval); + nsresult CanCopyImageContents(bool *_retval); + nsresult CanPaste(bool *_retval); + nsresult CutSelection(); + nsresult CopySelection(); + nsresult CopyLinkLocation(); + nsresult CopyImageLocation(); + nsresult CopyImageContents(); + nsresult Paste(); + nsresult SelectAll(); + nsresult SelectNone(); +} + +[ + object, uuid(edb99640-8378-4106-8673-e701a086eb1c), local ] diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index eea3aa2..a49949d 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -62,6 +62,28 @@ void do_ns_command(HTMLDocument *This, const char *cmd, nsICommandParams *nspara nsICommandManager_Release(cmdmgr); } +static nsIClipboardCommands *get_clipboard_commands(HTMLDocument *doc) +{ + nsIClipboardCommands *clipboard_commands; + nsIDocShell *doc_shell; + nsresult nsres; + + nsres = get_nsinterface((nsISupports*)doc->window->nswindow, &IID_nsIDocShell, (void**)&doc_shell); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDocShell interface\n"); + return NULL; + } + + nsres = nsIDocShell_QueryInterface(doc_shell, &IID_nsIClipboardCommands, (void**)&clipboard_commands); + nsIDocShell_Release(doc_shell); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIClipboardCommands interface\n"); + return NULL; + } + + return clipboard_commands; +} + /********************************************************** * IOleCommandTarget implementation */ @@ -569,13 +591,26 @@ static HRESULT query_mshtml_paste(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { + nsIClipboardCommands *clipboard_commands; + nsresult nsres; + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); if(This->doc_obj->usermode == EDITMODE) return editor_exec_paste(This, cmdexecopt, in, out); - FIXME("Unimplemented in browse mode\n"); - return E_NOTIMPL; + clipboard_commands = get_clipboard_commands(This); + if(!clipboard_commands) + return E_UNEXPECTED; + + nsres = nsIClipboardCommands_Paste(clipboard_commands); + nsIClipboardCommands_Release(clipboard_commands); + if(NS_FAILED(nsres)) { + ERR("Paste failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT exec_browsemode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out)

1 0

Jacek Caban : mshtml: Added support for IDM_CUT command in browser mode.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 44c22801e3d13b5bba79fe09b686dd05783ad972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c22801e3d13b5bba79fe09b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 10 19:02:37 2014 +0100 mshtml: Added support for IDM_CUT command in browser mode. --- dlls/mshtml/olecmd.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a49949d..c45e9c9 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -573,13 +573,26 @@ static HRESULT query_mshtml_cut(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_cut(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { + nsIClipboardCommands *clipboard_commands; + nsresult nsres; + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); if(This->doc_obj->usermode == EDITMODE) return editor_exec_cut(This, cmdexecopt, in, out); - FIXME("Unimplemented in browse mode\n"); - return E_NOTIMPL; + clipboard_commands = get_clipboard_commands(This); + if(!clipboard_commands) + return E_UNEXPECTED; + + nsres = nsIClipboardCommands_CutSelection(clipboard_commands); + nsIClipboardCommands_Release(clipboard_commands); + if(NS_FAILED(nsres)) { + ERR("Paste failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT query_mshtml_paste(HTMLDocument *This, OLECMD *cmd)

1 0

Martin Storsjo : msvcr120: Implement the _dclass/_fdclass/ _ldclass functions.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 5f395ee8e63dd6e91da47f048a569079a18d1c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f395ee8e63dd6e91da47f048… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 9 08:43:07 2014 +0200 msvcr120: Implement the _dclass/_fdclass/_ldclass functions. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcrt/math.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 7 +++++++ 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index e0e4661..9c765b3 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1104,7 +1104,7 @@ @ varargs _cwscanf_s(wstr) @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight -@ stub _dclass +@ cdecl _dclass(double) MSVCR120__dclass @ cdecl _difftime32(long long) MSVCRT__difftime32 @ cdecl _difftime64(long long) MSVCRT__difftime64 @ stub _dosmaperr @@ -1140,7 +1140,7 @@ @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s -@ stub _fdclass +@ cdecl _fdclass(float) MSVCR120__fdclass @ cdecl _fdopen(long str) MSVCRT__fdopen @ stub _fdpcomp @ stub _fdsign @@ -1389,7 +1389,7 @@ @ cdecl _j1(double) MSVCRT__j1 @ cdecl _jn(long double) MSVCRT__jn @ cdecl _kbhit() -@ stub _ldclass +@ cdecl _ldclass(double) MSVCR120__ldclass @ stub _ldpcomp @ stub _ldsign @ stub _ldtest diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 16a9c4e..9b75d36 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2526,3 +2526,44 @@ LDOUBLE CDECL MSVCR120_truncl(LDOUBLE x) { return MSVCR120_trunc(x); } + +/********************************************************************* + * _dclass (MSVCR120.@) + */ +short CDECL MSVCR120__dclass(double x) +{ + switch (MSVCRT__fpclass(x)) { + case MSVCRT__FPCLASS_QNAN: + case MSVCRT__FPCLASS_SNAN: + return MSVCRT_FP_NAN; + case MSVCRT__FPCLASS_NINF: + case MSVCRT__FPCLASS_PINF: + return MSVCRT_FP_INFINITE; + case MSVCRT__FPCLASS_ND: + case MSVCRT__FPCLASS_PD: + return MSVCRT_FP_SUBNORMAL; + case MSVCRT__FPCLASS_NN: + case MSVCRT__FPCLASS_PN: + default: + return MSVCRT_FP_NORMAL; + case MSVCRT__FPCLASS_NZ: + case MSVCRT__FPCLASS_PZ: + return MSVCRT_FP_ZERO; + } +} + +/********************************************************************* + * _fdclass (MSVCR120.@) + */ +short CDECL MSVCR120__fdclass(float x) +{ + return MSVCR120__dclass(x); +} + +/********************************************************************* + * _ldclass (MSVCR120.@) + */ +short CDECL MSVCR120__ldclass(LDOUBLE x) +{ + return MSVCR120__dclass(x); +} diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f397087..41f31b9 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -824,6 +824,13 @@ struct MSVCRT__stat64 { #define MSVCRT__FPCLASS_PN 0x0100 /* Positive Normal */ #define MSVCRT__FPCLASS_PINF 0x0200 /* Positive Infinity */ +/* fpclassify constants */ +#define MSVCRT_FP_INFINITE 1 +#define MSVCRT_FP_NAN 2 +#define MSVCRT_FP_NORMAL -1 +#define MSVCRT_FP_SUBNORMAL -2 +#define MSVCRT_FP_ZERO 0 + #define MSVCRT__MCW_EM 0x0008001f #define MSVCRT__MCW_IC 0x00040000 #define MSVCRT__MCW_RC 0x00000300

1 0

Martin Storsjo : combase: Add stub dll.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 3923c550b73a1abc952c2cee9c3697a37844fef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3923c550b73a1abc952c2cee9… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 9 10:36:45 2014 +0200 combase: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/combase/Makefile.in | 1 + dlls/combase/combase.spec | 308 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 313 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3923c550b73a1abc952c2…

1 0

Martin Storsjo : include: Add a roapi.h header.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: f185af6e8294db3a12a443a1de6d2b151249e612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f185af6e8294db3a12a443a1d… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 9 10:36:44 2014 +0200 include: Add a roapi.h header. --- dlls/api-ms-win-core-winrt-l1-1-0/main.c | 7 +----- include/Makefile.in | 1 + include/roapi.h | 41 ++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/main.c b/dlls/api-ms-win-core-winrt-l1-1-0/main.c index 4cf1105..674d21d 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/main.c +++ b/dlls/api-ms-win-core-winrt-l1-1-0/main.c @@ -16,17 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "objbase.h" +#include "roapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winrt); -typedef enum -{ - RO_INIT_SINGLETHREADED = 0, - RO_INIT_MULTITHREADED = 1, -} RO_INIT_TYPE; - /*********************************************************************** * RoInitialize (api-ms-win-core-winrt-l1-1-0.@) */ diff --git a/include/Makefile.in b/include/Makefile.in index a952964..5b1f3ab 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -506,6 +506,7 @@ SRCDIR_INCLUDES = \ restartmanager.h \ richedit.h \ rmxfguid.h \ + roapi.h \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roapi.h b/include/roapi.h new file mode 100644 index 0000000..0421fe9 --- /dev/null +++ b/include/roapi.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2014 Martin Storsjo + * + * 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 + */ + +#ifndef __WINE_ROAPI_H +#define __WINE_ROAPI_H + +#include <windef.h> + +typedef enum +{ + RO_INIT_SINGLETHREADED = 0, + RO_INIT_MULTITHREADED = 1, +} RO_INIT_TYPE; + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI RoInitialize(RO_INIT_TYPE type); +void WINAPI RoUninitialize(void); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_ROAPI_H */

1 0

Martin Storsjo : api-ms-win-core-winrt-l1-1-0: Move implementations into combase.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 13a101707a1793d777f5a30063ff9d19178cfbca URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a101707a1793d777f5a3006… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 9 10:36:46 2014 +0200 api-ms-win-core-winrt-l1-1-0: Move implementations into combase. --- dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in | 4 ---- .../api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec | 4 ++-- dlls/combase/Makefile.in | 4 ++++ dlls/combase/combase.spec | 4 ++-- dlls/{api-ms-win-core-winrt-l1-1-0/main.c => combase/roapi.c} | 7 ++++--- tools/make_specfiles | 4 ++++ 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in index 7ce8241..1660441 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in +++ b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in @@ -1,5 +1 @@ MODULE = api-ms-win-core-winrt-l1-1-0.dll -IMPORTS = ole32 - -C_SRCS = \ - main.c diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 344265a..0749ac0 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -1,9 +1,9 @@ @ stub RoActivateInstance @ stub RoGetActivationFactory @ stub RoGetApartmentIdentifier -@ stdcall RoInitialize(long) +@ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories @ stub RoRegisterForApartmentShutdown @ stub RoRevokeActivationFactories -@ stdcall RoUninitialize() +@ stdcall RoUninitialize() combase.RoUninitialize @ stub RoUnregisterForApartmentShutdown diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 8b1099d..79d22a1 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1 +1,5 @@ MODULE = combase.dll +IMPORTS = ole32 + +C_SRCS = \ + roapi.c diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index daa0bbb..652eff6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -255,7 +255,7 @@ @ stub RoGetMatchingRestrictedErrorInfo @ stub RoGetParameterizedTypeInstanceIID @ stub RoGetServerActivatableClasses -@ stub RoInitialize +@ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo @ stub RoOriginateError @@ -272,7 +272,7 @@ @ stub RoSetErrorReportingFlags @ stub RoTransformError @ stub RoTransformErrorW -@ stub RoUninitialize +@ stdcall RoUninitialize() @ stub RoUnregisterForApartmentShutdown @ stub SetCleanupFlag @ stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/main.c b/dlls/combase/roapi.c similarity index 90% rename from dlls/api-ms-win-core-winrt-l1-1-0/main.c rename to dlls/combase/roapi.c index 674d21d..a2c17db 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/main.c +++ b/dlls/combase/roapi.c @@ -15,15 +15,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "objbase.h" #include "roapi.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(winrt); +WINE_DEFAULT_DEBUG_CHANNEL(combase); /*********************************************************************** - * RoInitialize (api-ms-win-core-winrt-l1-1-0.@) + * RoInitialize (combase.@) */ HRESULT WINAPI RoInitialize(RO_INIT_TYPE type) { @@ -38,7 +39,7 @@ HRESULT WINAPI RoInitialize(RO_INIT_TYPE type) } /*********************************************************************** - * RoUninitialize (api-ms-win-core-winrt-l1-1-0.@) + * RoUninitialize (combase.@) */ void WINAPI RoUninitialize(void) { diff --git a/tools/make_specfiles b/tools/make_specfiles index 0bbd826..6e2f3d7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -204,6 +204,10 @@ my @dll_groups = "gdi32", "ext-ms-win-gdi-devcaps-l1-1-0", ], + [ + "combase", + "api-ms-win-core-winrt-l1-1-0", + ], ); my $update_flags = 0;

1 0

Nikolay Sivov : dwrite: Implement IsMonospacedFont().
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 730b2f4c6671f489b0638a0ca766f527da15850e URL: http://source.winehq.org/git/wine.git/?a=commit;h=730b2f4c6671f489b0638a0ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 9 09:58:14 2014 +0300 dwrite: Implement IsMonospacedFont(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 4 +-- dlls/dwrite/freetype.c | 20 +++++++++++++++ dlls/dwrite/tests/font.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 181a0a0..ed02501 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -129,6 +129,7 @@ extern BOOL init_freetype(void) DECLSPEC_HIDDEN; extern void release_freetype(void) DECLSPEC_HIDDEN; extern HRESULT freetype_get_design_glyph_metrics(IDWriteFontFace2*,UINT16,UINT16,DWRITE_GLYPH_METRICS*) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace2*) DECLSPEC_HIDDEN; +extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e7712d7..ef4c32c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -495,8 +495,8 @@ static HRESULT WINAPI dwritefontface1_GetUnicodeRanges(IDWriteFontFace2 *iface, static BOOL WINAPI dwritefontface1_IsMonospacedFont(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return freetype_is_monospaced(iface); } static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace2 *iface, diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 66dd1c9..7e8fd3c 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -67,6 +67,7 @@ MAKE_FUNCPTR(FT_Load_Glyph); MAKE_FUNCPTR(FT_New_Memory_Face); MAKE_FUNCPTR(FTC_Manager_New); MAKE_FUNCPTR(FTC_Manager_Done); +MAKE_FUNCPTR(FTC_Manager_LookupFace); MAKE_FUNCPTR(FTC_Manager_LookupSize); MAKE_FUNCPTR(FTC_Manager_RemoveFaceID); #undef MAKE_FUNCPTR @@ -135,6 +136,7 @@ BOOL init_freetype(void) LOAD_FUNCPTR(FT_New_Memory_Face) LOAD_FUNCPTR(FTC_Manager_New) LOAD_FUNCPTR(FTC_Manager_Done) + LOAD_FUNCPTR(FTC_Manager_LookupFace) LOAD_FUNCPTR(FTC_Manager_LookupSize) LOAD_FUNCPTR(FTC_Manager_RemoveFaceID) #undef LOAD_FUNCPTR @@ -210,6 +212,19 @@ HRESULT freetype_get_design_glyph_metrics(IDWriteFontFace2 *fontface, UINT16 uni return S_OK; } +BOOL freetype_is_monospaced(IDWriteFontFace2 *fontface) +{ + BOOL is_monospaced = FALSE; + FT_Face face; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) + is_monospaced = FT_IS_FIXED_WIDTH(face); + LeaveCriticalSection(&freetype_cs); + + return is_monospaced; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -230,4 +245,9 @@ HRESULT freetype_get_design_glyph_metrics(IDWriteFontFace2 *fontface, UINT16 uni return E_NOTIMPL; } +BOOL freetype_is_monospaced(IDWriteFontFace2 *fontface) +{ + return FALSE; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 58b536e..db554eb 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2578,6 +2578,64 @@ static void test_GetDesignGlyphMetrics(void) DeleteFileW(test_fontfile); } +static void test_IsMonospacedFont(void) +{ + static const WCHAR courierW[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; + IDWriteFontCollection *collection; + IDWriteFactory *factory; + UINT32 index; + BOOL exists; + HRESULT hr; + + factory = create_factory(); + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + exists = FALSE; + hr = IDWriteFontCollection_FindFamilyName(collection, courierW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (exists) { + IDWriteFontFamily *family; + IDWriteFont1 *font1; + IDWriteFont *font; + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFamily_Release(family); + + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void**)&font1); + if (hr == S_OK) { + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + BOOL is_monospaced; + + is_monospaced = IDWriteFont1_IsMonospacedFont(font1); + ok(is_monospaced, "got %d\n", is_monospaced); + + hr = IDWriteFont1_CreateFontFace(font1, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + ok(hr == S_OK, "got 0x%08x\n", hr); + is_monospaced = IDWriteFontFace1_IsMonospacedFont(fontface1); + ok(is_monospaced, "got %d\n", is_monospaced); + IDWriteFontFace1_Release(fontface1); + + IDWriteFontFace_Release(fontface); + IDWriteFont1_Release(font1); + } + else + win_skip("IsMonospacedFont() is not supported.\n"); + } + else + skip("Courier New font not found.\n"); + + IDWriteFontCollection_Release(collection); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2612,6 +2670,7 @@ START_TEST(font) test_CreateStreamFromKey(); test_ReadFileFragment(); test_GetDesignGlyphMetrics(); + test_IsMonospacedFont(); IDWriteFactory_Release(factory); }

1 0