wine-commits November 2023

wine-commits@winehq.org

1 participants
989 discussions

Daniel Lehman : msxml6/tests: Add tests for get_xml.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: 4e2d8b13282131cc0debbbf74f73e7e95a233a4e URL: https://gitlab.winehq.org/wine/wine/-/commit/4e2d8b13282131cc0debbbf74f73e7… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Nov 4 07:05:34 2023 -0700 msxml6/tests: Add tests for get_xml. --- dlls/msxml6/tests/domdoc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c index 7a5620b22a3..3aad799523d 100644 --- a/dlls/msxml6/tests/domdoc.c +++ b/dlls/msxml6/tests/domdoc.c @@ -66,6 +66,7 @@ static void test_namespaces_as_attributes(void) const WCHAR *basenames[3]; const WCHAR *uris[3]; const WCHAR *texts[3]; + const WCHAR *xmls[3]; }; static const struct test tests[] = { @@ -76,6 +77,7 @@ static void test_namespaces_as_attributes(void) { L"b", L"d", L"ns" }, /* baseName */ { L"nshref", NULL, L"" }, /* namespaceURI */ { L"b attr", L"d attr", L"nshref" }, /* text */ + { L"ns:b=\"b attr\"", L"d=\"d attr\"", L"xmlns:ns=\"nshref\"" }, /* xml */ }, /* property only */ { @@ -85,6 +87,7 @@ static void test_namespaces_as_attributes(void) { L"d" }, /* baseName */ { NULL }, /* namespaceURI */ { L"d attr" }, /* text */ + { L"d=\"d attr\"" }, /* xml */ }, /* namespace only */ { @@ -94,6 +97,7 @@ static void test_namespaces_as_attributes(void) { L"ns" }, /* baseName */ { L"" }, /* namespaceURI */ { L"nshref" }, /* text */ + { L"xmlns:ns=\"nshref\"" }, /* xml */ }, /* no properties or namespaces */ { @@ -187,6 +191,12 @@ static void test_namespaces_as_attributes(void) ok(!lstrcmpW(str, test->texts[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = NULL; + hr = IXMLDOMNode_get_xml(item, &str); + ok(SUCCEEDED(hr), "Failed to get node xml, hr %#lx.\n", hr); + ok(!lstrcmpW(str, test->xmls[i]), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(item); }

1 0

