[ros-diffs] [janderwald] 25045: - give getfirefox a WinMain it deserves - theres no reason to include NDK for it - fix a bug in dlOnProgress while debugging it

Author: janderwald
Date: Sun Dec  3 23:36:53 2006
New Revision: 25045

URL: http://svn.reactos.org/svn/reactos?rev=25045&view=rev
Log:
- give getfirefox a WinMain it deserves
- theres no reason to include NDK for it
- fix a bug in dlOnProgress while debugging it

Modified:
    trunk/reactos/base/applications/getfirefox/getfirefox.c
    trunk/reactos/base/applications/getfirefox/precomp.h

Modified: trunk/reactos/base/applications/getfirefox/getfirefox.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfirefo...
==============================================================================
--- trunk/reactos/base/applications/getfirefox/getfirefox.c (original)
+++ trunk/reactos/base/applications/getfirefox/getfirefox.c Sun Dec  3 23:36:53 2006
@@ -123,7 +123,7 @@
     }

Item = GetDlgItem(This->hDialog, IDC_STATUS);
-  if (NULL != Item)
+  if (NULL != Item && NULL != szStatusText)
     {
       SendMessageW(Item, WM_GETTEXT, sizeof(OldText) / sizeof(OldText[0]),
                    (LPARAM) OldText);
@@ -371,13 +371,17 @@
 /***********************************************************************
  *              Main program
  */
-int
-main(int argc, char *argv[])
+
+int WINAPI
+WinMain(HINSTANCE hThisInstance,
+        HINSTANCE hPrevInstance,
+        LPSTR lpCmdLine,
+        int nCmdShow)
 {
   InitCommonControls();

-  DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_GETFIREFOX), 0,
+  DialogBoxW(hThisInstance, MAKEINTRESOURCEW(IDD_GETFIREFOX), 0,
              dlProc);
-
   return 0;
-}
+
+}

Modified: trunk/reactos/base/applications/getfirefox/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfirefo...
==============================================================================
--- trunk/reactos/base/applications/getfirefox/precomp.h (original)
+++ trunk/reactos/base/applications/getfirefox/precomp.h Sun Dec  3 23:36:53 2006
@@ -7,10 +7,8 @@
  */

#define COBJMACROS
-#define NTOS_MODE_USER
 #define WIN32_NO_STATUS
 #include <windows.h>
-#include <ndk/ntndk.h>
 #include <commctrl.h>
 #include <shlobj.h>
 #include <shlwapi.h>