Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50592: [CMAKE] Link cfgmgr32 to setupapi, it redirects functions there and MSVC needs the importlib for that.
by tkreuzer＠svn.reactos.org 02 Feb '11

02 Feb '11

Author: tkreuzer Date: Wed Feb 2 13:52:30 2011 New Revision: 50592 URL: http://svn.reactos.org/svn/reactos?rev=50592&view=rev Log: [CMAKE] Link cfgmgr32 to setupapi, it redirects functions there and MSVC needs the importlib for that. Modified: branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cfgmgr3… ============================================================================== --- branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] Wed Feb 2 13:52:30 2011 @@ -1,7 +1,7 @@ spec2def(cfgmgr32.dll cfgmgr32.spec) -list(APPEND SOURCE +list(APPEND SOURCE cfgmgr32.rc ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) @@ -9,6 +9,6 @@ add_library(cfgmgr32 SHARED ${SOURCE}) set_entrypoint(cfgmgr32 0) -add_importlibs(cfgmgr32 kernel32 ntdll) +add_importlibs(cfgmgr32 setupapi kernel32 ntdll) add_dependencies(cfgmgr32 psdk buildno_header) add_cab_target(cfgmgr32 1)

1 0

[fireball] 50591: - Add an update routine which resizes the SWM root window to the primary surface size. See issue #5876 for more details.
by fireball＠svn.reactos.org 02 Feb '11

02 Feb '11

Author: fireball Date: Wed Feb 2 13:38:49 2011 New Revision: 50591 URL: http://svn.reactos.org/svn/reactos?rev=50591&view=rev Log: - Add an update routine which resizes the SWM root window to the primary surface size. See issue #5876 for more details. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Wed Feb 2 13:38:49 2011 @@ -534,6 +534,7 @@ SurfaceRect.left = SurfaceRect.top = 0; SurfaceRect.right = SurfObj->sizlBitmap.cx; SurfaceRect.bottom = SurfObj->sizlBitmap.cy; + SwmUpdateRootWindow(SurfObj); //EngEraseSurface(SurfObj, &SurfaceRect, 0); /* Give the PDEV a MovePointer function */ @@ -552,6 +553,7 @@ (SurfaceRect.bottom - SurfaceRect.top) / 2); EngUnlockSurface(SurfObj); + CsrNotifyShowDesktop(NULL, SurfSize.cx, SurfSize.cy); // Init Primary Displays Device Capabilities. //IntvGetDeviceCaps(&PrimarySurface, &GdiHandleTable->DevCaps); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] Wed Feb 2 13:38:49 2011 @@ -15,7 +15,7 @@ extern SWM_WINDOW SwmRoot; VOID NTAPI SwmInitialize(); -VOID NTAPI GrContextInit(); +VOID NTAPI SwmUpdateRootWindow(SURFOBJ *SurfObj); PSWM_WINDOW NTAPI SwmFindByHwnd(HWND hWnd); VOID NTAPI SwmAcquire(VOID); VOID NTAPI SwmRelease(VOID); Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Wed Feb 2 13:38:49 2011 @@ -932,30 +932,44 @@ VOID NTAPI -SwmInitialize() -{ - NTSTATUS Status; - - /* Initialize handles list and a spinlock */ - InitializeListHead(&SwmWindows); - - /* Initialize SWM access resource */ - Status = ExInitializeResourceLite(&SwmLock); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failure initializing SWM resource!\n"); - } - +SwmUpdateRootWindow(SURFOBJ *SurfObj) +{ /* Initialize a root window */ SwmRoot.Window.left = 0; SwmRoot.Window.top = 0; - SwmRoot.Window.right = 800; //FIXME! - SwmRoot.Window.bottom = 600; //FIXME! + SwmRoot.Window.right = SurfObj->sizlBitmap.cx; + SwmRoot.Window.bottom = SurfObj->sizlBitmap.cy; + SwmRoot.Hidden = FALSE; + SwmRoot.Topmost = FALSE; + + set_region_rect(SwmRoot.Visible, &SwmRoot.Window); +} + +VOID +NTAPI +SwmInitialize() +{ + NTSTATUS Status; + + /* Initialize handles list and a spinlock */ + InitializeListHead(&SwmWindows); + + /* Initialize SWM access resource */ + Status = ExInitializeResourceLite(&SwmLock); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure initializing SWM resource!\n"); + } + + /* Initialize a root window */ + SwmRoot.Window.left = 0; + SwmRoot.Window.top = 0; + SwmRoot.Window.right = 0; + SwmRoot.Window.bottom = 0; SwmRoot.Hidden = FALSE; SwmRoot.Topmost = FALSE; SwmRoot.Visible = create_empty_region(); - set_region_rect(SwmRoot.Visible, &SwmRoot.Window); InsertHeadList(&SwmWindows, &SwmRoot.Entry); }

