Modified: trunk/reactos/subsys/system/regedit/childwnd.c
Modified: trunk/reactos/subsys/system/regedit/edit.c
Modified: trunk/reactos/subsys/system/regedit/hexedit.c
Modified: trunk/reactos/subsys/system/regedit/listview.c
Modified: trunk/reactos/subsys/system/regedit/main.c
Modified: trunk/reactos/subsys/system/regedit/main.h
Modified: trunk/reactos/subsys/system/regedit/treeview.c
--- trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-29 01:35:32 UTC (rev 19739)
+++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-29 01:48:25 UTC (rev 19740)
@@ -287,8 +287,8 @@
_tcsncpy(pChildWnd->szPath, buffer, MAX_PATH);
pChildWnd->nSplitPos = 250;
pChildWnd->hWnd = hWnd;
- pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, TREE_WINDOW);
- pChildWnd->hListWnd = CreateListView(hWnd, LIST_WINDOW/*, pChildWnd->szPath*/);
+ pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW);
+ pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/);
SetFocus(pChildWnd->hTreeWnd);
break;
}
--- trunk/reactos/subsys/system/regedit/edit.c 2005-11-29 01:35:32 UTC (rev 19739)
+++ trunk/reactos/subsys/system/regedit/edit.c 2005-11-29 01:48:25 UTC (rev 19740)
@@ -248,7 +248,7 @@
{
WNDPROC oldwndproc;
- oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWL_USERDATA);
+ oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWL_USERDATA);
switch (uMsg)
{
@@ -301,7 +301,7 @@
/* subclass the edit control */
hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA);
- oldproc = (WNDPROC)GetWindowLongPtr(hwndValue, GWL_WNDPROC);
+ oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwndValue, GWL_WNDPROC);
SetWindowLongPtr(hwndValue, GWL_USERDATA, (DWORD_PTR)oldproc);
SetWindowLongPtr(hwndValue, GWL_WNDPROC, (DWORD_PTR)DwordEditSubclassProc);
--- trunk/reactos/subsys/system/regedit/hexedit.c 2005-11-29 01:35:32 UTC (rev 19739)
+++ trunk/reactos/subsys/system/regedit/hexedit.c 2005-11-29 01:48:25 UTC (rev 19740)
@@ -867,7 +867,7 @@
{
PHEXEDIT_DATA hed;
- hed = (PHEXEDIT_DATA)GetWindowLongPtr(hWnd, (DWORD_PTR)0);
+ hed = (PHEXEDIT_DATA)(LONG_PTR)GetWindowLongPtr(hWnd, (DWORD_PTR)0);
switch(uMsg)
{
case WM_ERASEBKGND:
--- trunk/reactos/subsys/system/regedit/listview.c 2005-11-29 01:35:32 UTC (rev 19739)
+++ trunk/reactos/subsys/system/regedit/listview.c 2005-11-29 01:48:25 UTC (rev 19740)
@@ -474,7 +474,7 @@
}
-HWND CreateListView(HWND hwndParent, int id)
+HWND CreateListView(HWND hwndParent, HMENU id)
{
RECT rcClient;
HWND hwndLV;
@@ -484,7 +484,7 @@
hwndLV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_LISTVIEW, _T("List View"),
WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS,
0, 0, rcClient.right, rcClient.bottom,
- hwndParent, (HMENU)id, hInst, NULL);
+ hwndParent, id, hInst, NULL);
if (!hwndLV) return NULL;
/* Initialize the image list, and add items to the control. */
--- trunk/reactos/subsys/system/regedit/main.c 2005-11-29 01:35:32 UTC (rev 19739)
+++ trunk/reactos/subsys/system/regedit/main.c 2005-11-29 01:48:25 UTC (rev 19740)
@@ -144,7 +144,7 @@
DWORD dwError = GetLastError();
} */
- hFrameWnd = CreateWindowEx(WS_EX_WINDOWEDGE, (LPCTSTR)(int)hFrameWndClass, szTitle,
+ hFrameWnd = CreateWindowEx(WS_EX_WINDOWEDGE, (LPCTSTR)(UlongToPtr(hFrameWndClass)), szTitle,
WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
NULL, hMenuFrame, hInstance, NULL/*lpParam*/);
--- trunk/reactos/subsys/system/regedit/main.h 2005-11-29 01:35:32 UTC (rev 19739)
+++ trunk/reactos/subsys/system/regedit/main.h 2005-11-29 01:48:25 UTC (rev 19740)
@@ -99,14 +99,14 @@
extern BOOL ExportRegistryFile(HWND hWnd);
/* listview.c */
-extern HWND CreateListView(HWND hwndParent, int id);
+extern HWND CreateListView(HWND hwndParent, HMENU id);
extern BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCTSTR keyPath);
extern LPCTSTR GetValueName(HWND hwndLV, int iStartAt);
extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result);
extern BOOL IsDefaultValue(HWND hwndLV, int i);
/* treeview.c */
-extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id);
+extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, HMENU id);
extern BOOL RefreshTreeView(HWND hWndTV);
extern BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem);
extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv);
--- trunk/reactos/subsys/system/regedit/treeview.c 2005-11-29 01:35:32 UTC (rev 19739)
+++ trunk/reactos/subsys/system/regedit/treeview.c 2005-11-29 01:48:25 UTC (rev 19740)
@@ -572,7 +572,7 @@
* Returns the handle to the new control if successful, or NULL otherwise.
* hwndParent - handle to the control's parent window.
*/
-HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id)
+HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, HMENU id)
{
RECT rcClient;
HWND hwndTV;
@@ -582,7 +582,7 @@
hwndTV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL,
WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS,
0, 0, rcClient.right, rcClient.bottom,
- hwndParent, (HMENU)id, hInst, NULL);
+ hwndParent, id, hInst, NULL);
/* Initialize the image list, and add items to the control. */
if (!InitTreeViewImageLists(hwndTV) || !InitTreeViewItems(hwndTV, pHostName)) {
DestroyWindow(hwndTV);