December 2022 - Wine-Commits

Piotr Caban : wineps: Skip EMRI_METAFILE_DATA record silently.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 659b4e511d538feab02390f294ce91a959bb753f URL: https://gitlab.winehq.org/wine/wine/-/commit/659b4e511d538feab02390f294ce91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 17:57:03 2022 +0100 wineps: Skip EMRI_METAFILE_DATA record silently. --- dlls/wineps.drv/printproc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 8b9048c673e..d671035fcb9 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -255,6 +255,12 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) switch (record.ulID) { + case EMRI_METAFILE_DATA: + pos.QuadPart = record.cjSize; + ret = SeekPrinter(spool_data, pos, NULL, FILE_CURRENT, FALSE); + if (!ret) + goto cleanup; + break; default: FIXME("%s not supported, skipping\n", debugstr_rec_type(record.ulID)); pos.QuadPart = record.cjSize;

1 0

Piotr Caban : wineps: Support parsing EMRI_METAFILE_EXT records.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 2c76c73ade2606162fbea4b9bcebd0e5f2245052 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c76c73ade2606162fbea4b9bcebd0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 18:41:49 2022 +0100 wineps: Support parsing EMRI_METAFILE_EXT records. --- dlls/wineps.drv/printproc.c | 75 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index d671035fcb9..b7b4749afcd 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -127,6 +127,55 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } +static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, + const ENHMETARECORD *rec, int n, LPARAM arg) +{ + FIXME("unsupported record: %ld\n", rec->iType); + return 1; +} + +static BOOL print_metafile(struct pp_data *data, HANDLE hdata) +{ + record_hdr header; + HENHMETAFILE hmf; + BYTE *buf; + BOOL ret; + DWORD r; + + if (!ReadPrinter(hdata, &header, sizeof(header), &r)) + return FALSE; + if (r != sizeof(header)) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + buf = malloc(header.cjSize); + if (!buf) + return FALSE; + + if (!ReadPrinter(hdata, buf, header.cjSize, &r)) + { + free(buf); + return FALSE; + } + if (r != header.cjSize) + { + free(buf); + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + hmf = SetEnhMetaFileBits(header.cjSize, buf); + free(buf); + if (!hmf) + return FALSE; + + ret = EnumEnhMetaFile(NULL, hmf, hmf_proc, NULL, NULL); + DeleteEnhMetaFile(hmf); + return ret; +} + BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { @@ -197,9 +246,9 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) { struct pp_data *data = get_handle_data(pp); emfspool_header header; + LARGE_INTEGER pos, cur; record_hdr record; HANDLE spool_data; - LARGE_INTEGER pos; DOC_INFO_1W info; BOOL ret; DWORD r; @@ -261,6 +310,30 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) if (!ret) goto cleanup; break; + case EMRI_METAFILE_EXT: + case EMRI_BW_METAFILE_EXT: + pos.QuadPart = 0; + ret = SeekPrinter(spool_data, pos, &cur, FILE_CURRENT, FALSE); + if (ret) + { + cur.QuadPart += record.cjSize; + ret = ReadPrinter(spool_data, &pos, sizeof(pos), &r); + if (r != sizeof(pos)) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + } + } + pos.QuadPart = -pos.QuadPart - 2 * sizeof(record); + if (ret) + ret = SeekPrinter(spool_data, pos, NULL, FILE_CURRENT, FALSE); + if (ret) + ret = print_metafile(data, spool_data); + if (ret) + ret = SeekPrinter(spool_data, cur, NULL, FILE_BEGIN, FALSE); + if (!ret) + goto cleanup; + break; default: FIXME("%s not supported, skipping\n", debugstr_rec_type(record.ulID)); pos.QuadPart = record.cjSize;

1 0

