October 2021 - Wine-commits

Rémi Bernon : dinput: Factor all GetObjectInfo implementations together.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 9f493b0ed8a45326aff559b3e746d811b4dde688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f493b0ed8a45326aff559b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 10:21:56 2021 +0200 dinput: Factor all GetObjectInfo implementations together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 68 +++++++++++++++++---------------------------- dlls/dinput/joystick_hid.c | 36 +----------------------- dlls/dinput/keyboard.c | 64 ++---------------------------------------- dlls/dinput/mouse.c | 30 +------------------- dlls/dinput8/tests/device.c | 4 +-- 5 files changed, 31 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f493b0ed8a45326aff5…

1 0

Zebediah Figura : kernel32/tests: Add a couple of tests for error handling when reading past EOF.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 80b35103dfce2f5466e3a6208a5e2c4db40e7809 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80b35103dfce2f5466e3a620… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:26:46 2021 -0500 kernel32/tests: Add a couple of tests for error handling when reading past EOF. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ea0a32f258d..b4c7adacf7e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5927,6 +5927,7 @@ static void test_move_file(void) static void test_eof(void) { char temp_path[MAX_PATH], filename[MAX_PATH], buffer[20]; + OVERLAPPED overlapped = {0}; LARGE_INTEGER file_size; HANDLE file, mapping; unsigned int i; @@ -5961,9 +5962,25 @@ static void test_eof(void) ok(ret, "failed to get size, error %u\n", GetLastError()); ok(!file_size.QuadPart, "got size %I64d\n", file_size.QuadPart); + SetLastError(0xdeadbeef); ret = ReadFile(file, buffer, sizeof(buffer), &size, NULL); ok(ret, "failed to read, error %u\n", GetLastError()); ok(!size, "got size %u\n", size); + ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + + SetFilePointer(file, 2, NULL, SEEK_SET); + + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + overlapped.Offset = 2; + ret = ReadFile(file, buffer, sizeof(buffer), &size, &overlapped); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_HANDLE_EOF, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); + + SetFilePointer(file, 2, NULL, SEEK_SET); ret = SetEndOfFile(file); ok(ret, "failed to set EOF, error %u\n", GetLastError());

1 0

Zebediah Figura : include: Fix the type of the "output" parameter of IWMReaderAllocatorEx::AllocateForOutputEx().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: c96cb78acc50feb39df9281b66bba5d36ea44fc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96cb78acc50feb39df9281b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:05 2021 -0500 include: Fix the type of the "output" parameter of IWMReaderAllocatorEx::AllocateForOutputEx(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 716abe056db..945a8faaca4 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1082,7 +1082,7 @@ interface IWMReaderAllocatorEx : IUnknown [in] void *pvContext); HRESULT AllocateForOutputEx( - [in] WORD wOutputNum, + [in] DWORD output, [in] DWORD cbBuffer, [out] INSSBuffer **ppBuffer, [in] DWORD dwFlags,

1 0

Zebediah Figura : include: Add IWMGetSecureChannel.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: bb6444682d3cfe096c123ad4264e1682cdf21f19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb6444682d3cfe096c123ad4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:06 2021 -0500 include: Add IWMGetSecureChannel. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wmsecure.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 94010695214..a9a478e5433 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -832,6 +832,7 @@ SOURCES = \ wmsbuffer.idl \ wmsdk.h \ wmsdkidl.idl \ + wmsecure.idl \ wnaspi32.h \ wownt16.h \ wownt32.h \ diff --git a/include/wmsecure.idl b/include/wmsecure.idl new file mode 100644 index 00000000000..f8d731a05ba --- /dev/null +++ b/include/wmsecure.idl @@ -0,0 +1,62 @@ +/* + * Copyright 2021 Zebediah Figura for CodeWeavers + * + * 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + object, + local, + uuid(d9b67d36-a9ad-4eb4-baef-db284ef5504c), +] +interface IWMAuthorizer : IUnknown +{ + HRESULT GetCertCount(DWORD *count); + HRESULT GetCert(DWORD index, BYTE **data); + HRESULT GetSharedData(DWORD index, const BYTE *data, BYTE *cert, BYTE **ret_data); +} + +[ + object, + local, + uuid(2720598a-d0f2-4189-bd10-91c46ef0936f), +] +interface IWMSecureChannel : IWMAuthorizer +{ + HRESULT WMSC_AddCertificate(IWMAuthorizer *cert); + HRESULT WMSC_AddSignature(BYTE *signature, DWORD size); + HRESULT WMSC_Connect(IWMSecureChannel *peer); + HRESULT WMSC_IsConnected(BOOL *connected); + HRESULT WMSC_Disconnect(); + HRESULT WMSC_GetValidCertificate(BYTE **cert, DWORD *signature); + HRESULT WMSC_Encrypt(BYTE *data, DWORD size); + HRESULT WMSC_Decrypt(BYTE *data, DWORD size); + HRESULT WMSC_Lock(); + HRESULT WMSC_Unlock(); + HRESULT WMSC_SetSharedData(DWORD index, BYTE *data); +} + +[ + object, + local, + uuid(94bc0598-c3d2-11d3-bedf-00c04f612986), +] +interface IWMGetSecureChannel : IUnknown +{ + HRESULT GetPeerSecureChannelInterface(IWMSecureChannel **channel); +}

1 0

Zebediah Figura : include: Add IWMIStreamProps.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: ac6ba5f395094631053907a8fb0d6446e3013690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac6ba5f395094631053907a8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:07 2021 -0500 include: Add IWMIStreamProps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 945a8faaca4..78505ce3e5a 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1888,6 +1888,16 @@ interface IWMLicenseRestore : IUnknown HRESULT CancelLicenseRestore(); } +[ + object, + local, + uuid(6816dad3-2b4b-4c8e-8149-874c3483a753), +] +interface IWMIStreamProps : IUnknown +{ + HRESULT GetProperty(const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, DWORD *size); +} + cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);")

1 0

Zebediah Figura : include: Add IWMReaderCallbackAdvanced.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: a4e1e7f9008c189642b766b4ab4789215f7feccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4e1e7f9008c189642b766b4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:08 2021 -0500 include: Add IWMReaderCallbackAdvanced. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 78505ce3e5a..0adde5e2dd9 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -260,6 +260,21 @@ interface IWMReaderCallback : IWMStatusCallback [in] void *pvContext); } +[ + object, + local, + uuid(96406beb-2b2b-11d3-b36b-00c04f6108ff), +] +interface IWMReaderCallbackAdvanced : IUnknown +{ + HRESULT OnStreamSample(WORD stream_number, QWORD pts, QWORD duration, DWORD flags, INSSBuffer *sample, void *context); + HRESULT OnTime(QWORD time, void *context); + HRESULT OnStreamSelection(WORD count, WORD *stream_numbers, WMT_STREAM_SELECTION *selections, void *context); + HRESULT OnOutputPropsChanged(DWORD output_number, WM_MEDIA_TYPE *mt, void *context); + HRESULT AllocateForStream(WORD stream_number, DWORD size, INSSBuffer **sample, void *context); + HRESULT AllocateForOutput(DWORD output_number, DWORD size, INSSBuffer **sample, void *context); +} + [ object, uuid(96406Bdd-2b2b-11d3-b36b-00c04f6108ff),

1 0

Zebediah Figura : include: Add IWMCredentialCallback.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 3eb33e94a2b719cede5d27a7c6860e4c73660bc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eb33e94a2b719cede5d27a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:09 2021 -0500 include: Add IWMCredentialCallback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 0adde5e2dd9..f276d642a03 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1913,6 +1913,17 @@ interface IWMIStreamProps : IUnknown HRESULT GetProperty(const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, DWORD *size); } +[ + object, + local, + uuid(342e0eb7-e651-450c-975b-2ace2c90c48e), +] +interface IWMCredentialCallback : IUnknown +{ + HRESULT AcquireCredentials(WCHAR *realm, WCHAR *site, WCHAR *username, DWORD username_size, + WCHAR *password, DWORD password_size, HRESULT hr, DWORD *flags); +} + cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);")

1 0

Zebediah Figura : include: Add INSSBuffer3.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: f454932b4a0dcf85e9bd190ea66844ec3a99e8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f454932b4a0dcf85e9bd190e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:10 2021 -0500 include: Add INSSBuffer3. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsbuffer.idl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/wmsbuffer.idl b/include/wmsbuffer.idl index 6ec9dfc7c3b..a9d76898982 100644 --- a/include/wmsbuffer.idl +++ b/include/wmsbuffer.idl @@ -41,3 +41,25 @@ interface INSSBuffer : IUnknown [out] BYTE **ppdwBuffer, [out] DWORD *pdwLength); } + +[ + object, + local, + uuid(4f528693-1035-43fe-b428-757561ad3a68), +] +interface INSSBuffer2 : INSSBuffer +{ + HRESULT GetSampleProperties(DWORD size, BYTE *props); + HRESULT SetSampleProperties(DWORD size, BYTE *props); +} + +[ + object, + local, + uuid(c87ceaaf-75be-4bc4-84eb-ac2798507672), +] +interface INSSBuffer3 : INSSBuffer2 +{ + HRESULT SetProperty(GUID id, void *value, DWORD size); + HRESULT GetProperty(GUID id, void *value, DWORD *size); +}

1 0

Huw Davies : wineps: Avoid using typeof().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 586ae944b54b9e34b4fd2a624b814a48a0af34c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586ae944b54b9e34b4fd2a62… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 18 08:39:40 2021 +0100 wineps: Avoid using typeof(). Based on a patch by Alex Henrie. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/download.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index dc77cf11703..3e720bf195b 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -65,7 +65,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str { USHORT count, i; BYTE *strings; - struct + struct name_record { USHORT platform_id; USHORT encoding_id; @@ -78,7 +78,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str GetFontData(dev->hdc, MS_MAKE_TAG('n','a','m','e'), 0, name, size); count = GET_BE_WORD(name + 2); strings = name + GET_BE_WORD(name + 4); - name_record = (typeof(name_record))(name + 6); + name_record = (struct name_record *)(name + 6); for(i = 0; i < count; i++, name_record++) { name_record->platform_id = GET_BE_WORD(&name_record->platform_id); @@ -687,7 +687,6 @@ void get_glyph_name(HDC hdc, WORD index, char *name) DWORD minMemType1; DWORD maxMemType1; } *post_header; - BYTE *post = NULL; DWORD size; /* set a fallback name that is just 'g<index>' */ @@ -697,13 +696,11 @@ void get_glyph_name(HDC hdc, WORD index, char *name) size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, NULL, 0); if(size < sizeof(*post_header) || size == GDI_ERROR) return; - post = HeapAlloc(GetProcessHeap(), 0, size); - if(!post) - return; - size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, post, size); + post_header = HeapAlloc(GetProcessHeap(), 0, size); + if(!post_header) return; + size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, post_header, size); if(size < sizeof(*post_header) || size == GDI_ERROR) goto cleanup; - post_header = (typeof(post_header))(post); /* note: only interested in the format for obtaining glyph names */ post_header->format = GET_BE_DWORD(&post_header->format); @@ -717,7 +714,7 @@ void get_glyph_name(HDC hdc, WORD index, char *name) } else if(post_header->format == MAKELONG(0, 2)) { - BYTE *post2header = post + sizeof(*post_header); + void *post2header = post_header + 1; int glyphNameIndex; size -= sizeof(*post_header); @@ -739,7 +736,7 @@ void get_glyph_name(HDC hdc, WORD index, char *name) HIWORD(post_header->format), LOWORD(post_header->format)); cleanup: - HeapFree(GetProcessHeap(), 0, post); + HeapFree(GetProcessHeap(), 0, post_header); } /****************************************************************************

1 0

Zhiyi Zhang : Revert "winevdm: Enable visual styles.".
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: b1eeaa657db649c256fe92c94f210982f810fd6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1eeaa657db649c256fe92c9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 18 14:54:09 2021 +0800 Revert "winevdm: Enable visual styles.". This reverts commit f304b2ae23bb537029fe51983f060f680de66a12. 16-bit applications don't use themed controls even if theming is on. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51583 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51802 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winevdm/Makefile.in | 2 +- programs/winevdm/winevdm.c | 3 --- programs/winevdm/winevdm.manifest | 12 ------------ 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in index cc3dddb09c6..67420b81759 100644 --- a/programs/winevdm/Makefile.in +++ b/programs/winevdm/Makefile.in @@ -1,5 +1,5 @@ MODULE = winevdm.exe -IMPORTS = user32 kernel comctl32 +IMPORTS = user32 kernel EXTRADLLFLAGS = -mwindows diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 19f3c778513..5b5f72db253 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -29,7 +29,6 @@ #include "wine/winbase16.h" #include "winuser.h" #include "wincon.h" -#include "commctrl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winevdm); @@ -448,8 +447,6 @@ int main( int argc, char *argv[] ) char *cmdline, *appname, **first_arg; char *p; - InitCommonControls(); - if (!argv[1]) usage(); if (!strcmp( argv[1], "--app-name" )) diff --git a/programs/winevdm/winevdm.manifest b/programs/winevdm/winevdm.manifest index 6547ce24206..98bc91bd786 100644 --- a/programs/winevdm/winevdm.manifest +++ b/programs/winevdm/winevdm.manifest @@ -1,18 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity type="win32" name="Wine.Winevdm" version="0.0.0.0"/> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="*" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> <application xmlns="urn:schemas-microsoft-com:asm.v3"> <windowsSettings> <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>

1 0