1 0

[tkreuzer] 50590: [USER32] - Remove exports for IsProcess16Bit and IsSETEnabled - Redirect CalcMenuBar, PaintMenuBar and SetConsoleReserveKeys to NtUser* - Implement stubs for BuildReasonArray, Cre...
by tkreuzer＠svn.reactos.org 02 Feb '11

02 Feb '11

Author: tkreuzer Date: Wed Feb 2 13:15:26 2011 New Revision: 50590 URL: http://svn.reactos.org/svn/reactos?rev=50590&view=rev Log: [USER32] - Remove exports for IsProcess16Bit and IsSETEnabled - Redirect CalcMenuBar, PaintMenuBar and SetConsoleReserveKeys to NtUser* - Implement stubs for BuildReasonArray, CreateSystemThreads, DestroyReasons, DeviceEventWorker, GetCursorFrameInfo, GetReasonTitleFromReasonCode, RecordShutdownReason, UserLpkPSMTextOut, UserLpkTabbedTextOut, Win32PoolAllocationStats - Remove implementations of SetCursor, ClipCursor, GetClipCursor and HiliteMenuItem - Remove auto stub file from sources - Fix resource include path Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/misc/stubs.c branches/cmake-bringup/dll/win32/user32/user32.rc branches/cmake-bringup/dll/win32/user32/user32.spec branches/cmake-bringup/dll/win32/user32/windows/cursoricon.c branches/cmake-bringup/dll/win32/user32/windows/menu.c Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Wed Feb 2 13:15:26 2011 @@ -64,7 +64,6 @@ windows/window.c windows/winpos.c user32.rc - ${CMAKE_CURRENT_BINARY_DIR}/user32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/user32.def) add_library(user32 SHARED Modified: branches/cmake-bringup/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/misc/stubs.c [iso-8859-1] Wed Feb 2 13:15:26 2011 @@ -541,3 +541,94 @@ return 0; } +BOOL +WINAPI +BuildReasonArray(PVOID Pointer) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +WINAPI +CreateSystemThreads(DWORD dwUnknown) +{ + NtUserCallOneParam(dwUnknown, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); +} + +BOOL +WINAPI +DestroyReasons(PVOID Pointer) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +DeviceEventWorker(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +GetCursorFrameInfo(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +GetReasonTitleFromReasonCode(DWORD dw1, DWORD dw2, DWORD dw3) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +RecordShutdownReason(DWORD dw0) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +UserLpkPSMTextOut(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +UserLpkTabbedTextOut( + DWORD dw1, + DWORD dw2, + DWORD dw3, + DWORD dw4, + DWORD dw5, + DWORD dw6, + DWORD dw7, + DWORD dw8, + DWORD dw9, + DWORD dw10, + DWORD dw11, + DWORD dw12) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +Win32PoolAllocationStats(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5) +{ + UNIMPLEMENTED; + return FALSE; +} + Modified: branches/cmake-bringup/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/user32.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/user32.rc [iso-8859-1] Wed Feb 2 13:15:26 2011 @@ -1,7 +1,7 @@ /* $Id$ */ #include <windows.h> -#include "resource.h" +#include "include/resource.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS User API Client Dll\0" Modified: branches/cmake-bringup/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/user32.spec [iso-8859-1] Wed Feb 2 13:15:26 2011 @@ -20,8 +20,8 @@ @ stdcall BroadcastSystemMessageExA(long ptr long long long ptr) @ stdcall BroadcastSystemMessageExW(long ptr long long long ptr) @ stdcall BroadcastSystemMessageW(long ptr long long long) -@ stub BuildReasonArray -@ stub CalcMenuBar +@ stdcall BuildReasonArray(ptr) +@ stdcall CalcMenuBar(long long long long long) NtUserCalcMenuBar @ stdcall CallMsgFilter(ptr long) CallMsgFilterA @ stdcall CallMsgFilterA(ptr long) @ stdcall CallMsgFilterW(ptr long) @@ -94,7 +94,7 @@ @ stdcall CreateMDIWindowW(ptr ptr long long long long long long long long) @ stdcall CreateMenu() @ stdcall CreatePopupMenu() -@ stub CreateSystemThreads +@ stdcall CreateSystemThreads(long) @ stdcall CreateWindowExA(long str str long long long long long long long long ptr) @ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) @ stdcall CreateWindowStationA(str long long ptr) @@ -151,9 +151,9 @@ @ stdcall DestroyCursor(long) @ stdcall DestroyIcon(long) @ stdcall DestroyMenu(long) NtUserDestroyMenu -@ stub DestroyReasons +@ stdcall DestroyReasons(ptr) @ stdcall DestroyWindow(long) NtUserDestroyWindow -@ stub DeviceEventWorker +@ stdcall DeviceEventWorker(long long long long long) @ stdcall DialogBoxIndirectParamA(long ptr long ptr long) @ stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long) @ stdcall DialogBoxIndirectParamW(long ptr long ptr long) @@ -201,7 +201,7 @@ @ stdcall EndMenu() @ stdcall EndPaint(long ptr) NtUserEndPaint @ stdcall EndTask(ptr long long) -@ stub EnterReaderModeHelper +@ stdcall EnterReaderModeHelper(ptr) @ stdcall EnumChildWindows(long ptr long) @ stdcall EnumClipboardFormats(long) @ stdcall EnumDesktopWindows(long ptr ptr) @@ -266,7 +266,7 @@ @ stdcall GetClipboardViewer() NtUserGetClipboardViewer @ stdcall GetComboBoxInfo(long ptr) ; Direct call NtUserGetComboBoxInfo @ stdcall GetCursor() -@ stub GetCursorFrameInfo +@ stdcall GetCursorFrameInfo(long long long long long) @ stdcall GetCursorInfo(ptr) NtUserGetCursorInfo @ stdcall GetCursorPos(ptr) @ stdcall GetDC(long) NtUserGetDC @@ -339,7 +339,7 @@ @ stdcall GetRawInputDeviceInfoA(ptr long ptr ptr) @ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) @ stdcall GetRawInputDeviceList(ptr ptr long) -@ stub GetReasonTitleFromReasonCode +@ stdcall GetReasonTitleFromReasonCode(long long long) @ stdcall GetRegisteredRawInputDevices(ptr ptr long) @ stdcall GetScrollBarInfo(long long ptr) NtUserGetScrollBarInfo @ stdcall GetScrollInfo(long long ptr) @@ -399,7 +399,7 @@ @ stdcall InSendMessageEx(ptr) @ stdcall InflateRect(ptr long long) @ stdcall InitializeLpkHooks(ptr) -@ stub InitializeWin32EntryTable +@ stdcall InitializeWin32EntryTable(ptr) @ stdcall InsertMenuA(long long long long ptr) @ stdcall InsertMenuItemA(long long long ptr) @ stdcall InsertMenuItemW(long long long ptr) @@ -427,9 +427,7 @@ @ stdcall IsHungAppWindow(long) @ stdcall IsIconic(long) @ stdcall IsMenu(long) -@ stub IsProcess16Bit @ stdcall IsRectEmpty(ptr) -@ stub IsSETEnabled @ stdcall IsServerSideWindow(long) @ stdcall IsWinEventHookInstalled(long) @ stdcall IsWindow(long) @@ -437,7 +435,7 @@ @ stdcall IsWindowInDestroy(long) @ stdcall IsWindowUnicode(long) @ stdcall IsWindowVisible(long) -@ stub IsWow64Message +# @ stub IsWow64Message @ stdcall IsZoomed(long) @ stdcall KillSystemTimer(long long) @ stdcall KillTimer(long long) NtUserKillTimer @@ -454,7 +452,7 @@ @ stdcall LoadImageA(long str long long long long) @ stdcall LoadImageW(long wstr long long long long) @ stdcall LoadKeyboardLayoutA(str long) -@ stub LoadKeyboardLayoutEx +@ stdcall LoadKeyboardLayoutEx(long ptr long) @ stdcall LoadKeyboardLayoutW(wstr long) @ stdcall LoadLocalFonts() @ stdcall LoadMenuA(long str) @@ -487,8 +485,8 @@ @ stdcall MessageBoxExW(long wstr wstr long long) @ stdcall MessageBoxIndirectA(ptr) @ stdcall MessageBoxIndirectW(ptr) -@ stub MessageBoxTimeoutA -@ stub MessageBoxTimeoutW +@ stdcall MessageBoxTimeoutA(ptr str str long long long) +@ stdcall MessageBoxTimeoutW(ptr wstr wstr long long long) @ stdcall MessageBoxW(long wstr wstr long) @ stdcall ModifyMenuA(long long long long ptr) @ stdcall ModifyMenuW(long long long long ptr) @@ -514,7 +512,7 @@ @ stdcall OpenWindowStationW(wstr long long) @ stdcall PackDDElParam(long long long) @ stdcall PaintDesktop(long) NtUserPaintDesktop -@ stub PaintMenuBar +@ stdcall PaintMenuBar(long long long long long long) NtUserPaintMenuBar @ stdcall PeekMessageA(ptr long long long long) @ stdcall PeekMessageW(ptr long long long long) @ stdcall PostMessageA(long long long long) @@ -533,9 +531,9 @@ @ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA @ stdcall RealGetWindowClassA(long ptr long) @ stdcall RealGetWindowClassW(long ptr long) -@ stub ReasonCodeNeedsBugID -@ stub ReasonCodeNeedsComment -@ stub RecordShutdownReason +@ stdcall ReasonCodeNeedsBugID(long) +@ stdcall ReasonCodeNeedsComment(long) +@ stdcall RecordShutdownReason(long) @ stdcall RedrawWindow(long ptr long long) NtUserRedrawWindow @ stdcall RegisterClassA(ptr) @ stdcall RegisterClassExA(ptr) @@ -547,7 +545,7 @@ @ stdcall RegisterDeviceNotificationW(long ptr long) @ stdcall RegisterHotKey(long long long long) NtUserRegisterHotKey @ stdcall RegisterLogonProcess(long long) -@ stub RegisterMessagePumpHook +@ stdcall RegisterMessagePumpHook(ptr) @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow(long) @@ -593,7 +591,7 @@ @ stdcall SetClassWord(long long long) ; Direct call NtUserSetClassWord @ stdcall SetClipboardData(long long) @ stdcall SetClipboardViewer(long) NtUserSetClipboardViewer -@ stub SetConsoleReserveKeys +@ stdcall SetConsoleReserveKeys(long long) NtUserSetConsoleReserveKeys @ stdcall SetCursor(long) NtUserSetCursor @ stdcall SetCursorContents(ptr ptr) NtUserSetCursorContents @ stdcall SetCursorPos(long long) @@ -667,7 +665,7 @@ @ stdcall ShowStartGlass(long) @ stdcall ShowWindow(long long) NtUserShowWindow @ stdcall ShowWindowAsync(long long) NtUserShowWindowAsync -@ stub SoftModalMessageBox +@ stdcall SoftModalMessageBox(long) @ stdcall SubtractRect(ptr ptr ptr) @ stdcall SwapMouseButton(long) @ stdcall SwitchDesktop(long) NtUserSwitchDesktop @@ -690,7 +688,7 @@ @ stdcall TranslateAcceleratorW(long long ptr) @ stdcall TranslateMDISysAccel(long ptr) @ stdcall TranslateMessage(ptr) -@ stub TranslateMessageEx +@ stdcall TranslateMessageEx(ptr long) @ stdcall UnhookWinEvent(long) NtUserUnhookWinEvent @ stdcall UnhookWindowsHook(long ptr) @ stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx @@ -702,7 +700,7 @@ @ stdcall UnregisterClassW(wstr long) @ stdcall UnregisterDeviceNotification(long) @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey -@ stub UnregisterMessagePumpHook +@ stdcall UnregisterMessagePumpHook() @ stdcall UnregisterUserApiHook() NtUserUnregisterUserApiHook @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) @@ -711,8 +709,8 @@ @ stdcall User32InitializeImmEntryTable(ptr) @ stdcall UserClientDllInitialize(long long ptr) DllMain @ stdcall UserHandleGrantAccess(ptr ptr long) NtUserUserHandleGrantAccess -@ stub UserLpkPSMTextOut -@ stub UserLpkTabbedTextOut +@ stdcall UserLpkPSMTextOut(long long long long long long) +@ stdcall UserLpkTabbedTextOut(long long long long long long long long long long long long) @ stdcall UserRealizePalette(long) @ stdcall UserRegisterWowHandlers(ptr ptr) @ stdcall ValidateRect(long ptr) NtUserValidateRect @@ -727,7 +725,7 @@ @ stdcall WINNLSGetIMEHotkey(long) @ stdcall WaitForInputIdle(long long) @ stdcall WaitMessage() NtUserWaitMessage -@ stub Win32PoolAllocationStats +@ stdcall Win32PoolAllocationStats(long long long long long) @ stdcall WinHelpA(long str long long) @ stdcall WinHelpW(long wstr long long) @ stdcall WindowFromDC(long) Modified: branches/cmake-bringup/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Wed Feb 2 13:15:26 2011 @@ -1245,19 +1245,6 @@ } /*********************************************************************** - * SetCursor (USER32.@) - * - * Set the cursor shape. - * - * RETURNS - * A handle to the previous cursor shape. - */ -HCURSOR WINAPI /*DECLSPEC_HOTPATCH*/ SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) -{ - return NtUserSetCursor(hCursor); -} - -/*********************************************************************** * ShowCursor (USER32.@) */ INT WINAPI /*DECLSPEC_HOTPATCH*/ ShowCursor( BOOL bShow ) @@ -1278,23 +1265,6 @@ return (HCURSOR)0; } - -/*********************************************************************** - * ClipCursor (USER32.@) - */ -BOOL WINAPI /*DECLSPEC_HOTPATCH*/ ClipCursor( const RECT *rect ) -{ - return NtUserClipCursor((RECT *)rect); -} - - -/*********************************************************************** - * GetClipCursor (USER32.@) - */ -BOOL WINAPI /*DECLSPEC_HOTPATCH*/ GetClipCursor( RECT *rect ) -{ - return NtUserGetClipCursor(rect); -} /*********************************************************************** @@ -1504,7 +1474,7 @@ return NULL; } } - else + else { mask = CreateBitmap( width, height * 2, 1, 1, NULL ); if(!mask) @@ -1775,7 +1745,7 @@ if (is_dib_monochrome(fix_info)) hbitmap = CreateBitmap(new_width, new_height, 1, 1, NULL); else - hbitmap = CreateCompatibleBitmap(screen_dc, new_width, new_height); + hbitmap = CreateCompatibleBitmap(screen_dc, new_width, new_height); } orig_bm = SelectObject(screen_mem_dc, hbitmap); @@ -1985,7 +1955,7 @@ { /* Look if the colors of the DIB are black and white */ - monochrome = + monochrome = (bi->bmiColors[0].rgbRed == 0xff && bi->bmiColors[0].rgbGreen == 0xff && bi->bmiColors[0].rgbBlue == 0xff Modified: branches/cmake-bringup/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Feb 2 13:15:26 2011 @@ -777,7 +777,7 @@ mis.itemWidth = 0; SendMessageW( hwndOwner, WM_MEASUREITEM, 0, (LPARAM)&mis ); /* Tests reveal that Windows ( Win95 thru WinXP) adds twice the average - * width of a menufont character to the width of an owner-drawn menu. + * width of a menufont character to the width of an owner-drawn menu. */ lpitem->Rect.right += mis.itemWidth + 2 * MenuCharSize.cx; @@ -857,7 +857,7 @@ } if (menuBar) { txtheight = DrawTextW( hdc, lpitem->dwTypeData, -1, &rc, - DT_SINGLELINE|DT_CALCRECT); + DT_SINGLELINE|DT_CALCRECT); lpitem->Rect.right += rc.right - rc.left; itemheight = max( max( itemheight, txtheight), GetSystemMetrics( SM_CYMENU) - 1); @@ -1159,7 +1159,7 @@ SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); bkgnd = (menuBar && flat_menu) ? COLOR_MENUBAR : COLOR_MENU; - + /* Setup colors */ if (lpitem->fState & MF_HILITE) @@ -1319,7 +1319,7 @@ * Custom checkmark bitmaps are monochrome but not always 1bpp. */ if( !(MenuInfo->dwStyle & MNS_NOCHECK)) { - bm = (lpitem->fState & MF_CHECKED) ? lpitem->hbmpChecked : + bm = (lpitem->fState & MF_CHECKED) ? lpitem->hbmpChecked : lpitem->hbmpUnchecked; if (bm) /* we have a custom bitmap */ { @@ -1490,7 +1490,7 @@ if (MenuGetRosMenuInfo(&MenuInfo, hmenu) && MenuInfo.MenuItemCount) { UINT u; - + MenuInitRosMenuItemInfo(&ItemInfo); for (u = 0; u < MenuInfo.MenuItemCount; u++) @@ -1855,7 +1855,7 @@ break; case MM_GETMENUHANDLE: - case MN_GETHMENU: + case MN_GETHMENU: return GetWindowLongPtrA(Wnd, 0); default: @@ -3480,7 +3480,7 @@ static BOOL FASTCALL MenuInitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup, UINT wFlags) { ROSMENUINFO MenuInfo; - + TRACE("hwnd=%p hmenu=%p\n", hWnd, hMenu); HideCaret(0); @@ -3651,7 +3651,7 @@ BOOL ret = FALSE; ROSMENUINFO MenuInfo; - if (!IsMenu(Menu)) + if (!IsMenu(Menu)) { SetLastError( ERROR_INVALID_MENU_HANDLE ); return FALSE; @@ -3838,10 +3838,10 @@ User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength) { PLOADMENU_CALLBACK_ARGUMENTS Common; - LRESULT Result; + LRESULT Result; Common = (PLOADMENU_CALLBACK_ARGUMENTS) Arguments; - + Result = (LRESULT)LoadMenuW( Common->hModule, IS_INTRESOURCE(Common->MenuName[0]) ? MAKEINTRESOURCE(Common->MenuName[0]) : @@ -4122,25 +4122,6 @@ return TRUE; } -// So this one maybe one day it will be a callback! -BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, - UINT wHilite ) -{ - ROSMENUINFO MenuInfo; - ROSMENUITEMINFO mii; - TRACE("(%p, %p, %04x, %04x);\n", hWnd, hMenu, wItemID, wHilite); - if (!hWnd) - { - SetLastError(ERROR_INVALID_WINDOW_HANDLE); - return FALSE; - } - if (!NtUserMenuItemInfo(hMenu, wItemID, wHilite, &mii, FALSE)) return FALSE; - if (!NtUserMenuInfo(hMenu, &MenuInfo, FALSE)) return FALSE; - if (MenuInfo.FocusedItem == wItemID) return TRUE; - MenuHideSubPopups( hWnd, &MenuInfo, FALSE, 0 ); - MenuSelectItem( hWnd, &MenuInfo, wItemID, TRUE, 0 ); - return TRUE; -} /* * @implemented

