(#183) Merge develop

s1hofmann · s1hofmann · commit 7af957464f0b · 2021-03-17T15:56:44.000+01:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,9 +22,7 @@ jobs:
           node-version: ${{matrix.node}}
       - name: Configure Linux environment
         if: ${{matrix.os == 'ubuntu-latest'}}
-        run: |
-          sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev g++-4.8 gcc-4.8
-          export CXX=g++-4.8 && $CXX --version
+        run: sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev build-essential
       - name: Install
         run: npm run patch && npm i
       - name: Build
diff --git a/.github/workflows/snapshot_release.yaml b/.github/workflows/snapshot_release.yaml
@@ -19,9 +19,7 @@ jobs:
           node-version: ${{matrix.node}}
       - name: Configure Linux environment
         if: ${{matrix.os == 'ubuntu-latest'}}
-        run: |
-          sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev g++-4.8 gcc-4.8
-          export CXX=g++-4.8 && $CXX --version
+        run: sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev build-essential
       - name: Install
         run: npm run patch && npm i
       - name: Build
@@ -53,9 +51,7 @@ jobs:
           node-version: 14
       - name: Configure Linux environment
         if: ${{matrix.os == 'ubuntu-latest'}}
-        run: |
-          sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev g++-4.8 gcc-4.8
-          export CXX=g++-4.8 && $CXX --version
+        run: sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev build-essential
       - name: Install
         run: npm run patch && npm i
       - name: Publish snapshot release
diff --git a/.github/workflows/tagged_release.yaml b/.github/workflows/tagged_release.yaml
@@ -20,9 +20,7 @@ jobs:
           node-version: ${{matrix.node}}
       - name: Configure Linux environment
         if: ${{matrix.os == 'ubuntu-latest'}}
-        run: |
-          sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev g++-4.8 gcc-4.8
-          export CXX=g++-4.8 && $CXX --version
+        run: sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev build-essential
       - name: Install
         run: npm run patch && npm i
       - name: Build
@@ -54,9 +52,7 @@ jobs:
           node-version: 14
       - name: Configure Linux environment
         if: ${{matrix.os == 'ubuntu-latest'}}
-        run: |
-          sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev g++-4.8 gcc-4.8
-          export CXX=g++-4.8 && $CXX --version
+        run: sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev build-essential
       - name: Install
         run: npm run patch && npm i
       - name: Publish tagged release
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,7 +37,7 @@ if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     set(CMAKE_CXX_FLAGS "-Wall -Wparentheses -Winline -Wbad-function-cast -Wdisabled-optimization -Wextra")
 else()
     message(STATUS "MSVC compiler in use")
-    set(CMAKE_CXX_FLAGS "/Wall /W4")
+    set(CMAKE_CXX_FLAGS "/Wall /W4 /EHsc")
 endif()
 
 add_compile_definitions(NAPI_CPP_EXCEPTIONS)
diff --git a/src/MMBitmap.c b/src/MMBitmap.c
@@ -36,6 +36,7 @@ void destroyMMBitmap(MMBitmapRef bitmap)
 
 void destroyMMBitmapBuffer(char * bitmapBuffer, void * hint)
 {
+	(void)hint;
 	if (bitmapBuffer != NULL)	
 	{
 		free(bitmapBuffer);
diff --git a/src/MMBitmap.h b/src/MMBitmap.h
@@ -47,8 +47,8 @@ MMBitmapRef copyMMBitmapFromPortion(MMBitmapRef source, MMRect rect);
 #define MMBitmapPointInBounds(image, p) ((p).x < (image)->width && \
                                          (p).y < (image)->height)
 #define MMBitmapRectInBounds(image, r)                    \
-	(((r).origin.x + (r).size.width <= (image)->width) && \
-	 ((r).origin.y + (r).size.height <= (image)->height))
+	(((r).origin.x + (r).size.width <= (int64_t)(image)->width) && \
+	 ((r).origin.y + (r).size.height <= (int64_t)(image)->height))
 
 #define MMBitmapGetBounds(image) MMRectMake(0, 0, image->width, image->height)
 
diff --git a/src/buffer_finalizer.h b/src/buffer_finalizer.h
@@ -4,6 +4,7 @@ class BufferFinalizer
 public:
 	void operator()(Napi::Env env, T *data)
 	{
+		(void)env;
 		if (data != nullptr)
 		{
 			delete data;
diff --git a/src/deadbeef_rand.c b/src/deadbeef_rand.c
@@ -23,5 +23,5 @@ uint32_t deadbeef_generate_seed(void)
 {
 	  uint32_t t = (uint32_t)time(NULL);
 	  uint32_t c = (uint32_t)clock();
-	  return (t << 24) ^ (c << 11) ^ t ^ (size_t) &c;
+	  return (uint32_t)((t << 24) ^ (c << 11) ^ t ^ (size_t) &c);
 }
diff --git a/src/main.cc b/src/main.cc
@@ -496,7 +496,7 @@ Napi::Number _keyToggle(const Napi::CallbackInfo &info)
 	MMKeyFlags flags = MOD_NONE;
 	MMKeyCode key;
 
-	bool down;
+	bool down = false;
 
 	//Get arguments from JavaScript.
 	std::string keyName = info[0].As<Napi::String>();
@@ -576,7 +576,7 @@ Napi::Number _typeStringDelayed(const Napi::CallbackInfo &info)
 	std::string stringToType = info[0].As<Napi::String>();
 	size_t cpm = info[1].As<Napi::Number>().Int32Value();
 
-	typeStringDelayed(stringToType.c_str(), cpm);
+	typeStringDelayed(stringToType.c_str(), (unsigned int)cpm);
 
 	return Napi::Number::New(env, 1);
 }
@@ -613,8 +613,8 @@ Napi::Object _getScreenSize(const Napi::CallbackInfo &info)
 
 	//Create our return object.
 	Napi::Object obj = Napi::Object::New(env);
-	obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, displaySize.width));
-	obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, displaySize.height));
+	obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, (double)displaySize.width));
+	obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, (double)displaySize.height));
 
 	return obj;
 }
