July 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Keep original script for NO_VISUAL case.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 29abc7f172414750411cc27d5ff1ade2578f1a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29abc7f172414750411cc27d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 10:44:48 2016 +0300 dwrite: Keep original script for NO_VISUAL case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 7 +++--- dlls/dwrite/tests/analyzer.c | 52 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index e49131b..5e53a54 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -249,7 +249,8 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 length, DWRITE_SCRIPT_ANALYSIS sa; UINT32 pos, i, seq_length; - if (!length) return S_OK; + if (!length) + return S_OK; sa = get_char_sa(*text); @@ -268,11 +269,11 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 length, case Script_Common: if (cur_sa.script == Script_Unknown) cur_sa.script = sa.script; - else if (cur_sa.script != Script_Common) + else if ((cur_sa.script != Script_Common) && sa.shapes == DWRITE_SCRIPT_SHAPES_DEFAULT) sa.script = cur_sa.script; break; default: - if (cur_sa.script == Script_Unknown || cur_sa.script == Script_Common) + if ((cur_sa.script == Script_Common && cur_sa.shapes == DWRITE_SCRIPT_SHAPES_DEFAULT) || cur_sa.script == Script_Unknown) cur_sa.script = sa.script; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index d008178..1e3b318 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -906,7 +906,57 @@ static struct sa_test sa_tests[] = { { 2, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, { 4, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } }, - /* keep this as end marker */ + { + /* Inherited on its own */ + {0x300,0x300,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* Inherited followed by Latin */ + {0x300,0x300,'a',0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* Inherited mixed with Arabic and Latin */ + {0x300,'+',0x627,0x300,'a',0}, 2, + { { 0, 4, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 4, 1, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + {'a',0x300,'+',0x627,0x300,')','a',0}, 3, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 3, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 6, 1, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + /* Paired punctuation */ + { + {0x627,'(','a',')','a',0}, 2, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 2, 3, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + {0x627,'[','a',']',0x627,0}, 3, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 2, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 4, 1, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + /* Combining marks */ + { + /* dotted circle - Common, followed by accent - Inherited */ + {0x25cc,0x300,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* combining mark with explicit script value */ + {0x25cc,0x300,0x5c4,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* inherited merges with following explicit script */ + {0x25cc,0x300,'a',0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + /* keep this as end test data marker */ { {0} } };

1 0

Michael Müller : shell32: Correctly compare result of SHFileOperation in UNIXFS copy/ delete functions.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: b05aa34f63f8d1a752cea9bf69d436e09c951bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05aa34f63f8d1a752cea9bf6… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jul 1 22:00:28 2016 +0200 shell32: Correctly compare result of SHFileOperation in UNIXFS copy/delete functions. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 309c941..884fc0a 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -847,7 +847,7 @@ static HRESULT UNIXFS_copy(LPCWSTR pwszDosSrc, LPCWSTR pwszDosDst) op.pFrom = pwszSrc; op.pTo = pwszDst; op.fFlags = FOF_ALLOWUNDO; - if (!SHFileOperationW(&op)) + if (SHFileOperationW(&op)) { WARN("SHFileOperationW failed\n"); res = E_FAIL; @@ -1981,7 +1981,7 @@ static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LP op.wFunc = FO_DELETE; op.pFrom = wszPathsList; op.fFlags = FOF_ALLOWUNDO; - if (!SHFileOperationW(&op)) + if (SHFileOperationW(&op)) { WARN("SHFileOperationW failed\n"); ret = E_FAIL;

1 0

Michael Stefaniuc : dispex/tests: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: c9acabe1ddcfa2953fb0de1fb9368471be6af030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9acabe1ddcfa2953fb0de1fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:28:45 2016 +0200 dispex/tests: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dispex/tests/marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 0211cd7..c4917c6 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -356,7 +356,7 @@ static IDispatchEx *dispex_create(void) if (!This) return NULL; This->IDispatchEx_iface.lpVtbl = &dispex_vtable; This->refs = 1; - return (IDispatchEx *)This; + return &This->IDispatchEx_iface; } static void test_dispex(void)

1 0

Michael Stefaniuc : riched20/tests: Use InflateRect() instead of open coding it.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: fe2f34a5c78762b924569723244fbf1db41a3a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2f34a5c78762b9245697232… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:36:17 2016 +0200 riched20/tests: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 200ce53..fd5bcc4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7057,10 +7057,7 @@ static void test_format_rect(void) for (n = -3; n <= 3; n++) { rc = clientRect; - rc.top += n; - rc.left += n; - rc.bottom -= n; - rc.right -= n; + InflateRect(&rc, -n, -n); SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = rc; @@ -7206,10 +7203,7 @@ static void test_format_rect(void) expected.top, expected.left, expected.bottom, expected.right); rc = clientRect; - rc.top += 5; - rc.left += 5; - rc.bottom -= 5; - rc.right -= 5; + InflateRect(&rc, -5, -5); expected = rc; expected.top -= 1; expected.left -= 1;

1 0

Michael Stefaniuc : msxml3: Don't cast from a COM object to an iface.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 158e7e26fc18614bcf07a15c2a2d070289bb03b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158e7e26fc18614bcf07a15c2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:52:29 2016 +0200 msxml3: Don't cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index e0f08ea..e0b6e1c 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1560,19 +1560,19 @@ static HRESULT WINAPI httprequest_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) { httprequest *This = impl_from_IObjectWithSite(iface); - return IXMLHTTPRequest_QueryInterface( (IXMLHTTPRequest *)This, riid, ppvObject ); + return IXMLHTTPRequest_QueryInterface(&This->IXMLHTTPRequest_iface, riid, ppvObject); } static ULONG WINAPI httprequest_ObjectWithSite_AddRef( IObjectWithSite* iface ) { httprequest *This = impl_from_IObjectWithSite(iface); - return IXMLHTTPRequest_AddRef((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_AddRef(&This->IXMLHTTPRequest_iface); } static ULONG WINAPI httprequest_ObjectWithSite_Release( IObjectWithSite* iface ) { httprequest *This = impl_from_IObjectWithSite(iface); - return IXMLHTTPRequest_Release((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_Release(&This->IXMLHTTPRequest_iface); } static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface, REFIID iid, void **ppvSite ) @@ -1656,19 +1656,19 @@ static const IObjectWithSiteVtbl ObjectWithSiteVtbl = static HRESULT WINAPI httprequest_Safety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { httprequest *This = impl_from_IObjectSafety(iface); - return IXMLHTTPRequest_QueryInterface( (IXMLHTTPRequest *)This, riid, ppv ); + return IXMLHTTPRequest_QueryInterface(&This->IXMLHTTPRequest_iface, riid, ppv); } static ULONG WINAPI httprequest_Safety_AddRef(IObjectSafety *iface) { httprequest *This = impl_from_IObjectSafety(iface); - return IXMLHTTPRequest_AddRef((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_AddRef(&This->IXMLHTTPRequest_iface); } static ULONG WINAPI httprequest_Safety_Release(IObjectSafety *iface) { httprequest *This = impl_from_IObjectSafety(iface); - return IXMLHTTPRequest_Release((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_Release(&This->IXMLHTTPRequest_iface); } static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid,

1 0

Austin English : advapi32: Add stubs for some advapi32 wmi functions.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: ec45ce75b6b986c80661cd5457754675c9149c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec45ce75b6b986c80661cd545… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 1 05:08:47 2016 +0200 advapi32: Add stubs for some advapi32 wmi functions. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 3 +- dlls/advapi32/advapi32.spec | 28 +++---- dlls/advapi32/eventlog.c | 9 --- dlls/advapi32/wmi.c | 181 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 197 insertions(+), 24 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index 6b54295..ff6452a 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -18,7 +18,8 @@ C_SRCS = \ lsa.c \ registry.c \ security.c \ - service.c + service.c \ + wmi.c IDL_SRCS = svcctl.idl diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 3f32aa3..adb6d7e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -795,35 +795,35 @@ # @ stub WmiDevInstToInstanceNameA # @ stub WmiDevInstToInstanceNameW # @ stub WmiEnumerateGuids -# @ stub WmiExecuteMethodA -# @ stub WmiExecuteMethodW +@ stdcall WmiExecuteMethodA(long str long long ptr ptr ptr) +@ stdcall WmiExecuteMethodW(long wstr long long ptr ptr ptr) # @ stub WmiFileHandleToInstanceNameA # @ stub WmiFileHandleToInstanceNameW -# @ stub WmiFreeBuffer +@ stdcall WmiFreeBuffer(ptr) # @ stub WmiGetFirstTraceOffset # @ stub WmiGetNextEvent # @ stub WmiGetTraceHeader -# @ stub WmiMofEnumerateResourcesA -# @ stub WmiMofEnumerateResourcesW -# @ stub WmiNotificationRegistrationA -# @ stub WmiNotificationRegistrationW +@ stdcall WmiMofEnumerateResourcesA(long ptr ptr) +@ stdcall WmiMofEnumerateResourcesW(long ptr ptr) +@ stdcall WmiNotificationRegistrationA(ptr long ptr long long) +@ stdcall WmiNotificationRegistrationW(ptr long ptr long long) @ stdcall WmiOpenBlock(ptr long ptr) # @ stub WmiOpenTraceWithCursor # @ stub WmiParseTraceEvent -# @ stub WmiQueryAllDataA +@ stdcall WmiQueryAllDataA(long ptr ptr) # @ stub WmiQueryAllDataMultipleA # @ stub WmiQueryAllDataMultipleW -# @ stub WmiQueryAllDataW -# @ stub WmiQueryGuidInformation +@ stdcall WmiQueryAllDataW(long ptr ptr) +@ stdcall WmiQueryGuidInformation(long ptr) # @ stub WmiQuerySingleInstanceA # @ stub WmiQuerySingleInstanceMultipleA # @ stub WmiQuerySingleInstanceMultipleW @ stub WmiQuerySingleInstanceW # @ stub WmiReceiveNotificationsA # @ stub WmiReceiveNotificationsW -# @ stub WmiSetSingleInstanceA -@ stub WmiSetSingleInstanceW -# @ stub WmiSetSingleItemA -# @ stub WmiSetSingleItemW +@ stdcall WmiSetSingleInstanceA(long str long long ptr) +@ stdcall WmiSetSingleInstanceW(long wstr long long ptr) +@ stdcall WmiSetSingleItemA(long str long long long ptr) +@ stdcall WmiSetSingleItemW(long wstr long long long ptr) # @ stub Wow64Win32ApiEntry @ stdcall WriteEncryptedFileRaw(ptr ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 93c164d..7274d98 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -964,12 +964,3 @@ ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray, FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount); return ERROR_INVALID_PARAMETER; } - -/****************************************************************************** - * WmiOpenBlock [ADVAPI32.@] - */ -NTSTATUS WINAPI WmiOpenBlock(GUID *guid, ULONG access, PVOID *datablock) -{ - FIXME("%s %d %p: stub\n", debugstr_guid(guid), access, datablock); - return ERROR_SUCCESS; -} diff --git a/dlls/advapi32/wmi.c b/dlls/advapi32/wmi.c new file mode 100644 index 0000000..b615699 --- /dev/null +++ b/dlls/advapi32/wmi.c @@ -0,0 +1,181 @@ +/* + * Win32 advapi/wmi functions + * + * Copyright 2016 Austin English + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winternl.h" +#include "wmistr.h" + +#define _WMI_SOURCE_ +#include "wmium.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +#include "advapi32_misc.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmi); + +/****************************************************************************** + * WmiExecuteMethodA [ADVAPI32.@] + */ +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const char *name, ULONG method, ULONG inputsize, + void *inputbuffer, ULONG *outputsize, void *outputbuffer) +{ + FIXME(" %p %s %u %u %p %p %p: stub\n", handle, debugstr_a(name), method, inputsize, inputbuffer, + outputsize, outputbuffer); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiExecuteMethodW [ADVAPI32.@] + */ +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE handle, const WCHAR *name, ULONG method, ULONG inputsize, + void *inputbuffer, ULONG *outputsize, void *outputbuffer) +{ + FIXME("%p %s %u %u %p %p %p: stub\n", handle, debugstr_w(name), method, inputsize, inputbuffer, + outputsize, outputbuffer); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiFreeBuffer [ADVAPI32.@] + */ +void WMIAPI WmiFreeBuffer(void *buffer) +{ + FIXME("%p: stub\n", buffer); +} + +/****************************************************************************** + * WmiMofEnumerateResourcesA [ADVAPI32.@] + */ +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOA **resource) +{ + FIXME("%p %p %p: stub\n", handle, count, resource); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiMofEnumerateResourcesW [ADVAPI32.@] + */ +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOW **resource) +{ + FIXME("%p %p %p: stub\n", handle, count, resource); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiNotificationRegistrationA [ADVAPI32.@] + */ +ULONG WMIAPI WmiNotificationRegistrationA(GUID *guid, BOOLEAN enable, void *info, + ULONG_PTR context, ULONG flags) +{ + FIXME("%s %u %p 0x%lx 0x%08x: stub\n", debugstr_guid(guid), enable, info, context, flags); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiNotificationRegistrationW [ADVAPI32.@] + */ +ULONG WMIAPI WmiNotificationRegistrationW(GUID *guid, BOOLEAN enable, void *info, + ULONG_PTR context, ULONG flags) +{ + FIXME("%s %u %p 0x%lx 0x%08x: stub\n", debugstr_guid(guid), enable, info, context, flags); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiOpenBlock [ADVAPI32.@] + */ +ULONG WINAPI WmiOpenBlock(GUID *guid, ULONG access, WMIHANDLE *handle) +{ + FIXME("%s %u %p: stub\n", debugstr_guid(guid), access, handle); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * WmiQueryAllDataA [ADVAPI32.@] + */ +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE handle, ULONG *size, void *buffer) +{ + FIXME("%p %p %p: stub\n", handle, size, buffer); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiQueryAllDataW [ADVAPI32.@] + */ +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE handle, ULONG *size, void *buffer) +{ + FIXME("%p %p %p: stub\n", handle, size, buffer); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiQueryGuidInformation [ADVAPI32.@] + */ +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE handle, WMIGUIDINFORMATION *info) +{ + FIXME("%p %p: stub\n", handle, info); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiSetSingleInstanceA [ADVAPI32.@] + */ +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE handle, const char *name, ULONG reserved, + ULONG size, void *buffer) +{ + FIXME("%p %s %u %u %p: stub\n", handle, debugstr_a(name), reserved, size, buffer); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiSetSingleInstanceW [ADVAPI32.@] + */ +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG reserved, + ULONG size, void *buffer) +{ + FIXME("%p %s %u %u %p: stub\n", handle, debugstr_w(name), reserved, size, buffer); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiSetSingleItemA [ADVAPI32.@] + */ +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE handle, const char *name, ULONG id, ULONG reserved, + ULONG size, void *buffer) +{ + FIXME("%p %s %u %u %u %p: stub\n", handle, debugstr_a(name), id, reserved, size, buffer); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * WmiSetSingleItemW [ADVAPI32.@] + */ +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE handle, const WCHAR *name, ULONG id, ULONG reserved, + ULONG size, void *buffer) +{ + FIXME("%p %s %u %u %u %p: stub\n", handle, debugstr_w(name), id, reserved, size, buffer); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Austin English : include: Add wmium.h.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 2e99bb9bed8b311e9e5d24a06378a9d33f77aa58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e99bb9bed8b311e9e5d24a06… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 1 00:22:06 2016 +0200 include: Add wmium.h. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wmium.h | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b2002a9..18c3383 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -671,6 +671,7 @@ HEADER_SRCS = \ winver.h \ wlanapi.h \ wmistr.h \ + wmium.h \ wnaspi32.h \ wownt32.h \ ws2def.h \ diff --git a/include/wmium.h b/include/wmium.h new file mode 100644 index 0000000..bbb13a3 --- /dev/null +++ b/include/wmium.h @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2016 Austin English + * + * 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 _WMIUM_ +#define _WMIUM_ + +#ifdef _WMI_SOURCE_ +#define WMIAPI __stdcall +#else +#define WMIAPI DECLSPEC_IMPORT __stdcall +#endif + +#include <guiddef.h> +#include <basetsd.h> +#include <wmistr.h> + +typedef PVOID WMIHANDLE, *PWMIHANDLE, MOFHANDLE, *PMOFHANDLE; + +#define MOFCI_RESERVED0 0x00000001 +#define MOFCI_RESERVED1 0x00000002 +#define MOFCI_RESERVED2 0x00000004 + +typedef struct +{ + char *ImagePath; + char *ResourceName; + ULONG ResourceSize; + UCHAR *ResourceBuffer; +} MOFRESOURCEINFOA, *PMOFRESOURCEINFOA; + +typedef struct +{ + WCHAR *ImagePath; + WCHAR *ResourceName; + ULONG ResourceSize; + UCHAR *ResourceBuffer; +} MOFRESOURCEINFOW, *PMOFRESOURCEINFOW; + +DECL_WINELIB_TYPE_AW(MOFRESOURCEINFO) +DECL_WINELIB_TYPE_AW(PMOFRESOURCEINFO) + +#ifdef __cplusplus +extern "C" { +#endif + +#define NOTIFICATION_TRACE_FLAG 0x00010000 +#define NOTIFICATION_CALLBACK_DIRECT 0x00000004 +#define NOTIFICATION_CHECK_ACCESS 0x00000008 + +typedef void (WINAPI *NOTIFICATIONCALLBACK)(WNODE_HEADER *, UINT_PTR); + +typedef struct _WMIGUIDINFORMATION +{ + ULONG Size; + BOOLEAN IsExpensive; + BOOLEAN IsEventOnly; +} WMIGUIDINFORMATION, *PWMIGUIDINFORMATION; + +DEFINE_GUID(GUID_REGISTRATION_CHANGE_NOTIFICATION, 0xb48d49a1, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); +DEFINE_GUID(GUID_MOF_RESOURCE_ADDED_NOTIFICATION, 0xb48d49a2, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); +DEFINE_GUID(GUID_MOF_RESOURCE_REMOVED_NOTIFICATION, 0xb48d49a3, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); + +ULONG WMIAPI WmiCloseBlock(WMIHANDLE); +ULONG WMIAPI WmiDevInstToInstanceNameA(char *, ULONG, char *, ULONG); +ULONG WMIAPI WmiDevInstToInstanceNameW(WCHAR *, ULONG, WCHAR *, ULONG); +#define WmiDevInstToInstanceName WINELIB_NAME_AW(WmiDevInstToInstanceName) +ULONG WMIAPI WmiEnumerateGuids(GUID *, ULONG *); +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE, const char *, ULONG, ULONG, void *, ULONG *, void *); +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE, const WCHAR *, ULONG, ULONG, void *, ULONG *, void *); +#define WmiExecuteMethod WINELIB_NAME_AW(WmiExecuteMethod) +ULONG WMIAPI WmiFileHandleToInstanceNameA(WMIHANDLE, HANDLE, ULONG *, char *); +ULONG WMIAPI WmiFileHandleToInstanceNameW(WMIHANDLE, HANDLE, ULONG *, WCHAR *); +#define WmiFileHandleToInstanceName WINELIB_NAME_AW(WmiFileHandleToInstanceName) +void WMIAPI WmiFreeBuffer(void *); +#define WmiInsertTimestamp(WnodeHeader) GetSystemTimeAsFileTime((FILETIME *)&((WNODE_HEADER *)WnodeHeader)->TimeStamp) +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE, ULONG *, MOFRESOURCEINFOA **); +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE, ULONG *, MOFRESOURCEINFOW **); +#define WmiMofEnumerateResources WINELIB_NAME_AW(WmiMofEnumerateResources) +ULONG WMIAPI WmiNotificationRegistrationA(GUID *, BOOLEAN, void *, ULONG_PTR, ULONG); +ULONG WMIAPI WmiNotificationRegistrationW(GUID *, BOOLEAN, void *, ULONG_PTR, ULONG); +#define WmiNotificationRegistration WINELIB_NAME_AW(WmiNotificationRegistration) +ULONG WMIAPI WmiOpenBlock(GUID *, ULONG, WMIHANDLE *); +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE, ULONG *, void *); +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE, ULONG *, void *); +#define WmiQueryAllData WINELIB_NAME_AW(WmiQueryAllData) +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE, WMIGUIDINFORMATION *); +ULONG WMIAPI WmiQuerySingleInstanceA(WMIHANDLE, const char *, ULONG *, void *); +ULONG WMIAPI WmiQuerySingleInstanceW(WMIHANDLE, const WCHAR *, ULONG *, void *); +#define WmiQuerySingleInstance WINELIB_NAME_AW(WmiQuerySingleInstance) +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE, const char *, ULONG, ULONG, void *); +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE, const WCHAR *, ULONG, ULONG, void *); +#define WmiSetSingleInstance WINELIB_NAME_AW(WmiSetSingleInstance) +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE, const char *, ULONG, ULONG, ULONG, void *); +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE, const WCHAR *, ULONG, ULONG, ULONG, void *); +#define WmiSetSingleItem WINELIB_NAME_AW(WmiSetSingleItem) + +#ifdef __cplusplus +} +#endif + +#endif /* _WMIUM_ */

1 0

Sebastian Lackner : include: Remove duplicate definition of WS_XML_NODE_POSITION.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 5b149374be47fc862ea06db51112132c96d34bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b149374be47fc862ea06db51… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 30 22:54:30 2016 +0200 include: Remove duplicate definition of WS_XML_NODE_POSITION. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/webservices.h b/include/webservices.h index a5ffd51..3c808f5 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -73,7 +73,6 @@ typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY; typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING; typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING; typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT; -typedef struct _WS_XML_NODE_POSITION WS_XML_NODE_POSITION; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING;

1 0

Michael Stefaniuc : include: Add inline variants of InflateRect and OffsetRect too.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: d534a6e1aa5d8e7836aaa63e9287df8f30ed3b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d534a6e1aa5d8e7836aaa63e9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 11:21:49 2016 +0200 include: Add inline variants of InflateRect and OffsetRect too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 157a6ef..31c6eee 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3734,7 +3734,6 @@ WINUSERAPI BOOL WINAPI GrayStringW(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,INT,I #define GrayString WINELIB_NAME_AW(GrayString) WINUSERAPI BOOL WINAPI HideCaret(HWND); WINUSERAPI BOOL WINAPI HiliteMenuItem(HWND,HMENU,UINT,UINT); -WINUSERAPI BOOL WINAPI InflateRect(LPRECT,INT,INT); WINUSERAPI BOOL WINAPI InSendMessage(void); WINUSERAPI DWORD WINAPI InSendMessageEx(LPVOID); WINUSERAPI BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR); @@ -3849,7 +3848,6 @@ WINUSERAPI BOOL WINAPI OemToCharW(LPCSTR,LPWSTR); WINUSERAPI BOOL WINAPI OemToCharBuffA(LPCSTR,LPSTR,DWORD); WINUSERAPI BOOL WINAPI OemToCharBuffW(LPCSTR,LPWSTR,DWORD); #define OemToCharBuff WINELIB_NAME_AW(OemToCharBuff) -WINUSERAPI BOOL WINAPI OffsetRect(LPRECT,INT,INT); WINUSERAPI BOOL WINAPI OpenClipboard(HWND); WINUSERAPI HDESK WINAPI OpenDesktopA(LPCSTR,DWORD,BOOL,ACCESS_MASK); WINUSERAPI HDESK WINAPI OpenDesktopW(LPCWSTR,DWORD,BOOL,ACCESS_MASK); @@ -4091,7 +4089,9 @@ WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list); #if !defined(__WINESRC__) || defined(WINE_NO_INLINE_RECT) WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); +WINUSERAPI BOOL WINAPI InflateRect(LPRECT,INT,INT); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); +WINUSERAPI BOOL WINAPI OffsetRect(LPRECT,INT,INT); WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); @@ -4106,12 +4106,32 @@ static inline BOOL WINAPI EqualRect(const RECT *rect1, const RECT *rect2) (rect1->top == rect2->top) && (rect1->bottom == rect2->bottom)); } +static inline BOOL WINAPI InflateRect(LPRECT rect, INT x, INT y) +{ + if (!rect) return FALSE; + rect->left -= x; + rect->top -= y; + rect->right += x; + rect->bottom += y; + return TRUE; +} + static inline BOOL WINAPI IsRectEmpty(const RECT *rect) { if (!rect) return TRUE; return ((rect->left >= rect->right) || (rect->top >= rect->bottom)); } +static inline BOOL WINAPI OffsetRect(LPRECT rect, INT x, INT y) +{ + if (!rect) return FALSE; + rect->left += x; + rect->right += x; + rect->top += y; + rect->bottom += y; + return TRUE; +} + static inline BOOL WINAPI SetRect(LPRECT rect, INT left, INT top, INT right, INT bottom) { if (!rect) return FALSE;

1 0

Michael Stefaniuc : user32: Use InflateRect() instead of open coding it.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 62c3bce8476561f0f7922039e84af0a9b72ccded URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c3bce8476561f0f7922039e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:44:15 2016 +0200 user32: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/uitools.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 9a0fff9..fa2e826 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -706,12 +706,7 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags) /* Adjust rectangle if asked */ if(uFlags & DFCS_ADJUSTRECT) - { - r->left += 2; - r->right -= 2; - r->top += 2; - r->bottom -= 2; - } + InflateRect(r, -2, -2); return TRUE; } @@ -832,11 +827,7 @@ static BOOL UITOOLS95_DFC_ButtonRadio(HDC dc, LPRECT r, UINT uFlags) SelectObject(dc, GetSysColorBrush(COLOR_BTNSHADOW)); Pie(dc, myr.left, myr.top, myr.right+1, myr.bottom+1, myr.right+1, myr.top, myr.left-1, myr.bottom); - myr.left += BorderShrink; - myr.right -= BorderShrink; - myr.top += BorderShrink; - myr.bottom -= BorderShrink; - + InflateRect(&myr, -BorderShrink, -BorderShrink); SelectObject(dc, SYSCOLOR_GetPen(COLOR_3DLIGHT)); SelectObject(dc, GetSysColorBrush(COLOR_3DLIGHT)); Pie(dc, myr.left, myr.top, myr.right+1, myr.bottom+1, myr.left-1, myr.bottom, myr.right+1, myr.top);

1 0