1 0

[tkreuzer] 50589: [CMAKE] revert r50587
by tkreuzer＠svn.reactos.org 01 Feb '11

01 Feb '11

Author: tkreuzer Date: Tue Feb 1 22:07:32 2011 New Revision: 50589 URL: http://svn.reactos.org/svn/reactos?rev=50589&view=rev Log: [CMAKE] revert r50587 Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] Tue Feb 1 22:07:32 2011 @@ -1,7 +1,6 @@ add_library(tapiui SHARED tapiui.rc) set_entrypoint(tapiui 0) -set_target_properties(tapiui PROPERTIES LINKER_LANGUAGE C) add_dependencies(tapiui psdk buildno_header) add_cab_target(tapiui 1)

1 0

[tkreuzer] 50588: [CMAKE] Correctly define CMAKE_RC_CREATE_SHARED_LIBRARY and CMAKE_ASM_CREATE_SHARED_LIBRARY for MSVC.
by tkreuzer＠svn.reactos.org 01 Feb '11

01 Feb '11

Author: tkreuzer Date: Tue Feb 1 22:06:31 2011 New Revision: 50588 URL: http://svn.reactos.org/svn/reactos?rev=50588&view=rev Log: [CMAKE] Correctly define CMAKE_RC_CREATE_SHARED_LIBRARY and CMAKE_ASM_CREATE_SHARED_LIBRARY for MSVC. Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=505… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Tue Feb 1 22:06:31 2011 @@ -28,7 +28,8 @@ link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) -set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") +set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) +set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) macro(add_pch _target_name _header_filename _src_list) get_filename_component(FILE ${_header_filename} NAME)

