From d2f836119a8101b8fd10da0585a727fab8f5717e Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date: Sat, 11 Mar 2017 18:36:01 +0100
Subject: [PATCH] vstudio: remove remains, move sha in tree

+ small code fixes
---
 ccminer.vcxproj           |  1 -
 ccminer.vcxproj.filters   | 13 +++++--------
 x11/veltor.cu             |  2 +-
 x15/cuda_x15_whirlpool.cu |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ccminer.vcxproj b/ccminer.vcxproj
index 38073fa..afddcc2 100644
--- a/ccminer.vcxproj
+++ b/ccminer.vcxproj
@@ -352,7 +352,6 @@
     <ClInclude Include="quark\cuda_bmw512_sm3.cuh" />
     <ClInclude Include="quark\cuda_quark_groestl512_sm2.cuh" />
     <ClInclude Include="quark\cuda_quark_blake512_sp.cuh" />
-    <ClInclude Include="quark\cuda_skein512_sp.cuh" />
     <ClInclude Include="res\resource.h" />
     <ClInclude Include="sia\sia-rpc.h" />
     <ClInclude Include="scrypt\salsa_kernel.h" />
diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
index 1b4c395..775da32 100644
--- a/ccminer.vcxproj.filters
+++ b/ccminer.vcxproj.filters
@@ -85,7 +85,7 @@
     <Filter Include="Source Files\CUDA\lbry">
       <UniqueIdentifier>{3079ea1f-f768-455a-acd6-f517fac535b4}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\sha256">
+    <Filter Include="Source Files\CUDA\sha256">
       <UniqueIdentifier>{86a896c0-1688-4854-98e3-285d166069a3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\sia">
@@ -518,9 +518,6 @@
     <ClInclude Include="quark\cuda_quark_blake512_sp.cuh">
       <Filter>Source Files\CUDA\quark</Filter>
     </ClInclude>
-    <ClInclude Include="quark\cuda_skein512_sp.cuh">
-      <Filter>Source Files\CUDA\quark</Filter>
-    </ClInclude>
     <ClInclude Include="quark\cuda_bmw512_sm3.cuh">
       <Filter>Source Files\CUDA\quark</Filter>
     </ClInclude>
@@ -860,16 +857,16 @@
       <Filter>Source Files\CUDA\lbry</Filter>
     </CudaCompile>
     <CudaCompile Include="sha256\cuda_sha256d.cu">
-      <Filter>Source Files\sha256</Filter>
+      <Filter>Source Files\CUDA\sha256</Filter>
     </CudaCompile>
     <CudaCompile Include="sha256\sha256d.cu">
-      <Filter>Source Files\sha256</Filter>
+      <Filter>Source Files\CUDA\sha256</Filter>
     </CudaCompile>
     <CudaCompile Include="sha256\cuda_sha256t.cu">
-      <Filter>Source Files\sha256</Filter>
+      <Filter>Source Files\CUDA\sha256</Filter>
     </CudaCompile>
     <CudaCompile Include="sha256\sha256t.cu">
-      <Filter>Source Files\sha256</Filter>
+      <Filter>Source Files\CUDA\sha256</Filter>
     </CudaCompile>
     <CudaCompile Include="sia\sia.cu">
       <Filter>Source Files\sia</Filter>
diff --git a/x11/veltor.cu b/x11/veltor.cu
index 4c6f8cd..be05f5a 100644
--- a/x11/veltor.cu
+++ b/x11/veltor.cu
@@ -147,7 +147,7 @@ extern "C" int scanhash_veltor(int thr_id, struct work* work, uint32_t max_nonce
 				if (!opt_quiet)
 					gpulog(LOG_WARNING, thr_id, "result for %08x does not validate on CPU!", h_resNonce[0]);
 				cudaMemset(d_resNonce[thr_id], 0xff, NBN*sizeof(uint32_t));
-				pdata[19] = h_resNonce[0] + 1;
+				pdata[19] = startNounce + h_resNonce[0] + 1;
 				continue;
 			}
 		}
diff --git a/x15/cuda_x15_whirlpool.cu b/x15/cuda_x15_whirlpool.cu
index 933aa91..a541919 100644
--- a/x15/cuda_x15_whirlpool.cu
+++ b/x15/cuda_x15_whirlpool.cu
@@ -62,7 +62,7 @@ __device__ static uint2 c_PaddedMessage80[16];
  */
 __device__ uint2 InitVector_RC[10];
 
-static uint32_t *d_resNonce[MAX_GPUS];
+static uint32_t *d_resNonce[MAX_GPUS] = { 0 };
 
 //--------START OF WHIRLPOOL DEVICE MACROS---------------------------------------------------------------------------
 __device__ __forceinline__