@@ -660,7 +660,7 @@ Napi::Number _highlight(const Napi::CallbackInfo &info)
 		y = info[1].As<Napi::Number>().Int32Value();
 		width = info[2].As<Napi::Number>().Int32Value();
 		height = info[3].As<Napi::Number>().Int32Value();
-		duration = info[4].As<Napi::Number>().Int64Value();
+		duration = (int)info[4].As<Napi::Number>().Int64Value();
 		opacity = info[5].As<Napi::Number>().FloatValue();
 
 		highlight(x, y, width, height, duration, opacity);
@@ -673,7 +673,7 @@ Napi::Number _getActiveWindow(const Napi::CallbackInfo &info) {
 	Napi::Env env = info.Env();
 
 	WindowHandle windowHandle = getActiveWindow();
-	return Napi::Number::New(env, windowHandle);
+	return Napi::Number::New(env, (double)windowHandle);
 }
 
 Napi::Array _getWindows(const Napi::CallbackInfo &info) {
@@ -683,7 +683,7 @@ Napi::Array _getWindows(const Napi::CallbackInfo &info) {
 	auto arr = Napi::Array::New(env, windowHandles.size());
 
 	for (size_t idx = 0; idx < windowHandles.size(); ++idx) {
-		arr[idx] = windowHandles[idx];
+		arr[(uint32_t)idx] = windowHandles[idx];
 	}
 
 	return arr;
@@ -696,10 +696,10 @@ Napi::Object _getWindowRect(const Napi::CallbackInfo &info) {
 	MMRect windowRect = getWindowRect(windowHandle);
 
 	Napi::Object obj = Napi::Object::New(env);
-	obj.Set(Napi::String::New(env, "x"), Napi::Number::New(env, windowRect.origin.x));
-	obj.Set(Napi::String::New(env, "y"), Napi::Number::New(env, windowRect.origin.y));
-	obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, windowRect.size.width));
-	obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, windowRect.size.height));
+	obj.Set(Napi::String::New(env, "x"), Napi::Number::New(env, (double)windowRect.origin.x));
+	obj.Set(Napi::String::New(env, "y"), Napi::Number::New(env, (double)windowRect.origin.y));
+	obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, (double)windowRect.size.width));
+	obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, (double)windowRect.size.height));
 
 	return obj;
 }
@@ -758,14 +758,18 @@ Napi::Object _captureScreen(const Napi::CallbackInfo &info)
 	}
 
 	MMBitmapRef bitmap = copyMMBitmapFromDisplayInRect(MMRectMake(x, y, w, h));
+	
+	if (bitmap == NULL) {
+		throw Napi::Error::New(env, "Error: Failed to capture screen");
+	}
 
-	uint32_t bufferSize = bitmap->bytewidth * bitmap->height;
+	uint32_t bufferSize = (uint32_t)(bitmap->bytewidth * bitmap->height);
 	Napi::Buffer<char> buffer = Napi::Buffer<char>::New(env, (char *)bitmap->imageBuffer, bufferSize, finalizer);
 
 	Napi::Object obj = Napi::Object::New(env);
-	obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, bitmap->width));
-	obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, bitmap->height));
-	obj.Set(Napi::String::New(env, "byteWidth"), Napi::Number::New(env, bitmap->bytewidth));
+	obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, (double)bitmap->width));
+	obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, (double)bitmap->height));
+	obj.Set(Napi::String::New(env, "byteWidth"), Napi::Number::New(env, (double)bitmap->bytewidth));
 	obj.Set(Napi::String::New(env, "bitsPerPixel"), Napi::Number::New(env, bitmap->bitsPerPixel));
 	obj.Set(Napi::String::New(env, "bytesPerPixel"), Napi::Number::New(env, bitmap->bytesPerPixel));
 	obj.Set(Napi::String::New(env, "image"), buffer);
