January 2022 - Wine-commits

Zebediah Figura : ntdll: Implement wcsnlen().
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: a524ab500434df3b9c4c5b10010b0f6fe571e859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a524ab500434df3b9c4c5b10… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 29 20:39:55 2022 -0600 ntdll: Implement wcsnlen(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/wcstring.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd8e1f5efe6..afb945d4665 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1609,6 +1609,7 @@ @ cdecl wcsncat(wstr wstr long) @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) +@ cdecl wcsnlen(ptr long) @ cdecl wcspbrk(wstr wstr) @ cdecl wcsrchr(wstr long) @ cdecl wcsspn(wstr wstr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index a727e4defac..9422e4f676c 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -251,6 +251,17 @@ LPWSTR __cdecl wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ) } +/********************************************************************* + * wcsnlen (NTDLL.@) + */ +size_t __cdecl wcsnlen( const WCHAR *str, size_t len ) +{ + const WCHAR *s = str; + for (s = str; len && *s; s++, len--) ; + return s - str; +} + + /********************************************************************* * wcspbrk (NTDLL.@) */

1 0

Zebediah Figura : kernelbase: Use wcsnlen().
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 628f2a1e565ea1d539f8ec37a029c66d0f54bacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=628f2a1e565ea1d539f8ec37… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 29 20:39:56 2022 -0600 kernelbase: Use wcsnlen(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b4b31410a3a..3503286a82a 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -105,15 +105,6 @@ static WCHAR *heap_strdupAtoW(const char *str) return ret; } -static SIZE_T strnlenW(const WCHAR *string, SIZE_T maxlen) -{ - SIZE_T i; - - for (i = 0; i < maxlen; i++) - if (!string[i]) break; - return i; -} - static BOOL is_drive_spec( const WCHAR *str ) { return ((str[0] >= 'A' && str[0] <= 'Z') || (str[0] >= 'a' && str[0] <= 'z')) && str[1] == ':'; @@ -517,7 +508,7 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens if (FAILED(hr)) return hr; if (*existing_extension) return S_FALSE; - path_length = strnlenW(path, size); + path_length = wcsnlen(path, size); dot_length = has_dot ? 0 : 1; extension_length = lstrlenW(extension); @@ -752,7 +743,7 @@ HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **p return E_INVALIDARG; } - path_length = strnlenW(path, path_size); + path_length = wcsnlen(path, path_size); if (path_length == path_size && !path[path_length]) return E_INVALIDARG; root_end = get_root_end(path);

1 0