Daniel Lehman : msxml6/tests: Use wide string literals.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: df7197874e7d1757bcc481a5b89948734234e758 URL: https://gitlab.winehq.org/wine/wine/-/commit/df7197874e7d1757bcc481a5b89948… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Nov 4 07:05:34 2023 -0700 msxml6/tests: Use wide string literals. --- dlls/msxml6/tests/domdoc.c | 76 +++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c index a6ee0fdc5e4..7a5620b22a3 100644 --- a/dlls/msxml6/tests/domdoc.c +++ b/dlls/msxml6/tests/domdoc.c @@ -39,18 +39,10 @@ static BSTR alloced_bstrs[256]; static int alloced_bstrs_count; -static BSTR alloc_str_from_narrow(const char *str) -{ - int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - BSTR ret = SysAllocStringLen(NULL, len - 1); /* NUL character added automatically */ - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - return ret; -} - -static BSTR _bstr_(const char *str) +static BSTR _bstr_(const WCHAR *str) { assert(alloced_bstrs_count < ARRAY_SIZE(alloced_bstrs)); - alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); + alloced_bstrs[alloced_bstrs_count] = SysAllocString(str); return alloced_bstrs[alloced_bstrs_count++]; } @@ -67,45 +59,45 @@ static void test_namespaces_as_attributes(void) { struct test { - const char *xml; + const WCHAR *xml; int explen; - const char *names[3]; - const char *prefixes[3]; - const char *basenames[3]; - const char *uris[3]; - const char *texts[3]; + const WCHAR *names[3]; + const WCHAR *prefixes[3]; + const WCHAR *basenames[3]; + const WCHAR *uris[3]; + const WCHAR *texts[3]; }; static const struct test tests[] = { { - "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />", 3, - { "ns:b", "d", "xmlns:ns" }, /* nodeName */ - { "ns", NULL, "xmlns" }, /* prefix */ - { "b", "d", "ns" }, /* baseName */ - { "nshref", NULL, "" }, /* namespaceURI */ - { "b attr", "d attr", "nshref" }, /* text */ + L"<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />", 3, + { L"ns:b", L"d", L"xmlns:ns" }, /* nodeName */ + { L"ns", NULL, L"xmlns" }, /* prefix */ + { L"b", L"d", L"ns" }, /* baseName */ + { L"nshref", NULL, L"" }, /* namespaceURI */ + { L"b attr", L"d attr", L"nshref" }, /* text */ }, /* property only */ { - "<a d=\"d attr\" />", 1, - { "d" }, /* nodeName */ - { NULL }, /* prefix */ - { "d" }, /* baseName */ - { NULL }, /* namespaceURI */ - { "d attr" }, /* text */ + L"<a d=\"d attr\" />", 1, + { L"d" }, /* nodeName */ + { NULL }, /* prefix */ + { L"d" }, /* baseName */ + { NULL }, /* namespaceURI */ + { L"d attr" }, /* text */ }, /* namespace only */ { - "<a xmlns:ns=\"nshref\" />", 1, - { "xmlns:ns" }, /* nodeName */ - { "xmlns" }, /* prefix */ - { "ns" }, /* baseName */ - { "" }, /* namespaceURI */ - { "nshref" }, /* text */ + L"<a xmlns:ns=\"nshref\" />", 1, + { L"xmlns:ns" }, /* nodeName */ + { L"xmlns" }, /* prefix */ + { L"ns" }, /* baseName */ + { L"" }, /* namespaceURI */ + { L"nshref" }, /* text */ }, /* no properties or namespaces */ { - "<a />", 0, + L"<a />", 0, }, { NULL } @@ -129,7 +121,7 @@ static void test_namespaces_as_attributes(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); node = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("a"), &node); + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(L"a"), &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXMLDOMNode_get_attributes(node, &map); @@ -154,7 +146,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->names[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->names[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; @@ -162,7 +154,7 @@ static void test_namespaces_as_attributes(void) if (test->prefixes[i]) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->prefixes[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else @@ -171,7 +163,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_baseName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->basenames[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->basenames[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; @@ -179,11 +171,11 @@ static void test_namespaces_as_attributes(void) if (test->uris[i]) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns")) + if (test->prefixes[i] && !lstrcmpW(test->prefixes[i], L"xmlns")) ok(!lstrcmpW(str, L"http://www.w3.org/2000/xmlns/"), "got %s\n", wine_dbgstr_w(str)); else - ok(!lstrcmpW(str, _bstr_(test->uris[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->uris[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else @@ -192,7 +184,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_text(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->texts[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->texts[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(item);

1 0

