Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[gadamopoulos] 47275: [win32k] -Store the monitor work area in the monitor and not in the desktop

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed May 19 13:50:21 2010 New Revision: 47275 URL: http://svn.reactos.org/svn/reactos?rev=47275&view=rev Log: [win32k] -Store the monitor work area in the monitor and not in the desktop Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Wed May 19 13:50:21 2010 @@ -24,8 +24,6 @@ DWORD dwMouseHoverTime; /* ReactOS */ - /* Rectangle of the work area */ - RECTL WorkArea; /* Pointer to the active queue. */ PVOID ActiveMessageQueue; /* Handle of the desktop window. */ @@ -69,9 +67,6 @@ VOID APIENTRY IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters); -VOID FASTCALL -IntGetDesktopWorkArea(PDESKTOP Desktop, RECTL *Rect); - LRESULT CALLBACK IntDesktopWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed May 19 13:50:21 2010 @@ -419,35 +419,6 @@ return Status; } -VOID FASTCALL -IntGetDesktopWorkArea(PDESKTOP Desktop, RECTL *Rect) -{ - RECTL *Ret; - - ASSERT(Desktop); - - Ret = &Desktop->WorkArea; - if((Ret->right == -1) && ScreenDeviceContext) - { - PDC dc; - SURFACE *psurf; - dc = DC_LockDc(ScreenDeviceContext); - /* FIXME - Handle dc == NULL!!!! */ - psurf = dc->dclevel.pSurface; - if (psurf) - { - Ret->right = psurf->SurfObj.sizlBitmap.cx; - Ret->bottom = psurf->SurfObj.sizlBitmap.cy; - } - DC_UnlockDc(dc); - } - - if(Rect) - { - *Rect = *Ret; - } -} - PDESKTOP FASTCALL IntGetActiveDesktop(VOID) { @@ -1051,13 +1022,6 @@ RtlCopyMemory(DesktopObject->pDeskInfo->szDesktopName, lpszDesktopName->Buffer, lpszDesktopName->Length); - - // init desktop area - DesktopObject->WorkArea.left = 0; - DesktopObject->WorkArea.top = 0; - DesktopObject->WorkArea.right = -1; - DesktopObject->WorkArea.bottom = -1; - IntGetDesktopWorkArea(DesktopObject, NULL); /* Initialize some local (to win32k) desktop state. */ InitializeListHead(&DesktopObject->PtiList); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Wed May 19 13:50:21 2010 @@ -344,10 +344,7 @@ RECTL MonitorRect, IntersectionRect; ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&Monitor->Lock); - MonitorRect.left = 0; /* FIXME: get origin */ - MonitorRect.top = 0; /* FIXME: get origin */ - MonitorRect.right = MonitorRect.left + Monitor->GdiDevice->gdiinfo.ulHorzRes; - MonitorRect.bottom = MonitorRect.top + Monitor->GdiDevice->gdiinfo.ulVertRes; + MonitorRect = Monitor->rcMonitor; ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&Monitor->Lock); DPRINT("MonitorRect: left = %d, top = %d, right = %d, bottom = %d\n", @@ -677,11 +674,8 @@ } /* fill monitor info */ - MonitorInfo.rcMonitor.left = 0; /* FIXME: get origin */ - MonitorInfo.rcMonitor.top = 0; /* FIXME: get origin */ - MonitorInfo.rcMonitor.right = MonitorInfo.rcMonitor.left + Monitor->GdiDevice->gdiinfo.ulHorzRes; - MonitorInfo.rcMonitor.bottom = MonitorInfo.rcMonitor.top + Monitor->GdiDevice->gdiinfo.ulVertRes; - MonitorInfo.rcWork = MonitorInfo.rcMonitor; /* FIXME: use DEVMODE panning to calculate work area? */ + MonitorInfo.rcMonitor = Monitor->rcMonitor; + MonitorInfo.rcWork = Monitor->rcWork; MonitorInfo.dwFlags = 0; if (Monitor->IsPrimary) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Wed May 19 13:50:21 2010 @@ -895,26 +895,24 @@ } return (UINT_PTR)KEY_METRIC; - case SPI_GETWORKAREA: // FIXME: the workarea should be part of the MONITOR + case SPI_GETWORKAREA: { - PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP pdesktop = pti->rpdesk; - RECTL rclWorkarea; - - if(!pdesktop) - return 0; - - IntGetDesktopWorkArea(pdesktop, &rclWorkarea); - return SpiGet(pvParam, &rclWorkarea, sizeof(RECTL), fl); + PMONITOR pmonitor = IntGetPrimaryMonitor(); + + if(!pmonitor) + return 0; + + return SpiGet(pvParam, &pmonitor->rcWork, sizeof(RECTL), fl); } - case SPI_SETWORKAREA: // FIXME: the workarea should be part of the MONITOR + case SPI_SETWORKAREA: { - PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP pdesktop = pti->rpdesk; + /*FIXME: we should set the work area of the monitor + that contains the specified rectangle*/ + PMONITOR pmonitor = IntGetPrimaryMonitor(); RECT rcWorkArea; - if(!pdesktop) + if(!pmonitor) return 0; if (!SpiSet(&rcWorkArea, pvParam, sizeof(RECTL), fl)) @@ -929,7 +927,7 @@ rcWorkArea.bottom <= rcWorkArea.top) return 0; - pdesktop->WorkArea = rcWorkArea; + pmonitor->rcWork = rcWorkArea; if (fl & SPIF_UPDATEINIFILE) { // FIXME: what to do? Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed May 19 13:50:21 2010 @@ -2112,7 +2112,7 @@ PRTL_USER_PROCESS_PARAMETERS ProcessParams; BOOL CalculatedDefPosSize = FALSE; - IntGetDesktopWorkArea(Window->pti->rpdesk, &WorkArea); + UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); rc = WorkArea; ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Wed May 19 13:50:21 2010 @@ -258,19 +258,17 @@ if (!Wnd->InternalPosInitialized) { RECTL WorkArea; - PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP Desktop = pti->rpdesk; /* Or rather get it from the window? */ Parent = Window->spwndParent; if(Parent) { if(IntIsDesktopWindow(Parent)) - IntGetDesktopWorkArea(Desktop, &WorkArea); + UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); else WorkArea = Parent->Wnd->rcClient; } else - IntGetDesktopWorkArea(Desktop, &WorkArea); + UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); Wnd->InternalPos.NormalRect = Window->Wnd->rcWindow; IntGetWindowBorderMeasures(Window, &XInc, &YInc);