Zebediah Figura : kernelbase: Use ntdll ctype functions.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: d0ed0b676c78702b48db2cb62866a6f09ef45feb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0ed0b676c78702b48db2cb6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 29 20:39:57 2022 -0600 kernelbase: Use ntdll ctype functions. These were open-coded in 5933c2a6901218bc6ef7b6e808b0571fa96b542e, but there's no reason not to use the ASCII versions from ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 18 ++++-------------- dlls/kernelbase/string.c | 4 ---- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 3503286a82a..5f983895576 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -36,13 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(path); -#define isalnum(ch) (((ch) >= '0' && (ch) <= '9') || \ - ((ch) >= 'A' && (ch) <= 'Z') || \ - ((ch) >= 'a' && (ch) <= 'z')) -#define isxdigit(ch) (((ch) >= '0' && (ch) <= '9') || \ - ((ch) >= 'A' && (ch) <= 'F') || \ - ((ch) >= 'a' && (ch) <= 'f')) - static const char hexDigits[] = "0123456789ABCDEF"; static const unsigned char hashdata_lookup[256] = @@ -107,13 +100,12 @@ static WCHAR *heap_strdupAtoW(const char *str) static BOOL is_drive_spec( const WCHAR *str ) { - return ((str[0] >= 'A' && str[0] <= 'Z') || (str[0] >= 'a' && str[0] <= 'z')) && str[1] == ':'; + return isalpha( str[0] ) && str[1] == ':'; } static BOOL is_escaped_drive_spec( const WCHAR *str ) { - return ((str[0] >= 'A' && str[0] <= 'Z') || (str[0] >= 'a' && str[0] <= 'z')) && - (str[1] == ':' || str[1] == '|'); + return isalpha( str[0] ) && (str[1] == ':' || str[1] == '|'); } static BOOL is_prefixed_unc(const WCHAR *string) @@ -2794,8 +2786,7 @@ HRESULT WINAPI ParseURLA(const char *url, PARSEDURLA *result) if (result->cbSize != sizeof(*result)) return E_INVALIDARG; - while (*ptr && ((*ptr >= 'a' && *ptr <= 'z') || (*ptr >= 'A' && *ptr <= 'Z') || - (*ptr >= '0' && *ptr <= '9') || *ptr == '-' || *ptr == '+' || *ptr == '.')) + while (*ptr && (isalnum( *ptr ) || *ptr == '-' || *ptr == '+' || *ptr == '.')) ptr++; if (*ptr != ':' || ptr <= url + 1) @@ -4177,8 +4168,7 @@ static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_typ switch (type) { case SCHEME: - while ((*start >= 'a' && *start <= 'z') || (*start >= '0' && *start <= '9') || - *start == '+' || *start == '-' || *start == '.') + while ((isalnum( *start ) && !isupper( *start )) || *start == '+' || *start == '-' || *start == '.') { start++; (*size)++; diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 29cc158202f..f5d4468ae6c 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -30,10 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(string); -#define isxdigit(ch) (((ch) >= '0' && (ch) <= '9') || \ - ((ch) >= 'A' && (ch) <= 'F') || \ - ((ch) >= 'a' && (ch) <= 'f')) - static BOOL char_compare(WORD ch1, WORD ch2, DWORD flags) { char str1[3], str2[3];

1 0

