[sginsberg] 35697: - Get gdi32 and user32 to compile again - Update some system call prototypes and definitions
Author: sginsberg Date: Wed Aug 27 09:22:38 2008 New Revision: 35697
URL: http://svn.reactos.org/svn/reactos?rev=35697&view=rev Log: - Get gdi32 and user32 to compile again - Update some system call prototypes and definitions
Modified: branches/nwin32/dll/win32/gdi32/misc/hacks.c branches/nwin32/dll/win32/gdi32/objects/bitmap.c branches/nwin32/dll/win32/gdi32/objects/coord.c branches/nwin32/dll/win32/gdi32/objects/font.c branches/nwin32/dll/win32/user32/controls/scrollbar.c branches/nwin32/dll/win32/user32/misc/display.c branches/nwin32/dll/win32/user32/windows/bitmap.c branches/nwin32/dll/win32/user32/windows/class.c branches/nwin32/dll/win32/user32/windows/cursor.c branches/nwin32/dll/win32/user32/windows/icon.c branches/nwin32/dll/win32/user32/windows/input.c branches/nwin32/dll/win32/user32/windows/menu.c branches/nwin32/dll/win32/user32/windows/message.c branches/nwin32/dll/win32/user32/windows/nonclient.c branches/nwin32/dll/win32/user32/windows/window.c branches/nwin32/dll/win32/user32/windows/winpos.c branches/nwin32/include/reactos/win32k/ntuser.h branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c branches/nwin32/subsystems/win32/win32k/ntuser/display.c
Modified: branches/nwin32/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/misc/hack... ============================================================================== --- branches/nwin32/dll/win32/gdi32/misc/hacks.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/misc/hacks.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -21,7 +21,8 @@ int nYOffset, LPPOINT lpPoint) { - return NtGdiOffsetViewportOrgEx(hdc, nXOffset, nYOffset, lpPoint); + /* Unimplemented for now */ + return FALSE; }
/* @@ -35,7 +36,8 @@ int nYOffset, LPPOINT lpPoint) { - return NtGdiOffsetWindowOrgEx(hdc, nXOffset, nYOffset, lpPoint); + /* Unimplemented for now */ + return FALSE; }
Modified: branches/nwin32/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/objects/b... ============================================================================== --- branches/nwin32/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -315,7 +315,6 @@ 0); }
-#if 0 /* * @implemented */ @@ -406,20 +405,6 @@ RestoreDC(SavehDC, -1);
return LinesCopied; -} -#endif - -INT -STDCALL -SetDIBits(HDC hdc, - HBITMAP hbmp, - UINT uStartScan, - UINT cScanLines, - CONST VOID *lpvBits, - CONST BITMAPINFO *lpbmi, - UINT fuColorUse) -{ - return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); }
/*
Modified: branches/nwin32/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/objects/c... ============================================================================== --- branches/nwin32/dll/win32/gdi32/objects/coord.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/objects/coord.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -377,7 +377,8 @@ } return TRUE; #endif - return NtGdiSetViewportExtEx(hdc, nXExtent, nYExtent, lpSize); + /* Unimplemented for now */ + return FALSE; }
/* @@ -439,7 +440,8 @@ Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); return TRUE; #endif - return NtGdiSetWindowOrgEx(hdc,X,Y,lpPoint); + /* Unimplemented for now */ + return FALSE; }
/* @@ -510,7 +512,8 @@ } return TRUE; // Return TRUE. #endif - return NtGdiSetWindowExtEx(hdc, nXExtent, nYExtent, lpSize); + /* Unimplemented for now */ + return FALSE; }
/* @@ -559,7 +562,8 @@ Dc_Attr->ptlViewportOrg.y = Y; return TRUE; #endif - return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); + /* Unimplemented for now */ + return FALSE; }
/*
Modified: branches/nwin32/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/objects/f... ============================================================================== --- branches/nwin32/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/objects/font.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -283,74 +283,8 @@ IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam, BOOL Unicode) { - int FontFamilyCount; - int FontFamilySize; - PFONTFAMILYINFO Info; - int Ret = 0; - int i; - ENUMLOGFONTEXA EnumLogFontExA; - NEWTEXTMETRICEXA NewTextMetricExA; - - Info = RtlAllocateHeap(GetProcessHeap(), 0, - INITIAL_FAMILY_COUNT * sizeof(FONTFAMILYINFO)); - if (NULL == Info) - { - return 0; - } - FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, LogFont, Info, INITIAL_FAMILY_COUNT); - if (FontFamilyCount < 0) - { - RtlFreeHeap(GetProcessHeap(), 0, Info); - return 0; - } - if (INITIAL_FAMILY_COUNT < FontFamilyCount) - { - FontFamilySize = FontFamilyCount; - RtlFreeHeap(GetProcessHeap(), 0, Info); - Info = RtlAllocateHeap(GetProcessHeap(), 0, - FontFamilyCount * sizeof(FONTFAMILYINFO)); - if (NULL == Info) - { - return 0; - } - FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, LogFont, Info, FontFamilySize); - if (FontFamilyCount < 0 || FontFamilySize < FontFamilyCount) - { - RtlFreeHeap(GetProcessHeap(), 0, Info); - return 0; - } - } - - for (i = 0; i < FontFamilyCount; i++) - { - if (Unicode) - { - Ret = ((FONTENUMPROCW) EnumProc)( - &Info[i].EnumLogFontEx, - &Info[i].NewTextMetricEx, - Info[i].FontType, lParam); - } - else - { // Could use EnumLogFontExW2A here? - LogFontW2A(&EnumLogFontExA.elfLogFont, &Info[i].EnumLogFontEx.elfLogFont); - WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfFullName, -1, - (LPSTR)EnumLogFontExA.elfFullName, LF_FULLFACESIZE, NULL, NULL); - WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfStyle, -1, - (LPSTR)EnumLogFontExA.elfStyle, LF_FACESIZE, NULL, NULL); - WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfScript, -1, - (LPSTR)EnumLogFontExA.elfScript, LF_FACESIZE, NULL, NULL); - NewTextMetricExW2A(&NewTextMetricExA, - &Info[i].NewTextMetricEx); - Ret = ((FONTENUMPROCA) EnumProc)( - &EnumLogFontExA, - &NewTextMetricExA, - Info[i].FontType, lParam); - } - } - - RtlFreeHeap(GetProcessHeap(), 0, Info); - - return Ret; + /* Unimplemented for now, should use NewEnumFontFamiliesExW */ + return 0; }
/*
Modified: branches/nwin32/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/controls... ============================================================================== --- branches/nwin32/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -58,14 +58,14 @@ #define SCROLL_MIN_THUMB 6
/* Thumb-tracking info */ -static HWND ScrollTrackingWin = 0; -static INT ScrollTrackingBar = 0; -static INT ScrollTrackingPos = 0; -static INT ScrollTrackingVal = 0; -static BOOL ScrollMovingThumb = FALSE; - -static DWORD ScrollTrackHitTest = SCROLL_NOWHERE; -static BOOL ScrollTrackVertical; +//static HWND ScrollTrackingWin = 0; +//static INT ScrollTrackingBar = 0; +//static INT ScrollTrackingPos = 0; +//static INT ScrollTrackingVal = 0; +//static BOOL ScrollMovingThumb = FALSE; + +//static DWORD ScrollTrackHitTest = SCROLL_NOWHERE; +//static BOOL ScrollTrackVertical;
HBRUSH DefWndControlColor(HDC hDC, UINT ctlType);
@@ -254,6 +254,7 @@ DrawFrameControl(hDC, &RectRB, DFC_SCROLL, ScrollDirFlagRB); }
+#if 0 static VOID FASTCALL IntScrollDrawMovingThumb(HDC Dc, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical) { @@ -306,13 +307,13 @@
return OBJID_CLIENT; } +#endif
static BOOL FASTCALL IntGetScrollBarInfo(HWND Wnd, INT Bar, PSCROLLBARINFO ScrollBarInfo) { - ScrollBarInfo->cbSize = sizeof(SCROLLBARINFO); - - return NtUserGetScrollBarInfo(Wnd, IntScrollGetObjectId(Bar), ScrollBarInfo); + UNIMPLEMENTED; + return FALSE; }
void @@ -383,6 +384,7 @@ } }
+#if 0 static BOOL FASTCALL IntScrollPtInRectEx(LPRECT Rect, POINT Pt, BOOL Vertical) { @@ -467,6 +469,7 @@
return SCROLL_THUMB; } +#endif
/*********************************************************************** @@ -485,6 +488,9 @@ INT *ArrowSize, INT *ThumbSize, INT *ThumbPos) { + UNIMPLEMENTED; + return FALSE; +#if 0 INT Pixels; BOOL Vertical; RECT ClientRect; @@ -622,6 +628,7 @@ }
return Vertical; +#endif }
/*********************************************************************** @@ -630,6 +637,7 @@ * Compute the current scroll position based on the thumb position in pixels * from the top of the scroll-bar. */ +#if 0 static UINT FASTCALL IntScrollGetThumbVal(HWND Wnd, INT SBType, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical, INT Pos) @@ -699,6 +707,7 @@
return Pt; } +#endif
/*********************************************************************** * IntScrollDrawSizeGrip @@ -782,6 +791,9 @@ static VOID FASTCALL IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) { + UNIMPLEMENTED; + return; +#if 0 static POINT PrevPt; /* Previous mouse position for timer events */ static UINT TrackThumbPos; /* Thumb position when tracking started. */ static INT LastClickPos; /* Position in the scroll-bar of the last @@ -1057,6 +1069,7 @@ }
ReleaseDC(Wnd, Dc); +#endif }
@@ -1140,16 +1153,8 @@ static INT FASTCALL IntScrollGetScrollPos(HWND Wnd, INT Bar) { - SCROLLINFO ScrollInfo; - - ScrollInfo.cbSize = sizeof(SCROLLINFO); - ScrollInfo.fMask = SIF_POS; - if (! NtUserGetScrollInfo(Wnd, Bar, &ScrollInfo)) - { - return 0; - } - - return ScrollInfo.nPos; + UNIMPLEMENTED; + return 0; }
static BOOL FASTCALL @@ -1166,7 +1171,7 @@
ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_RANGE; - Result = NtUserGetScrollInfo(Wnd, Bar, &ScrollInfo); + Result = FALSE; if (Result) { *MinPos = ScrollInfo.nMin; @@ -1436,7 +1441,7 @@ return NtUserSetScrollInfo(Wnd, SB_CTL, (SCROLLINFO *) lParam, wParam);
case SBM_GETSCROLLINFO: - return NtUserGetScrollInfo(Wnd, SB_CTL, (SCROLLINFO *) lParam); + return FALSE;
case 0x00e5: case 0x00e7: @@ -1491,7 +1496,8 @@ BOOL STDCALL GetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) { - return NtUserGetScrollBarInfo(hWnd, idObject, psbi); + UNIMPLEMENTED; + return FALSE; }
/* @@ -1506,7 +1512,8 @@ } else { - return NtUserGetScrollInfo(Wnd, SBType, Info); + UNIMPLEMENTED; + return FALSE; } }
@@ -1580,7 +1587,7 @@ * Call NtUserGetScrollInfo() to get the previous position that * we will later return. */ - if (NtUserGetScrollInfo(hWnd, nBar, &ScrollInfo)) + if (FALSE) { Result = ScrollInfo.nPos; if (Result != nPos)
Modified: branches/nwin32/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/misc/dis... ============================================================================== --- branches/nwin32/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/misc/display.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -134,66 +134,8 @@ MONITORENUMPROC lpfnEnum, LPARAM dwData) { - INT iCount, i; - HMONITOR *hMonitorList; - LPRECT pRectList; - HANDLE hHeap; - - /* get list of monitors/rects */ - iCount = NtUserEnumDisplayMonitors(hdc, lprcClip, NULL, NULL, 0); - if (iCount < 0) - { - /* FIXME: SetLastError() */ - return FALSE; - } - if (iCount == 0) - { - return TRUE; - } - - hHeap = GetProcessHeap(); - hMonitorList = HeapAlloc(hHeap, 0, sizeof (HMONITOR) * iCount); - if (hMonitorList == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - pRectList = HeapAlloc(hHeap, 0, sizeof (RECT) * iCount); - if (pRectList == NULL) - { - HeapFree(hHeap, 0, hMonitorList); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - iCount = NtUserEnumDisplayMonitors(hdc, lprcClip, hMonitorList, pRectList, iCount); - if (iCount <= 0) - { - /* FIXME: SetLastError() */ - HeapFree(hHeap, 0, hMonitorList); - HeapFree(hHeap, 0, pRectList); - return FALSE; - } - - /* enumerate list */ - for (i = 0; i < iCount; i++) - { - HMONITOR hMonitor = hMonitorList[i]; - LPRECT pMonitorRect = pRectList + i; - HDC hMonitorDC = NULL; - - if (hdc != NULL) - { - /* make monitor DC */ - hMonitorDC = hdc; - } - - if (!lpfnEnum(hMonitor, hMonitorDC, pMonitorRect, dwData)) - break; - } - HeapFree(hHeap, 0, hMonitorList); - HeapFree(hHeap, 0, pRectList); - return TRUE; + UNIMPLEMENTED; + return FALSE; }
@@ -361,7 +303,7 @@ { if (lpmi->cbSize == sizeof (MONITORINFO)) { - return NtUserGetMonitorInfo(hMonitor, lpmi); + return FALSE; } else if (lpmi->cbSize != sizeof (MONITORINFOEXA)) { @@ -374,7 +316,7 @@ INT res;
miExW.cbSize = sizeof (MONITORINFOEXW); - if (!NtUserGetMonitorInfo(hMonitor, (LPMONITORINFO)&miExW)) + if (FALSE) { return FALSE; } @@ -402,7 +344,8 @@ HMONITOR hMonitor, LPMONITORINFO lpmi) { - return NtUserGetMonitorInfo(hMonitor, lpmi); + UNIMPLEMENTED; + return FALSE; }
@@ -415,7 +358,8 @@ IN POINT ptPoint, IN DWORD dwFlags ) { - return NtUserMonitorFromPoint(ptPoint, dwFlags); + UNIMPLEMENTED; + return NULL; }
@@ -428,7 +372,8 @@ IN LPCRECT lpcRect, IN DWORD dwFlags ) { - return NtUserMonitorFromRect(lpcRect, dwFlags); + UNIMPLEMENTED; + return NULL; }
@@ -441,7 +386,8 @@ IN HWND hWnd, IN DWORD dwFlags ) { - return NtUserMonitorFromWindow(hWnd, dwFlags); + UNIMPLEMENTED; + return NULL; }
@@ -478,7 +424,7 @@ else pDevModeW = NULL;
- rc = NtUserChangeDisplaySettings ( pDeviceName, pDevModeW, hwnd, dwflags, lParam ); + rc = NtUserChangeDisplaySettings ( pDeviceName, pDevModeW, dwflags, lParam );
if (lpszDeviceName != NULL) RtlFreeUnicodeString ( &DeviceName ); @@ -521,7 +467,7 @@ else pDeviceName = NULL;
- rc = NtUserChangeDisplaySettings ( pDeviceName, lpDevMode, hwnd, dwflags, lParam ); + rc = NtUserChangeDisplaySettings ( pDeviceName, lpDevMode, dwflags, lParam );
return rc; }
Modified: branches/nwin32/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows/... ============================================================================== --- branches/nwin32/dll/win32/user32/windows/bitmap.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/bitmap.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -242,7 +242,8 @@ * Let's see if we already loaded it */ if (fuLoad & LR_SHARED) { - hIcon = NtUserFindExistingCursorIcon(hinst, hResInfo, 0, 0); + PPOINT Point = NULL; + hIcon = NtUserFindExistingCursorIcon(hinst, hResInfo, Point); if (hIcon) { return hIcon; @@ -270,7 +271,7 @@
if (hIcon && 0 != (fuLoad & LR_SHARED)) { -#if 1 +#if 0 NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, hResInfo, (HRSRC)NULL); #else
Modified: branches/nwin32/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows/... ============================================================================== --- branches/nwin32/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/class.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -23,6 +23,9 @@ LPCSTR lpszClass, LPWNDCLASSEXA lpwcx) { + UNIMPLEMENTED; + return FALSE; +#if 0 UNICODE_STRING ClassName = {0}; BOOL Ret;
@@ -71,6 +74,7 @@ }
return Ret; +#endif }
@@ -84,6 +88,9 @@ LPCWSTR lpszClass, LPWNDCLASSEXW lpwcx) { + UNIMPLEMENTED; + return FALSE; +#if 0 UNICODE_STRING ClassName = {0};
TRACE("%p class/atom: %S/%04x %p\n", hInstance, @@ -120,6 +127,7 @@ lpwcx, NULL, FALSE); +#endif }
@@ -292,7 +300,7 @@ _SEH_END;
if (Wnd == NULL) - Ret = NtUserGetClassLong(hWnd, nIndex, TRUE); + Ret = 0;
return Ret; } @@ -405,7 +413,7 @@ _SEH_END;
if (Wnd == NULL) - Ret = NtUserGetClassLong(hWnd, nIndex, FALSE); + Ret = 0;
return Ret; } @@ -426,9 +434,10 @@ ClassName.MaximumLength = nMaxCount; ClassName.Buffer = lpClassName;
+ /* FIXME: Conver to unicode!!! */ Result = NtUserGetClassName(hWnd, - (PUNICODE_STRING)&ClassName, - TRUE); + FALSE, + (PUNICODE_STRING)&ClassName);
TRACE("%p class/atom: %s/%04x %x\n", hWnd, IS_ATOM(lpClassName) ? NULL : lpClassName, @@ -456,8 +465,8 @@ ClassName.Buffer = lpClassName;
Result = NtUserGetClassName(hWnd, - &ClassName, - FALSE); + FALSE, + &ClassName);
TRACE("%p class/atom: %S/%04x %x\n", hWnd, IS_ATOM(lpClassName) ? NULL : lpClassName, @@ -485,7 +494,7 @@ if ((nIndex < 0) && (nIndex != GCW_ATOM)) return 0;
- return (WORD) NtUserGetClassLong ( hWnd, nIndex, TRUE ); + return 0; }
@@ -536,7 +545,7 @@ case GWL_WNDPROC: /* Call win32k for this as a callproc handle may need to be created */ - return NtUserGetWindowLong(hWnd, nIndex, TRUE); + return 0;
default: SetLastError(ERROR_INVALID_PARAMETER); @@ -593,7 +602,7 @@ case GWL_WNDPROC: /* Call win32k for this as a callproc handle may need to be created */ - return NtUserGetWindowLong(hWnd, nIndex, FALSE); + return 0;
default: SetLastError(ERROR_INVALID_PARAMETER); @@ -654,6 +663,7 @@ /* * Create a small icon based on a standard icon */ +#if 0 static HICON CreateSmallIcon(HICON StdIcon) { @@ -814,6 +824,7 @@
return SmallIcon; } +#endif
ATOM STDCALL @@ -832,6 +843,9 @@ ATOM STDCALL RegisterClassExA(CONST WNDCLASSEXA *lpwcx) { + UNIMPLEMENTED; + return 0; +#if 0 RTL_ATOM Atom; WNDCLASSEXA WndClass; UNICODE_STRING ClassName; @@ -917,6 +931,7 @@ RtlFreeUnicodeString(&ClassName);
return (ATOM)Atom; +#endif }
/* @@ -925,6 +940,9 @@ ATOM STDCALL RegisterClassExW(CONST WNDCLASSEXW *lpwcx) { + UNIMPLEMENTED; + return 0; +#if 0 ATOM Atom; WNDCLASSEXW WndClass; UNICODE_STRING ClassName; @@ -1005,6 +1023,7 @@ lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass);
return Atom; +#endif }
/*
Modified: branches/nwin32/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows/... ============================================================================== --- branches/nwin32/dll/win32/user32/windows/cursor.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/cursor.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -76,7 +76,7 @@
if(GetIconInfo((HANDLE)pcur, &IconInfo)) { - return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); + return 0; } return (HCURSOR)0; } @@ -145,7 +145,7 @@ IconInfo.yHotspot = yHotSpot; IconInfo.hbmColor = 0;
- return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); + return NULL; }
Modified: branches/nwin32/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows/... ============================================================================== --- branches/nwin32/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/icon.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -88,7 +88,8 @@ ImageData, bwBIH, DIB_RGB_COLORS);
/* Create the icon based on everything we have so far */ - return NtUserCreateCursorIconHandle(&IconInfo, FALSE); + UNIMPLEMENTED; + return NULL; }
HICON @@ -139,7 +140,8 @@ IconInfo.hbmColor = (HBITMAP)0;
/* Create the icon based on everything we have so far */ - return NtUserCreateCursorIconHandle(&IconInfo, FALSE); + UNIMPLEMENTED; + return NULL; }
@@ -195,7 +197,8 @@ return (HICON)0; }
- return NtUserCreateCursorIconHandle(&IconInfo, FALSE); + UNIMPLEMENTED; + return NULL; }
@@ -343,7 +346,8 @@ return (HICON)0; }*/
- return (HICON)NtUserCreateCursorIconHandle(IconInfo, TRUE); + UNIMPLEMENTED; + return NULL; }
Modified: branches/nwin32/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows/... ============================================================================== --- branches/nwin32/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/input.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -289,7 +289,8 @@ BOOL STDCALL GetLastInputInfo(PLASTINPUTINFO plii) { - return NtUserGetLastInputInfo(plii); + UNIMPLEMENTED; + return FALSE; }
Modified: branches/nwin32/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows/... ============================================================================== --- branches/nwin32/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -131,7 +131,8 @@ MenuInfo->cbSize = sizeof(ROSMENUINFO); MenuInfo->fMask = MIM_BACKGROUND | MIM_HELPID | MIM_MAXHEIGHT | MIM_MENUDATA | MIM_STYLE;
- return NtUserMenuInfo(Menu, MenuInfo, FALSE); + UNIMPLEMENTED; + return FALSE; }
/*********************************************************************** @@ -145,7 +146,8 @@ MenuInfo->cbSize = sizeof(ROSMENUINFO); MenuInfo->fMask = MIM_BACKGROUND | MIM_HELPID | MIM_MAXHEIGHT | MIM_MENUDATA | MIM_STYLE;
- return NtUserMenuInfo(MenuInfo->Self, MenuInfo, TRUE); + UNIMPLEMENTED; + return FALSE; }
/*********************************************************************** @@ -180,9 +182,10 @@ | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE; ItemInfo->dwTypeData = NULL;
- if (! NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, FALSE)) + if (TRUE) { ItemInfo->fType = 0; + UNIMPLEMENTED; return FALSE; }
@@ -196,9 +199,10 @@ return FALSE; }
- if (! NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, FALSE)) + if (TRUE) { ItemInfo->fType = 0; + UNIMPLEMENTED; return FALSE; } ItemInfo->dwTypeData[ItemInfo->cch - 1] = UNICODE_NULL; @@ -222,7 +226,8 @@ { ItemInfo->cch = strlenW(ItemInfo->dwTypeData); } - Ret = NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, TRUE); + UNIMPLEMENTED; + Ret = FALSE;
return Ret; } @@ -250,6 +255,9 @@ static INT FASTCALL MenuGetAllRosMenuItemInfo(HMENU Menu, PROSMENUITEMINFO *ItemInfo) { + UNIMPLEMENTED; + return -1; +#if 0 DWORD BufSize;
BufSize = NtUserBuildMenuItemList(Menu, (VOID *) 1, 0, 0); @@ -264,6 +272,7 @@ }
return NtUserBuildMenuItemList(Menu, *ItemInfo, BufSize, 0); +#endif }
/*********************************************************************** @@ -4128,7 +4137,8 @@ UINT fByPos, UINT gmdiFlags) { - return NtUserGetMenuDefaultItem(hMenu, fByPos, gmdiFlags); + UNIMPLEMENTED; + return -1; }
@@ -4149,7 +4159,8 @@ mi.cbSize = sizeof(MENUINFO); mi.fMask = lpcmi->fMask;
- res = NtUserMenuInfo(hmenu, &mi, FALSE); + UNIMPLEMENTED; + res = FALSE;
memcpy(lpcmi, &mi, sizeof(MENUINFO)); return res; @@ -4180,7 +4191,7 @@ mii.cbSize = sizeof(MENUITEMINFOW); mii.fMask = MIIM_ID | MIIM_SUBMENU;
- if (! NtUserMenuItemInfo(hMenu, nPos, MF_BYPOSITION, &mii, FALSE)) + if (TRUE) { return -1; } @@ -4222,7 +4233,8 @@ if(!(mii->fMask & (MIIM_TYPE | MIIM_STRING))) { /* No text requested, just pass on */ - return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); + UNIMPLEMENTED; + return FALSE; }
AnsiBuffer = mii->dwTypeData; @@ -4238,7 +4250,7 @@ miiW.dwTypeData[0] = 0; }
- if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE)) + if (TRUE) { if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); return FALSE; @@ -4305,7 +4317,8 @@ if(!(mii->fMask & (MIIM_TYPE | MIIM_STRING))) { /* No text requested, just pass on */ - return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); + UNIMPLEMENTED; + return FALSE; }
String = mii->dwTypeData; @@ -4321,7 +4334,7 @@ miiW.dwTypeData[0] = 0; }
- if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE)) + if (TRUE) { if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); return FALSE; @@ -4379,7 +4392,7 @@ mii.fMask = MIIM_STATE | MIIM_FTYPE | MIIM_SUBMENU;
SetLastError(0); - if(NtUserMenuItemInfo(hMenu, uId, uFlags, &mii, FALSE)) + if(FALSE) { UINT nSubItems = 0; if(mii.hSubMenu) @@ -4473,7 +4486,7 @@ mi.cbSize = sizeof(MENUITEMINFOW); mi.fMask = MIIM_SUBMENU;
- if (NtUserMenuItemInfo(hMenu, (UINT)nPos, MF_BYPOSITION, &mi, FALSE)) + if (FALSE) { return IsMenu(mi.hSubMenu) ? mi.hSubMenu : NULL; } @@ -4925,7 +4938,9 @@ return res;
memcpy(&mi, lpcmi, sizeof(MENUINFO)); - return NtUserMenuInfo(hmenu, &mi, TRUE); + + UNIMPLEMENTED; + return FALSE; }
@@ -4945,8 +4960,7 @@ memset ( &uItem, 0, sizeof(uItem) ); uItem.fMask = MIIM_STATE | MIIM_BITMAP;
- if(!(NtUserMenuItemInfo(hMenu, uPosition, - (BOOL)(MF_BYPOSITION & uFlags), &uItem, FALSE))) return FALSE; + if(TRUE) return FALSE;
if (!hBitmapChecked && !hBitmapUnchecked) { @@ -4958,8 +4972,7 @@ uItem.hbmpUnchecked = hBitmapUnchecked; uItem.fState |= MF_USECHECKBITMAPS; } - return NtUserMenuItemInfo(hMenu, uPosition, - (BOOL)(MF_BYPOSITION & uFlags), &uItem, TRUE); + return FALSE; }
@@ -5013,8 +5026,8 @@ UnicodeString.Buffer = NULL; }
- Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition, - (PROSMENUITEMINFO)&MenuItemInfoW, TRUE); + UNIMPLEMENTED; + Result = FALSE;
if (UnicodeString.Buffer != NULL) { @@ -5054,8 +5067,8 @@ { MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData); } - Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition, - (PROSMENUITEMINFO)&MenuItemInfoW, TRUE); + UNIMPLEMENTED; + Result = FALSE;
return Result; } @@ -5183,10 +5196,7 @@ mi.cbSize = sizeof(ROSMENUINFO); mi.fMask = MIM_HELPID;
- if(NtUserMenuInfo(hmenu, &mi, FALSE)) - { - return mi.dwContextHelpID; - } + UNIMPLEMENTED; return 0; }
Modified: branches/nwin32/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows/... ============================================================================== --- branches/nwin32/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/message.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -265,6 +265,7 @@ return; }
+#if 0 static BOOL FASTCALL MsgiUMToKMReply(PMSG UMMsg, PMSG KMMsg, LRESULT *Result) { @@ -272,6 +273,7 @@
return TRUE; } +#endif
static BOOL FASTCALL MsgiKMToUMMessage(PMSG KMMsg, PMSG UMMsg) @@ -1702,6 +1704,9 @@ WPARAM wParam, LPARAM lParam) { + UNIMPLEMENTED; + return 0; +#if 0 MSG UMMsg, KMMsg; NTUSERSENDMESSAGEINFO Info; LRESULT Result; @@ -1749,6 +1754,7 @@ }
return Result; +#endif }
@@ -1758,6 +1764,9 @@ LRESULT STDCALL SendMessageA(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { + UNIMPLEMENTED; + return 0; +#if 0 MSG AnsiMsg, UcMsg; MSG KMMsg; LRESULT Result; @@ -1831,6 +1840,7 @@ }
return Result; +#endif }
/* @@ -1891,6 +1901,9 @@ UINT uTimeout, PDWORD_PTR lpdwResult) { + UNIMPLEMENTED; + return 0; +#if 0 MSG AnsiMsg; MSG UcMsg; LRESULT Result; @@ -1955,6 +1968,7 @@
SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); return Result; +#endif }
@@ -1972,6 +1986,9 @@ UINT uTimeout, PDWORD_PTR lpdwResult) { + UNIMPLEMENTED; + return 0; +#if 0 NTUSERSENDMESSAGEINFO Info; LRESULT Result;
@@ -1993,6 +2010,7 @@
SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); return Result; +#endif }
@@ -2007,6 +2025,9 @@ WPARAM wParam, LPARAM lParam) { + UNIMPLEMENTED; + return FALSE; +#if 0 MSG AnsiMsg, UcMsg; MSG KMMsg; LRESULT Result; @@ -2031,6 +2052,7 @@ MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg);
return Result; +#endif }
@@ -2045,6 +2067,9 @@ WPARAM wParam, LPARAM lParam) { + UNIMPLEMENTED; + return FALSE; +#if 0 MSG UMMsg, KMMsg; LRESULT Result;
@@ -2061,6 +2086,7 @@ MsgiUMToKMCleanup(&UMMsg, &KMMsg);
return Result; +#endif }
Modified: branches/nwin32/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows/... ============================================================================== --- branches/nwin32/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/nonclient.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -583,7 +583,7 @@ ssbi.rgstate[0] |= STATE_SYSTEM_OFFSCREEN; else ssbi.rgstate[0] &= ~STATE_SYSTEM_OFFSCREEN; - NtUserSetScrollBarInfo(hWnd, OBJID_VSCROLL, &ssbi); + //NtUserSetScrollBarInfo(hWnd, OBJID_VSCROLL, &ssbi); if(ssbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN) Style &= ~WS_VSCROLL; } @@ -602,7 +602,7 @@ ssbi.rgstate[0] |= STATE_SYSTEM_OFFSCREEN; else ssbi.rgstate[0] &= ~STATE_SYSTEM_OFFSCREEN; - NtUserSetScrollBarInfo(hWnd, OBJID_HSCROLL, &ssbi); + //NtUserSetScrollBarInfo(hWnd, OBJID_HSCROLL, &ssbi); if(ssbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN) Style &= ~WS_HSCROLL; }
Modified: branches/nwin32/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows/... ============================================================================== --- branches/nwin32/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/window.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -1043,7 +1043,8 @@ _SEH_END;
if (!Wnd) /* Fall back to win32k... */ - Ret = NtUserGetWindow(hWnd, uCmd); + UNIMPLEMENTED; + Ret = NULL;
return Ret; }
Modified: branches/nwin32/dll/win32/user32/windows/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows/... ============================================================================== --- branches/nwin32/dll/win32/user32/windows/winpos.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/user32/windows/winpos.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -75,6 +75,9 @@ WinPosGetMinMaxInfo(HWND hWnd, POINT* MaxSize, POINT* MaxPos, POINT* MinTrack, POINT* MaxTrack) { + UNIMPLEMENTED; + return 0; +#if o MINMAXINFO MinMax;
if(NtUserGetMinMaxInfo(hWnd, &MinMax, TRUE)) @@ -90,6 +93,7 @@ if (MaxTrack) *MaxTrack = MinMax.ptMaxTrackSize; } return 0; //FIXME: what does it return? +#endif }
Modified: branches/nwin32/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/nt... ============================================================================== --- branches/nwin32/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ branches/nwin32/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -882,7 +882,6 @@ NtUserChangeDisplaySettings( PUNICODE_STRING lpszDeviceName, LPDEVMODEW lpDevMode, - HWND hwnd, DWORD dwflags, LPVOID lParam);
@@ -1204,8 +1203,7 @@ NtUserFindExistingCursorIcon( HMODULE hModule, HRSRC hRsrc, - LONG cx, - LONG cy); + PPOINT Point); // FIXME: Verify!
HWND NTAPI @@ -2127,11 +2125,9 @@ NTAPI NtUserSetCursorIconData( HANDLE Handle, - PBOOL fIcon, - POINT *Hotspot, HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc); + PUNICODE_STRING pstrResName, + PICONINFO pIconInfo);
DWORD NTAPI
Modified: branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/n... ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -35,8 +35,7 @@ APIENTRY NtUserFindExistingCursorIcon(HMODULE hModule, HRSRC hRsrc, - LONG cx, - LONG cy) + PPOINT Point) { UNIMPLEMENTED; return NULL; @@ -86,15 +85,12 @@ return FALSE; }
- BOOL -APIENTRY +NTAPI NtUserSetCursorIconData(HANDLE Handle, - PBOOL fIcon, - POINT *Hotspot, HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc) + PUNICODE_STRING pstrResName, + PICONINFO pIconInfo) { UNIMPLEMENTED; return FALSE;
Modified: branches/nwin32/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/n... ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Wed Aug 27 09:22:38 2008 @@ -18,7 +18,6 @@ APIENTRY NtUserChangeDisplaySettings(PUNICODE_STRING lpszDeviceName, LPDEVMODEW lpDevMode, - HWND hWnd, DWORD dwflags, LPVOID lParam) {
-
sginsberg＠svn.reactos.org