Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[gedmurphy] 20523: change explorer quick launch icon to use default 'my computer' icon instead of a folder.

by gedmurphy＠svn.reactos.org

change explorer quick launch icon to use default 'my computer' icon instead of a folder. Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp --- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 18:13:07 UTC (rev 20522) +++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 18:45:16 UTC (rev 20523) @@ -122,7 +122,7 @@ HBRUSH bk_brush = GetSysColorBrush(COLOR_BTNFACE); AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL); - AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_EXPLORER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); + AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_COMPUTER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); TBBUTTON sep = {0, -1, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; SendMessage(_hwnd, TB_INSERTBUTTON, INT_MAX, (LPARAM)&sep);

18 years, 8 months

[gedmurphy] 20522: - split logoff and shutdown resources

by gedmurphy＠svn.reactos.org

- split logoff and shutdown resources - add icons for each Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/globals.h Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico Added: trunk/reactos/subsys/system/explorer/res/shutdown.ico Modified: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-01 18:13:07 UTC (rev 20522) @@ -392,6 +392,7 @@ _icons[ICID_NETWORK] = Icon(ICID_NETWORK, IDI_NETWORK); _icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER); _icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF); + _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN); _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS); _icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE); } _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-01 18:13:07 UTC (rev 20522) @@ -138,6 +138,7 @@ IDI_EXPLORER ICON DISCARDABLE "res/explorer.ico" IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico" IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico" +IDI_SHUTDOWN ICON DISCARDABLE "res/shutdown.ico" IDI_ARROW ICON DISCARDABLE "res/arrow.ico" IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico" IDI_APPICON ICON DISCARDABLE "res/appicon.ico" _____ Modified: trunk/reactos/subsys/system/explorer/globals.h --- trunk/reactos/subsys/system/explorer/globals.h 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/globals.h 2006-01-01 18:13:07 UTC (rev 20522) @@ -80,6 +80,7 @@ ICID_NETWORK, ICID_COMPUTER, ICID_LOGOFF, + ICID_SHUTDOWN, ICID_BOOKMARK, ICID_MINIMIZE, _____ Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico (Binary files differ) _____ Added: trunk/reactos/subsys/system/explorer/res/shutdown.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/explorer/res/shutdown.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/explorer/resource.h --- trunk/reactos/subsys/system/explorer/resource.h 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/resource.h 2006-01-01 18:13:07 UTC (rev 20522) @@ -67,6 +67,7 @@ #define IDI_FOLDERARROW 125 #define IDI_ARROW 125 #define IDI_ARROW_SELECTED 126 +#define IDI_SHUTDOWN 127 #define IDB_LOGOV 129 #define IDB_LOGOV256 130 #define IDA_SEARCH_PROGRAM 133 _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp --- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 18:13:07 UTC (rev 20522) @@ -121,7 +121,7 @@ COLORREF bk_color = GetSysColor(COLOR_BTNFACE); HBRUSH bk_brush = GetSysColorBrush(COLOR_BTNFACE); - AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE/*@@*/).create_bitmap(bk_col or, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL); + AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL); AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_EXPLORER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); TBBUTTON sep = {0, -1, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-01 18:13:07 UTC (rev 20522) @@ -1753,7 +1753,7 @@ #else if (IS_VALUE_ZERO(hkey, _T("NoClose"))) #endif - AddButton(ResString(IDS_SHUTDOWN), ICID_LOGOFF, false, IDC_SHUTDOWN); + AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN); #ifndef _ROS_

18 years, 8 months

[greatlrd] 20521: fix some bugs wih org with strechblt.

by greatlrd＠svn.reactos.org

fix some bugs wih org with strechblt. Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-01 16:49:53 UTC (rev 20520) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-01 17:12:19 UTC (rev 20521) @@ -630,10 +630,10 @@ BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom; - SrcSizeX = SourceRect->right; + SrcSizeY = SourceRect->bottom - SourceRect->top; + SrcSizeX = SourceRect->right - SourceRect->left; - DesSizeY = DestRect->bottom; + DesSizeY = DestRect->bottom ; DesSizeX = DestRect->right; zoomX = DesSizeX / SrcSizeX; @@ -659,7 +659,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -670,7 +670,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -692,7 +692,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -703,7 +703,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -728,7 +728,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -739,7 +739,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -759,7 +759,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -770,7 +770,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -797,7 +797,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -808,7 +808,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -826,7 +826,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -837,7 +837,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -859,7 +859,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -870,7 +870,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -886,7 +886,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -897,7 +897,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -921,7 +921,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -932,7 +932,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -950,7 +950,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -961,7 +961,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -983,7 +983,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -994,7 +994,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1010,7 +1010,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1021,7 +1021,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1050,7 +1050,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1061,7 +1061,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1079,7 +1079,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1090,7 +1090,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1112,7 +1112,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1123,7 +1123,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1139,7 +1139,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1150,7 +1150,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1174,7 +1174,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1185,7 +1185,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1203,7 +1203,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1214,7 +1214,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1236,7 +1236,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1247,7 +1247,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1263,7 +1263,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1274,7 +1274,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-01 16:49:53 UTC (rev 20520) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-01 17:12:19 UTC (rev 20521) @@ -518,8 +518,8 @@ int saveY; BOOLEAN DesIsBiggerY=FALSE; - SrcSizeY = SourceRect->bottom; - SrcSizeX = SourceRect->right; + SrcSizeY = SourceRect->bottom - SourceRect->top; + SrcSizeX = SourceRect->right - SourceRect->left; DesSizeY = DestRect->bottom; DesSizeX = DestRect->right; @@ -544,7 +544,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -555,7 +555,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -576,7 +576,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -587,7 +587,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -611,7 +611,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -622,7 +622,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -639,7 +639,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); @@ -650,7 +650,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -675,7 +675,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -686,7 +686,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -704,7 +704,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -715,7 +715,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -737,7 +737,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -748,7 +748,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -764,7 +764,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -775,7 +775,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -799,7 +799,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -810,7 +810,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -828,7 +828,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -839,7 +839,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -861,7 +861,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -872,7 +872,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -888,7 +888,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -899,7 +899,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -923,7 +923,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -934,7 +934,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -952,7 +952,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -963,7 +963,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -985,7 +985,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -996,7 +996,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1012,7 +1012,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1023,7 +1023,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1047,7 +1047,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1058,7 +1058,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1076,7 +1076,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1087,7 +1087,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1109,7 +1109,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1120,7 +1120,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1136,7 +1136,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1147,7 +1147,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1171,7 +1171,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1182,7 +1182,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1200,7 +1200,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1211,7 +1211,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1233,7 +1233,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1244,7 +1244,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1260,7 +1260,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1271,7 +1271,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-01 16:49:53 UTC (rev 20520) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-01 17:12:19 UTC (rev 20521) @@ -513,10 +513,10 @@ int saveY; BOOLEAN DesIsBiggerY=FALSE; - SrcSizeY = SourceRect->bottom; - SrcSizeX = SourceRect->right; + SrcSizeY = SourceRect->bottom - SourceRect->top; + SrcSizeX = SourceRect->right - SourceRect->left; - DesSizeY = DestRect->bottom; + DesSizeY = DestRect->bottom ; DesSizeX = DestRect->right; zoomX = DesSizeX / SrcSizeX; @@ -538,7 +538,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -549,7 +549,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -571,7 +571,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -582,7 +582,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -607,7 +607,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -618,7 +618,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -638,7 +638,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -649,7 +649,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -676,7 +676,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -687,7 +687,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -705,7 +705,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -716,7 +716,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -738,7 +738,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -749,7 +749,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -765,7 +765,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -776,7 +776,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -800,7 +800,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -811,7 +811,7 @@ saveY = DesY+zoomY; [truncated at 1000 lines; 1483 more skipped]