14 years, 8 months

[fireball] 47274: [VENDOR/WINE] - Import Wine-1.1.44 gdi32, user32, winex11.drv, wineserver.

by fireball＠svn.reactos.org

Author: fireball Date: Wed May 19 12:21:40 2010 New Revision: 47274 URL: http://svn.reactos.org/svn/reactos?rev=47274&view=rev Log: [VENDOR/WINE] - Import Wine-1.1.44 gdi32, user32, winex11.drv, wineserver. Modified: vendor/wine/dlls/gdi32/current/dc.c vendor/wine/dlls/gdi32/current/dib.c vendor/wine/dlls/gdi32/current/driver.c vendor/wine/dlls/gdi32/current/font.c vendor/wine/dlls/gdi32/current/gdi_private.h vendor/wine/dlls/gdi32/current/path.c vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/gdi32/current/tests/path.c vendor/wine/dlls/user32/current/cursoricon.c vendor/wine/dlls/user32/current/driver.c vendor/wine/dlls/user32/current/edit.c vendor/wine/dlls/user32/current/lstr.c vendor/wine/dlls/user32/current/resources/oic_winlogo.ico vendor/wine/dlls/user32/current/resources/oic_winlogo.svg vendor/wine/dlls/user32/current/tests/cursoricon.c vendor/wine/dlls/user32/current/tests/dialog.c vendor/wine/dlls/user32/current/tests/edit.c vendor/wine/dlls/user32/current/tests/msg.c vendor/wine/dlls/user32/current/uitools.c vendor/wine/dlls/user32/current/user_private.h vendor/wine/dlls/winex11.drv/current/bitblt.c vendor/wine/dlls/winex11.drv/current/clipboard.c vendor/wine/dlls/winex11.drv/current/dib.c vendor/wine/dlls/winex11.drv/current/event.c vendor/wine/dlls/winex11.drv/current/keyboard.c vendor/wine/dlls/winex11.drv/current/mouse.c vendor/wine/dlls/winex11.drv/current/opengl.c vendor/wine/dlls/winex11.drv/current/window.c vendor/wine/dlls/winex11.drv/current/winex11.drv.spec vendor/wine/dlls/winex11.drv/current/x11drv.h vendor/wine/dlls/winex11.drv/current/x11drv_main.c vendor/wine/dlls/winex11.drv/current/xdnd.c vendor/wine/dlls/winex11.drv/current/xrender.c vendor/wine/server/current/object.h vendor/wine/server/current/process.h vendor/wine/server/current/protocol.def vendor/wine/server/current/ptrace.c vendor/wine/server/current/queue.c vendor/wine/server/current/registry.c vendor/wine/server/current/request.h vendor/wine/server/current/thread.c vendor/wine/server/current/thread.h vendor/wine/server/current/trace.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/wine/dlls/gdi32/current/dc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/dc.c?rev=… Modified: vendor/wine/dlls/gdi32/current/dib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/dib.c?rev… Modified: vendor/wine/dlls/gdi32/current/driver.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/driver.c?… Modified: vendor/wine/dlls/gdi32/current/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/font.c?re… Modified: vendor/wine/dlls/gdi32/current/gdi_private.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdi_priva… Modified: vendor/wine/dlls/gdi32/current/path.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/path.c?re… Modified: vendor/wine/dlls/gdi32/current/tests/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/fon… Modified: vendor/wine/dlls/gdi32/current/tests/path.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/pat… Modified: vendor/wine/dlls/user32/current/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/cursoric… Modified: vendor/wine/dlls/user32/current/driver.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/driver.c… Modified: vendor/wine/dlls/user32/current/edit.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/edit.c?r… Modified: vendor/wine/dlls/user32/current/lstr.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/lstr.c?r… Modified: vendor/wine/dlls/user32/current/resources/oic_winlogo.ico URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_winlogo.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/tests/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/cu… Modified: vendor/wine/dlls/user32/current/tests/dialog.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/di… Modified: vendor/wine/dlls/user32/current/tests/edit.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ed… Modified: vendor/wine/dlls/user32/current/tests/msg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ms… Modified: vendor/wine/dlls/user32/current/uitools.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/uitools.… Modified: vendor/wine/dlls/user32/current/user_private.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/user_pri… Modified: vendor/wine/dlls/winex11.drv/current/bitblt.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/bit… Modified: vendor/wine/dlls/winex11.drv/current/clipboard.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/cli… Modified: vendor/wine/dlls/winex11.drv/current/dib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/dib… Modified: vendor/wine/dlls/winex11.drv/current/event.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/eve… Modified: vendor/wine/dlls/winex11.drv/current/keyboard.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/key… Modified: vendor/wine/dlls/winex11.drv/current/mouse.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/mou… Modified: vendor/wine/dlls/winex11.drv/current/opengl.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/ope… Modified: vendor/wine/dlls/winex11.drv/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… Modified: vendor/wine/dlls/winex11.drv/current/winex11.drv.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… Modified: vendor/wine/dlls/winex11.drv/current/x11drv.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/x11… Modified: vendor/wine/dlls/winex11.drv/current/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/x11… Modified: vendor/wine/dlls/winex11.drv/current/xdnd.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xdn… Modified: vendor/wine/dlls/winex11.drv/current/xrender.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xre… Modified: vendor/wine/server/current/object.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/object.h?rev=… Modified: vendor/wine/server/current/process.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/process.h?rev… Modified: vendor/wine/server/current/protocol.def URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/protocol.def?… Modified: vendor/wine/server/current/ptrace.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/ptrace.c?rev=… Modified: vendor/wine/server/current/queue.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/queue.c?rev=4… Modified: vendor/wine/server/current/registry.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/registry.c?re… Modified: vendor/wine/server/current/request.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/request.h?rev… Modified: vendor/wine/server/current/thread.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/thread.c?rev=… Modified: vendor/wine/server/current/thread.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/thread.h?rev=… Modified: vendor/wine/server/current/trace.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/trace.c?rev=4…