Piotr Caban : wineps: Add EnumPrintProcessorDatatypesW implementation.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 1bbe86692cf119851a536405aab87ee98135db0c URL: https://gitlab.winehq.org/wine/wine/-/commit/1bbe86692cf119851a536405aab87e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 16:17:18 2022 +0100 wineps: Add EnumPrintProcessorDatatypesW implementation. --- dlls/wineps.drv/printproc.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 287dac9a0cf..3b9f1404c3c 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -31,10 +31,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { - FIXME("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), + static const WCHAR emf_1003[] = L"NT EMF 1.003"; + + DATATYPES_INFO_1W *info = (DATATYPES_INFO_1W *)datatypes; + + TRACE("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), level, datatypes, size, needed, no); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (!needed || !no) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *no = 0; + *needed = sizeof(*info) + sizeof(emf_1003); + + if (level != 1 || (size && !datatypes)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (size < *needed) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + *no = 1; + info->pName = (WCHAR*)(info + 1); + memcpy(info + 1, emf_1003, sizeof(emf_1003)); + return TRUE; } HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data)

1 0

Piotr Caban : wineps: Add OpenPrintProcessor implementation.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 9e9c9c7a2415e0851d862e133548265782356640 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e9c9c7a2415e0851d862e13354826… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 16:22:49 2022 +0100 wineps: Add OpenPrintProcessor implementation. --- dlls/wineps.drv/printproc.c | 75 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 9 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 3b9f1404c3c..613b8752948 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> +#include <stdlib.h> #include <windows.h> #include <winspool.h> @@ -28,11 +28,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +#define PP_MAGIC 0x952173fe + +struct pp_data +{ + DWORD magic; + HANDLE hport; + WCHAR *doc_name; + WCHAR *out_file; +}; + +static const WCHAR emf_1003[] = L"NT EMF 1.003"; + +static struct pp_data* get_handle_data(HANDLE pp) +{ + struct pp_data *ret = (struct pp_data *)pp; + + if (!ret || ret->magic != PP_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + return ret; +} + BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { - static const WCHAR emf_1003[] = L"NT EMF 1.003"; - DATATYPES_INFO_1W *info = (DATATYPES_INFO_1W *)datatypes; TRACE("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), @@ -67,9 +89,33 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) { - FIXME("%s, %p\n", debugstr_w(port), open_data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; + struct pp_data *data; + HANDLE hport; + + TRACE("%s, %p\n", debugstr_w(port), open_data); + + if (!port || !open_data || !open_data->pDatatype) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (wcscmp(open_data->pDatatype, emf_1003)) + { + SetLastError(ERROR_INVALID_DATATYPE); + return NULL; + } + + if (!OpenPrinterW(port, &hport, NULL)) + return NULL; + + data = LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, sizeof(*data)); + if (!data) + return NULL; + data->magic = PP_MAGIC; + data->hport = hport; + data->doc_name = wcsdup(open_data->pDocumentName); + data->out_file = wcsdup(open_data->pOutputFile); + return (HANDLE)data; } BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) @@ -88,7 +134,18 @@ BOOL WINAPI ControlPrintProcessor(HANDLE pp, DWORD cmd) BOOL WINAPI ClosePrintProcessor(HANDLE pp) { - FIXME("%p\n", pp); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct pp_data *data = get_handle_data(pp); + + TRACE("%p\n", pp); + + if (!data) + return FALSE; + + ClosePrinter(data->hport); + free(data->doc_name); + free(data->out_file); + + memset(data, 0, sizeof(*data)); + LocalFree(data); + return TRUE; }

1 0

Piotr Caban : wine.inf: Also install wineps.drv to print processor directory.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 28aa2017d75fe173f629be79c76f6410ff7e6752 URL: https://gitlab.winehq.org/wine/wine/-/commit/28aa2017d75fe173f629be79c76f64… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 16:13:33 2022 +0100 wine.inf: Also install wineps.drv to print processor directory. --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 32a74a5950e..8bd7e448197 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2149,6 +2149,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,msdaps.dll 16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll +55,,wineps.drv 66000,3,wineps.drv 55,,winprint.dll 12,,*.sys,- @@ -2212,6 +2213,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,msdaps.dll 16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll +55,,wineps.drv 66000,3,wineps.drv 55,,winprint.dll 12,,*.sys