18 years, 8 months

[hpoussin] 20520: Add missing processor architecture cases

by hpoussin＠svn.reactos.org

Add missing processor architecture cases Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2006-01-01 16:00:45 UTC (rev 20519) +++ trunk/reactos/lib/setupapi/devinst.c 2006-01-01 16:49:53 UTC (rev 20520) @@ -2,7 +2,7 @@ * SetupAPI device installer * * Copyright 2000 Andreas Mohr for CodeWeavers - * 2005 HervÚ Poussineau (hpoussin(a)reactos.org) + * 2005-2006 HervÚ Poussineau (hpoussin(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -979,7 +979,10 @@ static const WCHAR ExtensionPlatformWindows[] = {'.','W','i','n',0}; static const WCHAR ExtensionArchitectureNone[] = {0}; +static const WCHAR ExtensionArchitecturealpha[] = {'a','l','p','h','a',0}; static const WCHAR ExtensionArchitectureamd64[] = {'a','m','d','6','4',0}; +static const WCHAR ExtensionArchitectureia64[] = {'i','a','6','4',0}; +static const WCHAR ExtensionArchitecturemips[] = {'m','i','p','s',0}; static const WCHAR ExtensionArchitectureppc[] = {'p','p','c',0}; static const WCHAR ExtensionArchitecturex86[] = {'x','8','6',0}; @@ -993,17 +996,27 @@ pExtensionPlatform = ExtensionPlatformNT; break; default: + ERR("Unkown platform 0x%lx\n", pPlatformInfo->Platform); pExtensionPlatform = ExtensionPlatformNone; break; } switch (pPlatformInfo->ProcessorArchitecture) { + case PROCESSOR_ARCHITECTURE_ALPHA: + pExtensionArchitecture = ExtensionArchitecturealpha; + break; case PROCESSOR_ARCHITECTURE_AMD64: pExtensionArchitecture = ExtensionArchitectureamd64; break; + case PROCESSOR_ARCHITECTURE_IA64: + pExtensionArchitecture = ExtensionArchitectureia64; + break; case PROCESSOR_ARCHITECTURE_INTEL: pExtensionArchitecture = ExtensionArchitecturex86; break; + case PROCESSOR_ARCHITECTURE_MIPS: + pExtensionArchitecture = ExtensionArchitecturemips; + break; case PROCESSOR_ARCHITECTURE_PPC: pExtensionArchitecture = ExtensionArchitectureppc; break; @@ -6529,7 +6542,7 @@ break; } } - ItemList= ItemList->Flink; + ItemList = ItemList->Flink; } if (ItemList == ListHead) SetLastError(ERROR_INVALID_PARAMETER);

18 years, 8 months

[greatlrd] 20519: revert 17709 for it break streach for windows mode. That why I did only got black windows in winquake with windows mode 640x480.

by greatlrd＠svn.reactos.org

revert 17709 for it break streach for windows mode. That why I did only got black windows in winquake with windows mode 640x480. Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -630,11 +630,11 @@ BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -518,12 +518,12 @@ int saveY; BOOLEAN DesIsBiggerY=FALSE; - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -513,12 +513,12 @@ int saveY; BOOLEAN DesIsBiggerY=FALSE; - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -557,11 +557,11 @@ BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -397,12 +397,12 @@ int saveY; BOOLEAN DesIsBiggerY=FALSE; - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -480,12 +480,12 @@ BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1;

18 years, 8 months

[mf] 20518: eliminate GCC warning about initialization order

by mf＠svn.reactos.org

eliminate GCC warning about initialization order Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h --- branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h 2006-01-01 15:44:46 UTC (rev 20517) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h 2006-01-01 15:48:03 UTC (rev 20518) @@ -104,13 +104,13 @@ protected: HWND _hwnd; + HWND _hWndFrame; HWND _left_hwnd; WindowHandle& _right_hwnd; ShellPathInfo& _create_info; Root _root; - WindowHandle _hWndFrame; ShellFolder _folder; IShellView* _pShellView; // current hosted shellview

18 years, 8 months

[mf] 20517: eliminate GCC warning about initialization order

by mf＠svn.reactos.org

eliminate GCC warning about initialization order Modified: trunk/reactos/subsys/system/explorer/explorer.dsp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h _____ Modified: trunk/reactos/subsys/system/explorer/explorer.dsp --- trunk/reactos/subsys/system/explorer/explorer.dsp 2006-01-01 15:32:40 UTC (rev 20516) +++ trunk/reactos/subsys/system/explorer/explorer.dsp 2006-01-01 15:44:46 UTC (rev 20517) @@ -407,6 +407,11 @@ # End Source File # Begin Source File +SOURCE=".\explorer-pl.rc" +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + SOURCE=".\explorer-pt.rc" # PROP Exclude_From_Build 1 # End Source File @@ -523,6 +528,10 @@ # End Source File # Begin Source File +SOURCE=.\res\minimize.ico +# End Source File +# Begin Source File + SOURCE=.\res\network.ico # End Source File # Begin Source File _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2006-01-01 15:32:40 UTC (rev 20516) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2006-01-01 15:44:46 UTC (rev 20517) @@ -141,23 +141,23 @@ void invalidate_cache(); protected: - HWND _hwnd; - HWND _left_hwnd; - WindowHandle& _right_hwnd; - ShellPathInfo& _create_info; - HIMAGELIST _himl; - HIMAGELIST _himl_old; + HWND _hwnd; + HWND _hwndFrame; + HWND _left_hwnd; + WindowHandle& _right_hwnd; + ShellPathInfo& _create_info; + HIMAGELIST _himl; + HIMAGELIST _himl_old; BrowserCallback* _callback; - HWND _hwndFrame; - ShellFolder _folder; + ShellFolder _folder; - IShellView* _pShellView; // current hosted shellview - TreeDropTarget* _pDropTarget; + IShellView* _pShellView; // current hosted shellview + TreeDropTarget* _pDropTarget; - HTREEITEM _last_sel; + HTREEITEM _last_sel; - Root _root; + Root _root; ShellDirectory* _cur_dir; CtxMenuInterfaces& _cm_ifs;

