Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 40444: Don't hard code viewport extents, they depend on the dc size - highlighted by gdi32 mapping tests
by gschneider＠svn.reactos.org 10 Apr '09

10 Apr '09

Author: gschneider Date: Fri Apr 10 23:40:48 2009 New Revision: 40444 URL: http://svn.reactos.org/svn/reactos?rev=40444&view=rev Log: Don't hard code viewport extents, they depend on the dc size - highlighted by gdi32 mapping tests Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Fri Apr 10 23:40:48 2009 @@ -674,36 +674,36 @@ /* Fall through */ case MM_LOMETRIC: - pdcattr->szlWindowExt.cx = 3600; - pdcattr->szlWindowExt.cy = 2700; + pdcattr->szlWindowExt.cx = dc->ppdev->GDIInfo.ulHorzSize * 10; + pdcattr->szlWindowExt.cy = dc->ppdev->GDIInfo.ulVertSize * 10; pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; break; case MM_HIMETRIC: - pdcattr->szlWindowExt.cx = 36000; - pdcattr->szlWindowExt.cy = 27000; + pdcattr->szlWindowExt.cx = dc->ppdev->GDIInfo.ulHorzSize * 100; + pdcattr->szlWindowExt.cy = dc->ppdev->GDIInfo.ulVertSize * 100; pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; break; case MM_LOENGLISH: - pdcattr->szlWindowExt.cx = 1417; - pdcattr->szlWindowExt.cy = 1063; + pdcattr->szlWindowExt.cx = MulDiv(1000, dc->ppdev->GDIInfo.ulHorzSize, 254); + pdcattr->szlWindowExt.cy = MulDiv(1000, dc->ppdev->GDIInfo.ulVertSize, 254); pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; break; case MM_HIENGLISH: - pdcattr->szlWindowExt.cx = 14173; - pdcattr->szlWindowExt.cy = 10630; + pdcattr->szlWindowExt.cx = MulDiv(10000, dc->ppdev->GDIInfo.ulHorzSize, 254); + pdcattr->szlWindowExt.cy = MulDiv(10000, dc->ppdev->GDIInfo.ulVertSize, 254); pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; break; case MM_TWIPS: - pdcattr->szlWindowExt.cx = 20409; - pdcattr->szlWindowExt.cy = 15307; + pdcattr->szlWindowExt.cx = MulDiv(14400, dc->ppdev->GDIInfo.ulHorzSize, 254); + pdcattr->szlWindowExt.cy = MulDiv(14400, dc->ppdev->GDIInfo.ulVertSize, 254); pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; break; @@ -1057,19 +1057,19 @@ DC_UpdateXforms(PDC dc) { XFORM xformWnd2Vport; - FLOAT scaleX, scaleY; + DOUBLE scaleX, scaleY; PDC_ATTR pdcattr = dc->pdcattr; XFORM xformWorld2Vport, xformWorld2Wnd, xformVport2World; /* Construct a transformation to do the window-to-viewport conversion */ - scaleX = (pdcattr->szlWindowExt.cx ? (FLOAT)pdcattr->szlViewportExt.cx / (FLOAT)pdcattr->szlWindowExt.cx : 0.0f); - scaleY = (pdcattr->szlWindowExt.cy ? (FLOAT)pdcattr->szlViewportExt.cy / (FLOAT)pdcattr->szlWindowExt.cy : 0.0f); + scaleX = (pdcattr->szlWindowExt.cx ? (DOUBLE)pdcattr->szlViewportExt.cx / (DOUBLE)pdcattr->szlWindowExt.cx : 0.0f); + scaleY = (pdcattr->szlWindowExt.cy ? (DOUBLE)pdcattr->szlViewportExt.cy / (DOUBLE)pdcattr->szlWindowExt.cy : 0.0f); xformWnd2Vport.eM11 = scaleX; xformWnd2Vport.eM12 = 0.0; xformWnd2Vport.eM21 = 0.0; xformWnd2Vport.eM22 = scaleY; - xformWnd2Vport.eDx = (FLOAT)pdcattr->ptlViewportOrg.x - scaleX * (FLOAT)pdcattr->ptlWindowOrg.x; - xformWnd2Vport.eDy = (FLOAT)pdcattr->ptlViewportOrg.y - scaleY * (FLOAT)pdcattr->ptlWindowOrg.y; + xformWnd2Vport.eDx = (DOUBLE)pdcattr->ptlViewportOrg.x - scaleX * (DOUBLE)pdcattr->ptlWindowOrg.x; + xformWnd2Vport.eDy = (DOUBLE)pdcattr->ptlViewportOrg.y - scaleY * (DOUBLE)pdcattr->ptlWindowOrg.y; /* Combine with the world transformation */ MatrixS2XForm(&xformWorld2Vport, &dc->dclevel.mxWorldToDevice);

