Changeset 694

Timestamp:

Mar 8, 2013, 1:31:30 AM (12 years ago)

Author:

alloc

Message:

Daodan: Fixed gamma ramp thing

Location:

Daodan/src

Files:

• BFW_Motoko_Draw.h (modified) (1 diff)
• Daodan.c (modified) (1 diff)
• Daodan_GL.c (modified) (1 diff)
• Oni_GL.h (modified) (1 diff)
• Oni_Symbols.h (modified) (1 diff)

Daodan/src/BFW_Motoko_Draw.h

@@ -69 +69 @@
 } M3tDrawPtrState;
 
+typedef struct
+{
+        WORD data[3][256];
+} M3tWin32GammaRamp;
+
 extern char M3gResolutionSwitch;
 

Daodan/src/Daodan.c

@@ -255 +255 @@
         if(patch_chinese)
         {
+                DDrStartupMessage("Loading chinese DLL");
                 HMODULE dll = LoadLibrary("xfhsm_oni.dll");
+                DWORD err = GetLastError();
+                DDrStartupMessage(" - Module loading returned error %i", err);
                 if( dll )
                 {

Daodan/src/Daodan_GL.c

@@ -237 +237 @@
                 DDrStartupMessage("Using standard Windows gamma adjustment");
 
-//WINE CRASH!           if (GetDeviceGammaRamp(gl_eng->HDC, gl_gamma_ramp))
+                if (GetDeviceGammaRamp(gl_eng->HDC, gl_gamma_ramp))
                         gl_gamma_ramp_valid = 1;
         }

Daodan/src/Oni_GL.h

@@ -435 +435 @@
         GLboolean (WINAPI *wglSwapIntervalEXT)(GLint interval);
 
-        GLint (WINAPI *wglSetDeviceGammaRamp3DFX)(HDC, GLvoid *);
-        GLint (WINAPI *wglGetDeviceGammaRamp3DFX)(HDC, GLvoid *);
+        GLint (WINAPI *wglSetDeviceGammaRamp3DFX)(HDC, M3tWin32GammaRamp*);
+        GLint (WINAPI *wglGetDeviceGammaRamp3DFX)(HDC, M3tWin32GammaRamp*);
 } gl_api_t;
 

Daodan/src/Oni_Symbols.h

@@ -36 +36 @@
 
 // OpenGL Gamma related
-#define gl_gamma_ramp           (*((WORD**)0x0055fdfc))
+#define gl_gamma_ramp           (((M3tWin32GammaRamp*)0x0055fdfc))
 
 // OpenGL Gamma related