fix msvc warnings Modified: trunk/reactos/subsys/system/servman/about.c Modified: trunk/reactos/subsys/system/servman/propsheet.c Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h _____
Modified: trunk/reactos/subsys/system/servman/about.c --- trunk/reactos/subsys/system/servman/about.c 2006-01-09 00:34:53 UTC (rev 20745) +++ trunk/reactos/subsys/system/servman/about.c 2006-01-09 00:36:08 UTC (rev 20746) @@ -13,6 +13,9 @@
extern HINSTANCE hInstance;
+#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { _____
Modified: trunk/reactos/subsys/system/servman/propsheet.c --- trunk/reactos/subsys/system/servman/propsheet.c 2006-01-09 00:34:53 UTC (rev 20745) +++ trunk/reactos/subsys/system/servman/propsheet.c 2006-01-09 00:36:08 UTC (rev 20746) @@ -11,7 +11,9 @@
extern HINSTANCE hInstance;
- +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif /* Property page dialog callback */ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, _____
Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-09 00:34:53 UTC (rev 20745) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-09 00:36:08 UTC (rev 20746) @@ -46,7 +46,7 @@
/* Create the icon image lists */ hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR16, 1, 1); + GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR16, 1, 1);
/* Add an icon to each image list */ hiconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); _____
Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-09 00:34:53 UTC (rev 20745) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-09 00:36:08 UTC (rev 20746) @@ -177,12 +177,15 @@
SendMessage(hStatus, SB_SETPARTS, sizeof(statwidths)/sizeof(int), (LPARAM)statwidths);
- /* populate the list view with all services */ + +/* ================= populate the list view with all services =================== */ + if (! RefreshServiceList() ) GetError();
} break; + case WM_SIZE: { RECT rcTool; @@ -241,7 +244,7 @@
// Specify the resource identifier of the descriptive // text for the given button. - idButton = lpttt->hdr.idFrom; + idButton = (UINT)lpttt->hdr.idFrom; switch (idButton) { case ID_PROP: @@ -337,11 +340,13 @@ break;
case ID_HELP: + MessageBox(NULL, _T("Help is not yet implemented\n"), + _T("Note!"), MB_OK | MB_ICONINFORMATION); break;
case ID_EXIT: - PostMessage(hwnd, WM_CLOSE, 0, 0); - break; + PostMessage(hwnd, WM_CLOSE, 0, 0); + break;
case ID_VIEW_CUSTOMIZE: break; @@ -362,8 +367,9 @@ return 0; }
- -//#pragma warning(disable : 4100) +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif int WINAPI WinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { @@ -426,7 +432,7 @@ DispatchMessage(&Msg); } } - return Msg.wParam; + return (int)Msg.wParam; }
_____
Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-09 00:34:53 UTC (rev 20745) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-09 00:36:08 UTC (rev 20746) @@ -13,15 +13,13 @@
BOOL RefreshServiceList(VOID);
-BOOL CALLBACK -AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
VOID GetError(VOID); VOID FreeMemory(VOID); VOID DisplayString(PTCHAR);
-LONG APIENTRY -PropSheets(HWND hwnd); +LONG APIENTRY PropSheets(HWND hwnd);
DWORD GetServiceList(VOID);