1 0

Alexandre Julliard : include: Use proper dllimports for winsock functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 7eef69e1fc840929b32d82466c555411a281c9f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7eef69e1fc840929b32d82466c5554… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 14:24:32 2022 +0100 include: Use proper dllimports for winsock functions. --- dlls/winsock.dll16/socket.c | 3 - dlls/ws2_32/Makefile.in | 1 + include/winsock.h | 96 ++++++++++---------- include/winsock2.h | 208 +++++++++++++++++++++++--------------------- 4 files changed, 161 insertions(+), 147 deletions(-)

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.6.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 891e2f739f44645934818930fe34ba15b37bbfe1 URL: https://gitlab.winehq.org/wine/wine/-/commit/891e2f739f44645934818930fe34ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 16:41:20 2022 +0100 vkd3d: Import upstream release 1.6. --- libs/vkd3d/AUTHORS | 1 + libs/vkd3d/config.h | 4 +- libs/vkd3d/include/private/vkd3d_common.h | 20 +- libs/vkd3d/include/private/vkd3d_debug.h | 1 + libs/vkd3d/include/private/vkd3d_version.h | 2 +- libs/vkd3d/include/vkd3d.h | 1 + libs/vkd3d/include/vkd3d_shader.h | 12 + libs/vkd3d/libs/vkd3d-common/debug.c | 57 +- libs/vkd3d/libs/vkd3d-common/error.c | 2 +- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 17 +- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 266 ++- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 79 +- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 3 + libs/vkd3d/libs/vkd3d-shader/hlsl.y | 835 +++++++--- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 430 ++++- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 18 +- libs/vkd3d/libs/vkd3d-shader/hlsl_sm1.c | 11 +- libs/vkd3d/libs/vkd3d-shader/hlsl_sm4.c | 161 +- libs/vkd3d/libs/vkd3d-shader/spirv.c | 1685 ++++++++++---------- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 40 +- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 16 +- libs/vkd3d/libs/vkd3d/device.c | 3 +- libs/vkd3d/libs/vkd3d/state.c | 4 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 9 - 24 files changed, 2384 insertions(+), 1293 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for shell32 functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 55fc5c8ae812fc0fb5424133b8e8dd733572154e URL: https://gitlab.winehq.org/wine/wine/-/commit/55fc5c8ae812fc0fb5424133b8e8dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 13:50:32 2022 +0100 include: Use proper dllimports for shell32 functions. --- dlls/shell32/Makefile.in | 1 + include/shellapi.h | 133 ++++++++++++----------- include/shlobj.h | 274 ++++++++++++++++++++++++----------------------- include/shobjidl.idl | 33 +++--- 4 files changed, 230 insertions(+), 211 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for winhttp functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 19b4814fd3c49b87fbef78a8ed4bfd949880860f URL: https://gitlab.winehq.org/wine/wine/-/commit/19b4814fd3c49b87fbef78a8ed4bfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 13:31:56 2022 +0100 include: Use proper dllimports for winhttp functions. --- dlls/winhttp/Makefile.in | 1 + include/winhttp.h | 101 +++++++++++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 97266fbc92a..360769a0758 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_WINHTTP_INTERNAL_ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid jsproxy user32 advapi32 ws2_32 diff --git a/include/winhttp.h b/include/winhttp.h index 930c5891f5e..9408c4cbf65 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -25,7 +25,12 @@ #include <pshpack4.h> #endif -#define WINHTTPAPI +#ifdef _WINHTTP_INTERNAL_ +# define WINHTTPAPI +#else +# define WINHTTPAPI DECLSPEC_IMPORT +#endif + #define BOOLAPI WINHTTPAPI BOOL WINAPI @@ -814,53 +819,53 @@ typedef struct _WINHTTP_WEB_SOCKET_STATUS extern "C" { #endif -BOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); -BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); -BOOL WINAPI WinHttpCheckPlatform(void); -BOOL WINAPI WinHttpCloseHandle(HINTERNET); -HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); -BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); -DWORD WINAPI WinHttpCreateProxyResolver(HINTERNET,HINTERNET*); -BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); -VOID WINAPI WinHttpFreeProxyResult(WINHTTP_PROXY_RESULT*); -VOID WINAPI WinHttpFreeProxyResultEx(WINHTTP_PROXY_RESULT_EX*); -VOID WINAPI WinHttpFreeProxySettings(WINHTTP_PROXY_SETTINGS*); -BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); -BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); -DWORD WINAPI WinHttpGetProxyForUrlEx(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD_PTR); -DWORD WINAPI WinHttpGetProxyForUrlEx2(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD,BYTE*,DWORD_PTR); -DWORD WINAPI WinHttpGetProxyResult(HINTERNET,WINHTTP_PROXY_RESULT*); -DWORD WINAPI WinHttpGetProxyResultEx(HINTERNET,WINHTTP_PROXY_RESULT_EX*); -DWORD WINAPI WinHttpGetProxySettingsVersion(HINTERNET,DWORD*); -DWORD WINAPI WinHttpIsHostInProxyBypassList(const WINHTTP_PROXY_INFO*,PCWSTR,INTERNET_SCHEME,INTERNET_PORT,BOOL*); -HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); -HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); -BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); -BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); -BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); -BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); -BOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); -BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); -DWORD WINAPI WinHttpReadProxySettings(HINTERNET,PCWSTR,BOOL,BOOL,DWORD*,BOOL*,WINHTTP_PROXY_SETTINGS*); -BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); -DWORD WINAPI WinHttpResetAutoProxy(HINTERNET,DWORD); -BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); -BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); -BOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); -WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR); -BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); -BOOL WINAPI WinHttpTimeFromSystemTime(const SYSTEMTIME *,LPWSTR); -BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); -DWORD WINAPI WinHttpWebSocketClose(HINTERNET,USHORT,void *,DWORD); -HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade(HINTERNET,DWORD_PTR); -DWORD WINAPI WinHttpWebSocketQueryCloseStatus(HINTERNET,USHORT*,void*,DWORD,DWORD*); -DWORD WINAPI WinHttpWebSocketReceive(HINTERNET,void*,DWORD,DWORD*,WINHTTP_WEB_SOCKET_BUFFER_TYPE*); -DWORD WINAPI WinHttpWebSocketSend(HINTERNET,WINHTTP_WEB_SOCKET_BUFFER_TYPE,void*,DWORD); -DWORD WINAPI WinHttpWebSocketShutdown(HINTERNET,USHORT,void*,DWORD); -BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); -DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,BOOL,WINHTTP_PROXY_SETTINGS*); +WINHTTPAPI BOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); +WINHTTPAPI BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); +WINHTTPAPI BOOL WINAPI WinHttpCheckPlatform(void); +WINHTTPAPI BOOL WINAPI WinHttpCloseHandle(HINTERNET); +WINHTTPAPI HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); +WINHTTPAPI BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); +WINHTTPAPI DWORD WINAPI WinHttpCreateProxyResolver(HINTERNET,HINTERNET*); +WINHTTPAPI BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); +WINHTTPAPI VOID WINAPI WinHttpFreeProxyResult(WINHTTP_PROXY_RESULT*); +WINHTTPAPI VOID WINAPI WinHttpFreeProxyResultEx(WINHTTP_PROXY_RESULT_EX*); +WINHTTPAPI VOID WINAPI WinHttpFreeProxySettings(WINHTTP_PROXY_SETTINGS*); +WINHTTPAPI BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); +WINHTTPAPI BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); +WINHTTPAPI BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); +WINHTTPAPI DWORD WINAPI WinHttpGetProxyForUrlEx(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD_PTR); +WINHTTPAPI DWORD WINAPI WinHttpGetProxyForUrlEx2(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD,BYTE*,DWORD_PTR); +WINHTTPAPI DWORD WINAPI WinHttpGetProxyResult(HINTERNET,WINHTTP_PROXY_RESULT*); +WINHTTPAPI DWORD WINAPI WinHttpGetProxyResultEx(HINTERNET,WINHTTP_PROXY_RESULT_EX*); +WINHTTPAPI DWORD WINAPI WinHttpGetProxySettingsVersion(HINTERNET,DWORD*); +WINHTTPAPI DWORD WINAPI WinHttpIsHostInProxyBypassList(const WINHTTP_PROXY_INFO*,PCWSTR,INTERNET_SCHEME,INTERNET_PORT,BOOL*); +WINHTTPAPI HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); +WINHTTPAPI HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); +WINHTTPAPI BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); +WINHTTPAPI BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); +WINHTTPAPI BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); +WINHTTPAPI BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); +WINHTTPAPI BOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); +WINHTTPAPI BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); +WINHTTPAPI DWORD WINAPI WinHttpReadProxySettings(HINTERNET,PCWSTR,BOOL,BOOL,DWORD*,BOOL*,WINHTTP_PROXY_SETTINGS*); +WINHTTPAPI BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); +WINHTTPAPI DWORD WINAPI WinHttpResetAutoProxy(HINTERNET,DWORD); +WINHTTPAPI BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); +WINHTTPAPI BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); +WINHTTPAPI BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); +WINHTTPAPI BOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); +WINHTTPAPI WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR); +WINHTTPAPI BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); +WINHTTPAPI BOOL WINAPI WinHttpTimeFromSystemTime(const SYSTEMTIME *,LPWSTR); +WINHTTPAPI BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); +WINHTTPAPI DWORD WINAPI WinHttpWebSocketClose(HINTERNET,USHORT,void *,DWORD); +WINHTTPAPI HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade(HINTERNET,DWORD_PTR); +WINHTTPAPI DWORD WINAPI WinHttpWebSocketQueryCloseStatus(HINTERNET,USHORT*,void*,DWORD,DWORD*); +WINHTTPAPI DWORD WINAPI WinHttpWebSocketReceive(HINTERNET,void*,DWORD,DWORD*,WINHTTP_WEB_SOCKET_BUFFER_TYPE*); +WINHTTPAPI DWORD WINAPI WinHttpWebSocketSend(HINTERNET,WINHTTP_WEB_SOCKET_BUFFER_TYPE,void*,DWORD); +WINHTTPAPI DWORD WINAPI WinHttpWebSocketShutdown(HINTERNET,USHORT,void*,DWORD); +WINHTTPAPI BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); +WINHTTPAPI DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,BOOL,WINHTTP_PROXY_SETTINGS*); #ifdef __cplusplus }

1 0

Alexandre Julliard : include: Use proper dllimports for wininet functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 9be166e2517cdfd85c993a6f845c05d46d883c56 URL: https://gitlab.winehq.org/wine/wine/-/commit/9be166e2517cdfd85c993a6f845c05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 14:15:30 2022 +0100 include: Use proper dllimports for wininet functions. --- dlls/wininet/Makefile.in | 1 + include/wininet.h | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 7e8111f811d..5fbb66be50e 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_WININET_INTERNAL_ MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32 diff --git a/include/wininet.h b/include/wininet.h index cef5da15de2..f1c4e312281 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -23,7 +23,14 @@ extern "C" { #endif -#define INTERNETAPI +#ifndef INTERNETAPI +#ifdef _WININET_INTERNAL_ +# define INTERNETAPI +#else +# define INTERNETAPI DECLSPEC_IMPORT +#endif +#endif + #define BOOLAPI INTERNETAPI BOOL WINAPI typedef LPVOID HINTERNET;

1 0