From deecf156b88af0401036f428984c68ee02b6467f Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Fri, 22 Dec 2006 21:49:18 +0000 Subject: [PATCH] fixed some warnings svn path=/trunk/; revision=25206 --- reactos/base/applications/devmgr/devmgr.c | 4 +- reactos/base/applications/imagesoft/about.c | 2 +- .../base/applications/imagesoft/brightness.c | 6 +-- .../base/applications/imagesoft/contrast.c | 6 +-- .../base/applications/imagesoft/custcombo.c | 6 +-- .../base/applications/imagesoft/floatwindow.c | 2 +- reactos/base/applications/imagesoft/font.c | 4 +- .../base/applications/network/finger/finger.c | 4 +- reactos/base/applications/notepad/main.c | 28 +++++------ reactos/base/applications/notepad/main.h | 48 +++++++++---------- reactos/base/applications/sc/sc.c | 4 +- reactos/base/applications/servman/about.c | 2 +- reactos/base/applications/servman/create.c | 16 +++---- reactos/base/applications/servman/delete.c | 2 +- reactos/base/applications/servman/mainwnd.c | 4 +- reactos/base/applications/servman/misc.c | 8 ++-- reactos/base/applications/sndvol32/mixer.c | 22 ++++----- reactos/base/applications/wordpad/editwnd.c | 4 +- reactos/base/applications/wordpad/mainwnd.c | 2 +- reactos/base/applications/wordpad/misc.c | 4 +- reactos/base/applications/wordpad/wordpad.c | 2 +- 21 files changed, 90 insertions(+), 90 deletions(-) diff --git a/reactos/base/applications/devmgr/devmgr.c b/reactos/base/applications/devmgr/devmgr.c index a13b528798d..9df585a231f 100644 --- a/reactos/base/applications/devmgr/devmgr.c +++ b/reactos/base/applications/devmgr/devmgr.c @@ -63,7 +63,7 @@ void UpdateMenu(HWND, HMENU); BOOL InsertListViewItems(); void PositionHeader(); -void CreateButtons(); +void CreateButtons(HINSTANCE hInstance, HWND hwndParent); void ListByClass(); /************************************************************************** @@ -654,7 +654,7 @@ void InsertIntoListView(int typ, LPTSTR name, LPTSTR intern_name) item.iSubItem = 0; item.state = 0; //item.statemask = 0; - item.pszText=malloc(10); + item.pszText = (char*) malloc(10); if (typ>=1) { sprintf(temp,"%i",typ); diff --git a/reactos/base/applications/imagesoft/about.c b/reactos/base/applications/imagesoft/about.c index 88cdbaa08e4..a53af44d64e 100644 --- a/reactos/base/applications/imagesoft/about.c +++ b/reactos/base/applications/imagesoft/about.c @@ -14,7 +14,7 @@ AboutDialogProc(HWND hDlg, { case WM_INITDIALOG: - hIcon = LoadImage(hInstance, + hIcon = (HICON) LoadImage(hInstance, MAKEINTRESOURCE(IDI_IMAGESOFTICON), IMAGE_ICON, 16, diff --git a/reactos/base/applications/imagesoft/brightness.c b/reactos/base/applications/imagesoft/brightness.c index be0fe8c67e1..59b2398f33c 100644 --- a/reactos/base/applications/imagesoft/brightness.c +++ b/reactos/base/applications/imagesoft/brightness.c @@ -120,7 +120,7 @@ Bri_OnInitDialog(PIMAGEADJUST pImgAdj, HWND hDlg, LPARAM lParam) { - pImgAdj = HeapAlloc(ProcessHeap, + pImgAdj = (IMAGEADJUST*) HeapAlloc(ProcessHeap, 0, sizeof(IMAGEADJUST)); if (!pImgAdj) @@ -137,7 +137,7 @@ Bri_OnInitDialog(PIMAGEADJUST pImgAdj, &pImgAdj->ImageRect); /* Make a static copy of the main image */ - pImgAdj->hBitmap = CopyImage(pImgAdj->Info->ImageEditors->hBitmap, + pImgAdj->hBitmap = (HBITMAP) CopyImage(pImgAdj->Info->ImageEditors->hBitmap, IMAGE_BITMAP, pImgAdj->ImageRect.right, pImgAdj->ImageRect.bottom, @@ -146,7 +146,7 @@ Bri_OnInitDialog(PIMAGEADJUST pImgAdj, goto fail; /* Make a copy which will be updated */ - pImgAdj->hPreviewBitmap = CopyImage(pImgAdj->Info->ImageEditors->hBitmap, + pImgAdj->hPreviewBitmap = (HBITMAP) CopyImage(pImgAdj->Info->ImageEditors->hBitmap, IMAGE_BITMAP, pImgAdj->ImageRect.right, pImgAdj->ImageRect.bottom, diff --git a/reactos/base/applications/imagesoft/contrast.c b/reactos/base/applications/imagesoft/contrast.c index 10b7a8b07d1..aaa1933ff49 100644 --- a/reactos/base/applications/imagesoft/contrast.c +++ b/reactos/base/applications/imagesoft/contrast.c @@ -121,7 +121,7 @@ Cont_OnInitDialog(PIMAGEADJUST pImgAdj, HWND hDlg, LPARAM lParam) { - pImgAdj = HeapAlloc(ProcessHeap, + pImgAdj = (IMAGEADJUST*) HeapAlloc(ProcessHeap, 0, sizeof(IMAGEADJUST)); if (!pImgAdj) @@ -138,7 +138,7 @@ Cont_OnInitDialog(PIMAGEADJUST pImgAdj, &pImgAdj->ImageRect); /* Make a static copy of the main image */ - pImgAdj->hBitmap = CopyImage(pImgAdj->Info->ImageEditors->hBitmap, + pImgAdj->hBitmap = (HBITMAP) CopyImage(pImgAdj->Info->ImageEditors->hBitmap, IMAGE_BITMAP, pImgAdj->ImageRect.right, pImgAdj->ImageRect.bottom, @@ -147,7 +147,7 @@ Cont_OnInitDialog(PIMAGEADJUST pImgAdj, goto fail; /* Make a copy which will be updated */ - pImgAdj->hPreviewBitmap = CopyImage(pImgAdj->Info->ImageEditors->hBitmap, + pImgAdj->hPreviewBitmap = (HBITMAP) CopyImage(pImgAdj->Info->ImageEditors->hBitmap, IMAGE_BITMAP, pImgAdj->ImageRect.right, pImgAdj->ImageRect.bottom, diff --git a/reactos/base/applications/imagesoft/custcombo.c b/reactos/base/applications/imagesoft/custcombo.c index 68b3d107ec0..df8397d9b75 100644 --- a/reactos/base/applications/imagesoft/custcombo.c +++ b/reactos/base/applications/imagesoft/custcombo.c @@ -88,8 +88,8 @@ FlatComboProc(HWND hwnd, pt[2].x = pt[1].x - 2; pt[2].y = pt[1].y + 2; - oldPen = SelectObject(hdc, GetStockPen(WHITE_PEN)); - oldBrush = SelectObject(hdc, GetStockBrush(WHITE_BRUSH)); + oldPen = (HPEN) SelectObject(hdc, GetStockPen(WHITE_PEN)); + oldBrush = (HBRUSH) SelectObject(hdc, GetStockBrush(WHITE_BRUSH)); Polygon(hdc, pt, 3); SelectObject(hdc, oldPen); @@ -112,7 +112,7 @@ FlatComboProc(HWND hwnd, pt[2].x = pt[1].x - 2; pt[2].y = pt[1].y + 2; - oldBrush = SelectObject(hdc, GetStockBrush(BLACK_BRUSH)); + oldBrush = (HBRUSH) SelectObject(hdc, GetStockBrush(BLACK_BRUSH)); Polygon(hdc, pt, 3); SelectObject(hdc, oldBrush); diff --git a/reactos/base/applications/imagesoft/floatwindow.c b/reactos/base/applications/imagesoft/floatwindow.c index c0e9e6a374a..14d6bf4c29a 100644 --- a/reactos/base/applications/imagesoft/floatwindow.c +++ b/reactos/base/applications/imagesoft/floatwindow.c @@ -185,7 +185,7 @@ FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info) WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, 2, 2, - rect.right * 0.65, + (int) (rect.right * 0.65), rect.bottom - 2, Info->fltColors->hSelf, NULL, diff --git a/reactos/base/applications/imagesoft/font.c b/reactos/base/applications/imagesoft/font.c index 85fbaf8cfdc..972798c398d 100644 --- a/reactos/base/applications/imagesoft/font.c +++ b/reactos/base/applications/imagesoft/font.c @@ -88,7 +88,7 @@ FillFontSizeComboList(HWND hwndCombo) INT cursize = 12; INT i, count, nearest = 0; - HFONT hFont = GetStockObject(DEFAULT_GUI_FONT); + HFONT hFont = (HFONT) GetStockObject(DEFAULT_GUI_FONT); SendMessage(hwndCombo, WM_SETFONT, @@ -146,7 +146,7 @@ FillFontStyleComboList(HWND hwndCombo) LOGFONT lf; /* FIXME: draw each font in its own style */ - HFONT hFont = GetStockObject(DEFAULT_GUI_FONT); + HFONT hFont = (HFONT) GetStockObject(DEFAULT_GUI_FONT); SendMessage(hwndCombo, WM_SETFONT, (WPARAM)hFont, diff --git a/reactos/base/applications/network/finger/finger.c b/reactos/base/applications/network/finger/finger.c index 0c0e532de48..358bb4fa95a 100644 --- a/reactos/base/applications/network/finger/finger.c +++ b/reactos/base/applications/network/finger/finger.c @@ -129,8 +129,8 @@ userlist(int argc, char **argv) int iErr; - if ((nargv = malloc((argc+1) * sizeof(char *))) == NULL || - (used = calloc(argc, sizeof(int))) == NULL) + if ((nargv = (char**) malloc((argc+1) * sizeof(char *))) == NULL || + (used = (int*) calloc(argc, sizeof(int))) == NULL) err(1, NULL); /* Pull out all network requests into nargv. */ diff --git a/reactos/base/applications/notepad/main.c b/reactos/base/applications/notepad/main.c index 0d10a796673..2f357ab376c 100644 --- a/reactos/base/applications/notepad/main.c +++ b/reactos/base/applications/notepad/main.c @@ -378,7 +378,7 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_DROPFILES: { WCHAR szFileName[MAX_PATH]; - HANDLE hDrop = (HANDLE) wParam; + HDROP hDrop = (HDROP) wParam; DragQueryFile(hDrop, 0, szFileName, SIZEOF(szFileName)); DragFinish(hDrop); @@ -529,8 +529,8 @@ static void HandleCommandLine(LPWSTR cmdline) int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) { MSG msg; - HACCEL hAccel; - WNDCLASSEX class; + HACCEL hAccel; + WNDCLASSEX wndclass; static const WCHAR className[] = {'N','P','C','l','a','s','s',0}; static const WCHAR winName[] = {'N','o','t','e','p','a','d',0}; @@ -543,19 +543,19 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) Globals.hInstance = hInstance; LoadSettings(); - ZeroMemory(&class, sizeof(class)); - class.cbSize = sizeof(class); - class.lpfnWndProc = NOTEPAD_WndProc; - class.hInstance = Globals.hInstance; - class.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_NPICON)); - class.hCursor = LoadCursor(0, IDC_ARROW); - class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - class.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); - class.lpszClassName = className; - class.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_NPICON), + ZeroMemory(&wndclass, sizeof(wndclass)); + wndclass.cbSize = sizeof(wndclass); + wndclass.lpfnWndProc = NOTEPAD_WndProc; + wndclass.hInstance = Globals.hInstance; + wndclass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_NPICON)); + wndclass.hCursor = LoadCursor(0, IDC_ARROW); + wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wndclass.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); + wndclass.lpszClassName = className; + wndclass.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_NPICON), IMAGE_ICON, 16, 16, 0); - if (!RegisterClassEx(&class)) return FALSE; + if (!RegisterClassEx(&wndclass)) return FALSE; /* Setup windows */ diff --git a/reactos/base/applications/notepad/main.h b/reactos/base/applications/notepad/main.h index 955b6d8976e..141bedfa1e2 100644 --- a/reactos/base/applications/notepad/main.h +++ b/reactos/base/applications/notepad/main.h @@ -41,30 +41,30 @@ typedef struct { - HANDLE hInstance; - HWND hMainWnd; - HWND hFindReplaceDlg; - HWND hEdit; - HWND hStatusBar; - HFONT hFont; /* Font used by the edit control */ - LOGFONT lfFont; - BOOL bWrapLongLines; - BOOL bShowStatusBar; - WCHAR szFindText[MAX_PATH]; - WCHAR szReplaceText[MAX_PATH]; - WCHAR szFileName[MAX_PATH]; - WCHAR szFileTitle[MAX_PATH]; - WCHAR szFilter[2 * MAX_STRING_LEN + 100]; - WCHAR szMarginTop[MAX_PATH]; - WCHAR szMarginBottom[MAX_PATH]; - WCHAR szMarginLeft[MAX_PATH]; - WCHAR szMarginRight[MAX_PATH]; - WCHAR szHeader[MAX_PATH]; - WCHAR szFooter[MAX_PATH]; - WCHAR szStatusBarLine[MAX_PATH]; - WCHAR szStatusBarCol[MAX_PATH]; - int iEncoding; - int iEoln; + HINSTANCE hInstance; + HWND hMainWnd; + HWND hFindReplaceDlg; + HWND hEdit; + HWND hStatusBar; + HFONT hFont; /* Font used by the edit control */ + LOGFONT lfFont; + BOOL bWrapLongLines; + BOOL bShowStatusBar; + WCHAR szFindText[MAX_PATH]; + WCHAR szReplaceText[MAX_PATH]; + WCHAR szFileName[MAX_PATH]; + WCHAR szFileTitle[MAX_PATH]; + WCHAR szFilter[2 * MAX_STRING_LEN + 100]; + WCHAR szMarginTop[MAX_PATH]; + WCHAR szMarginBottom[MAX_PATH]; + WCHAR szMarginLeft[MAX_PATH]; + WCHAR szMarginRight[MAX_PATH]; + WCHAR szHeader[MAX_PATH]; + WCHAR szFooter[MAX_PATH]; + WCHAR szStatusBarLine[MAX_PATH]; + WCHAR szStatusBarCol[MAX_PATH]; + int iEncoding; + int iEoln; FINDREPLACE find; } NOTEPAD_GLOBALS; diff --git a/reactos/base/applications/sc/sc.c b/reactos/base/applications/sc/sc.c index acf3c840efc..ae4044322e5 100644 --- a/reactos/base/applications/sc/sc.c +++ b/reactos/base/applications/sc/sc.c @@ -245,12 +245,12 @@ int main( int argc, char **argv ) WCHAR **argvW; int i, j, Ret = 1; - if ((argvW = malloc(argc * sizeof(WCHAR*)))) + if ((argvW = (WCHAR**) malloc(argc * sizeof(WCHAR*)))) { /* convert the arguments */ for (i = 0, j = 0; i < argc; i++) { - if (!(argvW[i] = malloc((strlen(argv[i]) + 1) * sizeof(WCHAR)))) + if (!(argvW[i] = (WCHAR*) malloc((strlen(argv[i]) + 1) * sizeof(WCHAR)))) { j++; } diff --git a/reactos/base/applications/servman/about.c b/reactos/base/applications/servman/about.c index 3dc51b8a8a7..d787d85d219 100644 --- a/reactos/base/applications/servman/about.c +++ b/reactos/base/applications/servman/about.c @@ -20,7 +20,7 @@ AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { case WM_INITDIALOG: - hIcon = LoadImage(hInstance, + hIcon = (HICON) LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, diff --git a/reactos/base/applications/servman/create.c b/reactos/base/applications/servman/create.c index 8bb43b76bb8..58e3c4548c4 100644 --- a/reactos/base/applications/servman/create.c +++ b/reactos/base/applications/servman/create.c @@ -92,7 +92,7 @@ GetDataFromDialog(PCREATE_DATA Data) iLen = GetWindowTextLength(hwnd); if (iLen != 0) { - Data->ServiceName = HeapAlloc(ProcessHeap, + Data->ServiceName = (TCHAR*) HeapAlloc(ProcessHeap, 0, (iLen+1) * sizeof(TCHAR)); if (Data->ServiceName != NULL) @@ -122,7 +122,7 @@ GetDataFromDialog(PCREATE_DATA Data) iLen = GetWindowTextLength(hwnd); if (iLen != 0) { - Data->DisplayName = HeapAlloc(ProcessHeap, + Data->DisplayName = (TCHAR*) HeapAlloc(ProcessHeap, 0, (iLen+1) * sizeof(TCHAR)); if (Data->DisplayName != NULL) @@ -152,7 +152,7 @@ GetDataFromDialog(PCREATE_DATA Data) iLen = GetWindowTextLength(hwnd); if (iLen != 0) { - Data->BinPath = HeapAlloc(ProcessHeap, + Data->BinPath = (TCHAR*) HeapAlloc(ProcessHeap, 0, (iLen+1) * sizeof(TCHAR)); if (Data->BinPath != NULL) @@ -182,7 +182,7 @@ GetDataFromDialog(PCREATE_DATA Data) iLen = GetWindowTextLength(hwnd); if (iLen != 0) { - Data->Description = HeapAlloc(ProcessHeap, + Data->Description = (TCHAR*) HeapAlloc(ProcessHeap, 0, (iLen+1) * sizeof(TCHAR)); if (Data->Description != NULL) @@ -203,7 +203,7 @@ GetDataFromDialog(PCREATE_DATA Data) iLen = GetWindowTextLength(hwnd); if (iLen != 0) { - Data->Options = HeapAlloc(ProcessHeap, + Data->Options = (TCHAR*) HeapAlloc(ProcessHeap, 0, (iLen+1) * sizeof(TCHAR)); if (Data->Options != NULL) @@ -263,7 +263,7 @@ CreateHelpDialogProc(HWND hDlg, { case WM_INITDIALOG: { - hIcon = LoadImage(hInstance, + hIcon = (HICON) LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, @@ -318,7 +318,7 @@ CreateDialogProc(HWND hDlg, { case WM_INITDIALOG: { - hIcon = LoadImage(hInstance, + hIcon = (HICON) LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, @@ -340,7 +340,7 @@ CreateDialogProc(HWND hDlg, { PCREATE_DATA Data; - Data = HeapAlloc(ProcessHeap, + Data = (PCREATE_DATA) HeapAlloc(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(CREATE_DATA)); if (Data != NULL) diff --git a/reactos/base/applications/servman/delete.c b/reactos/base/applications/servman/delete.c index c2fe5a7e1cb..430aa2b6906 100644 --- a/reactos/base/applications/servman/delete.c +++ b/reactos/base/applications/servman/delete.c @@ -71,7 +71,7 @@ DeleteDialogProc(HWND hDlg, { Info = (PMAIN_WND_INFO)lParam; - hIcon = LoadImage(hInstance, + hIcon = (HICON) LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, diff --git a/reactos/base/applications/servman/mainwnd.c b/reactos/base/applications/servman/mainwnd.c index 9ed5a9ad0e5..ecd3e03c5f0 100644 --- a/reactos/base/applications/servman/mainwnd.c +++ b/reactos/base/applications/servman/mainwnd.c @@ -523,7 +523,7 @@ MainWndCommand(PMAIN_WND_INFO Info, { PPROP_DLG_INFO PropSheet; - PropSheet = HeapAlloc(ProcessHeap, + PropSheet = (PROP_DLG_INFO*) HeapAlloc(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(PROP_DLG_INFO)); if (PropSheet != NULL) @@ -998,7 +998,7 @@ CreateMainWindow(LPCTSTR lpCaption, PMAIN_WND_INFO Info; HWND hMainWnd = NULL; - Info = HeapAlloc(ProcessHeap, + Info = (MAIN_WND_INFO*) HeapAlloc(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(MAIN_WND_INFO)); diff --git a/reactos/base/applications/servman/misc.c b/reactos/base/applications/servman/misc.c index 0f64719e331..86d4e2094d4 100644 --- a/reactos/base/applications/servman/misc.c +++ b/reactos/base/applications/servman/misc.c @@ -28,7 +28,7 @@ LengthOfStrResource(IN HINSTANCE hInst, /* Find the string table block */ if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && (hRes = LoadResource(hInst, hrSrc)) && - (lpStr = LockResource(hRes))) + (lpStr = (WCHAR*) LockResource(hRes))) { UINT x; @@ -86,7 +86,7 @@ LoadAndFormatString(IN HINSTANCE hInstance, uID) > 0) { va_start(lArgs, lpTarget); - /* let's use FormatMessage to format it because it has the ability to allocate + /* let's use Format to format it because it has the ability to allocate memory automatically */ Ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, lpFormat, @@ -203,7 +203,7 @@ VOID GetError(VOID) 0, NULL ); - MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); + MessageBox(NULL, (LPCTSTR) lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } @@ -237,7 +237,7 @@ InitImageList(UINT StartResource, /* Add all icons to the image list */ for (i = StartResource; i <= EndResource; i++) { - hBitmap = LoadImage(hInstance, + hBitmap = (HBITMAP) LoadImage(hInstance, MAKEINTRESOURCE(i), IMAGE_BITMAP, Width, diff --git a/reactos/base/applications/sndvol32/mixer.c b/reactos/base/applications/sndvol32/mixer.c index 44f0abe74fe..d7bb2b37c71 100644 --- a/reactos/base/applications/sndvol32/mixer.c +++ b/reactos/base/applications/sndvol32/mixer.c @@ -68,7 +68,7 @@ ClearMixerCache(PSND_MIXER Mixer) PSND_MIXER SndMixerCreate(HWND hWndNotification) { - PSND_MIXER Mixer = HeapAlloc(GetProcessHeap(), + PSND_MIXER Mixer = (PSND_MIXER) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SND_MIXER)); if (Mixer != NULL) @@ -115,7 +115,7 @@ SndMixerQueryControls(PSND_MIXER Mixer, { if (LineInfo->cControls > 0) { - *Controls = HeapAlloc(GetProcessHeap(), + *Controls = (MIXERCONTROL*) HeapAlloc(GetProcessHeap(), 0, LineInfo->cControls * sizeof(MIXERCONTROL)); if (*Controls != NULL) @@ -128,7 +128,7 @@ SndMixerQueryControls(PSND_MIXER Mixer, LineControls.dwLineID = LineInfo->dwLineID; LineControls.cControls = LineInfo->cControls; LineControls.cbmxctrl = sizeof(MIXERCONTROL); - LineControls.pamxctrl = (PVOID)(*Controls); + LineControls.pamxctrl = (MIXERCONTROL*)(*Controls); Result = mixerGetLineControls((HMIXEROBJ)Mixer->hmx, &LineControls, @@ -191,9 +191,9 @@ SndMixerQueryConnections(PSND_MIXER Mixer, { LPMIXERCONTROL Controls; PSND_MIXER_CONNECTION Con; - + DPRINT("++ Source: %ws\n", LineInfo.szName); - + DispControls = 0; if (!SndMixerQueryControls(Mixer, @@ -206,7 +206,7 @@ SndMixerQueryConnections(PSND_MIXER Mixer, break; } - Con = HeapAlloc(GetProcessHeap(), + Con = (SND_MIXER_CONNECTION*) HeapAlloc(GetProcessHeap(), 0, sizeof(SND_MIXER_CONNECTION)); if (Con != NULL) @@ -245,7 +245,7 @@ SndMixerQueryDestinations(PSND_MIXER Mixer) { PSND_MIXER_DESTINATION Line; - Line = HeapAlloc(GetProcessHeap(), + Line = (SND_MIXER_DESTINATION*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SND_MIXER_DESTINATION)); if (Line != NULL) @@ -257,7 +257,7 @@ SndMixerQueryDestinations(PSND_MIXER Mixer) MIXER_GETLINEINFOF_DESTINATION) == MMSYSERR_NOERROR) { DPRINT("+ Destination: %ws (0x%x, %d)\n", Line->Info.szName, Line->Info.dwLineID, Line->Info.dwComponentType); - + if (!SndMixerQueryControls(Mixer, &Line->DisplayControls, &Line->Info, @@ -516,7 +516,7 @@ SndMixerEnumConnections(PSND_MIXER Mixer, if (Line->Info.dwLineID == LineID) { PSND_MIXER_CONNECTION Connection; - + if (Line->DisplayControls != 0) { if (!EnumProc(Mixer, @@ -538,7 +538,7 @@ SndMixerEnumConnections(PSND_MIXER Mixer, return FALSE; } } - + return TRUE; } } @@ -560,7 +560,7 @@ SndMixerIsDisplayControl(PSND_MIXER Mixer, return TRUE; } } - + return FALSE; } diff --git a/reactos/base/applications/wordpad/editwnd.c b/reactos/base/applications/wordpad/editwnd.c index 8722e61e13a..561df5267d8 100644 --- a/reactos/base/applications/wordpad/editwnd.c +++ b/reactos/base/applications/wordpad/editwnd.c @@ -36,7 +36,7 @@ InitEditWnd(PEDIT_WND_INFO Info) return FALSE; } - hfDefault = GetStockObject(DEFAULT_GUI_FONT); + hfDefault = (HFONT) GetStockObject(DEFAULT_GUI_FONT); SendMessage(Info->hEdit, WM_SETFONT, (WPARAM)hfDefault, @@ -135,7 +135,7 @@ CreateEditWindow(struct _MAIN_WND_INFO *MainWnd, PEDIT_WND_INFO Info; HWND hWndEditor; - Info = HeapAlloc(ProcessHeap, + Info = (EDIT_WND_INFO*) HeapAlloc(ProcessHeap, 0, sizeof(EDIT_WND_INFO)); if (Info != NULL) diff --git a/reactos/base/applications/wordpad/mainwnd.c b/reactos/base/applications/wordpad/mainwnd.c index a7839e6d0fd..a9a703fb7c5 100644 --- a/reactos/base/applications/wordpad/mainwnd.c +++ b/reactos/base/applications/wordpad/mainwnd.c @@ -578,7 +578,7 @@ CreateMainWindow(LPCTSTR lpCaption, PMAIN_WND_INFO Info; HWND hMainWnd = NULL; - Info = HeapAlloc(ProcessHeap, + Info = (MAIN_WND_INFO*) HeapAlloc(ProcessHeap, 0, sizeof(MAIN_WND_INFO)); if (Info != NULL) diff --git a/reactos/base/applications/wordpad/misc.c b/reactos/base/applications/wordpad/misc.c index 8f728562a2d..813bac5239f 100644 --- a/reactos/base/applications/wordpad/misc.c +++ b/reactos/base/applications/wordpad/misc.c @@ -19,7 +19,7 @@ LengthOfStrResource(IN HINSTANCE hInst, /* Find the string table block */ if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && (hRes = LoadResource(hInst, hrSrc)) && - (lpStr = LockResource(hRes))) + (lpStr = (WCHAR*) LockResource(hRes))) { UINT x; @@ -197,7 +197,7 @@ VOID GetError(DWORD err) 0, NULL ); - MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); + MessageBox(NULL, (LPCTSTR) lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } diff --git a/reactos/base/applications/wordpad/wordpad.c b/reactos/base/applications/wordpad/wordpad.c index cc96cb69285..eac226309ed 100644 --- a/reactos/base/applications/wordpad/wordpad.c +++ b/reactos/base/applications/wordpad/wordpad.c @@ -35,7 +35,7 @@ _tWinMain(HINSTANCE hThisInstance, } len = _tcslen(lpAppName) + _tcslen(lpVersion); - lpTitle = HeapAlloc(ProcessHeap, + lpTitle = (TCHAR*) HeapAlloc(ProcessHeap, 0, (len + 2) * sizeof(TCHAR));