- give getfirefox a WinMain it deserves

- theres no reason to include NDK for it
- fix a bug in dlOnProgress while debugging it

svn path=/trunk/; revision=25045
This commit is contained in:
Johannes Anderwald 2006-12-03 20:36:53 +00:00
parent 86f3d0e7ea
commit 316ca7fc58
2 changed files with 9 additions and 7 deletions

View file

@ -123,7 +123,7 @@ dlOnProgress(IBindStatusCallback* iface, ULONG ulProgress,
} }
Item = GetDlgItem(This->hDialog, IDC_STATUS); Item = GetDlgItem(This->hDialog, IDC_STATUS);
if (NULL != Item) if (NULL != Item && NULL != szStatusText)
{ {
SendMessageW(Item, WM_GETTEXT, sizeof(OldText) / sizeof(OldText[0]), SendMessageW(Item, WM_GETTEXT, sizeof(OldText) / sizeof(OldText[0]),
(LPARAM) OldText); (LPARAM) OldText);
@ -371,13 +371,17 @@ dlProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam)
/*********************************************************************** /***********************************************************************
* Main program * Main program
*/ */
int
main(int argc, char *argv[]) int WINAPI
WinMain(HINSTANCE hThisInstance,
HINSTANCE hPrevInstance,
LPSTR lpCmdLine,
int nCmdShow)
{ {
InitCommonControls(); InitCommonControls();
DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_GETFIREFOX), 0, DialogBoxW(hThisInstance, MAKEINTRESOURCEW(IDD_GETFIREFOX), 0,
dlProc); dlProc);
return 0; return 0;
} }

View file

@ -7,10 +7,8 @@
*/ */
#define COBJMACROS #define COBJMACROS
#define NTOS_MODE_USER
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#include <windows.h> #include <windows.h>
#include <ndk/ntndk.h>
#include <commctrl.h> #include <commctrl.h>
#include <shlobj.h> #include <shlobj.h>
#include <shlwapi.h> #include <shlwapi.h>