14 years, 8 months

[gadamopoulos] 47273: [win32k] -WM_WINDOWPOSCHANGED should contain the final window position

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed May 19 11:18:24 2010 New Revision: 47273 URL: http://svn.reactos.org/svn/reactos?rev=47273&view=rev Log: [win32k] -WM_WINDOWPOSCHANGED should contain the final window position Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Wed May 19 11:18:24 2010 @@ -1416,7 +1416,16 @@ } if ((WinPos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) + { + /* WM_WINDOWPOSCHANGED is sent even if SWP_NOSENDCHANGING is set + and always contains final window position. + */ + WinPos.x = NewWindowRect.left; + WinPos.y = NewWindowRect.top; + WinPos.cx = NewWindowRect.right - NewWindowRect.left; + WinPos.cy = NewWindowRect.bottom - NewWindowRect.top; co_IntSendMessageNoWait(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); + } return TRUE; }

14 years, 8 months

[dreimer] 47272: Remove the Old behavior mode for now again. 64 bit hosts and their (x86) in path make problems in stupid batch!

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed May 19 10:45:36 2010 New Revision: 47272 URL: http://svn.reactos.org/svn/reactos?rev=47272&view=rev Log: Remove the Old behavior mode for now again. 64 bit hosts and their (x86) in path make problems in stupid batch! Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Wed May 19 10:45:36 2010 @@ -1,4 +1,11 @@ -*** May XXth, 2010 - RosBE 1.5.1 Released +*** May 19th, 2010 - RosBE 1.5.1.1 Released + +- fix a bug in ssvn batch version which always ran through the update function even if the 1st param was crap. (Crocodile) +- Fixing another Bug noone saw in the RCs or in RosBE 1.5 Update 1, a bug which exactly shows the bullshit Batch is in real. (Daniel Reimer) + Results in having to remove the old behavior mode again for now. 64 bit hosts make problems with their (x86) in the path var. (Daniel Reimer) +- Some sSVN cleanup, too. (Daniel Reimer) + +*** May 16th, 2010 - RosBE 1.5.1 Released - Updated NASM to 2.08.01 (Daniel Reimer) - Updated YASM to 1.0.0 (Daniel Reimer) Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Wed May 19 10:45:36 2010 @@ -41,15 +41,7 @@ set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% set _BUILDBOT_SVNSKIPMAINTRUNK=0 -setlocal enabledelayedexpansion - -if "%_ROSBE_NOSYSPATH%" == "1" ( - set _ROSBE_ORIGINALPATH=!_ROSBE_BASEDIR!;!_ROSBE_BASEDIR!\Tools;!_ROSBE_BASEDIR!\samples;!SystemRoot!\system32;!SystemRoot!;!SystemRoot!\System32\Wbem -) else ( - set _ROSBE_ORIGINALPATH=!_ROSBE_BASEDIR!;!_ROSBE_BASEDIR!\Tools;!_ROSBE_BASEDIR!\samples;!PATH! -) - -endlocal && set _ROSBE_ORIGINALPATH=%_ROSBE_ORIGINALPATH% +set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%PATH% :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed May 19 10:45:36 2010 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.5.1" +!define PRODUCT_VERSION "1.5.1.1" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.5.1.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.5.1.1" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.5.1.0" +VIProductVersion "1.5.1.1" CRCCheck force SetDatablockOptimize on

