January 2018 - Wine-Commits

Józef Kucia : dxgi: Update to IDXGIFactory4.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: f2d8491ed920e93f5d81ad064843ba08f7d66572 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d8491ed920e93f5d81ad06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:16 2018 +0100 dxgi: Update to IDXGIFactory4. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 6 +-- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 4 +- dlls/dxgi/factory.c | 117 ++++++++++++++++++++++++++++++----------------- 4 files changed, 80 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2d8491ed920e93f5d81…

1 0

Jacek Caban : schtasks: Added /delete command implementation.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: c6f66c6b98b6a6d22874f3a59bcbd4f55b5d2e8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f66c6b98b6a6d22874f3a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 19 19:16:20 2018 +0100 schtasks: Added /delete command implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 87 +++++++++++++++++++++++++++++++++----- programs/schtasks/tests/schtasks.c | 3 +- 2 files changed, 79 insertions(+), 11 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 24d6876..88a004f 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -26,17 +26,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(schtasks); -const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; -const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; -const WCHAR tn_optW[] = {'/','t','n',0}; +static const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; +static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; +static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; +static const WCHAR f_optW[] = {'/','f',0}; +static const WCHAR tn_optW[] = {'/','t','n',0}; -static IRegisteredTask *get_registered_task(const WCHAR *name) +static ITaskFolder *get_tasks_root_folder(void) { - IRegisteredTask *registered_task; ITaskService *service; - ITaskFolder *folder; + ITaskFolder *root; VARIANT empty; - BSTR str; HRESULT hres; hres = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, @@ -51,17 +51,31 @@ static IRegisteredTask *get_registered_task(const WCHAR *name) return NULL; } - hres = ITaskService_GetFolder(service, NULL, &folder); + hres = ITaskService_GetFolder(service, NULL, &root); ITaskService_Release(service); if (FAILED(hres)) { FIXME("GetFolder failed: %08x\n", hres); return NULL; } + return root; +} + +static IRegisteredTask *get_registered_task(const WCHAR *name) +{ + IRegisteredTask *registered_task; + ITaskFolder *root; + BSTR str; + HRESULT hres; + + root = get_tasks_root_folder(); + if (!root) + return NULL; + str = SysAllocString(name); - hres = ITaskFolder_GetTask(folder, str, &registered_task); + hres = ITaskFolder_GetTask(root, str, &registered_task); SysFreeString(str); - ITaskFolder_Release(folder); + ITaskFolder_Release(root); if (FAILED(hres)) { FIXME("GetTask failed: %08x\n", hres); return NULL; @@ -118,6 +132,57 @@ static int change_command(int argc, WCHAR *argv[]) return 0; } +static int delete_command(int argc, WCHAR *argv[]) +{ + const WCHAR *task_name = NULL; + ITaskFolder *root = NULL; + BSTR str; + HRESULT hres; + + while (argc) { + if (!strcmpiW(argv[0], f_optW)) { + TRACE("force opt\n"); + argc--; + argv++; + }else if(!strcmpiW(argv[0], tn_optW)) { + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + if (task_name) { + FIXME("Duplicated /tn argument\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + }else { + FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); + return 1; + } + } + + if (!task_name) { + FIXME("Missing /tn argument\n"); + return 1; + } + + root = get_tasks_root_folder(); + if (!root) + return 1; + + str = SysAllocString(task_name); + hres = ITaskFolder_DeleteTask(root, str, 0); + SysFreeString(str); + ITaskFolder_Release(root); + if (FAILED(hres)) + return 1; + + return 0; +} + int wmain(int argc, WCHAR *argv[]) { int i, ret = 0; @@ -132,6 +197,8 @@ int wmain(int argc, WCHAR *argv[]) FIXME("Print current tasks state\n"); else if (!strcmpiW(argv[1], change_optW)) ret = change_command(argc - 2, argv + 2); + else if (!strcmpiW(argv[1], delete_optW)) + ret = delete_command(argc - 2, argv + 2); else FIXME("Unsupported command %s\n", debugstr_w(argv[1])); diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 03f4e43..7765038 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -180,7 +180,8 @@ START_TEST(schtasks) r = run_command("schtasks /CHANGE /tn wine\\test\\winetest /enable"); ok(r == 0, "r = %u\n", r); - unregister_task("wine\\test\\winetest"); + r = run_command("schtasks /delete /f /tn wine\\test\\winetest"); + ok(r == 0, "r = %u\n", r); r = run_command("schtasks /Change /tn wine\\test\\winetest /enable"); ok(r == 1, "r = %u\n", r);

1 0

Dmitry Timoshkov : include: Fix the SpInitializeFn typedef.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: aeff707ff2e7dd8f2ed8549cb47b8c90e02f35fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeff707ff2e7dd8f2ed8549c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 18 23:51:13 2018 +0800 include: Fix the SpInitializeFn typedef. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntsecpkg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 9378826..7f64d06 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -325,7 +325,7 @@ typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX2)(PLSA_CLIENT_REQUEST, SECURITY_LOGON_TYPE, PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID, PNTSTATUS, PLSA_TOKEN_INFORMATION_TYPE, PVOID *, PUNICODE_STRING *, PUNICODE_STRING *, PUNICODE_STRING *, PSECPKG_PRIMARY_CRED, PSECPKG_SUPPLEMENTAL_CRED_ARRAY *); -typedef NTSTATUS (SpInitializeFn)(ULONG_PTR, PSECPKG_PARAMETERS, +typedef NTSTATUS (NTAPI SpInitializeFn)(ULONG_PTR, PSECPKG_PARAMETERS, PLSA_SECPKG_FUNCTION_TABLE); typedef NTSTATUS (NTAPI SpShutDownFn)(void); typedef NTSTATUS (NTAPI SpGetInfoFn)(PSecPkgInfoW);

1 0

Dmitry Timoshkov : kerberos: Implement SpGetInfo.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 3e7edceb1463eabefbf77f18f25d2cf9eadbc2a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e7edceb1463eabefbf77f18… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 18 23:51:08 2018 +0800 kerberos: Implement SpGetInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 27da4d7..76a5a07 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "rpc.h" #include "sspi.h" #include "ntsecapi.h" #include "ntsecpkg.h" @@ -39,6 +40,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(kerberos); +#define KERBEROS_MAX_BUF 12000 + +#define KERBEROS_CAPS \ + ( SECPKG_FLAG_INTEGRITY \ + | SECPKG_FLAG_PRIVACY \ + | SECPKG_FLAG_TOKEN_ONLY \ + | SECPKG_FLAG_DATAGRAM \ + | SECPKG_FLAG_CONNECTION \ + | SECPKG_FLAG_MULTI_REQUIRED \ + | SECPKG_FLAG_EXTENDED_ERROR \ + | SECPKG_FLAG_IMPERSONATION \ + | SECPKG_FLAG_ACCEPT_WIN32_NAME \ + | SECPKG_FLAG_NEGOTIABLE \ + | SECPKG_FLAG_GSS_COMPATIBLE \ + | SECPKG_FLAG_LOGON \ + | SECPKG_FLAG_MUTUAL_AUTH \ + | SECPKG_FLAG_DELEGATION \ + | SECPKG_FLAG_READONLY_WITH_CHECKSUM \ + | SECPKG_FLAG_RESTRICTED_TOKENS \ + | SECPKG_FLAG_APPCONTAINER_CHECKS) + static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; @@ -122,6 +144,30 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) +{ + static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; + static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; + static const SecPkgInfoW infoW = + { + KERBEROS_CAPS, + 1, + RPC_C_AUTHN_GSS_KERBEROS, + KERBEROS_MAX_BUF, + kerberos_name_W, + kerberos_comment_W + }; + + TRACE("%p\n", info); + + /* LSA will make a copy before forwarding the structure, so + * it's safe to put pointers to dynamic or constant data there. + */ + *info = infoW; + + return STATUS_SUCCESS; +} + static SECPKG_FUNCTION_TABLE kerberos_table = { kerberos_LsaApInitializePackage, /* InitializePackage */ @@ -134,7 +180,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* LogonUserEx2 */ NULL, /* Initialize */ NULL, /* Shutdown */ - NULL, /* SpGetInfoUnified */ + kerberos_SpGetInfo, NULL, /* AcceptCredentials */ NULL, /* SpAcquireCredentialsHandle */ NULL, /* SpQueryCredentialsAttributes */

1 0

Dmitry Timoshkov : kerberos: Use kerberos prefix instead of krb5.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 892e11835d8902058ff06a13059c2eaf44eadb9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=892e11835d8902058ff06a13… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 18 23:51:03 2018 +0800 kerberos: Use kerberos prefix instead of krb5. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0134b94..27da4d7 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -37,9 +37,9 @@ #include "wine/library.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(krb5); +WINE_DEFAULT_DEBUG_CHANNEL(kerberos); -static ULONG krb5_package_id; +static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; #ifdef SONAME_LIBKRB5 @@ -84,34 +84,34 @@ static void load_krb5(void) #endif /* SONAME_LIBKRB5 */ -static NTSTATUS NTAPI krb5_LsaApInitializePackage(ULONG package_id, PLSA_DISPATCH_TABLE dispatch, +static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DISPATCH_TABLE dispatch, PLSA_STRING database, PLSA_STRING confidentiality, PLSA_STRING *package_name) { - char *krb5_name; + char *kerberos_name; load_krb5(); - krb5_package_id = package_id; + kerberos_package_id = package_id; lsa_dispatch = *dispatch; - krb5_name = lsa_dispatch.AllocateLsaHeap(sizeof(MICROSOFT_KERBEROS_NAME_A)); - if (!krb5_name) return STATUS_NO_MEMORY; + kerberos_name = lsa_dispatch.AllocateLsaHeap(sizeof(MICROSOFT_KERBEROS_NAME_A)); + if (!kerberos_name) return STATUS_NO_MEMORY; - memcpy(krb5_name, MICROSOFT_KERBEROS_NAME_A, sizeof(MICROSOFT_KERBEROS_NAME_A)); + memcpy(kerberos_name, MICROSOFT_KERBEROS_NAME_A, sizeof(MICROSOFT_KERBEROS_NAME_A)); *package_name = lsa_dispatch.AllocateLsaHeap(sizeof(**package_name)); if (!*package_name) { - lsa_dispatch.FreeLsaHeap(krb5_name); + lsa_dispatch.FreeLsaHeap(kerberos_name); return STATUS_NO_MEMORY; } - RtlInitString(*package_name, krb5_name); + RtlInitString(*package_name, kerberos_name); return STATUS_SUCCESS; } -static NTSTATUS NTAPI krb5_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request, +static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request, PVOID in_buffer, PVOID client_buffer_base, ULONG in_buffer_length, PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) { @@ -122,13 +122,13 @@ static NTSTATUS NTAPI krb5_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request return STATUS_NOT_IMPLEMENTED; } -static SECPKG_FUNCTION_TABLE krb5_table = +static SECPKG_FUNCTION_TABLE kerberos_table = { - krb5_LsaApInitializePackage, /* InitializePackage */ + kerberos_LsaApInitializePackage, /* InitializePackage */ NULL, /* LsaLogonUser */ NULL, /* CallPackage */ NULL, /* LogonTerminated */ - krb5_LsaApCallPackageUntrusted, /* CallPackageUntrusted */ + kerberos_LsaApCallPackageUntrusted, /* CallPackageUntrusted */ NULL, /* CallPackagePassthrough */ NULL, /* LogonUserEx */ NULL, /* LogonUserEx2 */ @@ -168,7 +168,7 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, TRACE("%#x,%p,%p,%p\n", lsa_version, package_version, table, table_count); *package_version = SECPKG_INTERFACE_VERSION; - *table = &krb5_table; + *table = &kerberos_table; *table_count = 1; return STATUS_SUCCESS;

1 0

Nikolay Sivov : user32: Add SysLink to known classes list.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 71d8edebb98201d1b74275b565e5c01d68c32e6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d8edebb98201d1b74275b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 19 00:04:12 2018 +0300 user32: Add SysLink to known classes list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 1 + dlls/user32/tests/class.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 0b3582e..fae88f2 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -139,6 +139,7 @@ static BOOL is_comctl32_class( const WCHAR *name ) {'S','y','s','D','a','t','e','T','i','m','e','P','i','c','k','3','2',0}, {'S','y','s','H','e','a','d','e','r','3','2',0}, {'S','y','s','I','P','A','d','d','r','e','s','s','3','2',0}, + {'S','y','s','L','i','n','k',0}, {'S','y','s','L','i','s','t','V','i','e','w','3','2',0}, {'S','y','s','M','o','n','t','h','C','a','l','3','2',0}, {'S','y','s','P','a','g','e','r',0}, diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 88bf376..dd8f266 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1093,6 +1093,7 @@ static void test_comctl32_classes(void) PROGRESS_CLASSA, REBARCLASSNAMEA, STATUSCLASSNAMEA, + "SysLink", WC_TABCONTROLA, TOOLBARCLASSNAMEA, TOOLTIPS_CLASSA,

1 0

Alexandre Julliard : ntdll: Export strnlen.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 7bcb214158a102e296931e8d2610e3fbff79437b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bcb214158a102e296931e8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 19:19:28 2018 +0100 ntdll: Export strnlen. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/string.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 95581ec..097140f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1431,6 +1431,7 @@ @ cdecl -private strncat(str str long) NTDLL_strncat @ cdecl -private strncmp(str str long) NTDLL_strncmp @ cdecl -private strncpy(ptr str long) NTDLL_strncpy +@ cdecl -private strnlen(ptr long) NTDLL_strnlen @ cdecl -private strpbrk(str str) NTDLL_strpbrk @ cdecl -private strrchr(str long) NTDLL_strrchr @ cdecl -private strspn(str str) NTDLL_strspn diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index c349add..e0bf5be 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -164,6 +164,15 @@ char * __cdecl NTDLL_strncpy( char *dst, const char *src, size_t len ) /********************************************************************* + * strnlen (NTDLL.@) + */ +size_t __cdecl NTDLL_strnlen( const char *str, size_t len ) +{ + return strnlen( str, len ); +} + + +/********************************************************************* * strpbrk (NTDLL.@) */ char * __cdecl NTDLL_strpbrk( const char *str, const char *accept )

1 0

Thomas Faber : usp10: Re-use script caches for the same font.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: fb44feb62fd8b49edd27921bc6bc3682d14c1254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb44feb62fd8b49edd27921b… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jan 12 14:30:13 2018 +0100 usp10: Re-use script caches for the same font. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 69 +++++++++++++++++++++++--- dlls/usp10/usp10_internal.h | 5 ++ 3 files changed, 186 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb44feb62fd8b49edd27…

1 0

Nikolay Sivov : urlmon/tests: Add some more PARSE_PATH_FROM_URL tests.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 45afe832565c5b52f20ba28a8025662805053737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45afe832565c5b52f20ba28a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 11 16:21:52 2018 +0300 urlmon/tests: Add some more PARSE_PATH_FROM_URL tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index fd82c0b..a0e3f61 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7389,6 +7389,9 @@ static const uri_parse_test uri_parse_tests[] = { {"file:///c:/te%XX t/",0,PARSE_PATH_FROM_URL,0,"c:\\te%XX t\\",S_OK,FALSE}, {"file://server/test",0,PARSE_PATH_FROM_URL,0,"\\\\server\\test",S_OK,FALSE}, {"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE}, + {"file:/c:/dir/test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\dir\\test.mp3",S_OK}, + {"file:/c:/test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\test.mp3",S_OK}, + {"file://c:\\test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\test.mp3",S_OK}, /* PARSE_URL_FROM_PATH tests. */ /* This function almost seems to useless (just returns the absolute uri). */ @@ -10566,11 +10569,11 @@ static void test_CoInternetParseIUri(void) { if(SUCCEEDED(hr)) { DWORD len = lstrlenA(test.property); ok(!strcmp_aw(test.property, result) || (test.property2 && !strcmp_aw(test.property2, result)), - "Error: Expected %s but got %s instead on uri_parse_tests[%d].\n", - test.property, wine_dbgstr_w(result), i); + "Error: Expected %s but got %s instead on uri_parse_tests[%d] - %s.\n", + test.property, wine_dbgstr_w(result), i, wine_dbgstr_w(uriW)); ok(len == result_len || (test.property2 && lstrlenA(test.property2) == result_len), - "Error: Expected %d, but got %d instead on uri_parse_tests[%d].\n", - len, result_len, i); + "Error: Expected %d, but got %d instead on uri_parse_tests[%d] - %s.\n", + len, result_len, i, wine_dbgstr_w(uriW)); } else { ok(!result_len, "Error: Expected 'result_len' to be 0, but was %d on uri_parse_tests[%d].\n",

1 0

Gijs Vermeulen : ole2disp.dll16: Implement SafeArrayGet[UBound|LBound].
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: a9686b0037126008cd5935eb45a100095d022415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9686b0037126008cd5935eb… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jan 17 22:34:28 2018 +0100 ole2disp.dll16: Implement SafeArrayGet[UBound|LBound]. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 36 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index d61b5e8..98aca3d 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -117,6 +117,42 @@ USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayGetUBound [OLE2DISP.19] + */ +HRESULT WINAPI SafeArrayGetUBound16(SAFEARRAY16 *sa, UINT16 dim, LONG *ubound) +{ + TRACE("(%p, %u, %p)\n", sa, dim, ubound); + + if (!sa) + return E_INVALIDARG16; + + if (!dim || dim > sa->cDims) + return DISP_E_BADINDEX; + + *ubound = sa->rgsabound[sa->cDims - dim].lLbound + sa->rgsabound[sa->cDims - dim].cElements - 1; + + return S_OK; +} + +/****************************************************************************** + * SafeArrayGetLBound [OLE2DISP.20] + */ +HRESULT WINAPI SafeArrayGetLBound16(SAFEARRAY16 *sa, UINT16 dim, LONG *lbound) +{ + TRACE("(%p, %u, %p)\n", sa, dim, lbound); + + if (!sa) + return E_INVALIDARG16; + + if (!dim || dim > sa->cDims) + return DISP_E_BADINDEX; + + *lbound = sa->rgsabound[sa->cDims - dim].lLbound; + + return S_OK; +} + +/****************************************************************************** * SafeArrayLock [OLE2DISP.21] */ HRESULT WINAPI SafeArrayLock16(SAFEARRAY16 *sa) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 4b8af41..7b00ac3 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -16,8 +16,8 @@ 16 stub SAFEARRAYDESTROY 17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 -19 stub SAFEARRAYGETUBOUND -20 stub SAFEARRAYGETLBOUND +19 pascal SafeArrayGetUBound(ptr word ptr) SafeArrayGetUBound16 +20 pascal SafeArrayGetLBound(ptr word ptr) SafeArrayGetLBound16 21 pascal SafeArrayLock(ptr) SafeArrayLock16 22 pascal SafeArrayUnlock(ptr) SafeArrayUnlock16 23 pascal SafeArrayAccessData(ptr ptr) SafeArrayAccessData16

1 0