15 Aug
2009
15 Aug
'09
4:58 p.m.
Author: fireball
Date: Sat Aug 15 18:58:58 2009
New Revision: 42710
URL: http://svn.reactos.org/svn/reactos?rev=42710&view=rev
Log:
- Totally get rid of 16 bit global heap functions.
Modified:
branches/arwinss/reactos/dll/win32/user32/controls.h
branches/arwinss/reactos/dll/win32/user32/defdlg.c
branches/arwinss/reactos/dll/win32/user32/legacy.c
branches/arwinss/reactos/dll/win32/user32/menu.c
branches/arwinss/reactos/dll/win32/user32/static.c
branches/arwinss/reactos/dll/win32/user32/uitools.c
branches/arwinss/reactos/dll/win32/user32/winproc.c
Modified: branches/arwinss/reactos/dll/win32/user32/controls.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/controls.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/controls.h [iso-8859-1] Sat Aug 15 18:58:58
2009
@@ -160,7 +160,7 @@
UINT yBaseUnit;
INT idResult; /* EndDialog() result / default pushbutton ID */
UINT flags; /* EndDialog() called for this dialog */
- HGLOBAL16 hDialogHeap;
+ HGLOBAL hDialogHeap;
} DIALOGINFO;
#define DF_END 0x0001
Modified: branches/arwinss/reactos/dll/win32/user32/defdlg.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/defdlg.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/defdlg.c [iso-8859-1] Sat Aug 15 18:58:58
2009
@@ -237,8 +237,8 @@
/* Free dialog heap (if created) */
if (dlgInfo->hDialogHeap)
{
- GlobalUnlock16(dlgInfo->hDialogHeap);
- GlobalFree16(dlgInfo->hDialogHeap);
+ GlobalUnlock(dlgInfo->hDialogHeap);
+ GlobalFree(dlgInfo->hDialogHeap);
}
if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont );
if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu );
Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] Sat Aug 15 18:58:58
2009
@@ -14,81 +14,6 @@
RosUserConnectCsrss();
WINE_DEFAULT_DEBUG_CHANNEL(userlegacy);
-
-void WINAPI DbgBreakPoint(void);
-
-LPVOID
-WINAPI
-GlobalLock16(HGLOBAL16 h)
-{
- UNIMPLEMENTED;
- return NULL;
-}
-
-BOOL16
-WINAPI
-GlobalUnlock16(HGLOBAL16 h)
-{
- UNIMPLEMENTED;
- return FALSE;
-}
-
-HGLOBAL16
-WINAPI
-GlobalAlloc16(UINT16 u, DWORD d)
-{
- UNIMPLEMENTED;
- DbgBreakPoint();
- return 0;
-}
-
-HGLOBAL16
-WINAPI
-GlobalFree16(HGLOBAL16 h)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
-DWORD
-WINAPI
-GlobalSize16(HGLOBAL16 h)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
-SEGPTR
-WINAPI
-LocalLock16(HLOCAL16 h)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
-BOOL16
-WINAPI
-LocalUnlock16(HLOCAL16 h)
-{
- UNIMPLEMENTED;
- return FALSE;
-}
-
-LPVOID
-WINAPI
-LockResource16(HGLOBAL16 h)
-{
- UNIMPLEMENTED;
- return NULL;
-}
-
-BOOL16
-WINAPI
-FreeResource16(HGLOBAL16 h)
-{
- UNIMPLEMENTED;
- return FALSE;
-}
VOID
WINAPI
Modified: branches/arwinss/reactos/dll/win32/user32/menu.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] Sat Aug 15 18:58:58 2009
@@ -5351,13 +5351,13 @@
INT WINAPI TranslateAcceleratorA( HWND hWnd, HACCEL hAccel, LPMSG msg )
{
/* YES, Accel16! */
- LPACCEL16 lpAccelTbl;
+ LPACCEL lpAccelTbl;
int i;
WPARAM wParam;
if (!hWnd || !msg) return 0;
- if (!hAccel || !(lpAccelTbl = (LPACCEL16) LockResource16(LOWORD(hAccel))))
+ if (!hAccel || !(lpAccelTbl = (LPACCEL) LockResource(hAccel)))
{
WARN_(accel)("invalid accel handle=%p\n", hAccel);
return 0;
Modified: branches/arwinss/reactos/dll/win32/user32/static.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/static.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/static.c [iso-8859-1] Sat Aug 15 18:58:58
2009
@@ -151,7 +151,7 @@
CURSORICONINFO * info;
if ((style & SS_TYPEMASK) != SS_ICON) return 0;
- info = hicon ? GlobalLock16(HICON_16(hicon)) : NULL;
+ info = hicon ? GlobalLock(hicon) : NULL;
if (hicon && !info) {
WARN("hicon != 0, but info == 0\n");
return 0;
@@ -174,7 +174,7 @@
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
}
}
- if (info) GlobalUnlock16(HICON_16(hicon));
+ if (info) GlobalUnlock(hicon);
return prevIcon;
}
@@ -803,7 +803,7 @@
GetClientRect( hwnd, &rc );
hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc);
hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET );
- info = hIcon ? GlobalLock16(HICON_16(hIcon)) : NULL;
+ info = hIcon ? GlobalLock(hIcon) : NULL;
if (!hIcon || !info)
{
FillRect(hdc, &rc, hbrush);
@@ -823,7 +823,7 @@
DrawIconEx( hdc, iconRect.left, iconRect.top, hIcon, iconRect.right -
iconRect.left,
iconRect.bottom - iconRect.top, 0, NULL, DI_NORMAL );
}
- if (info) GlobalUnlock16(HICON_16(hIcon));
+ if (info) GlobalUnlock(hIcon);
}
static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style )
Modified: branches/arwinss/reactos/dll/win32/user32/uitools.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] Sat Aug 15 18:58:58
2009
@@ -1612,11 +1612,11 @@
break;
case DST_ICON:
- ici = GlobalLock16((HGLOBAL16)lp);
+ ici = GlobalLock((HGLOBAL)lp);
if(!ici) return FALSE;
s.cx = ici->nWidth;
s.cy = ici->nHeight;
- GlobalUnlock16((HGLOBAL16)lp);
+ GlobalUnlock((HGLOBAL)lp);
break;
case DST_BITMAP:
Modified: branches/arwinss/reactos/dll/win32/user32/winproc.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] Sat Aug 15 18:58:58
2009
@@ -739,7 +739,7 @@
}
-
+#if 0
static UINT_PTR convert_handle_16_to_32(HANDLE16 src, unsigned int flags)
{
HANDLE dst;
@@ -773,6 +773,7 @@
return dst;
}
+#endif
/**********************************************************************
5875
days inactive
5875
days old
0 comments
1 participants
participants (1)
-
fireball＠svn.reactos.org