[ros-diffs] [cfinck] 27838: - Remove the main() procedure as we already have a WinMain() procedure and we need the hInstance value - Use RegisterClass with WNDCLASS instead of RegisterClassEx with WNDCLASSEX, so we don't need to care about the small icon

cfinck at svn.reactos.org cfinck at svn.reactos.org
Thu Jul 26 14:31:57 CEST 2007


Author: cfinck
Date: Thu Jul 26 16:31:56 2007
New Revision: 27838

URL: http://svn.reactos.org/svn/reactos?rev=27838&view=rev
Log:
- Remove the main() procedure as we already have a WinMain() procedure and we need the hInstance value
- Use RegisterClass with WNDCLASS instead of RegisterClassEx with WNDCLASSEX, so we don't need to care about the small icon

Modified:
    trunk/reactos/base/applications/games/solitaire/solitaire.cpp

Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/solitaire.cpp?rev=27838&r1=27837&r2=27838&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Thu Jul 26 16:31:56 2007
@@ -34,11 +34,6 @@
     lstrcpy(ptr + 1, szExt);
 }
 
-int main ( int argc, char** argv )
-{
-    return WinMain ( NULL, NULL, NULL, SW_SHOW );
-}
-
 //
 //    Main entry point
 //
@@ -46,7 +41,7 @@
 {
     HWND        hwnd;
     MSG            msg;
-    WNDCLASSEX    wndclass;
+    WNDCLASS    wndclass;
     INITCOMMONCONTROLSEX ice;
     HACCEL        hAccelTable;
 
@@ -60,7 +55,6 @@
     LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0]));
 
     //Window class for the main application parent window
-    wndclass.cbSize            = sizeof(wndclass);
     wndclass.style            = 0;//CS_HREDRAW | CS_VREDRAW;
     wndclass.lpfnWndProc    = WndProc;
     wndclass.cbClsExtra        = 0;
@@ -71,9 +65,8 @@
     wndclass.hbrBackground    = (HBRUSH)NULL;
     wndclass.lpszMenuName    = MAKEINTRESOURCE(IDR_MENU1);
     wndclass.lpszClassName    = szAppName;
-    wndclass.hIconSm        = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_SOLITAIRE), IMAGE_ICON, 16, 16, 0);
-
-    RegisterClassEx(&wndclass);
+
+    RegisterClass(&wndclass);
 
     ice.dwSize = sizeof(ice);
     ice.dwICC = ICC_BAR_CLASSES;




More information about the Ros-diffs mailing list