14 years, 8 months

[tkreuzer] 47271: sync with trunk (r47268)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 19 05:44:15 2010 New Revision: 47271 URL: http://svn.reactos.org/svn/reactos?rev=47271&view=rev Log: sync with trunk (r47268) Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/ReactOS-arm.rbuild branches/reactos-yarotows/base/applications/rapps/rapps/dosbox.txt branches/reactos-yarotows/base/applications/rapps/rapps/firefox2.txt branches/reactos-yarotows/base/applications/rapps/rapps/irfanview.txt branches/reactos-yarotows/base/applications/rapps/rapps/irfanviewplugins.txt branches/reactos-yarotows/base/applications/rapps/rapps/rosbe.txt branches/reactos-yarotows/base/applications/rapps/rapps/utorrent.txt branches/reactos-yarotows/base/applications/regedit/find.c branches/reactos-yarotows/base/applications/regedit/lang/bg-BG.rc branches/reactos-yarotows/base/applications/regedit/lang/cs-CZ.rc branches/reactos-yarotows/base/applications/regedit/lang/de-DE.rc branches/reactos-yarotows/base/applications/regedit/lang/el-GR.rc branches/reactos-yarotows/base/applications/regedit/lang/en-US.rc branches/reactos-yarotows/base/applications/regedit/lang/es-ES.rc branches/reactos-yarotows/base/applications/regedit/lang/fr-FR.rc branches/reactos-yarotows/base/applications/regedit/lang/hu-HU.rc branches/reactos-yarotows/base/applications/regedit/lang/id-ID.rc branches/reactos-yarotows/base/applications/regedit/lang/it-IT.rc branches/reactos-yarotows/base/applications/regedit/lang/ja-JP.rc branches/reactos-yarotows/base/applications/regedit/lang/ko-KR.rc branches/reactos-yarotows/base/applications/regedit/lang/nl-NL.rc branches/reactos-yarotows/base/applications/regedit/lang/no-NO.rc branches/reactos-yarotows/base/applications/regedit/lang/pl-PL.rc branches/reactos-yarotows/base/applications/regedit/lang/pt-BR.rc branches/reactos-yarotows/base/applications/regedit/lang/pt-PT.rc branches/reactos-yarotows/base/applications/regedit/lang/ru-RU.rc branches/reactos-yarotows/base/applications/regedit/lang/sk-SK.rc branches/reactos-yarotows/base/applications/regedit/lang/sl-SI.rc branches/reactos-yarotows/base/applications/regedit/lang/sv-SE.rc branches/reactos-yarotows/base/applications/regedit/lang/th-TH.rc branches/reactos-yarotows/base/applications/regedit/lang/uk-UA.rc branches/reactos-yarotows/base/applications/regedit/lang/zh-CN.rc branches/reactos-yarotows/base/applications/regedit/listview.c branches/reactos-yarotows/base/applications/regedit/regproc.c branches/reactos-yarotows/base/applications/regedit/regproc.h branches/reactos-yarotows/boot/bootdata/hivesft_arm.inf branches/reactos-yarotows/boot/bootdata/hivesft_i386.inf branches/reactos-yarotows/boot/bootdata/hivesys_i386.inf branches/reactos-yarotows/dll/win32/kernel32/mem/global.c branches/reactos-yarotows/dll/win32/kernel32/misc/console.c branches/reactos-yarotows/dll/win32/kernel32/misc/nls.c branches/reactos-yarotows/dll/win32/kernel32/misc/utils.c branches/reactos-yarotows/dll/win32/kernel32/thread/fiber.c branches/reactos-yarotows/dll/win32/kernel32/thread/i386/fiber.S branches/reactos-yarotows/dll/win32/qmgr/qmgr.inf branches/reactos-yarotows/dll/win32/setupapi/install.c branches/reactos-yarotows/dll/win32/user32/windows/menu.c branches/reactos-yarotows/dll/win32/user32/windows/window.c branches/reactos-yarotows/dll/win32/userenv/lang/de-DE.rc branches/reactos-yarotows/dll/win32/userenv/lang/fr-FR.rc branches/reactos-yarotows/drivers/network/afd/afd/read.c branches/reactos-yarotows/hal/halx86/hal_generic.rbuild branches/reactos-yarotows/hal/halx86/halamd64.rbuild branches/reactos-yarotows/include/ndk/i386/asm.h branches/reactos-yarotows/subsystems/win32/csrss/win32csr/conio.c branches/reactos-yarotows/subsystems/win32/win32k/include/rect.h branches/reactos-yarotows/subsystems/win32/win32k/ntuser/menu.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/timer.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/window.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/winpos.c branches/reactos-yarotows/subsystems/win32/win32k/objects/rect.c branches/reactos-yarotows/tools/rbuild/backend/msvc/vcxprojmaker.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactos-yarotows/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ReactOS-arm.rb… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/regedit/regproc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… Modified: branches/reactos-yarotows/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… Modified: branches/reactos-yarotows/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… Modified: branches/reactos-yarotows/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/thread/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/qmgr/qmgr.inf URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/qmgr… Modified: branches/reactos-yarotows/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/setu… Modified: branches/reactos-yarotows/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/dll/win32/userenv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/dll/win32/userenv/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/networ… Modified: branches/reactos-yarotows/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/hal/halx86/hal… Modified: branches/reactos-yarotows/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/hal/halx86/hal… Modified: branches/reactos-yarotows/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/ndk/i3… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/rect.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/rect.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/tools/rbuild/backend/msvc/vcxprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/rbuild/b…

