wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Nikolay Sivov : wshom.ocx: Fix IWshShell3 definition.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: bf0e3a58517147d8711a1a757fe4dcd2d40a068c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0e3a58517147d8711a1a757… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 30 13:40:13 2011 +0300 wshom.ocx: Fix IWshShell3 definition. --- dlls/wshom.ocx/shell.c | 72 +++++++++++++++++- dlls/wshom.ocx/wshom.idl | 184 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 241 insertions(+), 15 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 68f14b8..857a48d 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -61,7 +61,6 @@ static ULONG WINAPI WshShell3_Release(IWshShell3 *iface) static HRESULT WINAPI WshShell3_GetTypeInfoCount(IWshShell3 *iface, UINT *pctinfo) { TRACE("(%p)\n", pctinfo); - *pctinfo = 1; return S_OK; } @@ -112,19 +111,73 @@ static HRESULT WINAPI WshShell3_Invoke(IWshShell3 *iface, DISPID dispIdMember, R static HRESULT WINAPI WshShell3_get_SpecialFolders(IWshShell3 *iface, IWshCollection **out_Folders) { - FIXME("(%p)\n", out_Folders); + FIXME("(%p): stub\n", out_Folders); return E_NOTIMPL; } static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *Type, IWshEnvironment **out_Env) { - FIXME("(%p %p)\n", Type, out_Env); + FIXME("(%p %p): stub\n", Type, out_Env); return E_NOTIMPL; } static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR Command, VARIANT *WindowStyle, VARIANT *WaitOnReturn, int *out_ExitCode) { - FIXME("(%p %p %p)\n", WindowStyle, WaitOnReturn, out_ExitCode); + FIXME("(%p %p %p): stub\n", WindowStyle, WaitOnReturn, out_ExitCode); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* SecondsToWait, VARIANT *Title, VARIANT *Type, int *button) +{ + FIXME("(%s %p %p %p %p): stub\n", debugstr_w(Text), SecondsToWait, Title, Type, button); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, IDispatch** out_Shortcut) +{ + FIXME("(%s %p): stub\n", debugstr_w(PathLink), out_Shortcut); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* out_Dst) +{ + FIXME("(%s %p): stub\n", debugstr_w(Src), out_Dst); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR Name, VARIANT* out_Value) +{ + FIXME("(%s %p): stub\n", debugstr_w(Name), out_Value); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR Name, VARIANT *Value, VARIANT *Type) +{ + FIXME("(%s %p %p): stub\n", debugstr_w(Name), Value, Type); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_RegDelete(IWshShell3 *iface, BSTR Name) +{ + FIXME("(%s): stub\n", debugstr_w(Name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_LogEvent(IWshShell3 *iface, VARIANT *Type, BSTR Message, BSTR Target, VARIANT_BOOL *out_Success) +{ + FIXME("(%p %s %s %p): stub\n", Type, debugstr_w(Message), debugstr_w(Target), out_Success); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_AppActivate(IWshShell3 *iface, VARIANT *App, VARIANT *Wait, VARIANT_BOOL *out_Success) +{ + FIXME("(%p %p %p): stub\n", App, Wait, out_Success); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_SendKeys(IWshShell3 *iface, BSTR Keys, VARIANT *Wait) +{ + FIXME("(%s %p): stub\n", debugstr_w(Keys), Wait); return E_NOTIMPL; } @@ -138,7 +191,16 @@ static const IWshShell3Vtbl WshShell3Vtbl = { WshShell3_Invoke, WshShell3_get_SpecialFolders, WshShell3_get_Environment, - WshShell3_Run + WshShell3_Run, + WshShell3_Popup, + WshShell3_CreateShortcut, + WshShell3_ExpandEnvironmentStrings, + WshShell3_RegRead, + WshShell3_RegWrite, + WshShell3_RegDelete, + WshShell3_LogEvent, + WshShell3_AppActivate, + WshShell3_SendKeys }; static IWshShell3 WshShell3 = { &WshShell3Vtbl }; diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index a7dcb3a..8d0b8e1 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -17,6 +17,7 @@ */ import "oaidl.idl"; +cpp_quote("#undef ExpandEnvironmentStrings") [ helpstring("Windows Script Host Object Model"), @@ -27,6 +28,61 @@ library IWshRuntimeLibrary { importlib("stdole2.tlb"); + typedef enum { + WshRunning = 0, + WshFinished, + WshFailed + } WshExecStatus; + + [ + uuid(53bad8c1-e718-11cf-893d-00a0c9054228), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface ITextStream : IDispatch { + [id(0x2710), propget] + HRESULT Line([out, retval] long* Line); + + [id(0xfffffdef), propget] + HRESULT Column([out, retval] long* Column); + + [id(0x2712), propget] + HRESULT AtEndOfStream([out, retval] VARIANT_BOOL* EOS); + + [id(0x2713), propget] + HRESULT AtEndOfLine([out, retval] VARIANT_BOOL* EOL); + + [id(0x2714)] + HRESULT Read([in] long Characters, [out, retval] BSTR* Text); + + [id(0x2715)] + HRESULT ReadLine([out, retval] BSTR* Text); + + [id(0x2716)] + HRESULT ReadAll([out, retval] BSTR* Text); + + [id(0x2717)] + HRESULT Write([in] BSTR Text); + + [id(0x2718)] + HRESULT WriteLine([in, optional, defaultvalue("")] BSTR Text); + + [id(0x2719)] + HRESULT WriteBlankLines([in] long Lines); + + [id(0x271a)] + HRESULT Skip([in] long Characters); + + [id(0x271b)] + HRESULT SkipLine(); + + [id(0x271c)] + HRESULT Close(); + }; + [ uuid(f935dc27-1cf0-11d0-adb9-00c04fd58a0b), odl, @@ -80,27 +136,135 @@ library IWshRuntimeLibrary } [ - uuid(41904400-be18-11d3-a28b-00104bd35090), + uuid(08fed190-be19-11d3-a28b-00104bd35090), odl, dual, oleautomation ] - interface IWshShell3 : IDispatch { + interface IWshExec : IDispatch { + [id(0x0001), propget] + HRESULT Status([out, retval] WshExecStatus* Status); + + [id(0x0003), propget] + HRESULT StdIn([out, retval] ITextStream** stream); + + [id(0x0004), propget] + HRESULT StdOut([out, retval] ITextStream** stream); + + [id(0x0005), propget] + HRESULT StdErr([out, retval] ITextStream** stream); + + [id(0x0006), propget] + HRESULT ProcessID([out, retval] long* pid); + + [id(0x0007), propget] + HRESULT ExitCode([out, retval] long* ExitCode); + + [id(0x0008)] + HRESULT Terminate(); + }; + + [ + uuid(f935dc21-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation, + hidden + ] + interface IWshShell : IDispatch { [id(0x0064), propget] - HRESULT SpecialFolders([out, retval] IWshCollection **out_Folders); + HRESULT SpecialFolders([out, retval] IWshCollection** out_Folders); [id(0x00c8), propget] HRESULT Environment( - [in, optional] VARIANT *Type, - [out, retval] IWshEnvironment **out_Env); + [in, optional] VARIANT* Type, + [out, retval] IWshEnvironment** out_Env); [id(0x03e8)] HRESULT Run( - [in] BSTR Command, - [in, optional] VARIANT *WindowStyle, - [in, optional] VARIANT *WaitOnReturn, - [out, retval] int *out_ExitCode); - } + [in] BSTR Command, + [in, optional] VARIANT* WindowStyle, + [in, optional] VARIANT* WaitOnReturn, + [out, retval] int* out_ExitCode); + + [id(0x03e9)] + HRESULT Popup( + [in] BSTR Text, + [in, optional] VARIANT* SecondsToWait, + [in, optional] VARIANT* Title, + [in, optional] VARIANT* Type, + [out, retval] int* out_Button); + + [id(0x03ea)] + HRESULT CreateShortcut( + [in] BSTR PathLink, + [out, retval] IDispatch** out_Shortcut); + + [id(0x03ee)] + HRESULT ExpandEnvironmentStrings( + [in] BSTR Src, + [out, retval] BSTR* out_Dst); + + [id(0x07d0)] + HRESULT RegRead( + [in] BSTR Name, + [out, retval] VARIANT* out_Value); + + [id(0x07d1)] + HRESULT RegWrite( + [in] BSTR Name, + [in] VARIANT* Value, + [in, optional] VARIANT* Type); + + [id(0x07d2)] + HRESULT RegDelete([in] BSTR Name); + }; + + [ + uuid(24be5a30-edfe-11d2-b933-00104b365c9f), + odl, + dual, + oleautomation, + hidden + ] + interface IWshShell2 : IWshShell { + [id(0x0bb8)] + HRESULT LogEvent( + [in] VARIANT* Type, + [in] BSTR Message, + [in, optional, defaultvalue("")] BSTR Target, + [out, retval] VARIANT_BOOL* out_Success); + + [id(0x0bc2)] + HRESULT AppActivate( + [in] VARIANT* App, + [in, optional] VARIANT* Wait, + [out, retval] VARIANT_BOOL* out_Success); + + [id(0x0bc3)] + HRESULT SendKeys( + [in] BSTR Keys, + [in, optional] VARIANT* Wait); + }; + + [ + uuid(41904400-be18-11d3-a28b-00104bd35090), + odl, + dual, + oleautomation + ] + interface IWshShell3 : IWshShell2 { + [id(0x0bc4)] + HRESULT Exec( + [in] BSTR Command, + [out, retval] IWshExec** out_Exec); + + [id(0x0bc5), propget] + HRESULT CurrentDirectory([out, retval] BSTR* out_Directory); + + [id(0x0bc5), propput] + HRESULT CurrentDirectory([in] BSTR out_Directory); + }; [ uuid(24be5a31-edfe-11d2-b933-00104b365c9f),

1 0

Jacek Caban : mshtml: Use IUri in IHTMLLocation::put_port implementation.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 2e2a80ce8abb070632ce1dcd4187f286a8636e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2a80ce8abb070632ce1dcd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 12:23:41 2011 +0100 mshtml: Use IUri in IHTMLLocation::put_port implementation. --- dlls/mshtml/htmllocation.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index b5d6b5e..e386d17 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -402,7 +402,7 @@ static HRESULT WINAPI HTMLLocation_put_port(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + DWORD port; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -410,18 +410,23 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - hres = get_url_components(This, &url); + if(!This->window || !This->window->uri) { + FIXME("No current URI\n"); + return E_NOTIMPL; + } + + hres = IUri_GetPort(This->window->uri, &port); if(FAILED(hres)) return hres; - if(url.nPort) { - const WCHAR format[] = {'%','u',0}; - WCHAR buf[6]; - snprintfW(buf, 6, format, url.nPort); + if(hres == S_OK) { + static const WCHAR formatW[] = {'%','u',0}; + WCHAR buf[12]; + + sprintfW(buf, formatW, port); *p = SysAllocString(buf); }else { - const WCHAR empty[] = {0}; - *p = SysAllocString(empty); + *p = SysAllocStringLen(NULL, 0); } if(!*p)

1 0

Alistair Leslie-Hughes : mmcndmgr: Register MMCVersionInfo Interface.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 71109b509e34372a74571ded77b2b941b66a248b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71109b509e34372a74571ded7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 30 19:49:42 2011 +1100 mmcndmgr: Register MMCVersionInfo Interface. --- include/mmc.idl | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/mmc.idl b/include/mmc.idl index 828660f..b0443b2 100644 --- a/include/mmc.idl +++ b/include/mmc.idl @@ -20,6 +20,12 @@ import "basetsd.h"; import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(A8D2C5FE-CDCB-4B9D-BDE5-A27343FF54BC), ] @@ -38,8 +44,11 @@ library MMCVersionLib importlib("stdole2.tlb"); [ - helpstring("MMCVersionInfo coclass"), - uuid(D6FEDB1D-CF21-4BD9-AF3B-C5468E9C6684) + helpstring("MMCVersionInfo 1.0 Object"), + uuid(D6FEDB1D-CF21-4BD9-AF3B-C5468E9C6684), + threading(apartment), + progid("NODEMGR.MMCVersionInfo.1"), + vi_progid("NODEMGR.MMCVersionInfo") ] coclass MMCVersionInfo {

1 0

Austin English : inetcpl.cpl: Add a stub for LaunchPrivacyDialog.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 56b18f88572ab5a353fa029f046b3d7aff9c9d51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b18f88572ab5a353fa029f0… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 29 16:32:29 2011 -0600 inetcpl.cpl: Add a stub for LaunchPrivacyDialog. --- dlls/inetcpl.cpl/inetcpl.c | 10 ++++++++++ dlls/inetcpl.cpl/inetcpl.cpl.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index 4a7b2b0..6981277 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -201,3 +201,13 @@ BOOL WINAPI LaunchInternetControlPanel(HWND parent) display_cpl_sheets(parent); return TRUE; } + +/********************************************************************* + * LaunchInternetControlPanel (inetcpl.@) + * + */ +BOOL WINAPI LaunchPrivacyDialog(HWND hParent) +{ + FIXME(": stub\n"); + return FALSE; +} diff --git a/dlls/inetcpl.cpl/inetcpl.cpl.spec b/dlls/inetcpl.cpl/inetcpl.cpl.spec index eaf5e4d..90f1d43 100644 --- a/dlls/inetcpl.cpl/inetcpl.cpl.spec +++ b/dlls/inetcpl.cpl/inetcpl.cpl.spec @@ -11,7 +11,7 @@ @ stdcall LaunchInternetControlPanel(long) @ stub LaunchPerSitePrivacyActionDialog @ stub LaunchPopupWindowManagementDialog -@ stub LaunchPrivacyDialog +@ stdcall LaunchPrivacyDialog(long) @ stub LaunchSecurityDialog @ stub LaunchSecurityDialogEx @ stdcall LaunchSiteCertDialog(long)

1 0

Austin English : ntoskrnl.exe: Add a stub for Ke386SetIoAccessMap.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: daf0cba81f706d9a94188eae62a33e993a5ae9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0cba81f706d9a94188eae6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 29 16:17:54 2011 -0600 ntoskrnl.exe: Add a stub for Ke386SetIoAccessMap. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f3f26d1..4dbab40 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1742,3 +1742,12 @@ BOOLEAN WINAPI Ke386IoSetAccessProcess(PEPROCESS *process, ULONG flag) FIXME("(%p %d) stub\n", process, flag); return FALSE; } + +/***************************************************** + * Ke386SetIoAccessMap (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI Ke386SetIoAccessMap(ULONG flag, PVOID buffer) +{ + FIXME("(%d %p) stub\n", flag, buffer); + return FALSE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4ddb578..2982d8b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -505,7 +505,7 @@ @ stub Ke386CallBios @ stdcall Ke386IoSetAccessProcess(ptr long) @ stub Ke386QueryIoAccessMap -@ stub Ke386SetIoAccessMap +@ stdcall Ke386SetIoAccessMap(long ptr) @ stub KeAcquireInterruptSpinLock @ stub KeAcquireSpinLockAtDpcLevel @ stub KeAddSystemServiceTable

1 0

Austin English : ntoskrnl.exe: Add a stub for Ke386IoSetAccessProcess.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 60bd62b07c2cd3033e1c0bfec2d156141caaf74a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60bd62b07c2cd3033e1c0bfec… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 29 16:14:16 2011 -0600 ntoskrnl.exe: Add a stub for Ke386IoSetAccessProcess. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4f6f493..f3f26d1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1733,3 +1733,12 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } return TRUE; } + +/***************************************************** + * Ke386IoSetAccessProcess (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI Ke386IoSetAccessProcess(PEPROCESS *process, ULONG flag) +{ + FIXME("(%p %d) stub\n", process, flag); + return FALSE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 187439f..4ddb578 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -503,7 +503,7 @@ @ stub KdPollBreakIn @ stub KdPowerTransition @ stub Ke386CallBios -@ stub Ke386IoSetAccessProcess +@ stdcall Ke386IoSetAccessProcess(ptr long) @ stub Ke386QueryIoAccessMap @ stub Ke386SetIoAccessMap @ stub KeAcquireInterruptSpinLock

1 0

Aric Stewart : usp10: Convert newOtTag to an OPENTYPE_TAG.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: ee2981c6efabe00dcbbe483ae4448791a867b4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2981c6efabe00dcbbe483ae… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 29 14:50:27 2011 -0600 usp10: Convert newOtTag to an OPENTYPE_TAG. --- dlls/usp10/shape.c | 176 ++++++++++++++++++++++++++-------------------------- 1 files changed, 88 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee2981c6efabe00dcbbe4…

1 0

Aric Stewart : usp10: Remove redundant information by making scriptData accessible and removing otTag .
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: ef98d143d748873d9e6fbce84c985c7f83e0dd93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef98d143d748873d9e6fbce84… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 29 14:50:23 2011 -0600 usp10: Remove redundant information by making scriptData accessible and removing otTag. --- dlls/usp10/shape.c | 180 +++++++++++++++++++++---------------------- dlls/usp10/usp10.c | 10 +-- dlls/usp10/usp10_internal.h | 8 ++ 3 files changed, 98 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef98d143d748873d9e6fb…

1 0

Aric Stewart : usp10: Update get_opentype_script to return OPENTYPE_TAG.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 419d3d7100d399c45ea5398dfd266da9fd979bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=419d3d7100d399c45ea5398df… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 29 14:50:19 2011 -0600 usp10: Update get_opentype_script to return OPENTYPE_TAG. --- dlls/usp10/shape.c | 53 ++++++++++++++++++++---------------------- dlls/usp10/usp10_internal.h | 2 +- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index e9e5721..6b59622 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1158,23 +1158,23 @@ static INT GSUB_apply_feature_all_lookups(const GSUB_Header * header, const GSUB return out_index; } -static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, BOOL tryNew) +static OPENTYPE_TAG get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, BOOL tryNew) { UINT charset; if (psc->userScript != 0) { if (tryNew && ShapingData[psa->eScript].newOtTag[0] != 0 && strncmp((char*)&psc->userScript,ShapingData[psa->eScript].otTag,4)==0) - return ShapingData[psa->eScript].newOtTag; + return MS_MAKE_TAG(ShapingData[psa->eScript].newOtTag[0], ShapingData[psa->eScript].newOtTag[1], ShapingData[psa->eScript].newOtTag[2], ShapingData[psa->eScript].newOtTag[3]); else - return (char*)&psc->userScript; + return psc->userScript; } if (tryNew && ShapingData[psa->eScript].newOtTag[0] != 0) - return ShapingData[psa->eScript].newOtTag; + return MS_MAKE_TAG(ShapingData[psa->eScript].newOtTag[0], ShapingData[psa->eScript].newOtTag[1], ShapingData[psa->eScript].newOtTag[2], ShapingData[psa->eScript].newOtTag[3]); if (ShapingData[psa->eScript].otTag[0] != 0) - return ShapingData[psa->eScript].otTag; + return MS_MAKE_TAG(ShapingData[psa->eScript].otTag[0], ShapingData[psa->eScript].otTag[1], ShapingData[psa->eScript].otTag[2], ShapingData[psa->eScript].otTag[3]); /* * fall back to the font charset @@ -1182,36 +1182,36 @@ static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach charset = GetTextCharsetInfo(hdc, NULL, 0x0); switch (charset) { - case ANSI_CHARSET: return "latn"; - case BALTIC_CHARSET: return "latn"; /* ?? */ - case CHINESEBIG5_CHARSET: return "hani"; - case EASTEUROPE_CHARSET: return "latn"; /* ?? */ - case GB2312_CHARSET: return "hani"; - case GREEK_CHARSET: return "grek"; - case HANGUL_CHARSET: return "hang"; - case RUSSIAN_CHARSET: return "cyrl"; - case SHIFTJIS_CHARSET: return "kana"; - case TURKISH_CHARSET: return "latn"; /* ?? */ - case VIETNAMESE_CHARSET: return "latn"; - case JOHAB_CHARSET: return "latn"; /* ?? */ - case ARABIC_CHARSET: return "arab"; - case HEBREW_CHARSET: return "hebr"; - case THAI_CHARSET: return "thai"; - default: return "latn"; + case ANSI_CHARSET: + case BALTIC_CHARSET: return MS_MAKE_TAG('l','a','t','n'); + case CHINESEBIG5_CHARSET: return MS_MAKE_TAG('h','a','n','i'); + case EASTEUROPE_CHARSET: return MS_MAKE_TAG('l','a','t','n'); /* ?? */ + case GB2312_CHARSET: return MS_MAKE_TAG('h','a','n','i'); + case GREEK_CHARSET: return MS_MAKE_TAG('g','r','e','k'); + case HANGUL_CHARSET: return MS_MAKE_TAG('h','a','n','g'); + case RUSSIAN_CHARSET: return MS_MAKE_TAG('c','y','r','l'); + case SHIFTJIS_CHARSET: return MS_MAKE_TAG('k','a','n','a'); + case TURKISH_CHARSET: return MS_MAKE_TAG('l','a','t','n'); /* ?? */ + case VIETNAMESE_CHARSET: return MS_MAKE_TAG('l','a','t','n'); + case JOHAB_CHARSET: return MS_MAKE_TAG('l','a','t','n'); /* ?? */ + case ARABIC_CHARSET: return MS_MAKE_TAG('a','r','a','b'); + case HEBREW_CHARSET: return MS_MAKE_TAG('h','e','b','r'); + case THAI_CHARSET: return MS_MAKE_TAG('t','h','a','i'); + default: return MS_MAKE_TAG('l','a','t','n'); } } static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const char* feat) { const GSUB_Feature *feature; - const char* script; + OPENTYPE_TAG script; int i; script = get_opentype_script(hdc,psa,psc,FALSE); for (i = 0; i < psc->feature_count; i++) { - if (strncmp(psc->features[i].tag,feat,4)==0 && strncmp(psc->features[i].script,script,4)==0) + if (strncmp(psc->features[i].tag,feat,4)==0 && psc->features[i].script == script) return psc->features[i].feature; } @@ -1228,10 +1228,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc do { - const char* tag; - - tag = get_opentype_script(hdc,psa,psc,(attempt==2)); - hr = GSUB_GetFontScriptTags(psc, MS_MAKE_TAG(tag[0],tag[1],tag[2],tag[3]), 1, &scriptTags, &cTags, (LPCVOID*)&script); + hr = GSUB_GetFontScriptTags(psc, get_opentype_script(hdc,psa,psc,(attempt==2)), 1, &scriptTags, &cTags, (LPCVOID*)&script); attempt--; if (SUCCEEDED(hr) && cTags && script) @@ -1268,7 +1265,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc psc->features = HeapAlloc(GetProcessHeap(), 0, psc->feature_count * sizeof(LoadedFeature)); lstrcpynA(psc->features[psc->feature_count - 1].tag, feat, 5); - lstrcpynA(psc->features[psc->feature_count - 1].script, script, 5); + psc->features[psc->feature_count - 1].script = script; psc->features[psc->feature_count - 1].feature = feature; return feature; } diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 6243877..4c5f728 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -127,7 +127,7 @@ typedef struct { char tag[5]; - char script[5]; + OPENTYPE_TAG script; LPCVOID feature; } LoadedFeature;

1 0

Aric Stewart : usp10: Replace GSUB_get_script_table with GSUB_GetFontScriptTags.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 71373552fffabd93cbd9af12b8bc18ed2d01805e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71373552fffabd93cbd9af12b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 29 14:50:17 2011 -0600 usp10: Replace GSUB_get_script_table with GSUB_GetFontScriptTags. --- dlls/usp10/shape.c | 50 ++++++++++++++++++++------------------------------ 1 files changed, 20 insertions(+), 30 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index fcf765e..e9e5721 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -347,6 +347,7 @@ typedef struct { } CMAP_SegmentedCoverage; static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); +static HRESULT GSUB_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags, LPCVOID* script_table); typedef struct tagVowelComponents { @@ -764,30 +765,6 @@ static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) return -1; } -static const GSUB_Script* GSUB_get_script_table( const GSUB_Header* header, const char* tag) -{ - const GSUB_ScriptList *script; - const GSUB_Script *deflt = NULL; - int i; - script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); - - TRACE("%i scripts in this font\n",GET_BE_WORD(script->ScriptCount)); - for (i = 0; i < GET_BE_WORD(script->ScriptCount); i++) - { - const GSUB_Script *scr; - int offset; - - offset = GET_BE_WORD(script->ScriptRecord[i].Script); - scr = (const GSUB_Script*)((const BYTE*)script + offset); - - if (strncmp(script->ScriptRecord[i].ScriptTag, tag,4)==0) - return scr; - if (strncmp(script->ScriptRecord[i].ScriptTag, "dflt",4)==0) - deflt = scr; - } - return deflt; -} - static const GSUB_LangSys* GSUB_get_lang_table( const GSUB_Script* script, const char* tag) { int i; @@ -1242,15 +1219,22 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc if (psc->GSUB_Table) { - const GSUB_Script *script; + const GSUB_Script *script = NULL; const GSUB_LangSys *language; int attempt = 2; + OPENTYPE_TAG scriptTags; + int cTags; + HRESULT hr; do { - script = GSUB_get_script_table(psc->GSUB_Table, get_opentype_script(hdc,psa,psc,(attempt==2))); + const char* tag; + + tag = get_opentype_script(hdc,psa,psc,(attempt==2)); + hr = GSUB_GetFontScriptTags(psc, MS_MAKE_TAG(tag[0],tag[1],tag[2],tag[3]), 1, &scriptTags, &cTags, (LPCVOID*)&script); + attempt--; - if (script) + if (SUCCEEDED(hr) && cTags && script) { if (psc->userLang != 0) language = GSUB_get_lang_table(script,(char*)&psc->userLang); @@ -1264,8 +1248,8 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc /* try in the default (latin) table */ if (!feature) { - script = GSUB_get_script_table(psc->GSUB_Table, "latn"); - if (script) + hr = GSUB_GetFontScriptTags(psc, MS_MAKE_TAG('l','a','t','n'), 1, &scriptTags, &cTags, (LPCVOID*)&script); + if (SUCCEEDED(hr) && script) { language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ if (language) @@ -1609,7 +1593,13 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W static inline BOOL get_GSUB_Indic2(SCRIPT_ANALYSIS *psa, ScriptCache *psc) { - return(GSUB_get_script_table(psc->GSUB_Table,ShapingData[psa->eScript].newOtTag)!=NULL); + OPENTYPE_TAG tag; + HRESULT hr; + int count = 0; + + hr = GSUB_GetFontScriptTags(psc, MS_MAKE_TAG(ShapingData[psa->eScript].newOtTag[0],ShapingData[psa->eScript].newOtTag[1],ShapingData[psa->eScript].newOtTag[2],ShapingData[psa->eScript].newOtTag[3]), 1, &tag, &count, NULL); + + return(SUCCEEDED(hr)); } static WCHAR neighbour_char(int i, int delta, const WCHAR* chars, INT cchLen)

1 0

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 December 2011