18 years, 8 months

[ekohl] 20516: - Fix crashes in calls to ScmAssignNewTag.

by ekohl＠svn.reactos.org

- Fix crashes in calls to ScmAssignNewTag. - ScmrCreateServiceW: Assign a group to the service. Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2006-01-01 15:21:03 UTC (rev 20515) +++ trunk/reactos/subsys/system/services/rpcserver.c 2006-01-01 15:32:40 UTC (rev 20516) @@ -220,12 +220,11 @@ DWORD -ScmAssignNewTag(LPWSTR lpServiceGroup, - LPDWORD lpdwTagId) +ScmAssignNewTag(PSERVICE lpService) { /* FIXME */ - DPRINT("Assigning new tag in group %S\n", lpServiceGroup); - *lpdwTagId = 0; + DPRINT("Assigning new tag to service %S\n", lpService->lpServiceName); + lpService->dwTag = 0; return ERROR_SUCCESS; } @@ -927,10 +926,10 @@ if (lpdwTagId != NULL) { - dwError = ScmAssignNewTag(lpService->lpGroup->lpGroupName, - &lpService->dwTag); + dwError = ScmAssignNewTag(lpService); if (dwError != ERROR_SUCCESS) goto done; + dwError = RegSetValueExW(hServiceKey, L"Tag", 0, @@ -939,6 +938,7 @@ sizeof(DWORD)); if (dwError != ERROR_SUCCESS) goto done; + *lpdwTagId = lpService->dwTag; } @@ -1073,6 +1073,23 @@ wcscpy(lpService->lpDisplayName, lpDisplayName); } + /* Assign the service to a group */ + if (lpLoadOrderGroup != NULL && *lpLoadOrderGroup != 0) + { + dwError = ScmSetServiceGroup(lpService, + lpLoadOrderGroup); + if (dwError != ERROR_SUCCESS) + goto done; + } + + /* Assign a new tag */ + if (lpdwTagId != NULL) + { + dwError = ScmAssignNewTag(lpService); + if (dwError != ERROR_SUCCESS) + goto done; + } + /* Write service data to the registry */ /* Create the service key */ dwError = ScmCreateServiceKey(lpServiceName, @@ -1161,10 +1178,6 @@ if (lpdwTagId != NULL) { - dwError = ScmAssignNewTag(lpService->lpGroup->lpGroupName, - &lpService->dwTag); - if (dwError != ERROR_SUCCESS) - goto done; dwError = RegSetValueExW(hServiceKey, L"Tag", 0,

18 years, 8 months

[mf] 20515: explorer:

by mf＠svn.reactos.org

explorer: - simplify SCAN flags - extend shell browser to use WINFS - resolve a few FIXMEs - simplify ShellBrowser initialization - handle /root command line option Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp Modified: trunk/reactos/subsys/system/explorer/doc/changes.txt Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp Modified: trunk/reactos/subsys/system/explorer/shell/entries.h Modified: trunk/reactos/subsys/system/explorer/shell/fatfs.h Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.h Modified: trunk/reactos/subsys/system/explorer/shell/pane.cpp Modified: trunk/reactos/subsys/system/explorer/shell/regfs.h Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.h Modified: trunk/reactos/subsys/system/explorer/shell/winfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/winfs.h Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp --- trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2006-01-01 15:21:03 UTC (rev 20515) @@ -59,7 +59,7 @@ ShellDirectory* dir = new ShellDirectory(GetDesktopFolder(), path, 0); _dirs.push(dir); - dir->smart_scan(SORT_NONE, /*SCAN_EXTRACT_ICONS|*/SCAN_FILESYSTEM); + dir->smart_scan(SORT_NONE); for(Entry*entry=dir->_down; _alive && entry; entry=entry->_next) { if (entry->_shell_attribs & SFGAO_HIDDEN) _____ Modified: trunk/reactos/subsys/system/explorer/doc/changes.txt --- trunk/reactos/subsys/system/explorer/doc/changes.txt 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/doc/changes.txt 2006-01-01 15:21:03 UTC (rev 20515) @@ -167,3 +167,4 @@ 01.11.2005 m. fuchs String::str(), String::toLower() to allow conventient and WINE compatible string conversions 29.11.2005 m. fuchs Adjustments for Visual Studio 2005: use new secure CT functions, COUNTOF for buffer sizes 28.12.2005 m. fuchs display icon overlays in Explorer tree view +31.12.2005 m. fuchs handle "/root" command line parameter Property changes on: trunk/reactos/subsys/system/explorer/notifyhook ___________________________________________________________________ Name: svn:ignore - Debug Release *.d *.o *.a *.dll *.gch *.h.pch notifyhook.map notifyhook.sym notifyhook.coff GNUmakefile Win32 + Debug Release *.d *.o *.a *.dll *.gch *.h.pch notifyhook.map notifyhook.sym notifyhook.coff GNUmakefile Win32 *.user _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-01 15:21:03 UTC (rev 20515) @@ -614,6 +614,7 @@ return hr; } + // get full path of specified directory entry bool Entry::get_path_base ( PTSTR path, size_t path_count, ENTRY_TYPE etype ) const { _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.h --- trunk/reactos/subsys/system/explorer/shell/entries.h 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/entries.h 2006-01-01 15:21:03 UTC (rev 20515) @@ -50,12 +50,9 @@ }; enum SCAN_FLAGS { -// SCAN_EXTRACT_ICONS = 1, - SCAN_DO_ACCESS = 2, - - SCAN_ALL = 3, - - SCAN_FILESYSTEM = 4 + SCAN_DONT_EXTRACT_ICONS = 1, + SCAN_DONT_ACCESS = 2, + SCAN_NO_FILESYSTEM = 4 }; #ifndef ATTRIBUTE_SYMBOLIC_LINK @@ -114,19 +111,20 @@ void free_subentries(); - void read_directory_base(SORT_ORDER sortOrder=SORT_NAME, int scan_flags=SCAN_ALL); - Entry* read_tree(const void* path, SORT_ORDER sortOrder=SORT_NAME, int scan_flags=SCAN_ALL); + void read_directory_base(SORT_ORDER sortOrder=SORT_NAME, int scan_flags=0); + Entry* read_tree(const void* path, SORT_ORDER sortOrder=SORT_NAME, int scan_flags=0); void sort_directory(SORT_ORDER sortOrder); - void smart_scan(SORT_ORDER sortOrder=SORT_NAME, int scan_flags=SCAN_ALL); + void smart_scan(SORT_ORDER sortOrder=SORT_NAME, int scan_flags=0); int extract_icon(ICONCACHE_FLAGS flags=ICF_NORMAL); int safe_extract_icon(ICONCACHE_FLAGS flags=ICF_NORMAL); - virtual void read_directory(int scan_flags=SCAN_ALL) {} + virtual void read_directory(int scan_flags=0) {} virtual const void* get_next_path_component(const void*) const {return NULL;} virtual Entry* find_entry(const void*) {return NULL;} virtual bool get_path(PTSTR path, size_t path_count) const = 0; virtual ShellPath create_absolute_pidl() const {return (LPCITEMIDLIST)NULL;} virtual HRESULT GetUIObjectOf(HWND hWnd, REFIID riid, LPVOID* ppvOut); + virtual ShellFolder get_shell_folder() const; virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow=SW_SHOWNORMAL); virtual HRESULT do_context_menu(HWND hwnd, const POINT& pos, CtxMenuInterfaces& cm_ifs); @@ -158,6 +156,6 @@ DWORD _fs_flags; SORT_ORDER _sort_order; - Entry* read_tree(LPCTSTR path, int scan_flags=SCAN_ALL); - Entry* read_tree(LPCITEMIDLIST pidl, int scan_flags=SCAN_ALL); + Entry* read_tree(LPCTSTR path, int scan_flags=0); + Entry* read_tree(LPCITEMIDLIST pidl, int scan_flags=0); }; _____ Modified: trunk/reactos/subsys/system/explorer/shell/fatfs.h --- trunk/reactos/subsys/system/explorer/shell/fatfs.h 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/fatfs.h 2006-01-01 15:21:03 UTC (rev 20515) @@ -50,7 +50,7 @@ FATDirectory(FATDrive& drive, Entry* parent, LPCTSTR path, unsigned cluster); ~FATDirectory(); - virtual void read_directory(int scan_flags=SCAN_ALL); + virtual void read_directory(int scan_flags=0); virtual const void* get_next_path_component(const void*) const; virtual Entry* find_entry(const void*); _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-01 15:21:03 UTC (rev 20515) @@ -980,6 +980,11 @@ // Shell Namespace as default view ShellChildWndInfo create_info(_hmdiclient, path, shell_path); + if (wparam & OWM_ROOTED) + create_info._root_shell_path = shell_path; + else + create_info._root_shell_path = DesktopFolderPath(); //SpecialFolderPath(CSIDL_DRIVES, _hwnd); + create_info._pos.showCmd = wparam&OWM_SEPARATE? SW_SHOWNORMAL: SW_SHOWMAXIMIZED; create_info._pos.rcNormalPosition.left = CW_USEDEFAULT; create_info._pos.rcNormalPosition.top = CW_USEDEFAULT; @@ -1521,7 +1526,7 @@ if (wparam & OWM_ROOTED) _shellpath_info._root_shell_path = shell_path; else - _shellpath_info._root_shell_path = SpecialFolderPath(CSIDL_DESKTOP, _hwnd); // CSIDL_DRIVES + _shellpath_info._root_shell_path = DesktopFolderPath(); //SpecialFolderPath(CSIDL_DRIVES, _hwnd); jump_to(shell_path, wparam); //@todo content of 'path' not used any more return TRUE;} // success @@ -1660,11 +1665,9 @@ } } - _shellBrowser = auto_ptr<ShellBrowser>(new ShellBrowser(_hwnd, _left_hwnd, _right_hwnd, + _shellBrowser = auto_ptr<ShellBrowser>(new ShellBrowser(_hwnd, _hwnd, _left_hwnd, _right_hwnd, _shellpath_info, this, _cm_ifs)); - _shellBrowser->Init(_hwnd); - if (_left_hwnd) _shellBrowser->Init(); @@ -1674,37 +1677,25 @@ void SDIMainFrame::entry_selected(Entry* entry) { - if (entry->_etype == ET_SHELL) { - ShellEntry* shell_entry = static_cast<ShellEntry*>(entry); - IShellFolder* folder; + if (_left_hwnd) + _shellBrowser->select_folder(entry, false); - if (shell_entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - folder = static_cast<ShellDirectory*>(shell_entry)->_folder; - else - folder = shell_entry->get_parent_folder(); + _shellBrowser->UpdateFolderView(entry->get_shell_folder()); - if (!folder) { - assert(folder); - return; - } + // set size of new created shell view windows + resize_children(); - TCHAR path[MAX_PATH]; + TCHAR path[MAX_PATH]; - if (shell_entry->get_path(path, COUNTOF(path))) { - String url; + if (entry->get_path(path, COUNTOF(path))) { + String url; - if (path[0] == ':') - url.printf(TEXT("shell://%s"), path); - else - url.printf(TEXT("file://%s"), path); + if (path[0] == ':') + url.printf(TEXT("shell://%s"), path); + else + url.printf(TEXT("file://%s"), path); - set_url(url); - } - - _shellBrowser->UpdateFolderView(folder); - - // update _clnt_rect and set size of new created shell view windows - update_clnt_rect(); + set_url(url); } } _____ Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.h --- trunk/reactos/subsys/system/explorer/shell/ntobjfs.h 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/ntobjfs.h 2006-01-01 15:21:03 UTC (rev 20515) @@ -117,6 +117,6 @@ _path = NULL; } - virtual void read_directory(int scan_flags=SCAN_ALL); + virtual void read_directory(int scan_flags=0); virtual Entry* find_entry(const void*); }; _____ Modified: trunk/reactos/subsys/system/explorer/shell/pane.cpp --- trunk/reactos/subsys/system/explorer/shell/pane.cpp 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/pane.cpp 2006-01-01 15:21:03 UTC (rev 20515) @@ -648,7 +648,6 @@ DrawTextEx(dis->hDC, (LPTSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ DrawText(dis->hDC, (LPTSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); - //FIXME rt (0,0) ??? if (rt.right > _widths[col]) _widths[col] = rt.right; _____ Modified: trunk/reactos/subsys/system/explorer/shell/regfs.h --- trunk/reactos/subsys/system/explorer/shell/regfs.h 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/regfs.h 2006-01-01 15:21:03 UTC (rev 20515) @@ -50,7 +50,7 @@ _path = NULL; } - virtual void read_directory(int scan_flags=SCAN_ALL); + virtual void read_directory(int scan_flags=0); virtual const void* get_next_path_component(const void*) const; virtual Entry* find_entry(const void*); @@ -78,5 +78,5 @@ _path = NULL; } - virtual void read_directory(int scan_flags=SCAN_ALL); + virtual void read_directory(int scan_flags=0); }; _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-01 15:21:03 UTC (rev 20515) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004, 2005 Martin Fuchs + * Copyright 2003, 2004, 2005, 2006 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,7 +37,7 @@ #endif -ShellBrowser::ShellBrowser(HWND hwnd, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, +ShellBrowser::ShellBrowser(HWND hwnd, HWND hwndFrame, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, BrowserCallback* cb, CtxMenuInterfaces& cm_ifs) #ifndef __MINGW32__ // IShellFolderViewCB missing in MinGW (as of 25.09.2005) : super(IID_IShellFolderViewCB), @@ -45,6 +45,7 @@ : #endif _hwnd(hwnd), + _hwndFrame(hwndFrame), _left_hwnd(left_hwnd), _right_hwnd(right_hwnd), _create_info(create_info), @@ -81,12 +82,10 @@ } -LRESULT ShellBrowser::Init(HWND hWndFrame) +void ShellBrowser::Init() { CONTEXT("ShellBrowser::Init()"); - _hWndFrame = hWndFrame; - const String& root_name = GetDesktopFolder().get_name(_create_info._root_shell_path, SHGDN_FORADDRESSBAR); _root._drive_type = DRIVE_UNKNOWN; @@ -96,22 +95,23 @@ _root._entry = new ShellDirectory(GetDesktopFolder(), _create_info._root_shell_path, _hwnd); + _root._entry->read_directory(SCAN_DONT_ACCESS|SCAN_NO_FILESYSTEM); // avoid to handle desktop root folder as file system directory + + if (_left_hwnd) { + InitializeTree(); + InitDragDrop(); + } + jump_to(_create_info._shell_path); - // -> set_curdir() - _root._entry->read_directory(); - /* already filled by ShellDirectory constructor lstrcpy(_root._entry->_data.cFileName, TEXT("Desktop")); */ - - return 0; } void ShellBrowser::jump_to(LPCITEMIDLIST pidl) { Entry* entry = NULL; - //@@ if (!_cur_dir) _cur_dir = static_cast<ShellDirectory*>(_root._entry); @@ -129,7 +129,7 @@ if (!child_pidl || !child_pidl->mkid.cb) break; - _cur_dir->smart_scan(); + _cur_dir->smart_scan(SORT_NAME, SCAN_DONT_ACCESS); entry = _cur_dir->find_entry(child_pidl); if (!entry) @@ -139,7 +139,7 @@ _callback->entry_selected(entry); } } else { - _cur_dir->smart_scan(); + _cur_dir->smart_scan(SORT_NAME, SCAN_DONT_ACCESS); entry = _cur_dir->find_entry(pidl); // This is not correct in the common case, but works on the desktop level. @@ -211,30 +211,6 @@ } -void ShellBrowser::OnTreeItemRClick(int idCtrl, LPNMHDR pnmh) -{ - CONTEXT("ShellBrowser::OnTreeItemRClick()"); - - TVHITTESTINFO tvhti; - - GetCursorPos(&tvhti.pt); - ScreenToClient(_left_hwnd, &tvhti.pt); - - tvhti.flags = LVHT_NOWHERE; - (void)TreeView_HitTest(_left_hwnd, &tvhti); - - if (TVHT_ONITEM & tvhti.flags) { - LPARAM itemData = TreeView_GetItemData(_left_hwnd, tvhti.hItem); - - if (itemData) { - Entry* entry = (Entry*)itemData; - ClientToScreen(_left_hwnd, &tvhti.pt); - - CHECKERROR(entry->do_context_menu(_hwnd, tvhti.pt, _cm_ifs)); - } - } -} - void ShellBrowser::OnTreeGetDispInfo(int idCtrl, LPNMHDR pnmh) { CONTEXT("ShellBrowser::OnTreeGetDispInfo()"); @@ -289,6 +265,7 @@ _image_map.clear(); } + void ShellBrowser::OnTreeItemExpanding(int idCtrl, LPNMTREEVIEW pnmtv) { CONTEXT("ShellBrowser::OnTreeItemExpanding()"); @@ -325,7 +302,7 @@ SendMessage(_left_hwnd, WM_SETREDRAW, FALSE, 0); try { - entry->smart_scan(); + entry->smart_scan(SORT_NAME, SCAN_DONT_ACCESS); } catch(COMException& e) { HandleException(e, g_Globals._hMainWnd); } @@ -344,6 +321,16 @@ if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) #endif { + // ignore hidden directories + if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + continue; + + // ignore directory entries "." and ".." + if (entry->_data.cFileName[0]==TEXT('.') && + (entry->_data.cFileName[1]==TEXT('\0') || + (entry->_data.cFileName[1]==TEXT('.') && entry->_data.cFileName[2]==TEXT('\0')))) + continue; + ZeroMemory(&tvItem, sizeof(tvItem)); tvItem.mask = TVIF_PARAM | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN; @@ -363,9 +350,9 @@ tvInsert.hParent = hParentItem; (void)TreeView_InsertItem(_left_hwnd, &tvInsert); + + ++cnt; } - - ++cnt; } SendMessage(_left_hwnd, WM_SETREDRAW, TRUE, 0); @@ -373,11 +360,12 @@ return cnt; } + void ShellBrowser::OnTreeItemSelected(int idCtrl, LPNMTREEVIEW pnmtv) { CONTEXT("ShellBrowser::OnTreeItemSelected()"); - ShellEntry* entry = (ShellEntry*)pnmtv->itemNew.lParam; + Entry* entry = (Entry*)pnmtv->itemNew.lParam; _last_sel = pnmtv->itemNew.hItem; @@ -385,6 +373,32 @@ _callback->entry_selected(entry); } + +void ShellBrowser::OnTreeItemRClick(int idCtrl, LPNMHDR pnmh) +{ + CONTEXT("ShellBrowser::OnTreeItemRClick()"); + + TVHITTESTINFO tvhti; + + GetCursorPos(&tvhti.pt); + ScreenToClient(_left_hwnd, &tvhti.pt); + + tvhti.flags = LVHT_NOWHERE; + (void)TreeView_HitTest(_left_hwnd, &tvhti); + + if (TVHT_ONITEM & tvhti.flags) { + LPARAM itemData = TreeView_GetItemData(_left_hwnd, tvhti.hItem); + + if (itemData) { + Entry* entry = (Entry*)itemData; + ClientToScreen(_left_hwnd, &tvhti.pt); + + CHECKERROR(entry->do_context_menu(_hwnd, tvhti.pt, _cm_ifs)); + } + } +} + + void ShellBrowser::UpdateFolderView(IShellFolder* folder) { CONTEXT("ShellBrowser::UpdateFolderView()"); @@ -461,7 +475,7 @@ if (parent) { try { - parent->smart_scan(); + parent->smart_scan(SORT_NAME, SCAN_DONT_ACCESS); } catch(COMException& e) { return e.Error(); } @@ -475,10 +489,13 @@ if (entry->_etype == ET_SHELL) if (_last_sel && select_entry(_last_sel, entry)) return S_OK; + + //@todo look for hidden or new subfolders and refresh/add new entry instead of opening a new window + return E_NOTIMPL; } } } else { // no tree control - if (MainFrameBase::OpenShellFolders(pida, _hWndFrame)) + if (MainFrameBase::OpenShellFolders(pida, _hwndFrame)) return S_OK; /* create new Frame Window @@ -534,7 +551,7 @@ if (!entry || !hitem) break; - entry->smart_scan(SORT_NAME); + entry->smart_scan(SORT_NAME, SCAN_DONT_ACCESS); Entry* found = entry->find_entry(p); p = entry->get_next_path_component(p); @@ -549,12 +566,40 @@ } +bool ShellBrowser::select_folder(Entry* entry, bool expand) +{ + CONTEXT("ShellBrowser::expand_folder()"); + + if (!_last_sel) + return false; + + if (!TreeView_Expand(_left_hwnd, _last_sel, TVE_EXPAND)) + return false; + + for(HTREEITEM hitem=TreeView_GetChild(_left_hwnd,_last_sel); hitem; hitem=TreeView_GetNextSibling(_left_hwnd,hitem)) { + if ((ShellDirectory*)TreeView_GetItemData(_left_hwnd,hitem) == entry) { + if (TreeView_SelectItem(_left_hwnd, hitem)) { + if (expand) + if (!TreeView_Expand(_left_hwnd, hitem, TVE_EXPAND)) + return false; + + return true; + } + + break; + } + } + + return false; +} + + #ifndef _NO_MDI MDIShellBrowserChild::MDIShellBrowserChild(HWND hwnd, const ShellChildWndInfo& info) : super(hwnd, info), _create_info(info), - _shellpath_info(info) //@@ copies info -> no referenz to _create_info ! + _shellpath_info(info) //@@ copies info -> no reference to _create_info ! { /**todo Conversion of shell path into path string -> store into URL history const String& path = GetDesktopFolder().get_name(info._shell_path, SHGDN_FORADDRESSBAR); @@ -585,12 +630,6 @@ update_shell_browser(); - if (_shellBrowser.get()) - if (_left_hwnd) - _shellBrowser->Init(); - else - _shellBrowser->UpdateFolderView(_create_info._shell_path.get_folder()); - return 0; } @@ -651,10 +690,10 @@ } } - _shellBrowser = auto_ptr<ShellBrowser>(new ShellBrowser(_hwnd, _left_hwnd, _right_hwnd, + _shellBrowser = auto_ptr<ShellBrowser>(new ShellBrowser(_hwnd, _hwndFrame, _left_hwnd, _right_hwnd, _shellpath_info, this, _cm_ifs)); - _shellBrowser->Init(_hwndFrame); + _shellBrowser->Init(); } @@ -681,38 +720,27 @@ void MDIShellBrowserChild::entry_selected(Entry* entry) { - if (entry->_etype == ET_SHELL) { - ShellEntry* shell_entry = static_cast<ShellEntry*>(entry); - IShellFolder* folder; + if (_left_hwnd) + _shellBrowser->select_folder(entry, false); - if (shell_entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - folder = static_cast<ShellDirectory*>(shell_entry)->_folder; - else - folder = shell_entry->get_parent_folder(); + _shellBrowser->UpdateFolderView(entry->get_shell_folder()); - if (!folder) { - assert(folder); - return; - } + // set size of new created shell view windows + ClientRect rt(_hwnd); + resize_children(rt.right, rt.bottom); - TCHAR path[MAX_PATH]; + // set new URL + TCHAR path[MAX_PATH]; - if (shell_entry->get_path(path, COUNTOF(path))) { - String url; + if (entry->get_path(path, COUNTOF(path))) { + String url; - if (path[0] == ':') - url.printf(TEXT("shell://%s"), path); - else - url.printf(TEXT("file://%s"), path); + if (path[0] == ':') + url.printf(TEXT("shell://%s"), path); + else + url.printf(TEXT("file://%s"), path); - set_url(url); - } - - _shellBrowser->UpdateFolderView(folder); - - // set size of new created shell view windows - ClientRect rt(_hwnd); - resize_children(rt.right, rt.bottom); + set_url(url); } } _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2006-01-01 15:21:03 UTC (rev 20515) @@ -61,7 +61,7 @@ , public IComSrvBase<IShellFolderViewCB, ShellBrowser>, public SimpleComObject #endif { - ShellBrowser(HWND hwnd, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, + ShellBrowser(HWND hwnd, HWND hwndFrame, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, BrowserCallback* cb, CtxMenuInterfaces& cm_ifs); virtual ~ShellBrowser(); @@ -90,7 +90,7 @@ return S_OK; } - HWND hwnd = (HWND)SendMessage(_hWndFrame, PM_GET_CONTROLWINDOW, id, 0); + HWND hwnd = (HWND)SendMessage(_hwndFrame, PM_GET_CONTROLWINDOW, id, 0); if (hwnd) { *lphwnd = hwnd; @@ -105,7 +105,7 @@ if (!pret) return E_POINTER; - HWND hstatusbar = (HWND)SendMessage(_hWndFrame, PM_GET_CONTROLWINDOW, id, 0); + HWND hstatusbar = (HWND)SendMessage(_hwndFrame, PM_GET_CONTROLWINDOW, id, 0); if (hstatusbar) { *pret = ::SendMessage(hstatusbar, uMsg, wParam, lParam); @@ -122,14 +122,8 @@ void OnTreeItemRClick(int idCtrl, LPNMHDR pnmh); void OnTreeItemSelected(int idCtrl, LPNMTREEVIEW pnmtv); - LRESULT Init(HWND hWndFrame); + void Init(); - void Init() - { - InitializeTree(); - InitDragDrop(); - } - int InsertSubitems(HTREEITEM hParentItem, Entry* entry, IShellFolder* pParentFolder); bool jump_to_pidl(LPCITEMIDLIST pidl); @@ -139,6 +133,8 @@ void UpdateFolderView(IShellFolder* folder); HTREEITEM select_entry(HTREEITEM hitem, Entry* entry, bool expand=true); + bool select_folder(Entry* entry, bool expand); + // for SDIMainFrame void jump_to(LPCITEMIDLIST pidl); @@ -153,7 +149,7 @@ HIMAGELIST _himl_old; BrowserCallback* _callback; - WindowHandle _hWndFrame; + HWND _hwndFrame; ShellFolder _folder; IShellView* _pShellView; // current hosted shellview @@ -272,7 +268,7 @@ void update_shell_browser(); // interface BrowserCallback - virtual void entry_selected(Entry* entry); + virtual void entry_selected(Entry* entry); }; #endif _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp --- trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2006-01-01 15:21:03 UTC (rev 20515) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004, 2005 Martin Fuchs + * Copyright 2003, 2004, 2005, 2006 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -228,6 +228,22 @@ } +ShellFolder Entry::get_shell_folder() const +{ + return ShellFolder(create_absolute_pidl()); +} + +ShellFolder ShellEntry::get_shell_folder() const +{ + return get_parent_folder(); +} + +ShellFolder ShellDirectory::get_shell_folder() const +{ + return _folder; +} + + void ShellDirectory::read_directory(int scan_flags) { CONTEXT("ShellDirectory::read_directory()"); @@ -241,14 +257,13 @@ return;*/ #ifndef _NO_WIN_FS - TCHAR buffer[MAX_PATH]; + TCHAR buffer[_MAX_PATH+_MAX_FNAME]; - if ((scan_flags&SCAN_FILESYSTEM) && get_path(buffer, COUNTOF(buffer)) && _tcsncmp(buffer,TEXT("::{"),3)) { + if (!(scan_flags&SCAN_NO_FILESYSTEM) && get_path(buffer, COUNTOF(buffer)) && _tcsncmp(buffer,TEXT("::{"),3)) { Entry* entry = NULL; // eliminate useless GCC warning by initializing entry LPTSTR p = buffer + _tcslen(buffer); - // TODO FIXME - this can overflow lstrcpy(p, TEXT("\\*")); WIN32_FIND_DATA w32fd; @@ -284,7 +299,7 @@ entry->_level = level; - if (scan_flags & SCAN_DO_ACCESS) { + if (!(scan_flags & SCAN_DONT_ACCESS)) { HANDLE hFile = CreateFile(buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); @@ -325,19 +340,18 @@ if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) entry->_icon_id = ICID_FOLDER; -/* else if (scan_flags & SCAN_EXTRACT_ICONS) - entry->safe_extract_icon(large_icons); -*/ + else if (!(scan_flags & SCAN_DONT_EXTRACT_ICONS)) + entry->_icon_id = entry->safe_extract_icon(); // Assume small icon, we can extract the large icon later on demand. + last = entry; } while(FindNextFile(hFind, &w32fd)); FindClose(hFind); } } - else // !SCAN_FILESYSTEM + else // SCAN_NO_FILESYSTEM #endif { - ShellItemEnumerator enumerator(_folder, SHCONTF_FOLDERS|SHCONTF_NONFOLDERS|SHCONTF_INCLUDEHIDDEN|SHCONTF_SHAREAB LE|SHCONTF_STORAGE); TCHAR name[MAX_PATH]; @@ -376,7 +390,7 @@ if (attribs & SFGAO_REMOVABLE) { attribs |= SFGAO_HASSUBFOLDER; removeable = true; - } else if (scan_flags & SCAN_DO_ACCESS) { + } else if (!(scan_flags & SCAN_DONT_ACCESS)) { DWORD attribs2 = SFGAO_READONLY; HRESULT hr = _folder->GetAttributesOf(1, (LPCITEMIDLIST*)&pidls[n], &attribs2); @@ -388,7 +402,7 @@ attribs = 0; bhfi_valid = fill_w32fdata_shell(pidls[n], attribs, &w32fd, &bhfi, - (scan_flags&SCAN_DO_ACCESS) && !removeable); + !(scan_flags&SCAN_DONT_ACCESS) && !removeable); try { Entry* entry = NULL; // eliminate useless GCC warning by initializing entry @@ -429,9 +443,9 @@ // get icons for files and virtual objects if (!(entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || !(attribs & SFGAO_FILESYSTEM)) { -/* if (scan_flags & SCAN_EXTRACT_ICONS) - entry->extract_icon(large_icons); -*/ } else if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + if (!(scan_flags & SCAN_DONT_EXTRACT_ICONS)) + entry->_icon_id = entry->safe_extract_icon(); // Assume small icon, we can extract the large icon later on demand. + } else if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) entry->_icon_id = ICID_FOLDER; else entry->_icon_id = ICID_NONE; // don't try again later @@ -478,6 +492,16 @@ if (se->_pidl && se->_pidl->mkid.cb==pidl->mkid.cb && !memcmp(se->_pidl, pidl, se->_pidl->mkid.cb)) return entry; + } else { + const ShellPath& sp = entry->create_absolute_pidl(); + static DynamicFct<LPITEMIDLIST(WINAPI*)(LPCITEMIDLIST)> ILFindLastID(TEXT("SHELL32"), "ILFindLastID"); + + if (ILFindLastID) { + LPCITEMIDLIST entry_pidl = (*ILFindLastID)(sp); + + if (entry_pidl && entry_pidl->mkid.cb==pidl->mkid.cb && !memcmp(entry_pidl, pidl, entry_pidl->mkid.cb)) + return entry; + } } return NULL; _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.h --- trunk/reactos/subsys/system/explorer/shell/shellfs.h 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.h 2006-01-01 15:21:03 UTC (rev 20515) @@ -37,6 +37,7 @@ virtual HRESULT GetUIObjectOf(HWND hWnd, REFIID riid, LPVOID* ppvOut); virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow=SW_SHOWNORMAL); virtual HRESULT do_context_menu(HWND hwnd, LPPOINT pptScreen, CtxMenuInterfaces& cm_ifs); + virtual ShellFolder get_shell_folder() const; IShellFolder* get_parent_folder() const; @@ -99,11 +100,12 @@ pFolder->Release(); } - virtual void read_directory(int scan_flags=SCAN_ALL); + virtual void read_directory(int scan_flags=0); virtual const void* get_next_path_component(const void*) const; virtual Entry* find_entry(const void*); virtual bool get_path(PTSTR path, size_t path_count) const; + virtual ShellFolder get_shell_folder() const; int extract_icons(ICONCACHE_FLAGS flags); _____ Modified: trunk/reactos/subsys/system/explorer/shell/winfs.cpp --- trunk/reactos/subsys/system/explorer/shell/winfs.cpp 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/winfs.cpp 2006-01-01 15:21:03 UTC (rev 20515) @@ -140,19 +140,6 @@ if (hFind != INVALID_HANDLE_VALUE) { do { -#ifdef _NO_WIN_FS //@todo not really correct: We shouldn't hide . and .. - // ignore hidden files (usefull in the start menu) - if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) - continue; - - // ignore directory entries "." and ".." - if ((w32fd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) && - w32fd.cFileName[0]==TEXT('.') && - (w32fd.cFileName[1]==TEXT('\0') || - (w32fd.cFileName[1]==TEXT('.') && w32fd.cFileName[2]==TEXT('\0')))) - continue; -#endif - lstrcpy(pname+1, w32fd.cFileName); if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) @@ -172,7 +159,7 @@ // display file type names, but don't hide file extensions g_Globals._ftype_mgr.set_type(entry, true); - if (scan_flags & SCAN_DO_ACCESS) { + if (!(scan_flags & SCAN_DONT_ACCESS)) { HANDLE hFile = CreateFile(buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); @@ -247,7 +234,7 @@ // get full path of specified directory entry bool WinEntry::get_path(PTSTR path, size_t path_count) const { - return get_path_base ( path, path_count, ET_WINDOWS ); + return get_path_base(path, path_count, ET_WINDOWS); } ShellPath WinEntry::create_absolute_pidl() const _____ Modified: trunk/reactos/subsys/system/explorer/shell/winfs.h --- trunk/reactos/subsys/system/explorer/shell/winfs.h 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/shell/winfs.h 2006-01-01 15:21:03 UTC (rev 20515) @@ -60,7 +60,7 @@ _path = NULL; } - virtual void read_directory(int scan_flags=SCAN_ALL); + virtual void read_directory(int scan_flags=0); virtual const void* get_next_path_component(const void*) const; virtual Entry* find_entry(const void*); }; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp --- trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2006-01-01 15:21:03 UTC (rev 20515) @@ -373,7 +373,7 @@ { TCHAR path[MAX_PATH], ext[_MAX_EXT]; - dir.smart_scan(SORT_NAME, SCAN_FILESYSTEM); + dir.smart_scan(SORT_NAME, SCAN_DONT_EXTRACT_ICONS); for(Entry*entry=dir._down; entry; entry=entry->_next) { if (entry->_shell_attribs & SFGAO_HIDDEN) // ignore files like "desktop.ini" _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp --- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 15:21:03 UTC (rev 20515) @@ -105,7 +105,7 @@ RecursiveCreateDirectory(path); _dir = new ShellDirectory(GetDesktopFolder(), path, _hwnd); - _dir->smart_scan(SORT_NAME, /*SCAN_EXTRACT_ICONS|*/SCAN_FILESYSTEM); + _dir->smart_scan(SORT_NAME); // immediatelly extract the shortcut icons for(Entry*entry=_dir->_down; entry; entry=entry->_next) @@ -160,12 +160,12 @@ if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) continue; - // hide subfolders - if (!(entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - HBITMAP hbmp = g_Globals._icon_cache.get_icon(entry->_icon_id).create_bitmap(bk_color, bk_brush, canvas); + // hide subfolders + if (!(entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { + HBITMAP hbmp = g_Globals._icon_cache.get_icon(entry->_icon_id).create_bitmap(bk_color, bk_brush, canvas); - AddButton(_next_id++, hbmp, entry->_display_name, entry); //entry->_etype==ET_SHELL? desktop_folder.get_name(static_cast<ShellEntry*>(entry)->_pidl): entry->_display_name); - } + AddButton(_next_id++, hbmp, entry->_display_name, entry); //entry->_etype==ET_SHELL? desktop_folder.get_name(static_cast<ShellEntry*>(entry)->_pidl): entry->_display_name); + } } _btn_dist = LOWORD(SendMessage(_hwnd, TB_GETBUTTONSIZE, 0, 0)); _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-01 14:40:24 UTC (rev 20514) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-01 15:21:03 UTC (rev 20515) @@ -218,9 +218,9 @@ WaitCursor wait; #ifdef _LAZY_ICONEXTRACT - dir.smart_scan(SORT_NAME, SCAN_FILESYSTEM); // lazy icon extraction, try to read directly from filesystem + dir.smart_scan(SORT_NAME, SCAN_DONT_EXTRACT_ICONS); // lazy icon extraction, try to read directly from filesystem #else - dir.smart_scan(SORT_NAME, SCAN_EXTRACT_ICONS|SCAN_FILESYSTEM); + dir.smart_scan(SORT_NAME); #endif } @@ -2208,9 +2208,9 @@ WaitCursor wait; #ifdef _LAZY_ICONEXTRACT - dir.smart_scan(SORT_NAME, SCAN_FILESYSTEM); + dir.smart_scan(SORT_NAME, SCAN_DONT_EXTRACT_ICONS); #else - dir.smart_scan(SORT_NAME, SCAN_EXTRACT_ICONS|SCAN_FILESYSTEM); + dir.smart_scan(SORT_NAME); #endif }

18 years, 8 months

[greatlrd] 20514: optimize hide curs lite. so it does not tryung update the underlying surface hold time. and do not save the underlying surface in show when it is hide. all these save alot of cycles and winquake are bit faster.

by greatlrd＠svn.reactos.org

optimize hide curs lite. so it does not tryung update the underlying surface hold time. and do not save the underlying surface in show when it is hide. all these save alot of cycles and winquake are bit faster. Modified: trunk/reactos/lib/dinput/mouse.c _____ Modified: trunk/reactos/lib/dinput/mouse.c --- trunk/reactos/lib/dinput/mouse.c 2006-01-01 14:32:17 UTC (rev 20513) +++ trunk/reactos/lib/dinput/mouse.c 2006-01-01 14:40:24 UTC (rev 20514) @@ -423,6 +423,7 @@ DWORD dwCoop; static long last_event = 0; int wdata; + long lasttime = 0; if (code != HC_ACTION) return CallNextHookEx( This->hook, code, wparam, lparam ); @@ -434,11 +435,20 @@ * the warps happen. But if it involves a mouse button event we * allow it since we don't want to lose the clicks. */ +#ifndef __REACTOS__ if (((GetCurrentTime() - last_event) < 10) && wparam == WM_MOUSEMOVE) goto end; else last_event = GetCurrentTime(); +#else + lasttime = GetCurrentTime() - last_event; + if ((lasttime) < 1) + goto end; + else if ((lasttime) >= 10) + last_event = GetCurrentTime(); +#endif + /* Mouse moved -> send event if asked */ if (This->hEvent) SetEvent(This->hEvent);

18 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006