June 2020 - Wine-Devel - list.winehq.org

Re: [PATCH V2] winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW

by Dmitry Timoshkov

Vijay Kiran Kamuju <infyquest(a)gmail.com> wrote: > + TRACE("(%s,%s,%s,%s): stub\n", debugstr_a(pName), debugstr_a(pEnvironment), > debugstr_a(pPathName), debugstr_a(pPrintProcessorName)); ": stub" doesn't belong to a TRACE. > + RtlFreeUnicodeString(&ProcessorW); > + RtlFreeUnicodeString(&PathW); > + RtlFreeUnicodeString(&EnvW); > + RtlFreeUnicodeString(&NameW); This could be a simple HeapFree, have a look at other places that use asciitounicode(). I have to admit, that asciitounicode() is an over- engineering, and could be replaced by simple strdupAtoW() in most (if not all) places. -- Dmitry.

June 1, 2020

[PATCH V2] winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW

by Vijay Kiran Kamuju

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26171 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

June 1, 2020

[PATCH 5/5] windowscodecs: Implement DdsFrameDecode_Dds_GetSizeInBlocks().

by Ziqing Hui

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 15 +++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 8 ++++---- 2 files changed, 17 insertions(+), 6 deletions(-)

June 1, 2020

[PATCH 4/5] windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetSizeInBlocks().

by Ziqing Hui

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

June 1, 2020

[PATCH 3/5] windowscodecs: Implement DdsFrameDecode_Dds_GetFormatInfo().

by Ziqing Hui

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 59 ++++++++++++++++++++++++---- dlls/windowscodecs/tests/ddsformat.c | 4 +- 2 files changed, 53 insertions(+), 10 deletions(-)

June 1, 2020

[PATCH 2/5] windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetFormatInfo().

by Ziqing Hui

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 55 ++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-)

June 1, 2020

[PATCH 1/5] windowscodecs: Check NULL parameters for DdsFrameDecode_GetSize().

by Ziqing Hui

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 2 ++ dlls/windowscodecs/tests/ddsformat.c | 6 ++++++ 2 files changed, 8 insertions(+)

June 1, 2020

Re: [PATCH] kernelbase: Add GetPackageFamilyName stub

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=72532 Your paranoid android. === debiant (32 bit Chinese:China report) === kernel32: mailslot.c:327: Test failed: timeout too short 987 === debiant (32 bit WoW report) === kernel32: mailslot.c:327: Test failed: timeout too short 985 === debiant (64 bit WoW report) === kernel32: mailslot.c:327: Test failed: timeout too short 988

June 1, 2020

[PATCH] kernelbase: Add GetPackageFamilyName stub

