From 10e480947bbf03270954883e6de86915002cc25e Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 30 Oct 2004 19:14:22 +0000
Subject: [PATCH] Use W32API.

svn path=/trunk/; revision=11481
---
 reactos/lib/cpl/cplsample/Makefile    |  5 ++++-
 reactos/lib/cpl/cplsample/cplsample.c | 22 ++++++++++++----------
 reactos/lib/cpl/cplsample/cplsample.h |  2 --
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/reactos/lib/cpl/cplsample/Makefile b/reactos/lib/cpl/cplsample/Makefile
index fdad5316c17..ca3473767fd 100644
--- a/reactos/lib/cpl/cplsample/Makefile
+++ b/reactos/lib/cpl/cplsample/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2004/02/05 19:17:11 weiden Exp $
+# $Id: Makefile,v 1.2 2004/10/30 19:14:22 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -13,6 +13,9 @@ TARGET_INSTALLDIR = system32
 TARGET_BASE = 0x75970000
 
 TARGET_CFLAGS = \
+ -D_WIN32_IE=0x0600 \
+ -D_WIN32_WINNT=0x0501 \
+ -D__USE_W32API \
  -I./include \
  -DUNICODE \
  -D_UNICODE \
diff --git a/reactos/lib/cpl/cplsample/cplsample.c b/reactos/lib/cpl/cplsample/cplsample.c
index f70ff242d29..5bc9b6676a2 100644
--- a/reactos/lib/cpl/cplsample/cplsample.c
+++ b/reactos/lib/cpl/cplsample/cplsample.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cplsample.c,v 1.4 2004/10/11 21:08:04 weiden Exp $
+/* $Id: cplsample.c,v 1.5 2004/10/30 19:14:22 ekohl Exp $
  *
  * PROJECT:         ReactOS Sample Control Panel
  * FILE:            lib/cpl/cplsample/cplsample.c
@@ -26,13 +26,15 @@
  *      05-01-2004  Created
  */
 #include <windows.h>
-#include <stdlib.h>
+#include <commctrl.h>
+#include <cpl.h>
+
 #include "resource.h"
 #include "cplsample.h"
 
 #define NUM_APPLETS	(1)
 
-LONG CALLBACK Applet1(VOID);
+LONG APIENTRY Applet1(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);
 HINSTANCE hApplet = 0;
 
 /* Applets */
@@ -48,7 +50,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
   psp->dwSize = sizeof(PROPSHEETPAGE);
   psp->dwFlags = PSP_DEFAULT;
   psp->hInstance = hApplet;
-  psp->u1.pszTemplate = MAKEINTRESOURCE(idDlg);
+  psp->pszTemplate = MAKEINTRESOURCE(idDlg);
   psp->pfnDlgProc = DlgProc;
 }
 
@@ -137,8 +139,8 @@ PropSheetProc(
 
 /* First Applet */
 
-LONG CALLBACK
-Applet1(VOID)
+LONG APIENTRY
+Applet1(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
 {
   PROPSHEETPAGE psp[3];
   PROPSHEETHEADER psh;
@@ -151,11 +153,11 @@ Applet1(VOID)
   psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE;
   psh.hwndParent = NULL;
   psh.hInstance = hApplet;
-  psh.u1.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1));
+  psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1));
   psh.pszCaption = Caption;
   psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE);
-  psh.u2.nStartPage = 0;
-  psh.u3.ppsp = psp;
+  psh.nStartPage = 0;
+  psh.ppsp = psp;
   psh.pfnCallback = PropSheetProc;
   
   InitPropSheetPage(&psp[0], IDD_PROPPAGE1, Page1Proc);
@@ -196,7 +198,7 @@ CPlApplet(
     }
     case CPL_DBLCLK:
     {
-      Applets[i].AppletProc();
+      Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2);
       break;
     }
   }
diff --git a/reactos/lib/cpl/cplsample/cplsample.h b/reactos/lib/cpl/cplsample/cplsample.h
index 7e289ff404b..817bd4fc80a 100644
--- a/reactos/lib/cpl/cplsample/cplsample.h
+++ b/reactos/lib/cpl/cplsample/cplsample.h
@@ -1,8 +1,6 @@
 #ifndef __CPL_SAMPLE_H
 #define __CPL_SAMPLE_H
 
-typedef LONG (CALLBACK *APPLET_PROC)(VOID);
-
 typedef struct
 {
   int idIcon;
-- 
2.17.1