[OMPT-svn-commit] SF.net SVN: modplug: [210] trunk/OpenMPT/mptrack

[<rel...@us...>]

Revision: 210
          http://modplug.svn.sourceforge.net/modplug/?rev=210&view=rev
Author:   relabsoluness
Date:     2008-04-13 14:53:04 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
1.17.02.52
. Shouldn't need winhttp anymore(at least now that updatecheck is disabled). Dependency caused problems in Win98.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/Mptrack.h
    trunk/OpenMPT/mptrack/bin/mptrack.exe
    trunk/OpenMPT/mptrack/mptrack.vcproj

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2008-04-05 20:56:19 UTC (rev 209)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2008-04-13 21:53:04 UTC (rev 210)
@@ -565,7 +565,6 @@
 	m_hBladeEnc = NULL;
 	m_hLameEnc = NULL;
 	m_hACMInst = NULL;
-	m_pRequestContext = NULL;
 	m_hAlternateResourceHandle = NULL;
 	m_szConfigFileName[0] = 0;
 	for (UINT i=0; i<MAX_DLS_BANKS; i++) gpDLSBanks[i] = NULL;
@@ -578,6 +577,10 @@
 	strcpy(&m_MidiCfg.szMidiGlb[MIDIOUT_PROGRAM*32], "Cc p");
 	strcpy(&m_MidiCfg.szMidiSFXExt[0], "F0F000z");
 	for (int iz=0; iz<16; iz++) wsprintf(&m_MidiCfg.szMidiZXXExt[iz*32], "F0F001%02X", iz*8);
+
+	#ifdef UPDATECHECKENABLED
+		m_pRequestContext = NULL;
+	#endif
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -823,6 +826,8 @@
 	return TRUE;
 }
 
+
+#ifdef UPDATECHECKENABLED
 void __stdcall CTrackApp::InternetRequestCallback( HINTERNET /*hInternet*/, DWORD_PTR userData, DWORD dwInternetStatus,
                               LPVOID /*lpvStatusInformation*/,  DWORD /*dwStatusInformationLength*/)
 //-----------------------------------------------------------------------------------------------------
@@ -999,9 +1004,9 @@
         }
 }
 
+#endif
 
 
-
 int CTrackApp::ExitInstance()
 //---------------------------
 {
@@ -1054,8 +1059,10 @@
 	UninitializeACM();
 
 	// Cleanup the internet request, in case it is still active.
+	#ifdef UPDATECHECKENABLED
 	CleanupInternetRequest(m_pRequestContext);
 	delete m_pRequestContext;
+	#endif
 
 	return CWinApp::ExitInstance();
 }

Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h	2008-04-05 20:56:19 UTC (rev 209)
+++ trunk/OpenMPT/mptrack/Mptrack.h	2008-04-13 21:53:04 UTC (rev 210)
@@ -15,9 +15,12 @@
 #include "resource.h"       // main symbols
 #include "sndfile.h"
 #include <windows.h>
-#include <Specstrings.h>	// In VC2003, '__in' was undefined in winhttp.h
-#include <winhttp.h>
 
+#ifdef UPDATECHECKENABLED
+	#include <Specstrings.h>	// In VC2003, '__in' was undefined in winhttp.h
+	#include <winhttp.h>
+#endif
+
 class CModDoc;
 class CVstPluginManager;
 
@@ -99,6 +102,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Internet connection context
 
+#ifdef UPDATECHECKENABLED
 typedef struct REQUEST_CONTEXT {
 	HINTERNET hSession; 
 	HINTERNET hConnection;
@@ -106,6 +110,7 @@
 	LPSTR     lpBuffer;       // Buffer for storing read data
 	LPSTR	  postData;
 } REQUEST_CONTEXT;
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 // CTrackApp:
@@ -138,8 +143,11 @@
 	CHAR m_szConfigFileName[_MAX_PATH];
 	CHAR m_szPluginCacheFileName[_MAX_PATH];
 	CHAR m_szStringsFileName[_MAX_PATH];
+
+	#ifdef UPDATECHECKENABLED
 	// Internet request context
 	REQUEST_CONTEXT *m_pRequestContext;
+	#endif
 
 public:
 	CTrackApp();
@@ -181,11 +189,14 @@
 protected:
 	VOID StartSplashScreen();
 	VOID StopSplashScreen();
-	VOID UpdateCheck();
-	static void __stdcall InternetRequestCallback( HINTERNET hInternet, DWORD_PTR dwContext, DWORD dwInternetStatus,
-			                      LPVOID lpvStatusInformation, DWORD dwStatusInformationLength);
-	static void CleanupInternetRequest(REQUEST_CONTEXT *pRequestContext);
 
+	#ifdef UPDATECHECKENABLED
+		VOID UpdateCheck();
+		static void __stdcall InternetRequestCallback( HINTERNET hInternet, DWORD_PTR dwContext, DWORD dwInternetStatus,
+									  LPVOID lpvStatusInformation, DWORD dwStatusInformationLength);
+		static void CleanupInternetRequest(REQUEST_CONTEXT *pRequestContext);
+	#endif
+
 // Localized strings
 public:
 	VOID ImportLocalizedStrings();

Modified: trunk/OpenMPT/mptrack/bin/mptrack.exe
===================================================================
(Binary files differ)

Modified: trunk/OpenMPT/mptrack/mptrack.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.vcproj	2008-04-05 20:56:19 UTC (rev 209)
+++ trunk/OpenMPT/mptrack/mptrack.vcproj	2008-04-13 21:53:04 UTC (rev 210)
@@ -48,13 +48,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib strmiids.lib dmoguids.lib xsoundlib.lib version.lib opengl32.lib glu32.lib Rpcrt4.lib winhttp.lib"
+				AdditionalDependencies="winmm.lib strmiids.lib dmoguids.lib xsoundlib.lib version.lib opengl32.lib glu32.lib Rpcrt4.lib"
 				OutputFile=".\Debug/mptrack.exe"
 				Version="5.0"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\xsoundlib\Debug"
-				DelayLoadDLLs="winhttp.dll"
+				DelayLoadDLLs=""
 				GenerateDebugInformation="TRUE"
 				AssemblyDebug="1"
 				ProgramDatabaseFile=".\Debug/mptrack.pdb"
@@ -124,7 +124,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="winmm.lib strmiids.lib dmoguids.lib xsoundlib.lib version.lib opengl32.lib glu32.lib Rpcrt4.lib winhttp.lib"
+				AdditionalDependencies="winmm.lib strmiids.lib dmoguids.lib xsoundlib.lib version.lib opengl32.lib glu32.lib Rpcrt4.lib"
 				OutputFile=".\Bin/mptrack.exe"
 				Version="5.0"
 				LinkIncremental="1"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.