Brendan Shanks : ntdll/unix: Replace some malloc/sprintf calls with asprintf.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: cd763004a6b159f77534e6e1d5e1dde255ac06a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd763004a6b159f77534e6e1d5e1dd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Nov 2 15:23:45 2023 -0700 ntdll/unix: Replace some malloc/sprintf calls with asprintf. --- dlls/ntdll/unix/env.c | 10 +++------- dlls/ntdll/unix/file.c | 14 ++++---------- dlls/ntdll/unix/loader.c | 21 +++++++++------------ dlls/ntdll/unix/server.c | 30 +++++++++++++----------------- 4 files changed, 29 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f845d2372e1..ec908a5389f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -108,8 +108,7 @@ static char *get_nls_file_path( UINT type, UINT id ) break; } if (!name) return NULL; - if (!(path = malloc( strlen(dir) + strlen(name) + 10 ))) return NULL; - sprintf( path, "%s/nls/%s.nls", dir, name ); + if (asprintf( &path, "%s/nls/%s.nls", dir, name ) == -1) return NULL; return path; } @@ -121,8 +120,7 @@ static void *read_nls_file( const char *name ) void *data, *ret = NULL; int fd; - if (!(path = malloc( strlen(dir) + strlen(name) + 10 ))) return NULL; - sprintf( path, "%s/nls/%s", dir, name ); + if (asprintf( &path, "%s/nls/%s", dir, name ) == -1) return NULL; if ((fd = open( path, O_RDONLY )) != -1) { @@ -2238,9 +2236,7 @@ NTSTATUS WINAPI NtInitializeNlsFiles( void **ptr, LCID *lcid, LARGE_INTEGER *siz SIZE_T mapsize; NTSTATUS status; - if (!(path = malloc( strlen(dir) + sizeof("/nls/locale.nls") ))) return STATUS_NO_MEMORY; - strcpy( path, dir ); - strcat( path, "/nls/locale.nls" ); + if (asprintf( &path, "%s/nls/locale.nls", dir ) == -1) return STATUS_NO_MEMORY; status = open_nls_data_file( path, system_dir, &file ); free( path ); if (!status) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c6533710365..72fcba6e998 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2098,10 +2098,8 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) struct stat st; unsigned int i; - if ((buffer = malloc( strlen(config_dir) + sizeof("/dosdevices/a:") ))) + if (asprintf( &buffer, "%s/dosdevices/a:", config_dir ) != -1) { - strcpy( buffer, config_dir ); - strcat( buffer, "/dosdevices/a:" ); p = buffer + strlen(buffer) - 2; for (i = nb_drives = 0; i < MAX_DOS_DRIVES; i++) @@ -2898,9 +2896,7 @@ static void init_redirects(void) char *dir; struct stat st; - if (!(dir = malloc( strlen(config_dir) + sizeof(system_dir) ))) return; - strcpy( dir, config_dir ); - strcat( dir, system_dir ); + if (asprintf( &dir, "%s%s", config_dir, system_dir ) == -1) return; if (!stat( dir, &st )) { sysdir.dev = st.st_dev; @@ -3904,11 +3900,9 @@ static NTSTATUS unmount_device( HANDLE handle ) #else static const char umount[] = "umount >/dev/null 2>&1 "; #endif - char *cmd = malloc( strlen(mount_point)+sizeof(umount)); - if (cmd) + char *cmd; + if (asprintf( &cmd, "%s%s", umount, mount_point ) != -1) { - strcpy( cmd, umount ); - strcat( cmd, mount_point ); system( cmd ); free( cmd ); #ifdef linux diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bfa161e25c9..0db25f88527 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -663,9 +663,7 @@ static void init_paths( char *argv[] ) } else wineloader = build_path( build_path( build_dir, "loader" ), basename ); - env = malloc( sizeof("WINELOADER=") + strlen(wineloader) ); - strcpy( env, "WINELOADER=" ); - strcat( env, wineloader ); + asprintf( &env, "WINELOADER=%s", wineloader ); putenv( env ); set_dll_path(); @@ -1835,18 +1833,18 @@ static void load_ntdll(void) UNICODE_STRING str; void *module; SIZE_T size = 0; - char *name; + char *name = NULL; init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/ntdll.dll.so") ); - if (build_dir) sprintf( name, "%s%s/ntdll.dll", ntdll_dir, pe_dir ); - else sprintf( name, "%s%s/ntdll.dll", dll_dir, pe_dir ); + if (build_dir) asprintf( &name, "%s%s/ntdll.dll", ntdll_dir, pe_dir ); + else asprintf( &name, "%s%s/ntdll.dll", dll_dir, pe_dir ); status = open_builtin_pe_file( name, &attr, &module, &size, &info, 0, 0, current_machine, FALSE ); if (status == STATUS_DLL_NOT_FOUND) { - sprintf( name, "%s/ntdll.dll.so", ntdll_dir ); + free( name ); + asprintf( &name, "%s/ntdll.dll.so", ntdll_dir ); status = open_builtin_so_file( name, &attr, &module, &info, FALSE ); } if (status == STATUS_IMAGE_NOT_AT_BASE) status = virtual_relocate_module( module ); @@ -1873,16 +1871,15 @@ static void load_apiset_dll(void) unsigned int status; HANDLE handle, mapping; SIZE_T size; - char *name; + char *name = NULL; void *ptr; UINT i; init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/apisetschema/apisetschema.dll") ); - if (build_dir) sprintf( name, "%s/dlls/apisetschema%s/apisetschema.dll", build_dir, pe_dir ); - else sprintf( name, "%s%s/apisetschema.dll", dll_dir, pe_dir ); + if (build_dir) asprintf( &name, "%s/dlls/apisetschema%s/apisetschema.dll", build_dir, pe_dir ); + else asprintf( &name, "%s%s/apisetschema.dll", dll_dir, pe_dir ); status = open_unix_file( &handle, name, GENERIC_READ | SYNCHRONIZE, &attr, 0, FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE, NULL, 0 ); diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 24653904308..7211457387c 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1243,29 +1243,25 @@ int server_pipe( int fd[2] ) */ static const char *init_server_dir( dev_t dev, ino_t ino ) { - char *p, *dir; - size_t len = sizeof("/server-") + 2 * sizeof(dev) + 2 * sizeof(ino) + 2; + char *dir = NULL; + int p; + char tmp[2 * sizeof(dev) + 2 * sizeof(ino) + 2]; -#ifdef __ANDROID__ /* there's no /tmp dir on Android */ - len += strlen( config_dir ) + sizeof("/.wineserver"); - dir = malloc( len ); - strcpy( dir, config_dir ); - strcat( dir, "/.wineserver/server-" ); -#else - len += sizeof("/tmp/.wine-") + 12; - dir = malloc( len ); - sprintf( dir, "/tmp/.wine-%u/server-", getuid() ); -#endif - p = dir + strlen( dir ); if (dev != (unsigned long)dev) - p += sprintf( p, "%lx%08lx-", (unsigned long)((unsigned long long)dev >> 32), (unsigned long)dev ); + p = snprintf( tmp, sizeof(tmp), "%lx%08lx-", (unsigned long)((unsigned long long)dev >> 32), (unsigned long)dev ); else - p += sprintf( p, "%lx-", (unsigned long)dev ); + p = snprintf( tmp, sizeof(tmp), "%lx-", (unsigned long)dev ); if (ino != (unsigned long)ino) - sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino ); + snprintf( tmp + p, sizeof(tmp) - p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino ); else - sprintf( p, "%lx", (unsigned long)ino ); + snprintf( tmp + p, sizeof(tmp) - p, "%lx", (unsigned long)ino ); + +#ifdef __ANDROID__ /* there's no /tmp dir on Android */ + asprintf( &dir, "%s/.wineserver/server-%s", config_dir, tmp ); +#else + asprintf( &dir, "/tmp/.wine-%u/server-%s", getuid(), tmp ); +#endif return dir; }

1 0

Alexandre Julliard : include: Use proper dllimports for propsys functions.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: f0b2e0d00c86fb04d47467f39e49c587250ffec5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0b2e0d00c86fb04d47467f39e49c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:23:02 2023 +0100 include: Use proper dllimports for propsys functions. --- dlls/propsys/Makefile.in | 1 + include/propsys.idl | 26 ++++++++++------- include/propvarutil.h | 72 +++++++++++++++++++++++++++--------------------- 3 files changed, 58 insertions(+), 41 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index 4a3e77a6ba5..a8661ca17e9 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_PROPSYS_ MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid diff --git a/include/propsys.idl b/include/propsys.idl index fa6902831e0..4df73640f5e 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -27,7 +27,13 @@ import "shtypes.idl"; import "structuredquerycondition.idl"; cpp_quote("#ifndef PSSTDAPI") -cpp_quote("#define PSSTDAPI EXTERN_C DECLSPEC_IMPORT HRESULT STDAPICALLTYPE") +cpp_quote("#ifdef _PROPSYS_") +cpp_quote("#define PSSTDAPI STDAPI") +cpp_quote("#define PSSTDAPI_(type) STDAPI_(type)") +cpp_quote("#else") +cpp_quote("#define PSSTDAPI DECLSPEC_IMPORT STDAPI") +cpp_quote("#define PSSTDAPI_(type) DECLSPEC_IMPORT STDAPI_(type)") +cpp_quote("#endif") cpp_quote("#endif") cpp_quote("#if 0") @@ -799,15 +805,15 @@ cpp_quote("#define PKEY_PIDSTR_MAX 10") cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") -cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") -cpp_quote("HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown*,DWORD,REFIID,void **);") -cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") -cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") -cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") -cpp_quote("HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") -cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") -cpp_quote("HRESULT WINAPI PSRegisterPropertySchema(LPCWSTR);") -cpp_quote("HRESULT WINAPI PSUnregisterPropertySchema(LPCWSTR);") +cpp_quote("PSSTDAPI PSCreateMemoryPropertyStore(REFIID,void **);") +cpp_quote("PSSTDAPI PSCreatePropertyStoreFromObject(IUnknown*,DWORD,REFIID,void **);") +cpp_quote("PSSTDAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") +cpp_quote("PSSTDAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") +cpp_quote("PSSTDAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") +cpp_quote("PSSTDAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") +cpp_quote("PSSTDAPI PSRefreshPropertySchema(void);") +cpp_quote("PSSTDAPI PSRegisterPropertySchema(LPCWSTR);") +cpp_quote("PSSTDAPI PSUnregisterPropertySchema(LPCWSTR);") /* TODO: Add remainder of the C api here */ diff --git a/include/propvarutil.h b/include/propvarutil.h index 026304e3f15..8bbe0c8fd15 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -27,6 +27,16 @@ typedef LONG NTSTATUS; #endif +#ifndef PSSTDAPI +#ifdef _PROPSYS_ +#define PSSTDAPI STDAPI +#define PSSTDAPI_(type) STDAPI_(type) +#else +#define PSSTDAPI DECLSPEC_IMPORT STDAPI +#define PSSTDAPI_(type) DECLSPEC_IMPORT STDAPI_(type) +#endif +#endif + #ifdef __cplusplus extern "C" { #endif @@ -68,37 +78,37 @@ enum tagPROPVAR_COMPARE_FLAGS typedef int PROPVAR_COMPARE_FLAGS; -HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, +PSSTDAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); -HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); -HRESULT WINAPI InitVariantFromFileTime(const FILETIME *ft, VARIANT *var); -HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); -HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); -HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar); -HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); -HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); -HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); -INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, +PSSTDAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); +PSSTDAPI InitVariantFromFileTime(const FILETIME *ft, VARIANT *var); +PSSTDAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); +PSSTDAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); +PSSTDAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar); +PSSTDAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); +PSSTDAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); +PSSTDAPI VariantToGUID(const VARIANT *pvar, GUID *guid); +PSSTDAPI_(INT) PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); -HRESULT WINAPI InitPropVariantFromFileTime(const FILETIME *pftIn, PROPVARIANT *ppropvar); -HRESULT WINAPI InitPropVariantFromStringVector(PCWSTR *strs, ULONG count, PROPVARIANT *ppropvar); - -HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); -HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret); -HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret); -HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret); -HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); -HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); -ULONG WINAPI PropVariantToUInt32WithDefault(REFPROPVARIANT propvarIn, ULONG uLDefault); -HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); -HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); -HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); -HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); -PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); -PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); -HRESULT WINAPI VariantToString(REFVARIANT var, PWSTR ret, UINT cch); - -HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); +PSSTDAPI InitPropVariantFromFileTime(const FILETIME *pftIn, PROPVARIANT *ppropvar); +PSSTDAPI InitPropVariantFromStringVector(PCWSTR *strs, ULONG count, PROPVARIANT *ppropvar); + +PSSTDAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); +PSSTDAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret); +PSSTDAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret); +PSSTDAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret); +PSSTDAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); +PSSTDAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); +PSSTDAPI_(ULONG) PropVariantToUInt32WithDefault(REFPROPVARIANT propvarIn, ULONG uLDefault); +PSSTDAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); +PSSTDAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +PSSTDAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); +PSSTDAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); +PSSTDAPI_(PCWSTR) PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PSSTDAPI_(PCWSTR) VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); +PSSTDAPI VariantToString(REFVARIANT var, PWSTR ret, UINT cch); + +PSSTDAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); #ifdef __cplusplus @@ -208,8 +218,8 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -HRESULT WINAPI StgSerializePropVariant(const PROPVARIANT *ppropvar, SERIALIZEDPROPERTYVALUE **ppprop, ULONG *pcb); -HRESULT WINAPI StgDeserializePropVariant(const SERIALIZEDPROPERTYVALUE *pprop, ULONG cbmax, PROPVARIANT *ppropvar); +PSSTDAPI StgSerializePropVariant(const PROPVARIANT *ppropvar, SERIALIZEDPROPERTYVALUE **ppprop, ULONG *pcb); +PSSTDAPI StgDeserializePropVariant(const SERIALIZEDPROPERTYVALUE *pprop, ULONG cbmax, PROPVARIANT *ppropvar); #ifdef __cplusplus }