14 years, 8 months

[tkreuzer] 47270: [WIN32K] Add back a break that got removed by accident. Fixes icon color regression.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 19 04:36:38 2010 New Revision: 47270 URL: http://svn.reactos.org/svn/reactos?rev=47270&view=rev Log: [WIN32K] Add back a break that got removed by accident. Fixes icon color regression. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed May 19 04:36:38 2010 @@ -108,6 +108,7 @@ case 16: psurfBmp->ppal = &gpalRGB565; GDIOBJ_IncrementShareCount((POBJ)&gpalRGB565); + break; case 24: case 32: psurfBmp->ppal = &gpalRGB;

14 years, 8 months

[tkreuzer] 47269: [WIN32K] - When initializing the EXLATEOBJ to translate the solid brush color in EBRUSHOBJ_vSetSolidBrushColor, also pass the EBRUSHOBJs back color. This fixes wrong colors when the destination surface is mono (e.g. disabled buttons)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 19 03:54:43 2010 New Revision: 47269 URL: http://svn.reactos.org/svn/reactos?rev=47269&view=rev Log: [WIN32K] - When initializing the EXLATEOBJ to translate the solid brush color in EBRUSHOBJ_vSetSolidBrushColor, also pass the EBRUSHOBJs back color. This fixes wrong colors when the destination surface is mono (e.g. disabled buttons) Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Wed May 19 03:54:43 2010 @@ -82,7 +82,12 @@ pebo->ulRGBColor = crColor; /* Initialize an XLATEOBJ RGB -> surface */ - EXLATEOBJ_vInitialize(&exlo, &gpalRGB, pebo->ppalSurf, 0, 0, 0); + EXLATEOBJ_vInitialize(&exlo, + &gpalRGB, + pebo->ppalSurf, + pebo->crCurrentBack, + 0, + 0); /* Translate the brush color to the target format */ iSolidColor = XLATEOBJ_iXlate(&exlo.xlo, crColor);