1 0

[tkreuzer] 50587: [TAPIUI] Set linker language C
by tkreuzer＠svn.reactos.org 01 Feb '11

01 Feb '11

Author: tkreuzer Date: Tue Feb 1 21:51:48 2011 New Revision: 50587 URL: http://svn.reactos.org/svn/reactos?rev=50587&view=rev Log: [TAPIUI] Set linker language C Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] Tue Feb 1 21:51:48 2011 @@ -1,6 +1,7 @@ add_library(tapiui SHARED tapiui.rc) set_entrypoint(tapiui 0) +set_target_properties(tapiui PROPERTIES LINKER_LANGUAGE C) add_dependencies(tapiui psdk buildno_header) -add_cab_target(tapiui 1) +add_cab_target(tapiui 1)

1 0

[tkreuzer] 50586: [MSCMS] mscms needs to link to advapi32, currently gcc builds optimize the calls to Reg* apis away, because of unimplemented fucntions.
by tkreuzer＠svn.reactos.org 01 Feb '11

01 Feb '11

Author: tkreuzer Date: Tue Feb 1 20:23:33 2011 New Revision: 50586 URL: http://svn.reactos.org/svn/reactos?rev=50586&view=rev Log: [MSCMS] mscms needs to link to advapi32, currently gcc builds optimize the calls to Reg* apis away, because of unimplemented fucntions. Modified: branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscms/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] Tue Feb 1 20:23:33 2011 @@ -21,5 +21,5 @@ set_module_type(mscms win32dll) target_link_libraries(mscms wine) -add_importlibs(mscms msvcrt kernel32 ntdll) +add_importlibs(mscms msvcrt advapi32 kernel32 ntdll) add_cab_target(mscms 1)