1 0

Alexandre Julliard : include: Use proper dllimports for pathcch functions.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: 526b3cd4367e4c416fd7dff7045e82741a00a52e URL: https://gitlab.winehq.org/wine/wine/-/commit/526b3cd4367e4c416fd7dff7045e82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:21:47 2023 +0100 include: Use proper dllimports for pathcch functions. --- include/pathcch.h | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/include/pathcch.h b/include/pathcch.h index 0c2dc63c41b..72fbe2ad23b 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -26,25 +26,25 @@ #define PATHCCH_MAX_CCH 0x8000 -HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out); -HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out); -HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); -HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); -HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -HRESULT WINAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2); -HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); -HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); -HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); -HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); -HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); -HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); -BOOL WINAPI PathCchIsRoot(const WCHAR *path); -HRESULT WINAPI PathCchRemoveBackslash(WCHAR *path, SIZE_T path_size); -HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size); -HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); -HRESULT WINAPI PathCchRemoveFileSpec(WCHAR *path, SIZE_T size); -HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); -HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); -HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size); -BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server); +WINBASEAPI HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out); +WINBASEAPI HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out); +WINBASEAPI HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); +WINBASEAPI HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); +WINBASEAPI HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +WINBASEAPI HRESULT WINAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2); +WINBASEAPI HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); +WINBASEAPI HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); +WINBASEAPI HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); +WINBASEAPI HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); +WINBASEAPI HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); +WINBASEAPI HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); +WINBASEAPI BOOL WINAPI PathCchIsRoot(const WCHAR *path); +WINBASEAPI HRESULT WINAPI PathCchRemoveBackslash(WCHAR *path, SIZE_T path_size); +WINBASEAPI HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size); +WINBASEAPI HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); +WINBASEAPI HRESULT WINAPI PathCchRemoveFileSpec(WCHAR *path, SIZE_T size); +WINBASEAPI HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +WINBASEAPI HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); +WINBASEAPI HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); +WINBASEAPI HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size); +WINBASEAPI BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server);

