From bd474ceaa9b2124b2218f445b3f1c08af1dcaec5 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 15 Jul 2006 21:01:11 +0000 Subject: [PATCH] Windows: Replace _WIN32 macro with _MSC_VER since the conditionals are really for the MSVC compiler, not for the windows platform in general. Code cleanup. --- src/native/common/common_tools.c | 7 +------ src/native/common/common_tools.h | 2 +- src/native/windows/org_lwjgl_input_Cursor.c | 2 +- src/native/windows/org_lwjgl_opengl_Display.c | 13 ++++--------- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/native/common/common_tools.c b/src/native/common/common_tools.c index cbda3691..90476d2b 100644 --- a/src/native/common/common_tools.c +++ b/src/native/common/common_tools.c @@ -39,11 +39,6 @@ #include #include - -#ifdef _WIN32 -#include -#endif - #include "common_tools.h" #include "org_lwjgl_DefaultSysImplementation.h" @@ -81,7 +76,7 @@ static jstring sprintfJavaString(JNIEnv *env, const char *format, va_list ap) { #define BUFFER_SIZE 4000 char buffer[BUFFER_SIZE]; jstring str; -#ifdef _WIN32 +#ifdef _MSC_VER vsnprintf_s(buffer, BUFFER_SIZE, _TRUNCATE, format, ap); #else vsnprintf(buffer, BUFFER_SIZE, format, ap); diff --git a/src/native/common/common_tools.h b/src/native/common/common_tools.h index d65e81e6..c236b093 100644 --- a/src/native/common/common_tools.h +++ b/src/native/common/common_tools.h @@ -57,7 +57,7 @@ typedef enum {false, true} bool; #endif #endif -#ifdef _WIN32 +#ifdef _MSC_VER #define inline __inline #include #else diff --git a/src/native/windows/org_lwjgl_input_Cursor.c b/src/native/windows/org_lwjgl_input_Cursor.c index 8af0eee4..08351f5a 100644 --- a/src/native/windows/org_lwjgl_input_Cursor.c +++ b/src/native/windows/org_lwjgl_input_Cursor.c @@ -88,7 +88,7 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nCreateCursor colorDIB = CreateDIBSection(GetDC(NULL), (BITMAPINFO*)&(bitmapInfo), DIB_RGB_COLORS, - (void**)&(ptrCursorImage), + (void*)&(ptrCursorImage), NULL, 0); srcPtr = pixels; dstPtr = ptrCursorImage; diff --git a/src/native/windows/org_lwjgl_opengl_Display.c b/src/native/windows/org_lwjgl_opengl_Display.c index 3fad26cf..582970a2 100644 --- a/src/native/windows/org_lwjgl_opengl_Display.c +++ b/src/native/windows/org_lwjgl_opengl_Display.c @@ -119,7 +119,7 @@ static LRESULT CALLBACK lwjglWindowProc(HWND hWnd, message_time = GetMessageTime(); handleMessage_method = (*env)->GetStaticMethodID(env, display_class_global, "handleMessage", "(JIJJJ)Z"); if (handleMessage_method != NULL) - if ((*env)->CallStaticBooleanMethod(env, display_class_global, handleMessage_method, (jlong)hWnd, (jint)msg, (jlong)wParam, (jlong)lParam, (jlong)message_time)) + if ((*env)->CallStaticBooleanMethod(env, display_class_global, handleMessage_method, (jlong)(intptr_t)hWnd, (jint)msg, (jlong)wParam, (jlong)lParam, (jlong)message_time)) return 0; } } @@ -190,7 +190,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nCreateWindow(JNIEnv jfieldID fid_height = (*env)->GetFieldID(env, cls_displayMode, "height", "I"); int width = (*env)->GetIntField(env, mode, fid_width); int height = (*env)->GetIntField(env, mode, fid_height); - BOOL result; bool isUndecorated; // Whether we're undecorated or not static bool oneShotInitialised = false; if (!oneShotInitialised) { @@ -321,8 +320,6 @@ static HICON createWindowIcon(JNIEnv *env, jint *pixels, jint width, jint height char *ptrCursorImage; int x, y; char *dstPtr; - int pixelCount; - int scanlinePad; int wordAlignedWidth; int imageSize; unsigned char *maskPixels; @@ -332,8 +329,6 @@ static HICON createWindowIcon(JNIEnv *env, jint *pixels, jint width, jint height int scanlineWidth; HBITMAP colorDIB; - jsize pixelsLen = width * height; - memset(&bitmapInfo, 0, sizeof(BITMAPINFO)); bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bitmapInfo.bmiHeader.biWidth = width; @@ -343,7 +338,7 @@ static HICON createWindowIcon(JNIEnv *env, jint *pixels, jint width, jint height bitmapInfo.bmiHeader.biCompression = BI_RGB; colorDIB = CreateDIBSection(GetDC(NULL), (BITMAPINFO*)&(bitmapInfo), - DIB_RGB_COLORS, (void**)&(ptrCursorImage), NULL, 0); + DIB_RGB_COLORS, (void*)&(ptrCursorImage), NULL, 0); if (!ptrCursorImage) { throwException(env, "Could not allocate DIB section."); } @@ -435,7 +430,7 @@ static HICON createWindowIcon(JNIEnv *env, jint *pixels, jint width, jint height JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nSetWindowIcon16 (JNIEnv *env, jclass clazz, jobject iconBuffer) { - int *imgData = (int *)(*env)->GetDirectBufferAddress(env, iconBuffer); + jint *imgData = (jint *)(*env)->GetDirectBufferAddress(env, iconBuffer); freeSmallIcon(); small_icon = createWindowIcon(env, imgData, 16, 16); @@ -453,7 +448,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nSetWindowIcon16 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nSetWindowIcon32 (JNIEnv *env, jclass clazz, jobject iconBuffer) { - int *imgData = (int *)(*env)->GetDirectBufferAddress(env, iconBuffer); + jint *imgData = (jint *)(*env)->GetDirectBufferAddress(env, iconBuffer); freeLargeIcon(); large_icon = createWindowIcon(env, imgData, 32, 32);