diff --git a/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch b/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch index 3699ea60..0bdec79c 100644 --- a/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch +++ b/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 52e207eaf175a8aeb285b8aac5afc9ef65a81318 Mon Sep 17 00:00:00 2001 +From a113e56cbb4cba0fb1027ee72b3567f24373debc Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 3 Jan 2015 03:32:12 +0100 Subject: nvcuda: Add stub dll. @@ -16,7 +16,7 @@ Subject: nvcuda: Add stub dll. create mode 100644 dlls/nvcuda/nvcuda.spec diff --git a/configure.ac b/configure.ac -index 94b83ab..feeb027 100644 +index b67a7e7..6e3108b 100644 --- a/configure.ac +++ b/configure.ac @@ -3125,6 +3125,7 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests) @@ -41,7 +41,7 @@ index 0000000..4b33278 +RC_SRCS = nvcuda.rc diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c new file mode 100644 -index 0000000..eb1c67e +index 0000000..8b7eb9c --- /dev/null +++ b/dlls/nvcuda/nvcuda.c @@ -0,0 +1,37 @@ @@ -74,7 +74,7 @@ index 0000000..eb1c67e + switch (reason) + { + case DLL_WINE_PREATTACH: -+ return TRUE; /* prefer native version */ ++ return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; diff --git a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch index 70447d20..2c9e3d6e 100644 --- a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch +++ b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch @@ -1,4 +1,4 @@ -From eeabd124863a2a20d453af1ee2afe94c4ffb5ebd Mon Sep 17 00:00:00 2001 +From 0680ea1241458e18340e352cd84a9e4e721236ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 3 Jan 2015 03:39:11 +0100 Subject: nvcuda: First implementation. @@ -7,19 +7,19 @@ Subject: nvcuda: First implementation. configure.ac | 1 + dlls/nvcuda/Makefile.in | 3 +- dlls/nvcuda/internal.c | 493 ++++++++++ - dlls/nvcuda/nvcuda.c | 2095 ++++++++++++++++++++++++++++++++++++++++- + dlls/nvcuda/nvcuda.c | 2097 ++++++++++++++++++++++++++++++++++++++++- 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, 3035 insertions(+), 250 deletions(-) + 8 files changed, 3035 insertions(+), 252 deletions(-) create mode 100755 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 feeb027..dfe3ac5 100644 +index 6e3108b..43c33bf 100644 --- a/configure.ac +++ b/configure.ac @@ -3126,6 +3126,7 @@ WINE_CONFIG_DLL(ntoskrnl.exe,,[implib]) @@ -45,7 +45,7 @@ index 4b33278..6322fb2 100644 RC_SRCS = nvcuda.rc diff --git a/dlls/nvcuda/internal.c b/dlls/nvcuda/internal.c new file mode 100755 -index 0000000..839d85c +index 0000000..6e2470a --- /dev/null +++ b/dlls/nvcuda/internal.c @@ -0,0 +1,493 @@ @@ -278,7 +278,7 @@ index 0000000..839d85c + * and the parameter seems to be some kind of device id. + * For programs using 2 GPUs you will see the values 0 and 1. + * The logic of this functions does not seem to be critical -+ * for a workind cuda implementation and is therefore stubbed ++ * for a working cuda implementation and is therefore stubbed + * till we find a way to prevent the crash. + */ + return CUDA_SUCCESS; @@ -543,7 +543,7 @@ index 0000000..839d85c + return CUDA_ERROR_UNKNOWN; +} diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index eb1c67e..8c134cb 100644 +index 8b7eb9c..5b9eed6 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c @@ -1,4 +1,5 @@ @@ -552,7 +552,7 @@ index eb1c67e..8c134cb 100644 * Copyright (C) 2014-2015 Sebastian Lackner * * This library is free software; you can redistribute it and/or -@@ -17,19 +18,2107 @@ +@@ -17,19 +18,2105 @@ */ #include "config.h" @@ -2647,8 +2647,8 @@ index eb1c67e..8c134cb 100644 + switch (reason) { - case DLL_WINE_PREATTACH: - return TRUE; /* prefer native version */ +- case DLL_WINE_PREATTACH: +- return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); + if (!load_functions()) return FALSE;