1 0

Alexandre Julliard : include: Use proper dllimports for winmm functions.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: a74b1f004328a01d77e37ef76202c494ed98229b URL: https://gitlab.winehq.org/wine/wine/-/commit/a74b1f004328a01d77e37ef76202c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:19:01 2023 +0100 include: Use proper dllimports for winmm functions. --- dlls/winmm/Makefile.in | 1 + include/mmsystem.h | 392 ++++++++++++++++++++++++------------------------- 2 files changed, 195 insertions(+), 198 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for mimeole functions.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: 5bd771d5dcedfe838de45052401e3b1260b7b51f URL: https://gitlab.winehq.org/wine/wine/-/commit/5bd771d5dcedfe838de45052401e3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:17:49 2023 +0100 include: Use proper dllimports for mimeole functions. --- dlls/inetcomm/Makefile.in | 1 + include/mimeole.idl | 180 ++++++++++++++++++++++++---------------------- 2 files changed, 95 insertions(+), 86 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for url functions.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: a36d747bfdb3b771d559c0e9b28d75311a1821be URL: https://gitlab.winehq.org/wine/wine/-/commit/a36d747bfdb3b771d559c0e9b28d75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:15:05 2023 +0100 include: Use proper dllimports for url functions. --- dlls/url/Makefile.in | 1 + include/intshcut.h | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in index 42bea8c95e3..8cfc7f5800a 100644 --- a/dlls/url/Makefile.in +++ b/dlls/url/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_INTSHCUT_ MODULE = url.dll IMPORTLIB = url IMPORTS = shell32 shlwapi diff --git a/include/intshcut.h b/include/intshcut.h index 842a9c07684..870386a3e09 100644 --- a/include/intshcut.h +++ b/include/intshcut.h @@ -21,7 +21,11 @@ #include <isguids.h> +#ifdef _INTSHCUT_ #define INTSHCUTAPI +#else +#define INTSHCUTAPI DECLSPEC_IMPORT +#endif #ifdef __cplusplus extern "C" { @@ -101,11 +105,10 @@ typedef enum translateurl_in_flags { TRANSLATEURL_FL_USE_DEFAULT_PROTOCOL } TRANSLATEURL_IN_FLAGS; -HRESULT WINAPI TranslateURLA(LPCSTR, DWORD, LPSTR *); -HRESULT WINAPI TranslateURLW(LPCWSTR, DWORD, LPWSTR *); +INTSHCUTAPI HRESULT WINAPI TranslateURLA(LPCSTR, DWORD, LPSTR *); +INTSHCUTAPI HRESULT WINAPI TranslateURLW(LPCWSTR, DWORD, LPWSTR *); #define TranslateURL WINELIB_NAME_AW(TranslateURL) - -BOOL WINAPI InetIsOffline(DWORD); +INTSHCUTAPI BOOL WINAPI InetIsOffline(DWORD); #ifdef __cplusplus }