1 0

[fireball] 40443: - Move 4 apps from rosapps to trunk for consistency (fontview, magnify, winver and write) [2/2].
by fireball＠svn.reactos.org 10 Apr '09

10 Apr '09

Author: fireball Date: Fri Apr 10 23:04:12 2009 New Revision: 40443 URL: http://svn.reactos.org/svn/reactos?rev=40443&view=rev Log: - Move 4 apps from rosapps to trunk for consistency (fontview, magnify, winver and write) [2/2]. Removed: trunk/rosapps/applications/fontview/ trunk/rosapps/applications/magnify/ trunk/rosapps/applications/winver/ trunk/rosapps/applications/write/ Modified: trunk/rosapps/applications/applications.rbuild Modified: trunk/rosapps/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.… ============================================================================== --- trunk/rosapps/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/applications.rbuild [iso-8859-1] Fri Apr 10 23:04:12 2009 @@ -17,18 +17,11 @@ <xi:include href="downloader/downloader.rbuild" /> </directory> - <directory name="fontview"> - <xi:include href="fontview/fontview.rbuild" /> - </directory>  - - <directory name="magnify"> - <xi:include href="magnify/magnify.rbuild" /> - </directory> <directory name="net"> <xi:include href="net/directory.rbuild" /> @@ -45,12 +38,4 @@ <directory name="winfile"> <xi:include href="winfile/winfile.rbuild" /> </directory> - - <directory name="winver"> - <xi:include href="winver/winver.rbuild" /> - </directory> - - <directory name="write"> - <xi:include href="write/write.rbuild" /> - </directory> </group>

1 0

[fireball] 40442: - Move 4 apps from rosapps to trunk for consistency (fontview, magnify, winver and write) [1/2].
by fireball＠svn.reactos.org 10 Apr '09

10 Apr '09

Author: fireball Date: Fri Apr 10 23:03:02 2009 New Revision: 40442 URL: http://svn.reactos.org/svn/reactos?rev=40442&view=rev Log: - Move 4 apps from rosapps to trunk for consistency (fontview, magnify, winver and write) [1/2]. Added: trunk/reactos/base/applications/fontview/ - copied from r40440, trunk/rosapps/applications/fontview/ trunk/reactos/base/applications/magnify/ - copied from r40440, trunk/rosapps/applications/magnify/ trunk/reactos/base/applications/winver/ - copied from r40440, trunk/rosapps/applications/winver/ trunk/reactos/base/applications/write/ - copied from r40440, trunk/rosapps/applications/write/ Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Fri Apr 10 23:03:02 2009 @@ -19,6 +19,9 @@ <directory name="dxdiag"> <xi:include href="dxdiag/dxdiag.rbuild" /> </directory> + <directory name="fontview"> + <xi:include href="fontview/fontview.rbuild" /> + </directory> <directory name="games"> <xi:include href="games/games.rbuild" /> </directory> @@ -33,6 +36,9 @@ </directory> <directory name="logoff"> <xi:include href="logoff/logoff.rbuild" /> + </directory> + <directory name="magnify"> + <xi:include href="magnify/magnify.rbuild" /> </directory> <directory name="mplay32"> <xi:include href="mplay32/mplay32.rbuild" /> @@ -76,7 +82,13 @@ <directory name="winhlp32"> <xi:include href="winhlp32/winhlp32.rbuild" /> </directory> + <directory name="winver"> + <xi:include href="winver/winver.rbuild" /> + </directory> <directory name="wordpad"> <xi:include href="wordpad/wordpad.rbuild" /> </directory> + <directory name="write"> + <xi:include href="write/write.rbuild" /> + </directory> </group> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Apr 10 23:03:02 2009 @@ -42,6 +42,7 @@ base\applications\cmdutils\xcopy\xcopy.exe 1 base\applications\control\control.exe 1 base\applications\dxdiag\dxdiag.exe 1 +base\applications\fontview\fontview.exe 1 base\applications\mscutils\devmgmt\devmgmt.exe 1 base\applications\mscutils\eventvwr\eventvwr.exe 1 base\applications\games\solitaire\sol.exe 1 @@ -50,6 +51,7 @@ base\applications\kbswitch\kbswitch.exe 1 base\applications\kbswitch\kbsdll\kbsdll.dll 1 base\applications\logoff\logoff.exe 1 +base\applications\magnify\magnify.exe 1 base\applications\mplay32\mplay32.exe 1 base\applications\msconfig\msconfig.exe 1 base\applications\mstsc\mstsc.exe 1 @@ -76,7 +78,9 @@ base\applications\sndvol32\sndvol32.exe 1 base\applications\taskmgr\taskmgr.exe 1 base\applications\winhlp32\winhlp32.exe 4 +base\applications\winver\winver.exe 1 base\applications\wordpad\wordpad.exe 1 +base\applications\write\write.exe 1 base\services\audiosrv\audiosrv.exe 1 base\services\dhcp\dhcp.exe 1 @@ -650,13 +654,11 @@ modules\rosapps\applications\sysutils\gettype\gettype.exe 1 optional modules\rosapps\applications\downloader\downloader.exe 1 optional modules\rosapps\applications\downloader\downloader.xml 1 optional -modules\rosapps\applications\fontview\fontview.exe 1 optional modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional modules\rosapps\applications\net\netreg\netreg.exe 1 optional modules\rosapps\applications\net\niclist\niclist.exe 1 optional modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional modules\rosapps\applications\notevil\notevil.exe 1 optional -modules\rosapps\applications\magnify\magnify.exe 1 optional modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional @@ -683,8 +685,6 @@ modules\rosapps\applications\sysutils\utils\stats\stats.exe 1 optional modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe 1 optional modules\rosapps\applications\winfile\winfile.exe 1 optional -modules\rosapps\applications\winver\winver.exe 1 optional -modules\rosapps\applications\write\write.exe 1 optional modules\rosapps\demos\maze\maze.exe 1 optional modules\rosapps\drivers\green\green.sys 2 optional

1 0

[cgutman] 40441: - Deserialized miniports always complete their sends asynchronously so we return NDIS_STATUS_PENDING when we call one (so the ProtocolSendComplete handler doesn't get called twice thus double-completing the packet) - Fixes miniport drivers that use a deserialized SendPackets handler (including the rtl8139) - The rtl8139 driver still doesn't work (likely due to a bug in tcpip)
by cgutman＠svn.reactos.org 10 Apr '09

10 Apr '09

Author: cgutman Date: Fri Apr 10 23:00:51 2009 New Revision: 40441 URL: http://svn.reactos.org/svn/reactos?rev=40441&view=rev Log: - Deserialized miniports always complete their sends asynchronously so we return NDIS_STATUS_PENDING when we call one (so the ProtocolSendComplete handler doesn't get called twice thus double-completing the packet) - Fixes miniport drivers that use a deserialized SendPackets handler (including the rtl8139) - The rtl8139 driver still doesn't work (likely due to a bug in tcpip) Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Apr 10 23:00:51 2009 @@ -975,7 +975,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, (PPNDIS_PACKET)&WorkItemContext, 1); - NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); + NdisStatus = NDIS_STATUS_PENDING; } else { Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Fri Apr 10 23:00:51 2009 @@ -201,7 +201,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); - NdisStatus = NDIS_GET_PACKET_STATUS(Packet); + NdisStatus = NDIS_STATUS_PENDING; } else { /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); @@ -322,12 +322,6 @@ { (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray, NumberOfPackets); - for (i = 0; i < NumberOfPackets; i++) - { - NdisStatus = NDIS_GET_PACKET_STATUS(PacketArray[i]); - if (NdisStatus != NDIS_STATUS_PENDING) - MiniSendComplete(Adapter, PacketArray[i], NdisStatus); - } } else {

1 0

[gschneider] 40440: - Don't copy the original header after the new header is filled correctly, fixes one gdi32 clipping winetest TDB for the other seven remaining clipping tests: - Deprecate rosdc regions and use dc/dclvl regions as soon as the other clip functions are ready for it (currently crashes virtually everywhere; first five failing tests) - Fix imprecision of one pixel (rounding problems?) in XFORMOBJ_bApplyXform (last two failing tests)
by gschneider＠svn.reactos.org 10 Apr '09

10 Apr '09

Author: gschneider Date: Fri Apr 10 21:49:12 2009 New Revision: 40440 URL: http://svn.reactos.org/svn/reactos?rev=40440&view=rev Log: - Don't copy the original header after the new header is filled correctly, fixes one gdi32 clipping winetest TDB for the other seven remaining clipping tests: - Deprecate rosdc regions and use dc/dclvl regions as soon as the other clip functions are ready for it (currently crashes virtually everywhere; first five failing tests) - Fix imprecision of one pixel (rounding problems?) in XFORMOBJ_bApplyXform (last two failing tests) Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Fri Apr 10 21:49:12 2009 @@ -2539,9 +2539,6 @@ _SEH2_TRY { - /* Copy header */ - Region->rdh = RgnData->rdh; - if (Xform) { ULONG ret;

1 0

[cfinck] 40439: - Remove _SHExpandEnvironmentStrings and replace calls to it by usual ExpandEnvironmentStringsW calls. That function didn't really do what it should as it replaced some variables by faulty generated values instead of their actual values. Fixing this gets us rid of our duplicated "Administrator" directory, so the only remaining Admin dir is "Administrator.REACTOS" created by userenv. This might also fix the SHGetFolderPathW timing issue, which was hit by rosautotest from time to t
by cfinck＠svn.reactos.org 10 Apr '09

10 Apr '09

Author: cfinck Date: Fri Apr 10 20:05:09 2009 New Revision: 40439 URL: http://svn.reactos.org/svn/reactos?rev=40439&view=rev Log: - Remove _SHExpandEnvironmentStrings and replace calls to it by usual ExpandEnvironmentStringsW calls. That function didn't really do what it should as it replaced some variables by faulty generated values instead of their actual values. Fixing this gets us rid of our duplicated "Administrator" directory, so the only remaining Admin dir is "Administrator.REACTOS" created by userenv. This might also fix the SHGetFolderPathW timing issue, which was hit by rosautotest from time to time. - In turn, removing that function makes it possible to get rid of the now unused _SHOpenProfilesKey and _SHGetProfilesValue functions. Modified: trunk/reactos/dll/win32/shell32/shellpath.c Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] Fri Apr 10 20:05:09 2009 @@ -909,8 +909,6 @@ } }; -static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest); - /* Gets the value named value from the registry key * rootKey\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders * (or from rootKey\userPrefix\... if userPrefix is not NULL) into path, which @@ -974,7 +972,7 @@ { WCHAR szTemp[MAX_PATH]; - _SHExpandEnvironmentStrings(path, szTemp); + ExpandEnvironmentStringsW(path, szTemp, MAX_PATH); lstrcpynW(path, szTemp, MAX_PATH); } ret = RegSetValueExW(shellFolderKey, value, 0, REG_SZ, (LPBYTE)path, @@ -1240,164 +1238,6 @@ hr = _SHGetDefaultValue(folder, pszPath); } TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); - return hr; -} - -static HRESULT _SHOpenProfilesKey(PHKEY pKey) -{ - LONG lRet; - DWORD disp; - - lRet = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ProfileListW, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, pKey, &disp); - return HRESULT_FROM_WIN32(lRet); -} - -/* Reads the value named szValueName from the key profilesKey (assumed to be - * opened by _SHOpenProfilesKey) into szValue, which is assumed to be MAX_PATH - * WCHARs in length. If it doesn't exist, returns szDefault (and saves - * szDefault to the registry). - */ -static HRESULT _SHGetProfilesValue(HKEY profilesKey, LPCWSTR szValueName, - LPWSTR szValue, LPCWSTR szDefault) -{ - HRESULT hr; - DWORD type, dwPathLen = MAX_PATH * sizeof(WCHAR); - LONG lRet; - - TRACE("%p,%s,%p,%s\n", profilesKey, debugstr_w(szValueName), szValue, - debugstr_w(szDefault)); - lRet = RegQueryValueExW(profilesKey, szValueName, NULL, &type, - (LPBYTE)szValue, &dwPathLen); - if (!lRet && (type == REG_SZ || type == REG_EXPAND_SZ) && dwPathLen - && *szValue) - { - dwPathLen /= sizeof(WCHAR); - szValue[dwPathLen] = '\0'; - hr = S_OK; - } - else - { - /* Missing or invalid value, set a default */ - lstrcpynW(szValue, szDefault, MAX_PATH); - TRACE("Setting missing value %s to %s\n", debugstr_w(szValueName), - debugstr_w(szValue)); - lRet = RegSetValueExW(profilesKey, szValueName, 0, REG_EXPAND_SZ, - (LPBYTE)szValue, - (wcslen(szValue) + 1) * sizeof(WCHAR)); - if (lRet) - hr = HRESULT_FROM_WIN32(lRet); - else - hr = S_OK; - } - TRACE("returning 0x%08x (output value is %s)\n", hr, debugstr_w(szValue)); - return hr; -} - -/* Attempts to expand environment variables from szSrc into szDest, which is - * assumed to be MAX_PATH characters in length. Before referring to the - * environment, handles a few variables directly, because the environment - * variables may not be set when this is called (as during Wine's installation - * when default values are being written to the registry). - * The directly handled environment variables, and their source, are: - * - ALLUSERSPROFILE, USERPROFILE: reads from the registry - * - SystemDrive: uses GetSystemDirectoryW and uses the drive portion of its - * path - * If one of the directly handled environment variables is expanded, only - * expands a single variable, and only in the beginning of szSrc. - */ -static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) -{ - HRESULT hr; - WCHAR szTemp[MAX_PATH], szProfilesPrefix[MAX_PATH] = { 0 }; - HKEY key = NULL; - - TRACE("%s, %p\n", debugstr_w(szSrc), szDest); - - if (!szSrc || !szDest) return E_INVALIDARG; - - /* short-circuit if there's nothing to expand */ - if (szSrc[0] != '%') - { - wcscpy(szDest, szSrc); - hr = S_OK; - goto end; - } - /* Get the profile prefix, we'll probably be needing it */ - hr = _SHOpenProfilesKey(&key); - if (SUCCEEDED(hr)) - { - WCHAR szDefaultProfilesPrefix[MAX_PATH]; - - GetWindowsDirectoryW(szDefaultProfilesPrefix, MAX_PATH); - PathAddBackslashW(szDefaultProfilesPrefix); - PathAppendW(szDefaultProfilesPrefix, szDefaultProfileDirW); - hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, - szDefaultProfilesPrefix); - } - - *szDest = 0; - wcscpy(szTemp, szSrc); - while (SUCCEEDED(hr) && szTemp[0] == '%') - { - if (!strncmpiW(szTemp, AllUsersProfileW, wcslen(AllUsersProfileW))) - { - WCHAR szAllUsers[MAX_PATH]; - - wcscpy(szDest, szProfilesPrefix); - hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); - PathAppendW(szDest, szAllUsers); - PathAppendW(szDest, szTemp + wcslen(AllUsersProfileW)); - } - else if (!strncmpiW(szTemp, UserProfileW, wcslen(UserProfileW))) - { - WCHAR userName[MAX_PATH]; - DWORD userLen = MAX_PATH; - - wcscpy(szDest, szProfilesPrefix); - GetUserNameW(userName, &userLen); - PathAppendW(szDest, userName); - PathAppendW(szDest, szTemp + wcslen(UserProfileW)); - } - else if (!strncmpiW(szTemp, SystemDriveW, wcslen(SystemDriveW))) - { - GetSystemDirectoryW(szDest, MAX_PATH); - if (szDest[1] != ':') - { - FIXME("non-drive system paths unsupported\n"); - hr = E_FAIL; - } - else - { - wcscpy(szDest + 3, szTemp + wcslen(SystemDriveW) + 1); - hr = S_OK; - } - } - else - { - DWORD ret = ExpandEnvironmentStringsW(szSrc, szDest, MAX_PATH); - - if (ret > MAX_PATH) - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - else if (ret == 0) - hr = HRESULT_FROM_WIN32(GetLastError()); - else - hr = S_OK; - } - if (SUCCEEDED(hr) && szDest[0] == '%') - wcscpy(szTemp, szDest); - else - { - /* terminate loop */ - szTemp[0] = '\0'; - } - } -end: - if (key) - RegCloseKey(key); - TRACE("returning 0x%08x (input was %s, output is %s)\n", hr, - debugstr_w(szSrc), debugstr_w(szDest)); return hr; } @@ -1557,9 +1397,20 @@ /* Expand environment strings if necessary */ if (*szTemp == '%') - hr = _SHExpandEnvironmentStrings(szTemp, szBuildPath); + { + DWORD ExpandRet = ExpandEnvironmentStringsW(szTemp, szBuildPath, MAX_PATH); + + if (ExpandRet > MAX_PATH) + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + else if (ExpandRet == 0) + hr = HRESULT_FROM_WIN32(GetLastError()); + else + hr = S_OK; + } else + { wcscpy(szBuildPath, szTemp); + } if (FAILED(hr)) goto end;

1 0

[fireball] 40438: - Fix a couple more assumptions about first primary partition being the active one. - If no active partitions found, set active primary partition number to 0. This fixes uninitialized variable usage, which revealed itself as a bug with unattended setup. - Silence a DPRINT1.
by fireball＠svn.reactos.org 10 Apr '09

10 Apr '09

Author: fireball Date: Fri Apr 10 17:27:09 2009 New Revision: 40438 URL: http://svn.reactos.org/svn/reactos?rev=40438&view=rev Log: - Fix a couple more assumptions about first primary partition being the active one. - If no active partitions found, set active primary partition number to 0. This fixes uninitialized variable usage, which revealed itself as a bug with unattended setup. - Silence a DPRINT1. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri Apr 10 17:27:09 2009 @@ -3345,7 +3345,8 @@ CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - PartitionType = PartitionList->ActiveBootPartition->PartInfo[0].PartitionType; + PartitionType = PartitionList->ActiveBootPartition-> + PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; if (PartitionType == PARTITION_ENTRY_UNUSED) { @@ -3518,7 +3519,8 @@ UCHAR PartitionType; NTSTATUS Status; - PartitionType = PartitionList->ActiveBootPartition->PartInfo[0].PartitionType; + PartitionType = PartitionList->ActiveBootPartition-> + PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; if ((PartitionType == PARTITION_FAT_12) || (PartitionType == PARTITION_FAT_16) || (PartitionType == PARTITION_HUGE) || Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Apr 10 17:27:09 2009 @@ -2361,6 +2361,7 @@ /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ List->ActiveBootDisk = DiskEntry; List->ActiveBootPartition = PartEntry; + List->ActiveBootPartitionNumber = 0; return; } @@ -2391,7 +2392,7 @@ List->ActiveBootPartition = PartEntry; List->ActiveBootPartitionNumber = i; - DPRINT1("Found bootable partition disk %d, drive letter %c\n", + DPRINT("Found bootable partition disk %d, drive letter %c\n", DiskEntry->BiosDiskNumber, PartEntry->DriveLetter[i]); break;

1 0

[fireball] 40437: - Add a new property to the disk entry: NoMbr flag. It's set, if MBR's first two bytes are zero (same algorithm is used by our cdrom bootsector). - If this flag is set for a boot disk, ReactOS MBR code will be installed on it. See issue #4355 for more details.
by fireball＠svn.reactos.org 10 Apr '09

10 Apr '09

Author: fireball Date: Fri Apr 10 14:37:08 2009 New Revision: 40437 URL: http://svn.reactos.org/svn/reactos?rev=40437&view=rev Log: - Add a new property to the disk entry: NoMbr flag. It's set, if MBR's first two bytes are zero (same algorithm is used by our cdrom bootsector). - If this flag is set for a boot disk, ReactOS MBR code will be installed on it. See issue #4355 for more details. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri Apr 10 14:37:08 2009 @@ -2380,6 +2380,28 @@ CheckActiveBootPartition(PartitionList); } + /* Install MBR if necessary */ + if (DiskEntry->NoMbr && + DiskEntry->BiosDiskNumber == 0) + { + wcscpy(PathBuffer, SourceRootPath.Buffer); + wcscat(PathBuffer, L"\\loader\\dosmbr.bin"); + + DPRINT("Install MBR bootcode: %S ==> %S\n", + PathBuffer, DestinationRootPath.Buffer); + + /* Install MBR bootcode */ + Status = InstallMbrBootCodeToDisk(PathBuffer, DestinationRootPath.Buffer); + if (!NT_SUCCESS (Status)) + { + DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", + Status); + return FALSE; + } + + DiskEntry->NoMbr = FALSE; + } + if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) { /* FIXME: Install boot code. This is a hack! */ Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Apr 10 14:37:08 2009 @@ -775,10 +775,6 @@ } Checksum = ~Checksum + 1; - RtlFreeHeap (ProcessHeap, - 0, - Mbr); - swprintf(Identifier, L"%08x-%08x-A", Checksum, Signature); DPRINT("Identifier: %S\n", Identifier); @@ -798,6 +794,17 @@ DiskEntry->Modified = TRUE; } DiskEntry->BiosFound = FALSE; + + /* Check if this disk has a valid MBR */ + if (Mbr->BootCode[0] == 0 && Mbr->BootCode[1] == 0) + DiskEntry->NoMbr = TRUE; + else + DiskEntry->NoMbr = FALSE; + + /* Free Mbr sector buffer */ + RtlFreeHeap (ProcessHeap, + 0, + Mbr); ListEntry = List->BiosDiskListHead.Flink; while(ListEntry != &List->BiosDiskListHead) @@ -2672,6 +2679,7 @@ } DiskEntry1->NewDisk = FALSE; + DiskEntry1->NoMbr = FALSE; } } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Fri Apr 10 14:37:08 2009 @@ -109,6 +109,7 @@ BOOLEAN Modified; BOOLEAN NewDisk; + BOOLEAN NoMbr; /* MBR is absent */ UNICODE_STRING DriverName;

1 0

[cgutman] 40436: - Complete send requests along with the other types when we get an EOF - Fail the requests with STATUS_CANCELLED
by cgutman＠svn.reactos.org 10 Apr '09

10 Apr '09

Author: cgutman Date: Fri Apr 10 06:38:45 2009 New Revision: 40436 URL: http://svn.reactos.org/svn/reactos?rev=40436&view=rev Log: - Complete send requests along with the other types when we get an EOF - Fail the requests with STATUS_CANCELLED Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Fri Apr 10 06:38:45 2009 @@ -218,27 +218,22 @@ if( NewState & SEL_FIN ) { PLIST_ENTRY ListsToErase[4]; - NTSTATUS IrpStatus[4]; UINT i; TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); ListsToErase[0] = &Connection->ReceiveRequest; - IrpStatus [0] = STATUS_SUCCESS; ListsToErase[1] = &Connection->ListenRequest; - IrpStatus [1] = STATUS_UNSUCCESSFUL; ListsToErase[2] = &Connection->ConnectRequest; - IrpStatus [2] = STATUS_UNSUCCESSFUL; - ListsToErase[3] = 0; - IrpStatus [3] = 0; - - for( i = 0; ListsToErase[i]; i++ ) { + ListsToErase[3] = &Connection->SendRequest; + + for( i = 0; i < 4; i++ ) { while( !IsListEmpty( ListsToErase[i] ) ) { Entry = RemoveHeadList( ListsToErase[i] ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; - Complete( Bucket->Request.RequestContext, IrpStatus[i], 0 ); - exFreePool( Bucket ); + Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + exFreePool( Bucket ); } } }

1 0

[tkreuzer] 40435: fix DEVMODE, 2nd try
by tkreuzer＠svn.reactos.org 09 Apr '09

09 Apr '09

Author: tkreuzer Date: Fri Apr 10 02:58:35 2009 New Revision: 40435 URL: http://svn.reactos.org/svn/reactos?rev=40435&view=rev Log: fix DEVMODE, 2nd try Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Fri Apr 10 02:58:35 2009 @@ -1507,7 +1507,7 @@ #ifdef __WINESRC__ } DUMMYUNIONNAME1; #else - } DUMMYUNIONNAME2; + } DUMMYUNIONNAME; #endif short dmColor;

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