by Alex Henrie

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49299 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- .../ext-ms-win-kernel32-package-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 10 ++++++++++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 4d2edd60f5..4c00082a15 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -9,7 +9,7 @@ @ stub GetCurrentPackageInfo @ stub GetCurrentPackagePath @ stub GetPackageApplicationIds -@ stub GetPackageFamilyName +@ stdcall GetPackageFamilyName(long ptr ptr) kernel32.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName @ stub GetPackageId @ stub GetPackageInfo diff --git a/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec b/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec index ae239528b3..214cd34471 100644 --- a/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec +++ b/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec @@ -7,7 +7,7 @@ @ stub AppXLookupMoniker @ stub ClosePackageInfo @ stub FormatApplicationUserModelId -@ stub GetPackageFamilyName +@ stdcall GetPackageFamilyName(long ptr ptr) kernel32.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName @ stub GetPackageId @ stub GetPackageInfo diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1a6fdbab01..8645d48d77 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -762,6 +762,7 @@ @ stdcall -import GetOverlappedResult(long ptr ptr long) @ stdcall -import GetOverlappedResultEx(long ptr ptr long long) @ stdcall -import GetUserPreferredUILanguages(long ptr ptr ptr) +@ stdcall GetPackageFamilyName(long ptr ptr) kernelbase.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernelbase.GetPackageFullName @ stdcall -import GetPhysicallyInstalledSystemMemory(ptr) @ stdcall -import GetPriorityClass(long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 986cd851ed..10de1821d1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -591,7 +591,7 @@ # @ stub GetPackageApplicationPropertyString # @ stub GetPackageApplicationResourcesContext # @ stub GetPackageContext -# @ stub GetPackageFamilyName +@ stdcall GetPackageFamilyName(long ptr ptr) # @ stub GetPackageFamilyNameFromToken @ stdcall GetPackageFullName(long ptr ptr) # @ stub GetPackageFullNameFromToken diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index d6d3237270..58c49aa148 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1544,3 +1544,13 @@ LONG WINAPI /* DECLSPEC_HOTPATCH */ GetPackageFullName( HANDLE process, UINT32 * FIXME( "(%p %p %p): stub\n", process, length, name ); return APPMODEL_ERROR_NO_PACKAGE; } + + +/*********************************************************************** + * GetPackageFamilyName (kernelbase.@) + */ +LONG WINAPI /* DECLSPEC_HOTPATCH */ GetPackageFamilyName( HANDLE process, UINT32 *length, WCHAR *name ) +{ + FIXME( "(%p %p %p): stub\n", process, length, name ); + return APPMODEL_ERROR_NO_PACKAGE; +} -- 2.26.2

June 1, 2020

[PATCH] rpcrt4: Implement RpcIfInqId().

by Zhiyi Zhang

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49257 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/rpcrt4_main.c | 25 ++++++++++++++++++++ dlls/rpcrt4/tests/rpc.c | 50 +++++++++++++++++++++++++++++++++++++++ include/rpcdce.h | 3 +++ 4 files changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 135beab0ff2..5a294df65ad 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -389,7 +389,7 @@ @ stub RpcFreeAuthorizationContext # wxp @ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus @ stub RpcIfIdVectorFree -@ stub RpcIfInqId +@ stdcall RpcIfInqId(ptr ptr) @ stdcall RpcImpersonateClient(ptr) @ stdcall RpcInitializeAsyncHandle(ptr long) RpcAsyncInitializeHandle @ stdcall RpcMgmtEnableIdleCleanup() diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index e716f7cfff2..57e33673c7a 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -95,6 +95,12 @@ struct threaddata struct context_handle_list *context_handle_list; }; +struct interface_header +{ + unsigned int length; + RPC_SYNTAX_IDENTIFIER id; +}; + /*********************************************************************** * DllMain * @@ -178,6 +184,25 @@ RPC_STATUS WINAPI RpcStringFreeW(RPC_WSTR* String) return RPC_S_OK; } +/************************************************************************* + * RpcIfInqId [RPCRT4.@] + * + * Get interface UUID and version. + */ +RPC_STATUS WINAPI RpcIfInqId(RPC_IF_HANDLE if_handle, RPC_IF_ID *if_id) +{ + struct interface_header *header = (struct interface_header *)if_handle; + + TRACE("(%p,%p)\n", if_handle, if_id); + + if_id->Uuid = header->id.SyntaxGUID; + if_id->VersMajor = header->id.SyntaxVersion.MajorVersion; + if_id->VersMinor = header->id.SyntaxVersion.MinorVersion; + TRACE("UUID:%s VersMajor:%hu VersMinor:%hu.\n", debugstr_guid(&if_id->Uuid), if_id->VersMajor, + if_id->VersMinor); + return RPC_S_OK; +} + /************************************************************************* * RpcRaiseException [RPCRT4.@] * diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index d3a3aee6c8c..ce16145119b 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -854,6 +854,55 @@ static void test_RpcBindingFree(void) status); } +static void test_RpcIfInqId(void) +{ + static const GUID guid = {0x12345678, 0xdead, 0xbeef, {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}}; + static RPC_STATUS (WINAPI *pRpcIfInqId)(RPC_IF_HANDLE, RPC_IF_ID *); + RPC_SERVER_INTERFACE server_interface; + RPC_CLIENT_INTERFACE client_interface; + RPC_IF_HANDLE test_handles[2]; + RPC_STATUS status; + RPC_IF_ID if_id; + UINT test_idx; + + pRpcIfInqId = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "RpcIfInqId"); + + memset(&server_interface, 0, sizeof(server_interface)); + memset(&client_interface, 0, sizeof(client_interface)); + server_interface.InterfaceId.SyntaxGUID = guid; + server_interface.InterfaceId.SyntaxVersion.MajorVersion = 1; + server_interface.InterfaceId.SyntaxVersion.MinorVersion = 2; + client_interface.InterfaceId.SyntaxGUID = guid; + client_interface.InterfaceId.SyntaxVersion.MajorVersion = 1; + client_interface.InterfaceId.SyntaxVersion.MinorVersion = 2; + + /* Crash on Windows */ + if (0) + { + status = pRpcIfInqId(NULL, &if_id); + ok(status == RPC_S_INVALID_ARG, "Expected %#x, got %#x.\n", RPC_S_INVALID_ARG, status); + + status = pRpcIfInqId((RPC_IF_HANDLE)&server_interface, NULL); + ok(status == RPC_S_INVALID_ARG, "Expected %#x, got %#x.\n", RPC_S_INVALID_ARG, status); + } + + test_handles[0] = (RPC_IF_HANDLE)&server_interface; + test_handles[1] = (RPC_IF_HANDLE)&client_interface; + + for (test_idx = 0; test_idx < ARRAY_SIZE(test_handles); ++test_idx) + { + memset(&if_id, 0, sizeof(if_id)); + status = pRpcIfInqId(test_handles[test_idx], &if_id); + ok(status == RPC_S_OK, "Test %u: Expected %#x, got %#x.\n", test_idx, RPC_S_OK, status); + ok(!memcmp(&if_id.Uuid, &guid, sizeof(guid)), "Test %u: Expected UUID %s, got %s.\n", test_idx, + wine_dbgstr_guid(&guid), wine_dbgstr_guid(&if_id.Uuid)); + ok(if_id.VersMajor == 1, "Test %u: Expected major version %hu, got %hu.\n", test_idx, 1, + if_id.VersMajor); + ok(if_id.VersMinor == 2, "Test %u: Expected minor version %hu, got %hu.\n", test_idx, 2, + if_id.VersMinor); + } +} + static void test_RpcServerInqDefaultPrincName(void) { RPC_STATUS ret; @@ -1204,6 +1253,7 @@ START_TEST( rpc ) test_UuidCreate(); test_UuidCreateSequential(); test_RpcBindingFree(); + test_RpcIfInqId(); test_RpcServerInqDefaultPrincName(); test_RpcServerRegisterAuthInfo(); diff --git a/include/rpcdce.h b/include/rpcdce.h index fc1fcea77b9..2b289b26550 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -593,6 +593,9 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcStringFreeW(RPC_WSTR* String); #define RpcStringFree WINELIB_NAME_AW(RpcStringFree) +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcIfInqId( RPC_IF_HANDLE RpcIfHandle, RPC_IF_ID *RpcIfId ); + RPCRTAPI RPC_STATUS RPC_ENTRY UuidToStringA( UUID* Uuid, RPC_CSTR* StringUuid ); RPCRTAPI RPC_STATUS RPC_ENTRY -- 2.25.1

June 1, 2020