Author: cwittich Date: Thu Jul 6 20:25:42 2006 New Revision: 22892
URL: http://svn.reactos.org/svn/reactos?rev=22892&view=rev Log: fixed about 70 warnings (msvc /W4)
Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/find.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/hexedit.c trunk/reactos/base/applications/regedit/listview.c trunk/reactos/base/applications/regedit/main.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/security.c
Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/c... ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Thu Jul 6 20:25:42 2006 @@ -67,7 +67,8 @@ static void ResizeWnd(ChildWnd* pChildWnd, int cx, int cy) { HDWP hdwp = BeginDeferWindowPos(2); - RECT rt = {0, 0, cx, cy}; + RECT rt; + SetRect(&rt, 0, 0, cx, cy);
cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2; DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); @@ -102,6 +103,8 @@ HKEY hRootKey; LPCTSTR keyPath, s; WORD wID = LOWORD(wParam); + + UNREFERENCED_PARAMETER(message);
switch (wID) { /* Parse the menu selections: */ @@ -209,12 +212,12 @@ { if (RegOpenKey(hRootKey, szBuffer, &hOtherKey) == ERROR_SUCCESS) { - lstrcpyn(pszSuggestions, TEXT("HKCR\"), iSuggestionsLength); + lstrcpyn(pszSuggestions, TEXT("HKCR\"), (int) iSuggestionsLength); i = _tcslen(pszSuggestions); pszSuggestions += i; iSuggestionsLength -= i;
- lstrcpyn(pszSuggestions, szBuffer, iSuggestionsLength); + lstrcpyn(pszSuggestions, szBuffer, (int) iSuggestionsLength); i = MIN(_tcslen(pszSuggestions) + 1, iSuggestionsLength); pszSuggestions += i; iSuggestionsLength -= i; @@ -235,12 +238,12 @@ if (RegQueryStringValue(hSubKey, TEXT("CLSID"), NULL, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) == ERROR_SUCCESS) { - lstrcpyn(pszSuggestions, TEXT("HKCR\CLSID\"), iSuggestionsLength); + lstrcpyn(pszSuggestions, TEXT("HKCR\CLSID\"), (int) iSuggestionsLength); i = _tcslen(pszSuggestions); pszSuggestions += i; iSuggestionsLength -= i;
- lstrcpyn(pszSuggestions, szBuffer, iSuggestionsLength); + lstrcpyn(pszSuggestions, szBuffer, (int) iSuggestionsLength); i = MIN(_tcslen(pszSuggestions) + 1, iSuggestionsLength); pszSuggestions += i; iSuggestionsLength -= i; @@ -263,7 +266,7 @@ */ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - static short last_split; + static int last_split; BOOL Result; ChildWnd* pChildWnd = g_pChildWnd;
@@ -432,7 +435,7 @@ _T("Software\Microsoft\Windows\CurrentVersion\Applets\Regedit"), &hKey) == ERROR_SUCCESS) { - RegSetValueEx(hKey, _T("LastKey"), 0, REG_SZ, (LPBYTE) szBuffer, _tcslen(szBuffer) * sizeof(szBuffer[0])); + RegSetValueEx(hKey, _T("LastKey"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) _tcslen(szBuffer) * sizeof(szBuffer[0])); RegCloseKey(hKey); } }
Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/e... ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c (original) +++ trunk/reactos/base/applications/regedit/edit.c Thu Jul 6 20:25:42 2006 @@ -103,6 +103,8 @@ HWND hwndValue; int len;
+ UNREFERENCED_PARAMETER(lParam); + switch(uMsg) { case WM_INITDIALOG: if(editValueName && _tcscmp(editValueName, _T(""))) @@ -168,6 +170,8 @@ HWND hwndValue; int len;
+ UNREFERENCED_PARAMETER(lParam); + switch(uMsg) { case WM_INITDIALOG: if(editValueName && _tcscmp(editValueName, _T(""))) @@ -238,7 +242,7 @@ case WM_CHAR: if (dwordEditMode == EDIT_MODE_DEC) { - if (isdigit(wParam & 0xff)) + if (isdigit((int) wParam & 0xff)) { break; } @@ -249,7 +253,7 @@ } else if (dwordEditMode == EDIT_MODE_HEX) { - if (isxdigit(wParam & 0xff)) + if (isxdigit((int) wParam & 0xff)) { break; } @@ -278,6 +282,8 @@ DWORD Base; DWORD Value = 0;
+ UNREFERENCED_PARAMETER(lParam); + switch(uMsg) { case WM_INITDIALOG: dwordEditMode = EDIT_MODE_HEX; @@ -383,6 +389,8 @@ { HWND hwndValue; UINT len; + + UNREFERENCED_PARAMETER(lParam);
switch(uMsg) { case WM_INITDIALOG: @@ -408,7 +416,7 @@ case IDOK: if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) { - len = HexEdit_GetBufferSize(hwndValue); + len = (UINT) HexEdit_GetBufferSize(hwndValue); if (len != valueDataLen && len > 0) { binValueData = HeapReAlloc(GetProcessHeap(), 0, binValueData, len); @@ -482,7 +490,7 @@ { if (stringValueData) { - lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)stringValueData, (_tcslen(stringValueData) + 1) * sizeof(TCHAR)); + lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)stringValueData, (DWORD) (_tcslen(stringValueData) + 1) * sizeof(TCHAR)); } else { @@ -496,7 +504,7 @@ { if (valueDataLen > 0) { - DWORD llen, listlen, nl_len; + size_t llen, listlen, nl_len; LPTSTR src, lines = NULL;
if (!(stringValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen))) @@ -542,7 +550,7 @@ /* convert \r\n to \0 */ BOOL EmptyLines = FALSE; LPTSTR src, lines, nl; - DWORD linechars, buflen, c_nl, dest; + size_t linechars, buflen, c_nl, dest;
src = stringValueData; buflen = sizeof(TCHAR); @@ -586,7 +594,7 @@ warning(hwnd, IDS_MULTI_SZ_EMPTY_STRING); }
- lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)lines, buflen); + lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)lines, (DWORD) buflen); HeapFree(GetProcessHeap(), 0, lines); } else
Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/f... ============================================================================== --- trunk/reactos/base/applications/regedit/find.c (original) +++ trunk/reactos/base/applications/regedit/find.c Thu Jul 6 20:25:42 2006 @@ -76,6 +76,9 @@
static INT_PTR CALLBACK AbortFindDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hDlg); + switch(uMsg) { case WM_CLOSE: @@ -102,6 +105,7 @@ static BOOL RegSearchProc(LPVOID lpParam) { MSG msg; + UNREFERENCED_PARAMETER(lpParam);
if (s_hwndAbortDialog && PeekMessage(&msg, s_hwndAbortDialog, 0, 0, PM_REMOVE)) {
Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/f... ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c (original) +++ trunk/reactos/base/applications/regedit/framewnd.c Thu Jul 6 20:25:42 2006 @@ -119,6 +119,7 @@ static void OnEnterMenuLoop(HWND hWnd) { int nParts; + UNREFERENCED_PARAMETER(hWnd);
/* Update the status bar pane sizes */ nParts = -1; @@ -191,6 +192,7 @@ static BOOL CheckCommDlgError(HWND hWnd) { DWORD dwErrorCode = CommDlgExtendedError(); + UNREFERENCED_PARAMETER(hWnd); switch (dwErrorCode) { case CDERR_DIALOGFAILURE: break; @@ -347,6 +349,8 @@ LPTSTR pszSelectedKey; OFNOTIFY *pOfnNotify;
+ UNREFERENCED_PARAMETER(wParam); + switch(uiMsg) { case WM_INITDIALOG: pOfn = (OPENFILENAME *) lParam; @@ -453,6 +457,7 @@ { #if 1 PRINTDLG pd; + UNREFERENCED_PARAMETER(path);
ZeroMemory(&pd, sizeof(PRINTDLG)); pd.lStructSize = sizeof(PRINTDLG); @@ -714,7 +719,7 @@ STGMEDIUM stm; FORMATETC fe;
- fe.cfFormat = RegisterClipboardFormat(CFSTR_DSOP_DS_SELECTION_LIST); + fe.cfFormat = (CLIPFORMAT) RegisterClipboardFormat(CFSTR_DSOP_DS_SELECTION_LIST); fe.ptd = NULL; fe.dwAspect = DVASPECT_CONTENT; fe.lindex = -1; @@ -787,6 +792,9 @@ LONG lRet; int item;
+ UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(message); + switch (LOWORD(wParam)) { case ID_REGISTRY_IMPORTREGISTRYFILE: ImportRegistryFile(hWnd);
Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/h... ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c (original) +++ trunk/reactos/base/applications/regedit/hexedit.c Thu Jul 6 20:25:42 2006 @@ -182,7 +182,7 @@ DWORD dx, dy, linestart; INT x; PBYTE buf, current, end, line; - UINT bufsize; + size_t bufsize; TCHAR hex[3], addr[17]; RECT rct;
@@ -526,6 +526,7 @@ static LRESULT HEXEDIT_WM_CREATE(PHEXEDIT_DATA hed) { + UNREFERENCED_PARAMETER(hed); return 1; }
@@ -541,6 +542,7 @@ static LRESULT HEXEDIT_WM_KILLFOCUS(PHEXEDIT_DATA hed) { + UNREFERENCED_PARAMETER(hed); DestroyCaret(); return 0; } @@ -550,6 +552,8 @@ { int ScrollY; SCROLLINFO si; + + UNREFERENCED_PARAMETER(ThumbPosition);
ZeroMemory(&si, sizeof(SCROLLINFO)); si.cbSize = sizeof(SCROLLINFO); @@ -708,6 +712,9 @@ SCROLLINFO si; int ScrollY;
+ UNREFERENCED_PARAMETER(ButtonsDown); + UNREFERENCED_PARAMETER(MousePos); + SetFocus(hed->hWndSelf);
si.cbSize = sizeof(SCROLLINFO); @@ -733,6 +740,7 @@ static LRESULT HEXEDIT_WM_GETDLGCODE(LPMSG Msg) { + UNREFERENCED_PARAMETER(Msg); return DLGC_WANTARROWS | DLGC_WANTCHARS; }
@@ -743,6 +751,7 @@ POINT EditPos; DWORD Hit = HEXEDIT_HitRegionTest(hed, Pt);
+ UNREFERENCED_PARAMETER(Buttons); SetFocus(hed->hWndSelf);
hed->Position = HEXEDIT_PositionFromPoint(hed, Pt, Hit, &EditPos, &NewField); @@ -849,6 +858,9 @@ static LRESULT HEXEDIT_WM_SIZE(PHEXEDIT_DATA hed, DWORD sType, WORD NewWidth, WORD NewHeight) { + UNREFERENCED_PARAMETER(sType); + UNREFERENCED_PARAMETER(NewHeight); + UNREFERENCED_PARAMETER(NewWidth); HEXEDIT_Update(hed); return 0; }
Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/l... ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c (original) +++ trunk/reactos/base/applications/regedit/listview.c Thu Jul 6 20:25:42 2006 @@ -128,7 +128,7 @@ item.state = 0; item.stateMask = 0; item.pszText = Name; - item.cchTextMax = _tcslen(item.pszText); + item.cchTextMax = (int) _tcslen(item.pszText); if (item.cchTextMax == 0) item.pszText = LPSTR_TEXTCALLBACK; item.iImage = 0; @@ -356,6 +356,8 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { LINE_INFO*l, *r; + UNREFERENCED_PARAMETER(lParamSort); + l = (LINE_INFO*)lParam1; r = (LINE_INFO*)lParam2;
@@ -373,6 +375,7 @@ BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) { NMLVDISPINFO* Info; + UNREFERENCED_PARAMETER(wParam); *Result = TRUE; switch (((LPNMHDR)lParam)->code) { case LVN_GETDISPINFO:
Modified: trunk/reactos/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/m... ============================================================================== --- trunk/reactos/base/applications/regedit/main.c (original) +++ trunk/reactos/base/applications/regedit/main.c Thu Jul 6 20:25:42 2006 @@ -62,41 +62,38 @@ HMENU hEditMenu; TCHAR szBuffer[256];
- WNDCLASSEX wcFrame = { - sizeof(WNDCLASSEX), - CS_HREDRAW | CS_VREDRAW/*style*/, - FrameWndProc, - 0/*cbClsExtra*/, - 0/*cbWndExtra*/, - hInstance, - LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)), - LoadCursor(0, IDC_ARROW), - 0/*hbrBackground*/, - 0/*lpszMenuName*/, - szFrameClass, - (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) - }; - ATOM hFrameWndClass = RegisterClassEx(&wcFrame); /* register frame window class */ - - WNDCLASSEX wcChild = { - sizeof(WNDCLASSEX), - CS_HREDRAW | CS_VREDRAW/*style*/, - ChildWndProc, - 0/*cbClsExtra*/, - sizeof(HANDLE)/*cbWndExtra*/, - hInstance, - LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)), - LoadCursor(0, IDC_ARROW), - 0/*hbrBackground*/, - 0/*lpszMenuName*/, - szChildClass, - (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) - - }; - ATOM hChildWndClass = RegisterClassEx(&wcChild); /* register child windows class */ - hChildWndClass = hChildWndClass; /* warning eater */ + WNDCLASSEX wcFrame; + WNDCLASSEX wcChild; + ATOM hFrameWndClass; + ATOM hChildWndClass; + + ZeroMemory(&wcFrame, sizeof(WNDCLASSEX)); + wcFrame.cbSize = sizeof(WNDCLASSEX); + wcFrame.style = CS_HREDRAW | CS_VREDRAW; + wcFrame.lpfnWndProc = FrameWndProc; + wcFrame.hInstance = hInstance; + wcFrame.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)); + wcFrame.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), + IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_SHARED); + wcFrame.hCursor = LoadCursor(0, IDC_ARROW); + wcFrame.lpszClassName = szFrameClass; + + hFrameWndClass = RegisterClassEx(&wcFrame); /* register frame window class */ + + ZeroMemory(&wcChild, sizeof(WNDCLASSEX)); + wcChild.cbSize = sizeof(WNDCLASSEX); + wcChild.style = CS_HREDRAW | CS_VREDRAW; + wcChild.lpfnWndProc = ChildWndProc; + wcChild.cbWndExtra = sizeof(HANDLE); + wcChild.hInstance = hInstance; + wcChild.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)); + wcChild.hCursor = LoadCursor(0, IDC_ARROW), + wcChild.lpszClassName = szChildClass, + wcChild.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); + + hChildWndClass = RegisterClassEx(&wcChild); /* register child windows class */
RegisterHexEditorClass(hInstance);
@@ -195,6 +192,8 @@ MSG msg; HACCEL hAccel;
+ UNREFERENCED_PARAMETER(hPrevInstance); + /* int hCrt; FILE *hf; @@ -238,5 +237,5 @@ }
ExitInstance(hInstance); - return msg.wParam; -} + return (int) msg.wParam; +}
Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/r... ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Thu Jul 6 20:25:42 2006 @@ -227,8 +227,8 @@ char *s = str; /* Pointer to current */ char *b = (char*) buf; /* Pointer to result */
- ULONG strLen = strlen(str); - ULONG strPos = 0; + size_t strLen = strlen(str); + size_t strPos = 0; DWORD byteCount = 0;
memset(buf, 0, bufLen); @@ -645,6 +645,7 @@ */ void doDeleteValue(LPSTR line) { + UNREFERENCED_PARAMETER(line); fprintf(stderr,"%s: deleteValue not yet implemented\n", getAppName()); }
@@ -655,6 +656,7 @@ */ void doDeleteKey(LPSTR line) { + UNREFERENCED_PARAMETER(line); fprintf(stderr,"%s: deleteKey not yet implemented\n", getAppName()); }
@@ -665,6 +667,7 @@ */ void doCreateKey(LPSTR line) { + UNREFERENCED_PARAMETER(line); fprintf(stderr,"%s: createKey not yet implemented\n", getAppName()); }
@@ -735,6 +738,7 @@ */ void processQueryValue(LPSTR cmdline) { + UNREFERENCED_PARAMETER(cmdline); fprintf(stderr,"ERROR!!! - temporary disabled"); exit(1); #if 0 @@ -1791,6 +1795,8 @@ LONG lResult; LPCTSTR s;
+ UNREFERENCED_PARAMETER(dwValueIndex); + if (dwSearchFlags & (RSF_LOOKATVALUES | RSF_LOOKATDATA)) return ERROR_CALL_NOT_IMPLEMENTED; /* NYI */
Modified: trunk/reactos/base/applications/regedit/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/s... ============================================================================== --- trunk/reactos/base/applications/regedit/security.c (original) +++ trunk/reactos/base/applications/regedit/security.c Thu Jul 6 20:25:42 2006 @@ -28,6 +28,8 @@ #if REGEDIT_IMPLEMENT_ISECURITYINFORMATION2 DEFINE_GUID(IID_IRegKeySecurity2, 0xc3ccfdb4, 0x6f88, 0x11d2, 0x00a3, 0xce,0x00,0xc0,0x4f,0xb1,0x78,0x2a); #endif + +/* FIXME: already defined in aclui.h - causing problems when compiling with MSVC/PSDK*/ DEFINE_GUID(IID_IEffectivePermission, 0x3853dc76, 0x9f35, 0x407c, 0x0088, 0xa1,0xd1,0x93,0x44,0x36,0x5f,0xbc); DEFINE_GUID(IID_ISecurityObjectTypeInfo, 0xfc3066eb, 0x79ef, 0x444b, 0x0091, 0x11,0xd1,0x8a,0x75,0xeb,0xf2,0xfa);
@@ -839,7 +841,7 @@ LPTSTR lpKeyPath = NULL; PCRegKeySecurity RegKeySecurity; SI_OBJECT_INFO ObjectInfo; - int lnMachine = 0, lnKeyName = 0; + size_t lnMachine = 0, lnKeyName = 0;
if (pfnEditSecurity == NULL) {
-
cwittich＠svn.reactos.org