1 0

Alexandre Julliard : include: Use proper dllimports for httpapi functions.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: 18a1d3538c376cd21ed1caf5bc89154f50931456 URL: https://gitlab.winehq.org/wine/wine/-/commit/18a1d3538c376cd21ed1caf5bc8915… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:11:56 2023 +0100 include: Use proper dllimports for httpapi functions. --- dlls/httpapi/httpapi_main.c | 1 + include/http.h | 48 ++++++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index b808b627174..b320e1c1195 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define HTTPAPI_LINKAGE #include "wine/http.h" #include "winsvc.h" #include "winternl.h" diff --git a/include/http.h b/include/http.h index 3ab57f70bf0..ce2a1b0588c 100644 --- a/include/http.h +++ b/include/http.h @@ -28,6 +28,10 @@ extern "C" { #endif +#ifndef HTTPAPI_LINKAGE +#define HTTPAPI_LINKAGE DECLSPEC_IMPORT +#endif + typedef struct _HTTPAPI_VERSION { USHORT HttpApiMajorVersion; @@ -462,28 +466,28 @@ typedef struct _HTTP_QOS_SETTING_INFO void *QosSetting; } HTTP_QOS_SETTING_INFO, *PHTTP_QOS_SETTING_INFO; -ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); -ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved); -ULONG WINAPI HttpCloseRequestQueue(HANDLE handle); -ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); -ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id); -ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); -ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle); -ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); -ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, ULONG reserved); -ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); -ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved); -ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); -ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); -ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); -ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); -ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); -ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); -ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); -ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2); -ULONG WINAPI HttpSetServerSessionProperty(HTTP_SERVER_SESSION_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG size); -ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); -ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length); +HTTPAPI_LINKAGE ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); +HTTPAPI_LINKAGE ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved); +HTTPAPI_LINKAGE ULONG WINAPI HttpCloseRequestQueue(HANDLE handle); +HTTPAPI_LINKAGE ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); +HTTPAPI_LINKAGE ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id); +HTTPAPI_LINKAGE ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); +HTTPAPI_LINKAGE ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle); +HTTPAPI_LINKAGE ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); +HTTPAPI_LINKAGE ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, ULONG reserved); +HTTPAPI_LINKAGE ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); +HTTPAPI_LINKAGE ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved); +HTTPAPI_LINKAGE ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); +HTTPAPI_LINKAGE ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); +HTTPAPI_LINKAGE ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +HTTPAPI_LINKAGE ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +HTTPAPI_LINKAGE ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); +HTTPAPI_LINKAGE ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); +HTTPAPI_LINKAGE ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); +HTTPAPI_LINKAGE ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2); +HTTPAPI_LINKAGE ULONG WINAPI HttpSetServerSessionProperty(HTTP_SERVER_SESSION_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG size); +HTTPAPI_LINKAGE ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); +HTTPAPI_LINKAGE ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length); #ifdef __cplusplus }

