wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Andrew Eikum : oleaut32: Don't prevent 64-bit from loading 32-bit typelibs.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: f1398510df7687d36006714b14295833100f8bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1398510df7687d36006714b1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 15:24:02 2013 -0500 oleaut32: Don't prevent 64-bit from loading 32-bit typelibs. --- dlls/oleaut32/typelib.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 100c539..d8e9840 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -548,10 +548,8 @@ HRESULT WINAPI RegisterTypeLib( if (FAILED(ITypeLib_GetLibAttr(ptlib, &attr))) return E_FAIL; -#ifdef _WIN64 - if (attr->syskind != SYS_WIN64) return TYPE_E_BADMODULEKIND; -#else - if (attr->syskind != SYS_WIN32 && attr->syskind != SYS_WIN16) return TYPE_E_BADMODULEKIND; +#ifndef _WIN64 + if (attr->syskind == SYS_WIN64) return TYPE_E_BADMODULEKIND; #endif get_typelib_key( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, keyName );

1 0

Nikolay Sivov : ntdll: Implement compatible section for dll redirects.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 2a5a8bc4a32f7e6d408388d9afec0c5a92bc1529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5a8bc4a32f7e6d408388d9a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 4 18:21:09 2013 +0400 ntdll: Implement compatible section for dll redirects. --- dlls/kernel32/tests/actctx.c | 153 ++++++++++++++++++--------- dlls/ntdll/actctx.c | 238 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 294 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a5a8bc4a32f7e6d40838…

1 0

Nikolay Sivov : ntdll: Support optional 'versioned' attribute for windowClass sections.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: cddea89d22e5d433b10367b213e4ecc4017d1af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cddea89d22e5d433b10367b21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 3 06:40:27 2013 +0400 ntdll: Support optional 'versioned' attribute for windowClass sections. --- dlls/kernel32/tests/actctx.c | 16 ++++++++++- dlls/ntdll/actctx.c | 56 +++++++++++++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ae82a07..234fa9d 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -105,7 +105,7 @@ static const char manifest_wndcls1[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"testdep1\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>" "<file name=\"testlib1.dll\">" -"<windowClass>wndClass1</windowClass>" +"<windowClass versioned=\"yes\">wndClass1</windowClass>" "<windowClass>wndClass2</windowClass>" "</file>" "</assembly>"; @@ -114,7 +114,7 @@ static const char manifest_wndcls2[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"4.3.2.1\" name=\"testdep2\" type=\"win32\" processorArchitecture=\"" ARCH "\" />" "<file name=\"testlib2.dll\">" -"<windowClass>wndClass3</windowClass>" +"<windowClass versioned=\"no\">wndClass3</windowClass>" "<windowClass>wndClass4</windowClass>" "</file>" "</assembly>"; @@ -1140,9 +1140,12 @@ todo_wine static void test_wndclass_section(void) { + static const WCHAR cls1W[] = {'1','.','2','.','3','.','4','!','w','n','d','C','l','a','s','s','1',0}; ACTCTX_SECTION_KEYED_DATA data, data2; + struct wndclass_redirect_data *classdata; ULONG_PTR cookie; HANDLE handle; + WCHAR *ptrW; BOOL ret; /* use two dependent manifests, each defines 2 window class redirects */ @@ -1178,6 +1181,15 @@ static void test_wndclass_section(void) ok(data.ulSectionTotalLength == data2.ulSectionTotalLength, "got %u, %u\n", data.ulSectionTotalLength, data2.ulSectionTotalLength); + /* wndClass1 is versioned, wndClass3 is not */ + classdata = (struct wndclass_redirect_data*)data.lpData; + ptrW = (WCHAR*)((BYTE*)data.lpData + classdata->name_offset); + ok(!lstrcmpW(ptrW, cls1W), "got %s\n", wine_dbgstr_w(ptrW)); + + classdata = (struct wndclass_redirect_data*)data2.lpData; + ptrW = (WCHAR*)((BYTE*)data2.lpData + classdata->name_offset); + ok(!lstrcmpW(ptrW, wndClass3W), "got %s\n", wine_dbgstr_w(ptrW)); + ret = pDeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 1561db8..d5f7055 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -167,6 +167,7 @@ struct entity struct { WCHAR *name; + BOOL versioned; } class; struct { @@ -279,6 +280,9 @@ static const WCHAR tlbidW[] = {'t','l','b','i','d',0}; static const WCHAR typeW[] = {'t','y','p','e',0}; static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; +static const WCHAR versionedW[] = {'v','e','r','s','i','o','n','e','d',0}; +static const WCHAR yesW[] = {'y','e','s',0}; +static const WCHAR noW[] = {'n','o',0}; static const WCHAR xmlW[] = {'?','x','m','l',0}; static const WCHAR manifestv1W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','1',0}; @@ -1093,15 +1097,30 @@ static int get_assembly_version(struct assembly *assembly, WCHAR *ret) static BOOL parse_window_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader* acl) { - xmlstr_t elem, content; - BOOL end = FALSE, ret = TRUE; + xmlstr_t elem, content, attr_name, attr_value; + BOOL end = FALSE, ret = TRUE, error; struct entity* entity; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION))) return FALSE; - if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; - if (end) return FALSE; + entity->u.class.versioned = TRUE; + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, versionedW)) + { + if (xmlstr_cmpi(&attr_value, noW)) + entity->u.class.versioned = FALSE; + else if (!xmlstr_cmpi(&attr_value, yesW)) + return FALSE; + } + else + { + WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value)); + } + } + + if (error || end) return end; if (!parse_text_content(xmlbuf, &content)) return FALSE; @@ -1318,7 +1337,6 @@ static BOOL parse_dependency_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) { if (xmlstr_cmp(&attr_name, optionalW)) { - static const WCHAR yesW[] = {'y','e','s',0}; optional = xmlstr_cmpi( &attr_value, yesW ); TRACE("optional=%s\n", debugstr_xmlstr(&attr_value)); } @@ -2259,16 +2277,19 @@ static NTSTATUS build_wndclass_section(ACTIVATION_CONTEXT* actctx, struct wndcla struct entity *entity = &dll->entities.base[k]; if (entity->kind == ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION) { - int class_len = strlenW(entity->u.class.name); + int class_len = strlenW(entity->u.class.name) + 1; int len; /* each class entry needs index, data and string data */ total_len += sizeof(struct wndclass_index); total_len += sizeof(struct wndclass_redirect_data); /* original name is stored separately */ - total_len += aligned_string_len((class_len+1)*sizeof(WCHAR)); + total_len += aligned_string_len(class_len*sizeof(WCHAR)); /* versioned name and module name are stored one after another */ - len = get_assembly_version(assembly, NULL) + class_len + 2 /* null terminator and '!' separator */; + if (entity->u.class.versioned) + len = get_assembly_version(assembly, NULL) + class_len + 1 /* '!' separator */; + else + len = class_len; len += strlenW(dll->name) + 1; total_len += aligned_string_len(len*sizeof(WCHAR)); @@ -2314,7 +2335,10 @@ static NTSTATUS build_wndclass_section(ACTIVATION_CONTEXT* actctx, struct wndcla RtlHashUnicodeString(&str, TRUE, HASH_STRING_ALGORITHM_X65599, &index->hash); /* include '!' separator too */ - versioned_len = (get_assembly_version(assembly, NULL) + 1)*sizeof(WCHAR) + str.Length; + if (entity->u.class.versioned) + versioned_len = (get_assembly_version(assembly, NULL) + 1)*sizeof(WCHAR) + str.Length; + else + versioned_len = str.Length; module_len = strlenW(dll->name)*sizeof(WCHAR); index->name_offset = name_offset; @@ -2344,9 +2368,17 @@ static NTSTATUS build_wndclass_section(ACTIVATION_CONTEXT* actctx, struct wndcla /* versioned name */ ptrW = (WCHAR*)((BYTE*)data + data->name_offset); - get_assembly_version(assembly, ptrW); - strcatW(ptrW, exclW); - strcatW(ptrW, entity->u.class.name); + if (entity->u.class.versioned) + { + get_assembly_version(assembly, ptrW); + strcatW(ptrW, exclW); + strcatW(ptrW, entity->u.class.name); + } + else + { + memcpy(ptrW, entity->u.class.name, index->name_len); + ptrW[index->name_len/sizeof(WCHAR)] = 0; + } name_offset += sizeof(*data); name_offset += aligned_string_len(str.MaximumLength) + aligned_string_len(versioned_len + module_len + 2*sizeof(WCHAR));

1 0

Huw Davies : ieframe: DdeNameService returns NULL on error.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 1103a241db1ad1a5b86f2465a8cfd33c59bb70a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1103a241db1ad1a5b86f2465a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 12 10:32:45 2013 +0100 ieframe: DdeNameService returns NULL on error. --- dlls/ieframe/iexplore.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 4232608..0bdb556 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -1008,9 +1008,8 @@ static void init_dde(void) if(!ddestr_openurl) WARN("Failed to create string handle: %u\n", DdeGetLastError(dde_inst)); - res = HandleToULong(DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER)); - if(res != DMLERR_NO_ERROR) - WARN("DdeNameService failed: %u\n", res); + if(!DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER)) + WARN("DdeNameService failed\n"); } static void release_dde(void)

1 0

Ken Thomases : winemac: Avoid using display palette API, which was deprecated with the 10.7 SDK.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 4b24fce4e2390fbcc0e6ba8fc607595c3d05df02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b24fce4e2390fbcc0e6ba8fc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 9 16:37:29 2013 -0500 winemac: Avoid using display palette API, which was deprecated with the 10.7 SDK. --- dlls/winemac.drv/gdi.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index e05f9ab..951b569 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -49,7 +49,6 @@ static int vert_res; /* height in pixels of screen */ static int desktop_horz_res; /* width in pixels of virtual desktop */ static int desktop_vert_res; /* height in pixels of virtual desktop */ static int bits_per_pixel; /* pixel depth of screen */ -static int palette_size; /* number of color entries in palette */ static int device_data_valid; /* do the above variables have up-to-date values? */ static CRITICAL_SECTION device_data_section; @@ -141,7 +140,6 @@ static void device_init(void) CGDirectDisplayID mainDisplay = CGMainDisplayID(); CGSize size_mm = CGDisplayScreenSize(mainDisplay); CGDisplayModeRef mode = CGDisplayCopyDisplayMode(mainDisplay); - CGDirectPaletteRef palette; /* Initialize device caps */ log_pixels_x = log_pixels_y = get_dpi(); @@ -187,15 +185,6 @@ static void device_init(void) desktop_horz_res = desktop_rect.size.width; desktop_vert_res = desktop_rect.size.height; - palette = CGPaletteCreateWithDisplay(mainDisplay); - if (palette) - { - palette_size = CGPaletteGetNumberOfSamples(palette); - CGPaletteRelease(palette); - } - else - palette_size = 0; - device_data_valid = TRUE; } @@ -368,7 +357,7 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) case RASTERCAPS: ret = (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP | RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS | - (palette_size ? RC_PALETTE : 0)); + (bits_per_pixel <= 8 ? RC_PALETTE : 0)); break; case SHADEBLENDCAPS: ret = (SB_GRAD_RECT | SB_GRAD_TRI | SB_CONST_ALPHA | SB_PIXEL_ALPHA); @@ -393,7 +382,7 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) ret = 0; break; case SIZEPALETTE: - ret = palette_size; + ret = bits_per_pixel <= 8 ? 1 << bits_per_pixel : 0; break; case NUMRESERVED: case PHYSICALWIDTH:

1 0

Aric Stewart : wineps.drv: Handle empty strings when building vertical runs .
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 7bd8623810f9d5e524ca1dcc58a633974f576e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd8623810f9d5e524ca1dcc5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 9 12:36:16 2013 -0500 wineps.drv: Handle empty strings when building vertical runs. --- dlls/wineps.drv/text.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 1a54510..a9623a1 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -91,15 +91,16 @@ static BOOL check_unicode_tategaki(WCHAR uchar) static Run* build_vertical_runs(PHYSDEV dev, UINT flags, LPCWSTR str, UINT count, INT *run_count) { - BOOL last_vert = check_unicode_tategaki(str[0]); + BOOL last_vert; INT start, end; INT array_size = 5; Run *run = HeapAlloc(GetProcessHeap(),0,sizeof(Run)*array_size); int index = 0; LOGFONTW lf; - if ((!(flags & ETO_GLYPH_INDEX)) && GetObjectW( GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf ) && (lf.lfFaceName[0] == '@')) + if (count && str && (!(flags & ETO_GLYPH_INDEX)) && GetObjectW( GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf ) && (lf.lfFaceName[0] == '@')) { + last_vert = check_unicode_tategaki(str[0]); start = end = 0; while (start < count) {

1 0

André Hentschel : winemaker: Improved check for libXML at runtime.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 6fb4e062984fc3fe49ebc396698d1f805b0b3906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb4e062984fc3fe49ebc3966… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 8 00:10:43 2013 +0200 winemaker: Improved check for libXML at runtime. --- tools/winemaker | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index c6eb480..af26243 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -873,8 +873,12 @@ sub source_scan_project_file($$$) push @{@$project_settings[$T_DEFINES]},$prj_target_defines; push @{@$project_settings[$T_LDFLAGS]},$prj_target_ldflags; } elsif ($filename =~ /.vcproj$/i) { - # Import XML::LibXML, you need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl) - require XML::LibXML; + eval { + require XML::LibXML; + }; + if ($@) { + die "Error: You need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl)"; + } my $xmlparser = XML::LibXML->new(); my $project_xml = $xmlparser->parse_file($filename);

1 0

André Hentschel : msvcp90/tests: Add dynamically loaded functions for ARM.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 1151546ce05439ee6570a1b2e52170ad39cec81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1151546ce05439ee6570a1b2e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 7 21:51:20 2013 +0200 msvcp90/tests: Add dynamically loaded functions for ARM. --- dlls/msvcp90/tests/ios.c | 112 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/tests/misc.c | 56 ++++++++++++++++++++++ 2 files changed, 168 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1151546ce05439ee6570a…

1 0

Qian Hong : ntdll: Fixed parameter list in spec file for RtlpNtQueryValueKey.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: f56edbf5379d969dd4997ee8627c2ceab2f8af9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56edbf5379d969dd4997ee86… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Aug 6 15:55:25 2013 +0800 ntdll: Fixed parameter list in spec file for RtlpNtQueryValueKey. --- dlls/ntdll/ntdll.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6f592b4..5caff45 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -939,7 +939,7 @@ @ stdcall RtlpNtEnumerateSubKey(ptr ptr long) @ stdcall RtlpNtMakeTemporaryKey(ptr) @ stdcall RtlpNtOpenKey(ptr long ptr) -@ stdcall RtlpNtQueryValueKey(long ptr ptr ptr) +@ stdcall RtlpNtQueryValueKey(long ptr ptr ptr ptr) @ stdcall RtlpNtSetValueKey(ptr long ptr long) @ stdcall RtlpUnWaitCriticalSection(ptr) @ stdcall RtlpWaitForCriticalSection(ptr)

1 0

Jacek Caban : inputscope.idl: Imported from mingw-w64.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: b25983ff7ea98ab14c22810006f5f222bbf7733e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25983ff7ea98ab14c2281000… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 5 13:14:50 2013 +0200 inputscope.idl: Imported from mingw-w64. --- .gitignore | 1 + dlls/msctf/msctf.c | 5 ++- include/Makefile.in | 1 + include/inputscope.idl | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ include/msctf.idl | 2 - 5 files changed, 98 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8c51c2a..5147285 100644 --- a/.gitignore +++ b/.gitignore @@ -194,6 +194,7 @@ include/iextag.h include/imnact.h include/imnxport.h include/indexsrv.h +include/inputscope.h include/mediaobj.h include/metahost.h include/mimeinfo.h diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 2a8b0e1..78992f7 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -35,6 +35,7 @@ #include "comcat.h" #include "rpcproxy.h" #include "msctf.h" +#include "inputscope.h" #include "msctf_internal.h" @@ -602,7 +603,7 @@ HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim) /*********************************************************************** * SetInputScope(MSCTF.@) */ -HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope) +HRESULT WINAPI SetInputScope(HWND hwnd, InputScope inputscope) { FIXME("STUB: %p %i\n",hwnd,inputscope); return S_OK; @@ -611,7 +612,7 @@ HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope) /*********************************************************************** * SetInputScopes(MSCTF.@) */ -HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, +HRESULT WINAPI SetInputScopes(HWND hwnd, const InputScope *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS) { diff --git a/include/Makefile.in b/include/Makefile.in index 7f26dca..b1e48fa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -49,6 +49,7 @@ PUBLIC_IDL_H_SRCS = \ imnact.idl \ imnxport.idl \ indexsrv.idl \ + inputscope.idl \ mediaobj.idl \ metahost.idl \ mimeinfo.idl \ diff --git a/include/inputscope.idl b/include/inputscope.idl new file mode 100644 index 0000000..059b6f8 --- /dev/null +++ b/include/inputscope.idl @@ -0,0 +1,93 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given. + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +typedef enum { + IS_DEFAULT = 0, + IS_URL = 1, + IS_FILE_FULLFILEPATH = 2, + IS_FILE_FILENAME = 3, + IS_EMAIL_USERNAME = 4, + IS_EMAIL_SMTPEMAILADDRESS = 5, + IS_LOGINNAME = 6, + IS_PERSONALNAME_FULLNAME = 7, + IS_PERSONALNAME_PREFIX = 8, + IS_PERSONALNAME_GIVENNAME = 9, + IS_PERSONALNAME_MIDDLENAME = 10, + IS_PERSONALNAME_SURNAME = 11, + IS_PERSONALNAME_SUFFIX = 12, + IS_ADDRESS_FULLPOSTALADDRESS = 13, + IS_ADDRESS_POSTALCODE = 14, + IS_ADDRESS_STREET = 15, + IS_ADDRESS_STATEORPROVINCE = 16, + IS_ADDRESS_CITY = 17, + IS_ADDRESS_COUNTRYNAME = 18, + IS_ADDRESS_COUNTRYSHORTNAME = 19, + IS_CURRENCY_AMOUNTANDSYMBOL = 20, + IS_CURRENCY_AMOUNT = 21, + IS_DATE_FULLDATE = 22, + IS_DATE_MONTH = 23, + IS_DATE_DAY = 24, + IS_DATE_YEAR = 25, + IS_DATE_MONTHNAME = 26, + IS_DATE_DAYNAME = 27, + IS_DIGITS = 28, + IS_NUMBER = 29, + IS_ONECHAR = 30, + IS_PASSWORD = 31, + IS_TELEPHONE_FULLTELEPHONENUMBER = 32, + IS_TELEPHONE_COUNTRYCODE = 33, + IS_TELEPHONE_AREACODE = 34, + IS_TELEPHONE_LOCALNUMBER = 35, + IS_TIME_FULLTIME = 36, + IS_TIME_HOUR = 37, + IS_TIME_MINORSEC = 38, + IS_NUMBER_FULLWIDTH = 39, + IS_ALPHANUMERIC_HALFWIDTH = 40, + IS_ALPHANUMERIC_FULLWIDTH = 41, + IS_CURRENCY_CHINESE = 42, + IS_BOPOMOFO = 43, + IS_HIRAGANA = 44, + IS_KATAKANA_HALFWIDTH = 45, + IS_KATAKANA_FULLWIDTH = 46, + IS_HANJA = 47, + IS_HANGUL_HALFWIDTH = 48, + IS_HANGUL_FULLWIDTH = 49, + IS_SEARCH = 50, + IS_FORMULA = 51, + IS_SEARCH_INCREMENTAL = 52, + IS_CHINESE_HALFWIDTH = 53, + IS_CHINESE_FULLWIDTH = 54, + IS_NATIVE_SCRIPT = 55, + + IS_PHRASELIST = -1, + IS_REGULAREXPRESSION = -2, + IS_SRGS = -3, + IS_XML = -4, + IS_ENUMSTRING = -5 +} InputScope; + +cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd,InputScope inputscope);") +cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd,const InputScope *pInputScopes,UINT cInputScopes,WCHAR **ppszPhraseList,UINT cPhrases,WCHAR *pszRegExp,WCHAR *pszSRGS);") +cpp_quote("HRESULT WINAPI SetInputScopeXML(HWND hwnd,WCHAR *pszXML);") + +cpp_quote("DEFINE_GUID(GUID_PROP_INPUTSCOPE,0x1713dd5a,0x68e7,0x4a5b,0x9a,0xf6,0x59,0x2a,0x59,0x5c,0x77,0x8d);") + +[ + object, + uuid(fde1eaee-6924-4cdf-91e7-da38cff5559d), + pointer_default(unique) +] +interface ITfInputScope : IUnknown +{ + HRESULT GetInputScopes([out, size_is(,*pcCount)] InputScope **pprgInputScopes, [out] UINT *pcCount); + HRESULT GetPhrase([out, size_is(,*pcCount)] BSTR **ppbstrPhrases, [out] UINT *pcCount); + HRESULT GetRegularExpression([out] BSTR *pbstrRegExp); + HRESULT GetSRGS([out] BSTR *pbstrSRGS); + HRESULT GetXML([out] BSTR *pbstrXML); +} diff --git a/include/msctf.idl b/include/msctf.idl index e17132b..a3db32e 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -29,8 +29,6 @@ cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_IT cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") -cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope);") -cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS);") cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr);")

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
47
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 August 2013