14 years, 8 months

[cgutman] 47268: [QMGR] - Add the FLG_ADDREG_APPEND flag when writing the netsvcs value because, unlike WINE, we are actually going to have values in there

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed May 19 00:48:09 2010 New Revision: 47268 URL: http://svn.reactos.org/svn/reactos?rev=47268&view=rev Log: [QMGR] - Add the FLG_ADDREG_APPEND flag when writing the netsvcs value because, unlike WINE, we are actually going to have values in there Modified: trunk/reactos/dll/win32/qmgr/qmgr.inf Modified: trunk/reactos/dll/win32/qmgr/qmgr.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.inf?re… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr.inf [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/qmgr.inf [iso-8859-1] Wed May 19 00:48:09 2010 @@ -12,5 +12,5 @@ HKCR,"AppID\%CLSID_BackgroundCopyQMgr%","LocalService",,"BITS" HKCR,"CLSID\%CLSID_BackgroundCopyManager%","AppID",,"%CLSID_BackgroundCopyQMgr%" -;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"BITS" +HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010008,"BITS" HKLM,"System\CurrentControlSet\Services\BITS\Parameters","ServiceDll",0x00020000,"qmgr.dll"

14 years, 8 months

[cgutman] 47267: [SETUPAPI] - Fix an incorrect length value that corrupted REG_MULTI_SZ values when they had strings appended - I'm not sure if this is synced with WINE, but if it is, they need this patch too

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed May 19 00:43:02 2010 New Revision: 47267 URL: http://svn.reactos.org/svn/reactos?rev=47267&view=rev Log: [SETUPAPI] - Fix an incorrect length value that corrupted REG_MULTI_SZ values when they had strings appended - I'm not sure if this is synced with WINE, but if it is, they need this patch too Modified: trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Wed May 19 00:43:02 2010 @@ -250,7 +250,7 @@ if (total != size) { TRACE( "setting value %s to %s\n", debugstr_w(value), debugstr_w(buffer) ); - RegSetValueExW( hkey, value, 0, REG_MULTI_SZ, (BYTE *)buffer, total ); + RegSetValueExW( hkey, value, 0, REG_MULTI_SZ, (BYTE *)buffer, total + sizeof(WCHAR) ); } done: HeapFree( GetProcessHeap(), 0, buffer );

14 years, 8 months

[spetreolle] 47266: Add SvcHost registry entries.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed May 19 00:35:00 2010 New Revision: 47266 URL: http://svn.reactos.org/svn/reactos?rev=47266&view=rev Log: Add SvcHost registry entries. Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Wed May 19 00:35:00 2010 @@ -1126,4 +1126,8 @@ ; Keyboard layout switcher ;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch",0x00000000,"kbswitch.exe" +; SvcHost services +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost", "netsvcs",0x00010000,"" + ; EOF Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Wed May 19 00:35:00 2010 @@ -1262,4 +1262,8 @@ ; Keyboard layout switcher ;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch",0x00000000,"kbswitch.exe" +; SvcHost services +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost", "netsvcs",0x00010000,"" + ; EOF

14 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2010