1 0

Alexandre Julliard : include: Use proper dllimports for eventlog functions.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: 9db1bbf2516b372cdbe2a1b71d9559e950465411 URL: https://gitlab.winehq.org/wine/wine/-/commit/9db1bbf2516b372cdbe2a1b71d9559… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:09:51 2023 +0100 include: Use proper dllimports for eventlog functions. --- dlls/advapi32/eventlog.c | 1 + dlls/sechost/trace.c | 1 + include/evntprov.h | 20 ++++++++++++-------- include/evntrace.h | 46 +++++++++++++++++++++++++++------------------- 4 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index e2e7bb238eb..58db53f5536 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -27,6 +27,7 @@ #include "winerror.h" #include "winternl.h" #include "wmistr.h" +#define _WMI_SOURCE_ #include "evntrace.h" #include "evntprov.h" diff --git a/dlls/sechost/trace.c b/dlls/sechost/trace.c index 7cefcbbb55f..e9914b69d0b 100644 --- a/dlls/sechost/trace.c +++ b/dlls/sechost/trace.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "wmistr.h" +#define _WMI_SOURCE_ #include "evntrace.h" #include "wine/debug.h" diff --git a/include/evntprov.h b/include/evntprov.h index a89c65fd4b0..5448524f492 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -23,6 +23,10 @@ extern "C" { #endif +#ifndef EVNTAPI +#define EVNTAPI DECLSPEC_IMPORT WINAPI +#endif + #define EVENT_LEVEL_MIN 0x00 #define EVENT_LEVEL_MAX 0xff @@ -67,14 +71,14 @@ typedef enum _EVENT_INFO_CLASS MaxEventInfo } EVENT_INFO_CLASS; -BOOLEAN WINAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); -BOOLEAN WINAPI EventProviderEnabled(REGHANDLE, UCHAR, ULONGLONG); -ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); -ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); -ULONG WINAPI EventUnregister(REGHANDLE); -ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); -ULONG WINAPI EventWriteString(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); -ULONG WINAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR); +BOOLEAN EVNTAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); +BOOLEAN EVNTAPI EventProviderEnabled(REGHANDLE, UCHAR, ULONGLONG); +ULONG EVNTAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); +ULONG EVNTAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); +ULONG EVNTAPI EventUnregister(REGHANDLE); +ULONG EVNTAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); +ULONG EVNTAPI EventWriteString(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); +ULONG EVNTAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR); #ifdef __cplusplus } diff --git a/include/evntrace.h b/include/evntrace.h index 89a6e2ebe34..4620d60b031 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -25,6 +25,14 @@ extern "C" { #endif +#ifndef WMIAPI +#ifdef _WMI_SOURCE_ +#define WMIAPI WINAPI +#else +#define WMIAPI DECLSPEC_IMPORT WINAPI +#endif +#endif + #define EVENT_TRACE_CONTROL_QUERY 0 #define EVENT_TRACE_CONTROL_STOP 1 #define EVENT_TRACE_CONTROL_UPDATE 2 @@ -286,33 +294,33 @@ typedef enum _TRACE_QUERY_INFO_CLASS #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0) -ULONG WINAPI CloseTrace(TRACEHANDLE); -ULONG WINAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); -ULONG WINAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG); +ULONG WMIAPI CloseTrace(TRACEHANDLE); +ULONG WMIAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); +ULONG WMIAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG); #define ControlTrace WINELIB_NAME_AW(ControlTrace) -ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); -ULONG WINAPI EnableTraceEx2(TRACEHANDLE,LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,ULONG,PENABLE_TRACE_PARAMETERS); -ULONG WINAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); -ULONG WINAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); +ULONG WMIAPI EnableTraceEx2(TRACEHANDLE,LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,ULONG,PENABLE_TRACE_PARAMETERS); +ULONG WMIAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define FlushTrace WINELIB_NAME_AW(FlushTrace) -ULONG WINAPI GetTraceEnableFlags(TRACEHANDLE); -UCHAR WINAPI GetTraceEnableLevel(TRACEHANDLE); -TRACEHANDLE WINAPI GetTraceLoggerHandle(PVOID); -ULONG WINAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); -ULONG WINAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); +ULONG WMIAPI GetTraceEnableFlags(TRACEHANDLE); +UCHAR WMIAPI GetTraceEnableLevel(TRACEHANDLE); +TRACEHANDLE WMIAPI GetTraceLoggerHandle(PVOID); +ULONG WMIAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); +ULONG WMIAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); #define QueryAllTraces WINELIB_NAME_AW(QueryAllTraces) -ULONG WINAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCSTR,LPCSTR,PTRACEHANDLE); -ULONG WINAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); +ULONG WMIAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCSTR,LPCSTR,PTRACEHANDLE); +ULONG WMIAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); #define RegisterTraceGuids WINELIB_NAME_AW(RegisterTraceGuids) -ULONG WINAPI StartTraceA(PTRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); -ULONG WINAPI StartTraceW(PTRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI StartTraceA(PTRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); +ULONG WMIAPI StartTraceW(PTRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define StartTrace WINELIB_NAME_AW(StartTrace) -ULONG WINAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); +ULONG WMIAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); ULONG WINAPIV TraceMessage(TRACEHANDLE,ULONG,LPGUID,USHORT,...); #ifdef __ms_va_list -ULONG WINAPI TraceMessageVa(TRACEHANDLE,ULONG,LPGUID,USHORT,__ms_va_list); +ULONG WMIAPI TraceMessageVa(TRACEHANDLE,ULONG,LPGUID,USHORT,__ms_va_list); #endif -ULONG WINAPI UnregisterTraceGuids(TRACEHANDLE); +ULONG WMIAPI UnregisterTraceGuids(TRACEHANDLE); #ifdef __cplusplus }

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
99
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2023