1 0

[tkreuzer] 50585: [JSCRIPT] Fix build with MSVC
by tkreuzer＠svn.reactos.org 01 Feb '11

01 Feb '11

Author: tkreuzer Date: Tue Feb 1 20:08:13 2011 New Revision: 50585 URL: http://svn.reactos.org/svn/reactos?rev=50585&view=rev Log: [JSCRIPT] Fix build with MSVC Modified: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript… ============================================================================== --- branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Tue Feb 1 20:08:13 2011 @@ -9,7 +9,9 @@ -D__WINESRC__ -D_USE_MATH_DEFINES -D_DLL - -D__USE_CRTIMP) + -D__USE_CRTIMP + -Disinf=!_finite + -Disnan=_isnan) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -43,6 +45,9 @@ set_module_type(jscript win32dll) target_link_libraries(jscript wine) +if(MSVC) + target_link_libraries(jscript uuid) +endif() add_importlibs(jscript msvcrt

1 0

[tkreuzer] 50584: [CMAKE] add ftol2_asm.s to crt and ci.c to msvcsup
by tkreuzer＠svn.reactos.org 31 Jan '11

31 Jan '11

Author: tkreuzer Date: Mon Jan 31 23:29:03 2011 New Revision: 50584 URL: http://svn.reactos.org/svn/reactos?rev=50584&view=rev Log: [CMAKE] add ftol2_asm.s to crt and ci.c to msvcsup Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Mon Jan 31 23:29:03 2011 @@ -346,6 +346,7 @@ math/i386/floor_asm.s math/i386/floorf.S math/i386/ftol_asm.s + math/i386/ftol2_asm.s math/i386/log_asm.s math/i386/log10_asm.s math/i386/pow_asm.s @@ -620,10 +621,11 @@ list(APPEND MSVCSUP_SOURCE misc/fltused.c except/i386/chkstk_asm.s + math/i386/ci.c math/i386/ftol2_asm.S) add_library(msvcsup ${MSVCSUP_SOURCE}) add_dependencies(msvcsup psdk buildno_header asm) endif() -add_subdirectory(printf) +add_subdirectory(printf)