Esme Povirk : include: Add ISymUnmanagedWriter definition.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: c396a784d0285a3663d205075dbf6e034e2391f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c396a784d0285a3663d20507… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jan 28 13:00:50 2022 -0600 include: Add ISymUnmanagedWriter definition. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/corsym.idl | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7fcf5f0ba7b..2f1e4767848 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -89,6 +89,7 @@ SOURCES = \ cordebug.idl \ corerror.h \ corhdr.h \ + corsym.idl \ cpl.h \ crtrow.idl \ cryptdlg.h \ diff --git a/include/corsym.idl b/include/corsym.idl new file mode 100644 index 00000000000..f46b1f5a78a --- /dev/null +++ b/include/corsym.idl @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2022 Esme Povirk + * + * 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 "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +cpp_quote("#if 0") +/* defined in corhdr.h */ +typedef UINT32 mdToken; +typedef mdToken mdMethodDef; +typedef mdToken mdTypeDef; +/* defined in winnt.h */ +typedef SIZE_T IMAGE_DEBUG_DIRECTORY; +cpp_quote("#endif") + +[ + object, + uuid(b01fafeb-c450-3a4d-beec-b4ceec01e006), + pointer_default(unique) +] +interface ISymUnmanagedDocumentWriter : IUnknown +{ + HRESULT SetSource([in] ULONG32 sourceSize, [in, size_is(sourceSize)] BYTE source[]); + HRESULT SetCheckSum([in] GUID algorithmId, + [in] ULONG32 checkSumSize, [in, size_is(checkSumSize)] BYTE checkSum[]); +} + +[ + object, + uuid(ed14aa72-78e2-4884-84e2-334293ae5214), + pointer_default(unique) +] +interface ISymUnmanagedWriter : IUnknown +{ + HRESULT DefineDocument([in] const WCHAR *url, [in] const GUID *language, [in] const GUID *languageVendor, + [in] const GUID *documentType, [out, retval] ISymUnmanagedDocumentWriter** pRetVal); + HRESULT SetUserEntryPoint([in] mdMethodDef entryMethod); + HRESULT OpenMethod([in] mdMethodDef method); + HRESULT CloseMethod(); + HRESULT OpenScope([in] ULONG32 startOffset, [out, retval] ULONG32 *pRetVal); + HRESULT CloseScope([in] ULONG32 endOffset); + HRESULT SetScopeRange([in] ULONG32 scopeID, [in] ULONG32 startOffset, [in] ULONG32 endOffset); + HRESULT DefineLocalVariable([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3, + [in] ULONG32 startOffset, [in] ULONG32 endOffset); + HRESULT DefineParameter([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 sequence, + [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT DefineField([in] mdTypeDef parent, [in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT DefineGlobalVariable([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT Close(); + HRESULT SetSymAttributes([in] mdToken parent, [in] const WCHAR *name, + [in] ULONG32 cData, [in, size_is(cData)] unsigned char data[]); + HRESULT OpenNamespace([in] const WCHAR *name); + HRESULT CloseNamespace(); + HRESULT UsingNamespace([in] const WCHAR *fullName); + HRESULT SetMethodSourceRange([in] ISymUnmanagedDocumentWriter *startDoc, ULONG32 startLine, ULONG32 startColumn, + [in] ISymUnmanagedDocumentWriter *endDoc, ULONG32 endLine, ULONG32 endColumn); + HRESULT Initialize([in] IUnknown *emitter, [in] const WCHAR *filename, [in] IStream *pIStream, + [in] BOOL fFullBuild); + HRESULT GetDebugInfo([in, out] IMAGE_DEBUG_DIRECTORY *pIDD, [in] DWORD cData, [out] DWORD *pcData, + [out, size_is(cData), length_is(*pcData)] BYTE data[]); + HRESULT DefineSequencePoints([in] ISymUnmanagedDocumentWriter *document, [in] ULONG32 spCount, + [in, size_is(spCount)] ULONG32 offsets[], [in, size_is(spCount)] ULONG32 lines[], + [in, size_is(spCount)] ULONG32 columns[], [in, size_is(spCount)] ULONG32 endLines[], + [in, size_is(spCount)] ULONG32 endColumns[]); + HRESULT RemapToken([in] mdToken oldToken, [in] mdToken newToken); + HRESULT Initialize2([in] IUnknown *emitter, [in] const WCHAR *tempFilename, [in] IStream *pIStream, + [in] BOOL fFullBuild, [in] const WCHAR *finalFilename); + HRESULT DefineConstant([in] const WCHAR *name, [in] VARIANT value, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[]); + HRESULT Abort(); +} + +cpp_quote("DEFINE_GUID(CLSID_CorSymWriter_SxS, 0x0ae2deb0,0xf901,0x478b,0xbb,0x9f,0x88,0x1e,0xe8,0x06,0x67,0x88);")

1 0

Esme Povirk : diasymreader: Add stub dll.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: ee6bee6a452647a2629c1d1f82dd2389fac4e441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee6bee6a452647a2629c1d1f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jan 28 13:00:51 2022 -0600 diasymreader: Add stub dll. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/diasymreader/Makefile.in | 3 +++ dlls/diasymreader/diasymreader.spec | 8 ++++++++ loader/wine.inf.in | 2 ++ 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 8578764ed5e..f5afadafd39 100755 --- a/configure +++ b/configure @@ -1294,6 +1294,7 @@ enable_devenum enable_dhcpcsvc enable_dhcpcsvc6 enable_dhtmled_ocx +enable_diasymreader enable_difxapi enable_dinput enable_dinput8 @@ -21842,6 +21843,7 @@ wine_fn_config_makefile dlls/dhcpcsvc enable_dhcpcsvc wine_fn_config_makefile dlls/dhcpcsvc/tests enable_tests wine_fn_config_makefile dlls/dhcpcsvc6 enable_dhcpcsvc6 wine_fn_config_makefile dlls/dhtmled.ocx enable_dhtmled_ocx +wine_fn_config_makefile dlls/diasymreader enable_diasymreader wine_fn_config_makefile dlls/difxapi enable_difxapi wine_fn_config_makefile dlls/dinput enable_dinput wine_fn_config_makefile dlls/dinput/tests enable_tests diff --git a/configure.ac b/configure.ac index 54ef47f767c..039beaf98ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2738,6 +2738,7 @@ WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc6) WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx) +WINE_CONFIG_MAKEFILE(dlls/diasymreader) WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) diff --git a/dlls/diasymreader/Makefile.in b/dlls/diasymreader/Makefile.in new file mode 100644 index 00000000000..6cc5541adff --- /dev/null +++ b/dlls/diasymreader/Makefile.in @@ -0,0 +1,3 @@ +MODULE = diasymreader.dll + +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/diasymreader/diasymreader.spec b/dlls/diasymreader/diasymreader.spec new file mode 100644 index 00000000000..9277fb1bcd9 --- /dev/null +++ b/dlls/diasymreader/diasymreader.spec @@ -0,0 +1,8 @@ +@ stub CreateNGenPdbWriter +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllGetClassObjectInternal +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub VSDllRegisterServer +@ stub VSDllUnregisterServer diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1dce3468db0..0e488d87dcb 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2635,6 +2635,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,aspnet_regiis.exe,- 11,,ngen.exe,- 11,,fusion.dll,- +11,,diasymreader.dll,- 11,,mscorwks.dll,- 11,,regsvcs.exe,- 11,,regasm.exe,- @@ -2689,6 +2690,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,aspnet_regiis.exe,- 11,,ngen.exe,- 11,,fusion.dll,- +11,,diasymreader.dll,- 11,,mscorwks.dll,- 11,,regsvcs.exe,- 11,,regasm.exe,-

1 0

Esme Povirk : diasymreader: Register CLSID_CorSymWriter_SXS.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 235f4654859bf6b86171a2d8bf4bacf646747e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=235f4654859bf6b86171a2d8… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jan 28 13:00:52 2022 -0600 diasymreader: Register CLSID_CorSymWriter_SXS. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/Makefile.in | 5 +++++ dlls/diasymreader/diasymreader.rc | 22 ++++++++++++++++++++++ dlls/diasymreader/diasymreader.rgs | 23 +++++++++++++++++++++++ dlls/diasymreader/diasymreader.spec | 6 +++--- dlls/diasymreader/main.c | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/diasymreader/Makefile.in b/dlls/diasymreader/Makefile.in index 6cc5541adff..2ea95048edd 100644 --- a/dlls/diasymreader/Makefile.in +++ b/dlls/diasymreader/Makefile.in @@ -1,3 +1,8 @@ MODULE = diasymreader.dll +IMPORTS = uuid EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = main.c + +RC_SRCS = diasymreader.rc diff --git a/dlls/diasymreader/diasymreader.rc b/dlls/diasymreader/diasymreader.rc new file mode 100644 index 00000000000..0c97aa85779 --- /dev/null +++ b/dlls/diasymreader/diasymreader.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2022 Esme Povirk + * + * 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 <windef.h> + +/* @makedep: diasymreader.rgs */ +2 WINE_REGISTRY diasymreader.rgs diff --git a/dlls/diasymreader/diasymreader.rgs b/dlls/diasymreader/diasymreader.rgs new file mode 100644 index 00000000000..ea5bf07f370 --- /dev/null +++ b/dlls/diasymreader/diasymreader.rgs @@ -0,0 +1,23 @@ +HKCR +{ + NoRemove CLSID + { + '{0ae2deb0-f901-478b-bb9f-881ee8066788}' + { + InProcServer32 = s 'mscoree.dll' + { + val ThreadingModel = s 'Both' + '4.0.30319' + { + val 'ImplementedInThisVersion' = s '' + } + ProgID = s 'CorSymWriter_SxS' + Server = s 'diasymreader.dll' + } + } + } + 'CorSymWriter_SxS' = s 'NDP SymWriter' + { + CLSID = s '{0ae2deb0-f901-478b-bb9f-881ee8066788}' + } +} diff --git a/dlls/diasymreader/diasymreader.spec b/dlls/diasymreader/diasymreader.spec index 9277fb1bcd9..63644e07fd4 100644 --- a/dlls/diasymreader/diasymreader.spec +++ b/dlls/diasymreader/diasymreader.spec @@ -1,8 +1,8 @@ @ stub CreateNGenPdbWriter @ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllGetClassObjectInternal -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub VSDllRegisterServer @ stub VSDllUnregisterServer diff --git a/dlls/diasymreader/main.c b/dlls/diasymreader/main.c new file mode 100644 index 00000000000..a85d9cd0222 --- /dev/null +++ b/dlls/diasymreader/main.c @@ -0,0 +1,35 @@ +/* Copyright (C) 2022 Esme Povirk + * + * This program 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 program 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 program; 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 "winnls.h" +#include "objbase.h" +#include "ocidl.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(diasymreader); + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + FIXME("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +}

1 0

Esme Povirk : mscoree: Update Wine Mono to 7.1.1.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 17b34ca8ad8f4e2f81d69a0849699d5aa0853888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17b34ca8ad8f4e2f81d69a08… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jan 28 13:00:53 2022 -0600 mscoree: Update Wine Mono to 7.1.1. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b4da6137d72..71919f225c8 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "7.0.0" +#define MONO_VERSION "7.1.1" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "b37e6fc9e590e582243dc25d72a5fcc330c3a7970dfdc98a7a81d23845ba8900" +#define MONO_SHA "9dc8e5603b7bc64354eb94ae4ea0f6821424767a3ff44ff0d19e346a490c11ea" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 1ef5ac200f3..2e72ea5370b 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "7.0.0" +#define WINE_MONO_VERSION "7.1.1" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Esme Povirk : mscoree: Use wide string syntax in create_monodata.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 71288ba50a6084cd9f3ec2334f088ea154e36cb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71288ba50a6084cd9f3ec233… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jan 28 13:00:54 2022 -0600 mscoree: Use wide string syntax in create_monodata. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ec06717be85..afb5a104ca7 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1718,13 +1718,9 @@ end: HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) { - static const WCHAR wszAssembly[] = {'A','s','s','e','m','b','l','y',0}; - static const WCHAR wszCodebase[] = {'C','o','d','e','B','a','s','e',0}; - static const WCHAR wszClass[] = {'C','l','a','s','s',0}; - static const WCHAR wszFileSlash[] = {'f','i','l','e',':','/','/','/',0}; - static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; - static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; - static const WCHAR wszDLL[] = {'.','d','l','l',0}; + static const WCHAR wszFileSlash[] = L"file:///"; + static const WCHAR wszCLSIDSlash[] = L"CLSID\\"; + static const WCHAR wszInprocServer32[] = L"\\InprocServer32"; WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) + ARRAY_SIZE(wszInprocServer32) - 1]; MonoDomain *domain; MonoAssembly *assembly; @@ -1751,7 +1747,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key); if (res != ERROR_FILE_NOT_FOUND) { - res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); + res = RegGetValueW( key, NULL, L"Class", RRF_RT_REG_SZ, NULL, classname, &dwBufLen); if(res != ERROR_SUCCESS) { WARN("Class value cannot be found.\n"); @@ -1762,7 +1758,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) TRACE("classname (%s)\n", debugstr_w(classname)); dwBufLen = MAX_PATH + 8; - res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + res = RegGetValueW( key, NULL, L"CodeBase", RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); if(res == ERROR_SUCCESS) { /* Strip file:/// */ @@ -1797,7 +1793,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) if (res != ERROR_SUCCESS) goto cleanup; dwBufLen = MAX_PATH + 8; - res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + res = RegGetValueW(subkey, NULL, L"Assembly", RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); RegCloseKey(subkey); if (res != ERROR_SUCCESS) goto cleanup; @@ -1805,7 +1801,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) else { dwBufLen = MAX_PATH + 8; - res = RegGetValueW(key, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + res = RegGetValueW(key, NULL, L"Assembly", RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); if (res != ERROR_SUCCESS) goto cleanup; } @@ -1830,7 +1826,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) *(ns) = '\0'; lstrcatW(filename, assemblyname); *(ns) = '.'; - lstrcatW(filename, wszDLL); + lstrcatW(filename, L".dll"); } } }

1 0

André Zwing : shlwapi: Fix some spec file entries.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 1901ee7d53c993755286a2c05a83de19fac507f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1901ee7d53c993755286a2c0… Author: André Zwing <nerv(a)dawncrow.de> Date: Fri Jan 28 21:56:02 2022 +0100 shlwapi: Fix some spec file entries. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/shlwapi.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 68d0e7f8122..c61e45b0270 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -257,7 +257,7 @@ 257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait -260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) +260 stdcall -noname SHQueueUserWorkItem(long long long long long str long) 261 stub -noname SHCreateTimerQueue 262 stub -noname SHDeleteTimerQueue 263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) @@ -288,8 +288,8 @@ 288 stub -noname IUnknown_CPContainerInvokeIndirect 289 stdcall -noname PlaySoundWrapW(wstr long long) 290 stub -noname SHMirrorIcon -291 stdcall -noname SHMessageBoxCheckExA(ptr ptr ptr ptr ptr long str) -292 stdcall -noname SHMessageBoxCheckExW(ptr ptr ptr ptr ptr long wstr) +291 stdcall -noname SHMessageBoxCheckExA(ptr ptr str ptr ptr long str) +292 stdcall -noname SHMessageBoxCheckExW(ptr ptr wstr ptr ptr long wstr) 293 stub -noname SHCancelUserWorkItems 294 stdcall -noname SHGetIniStringW(wstr wstr ptr long wstr) 295 stdcall -noname SHSetIniStringW(wstr wstr wstr wstr) @@ -488,7 +488,7 @@ 488 stub -noname SHConvertGraphicsFile 489 stdcall -noname GlobalAddAtomWrapW(wstr) kernel32.GlobalAddAtomW 490 stdcall -noname GlobalFindAtomWrapW(wstr) kernel32.GlobalFindAtomW -491 stdcall -noname SHGetShellKey(long long long) +491 stdcall -noname SHGetShellKey(long wstr long) 492 stub -noname PrettifyFileDescriptionW 493 stub -noname SHPropertyBag_ReadType 494 stub -noname SHPropertyBag_ReadStr @@ -663,8 +663,8 @@ @ stdcall -import PathRenameExtensionW(wstr wstr) @ stdcall -import PathSearchAndQualifyA(str ptr long) @ stdcall -import PathSearchAndQualifyW(wstr ptr long) -@ stdcall PathSetDlgItemPathA (long long ptr) -@ stdcall PathSetDlgItemPathW (long long ptr) +@ stdcall PathSetDlgItemPathA(long long str) +@ stdcall PathSetDlgItemPathW(long long wstr) @ stdcall -import PathSkipRootA(str) @ stdcall -import PathSkipRootW(wstr) @ stdcall -import PathStripPathA(str)

1 0

André Zwing : advapi32: Fix some spec file entries.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: e6a2bb34326c2a2ca31b15ddb76418577c56ef42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6a2bb34326c2a2ca31b15dd… Author: André Zwing <nerv(a)dawncrow.de> Date: Fri Jan 28 21:56:05 2022 +0100 advapi32: Fix some spec file entries. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 22 +++++++++++----------- .../api-ms-win-core-registry-l2-1-0.spec | 8 ++++---- .../api-ms-win-core-registry-l2-2-0.spec | 8 ++++---- .../api-ms-win-downlevel-advapi32-l2-1-0.spec | 2 +- .../api-ms-win-security-lsalookup-l2-1-0.spec | 4 ++-- .../api-ms-win-security-lsalookup-l2-1-1.spec | 4 ++-- .../api-ms-win-security-sddl-l1-1-0.spec | 2 +- .../api-ms-win-service-winsvc-l1-1-0.spec | 2 +- .../api-ms-win-service-winsvc-l1-2-0.spec | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6a2bb34326c2a2ca31b…

1 0