diff --git a/src/win32/keypress.c b/src/win32/keypress.c
@@ -61,7 +61,7 @@ void win32KeyEvent(int key, MMKeyFlags flags)
 
 	INPUT keyboardInput;
 	keyboardInput.type = INPUT_KEYBOARD;
-	keyboardInput.ki.wScan = scan;
+	keyboardInput.ki.wScan = (WORD)scan;
 	keyboardInput.ki.dwFlags = KEYEVENTF_SCANCODE | flags;
 	keyboardInput.ki.time = 0;
 	SendInput(1, &keyboardInput, sizeof(keyboardInput));
@@ -167,9 +167,11 @@ void typeString(const char *str)
 			c3 = (*str++) & 0x3F;
 			n = ((c & 0x07) << 18) | (c1 << 12) | (c2 << 6) | c3;
 		}
+		else
+			continue; /* ignore invalid UTF-8 */
 
-		toggleUniKey(n, true);
-		toggleUniKey(n, false);
+		toggleUniKey((char)n, true);
+		toggleUniKey((char)n, false);
 	}
 }
 
diff --git a/src/win32/mouse.c b/src/win32/mouse.c
@@ -26,11 +26,12 @@
  */
 void moveMouse(MMPoint point)
 {
-	SetCursorPos (point.x, point.y);
+	SetCursorPos ((int)point.x, (int)point.y);
 }
 
 void dragMouse(MMPoint point, const MMMouseButton button)
 {
+	(void)button;
 	moveMouse(point);
 }
 
diff --git a/src/win32/screengrab.c b/src/win32/screengrab.c
@@ -56,8 +56,8 @@ MMBitmapRef copyMMBitmapFromDisplayInRect(MMRect rect)
 	            (int)scaledRect.size.width,
 	            (int)scaledRect.size.height,
 				screen,
-				scaledRect.origin.x,
-				scaledRect.origin.y,
+				(int)scaledRect.origin.x,
+				(int)scaledRect.origin.y,
 				SRCCOPY)) {
 		
 		/* Error copying data. */

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ void destroyMMBitmap(MMBitmapRef bitmap)`
`36`	`36`
`37`	`37`	`void destroyMMBitmapBuffer(char * bitmapBuffer, void * hint)`
`38`	`38`	`{`
	`39`	`+ (void)hint;`
`39`	`40`	`if (bitmapBuffer != NULL)`
`40`	`41`	`{`
`41`	`42`	`free(bitmapBuffer);`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ class BufferFinalizer`
`4`	`4`	`public:`
`5`	`5`	`void operator()(Napi::Env env, T *data)`
`6`	`6`	`{`
	`7`	`+ (void)env;`
`7`	`8`	`if (data != nullptr)`
`8`	`9`	`{`
`9`	`10`	`delete data;`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ uint32_t deadbeef_generate_seed(void)`
`23`	`23`	`{`
`24`	`24`	`uint32_t t = (uint32_t)time(NULL);`
`25`	`25`	`uint32_t c = (uint32_t)clock();`
`26`		`- return (t << 24) ^ (c << 11) ^ t ^ (size_t) &c;`
	`26`	`+ return (uint32_t)((t << 24) ^ (c << 11) ^ t ^ (size_t) &c);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ void win32KeyEvent(int key, MMKeyFlags flags)`
`61`	`61`
`62`	`62`	`INPUT keyboardInput;`
`63`	`63`	`keyboardInput.type = INPUT_KEYBOARD;`
`64`		`- keyboardInput.ki.wScan = scan;`
	`64`	`+ keyboardInput.ki.wScan = (WORD)scan;`
`65`	`65`	`keyboardInput.ki.dwFlags = KEYEVENTF_SCANCODE \| flags;`
`66`	`66`	`keyboardInput.ki.time = 0;`
`67`	`67`	`SendInput(1, &keyboardInput, sizeof(keyboardInput));`
`@@ -167,9 +167,11 @@ void typeString(const char *str)`
`167`	`167`	`c3 = (*str++) & 0x3F;`
`168`	`168`	`n = ((c & 0x07) << 18) \| (c1 << 12) \| (c2 << 6) \| c3;`
`169`	`169`	`}`
	`170`	`+ else`
	`171`	`+ continue; /* ignore invalid UTF-8 */`
`170`	`172`
`171`		`- toggleUniKey(n, true);`
`172`		`- toggleUniKey(n, false);`
	`173`	`+ toggleUniKey((char)n, true);`
	`174`	`+ toggleUniKey((char)n, false);`
`173`	`175`	`}`
`174`	`176`	`}`
`175`	`177`