1 0

[tkreuzer] 50583: [CRT] Implement call_finally_block, call_filter and call_unwind_func for MSVC
by tkreuzer＠svn.reactos.org 31 Jan '11

31 Jan '11

Author: tkreuzer Date: Mon Jan 31 22:10:17 2011 New Revision: 50583 URL: http://svn.reactos.org/svn/reactos?rev=50583&view=rev Log: [CRT] Implement call_finally_block, call_filter and call_unwind_func for MSVC Modified: branches/cmake-bringup/lib/sdk/crt/except/except.c Modified: branches/cmake-bringup/lib/sdk/crt/except/except.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/except.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/except.c [iso-8859-1] Mon Jan 31 22:10:17 2011 @@ -96,6 +96,57 @@ : "ecx", "edx", "memory" ); return ret; } +#elif defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4731) // Don't complain about changing ebp +void __inline call_finally_block( void *code_block, void *base_ptr ) +{ + __asm + { + mov eax, code_block + mov ebp, base_ptr + call [eax] + } +} + +int __inline call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *_ebp ) +{ + int _ret; + __asm + { + push ebp + mov eax, arg + push eax + mov ebp, _ebp + mov eax, func + call [eax] + mov _ret, eax + pop ebp + pop ebp + } + return _ret; +} +int __inline call_unwind_func( int (*func)(void), void *_ebp ) +{ + int _ret; + + __asm + { + push ebp + push ebx + push esi + push edi + mov ebp, _ebp + call dword ptr [func] + mov _ret, eax + pop edi + pop esi + pop ebx + pop ebp + } + return _ret; +} +#pragma warning(pop) #endif static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs