4 modified files
reactos/lib/shell32
diff -u -r1.3 -r1.4
--- autocomplete.c 20 Sep 2004 09:18:52 -0000 1.3
+++ autocomplete.c 22 Sep 2004 19:46:52 -0000 1.4
@@ -260,7 +260,7 @@
WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
hwndParent, NULL,
- (HINSTANCE)GetWindowLongA( hwndParent, GWL_HINSTANCE ), NULL);
+ (HINSTANCE)GetWindowLongPtrW( hwndParent, GWLP_HINSTANCE ), NULL);
if (This->hwndListBox) {
This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc);
reactos/lib/shell32
diff -u -r1.12 -r1.13
--- dialogs.c 22 Sep 2004 18:47:39 -0000 1.12
+++ dialogs.c 22 Sep 2004 19:46:52 -0000 1.13
@@ -109,8 +109,8 @@
return;
}
- DialogBoxIndirectParamA((HINSTANCE)GetWindowLongA( hwndOwner,
- GWL_HINSTANCE ),
+ DialogBoxIndirectParamA((HINSTANCE)GetWindowLongPtrW( hwndOwner,
+ GWLP_HINSTANCE ),
template, hwndOwner, RunDlgProc, (LPARAM)&rfdp);
}
reactos/lib/shell32
diff -u -r1.9 -r1.10
--- shell32_main.c 22 Sep 2004 05:08:04 -0000 1.9
+++ shell32_main.c 22 Sep 2004 19:46:52 -0000 1.10
@@ -854,7 +854,7 @@
SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 );
info.hFont = CreateFontIndirectW( &logFont );
- bRet = DialogBoxIndirectParamW((HINSTANCE)GetWindowLongW( hWnd, GWL_HINSTANCE ),
+ bRet = DialogBoxIndirectParamW((HINSTANCE)GetWindowLongPtrW( hWnd, GWLP_HINSTANCE ),
template, hWnd, AboutDlgProc, (LPARAM)&info );
DeleteObject(info.hFont);
return bRet;
reactos/lib/shell32
diff -u -r1.9 -r1.10
--- shlview.c 20 Sep 2004 14:38:30 -0000 1.9
+++ shlview.c 22 Sep 2004 19:46:52 -0000 1.10
@@ -1532,7 +1532,7 @@
static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam)
{
- IShellViewImpl * pThis = (IShellViewImpl*)GetWindowLongA(hWnd, GWL_USERDATA);
+ IShellViewImpl * pThis = (IShellViewImpl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
LPCREATESTRUCTA lpcs;
TRACE("(hwnd=%p msg=%x wparm=%x lparm=%lx)\n",hWnd, uMessage, wParam, lParam);
@@ -1542,7 +1542,7 @@
case WM_NCCREATE:
lpcs = (LPCREATESTRUCTA)lParam;
pThis = (IShellViewImpl*)(lpcs->lpCreateParams);
- SetWindowLongA(hWnd, GWL_USERDATA, (LONG)pThis);
+ SetWindowLongPtrW(hWnd, GWLP_USERDATA, (ULONG_PTR)pThis);
pThis->hWnd = hWnd; /*set the window handle*/
break;
CVSspam 0.2.8