Merge pull request #501 from marceltaeumel/marceltaeumel/patch-3

Removes support for NSPlugin and browser mode on win32
OpenSmalltalk · Jun 13, 2020 · 07161bc · 07161bc
2 parents d716e76 + 39670ca
commit 07161bc
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 648 deletions.
diff --git a/platforms/win32/plugins/DropPlugin/sqWin32Drop.c b/platforms/win32/plugins/DropPlugin/sqWin32Drop.c
@@ -776,14 +776,10 @@ char *dropRequestFileName(int dropIndex) {
 
 sqInt dropRequestFileHandle(sqInt dropIndex) {
   sqInt fileHandle;
-  int wasBrowserMode;
   char *dropName = dropRequestFileName(dropIndex);
   if(!dropName)
     return interpreterProxy->nilObject();
   fileHandle = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), fileRecordSize());
-  wasBrowserMode = fBrowserMode;
-  fBrowserMode = false;
   sqFileOpen(fileValueOf(fileHandle),dropName, strlen(dropName), 0);
-  fBrowserMode = wasBrowserMode;
   return fileHandle;
 }
diff --git a/platforms/win32/vm/sqWin32.h b/platforms/win32/vm/sqWin32.h
@@ -225,7 +225,6 @@ extern HWND  consoleWindow;       /* console */
 
 
 extern HWND stWindow;	     	         /*	the squeak window */
-extern HWND browserWindow;	     	     /*	the browser window */
 extern HINSTANCE hInstance;	     /*	the instance of squeak running */
 extern HCURSOR currentCursor;	     /*	current cursor displayed by squeak */
 extern HPALETTE palette;	     /*	the palette (might be unused) */
@@ -240,7 +239,6 @@ extern BOOL fIsConsole;          /* Are we running as a console app? */
 /* Startup options */
 extern BOOL  fHeadlessImage; /* Do we run headless? */
 extern BOOL  fRunService;    /* Do we run as NT service? */
-extern BOOL  fBrowserMode;   /* Do we run in a web browser? */
 extern DWORD dwMemorySize;   /* How much memory do we use? */
 extern BOOL  fUseDirectSound;/* Do we use DirectSound?! */
 extern BOOL  fUseOpenGL;     /* Do we use OpenGL?! */
@@ -313,12 +311,6 @@ void vprintLastError(TCHAR *fmt, ...);
 DWORD SqueakImageLength(WCHAR *fileName);
 int isLocalFileName(TCHAR *fileName);
 
-#ifndef NO_PLUGIN_SUPPORT
-void pluginInit(void);
-void pluginExit(void);
-void pluginHandleEvent(MSG* msg);
-#endif /* NO_PLUGIN_SUPPORT */
-
 #ifndef NO_DROP
 int recordDragDropEvent(HWND wnd, int dragType, int x, int y, int numFiles);
 #endif

diff --git a/platforms/win32/vm/sqWin32Main.c b/platforms/win32/vm/sqWin32Main.c
@@ -1395,9 +1395,6 @@ void __cdecl Cleanup(void)
     dumpStackIfInMainThread(0);
   }
   ioShutdownAllModules();
-#ifndef NO_PLUGIN_SUPPORT
-  pluginExit();
-#endif
   ioReleaseTime();
   /* tricky ... we have no systray icon when running
      headfull or when running as service on NT */
@@ -1773,9 +1770,6 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
   /* get us the instance handle */
   hInstance = hInst;
 
-#ifndef NO_PLUGIN_SUPPORT
-  pluginInit();
-#endif
 #ifndef NO_SERVICE
   /* Find out if we're running from a service.
      That's a bit tricky since there is no difference between
@@ -1833,9 +1827,6 @@ main(int argc, char *argv[])
   /* open all streams in binary mode */
   _fmode  = _O_BINARY;
 
-#ifndef NO_PLUGIN_SUPPORT
-  pluginInit();
-#endif
 #ifndef NO_SERVICE
   /* Find out if we're running from a service.
      That's a bit tricky since there is no difference between
@@ -2064,22 +2055,6 @@ parseVMArgument(int argc, char *argv[])
 	}
 #endif
 
-  /* NOTE: the following flags are "undocumented" */
-	else if (argc > 1 && !strcmp(argv[0], VMOPTION("browserWindow"))) {
-#if SQ_HOST32
-		browserWindow = (HWND)atoi(argv[1]);
-#else
-		browserWindow = (HWND)atoll(argv[1]);
-#endif
-		return 2; }
-	else if (!strncmp(argv[0], VMOPTION("browserWindow:"), strlen(VMOPTION("browserWindow:")))) {
-#if SQ_HOST32
-		browserWindow = (HWND)atoi(argv[0]+strlen(VMOPTION("browserWindow:")));
-#else
-		browserWindow = (HWND)atoll(argv[0]+strlen(VMOPTION("browserWindow:")));
-#endif
-		return 1; }
-
 	return 0;	/* option not recognised */
 }