mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 8827eb6a83348057293f89be535ccb74607db608.
This commit is contained in:
Zebediah Figura
parent
480bf20bec
commit
ad66963dff
@ -1,39 +1,25 @@
|
||||
From c097870c69720ece3874ad4ff987408a8c24ffb2 Mon Sep 17 00:00:00 2001
|
||||
From bb64d06b76f761af74d6d7beb94997cc8953ca0d Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 2 Oct 2014 19:53:46 +0200
|
||||
Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
|
||||
|
||||
---
|
||||
dlls/ntdll/Makefile.in | 2 +-
|
||||
libs/wine/Makefile.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
|
||||
index ebf607e9d43..de93445d4e3 100644
|
||||
index 52f63892af6..f9029b49a6f 100644
|
||||
--- a/dlls/ntdll/Makefile.in
|
||||
+++ b/dlls/ntdll/Makefile.in
|
||||
@@ -69,7 +69,7 @@ server_EXTRADEFS = \
|
||||
@@ -81,7 +81,7 @@ unix_loader_EXTRADEFS = \
|
||||
-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
|
||||
|
||||
unix/version.c: dummy
|
||||
- version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
|
||||
+ version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
|
||||
|
||||
dummy:
|
||||
.PHONY: dummy
|
||||
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
|
||||
index fe2a2b45e58..1e55a6b1f46 100644
|
||||
--- a/libs/wine/Makefile.in
|
||||
+++ b/libs/wine/Makefile.in
|
||||
@@ -100,7 +100,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
|
||||
libwine_DEPS = $(LIBWINE_DEPENDS)
|
||||
|
||||
version.c: dummy
|
||||
- version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
|
||||
+ version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
|
||||
|
||||
dummy:
|
||||
.PHONY: dummy
|
||||
--
|
||||
2.26.2
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -1,117 +0,0 @@
|
||||
From eea7dea0e9488f8afc56b880d3d5f67d0b3d9f5c Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 29 May 2014 23:43:45 +0200
|
||||
Subject: [PATCH] loader: Add commandline option --patches to show the patch
|
||||
list.
|
||||
|
||||
---
|
||||
include/wine/library.h | 1 +
|
||||
libs/wine/config.c | 6 ++++++
|
||||
libs/wine/wine.map | 1 +
|
||||
loader/main.c | 42 +++++++++++++++++++++++++++++++++++++++++-
|
||||
4 files changed, 49 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/wine/library.h b/include/wine/library.h
|
||||
index 405ce0d9da3..eecb770b455 100644
|
||||
--- a/include/wine/library.h
|
||||
+++ b/include/wine/library.h
|
||||
@@ -41,6 +41,7 @@ extern "C" {
|
||||
|
||||
/* configuration */
|
||||
|
||||
+extern const void *wine_get_patches(void);
|
||||
extern void wine_init_argv0_path( const char *argv0 );
|
||||
extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
|
||||
|
||||
diff --git a/libs/wine/config.c b/libs/wine/config.c
|
||||
index f5b4c0de9af..e52739d55ad 100644
|
||||
--- a/libs/wine/config.c
|
||||
+++ b/libs/wine/config.c
|
||||
@@ -515,6 +515,12 @@ const char *wine_get_version(void)
|
||||
return PACKAGE_VERSION;
|
||||
}
|
||||
|
||||
+/* return the applied non-standard patches */
|
||||
+const void *wine_get_patches(void)
|
||||
+{
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
/* return the build id string */
|
||||
const char *wine_get_build_id(void)
|
||||
{
|
||||
diff --git a/libs/wine/wine.map b/libs/wine/wine.map
|
||||
index 1143b129734..55f874d3e74 100644
|
||||
--- a/libs/wine/wine.map
|
||||
+++ b/libs/wine/wine.map
|
||||
@@ -13,6 +13,7 @@ WINE_1.0
|
||||
wine_exec_wine_binary;
|
||||
wine_get_build_id;
|
||||
wine_get_version;
|
||||
+ wine_get_patches;
|
||||
wine_init;
|
||||
wine_init_argv0_path;
|
||||
wine_mmap_add_reserved_area;
|
||||
diff --git a/loader/main.c b/loader/main.c
|
||||
index a92276fa412..00b02e23c26 100644
|
||||
--- a/loader/main.c
|
||||
+++ b/loader/main.c
|
||||
@@ -57,7 +57,8 @@ static void check_command_line( int argc, char *argv[] )
|
||||
static const char usage[] =
|
||||
"Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n"
|
||||
" wine --help Display this help and exit\n"
|
||||
- " wine --version Output version information and exit";
|
||||
+ " wine --version Output version information and exit\n"
|
||||
+ " wine --patches Output patch information and exit";
|
||||
|
||||
if (argc <= 1)
|
||||
{
|
||||
@@ -74,6 +75,45 @@ static void check_command_line( int argc, char *argv[] )
|
||||
printf( "%s\n", wine_get_build_id() );
|
||||
exit(0);
|
||||
}
|
||||
+ if (!strcmp( argv[1], "--patches" ))
|
||||
+ {
|
||||
+ const struct
|
||||
+ {
|
||||
+ const char *author;
|
||||
+ const char *subject;
|
||||
+ int revision;
|
||||
+ }
|
||||
+ *next, *cur = wine_get_patches();
|
||||
+
|
||||
+ if (!cur)
|
||||
+ {
|
||||
+ fprintf( stderr, "Patchlist not available.\n" );
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
+ while (cur->author)
|
||||
+ {
|
||||
+ next = cur + 1;
|
||||
+ while (next->author)
|
||||
+ {
|
||||
+ if (strcmp( cur->author, next->author )) break;
|
||||
+ next++;
|
||||
+ }
|
||||
+
|
||||
+ printf( "%s (%d):\n", cur->author, (int)(next - cur) );
|
||||
+ while (cur < next)
|
||||
+ {
|
||||
+ printf( " %s", cur->subject );
|
||||
+ if (cur->revision != 1)
|
||||
+ printf( " [rev %d]", cur->revision );
|
||||
+ printf( "\n" );
|
||||
+ cur++;
|
||||
+ }
|
||||
+ printf( "\n" );
|
||||
+ }
|
||||
+
|
||||
+ exit(0);
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 2674bbd626b4a9e46e5ab729cb47c81950efefea Mon Sep 17 00:00:00 2001
|
||||
From 7fcdf1faa257c90d6452f26ad3a68daca1dd96d1 Mon Sep 17 00:00:00 2001
|
||||
From: Derek Lesho <dlesho@codeweavers.com>
|
||||
Date: Tue, 7 Jan 2020 14:22:49 -0600
|
||||
Subject: [PATCH] bcrypt: Implement BCryptSecretAgreement with libgcrypt.
|
||||
@ -9,15 +9,15 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
|
||||
dlls/bcrypt/Makefile.in | 1 +
|
||||
dlls/bcrypt/bcrypt_internal.h | 6 +
|
||||
dlls/bcrypt/bcrypt_main.c | 54 ++++++-
|
||||
dlls/bcrypt/gcrypt.c | 264 ++++++++++++++++++++++++++++++++++
|
||||
dlls/bcrypt/gcrypt.c | 263 ++++++++++++++++++++++++++++++++++
|
||||
dlls/bcrypt/gnutls.c | 9 ++
|
||||
dlls/bcrypt/macos.c | 6 +
|
||||
dlls/bcrypt/tests/bcrypt.c | 2 +-
|
||||
8 files changed, 350 insertions(+), 6 deletions(-)
|
||||
8 files changed, 349 insertions(+), 6 deletions(-)
|
||||
create mode 100644 dlls/bcrypt/gcrypt.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 928f8ebd1b1..f9db147e7d5 100644
|
||||
index 006087e05ec..b50737a766e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -47,6 +47,7 @@ AC_ARG_WITH(faudio, AS_HELP_STRING([--without-faudio],[do not use FAudio (XAu
|
||||
@ -28,7 +28,7 @@ index 928f8ebd1b1..f9db147e7d5 100644
|
||||
AC_ARG_WITH(gettext, AS_HELP_STRING([--without-gettext],[do not use gettext]))
|
||||
AC_ARG_WITH(gettextpo, AS_HELP_STRING([--with-gettextpo],[use the GetTextPO library to rebuild po files]),
|
||||
[if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi])
|
||||
@@ -2033,6 +2034,19 @@ WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"],
|
||||
@@ -2044,6 +2045,19 @@ WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"],
|
||||
[vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported.])
|
||||
test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no}
|
||||
|
||||
@ -92,10 +92,10 @@ index 43be170d77f..6c93ed78389 100644
|
||||
BOOL is_zero_vector( const UCHAR *, ULONG ) DECLSPEC_HIDDEN;
|
||||
BOOL is_equal_vector( const UCHAR *, ULONG, const UCHAR *, ULONG ) DECLSPEC_HIDDEN;
|
||||
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
|
||||
index bea2001a677..65c28ca63e2 100644
|
||||
index cd3b746e295..7b2a3393902 100644
|
||||
--- a/dlls/bcrypt/bcrypt_main.c
|
||||
+++ b/dlls/bcrypt/bcrypt_main.c
|
||||
@@ -1421,6 +1421,12 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *input, ULONG len )
|
||||
@@ -1425,6 +1425,12 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *input, ULONG len )
|
||||
ERR( "support for keys not available at build time\n" );
|
||||
return STATUS_NOT_IMPLEMENTED;
|
||||
}
|
||||
@ -108,7 +108,7 @@ index bea2001a677..65c28ca63e2 100644
|
||||
#endif
|
||||
|
||||
NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle,
|
||||
@@ -1838,8 +1844,9 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
|
||||
@@ -1842,8 +1848,9 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
|
||||
struct key *privkey = privatekey;
|
||||
struct key *pubkey = publickey;
|
||||
struct secret *secret;
|
||||
@ -119,7 +119,7 @@ index bea2001a677..65c28ca63e2 100644
|
||||
|
||||
if (!privkey || privkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
|
||||
if (!pubkey || pubkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
|
||||
@@ -1848,7 +1855,16 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
|
||||
@@ -1852,7 +1859,16 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
|
||||
if (!(secret = heap_alloc_zero( sizeof(*secret) ))) return STATUS_NO_MEMORY;
|
||||
secret->hdr.magic = MAGIC_SECRET;
|
||||
|
||||
@ -137,7 +137,7 @@ index bea2001a677..65c28ca63e2 100644
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -1856,10 +1872,11 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE handle)
|
||||
@@ -1860,10 +1876,11 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE handle)
|
||||
{
|
||||
struct secret *secret = handle;
|
||||
|
||||
@ -150,7 +150,7 @@ index bea2001a677..65c28ca63e2 100644
|
||||
heap_free( secret );
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
@@ -1869,12 +1886,33 @@ NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCrypt
|
||||
@@ -1873,12 +1890,33 @@ NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCrypt
|
||||
{
|
||||
struct secret *secret = handle;
|
||||
|
||||
@ -186,7 +186,7 @@ index bea2001a677..65c28ca63e2 100644
|
||||
}
|
||||
|
||||
BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
|
||||
@@ -1886,6 +1924,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
|
||||
@@ -1890,6 +1928,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
|
||||
DisableThreadLibraryCalls( hinst );
|
||||
#ifdef HAVE_GNUTLS_CIPHER_INIT
|
||||
gnutls_initialize();
|
||||
@ -196,7 +196,7 @@ index bea2001a677..65c28ca63e2 100644
|
||||
#endif
|
||||
break;
|
||||
|
||||
@@ -1893,6 +1934,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
|
||||
@@ -1897,6 +1938,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
|
||||
if (reserved) break;
|
||||
#ifdef HAVE_GNUTLS_CIPHER_INIT
|
||||
gnutls_uninitialize();
|
||||
@ -208,10 +208,10 @@ index bea2001a677..65c28ca63e2 100644
|
||||
}
|
||||
diff --git a/dlls/bcrypt/gcrypt.c b/dlls/bcrypt/gcrypt.c
|
||||
new file mode 100644
|
||||
index 00000000000..f882d61def8
|
||||
index 00000000000..4e0386a3dda
|
||||
--- /dev/null
|
||||
+++ b/dlls/bcrypt/gcrypt.c
|
||||
@@ -0,0 +1,264 @@
|
||||
@@ -0,0 +1,263 @@
|
||||
+#include "config.h"
|
||||
+#include "wine/port.h"
|
||||
+
|
||||
@ -235,7 +235,6 @@ index 00000000000..f882d61def8
|
||||
+
|
||||
+#include "wine/debug.h"
|
||||
+#include "wine/heap.h"
|
||||
+#include "wine/library.h"
|
||||
+#include "wine/unicode.h"
|
||||
+
|
||||
+#if defined(HAVE_GNUTLS_CIPHER_INIT) && defined(SONAME_LIBGCRYPT)
|
||||
@ -477,10 +476,10 @@ index 00000000000..f882d61def8
|
||||
+}
|
||||
+#endif
|
||||
diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
|
||||
index 19a00e2ee25..1e075fe9994 100644
|
||||
index 7acf8198626..8e5481aecc3 100644
|
||||
--- a/dlls/bcrypt/gnutls.c
|
||||
+++ b/dlls/bcrypt/gnutls.c
|
||||
@@ -1585,4 +1585,13 @@ NTSTATUS key_destroy( struct key *key )
|
||||
@@ -1606,4 +1606,13 @@ NTSTATUS key_destroy( struct key *key )
|
||||
heap_free( key );
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
@ -510,10 +509,10 @@ index 7f902535b8f..6c2a41a0725 100644
|
||||
+}
|
||||
#endif
|
||||
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
|
||||
index eb7a72e0ff4..a351aacf1f5 100644
|
||||
index 7fdc0ac7fb2..5701a0a30ce 100644
|
||||
--- a/dlls/bcrypt/tests/bcrypt.c
|
||||
+++ b/dlls/bcrypt/tests/bcrypt.c
|
||||
@@ -2068,7 +2068,7 @@ static void test_ECDH(void)
|
||||
@@ -2115,7 +2115,7 @@ static void test_ECDH(void)
|
||||
goto raw_secret_end;
|
||||
}
|
||||
|
||||
@ -523,5 +522,5 @@ index eb7a72e0ff4..a351aacf1f5 100644
|
||||
if (status != STATUS_SUCCESS)
|
||||
{
|
||||
--
|
||||
2.27.0
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c5c277e9a6d54ff4b9b22fd9f412401c47a71a4e Mon Sep 17 00:00:00 2001
|
||||
From b56857593bfce8f684953cd4c3356e78100a7ef5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 3 Jan 2015 03:39:11 +0100
|
||||
Subject: [PATCH] nvcuda: First implementation. (rev 2)
|
||||
@ -10,23 +10,23 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/nvcuda/Makefile.in | 1 +
|
||||
dlls/nvcuda/internal.c | 515 ++++++++
|
||||
dlls/nvcuda/nvcuda.c | 2097 ++++++++++++++++++++++++++++++++-
|
||||
dlls/nvcuda/internal.c | 514 ++++++++
|
||||
dlls/nvcuda/nvcuda.c | 2096 ++++++++++++++++++++++++++++++++-
|
||||
dlls/nvcuda/nvcuda.h | 29 +
|
||||
dlls/nvcuda/nvcuda.spec | 492 ++++----
|
||||
dlls/nvcuda/tests/Makefile.in | 4 +
|
||||
dlls/nvcuda/tests/nvcuda.c | 168 +++
|
||||
8 files changed, 3056 insertions(+), 251 deletions(-)
|
||||
8 files changed, 3054 insertions(+), 251 deletions(-)
|
||||
create mode 100644 dlls/nvcuda/internal.c
|
||||
create mode 100644 dlls/nvcuda/nvcuda.h
|
||||
create mode 100644 dlls/nvcuda/tests/Makefile.in
|
||||
create mode 100644 dlls/nvcuda/tests/nvcuda.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2bc340b70..d70d21d94 100644
|
||||
index 7fd6ce83974..7dd3db6bb9f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3544,6 +3544,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests)
|
||||
@@ -3602,6 +3602,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ntprint)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ntprint/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/nvcuda)
|
||||
@ -35,7 +35,7 @@ index 2bc340b70..d70d21d94 100644
|
||||
WINE_CONFIG_MAKEFILE(dlls/odbc32)
|
||||
WINE_CONFIG_MAKEFILE(dlls/odbcbcp)
|
||||
diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in
|
||||
index 4b33278c1..0921ce64c 100644
|
||||
index 4b33278c115..0921ce64cae 100644
|
||||
--- a/dlls/nvcuda/Makefile.in
|
||||
+++ b/dlls/nvcuda/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
@ -48,10 +48,10 @@ index 4b33278c1..0921ce64c 100644
|
||||
RC_SRCS = nvcuda.rc
|
||||
diff --git a/dlls/nvcuda/internal.c b/dlls/nvcuda/internal.c
|
||||
new file mode 100644
|
||||
index 000000000..611e3108d
|
||||
index 00000000000..664bdf84f51
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvcuda/internal.c
|
||||
@@ -0,0 +1,515 @@
|
||||
@@ -0,0 +1,514 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2014-2015 Michael Müller
|
||||
+ * Copyright (C) 2014-2015 Sebastian Lackner
|
||||
@ -79,7 +79,6 @@ index 000000000..611e3108d
|
||||
+
|
||||
+#include "windef.h"
|
||||
+#include "winbase.h"
|
||||
+#include "wine/library.h"
|
||||
+#include "wine/debug.h"
|
||||
+#include "wine/list.h"
|
||||
+#include "cuda.h"
|
||||
@ -568,7 +567,7 @@ index 000000000..611e3108d
|
||||
+ return CUDA_ERROR_UNKNOWN;
|
||||
+}
|
||||
diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c
|
||||
index 8b7eb9c37..3ef7c3505 100644
|
||||
index 8b7eb9c37b0..623c9f3c87a 100644
|
||||
--- a/dlls/nvcuda/nvcuda.c
|
||||
+++ b/dlls/nvcuda/nvcuda.c
|
||||
@@ -1,4 +1,5 @@
|
||||
@ -577,7 +576,7 @@ index 8b7eb9c37..3ef7c3505 100644
|
||||
* Copyright (C) 2014-2015 Sebastian Lackner
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
@@ -17,19 +18,2105 @@
|
||||
@@ -17,19 +18,2104 @@
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
@ -589,7 +588,6 @@ index 8b7eb9c37..3ef7c3505 100644
|
||||
-#include "winbase.h"
|
||||
+#include "windef.h"
|
||||
+#include "winbase.h"
|
||||
+#include "wine/library.h"
|
||||
+#include "wine/debug.h"
|
||||
+#include "wine/wgl.h"
|
||||
+#include "cuda.h"
|
||||
@ -2690,7 +2688,7 @@ index 8b7eb9c37..3ef7c3505 100644
|
||||
|
||||
diff --git a/dlls/nvcuda/nvcuda.h b/dlls/nvcuda/nvcuda.h
|
||||
new file mode 100644
|
||||
index 000000000..aaffe13af
|
||||
index 00000000000..aaffe13af5f
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvcuda/nvcuda.h
|
||||
@@ -0,0 +1,29 @@
|
||||
@ -2724,7 +2722,7 @@ index 000000000..aaffe13af
|
||||
+
|
||||
+#endif
|
||||
diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec
|
||||
index 279f7ab80..621b8d59c 100644
|
||||
index 279f7ab803b..621b8d59cf0 100644
|
||||
--- a/dlls/nvcuda/nvcuda.spec
|
||||
+++ b/dlls/nvcuda/nvcuda.spec
|
||||
@@ -1,36 +1,36 @@
|
||||
@ -3238,7 +3236,7 @@ index 279f7ab80..621b8d59c 100644
|
||||
@ stub cuWGLGetDevice
|
||||
diff --git a/dlls/nvcuda/tests/Makefile.in b/dlls/nvcuda/tests/Makefile.in
|
||||
new file mode 100644
|
||||
index 000000000..81f9290e5
|
||||
index 00000000000..81f9290e5aa
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvcuda/tests/Makefile.in
|
||||
@@ -0,0 +1,4 @@
|
||||
@ -3248,7 +3246,7 @@ index 000000000..81f9290e5
|
||||
+ nvcuda.c
|
||||
diff --git a/dlls/nvcuda/tests/nvcuda.c b/dlls/nvcuda/tests/nvcuda.c
|
||||
new file mode 100644
|
||||
index 000000000..fc8f300a2
|
||||
index 00000000000..fc8f300a28b
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvcuda/tests/nvcuda.c
|
||||
@@ -0,0 +1,168 @@
|
||||
@ -3421,5 +3419,5 @@ index 000000000..fc8f300a2
|
||||
+ test_TlsNotifyInterface();
|
||||
+}
|
||||
--
|
||||
2.24.0
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
From 0d393cfac6d2d4908f40a09565eab989bc71dfab Mon Sep 17 00:00:00 2001
|
||||
From 3693c4416a4d6e938a36a63970d9ae16ac5c38a8 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 22 Jan 2015 01:02:53 +0100
|
||||
Subject: nvcuda: Properly wrap stream callbacks by forwarding them to a worker
|
||||
thread.
|
||||
Subject: [PATCH] nvcuda: Properly wrap stream callbacks by forwarding them to
|
||||
a worker thread.
|
||||
|
||||
---
|
||||
dlls/nvcuda/Makefile.in | 1 +
|
||||
dlls/nvcuda/nvcuda.c | 136 ++++++++++++++++++++++++++++++++++++++++++------
|
||||
dlls/nvcuda/nvcuda.c | 136 +++++++++++++++++++++++++++++++++++-----
|
||||
2 files changed, 122 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in
|
||||
@ -20,10 +20,10 @@ index 0921ce64cae..ab8a5a29a7a 100644
|
||||
C_SRCS = \
|
||||
internal.c \
|
||||
diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c
|
||||
index 9fefc28fa76..8b356fd6f5d 100644
|
||||
index 7b23abe6f90..117d78b6766 100644
|
||||
--- a/dlls/nvcuda/nvcuda.c
|
||||
+++ b/dlls/nvcuda/nvcuda.c
|
||||
@@ -21,11 +21,17 @@
|
||||
@@ -21,10 +21,16 @@
|
||||
#include "wine/port.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
@ -35,13 +35,12 @@ index 9fefc28fa76..8b356fd6f5d 100644
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wine/library.h"
|
||||
#include "wine/debug.h"
|
||||
+#include "wine/list.h"
|
||||
#include "wine/wgl.h"
|
||||
#include "cuda.h"
|
||||
#include "nvcuda.h"
|
||||
@@ -39,6 +45,30 @@
|
||||
@@ -38,6 +44,30 @@
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(nvcuda);
|
||||
|
||||
@ -72,7 +71,7 @@ index 9fefc28fa76..8b356fd6f5d 100644
|
||||
static CUresult (*pcuArray3DCreate)(CUarray *pHandle, const CUDA_ARRAY3D_DESCRIPTOR *pAllocateArray);
|
||||
static CUresult (*pcuArray3DCreate_v2)(CUarray *pHandle, const CUDA_ARRAY3D_DESCRIPTOR *pAllocateArray);
|
||||
static CUresult (*pcuArray3DGetDescriptor)(CUDA_ARRAY3D_DESCRIPTOR *pArrayDescriptor, CUarray hArray);
|
||||
@@ -1793,40 +1823,116 @@ CUresult WINAPI wine_cuPointerSetAttribute(const void *value, CUpointer_attribut
|
||||
@@ -1792,40 +1822,116 @@ CUresult WINAPI wine_cuPointerSetAttribute(const void *value, CUpointer_attribut
|
||||
return pcuPointerSetAttribute(value, attribute, ptr);
|
||||
}
|
||||
|
||||
@ -205,5 +204,5 @@ index 9fefc28fa76..8b356fd6f5d 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.11.0
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 9d4e8c921196c2303812e3673b27f781218943aa Mon Sep 17 00:00:00 2001
|
||||
From 052056600a2161cf975878db4d58877192cf7614 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 7 Mar 2015 06:20:55 +0100
|
||||
Subject: [PATCH] nvcuda: Implement cuModuleLoad wrapper function.
|
||||
@ -10,7 +10,7 @@ Subject: [PATCH] nvcuda: Implement cuModuleLoad wrapper function.
|
||||
3 files changed, 24 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c
|
||||
index e11a1d51a9d..7c296cb6861 100644
|
||||
index 9aab6dda7d8..5d720ebed77 100644
|
||||
--- a/dlls/nvcuda/nvcuda.c
|
||||
+++ b/dlls/nvcuda/nvcuda.c
|
||||
@@ -29,6 +29,7 @@
|
||||
@ -18,10 +18,10 @@ index e11a1d51a9d..7c296cb6861 100644
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
+#include "winnls.h"
|
||||
#include "wine/library.h"
|
||||
#include "wine/debug.h"
|
||||
#include "wine/list.h"
|
||||
@@ -261,6 +262,7 @@ static CUresult (*pcuModuleGetGlobal)(CUdeviceptr *dptr, size_t *bytes, CUmodule
|
||||
#include "wine/wgl.h"
|
||||
@@ -260,6 +261,7 @@ static CUresult (*pcuModuleGetGlobal)(CUdeviceptr *dptr, size_t *bytes, CUmodule
|
||||
static CUresult (*pcuModuleGetGlobal_v2)(CUdeviceptr *dptr, size_t *bytes, CUmodule hmod, const char *name);
|
||||
static CUresult (*pcuModuleGetSurfRef)(CUsurfref *pSurfRef, CUmodule hmod, const char *name);
|
||||
static CUresult (*pcuModuleGetTexRef)(CUtexref *pTexRef, CUmodule hmod, const char *name);
|
||||
@ -29,7 +29,7 @@ index e11a1d51a9d..7c296cb6861 100644
|
||||
static CUresult (*pcuModuleLoadData)(CUmodule *module, const void *image);
|
||||
static CUresult (*pcuModuleLoadDataEx)(CUmodule *module, const void *image, unsigned int numOptions, CUjit_option *options, void **optionValues);
|
||||
static CUresult (*pcuModuleLoadFatBinary)(CUmodule *module, const void *fatCubin);
|
||||
@@ -606,6 +608,7 @@ static BOOL load_functions(void)
|
||||
@@ -605,6 +607,7 @@ static BOOL load_functions(void)
|
||||
LOAD_FUNCPTR(cuModuleGetGlobal_v2);
|
||||
LOAD_FUNCPTR(cuModuleGetSurfRef);
|
||||
LOAD_FUNCPTR(cuModuleGetTexRef);
|
||||
@ -37,7 +37,7 @@ index e11a1d51a9d..7c296cb6861 100644
|
||||
LOAD_FUNCPTR(cuModuleLoadData);
|
||||
LOAD_FUNCPTR(cuModuleLoadDataEx);
|
||||
LOAD_FUNCPTR(cuModuleLoadFatBinary);
|
||||
@@ -1883,6 +1886,25 @@ CUresult WINAPI wine_cuModuleGetTexRef(CUtexref *pTexRef, CUmodule hmod, const c
|
||||
@@ -1882,6 +1885,25 @@ CUresult WINAPI wine_cuModuleGetTexRef(CUtexref *pTexRef, CUmodule hmod, const c
|
||||
return pcuModuleGetTexRef(pTexRef, hmod, name);
|
||||
}
|
||||
|
||||
@ -89,5 +89,5 @@ index 327fe4d8ef3..2bf20f9533e 100644
|
||||
#define CUDA_ERROR_NOT_SUPPORTED 801
|
||||
#define CUDA_ERROR_UNKNOWN 999
|
||||
--
|
||||
2.27.0
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 3519cb4a7b8bb9c9bbf3dacbd9e6766b48dd121b Mon Sep 17 00:00:00 2001
|
||||
From c279f033d866661f9c2d7e090669a27c836b0579 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Tue, 6 Jan 2015 05:16:36 +0100
|
||||
Subject: [PATCH] nvcuvid: First implementation. (rev 2)
|
||||
@ -8,12 +8,12 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/nvcuvid/Makefile.in | 4 +
|
||||
dlls/nvcuvid/nvcuvid.c | 513 ++++++++++++++++++++++++++++++++++++++
|
||||
dlls/nvcuvid/nvcuvid.c | 512 ++++++++++++++++++++++++++++++++++++++
|
||||
dlls/nvcuvid/nvcuvid.spec | 24 ++
|
||||
include/Makefile.in | 2 +
|
||||
include/cuviddec.h | 99 ++++++++
|
||||
include/nvcuvid.h | 79 ++++++
|
||||
7 files changed, 722 insertions(+)
|
||||
7 files changed, 721 insertions(+)
|
||||
create mode 100644 dlls/nvcuvid/Makefile.in
|
||||
create mode 100644 dlls/nvcuvid/nvcuvid.c
|
||||
create mode 100644 dlls/nvcuvid/nvcuvid.spec
|
||||
@ -21,10 +21,10 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
|
||||
create mode 100644 include/nvcuvid.h
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e0d4af5b9d8..14bd257d826 100644
|
||||
index d449af00211..a278e6d30ac 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3589,6 +3589,7 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi/tests)
|
||||
@@ -3612,6 +3612,7 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
|
||||
WINE_CONFIG_MAKEFILE(dlls/nvcuda)
|
||||
WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests)
|
||||
@ -44,10 +44,10 @@ index 00000000000..2c2dc8ccf67
|
||||
+ nvcuvid.c
|
||||
diff --git a/dlls/nvcuvid/nvcuvid.c b/dlls/nvcuvid/nvcuvid.c
|
||||
new file mode 100644
|
||||
index 00000000000..a586c15eafb
|
||||
index 00000000000..616f883c329
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvcuvid/nvcuvid.c
|
||||
@@ -0,0 +1,513 @@
|
||||
@@ -0,0 +1,512 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2015 Michael Müller
|
||||
+ *
|
||||
@ -74,7 +74,6 @@ index 00000000000..a586c15eafb
|
||||
+#include "windef.h"
|
||||
+#include "winbase.h"
|
||||
+#include "winnls.h"
|
||||
+#include "wine/library.h"
|
||||
+#include "wine/debug.h"
|
||||
+#include "nvcuvid.h"
|
||||
+
|
||||
@ -592,10 +591,10 @@ index 00000000000..433e7db3b7e
|
||||
+@ stdcall cuvidSetVideoSourceState(ptr long) wine_cuvidSetVideoSourceState
|
||||
+@ stdcall cuvidUnmapVideoFrame(ptr long) wine_cuvidUnmapVideoFrame
|
||||
diff --git a/include/Makefile.in b/include/Makefile.in
|
||||
index 3bb3f938747..3db2e16be76 100644
|
||||
index 34daad90e78..22ed27ed968 100644
|
||||
--- a/include/Makefile.in
|
||||
+++ b/include/Makefile.in
|
||||
@@ -87,6 +87,7 @@ SOURCES = \
|
||||
@@ -88,6 +88,7 @@ SOURCES = \
|
||||
ctxtcall.idl \
|
||||
cuda.h \
|
||||
custcntl.h \
|
||||
@ -603,7 +602,7 @@ index 3bb3f938747..3db2e16be76 100644
|
||||
cvconst.h \
|
||||
d2d1.idl \
|
||||
d2d1_1.idl \
|
||||
@@ -527,6 +528,7 @@ SOURCES = \
|
||||
@@ -530,6 +531,7 @@ SOURCES = \
|
||||
ntsecpkg.h \
|
||||
ntstatus.h \
|
||||
nvapi.h \
|
||||
@ -802,5 +801,5 @@ index 00000000000..a192ef64c2e
|
||||
+
|
||||
+#endif /* __WINE_NVCUVID_H */
|
||||
--
|
||||
2.27.0
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From aaf02d5e9c8e3d5d90ac3a1bae16df9669385011 Mon Sep 17 00:00:00 2001
|
||||
From 12499caabc7010d8ba89f3886ecdadd636cbc123 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 8 Feb 2015 06:10:26 +0100
|
||||
Subject: [PATCH] nvencodeapi: First implementation.
|
||||
@ -6,13 +6,13 @@ Subject: [PATCH] nvencodeapi: First implementation.
|
||||
---
|
||||
configure.ac | 2 +
|
||||
dlls/nvencodeapi/Makefile.in | 4 +
|
||||
dlls/nvencodeapi/nvencodeapi.c | 370 ++++++++++++++++++++++++++
|
||||
dlls/nvencodeapi/nvencodeapi.c | 369 ++++++++++++++++++++++++++
|
||||
dlls/nvencodeapi/nvencodeapi.spec | 1 +
|
||||
dlls/nvencodeapi64/Makefile.in | 5 +
|
||||
dlls/nvencodeapi64/nvencodeapi64.spec | 1 +
|
||||
include/Makefile.in | 1 +
|
||||
include/nvencodeapi.h | 281 +++++++++++++++++++
|
||||
8 files changed, 665 insertions(+)
|
||||
include/nvencodeapi.h | 281 ++++++++++++++++++++
|
||||
8 files changed, 664 insertions(+)
|
||||
create mode 100644 dlls/nvencodeapi/Makefile.in
|
||||
create mode 100644 dlls/nvencodeapi/nvencodeapi.c
|
||||
create mode 100644 dlls/nvencodeapi/nvencodeapi.spec
|
||||
@ -21,10 +21,10 @@ Subject: [PATCH] nvencodeapi: First implementation.
|
||||
create mode 100644 include/nvencodeapi.h
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 326d03975..a2f06d7ff 100644
|
||||
index a278e6d30ac..3df3fb9ae18 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3555,6 +3555,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
|
||||
@@ -3613,6 +3613,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
|
||||
WINE_CONFIG_MAKEFILE(dlls/nvcuda)
|
||||
WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/nvcuvid)
|
||||
@ -35,7 +35,7 @@ index 326d03975..a2f06d7ff 100644
|
||||
WINE_CONFIG_MAKEFILE(dlls/odbcbcp)
|
||||
diff --git a/dlls/nvencodeapi/Makefile.in b/dlls/nvencodeapi/Makefile.in
|
||||
new file mode 100644
|
||||
index 000000000..a2e58acaf
|
||||
index 00000000000..a2e58acaf0d
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvencodeapi/Makefile.in
|
||||
@@ -0,0 +1,4 @@
|
||||
@ -45,10 +45,10 @@ index 000000000..a2e58acaf
|
||||
+ nvencodeapi.c
|
||||
diff --git a/dlls/nvencodeapi/nvencodeapi.c b/dlls/nvencodeapi/nvencodeapi.c
|
||||
new file mode 100644
|
||||
index 000000000..91a33fd58
|
||||
index 00000000000..40be216485f
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvencodeapi/nvencodeapi.c
|
||||
@@ -0,0 +1,370 @@
|
||||
@@ -0,0 +1,369 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2015 Michael Müller
|
||||
+ *
|
||||
@ -75,7 +75,6 @@ index 000000000..91a33fd58
|
||||
+#include "windef.h"
|
||||
+#include "winbase.h"
|
||||
+#include "wine/debug.h"
|
||||
+#include "wine/library.h"
|
||||
+
|
||||
+#include "nvencodeapi.h"
|
||||
+
|
||||
@ -421,14 +420,14 @@ index 000000000..91a33fd58
|
||||
+}
|
||||
diff --git a/dlls/nvencodeapi/nvencodeapi.spec b/dlls/nvencodeapi/nvencodeapi.spec
|
||||
new file mode 100644
|
||||
index 000000000..11d74e82d
|
||||
index 00000000000..11d74e82d99
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvencodeapi/nvencodeapi.spec
|
||||
@@ -0,0 +1 @@
|
||||
+@ stdcall NvEncodeAPICreateInstance(ptr)
|
||||
diff --git a/dlls/nvencodeapi64/Makefile.in b/dlls/nvencodeapi64/Makefile.in
|
||||
new file mode 100644
|
||||
index 000000000..8297ec352
|
||||
index 00000000000..8297ec352b5
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvencodeapi64/Makefile.in
|
||||
@@ -0,0 +1,5 @@
|
||||
@ -439,16 +438,16 @@ index 000000000..8297ec352
|
||||
+ nvencodeapi.c
|
||||
diff --git a/dlls/nvencodeapi64/nvencodeapi64.spec b/dlls/nvencodeapi64/nvencodeapi64.spec
|
||||
new file mode 100644
|
||||
index 000000000..11d74e82d
|
||||
index 00000000000..11d74e82d99
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvencodeapi64/nvencodeapi64.spec
|
||||
@@ -0,0 +1 @@
|
||||
+@ stdcall NvEncodeAPICreateInstance(ptr)
|
||||
diff --git a/include/Makefile.in b/include/Makefile.in
|
||||
index c38dd2ad1..5b21ec0df 100644
|
||||
index 22ed27ed968..667b4640d80 100644
|
||||
--- a/include/Makefile.in
|
||||
+++ b/include/Makefile.in
|
||||
@@ -500,6 +500,7 @@ SOURCES = \
|
||||
@@ -532,6 +532,7 @@ SOURCES = \
|
||||
ntstatus.h \
|
||||
nvapi.h \
|
||||
nvcuvid.h \
|
||||
@ -458,7 +457,7 @@ index c38dd2ad1..5b21ec0df 100644
|
||||
objectarray.idl \
|
||||
diff --git a/include/nvencodeapi.h b/include/nvencodeapi.h
|
||||
new file mode 100644
|
||||
index 000000000..45e9fb97f
|
||||
index 00000000000..45e9fb97f16
|
||||
--- /dev/null
|
||||
+++ b/include/nvencodeapi.h
|
||||
@@ -0,0 +1,281 @@
|
||||
@ -744,5 +743,5 @@ index 000000000..45e9fb97f
|
||||
+
|
||||
+#endif /* __WINE_NVENCODEAPI_H */
|
||||
--
|
||||
2.24.0
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "7ec069d85f5235db98e57291825b9d602ae47ed5"
|
||||
echo "8827eb6a83348057293f89be535ccb74607db608"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -1846,17 +1846,14 @@ fi
|
||||
# | * ntdll-FLS_Callbacks
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/Makefile.in, dlls/ntdll/loader.c, include/wine/library.h, libs/wine/Makefile.in, libs/wine/config.c,
|
||||
# | libs/wine/wine.map, loader/main.c
|
||||
# | * dlls/ntdll/Makefile.in, dlls/ntdll/loader.c
|
||||
# |
|
||||
if test "$enable_Staging" -eq 1; then
|
||||
patch_apply Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch
|
||||
patch_apply Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch
|
||||
patch_apply Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "ntdll: Print a warning message specifying the wine-staging branch name and version.", 1 },';
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "winelib: Append '\''(Staging)'\'' at the end of the version string.", 1 },';
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "loader: Add commandline option --patches to show the patch list.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 661d9d1f1f04ae904f4420f4a067fc23dae45c6f Mon Sep 17 00:00:00 2001
|
||||
From 6c7e1cd9d421fef33c4e89e17c4e269af4a53f8a Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Akulinchev <ivan.akulinchev@gmail.com>
|
||||
Date: Sat, 9 Feb 2019 15:18:54 -0600
|
||||
Subject: [PATCH 1/2] uxtheme: Initial implementation of GTK backend.
|
||||
Subject: [PATCH] uxtheme: Initial implementation of GTK backend.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
@ -35,13 +35,13 @@ Additional changes by Sebastian Lackner <sebastian@fds-team.de>:
|
||||
dlls/uxtheme/gtk-toolbar.c | 171 +++++++
|
||||
dlls/uxtheme/gtk-trackbar.c | 188 +++++++
|
||||
dlls/uxtheme/gtk-window.c | 172 +++++++
|
||||
dlls/uxtheme/gtk.c | 962 ++++++++++++++++++++++++++++++++++++
|
||||
dlls/uxtheme/gtk.c | 961 ++++++++++++++++++++++++++++++++++++
|
||||
dlls/uxtheme/metric.c | 24 +
|
||||
dlls/uxtheme/property.c | 40 ++
|
||||
dlls/uxtheme/system.c | 34 +-
|
||||
dlls/uxtheme/uxthemedll.h | 72 +++
|
||||
dlls/uxtheme/uxthemegtk.h | 129 +++++
|
||||
22 files changed, 3761 insertions(+), 1 deletion(-)
|
||||
22 files changed, 3760 insertions(+), 1 deletion(-)
|
||||
create mode 100644 dlls/uxtheme/gtk-button.c
|
||||
create mode 100644 dlls/uxtheme/gtk-combobox.c
|
||||
create mode 100644 dlls/uxtheme/gtk-edit.c
|
||||
@ -59,10 +59,10 @@ Additional changes by Sebastian Lackner <sebastian@fds-team.de>:
|
||||
create mode 100644 dlls/uxtheme/uxthemegtk.h
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1c912a30a..c4373aeb2 100644
|
||||
index 006087e05ec..cf5a6fa1b44 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -56,6 +56,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06
|
||||
@@ -57,6 +57,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06
|
||||
[if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi])
|
||||
AC_ARG_WITH(gssapi, AS_HELP_STRING([--without-gssapi],[do not use GSSAPI (Kerberos SSP support)]))
|
||||
AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreamer (codecs support)]))
|
||||
@ -70,7 +70,7 @@ index 1c912a30a..c4373aeb2 100644
|
||||
AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
|
||||
AC_ARG_WITH(inotify, AS_HELP_STRING([--without-inotify],[do not use inotify (filesystem change notifications)]))
|
||||
AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG]))
|
||||
@@ -1539,6 +1540,21 @@ fi
|
||||
@@ -1606,6 +1607,21 @@ fi
|
||||
WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms2_cmsOpenProfileFromFile" != "yes"],
|
||||
[liblcms2 ${notice_platform}development files not found, Color Management won't be supported.])
|
||||
|
||||
@ -93,7 +93,7 @@ index 1c912a30a..c4373aeb2 100644
|
||||
if test "x$with_freetype" != "xno"
|
||||
then
|
||||
diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
|
||||
index c3fff30ba..e09f891ee 100644
|
||||
index c3fff30ba90..e09f891ee48 100644
|
||||
--- a/dlls/uxtheme/Makefile.in
|
||||
+++ b/dlls/uxtheme/Makefile.in
|
||||
@@ -2,10 +2,25 @@ MODULE = uxtheme.dll
|
||||
@ -123,7 +123,7 @@ index c3fff30ba..e09f891ee 100644
|
||||
metric.c \
|
||||
msstyles.c \
|
||||
diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
|
||||
index 69c53b9eb..dbcbaab79 100644
|
||||
index 69c53b9ebc3..dbcbaab79b1 100644
|
||||
--- a/dlls/uxtheme/draw.c
|
||||
+++ b/dlls/uxtheme/draw.c
|
||||
@@ -55,6 +55,10 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags)
|
||||
@ -221,7 +221,7 @@ index 69c53b9eb..dbcbaab79 100644
|
||||
if (bgtype != BT_IMAGEFILE) return FALSE;
|
||||
diff --git a/dlls/uxtheme/gtk-button.c b/dlls/uxtheme/gtk-button.c
|
||||
new file mode 100644
|
||||
index 000000000..1e8581c77
|
||||
index 00000000000..1e8581c77eb
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-button.c
|
||||
@@ -0,0 +1,516 @@
|
||||
@ -743,7 +743,7 @@ index 000000000..1e8581c77
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-combobox.c b/dlls/uxtheme/gtk-combobox.c
|
||||
new file mode 100644
|
||||
index 000000000..f6cc04055
|
||||
index 00000000000..f6cc0405587
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-combobox.c
|
||||
@@ -0,0 +1,242 @@
|
||||
@ -991,7 +991,7 @@ index 000000000..f6cc04055
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-edit.c b/dlls/uxtheme/gtk-edit.c
|
||||
new file mode 100644
|
||||
index 000000000..834a3889c
|
||||
index 00000000000..834a3889c5c
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-edit.c
|
||||
@@ -0,0 +1,211 @@
|
||||
@ -1208,7 +1208,7 @@ index 000000000..834a3889c
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-header.c b/dlls/uxtheme/gtk-header.c
|
||||
new file mode 100644
|
||||
index 000000000..c95918db2
|
||||
index 00000000000..c95918db2ef
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-header.c
|
||||
@@ -0,0 +1,128 @@
|
||||
@ -1342,7 +1342,7 @@ index 000000000..c95918db2
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-listbox.c b/dlls/uxtheme/gtk-listbox.c
|
||||
new file mode 100644
|
||||
index 000000000..89b281ded
|
||||
index 00000000000..89b281ded41
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-listbox.c
|
||||
@@ -0,0 +1,119 @@
|
||||
@ -1467,7 +1467,7 @@ index 000000000..89b281ded
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-listview.c b/dlls/uxtheme/gtk-listview.c
|
||||
new file mode 100644
|
||||
index 000000000..fbc85fdcc
|
||||
index 00000000000..fbc85fdccce
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-listview.c
|
||||
@@ -0,0 +1,38 @@
|
||||
@ -1511,7 +1511,7 @@ index 000000000..fbc85fdcc
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-menu.c b/dlls/uxtheme/gtk-menu.c
|
||||
new file mode 100644
|
||||
index 000000000..30357bc85
|
||||
index 00000000000..30357bc85f4
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-menu.c
|
||||
@@ -0,0 +1,189 @@
|
||||
@ -1706,7 +1706,7 @@ index 000000000..30357bc85
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-rebar.c b/dlls/uxtheme/gtk-rebar.c
|
||||
new file mode 100644
|
||||
index 000000000..493b05b6f
|
||||
index 00000000000..493b05b6ff1
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-rebar.c
|
||||
@@ -0,0 +1,102 @@
|
||||
@ -1814,7 +1814,7 @@ index 000000000..493b05b6f
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-status.c b/dlls/uxtheme/gtk-status.c
|
||||
new file mode 100644
|
||||
index 000000000..558a8227c
|
||||
index 00000000000..558a8227c42
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-status.c
|
||||
@@ -0,0 +1,157 @@
|
||||
@ -1977,7 +1977,7 @@ index 000000000..558a8227c
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-tab.c b/dlls/uxtheme/gtk-tab.c
|
||||
new file mode 100644
|
||||
index 000000000..845dbec1a
|
||||
index 00000000000..845dbec1a65
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-tab.c
|
||||
@@ -0,0 +1,207 @@
|
||||
@ -2190,7 +2190,7 @@ index 000000000..845dbec1a
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-toolbar.c b/dlls/uxtheme/gtk-toolbar.c
|
||||
new file mode 100644
|
||||
index 000000000..231fffe73
|
||||
index 00000000000..231fffe7335
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-toolbar.c
|
||||
@@ -0,0 +1,171 @@
|
||||
@ -2367,7 +2367,7 @@ index 000000000..231fffe73
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-trackbar.c b/dlls/uxtheme/gtk-trackbar.c
|
||||
new file mode 100644
|
||||
index 000000000..0bd4c2d1d
|
||||
index 00000000000..0bd4c2d1dd2
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-trackbar.c
|
||||
@@ -0,0 +1,188 @@
|
||||
@ -2561,7 +2561,7 @@ index 000000000..0bd4c2d1d
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk-window.c b/dlls/uxtheme/gtk-window.c
|
||||
new file mode 100644
|
||||
index 000000000..2c4b40074
|
||||
index 00000000000..2c4b4007402
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk-window.c
|
||||
@@ -0,0 +1,172 @@
|
||||
@ -2739,10 +2739,10 @@ index 000000000..2c4b40074
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/gtk.c b/dlls/uxtheme/gtk.c
|
||||
new file mode 100644
|
||||
index 000000000..ddaa96496
|
||||
index 00000000000..17cee005d5a
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/gtk.c
|
||||
@@ -0,0 +1,962 @@
|
||||
@@ -0,0 +1,961 @@
|
||||
+/*
|
||||
+ * GTK uxtheme implementation
|
||||
+ *
|
||||
@ -2780,7 +2780,6 @@ index 000000000..ddaa96496
|
||||
+#include "vssym32.h"
|
||||
+
|
||||
+#include "wine/debug.h"
|
||||
+#include "wine/library.h"
|
||||
+
|
||||
+#include "uxthemedll.h"
|
||||
+
|
||||
@ -3706,7 +3705,7 @@ index 000000000..ddaa96496
|
||||
+
|
||||
+#endif /* HAVE_GTK_GTK_H */
|
||||
diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c
|
||||
index 073422f1c..244187d19 100644
|
||||
index 073422f1cda..244187d1963 100644
|
||||
--- a/dlls/uxtheme/metric.c
|
||||
+++ b/dlls/uxtheme/metric.c
|
||||
@@ -31,6 +31,7 @@
|
||||
@ -3783,7 +3782,7 @@ index 073422f1c..244187d19 100644
|
||||
WARN("Unknown StringID: %d\n", iStringID);
|
||||
return STG_E_INVALIDPARAMETER;
|
||||
diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c
|
||||
index 0e077aeec..ada482879 100644
|
||||
index 0e077aeec46..ada48287952 100644
|
||||
--- a/dlls/uxtheme/property.c
|
||||
+++ b/dlls/uxtheme/property.c
|
||||
@@ -31,6 +31,7 @@
|
||||
@ -3925,7 +3924,7 @@ index 0e077aeec..ada482879 100644
|
||||
*pOrigin = PO_NOTFOUND;
|
||||
return S_OK;
|
||||
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
|
||||
index c898ad32e..2f7d40fc0 100644
|
||||
index c898ad32e2f..2f7d40fc011 100644
|
||||
--- a/dlls/uxtheme/system.c
|
||||
+++ b/dlls/uxtheme/system.c
|
||||
@@ -558,6 +558,10 @@ BOOL WINAPI IsAppThemed(void)
|
||||
@ -4033,7 +4032,7 @@ index c898ad32e..2f7d40fc0 100644
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h
|
||||
index fee152c9c..cdc5958d7 100644
|
||||
index fee152c9c34..cdc5958d7c7 100644
|
||||
--- a/dlls/uxtheme/uxthemedll.h
|
||||
+++ b/dlls/uxtheme/uxthemedll.h
|
||||
@@ -21,6 +21,14 @@
|
||||
@ -4124,7 +4123,7 @@ index fee152c9c..cdc5958d7 100644
|
||||
/* "Cheap" binary alpha blending - but possibly faster */
|
||||
diff --git a/dlls/uxtheme/uxthemegtk.h b/dlls/uxtheme/uxthemegtk.h
|
||||
new file mode 100644
|
||||
index 000000000..87cd0456f
|
||||
index 00000000000..87cd0456f8d
|
||||
--- /dev/null
|
||||
+++ b/dlls/uxtheme/uxthemegtk.h
|
||||
@@ -0,0 +1,129 @@
|
||||
@ -4258,5 +4257,5 @@ index 000000000..87cd0456f
|
||||
+
|
||||
+#endif /* UXTHEMEGTK_H */
|
||||
--
|
||||
2.23.0
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 90ebd2a601712db291079151491b2f0f6ddba70b Mon Sep 17 00:00:00 2001
|
||||
From 317c7d9b27c4ebc9184e5225f505bb1ca782f464 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
|
||||
Date: Tue, 26 Aug 2014 00:59:37 +0200
|
||||
Subject: [PATCH] wpcap: Load libpcap dynamically.
|
||||
@ -8,14 +8,14 @@ Something we don't want i guess.
|
||||
---
|
||||
configure.ac | 4 +-
|
||||
dlls/wpcap/Makefile.in | 1 -
|
||||
dlls/wpcap/wpcap.c | 173 ++++++++++++++++++++++++++++++++---------
|
||||
3 files changed, 140 insertions(+), 38 deletions(-)
|
||||
dlls/wpcap/wpcap.c | 172 ++++++++++++++++++++++++++++++++---------
|
||||
3 files changed, 139 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c58d34330..9e8066e93 100644
|
||||
index 006087e05ec..30d67574e26 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1317,9 +1317,9 @@ WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes],
|
||||
@@ -1370,9 +1370,9 @@ WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes],
|
||||
dnl **** Check for libpcap ****
|
||||
if test "$ac_cv_header_pcap_pcap_h" = "yes"
|
||||
then
|
||||
@ -28,7 +28,7 @@ index c58d34330..9e8066e93 100644
|
||||
[enable_wpcap])
|
||||
|
||||
diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in
|
||||
index 91b4a9559..aeef71a46 100644
|
||||
index 91b4a955911..aeef71a46e5 100644
|
||||
--- a/dlls/wpcap/Makefile.in
|
||||
+++ b/dlls/wpcap/Makefile.in
|
||||
@@ -1,6 +1,5 @@
|
||||
@ -39,20 +39,19 @@ index 91b4a9559..aeef71a46 100644
|
||||
C_SRCS = \
|
||||
wpcap.c
|
||||
diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c
|
||||
index d2f1be7a3..c355fc6e1 100644
|
||||
index d2f1be7a312..67d3b789a41 100644
|
||||
--- a/dlls/wpcap/wpcap.c
|
||||
+++ b/dlls/wpcap/wpcap.c
|
||||
@@ -18,6 +18,9 @@
|
||||
@@ -18,6 +18,8 @@
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
+#include "wine/port.h"
|
||||
+#include "wine/library.h"
|
||||
#include <pcap/pcap.h>
|
||||
|
||||
/* pcap.h might define those: */
|
||||
@@ -63,47 +66,128 @@ static inline WCHAR *heap_strdupAtoW(const char *str)
|
||||
@@ -63,47 +65,128 @@ static inline WCHAR *heap_strdupAtoW(const char *str)
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -188,7 +187,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
}
|
||||
|
||||
typedef struct
|
||||
@@ -132,10 +216,10 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt,
|
||||
@@ -132,10 +215,10 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt,
|
||||
PCAP_HANDLER_CALLBACK pcb;
|
||||
pcb.pfn_cb = callback;
|
||||
pcb.user_data = user;
|
||||
@ -201,7 +200,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
}
|
||||
|
||||
int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf)
|
||||
@@ -143,7 +227,7 @@ int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf)
|
||||
@@ -143,7 +226,7 @@ int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf)
|
||||
int ret;
|
||||
|
||||
TRACE("(%p %p)\n", alldevsp, errbuf);
|
||||
@ -210,7 +209,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
if(alldevsp && !*alldevsp)
|
||||
ERR_(winediag)("Failed to access raw network (pcap), this requires special permissions.\n");
|
||||
|
||||
@@ -159,13 +243,13 @@ int CDECL wine_pcap_findalldevs_ex(char *source, void *auth, pcap_if_t **alldevs
|
||||
@@ -159,13 +242,13 @@ int CDECL wine_pcap_findalldevs_ex(char *source, void *auth, pcap_if_t **alldevs
|
||||
void CDECL wine_pcap_freealldevs(pcap_if_t *alldevs)
|
||||
{
|
||||
TRACE("(%p)\n", alldevs);
|
||||
@ -226,7 +225,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
}
|
||||
|
||||
typedef struct _AirpcapHandle *PAirpcapHandle;
|
||||
@@ -178,18 +262,18 @@ PAirpcapHandle CDECL wine_pcap_get_airpcap_handle(pcap_t *p)
|
||||
@@ -178,18 +261,18 @@ PAirpcapHandle CDECL wine_pcap_get_airpcap_handle(pcap_t *p)
|
||||
char* CDECL wine_pcap_geterr(pcap_t *p)
|
||||
{
|
||||
TRACE("(%p)\n", p);
|
||||
@ -248,7 +247,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
TRACE("%s\n", debugstr_a(ret));
|
||||
return ret;
|
||||
}
|
||||
@@ -197,7 +281,7 @@ const char* CDECL wine_pcap_lib_version(void)
|
||||
@@ -197,7 +280,7 @@ const char* CDECL wine_pcap_lib_version(void)
|
||||
int CDECL wine_pcap_list_datalinks(pcap_t *p, int **dlt_buffer)
|
||||
{
|
||||
TRACE("(%p %p)\n", p, dlt_buffer);
|
||||
@ -257,7 +256,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
}
|
||||
|
||||
char* CDECL wine_pcap_lookupdev(char *errbuf)
|
||||
@@ -208,10 +292,10 @@ char* CDECL wine_pcap_lookupdev(char *errbuf)
|
||||
@@ -208,10 +291,10 @@ char* CDECL wine_pcap_lookupdev(char *errbuf)
|
||||
TRACE("(%p)\n", errbuf);
|
||||
if (!ret)
|
||||
{
|
||||
@ -270,7 +269,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
@@ -220,7 +304,7 @@ int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned i
|
||||
@@ -220,7 +303,7 @@ int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned i
|
||||
char *errbuf)
|
||||
{
|
||||
TRACE("(%s %p %p %p)\n", debugstr_a(device), netp, maskp, errbuf);
|
||||
@ -279,7 +278,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
}
|
||||
|
||||
int CDECL wine_pcap_loop(pcap_t *p, int cnt,
|
||||
@@ -234,34 +318,34 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt,
|
||||
@@ -234,34 +317,34 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt,
|
||||
PCAP_HANDLER_CALLBACK pcb;
|
||||
pcb.pfn_cb = callback;
|
||||
pcb.user_data = user;
|
||||
@ -320,7 +319,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
}
|
||||
|
||||
#ifndef PCAP_OPENFLAG_PROMISCUOUS
|
||||
@@ -274,14 +358,14 @@ pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int rea
|
||||
@@ -274,14 +357,14 @@ pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int rea
|
||||
int promisc = flags & PCAP_OPENFLAG_PROMISCUOUS;
|
||||
FIXME("(%s %i %i %i %p %p): partial stub\n", debugstr_a(source), snaplen, flags, read_timeout,
|
||||
auth, errbuf);
|
||||
@ -337,7 +336,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
}
|
||||
|
||||
int CDECL wine_pcap_parsesrcstr(const char *source, int *type, char *host, char *port, char *name, char *errbuf)
|
||||
@@ -325,13 +409,13 @@ int CDECL wine_pcap_parsesrcstr(const char *source, int *type, char *host, char
|
||||
@@ -325,13 +408,13 @@ int CDECL wine_pcap_parsesrcstr(const char *source, int *type, char *host, char
|
||||
int CDECL wine_pcap_sendpacket(pcap_t *p, const unsigned char *buf, int size)
|
||||
{
|
||||
TRACE("(%p %p %i)\n", p, buf, size);
|
||||
@ -353,7 +352,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
}
|
||||
|
||||
int CDECL wine_pcap_setbuff(pcap_t * p, int dim)
|
||||
@@ -343,25 +427,25 @@ int CDECL wine_pcap_setbuff(pcap_t * p, int dim)
|
||||
@@ -343,25 +426,25 @@ int CDECL wine_pcap_setbuff(pcap_t * p, int dim)
|
||||
int CDECL wine_pcap_setfilter(pcap_t *p, struct bpf_program *fp)
|
||||
{
|
||||
TRACE("(%p %p)\n", p, fp);
|
||||
@ -383,7 +382,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
}
|
||||
|
||||
int CDECL wine_wsockinit(void)
|
||||
@@ -387,7 +471,7 @@ pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname)
|
||||
@@ -387,7 +470,7 @@ pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname)
|
||||
|
||||
TRACE("unix_path %s\n", debugstr_a(unix_path));
|
||||
|
||||
@ -392,7 +391,7 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
heap_free(unix_path);
|
||||
|
||||
return dumper;
|
||||
@@ -396,5 +480,24 @@ pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname)
|
||||
@@ -396,5 +479,24 @@ pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname)
|
||||
void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
|
||||
{
|
||||
TRACE("(%p %p %p)\n", user, h, sp);
|
||||
@ -419,5 +418,5 @@ index d2f1be7a3..c355fc6e1 100644
|
||||
+ return TRUE;
|
||||
}
|
||||
--
|
||||
2.22.0
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
7ec069d85f5235db98e57291825b9d602ae47ed5
|
||||
8827eb6a83348057293f89be535ccb74607db608
|
||||
|
||||
Loading…
Reference in New Issue
Block a user