Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[chorns] 13435: Build snmpapi and network applications

by chorns＠svn.reactos.com

Build snmpapi and network applications Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/apps/directory.xml Added: branches/xmlbuildsystem/reactos/apps/utils/directory.xml Added: branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.xml Added: branches/xmlbuildsystem/reactos/apps/utils/net/directory.xml Added: branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.xml Added: branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml Added: branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml Added: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml Added: branches/xmlbuildsystem/reactos/apps/utils/net/telnet/telnet.xml Added: branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.xml Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/snmpapi/snmpapi.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -21,6 +21,9 @@ <include>w32api/include</include> <include>w32api/include/ddk</include> + <directory name="apps"> + <xi:include href="apps/directory.xml" /> + </directory> <directory name="boot"> <xi:include href="boot/boot.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/apps/directory.xml --- branches/xmlbuildsystem/reactos/apps/directory.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/apps/directory.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,3 @@ +<directory name="utils"> + <xi:include href="utils/directory.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/apps/utils/directory.xml --- branches/xmlbuildsystem/reactos/apps/utils/directory.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/apps/utils/directory.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,3 @@ +<directory name="net"> + <xi:include href="net/directory.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,9 @@ +<module name="arp" type="win32cui"> + <include base="arp">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>snmpapi</library> + <file>arp.c</file> + <file>arp.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/apps/utils/net/directory.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/directory.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/apps/utils/net/directory.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,21 @@ +<directory name="arp"> + <xi:include href="arp/arp.xml" /> +</directory> +<directory name="finger"> + <xi:include href="finger/finger.xml" /> +</directory> +<directory name="ipconfig"> + <xi:include href="ipconfig/ipconfig.xml" /> +</directory> +<directory name="netstat"> + <xi:include href="netstat/netstat.xml" /> +</directory> +<directory name="ping"> + <xi:include href="ping/ping.xml" /> +</directory> +<directory name="telnet"> + <xi:include href="telnet/telnet.xml" /> +</directory> +<directory name="whois"> + <xi:include href="whois/whois.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,11 @@ +<module name="finger" type="win32cui"> + <include base="finger">.</include> + <define name="__USE_W32_SOCKETS" /> + <library>kernel32</library> + <library>ws2_32</library> + <file>finger.c</file> + <file>err.c</file> + <file>getopt.c</file> + <file>net.c</file> + <file>finger.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,10 @@ +<module name="ipconfig" type="win32cui"> + <include base="ipconfig">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>iphlpapi</library> + <file>ipconfig.c</file> + <file>trace.c</file> + <file>ipconfig.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,14 @@ +<module name="netstat" type="win32cui"> + <include base="netstat">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>ws2_32</library> + <library>snmpapi</library> + <library>iphlpapi</library> + <file>netstat.c</file> + <file>trace.c</file> + <file>netstat.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,10 @@ +<module name="ping" type="win32cui"> + <include base="ping">.</include> + <define name="__USE_W32_SOCKETS" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>ws2_32</library> + <file>ping.c</file> + <file>ping.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/apps/utils/net/telnet/telnet.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/telnet/telnet.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/apps/utils/net/telnet/telnet.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,29 @@ +<module name="telnet" type="win32cui"> + <include base="telnet">.</include> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <library>kernel32</library> + <library>ws2_32</library> + <directory name="src"> + <file>ansiprsr.cpp</file> + <file>keytrans.cpp</file> + <file>tcharmap.cpp</file> + <file>tconsole.cpp</file> + <file>tkeydef.cpp</file> + <file>tkeymap.cpp</file> + <file>tmapldr.cpp</file> + <file>tmouse.cpp</file> + <file>tnclass.cpp</file> + <file>tnclip.cpp</file> + <file>tncon.cpp</file> + <file>tnconfig.cpp</file> + <file>tnerror.cpp</file> + <file>tnetwork.cpp</file> + <file>tnmain.cpp</file> + <file>tnmisc.cpp</file> + <file>tscript.cpp</file> + <file>tscroll.cpp</file> + <file>ttelhndl.cpp</file> + </directory> + <file>telnet.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,7 @@ +<module name="whois" type="win32cui"> + <include base="whois">.</include> + <library>kernel32</library> + <library>ws2_32</library> + <file>whois.c</file> + <file>whois.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -203,6 +203,9 @@ <directory name="shlwapi"> <xi:include href="shlwapi/shlwapi.xml" /> </directory> +<directory name="snmpapi"> + <xi:include href="snmpapi/snmpapi.xml" /> +</directory> <directory name="string"> <xi:include href="string/string.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/lib/snmpapi/snmpapi.xml --- branches/xmlbuildsystem/reactos/lib/snmpapi/snmpapi.xml 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/lib/snmpapi/snmpapi.xml 2005-02-06 11:01:22 UTC (rev 13435) @@ -0,0 +1,10 @@ +<module name="snmpapi" type="win32dll"> + <importlibrary definition="snmpapi.def" /> + <include base="snmpapi">.</include> + <define name="UNICODE" /> + <define name="_DISABLE_TIDENTS" /> + <library>ntdll</library> + <library>kernel32</library> + <file>snmpapi.c</file> + <file>snmpapi.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-06 10:50:50 UTC (rev 13434) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-06 11:01:22 UTC (rev 13435) @@ -1767,10 +1767,16 @@ objectFilenames.c_str (), importLibraryDependencies.c_str () ); + string linker; + if ( IsCPlusPlusModule ( module ) ) + linker = "${gpp}"; + else + linker = "${gcc}"; + string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", module.entrypoint.c_str () ); GenerateLinkerCommand ( module, - "${gcc}", + linker, linkerParameters, objectFilenames ); }

19 years, 10 months

[mf] 13434: prevent crash related to unsupported context menu types

by mf＠svn.reactos.com

prevent crash related to unsupported context menu types Modified: trunk/reactos/subsys/system/explorer/shell/pane.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/pane.cpp --- trunk/reactos/subsys/system/explorer/shell/pane.cpp 2005-02-06 10:38:51 UTC (rev 13433) +++ trunk/reactos/subsys/system/explorer/shell/pane.cpp 2005-02-06 10:50:50 UTC (rev 13434) @@ -491,9 +491,9 @@ // output type/class name if (visible_cols & COL_TYPE) { if (calcWidthCol == -1) - _out_wrkr.output_text(dis, _positions, col, entry->_type_name? entry->_type_name: TEXT(""), 0); + _out_wrkr.output_text(dis, _positions, col, entry->_type_name&&entry->_type_name!=LPSTR_TEXTCALLBACK? entry->_type_name: TEXT(""), 0); else if (calcWidthCol==col || calcWidthCol==COLUMNS) - calc_width(dis, col, entry->_type_name? entry->_type_name: TEXT("")); + calc_width(dis, col, entry->_type_name&&entry->_type_name!=LPSTR_TEXTCALLBACK? entry->_type_name: TEXT("")); } ++col; @@ -623,9 +623,9 @@ // output content / symbolic link target / comment if (visible_cols & COL_CONTENT) { if (calcWidthCol == -1) - _out_wrkr.output_text(dis, _positions, col, entry->_content? entry->_content: TEXT(""), 0); + _out_wrkr.output_text(dis, _positions, col, entry->_content&&entry->_content!=LPSTR_TEXTCALLBACK? entry->_content: TEXT(""), 0); else if (calcWidthCol==col || calcWidthCol==COLUMNS) - calc_width(dis, col, entry->_content? entry->_content: TEXT("")); + calc_width(dis, col, entry->_content&&entry->_content!=LPSTR_TEXTCALLBACK? entry->_content: TEXT("")); } }

19 years, 10 months

[mf] 13433: support for owner drawn context menus on the desktop

by mf＠svn.reactos.com

support for owner drawn context menus on the desktop Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.h _____ Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp --- trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-02-06 10:23:29 UTC (rev 13432) +++ trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-02-06 10:38:51 UTC (rev 13433) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -473,6 +473,11 @@ : super(hwnd), _pShellView(pShellView) { + _pctxmenu2 = NULL; +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) + _pctxmenu3 = NULL; +#endif + _hwndListView = ::GetNextWindow(hwnd, GW_CHILD); SetWindowStyle(_hwndListView, GetWindowStyle(_hwndListView)&~LVS_ALIGNMASK);//|LVS_ALIGNTOP|LVS_AUTOAR RANGE); @@ -541,6 +546,36 @@ case PM_DISPLAY_VERSION: return SendMessage(_hwndListView, nmsg, wparam, lparam); +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) + case WM_MENUCHAR: // only supported by IContextMenu3 + if (_pctxmenu3) { + LRESULT lResult = 0; + + _pctxmenu3->HandleMenuMsg2(nmsg, wparam, lparam, &lResult); + + return lResult; + } + break; +#endif + + case WM_DRAWITEM: + case WM_MEASUREITEM: + if (wparam) + break; // If wParam != 0 then the message is not menu-related. + + // fall through + + case WM_INITMENUPOPUP: +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) + if (_pctxmenu3) + _pctxmenu3->HandleMenuMsg(nmsg, wparam, lparam); + else +#endif + if (_pctxmenu2) + _pctxmenu2->HandleMenuMsg(nmsg, wparam, lparam); + + return nmsg==WM_INITMENUPOPUP? 0: TRUE; // Inform caller that we handled WM_INITPOPUPMENU by ourself. + default: return super::WndProc(nmsg, wparam, lparam); } @@ -599,11 +634,29 @@ HRESULT DesktopShellView::DoDesktopContextMenu(int x, int y) { + IContextMenu* pcm1; IContextMenu* pcm; - HRESULT hr = DesktopFolder()->GetUIObjectOf(_hwnd, 0, NULL, IID_IContextMenu, NULL, (LPVOID*)&pcm); + HRESULT hr = DesktopFolder()->GetUIObjectOf(_hwnd, 0, NULL, IID_IContextMenu, NULL, (LPVOID*)&pcm1); if (SUCCEEDED(hr)) { + // Get the higher version context menu interfaces. + _pctxmenu2 = NULL; +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) + _pctxmenu3 = NULL; + + if (pcm1->QueryInterface(IID_IContextMenu3, (void**)&pcm) == NOERROR) + _pctxmenu3 = (LPCONTEXTMENU3)pcm; + else +#endif + if (pcm1->QueryInterface (IID_IContextMenu2, (void**)&pcm) == NOERROR) + _pctxmenu2 = (LPCONTEXTMENU2)pcm; + + if (pcm) + pcm1->Release(); + else + pcm = pcm1; + HMENU hmenu = CreatePopupMenu(); if (hmenu) { @@ -615,6 +668,11 @@ UINT idCmd = TrackPopupMenu(hmenu, TPM_LEFTALIGN|TPM_RETURNCMD|TPM_RIGHTBUTTON, x, y, 0, _hwnd, NULL); + _pctxmenu2 = NULL; +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) + _pctxmenu3 = NULL; +#endif + if (idCmd == FCIDM_SHVIEWLAST-1) { explorer_about(_hwnd); } else if (idCmd) { _____ Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.h --- trunk/reactos/subsys/system/explorer/desktop/desktop.h 2005-02-06 10:23:29 UTC (rev 13432) +++ trunk/reactos/subsys/system/explorer/desktop/desktop.h 2005-02-06 10:38:51 UTC (rev 13433) @@ -187,4 +187,9 @@ DesktopDropTarget* _pDropTarget; HWND _hwndListView; int _icon_algo; + + IContextMenu2* _pctxmenu2; +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) + IContextMenu3* _pctxmenu3; +#endif };

19 years, 10 months

[chorns] 13432: Build services

by chorns＠svn.reactos.com

Build services Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/services/directory.xml Added: branches/xmlbuildsystem/reactos/services/eventlog/eventlog.xml Added: branches/xmlbuildsystem/reactos/services/rpcss/rpcss.xml _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-02-06 10:01:07 UTC (rev 13431) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-02-06 10:23:29 UTC (rev 13432) @@ -47,6 +47,9 @@ <directory name="ntoskrnl"> <xi:include href="ntoskrnl/ntoskrnl.xml" /> </directory> + <directory name="services"> + <xi:include href="services/directory.xml" /> + </directory> <directory name="subsys"> <xi:include href="subsys/directory.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/services/directory.xml --- branches/xmlbuildsystem/reactos/services/directory.xml 2005-02-06 10:01:07 UTC (rev 13431) +++ branches/xmlbuildsystem/reactos/services/directory.xml 2005-02-06 10:23:29 UTC (rev 13432) @@ -0,0 +1,6 @@ +<directory name="eventlog"> + <xi:include href="eventlog/eventlog.xml" /> +</directory> +<directory name="rpcss"> + <xi:include href="rpcss/rpcss.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/services/eventlog/eventlog.xml --- branches/xmlbuildsystem/reactos/services/eventlog/eventlog.xml 2005-02-06 10:01:07 UTC (rev 13431) +++ branches/xmlbuildsystem/reactos/services/eventlog/eventlog.xml 2005-02-06 10:23:29 UTC (rev 13432) @@ -0,0 +1,9 @@ +<module name="eventlog" type="win32cui"> + <include base="eventlog">.</include> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <file>eventlog.c</file> + <file>logport.c</file> + <file>eventlog.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/services/rpcss/rpcss.xml --- branches/xmlbuildsystem/reactos/services/rpcss/rpcss.xml 2005-02-06 10:01:07 UTC (rev 13431) +++ branches/xmlbuildsystem/reactos/services/rpcss/rpcss.xml 2005-02-06 10:23:29 UTC (rev 13432) @@ -0,0 +1,8 @@ +<module name="rpcss" type="win32cui"> + <include base="rpcss">.</include> + <library>kernel32</library> + <library>advapi32</library> + <file>rpcss.c</file> + <file>endpoint.c</file> + <file>rpcss.rc</file> +</module>

19 years, 10 months

[navaraf] 13431: Use only 80 character wide lines in the comments.

by navaraf＠svn.reactos.com

Use only 80 character wide lines in the comments. Modified: trunk/reactos/include/ddk/csq.h _____ Modified: trunk/reactos/include/ddk/csq.h --- trunk/reactos/include/ddk/csq.h 2005-02-06 07:56:45 UTC (rev 13430) +++ trunk/reactos/include/ddk/csq.h 2005-02-06 10:01:07 UTC (rev 13431) @@ -9,34 +9,37 @@ * * BACKGROUND * - * IRP queuing is a royal pain in the butt, due to the fact that there are tons of - * built-in race conditions. IRP handling is difficult in general, but the cancel - * logic has been particularly complicated due to some subtle races, coupled - * with the fact that the system interfaces have changed over time. + * IRP queuing is a royal pain in the butt, due to the fact that there are + * tons of built-in race conditions. IRP handling is difficult in general, + * but the cancel logic has been particularly complicated due to some subtle + * races, coupled with the fact that the system interfaces have changed over + * time. * - * Walter Oney (2nd. Ed. of Programming the Windows Driver Model) states a common - * opinion among driver developers when he says that it is foolish to try to roll - * your own cancel logic. There are only a very few people who have gotten it - * right in the past. He suggests, instead, that you either use his own well-tested - * code, or use the code in the Microsoft Cancel-Safe Queue Library. + * Walter Oney (2nd. Ed. of Programming the Windows Driver Model) states a + * common opinion among driver developers when he says that it is foolish + * to try to roll your own cancel logic. There are only a very few people + * who have gotten it right in the past. He suggests, instead, that you + * either use his own well-tested code, or use the code in the Microsoft + * Cancel-Safe Queue Library. * - * We cannot do either, of course, due to copyright issues. I have therefore created - * this clone of the Microsoft library in order to concentrate all of the IRP-queuing - * bugs in one place. I'm quite sure there are problems here, so if you are a - * driver writer, I'd be glad to hear your feedback. + * We cannot do either, of course, due to copyright issues. I have therefore + * created this clone of the Microsoft library in order to concentrate all + * of the IRP-queuing bugs in one place. I'm quite sure there are problems + * here, so if you are a driver writer, I'd be glad to hear your feedback. * - * Apart from that, please try to use these routines, rather than building your own. - * If you think you have found a bug, please bring it up with me or on-list, as this - * is complicated and non-obvious stuff. Don't just change this and hope for the best! + * Apart from that, please try to use these routines, rather than building + * your own. If you think you have found a bug, please bring it up with me + * or on-list, as this is complicated and non-obvious stuff. Don't just + * change this and hope for the best! * * USAGE * * This library follows exactly the same interface as the Microsoft Cancel-Safe Queue - * routines (IoCsqXxx()). As such, the authoritative reference is the current DDK. - * There is also a DDK sample called "cancel" that has an example of how to use this - * code. I have also provided a sample driver that makes use of this queue. Finally, - * please do read the header and the source if you're curious about the inner workings - * of these routines. + * routines (IoCsqXxx()). As such, the authoritative reference is the + * current DDK. There is also a DDK sample called "cancel" that has an + * example of how to use this code. I have also provided a sample driver + * that makes use of this queue. Finally, please do read the header and the + * source if you're curious about the inner workings of these routines. */ #ifndef _REACTOS_CSQ_H @@ -48,10 +51,11 @@ /* * CSQ Callbacks * - * The cancel-safe queue is implemented as a set of IoCsqXxx() OS routines copuled - * with a set of driver callbacks to handle the basic operations of the queue. You - * need to supply one of each of these functions in your own driver. These routines - * are also documented in the DDK under CsqXxx(). That is the authoritative documentation. + * The cancel-safe queue is implemented as a set of IoCsqXxx() OS routines + * copuled with a set of driver callbacks to handle the basic operations of + * the queue. You need to supply one of each of these functions in your own + * driver. These routines are also documented in the DDK under CsqXxx(). + * That is the authoritative documentation. */ /* @@ -60,11 +64,11 @@ * * Sample implementation: * - VOID NTAPI CsqInsertIrp(PIO_CSQ Csq, PIRP Irp) - { - KdPrint(("Inserting IRP 0x%x into CSQ\n", Irp)); - InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); - } + VOID NTAPI CsqInsertIrp(PIO_CSQ Csq, PIRP Irp) + { + KdPrint(("Inserting IRP 0x%x into CSQ\n", Irp)); + InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); + } * */ typedef VOID (NTAPI *PIO_CSQ_INSERT_IRP) (struct _IO_CSQ *Csq, @@ -73,16 +77,16 @@ /* * Function to insert an IRP into the queue with extended context information. - * This is useful if you need to be able to de-queue particular IRPs more easily - * in some cases. + * This is useful if you need to be able to de-queue particular IRPs more + * easily in some cases. * * Same deal as above; sample implementation: * - NTSTATUS NTAPI CsqInsertIrpEx(PIO_CSQ Csq, PIRP Irp, PVOID InsertContext) - { - CsqInsertIrp(Csq, Irp); - return STATUS_PENDING; - } + NTSTATUS NTAPI CsqInsertIrpEx(PIO_CSQ Csq, PIRP Irp, PVOID InsertContext) + { + CsqInsertIrp(Csq, Irp); + return STATUS_PENDING; + } * */ typedef NTSTATUS (NTAPI *PIO_CSQ_INSERT_IRP_EX) (struct _IO_CSQ *Csq, @@ -94,11 +98,11 @@ * * Sample: * - VOID NTAPI CsqRemoveIrp(PIO_CSQ Csq, PIRP Irp) - { - KdPrint(("Removing IRP 0x%x from CSQ\n", Irp)); - RemoveEntryList(&Irp->Tail.Overlay.ListEntry); - } + VOID NTAPI CsqRemoveIrp(PIO_CSQ Csq, PIRP Irp) + { + KdPrint(("Removing IRP 0x%x from CSQ\n", Irp)); + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + } * */ typedef VOID (NTAPI *PIO_CSQ_REMOVE_IRP) (struct _IO_CSQ *Csq, @@ -109,18 +113,18 @@ * * Sample: * - PIRP NTAPI CsqPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext) - { - KdPrint(("Peeking for next IRP\n")); + PIRP NTAPI CsqPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext) + { + KdPrint(("Peeking for next IRP\n")); - if(Irp) - return CONTAINING_RECORD(&Irp->Tail.Overlay.ListEntry.Flink, IRP, Tail.Overlay.ListEntry); + if(Irp) + return CONTAINING_RECORD(&Irp->Tail.Overlay.ListEntry.Flink, IRP, Tail.Overlay.ListEntry); - if(IsListEmpty(&IrpQueue)) - return NULL; + if(IsListEmpty(&IrpQueue)) + return NULL; - return CONTAINING_RECORD(IrpQueue.Flink, IRP, Tail.Overlay.ListEntry); - } + return CONTAINING_RECORD(IrpQueue.Flink, IRP, Tail.Overlay.ListEntry); + } * */ typedef PIRP (NTAPI *PIO_CSQ_PEEK_NEXT_IRP) (struct _IO_CSQ *Csq, @@ -133,11 +137,11 @@ * * Sample: * - VOID NTAPI CsqAcquireLock(PIO_CSQ Csq, PKIRQL Irql) - { - KdPrint(("Acquiring spin lock\n")); - KeAcquireSpinLock(&IrpQueueLock, Irql); - } + VOID NTAPI CsqAcquireLock(PIO_CSQ Csq, PKIRQL Irql) + { + KdPrint(("Acquiring spin lock\n")); + KeAcquireSpinLock(&IrpQueueLock, Irql); + } * */ typedef VOID (NTAPI *PIO_CSQ_ACQUIRE_LOCK) (struct _IO_CSQ *Csq, @@ -146,11 +150,11 @@ /* * Unlock the queue: * - VOID NTAPI CsqReleaseLock(PIO_CSQ Csq, KIRQL Irql) - { - KdPrint(("Releasing spin lock\n")); - KeReleaseSpinLock(&IrpQueueLock, Irql); - } + VOID NTAPI CsqReleaseLock(PIO_CSQ Csq, KIRQL Irql) + { + KdPrint(("Releasing spin lock\n")); + KeReleaseSpinLock(&IrpQueueLock, Irql); + } * */ typedef VOID (NTAPI *PIO_CSQ_RELEASE_LOCK) (struct _IO_CSQ *Csq, @@ -162,13 +166,13 @@ * * Sample: * - VOID NTAPI CsqCompleteCancelledIrp(PIO_CSQ Csq, PIRP Irp) - { - KdPrint(("cancelling irp 0x%x\n", Irp)); - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } + VOID NTAPI CsqCompleteCancelledIrp(PIO_CSQ Csq, PIRP Irp) + { + KdPrint(("cancelling irp 0x%x\n", Irp)); + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } * */ typedef VOID (NTAPI *PIO_CSQ_COMPLETE_CANCELED_IRP) (struct _IO_CSQ *Csq, @@ -179,8 +183,8 @@ * STRUCTURES * * NOTE: Please do not use these directly. You will make incompatible code - * if you do. Always only use the documented IoCsqXxx() interfaces and you will - * amass much Good Karma. + * if you do. Always only use the documented IoCsqXxx() interfaces and you + * will amass much Good Karma. */ #define IO_TYPE_CSQ_IRP_CONTEXT 1 #define IO_TYPE_CSQ 2 @@ -213,9 +217,9 @@ /* * CANCEL-SAFE QUEUE DDIs * - * These device driver interfaces are called to make use of the queue. Again, authoritative - * documentation for these functions is in the DDK. The csqtest driver also makes use of - * some of them. + * These device driver interfaces are called to make use of the queue. Again, + * authoritative documentation for these functions is in the DDK. The csqtest + * driver also makes use of some of them. */ @@ -274,4 +278,3 @@ PVOID PeekContext); #endif /* _REACTOS_CSQ_H */ -

19 years, 10 months

[arty] 13430: Kill only selects involving a named file descriptor when clearing exclusive

by arty＠svn.reactos.com

Kill only selects involving a named file descriptor when clearing exclusive selects. This makes ASECHO32 work perfectly. Modified: trunk/reactos/drivers/net/afd/afd/main.c Modified: trunk/reactos/drivers/net/afd/afd/select.c Modified: trunk/reactos/drivers/net/afd/include/afd.h _____ Modified: trunk/reactos/drivers/net/afd/afd/main.c --- trunk/reactos/drivers/net/afd/afd/main.c 2005-02-06 00:01:21 UTC (rev 13429) +++ trunk/reactos/drivers/net/afd/afd/main.c 2005-02-06 07:56:45 UTC (rev 13430) @@ -225,7 +225,7 @@ FCB->PollState |= AFD_EVENT_CLOSE; PollReeval( FCB->DeviceExt, FileObject ); - KillSelectsForFCB( FCB->DeviceExt, FileObject ); + KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); _____ Modified: trunk/reactos/drivers/net/afd/afd/select.c --- trunk/reactos/drivers/net/afd/afd/select.c 2005-02-06 00:01:21 UTC (rev 13429) +++ trunk/reactos/drivers/net/afd/afd/select.c 2005-02-06 07:56:45 UTC (rev 13430) @@ -12,6 +12,25 @@ #include "tdiconn.h" #include "debug.h" +VOID PrintEvents( ULONG Events ) { + char *events_list[] = { "AFD_EVENT_RECEIVE", + "AFD_EVENT_OOB_RECEIVE", + "AFD_EVENT_SEND", + "AFD_EVENT_DISCONNECT", + "AFD_EVENT_ABORT", + "AFD_EVENT_CLOSE", + "AFD_EVENT_CONNECT", + "AFD_EVENT_ACCEPT", + "AFD_EVENT_CONNECT_FAIL", + "AFD_EVENT_QOS", + "AFD_EVENT_GROUP_QOS", + NULL }; + int i; + + for( i = 0; events_list[i]; i++ ) + if( Events & (1 << i) ) DbgPrint("%s ", events_list[i] ); +} + VOID CopyBackStatus( PAFD_HANDLE HandleArray, UINT HandleCount ) { UINT i; @@ -94,7 +113,8 @@ } VOID KillSelectsForFCB( PAFD_DEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject ) { + PFILE_OBJECT FileObject, + BOOLEAN OnlyExclusive ) { KIRQL OldIrql; PLIST_ENTRY ListEntry; PAFD_ACTIVE_POLL Poll; @@ -116,42 +136,19 @@ for( i = 0; i < PollReq->HandleCount; i++ ) { AFD_DbgPrint(MAX_TRACE,("Req: %x, This %x\n", PollReq->Handles[i].Handle, FileObject)); - if( (PVOID)PollReq->Handles[i].Handle == FileObject ) { + if( (PVOID)PollReq->Handles[i].Handle == FileObject && + (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { ZeroEvents( PollReq->Handles, PollReq->HandleCount ); SignalSocket( Poll, PollReq, STATUS_SUCCESS ); } } } - + KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - + AFD_DbgPrint(MID_TRACE,("Done\n")); } -VOID KillExclusiveSelects( PAFD_DEVICE_EXTENSION DeviceExt ) { - KIRQL OldIrql; - PLIST_ENTRY ListEntry; - PAFD_ACTIVE_POLL Poll; - PIRP Irp; - PAFD_POLL_INFO PollReq; - - KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); - - ListEntry = DeviceExt->Polls.Flink; - while ( ListEntry != &DeviceExt->Polls ) { - Poll = CONTAINING_RECORD(ListEntry, AFD_ACTIVE_POLL, ListEntry); - ListEntry = ListEntry->Flink; - if( Poll->Exclusive ) { - Irp = Poll->Irp; - PollReq = Irp->AssociatedIrp.SystemBuffer; - ZeroEvents( PollReq->Handles, PollReq->HandleCount ); - SignalSocket( Poll, PollReq, STATUS_CANCELLED ); - } - } - - KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); -} - NTSTATUS STDCALL AfdSelect( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { @@ -175,9 +172,6 @@ SET_AFD_HANDLES(PollReq, LockHandles( PollReq->Handles, PollReq->HandleCount )); - if( Exclusive ) KillExclusiveSelects( DeviceExt ); - - if( !AFD_HANDLES(PollReq) ) { Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; @@ -185,6 +179,16 @@ return Irp->IoStatus.Status; } + if( Exclusive ) { + for( i = 0; i < PollReq->HandleCount; i++ ) { + if( !AFD_HANDLES(PollReq)[i].Handle ) continue; + + KillSelectsForFCB( DeviceExt, + (PFILE_OBJECT)AFD_HANDLES(PollReq)[i].Handle, + TRUE ); + } + } + ZeroEvents( PollReq->Handles, PollReq->HandleCount ); @@ -218,6 +222,12 @@ PollReq->Handles[i].Status = AFD_EVENT_CLOSE; Signalled++; } else { +#ifdef DBG + DbgPrint("AFD: Select Events: "); + PrintEvents( PollReq->Handles[i].Events ); + DbgPrint("\n"); +#endif + PollReq->Handles[i].Status = PollReq->Handles[i].Events & FCB->PollState; if( PollReq->Handles[i].Status ) { _____ Modified: trunk/reactos/drivers/net/afd/include/afd.h --- trunk/reactos/drivers/net/afd/include/afd.h 2005-02-06 00:01:21 UTC (rev 13429) +++ trunk/reactos/drivers/net/afd/include/afd.h 2005-02-06 07:56:45 UTC (rev 13430) @@ -263,7 +263,7 @@ PIO_STACK_LOCATION IrpSp ); VOID PollReeval( PAFD_DEVICE_EXTENSION DeviceObject, PFILE_OBJECT FileObject ); VOID KillSelectsForFCB( PAFD_DEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject ); + PFILE_OBJECT FileObject, BOOLEAN ExclusiveOnly ); /* tdi.c */

19 years, 10 months

[weiden] 13429: Just cleaned up the code and changed the name of a few things. Patch by Trevor McCort.

by weiden＠svn.reactos.com

Just cleaned up the code and changed the name of a few things. Patch by Trevor McCort. Modified: trunk/reactos/lib/cpl/desk/background.c Modified: trunk/reactos/lib/cpl/desk/en.rc Modified: trunk/reactos/lib/cpl/desk/resource.h _____ Modified: trunk/reactos/lib/cpl/desk/background.c --- trunk/reactos/lib/cpl/desk/background.c 2005-02-05 22:48:07 UTC (rev 13428) +++ trunk/reactos/lib/cpl/desk/background.c 2005-02-06 00:01:21 UTC (rev 13429) @@ -19,38 +19,44 @@ #include "desk.h" #include "dibitmap.h" -#define MAX_WALLPAPERS 100 +#define MAX_BACKGROUNDS 100 #define PLACEMENT_CENTER 0 #define PLACEMENT_STRETCH 1 #define PLACEMENT_TILE 2 -DIBitmap *g_pWallpaperBitmap = NULL; +typedef struct +{ + BOOL bWallpaper; /* Is this background a wallpaper */ + + TCHAR szFilename[MAX_PATH]; + TCHAR szDisplayName[256]; + +} BackgroundItem; -int g_placementSelection = 0; -int g_wallpaperSelection = -1; +BackgroundItem g_backgroundItems[MAX_BACKGROUNDS]; -int g_wallpaperCount = 0; -int g_listViewItemCount = 0; +DIBitmap *g_pWallpaperBitmap = NULL; -int g_currentWallpaperItemId = 0; +int g_placementSelection = 0; +int g_backgroundSelection = 0; -HWND g_hBackgroundTab = NULL; +int g_listViewItemCount = 0; -HWND g_hWallpaperList = NULL; -HWND g_hWallpaperPreview = NULL; -HIMAGELIST g_hShellImageList = NULL; +HWND g_hBackgroundPage = NULL; +HWND g_hBackgroundList = NULL; +HWND g_hBackgroundPreview = NULL; -HWND g_hPlacementCombo = NULL; +HWND g_hPlacementCombo = NULL; +HWND g_hColorButton = NULL; -TCHAR g_wallpapers[MAX_WALLPAPERS][MAX_PATH]; +HIMAGELIST g_hShellImageList = NULL; /* Add the bitmaps in the C:\ReactOS directory and the current wallpaper if any */ void AddListViewItems() { WIN32_FIND_DATA fd; HANDLE hFind; - TCHAR szBuffer[256]; TCHAR szSearchPath[MAX_PATH]; LV_ITEM listItem; LV_COLUMN dummy; @@ -63,30 +69,38 @@ DWORD varType = REG_SZ; LONG result; UINT i = 0; + BackgroundItem *backgroundItem = NULL; - GetClientRect(g_hWallpaperList, &clientRect); + GetClientRect(g_hBackgroundList, &clientRect); ZeroMemory(&dummy, sizeof(LV_COLUMN)); dummy.mask = LVCF_SUBITEM | LVCF_WIDTH; dummy.iSubItem = 0; dummy.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); - ListView_InsertColumn(g_hWallpaperList, 0, &dummy); + ListView_InsertColumn(g_hBackgroundList, 0, &dummy); /* Add the "None" item */ - LoadString(hApplet, IDS_NONE, szBuffer, sizeof(szBuffer) / sizeof(TCHAR)); + backgroundItem = &g_backgroundItems[g_listViewItemCount]; + backgroundItem->bWallpaper = FALSE; + + LoadString(hApplet, + IDS_NONE, + backgroundItem->szDisplayName, + sizeof(backgroundItem->szDisplayName) / sizeof(TCHAR)); + ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.pszText = szBuffer; + listItem.state = LVIS_SELECTED; + listItem.pszText = backgroundItem->szDisplayName; + listItem.iImage = -1; listItem.iItem = g_listViewItemCount; - listItem.iImage = -1; - listItem.state = LVIS_SELECTED; - listItem.lParam = -1; + listItem.lParam = g_listViewItemCount; - ListView_InsertItem(g_hWallpaperList, &listItem); - ListView_SetItemState(g_hWallpaperList, g_listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); + ListView_InsertItem(g_hBackgroundList, &listItem); + ListView_SetItemState(g_hBackgroundList, g_listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); g_listViewItemCount++; @@ -110,26 +124,28 @@ if(i++ == 0) { g_hShellImageList = himl; - ListView_SetImageList(g_hWallpaperList, himl, LVSIL_SMALL); + ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); } + backgroundItem = &g_backgroundItems[g_listViewItemCount]; + + backgroundItem->bWallpaper = TRUE; + + _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + _tcscpy(backgroundItem->szFilename, wallpaperFilename); + ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.pszText = sfi.szDisplayName; listItem.state = LVIS_SELECTED; + listItem.pszText = backgroundItem->szDisplayName; + listItem.iImage = sfi.iIcon; listItem.iItem = g_listViewItemCount; - listItem.iImage = sfi.iIcon; - listItem.lParam = g_wallpaperCount; + listItem.lParam = g_listViewItemCount; - ListView_InsertItem(g_hWallpaperList, &listItem); - _tcscpy(g_wallpapers[g_wallpaperCount], wallpaperFilename); + ListView_InsertItem(g_hBackgroundList, &listItem); + ListView_SetItemState(g_hBackgroundList, g_listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); - ListView_SetItemState(g_hWallpaperList, g_listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); - - g_currentWallpaperItemId = g_listViewItemCount; - g_listViewItemCount++; - g_wallpaperCount++; } } @@ -168,22 +184,27 @@ if(i++ == 0) { g_hShellImageList = himl; - ListView_SetImageList(g_hWallpaperList, himl, LVSIL_SMALL); + ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); } + backgroundItem = &g_backgroundItems[g_listViewItemCount]; + + backgroundItem->bWallpaper = TRUE; + + _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + _tcscpy(backgroundItem->szFilename, filename); + ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.pszText = sfi.szDisplayName; + listItem.pszText = backgroundItem->szDisplayName; listItem.state = 0; - listItem.iItem = g_listViewItemCount++; listItem.iImage = sfi.iIcon; - listItem.lParam = g_wallpaperCount; + listItem.iItem = g_listViewItemCount; + listItem.lParam = g_listViewItemCount; - ListView_InsertItem(g_hWallpaperList, &listItem); + ListView_InsertItem(g_hBackgroundList, &listItem); - _tcscpy(g_wallpapers[g_wallpaperCount], filename); - - g_wallpaperCount++; + g_listViewItemCount++; } if(!FindNextFile(hFind, &fd)) @@ -193,9 +214,10 @@ void InitBackgroundDialog() { - g_hWallpaperList = GetDlgItem(g_hBackgroundTab, IDC_WALLPAPER_LIST); - g_hWallpaperPreview = GetDlgItem(g_hBackgroundTab, IDC_WALLPAPER_PREVIEW); - g_hPlacementCombo = GetDlgItem(g_hBackgroundTab, IDC_PLACEMENT_COMBO); + g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); + g_hBackgroundPreview = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_PREVIEW); + g_hPlacementCombo = GetDlgItem(g_hBackgroundPage, IDC_PLACEMENT_COMBO); + g_hColorButton = GetDlgItem(g_hBackgroundPage, IDC_COLOR_BUTTON); AddListViewItems(); @@ -256,7 +278,7 @@ RegCloseKey(regKey); } -void OnPatternButton() +void OnColorButton() { MessageBox(NULL, TEXT("That button doesn't do anything yet"), TEXT("Whoops"), MB_OK); } @@ -271,11 +293,12 @@ OPENFILENAME ofn; TCHAR filename[MAX_PATH]; TCHAR fileTitle[256]; + BackgroundItem *backgroundItem = NULL; ZeroMemory(&ofn, sizeof(OPENFILENAME)); ofn.lStructSize = sizeof(OPENFILENAME); - ofn.hwndOwner = g_hBackgroundTab; + ofn.hwndOwner = g_hBackgroundPage; ofn.lpstrFile = filename; /* Set lpstrFile[0] to '\0' so that GetOpenFileName does not @@ -292,77 +315,76 @@ if(GetOpenFileName(&ofn) == TRUE) { /* Check if there is already a entry that holds this filename */ - if(CheckListBoxFilename(g_hWallpaperList, filename) == FALSE) - { - SHFILEINFO sfi; - LV_ITEM listItem; - - if(g_wallpaperCount > (MAX_WALLPAPERS - 1)) - return; - - _tcscpy(g_wallpapers[g_wallpaperCount], filename); - - SHGetFileInfo(filename, - 0, - &sfi, - sizeof(sfi), - SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); - - ZeroMemory(&listItem, sizeof(LV_ITEM)); - listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.pszText = sfi.szDisplayName; - listItem.state = 0; - listItem.iItem = g_listViewItemCount++; - listItem.iImage = sfi.iIcon; - listItem.lParam = g_wallpaperCount; - - ListView_InsertItem(g_hWallpaperList, &listItem); - - g_wallpaperCount++; - } + if(CheckListBoxFilename(g_hBackgroundList, filename) == TRUE) + return; + + SHFILEINFO sfi; + LV_ITEM listItem; + + if(g_listViewItemCount > (MAX_BACKGROUNDS - 1)) + return; + + SHGetFileInfo(filename, + 0, + &sfi, + sizeof(sfi), + SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); + + backgroundItem = &g_backgroundItems[g_listViewItemCount]; + + backgroundItem->bWallpaper = TRUE; + + _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + _tcscpy(backgroundItem->szFilename, filename); + + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + listItem.state = 0; + listItem.pszText = backgroundItem->szDisplayName; + listItem.iImage = sfi.iIcon; + listItem.iItem = g_listViewItemCount; + listItem.lParam = g_listViewItemCount; + + ListView_InsertItem(g_hBackgroundList, &listItem); + + g_listViewItemCount++; } } void ListViewItemChanged(int itemIndex) -{ +{ + BackgroundItem *backgroundItem = NULL; + + g_backgroundSelection = itemIndex; + backgroundItem = &g_backgroundItems[g_backgroundSelection]; + if(g_pWallpaperBitmap != NULL) { DibFreeImage(g_pWallpaperBitmap); g_pWallpaperBitmap = NULL; } - - LV_ITEM listItem; - listItem.iItem = itemIndex; - listItem.mask = LVIF_PARAM; - ListView_GetItem(g_hWallpaperList, &listItem); - - if(listItem.lParam == -1) - { - g_wallpaperSelection = -1; - InvalidateRect(g_hWallpaperPreview, NULL, TRUE); - } - else - { - g_wallpaperSelection = listItem.lParam; + if(backgroundItem->bWallpaper == TRUE) + { + g_pWallpaperBitmap = DibLoadImage(backgroundItem->szFilename); - g_pWallpaperBitmap = DibLoadImage(g_wallpapers[g_wallpaperSelection]); - if(g_pWallpaperBitmap == NULL) { + return; } - - InvalidateRect(g_hWallpaperPreview, NULL, TRUE); } - EnableWindow(g_hPlacementCombo, (listItem.lParam != -1 ? TRUE : FALSE)); + InvalidateRect(g_hBackgroundPreview, NULL, TRUE); - PropSheet_Changed(GetParent(g_hBackgroundTab), g_hBackgroundTab); + EnableWindow(g_hColorButton, (backgroundItem->bWallpaper == FALSE ? TRUE : FALSE)); + EnableWindow(g_hPlacementCombo, backgroundItem->bWallpaper); + + PropSheet_Changed(GetParent(g_hBackgroundPage), g_hBackgroundPage); } -void DrawWallpaperPreview(LPDRAWITEMSTRUCT draw) +void DrawBackgroundPreview(LPDRAWITEMSTRUCT draw) { - if(g_wallpaperSelection == -1) + if(g_backgroundItems[g_backgroundSelection].bWallpaper == FALSE) { FillRect(draw->hDC, &draw->rcItem, GetSysColorBrush(COLOR_BACKGROUND)); return; @@ -471,17 +493,17 @@ RegCloseKey(regKey); - if(g_wallpaperSelection == -1) - { - SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, TEXT(""), SPIF_UPDATEINIFILE); - } - else - { + if(g_backgroundItems[g_backgroundSelection].bWallpaper == TRUE) + { SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, - g_wallpapers[g_wallpaperSelection], + g_backgroundItems[g_backgroundSelection].szFilename, SPIF_UPDATEINIFILE); } + else + { + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, TEXT(""), SPIF_UPDATEINIFILE); + } } INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg, @@ -489,7 +511,7 @@ WPARAM wParam, LPARAM lParam) { - g_hBackgroundTab = hwndDlg; + g_hBackgroundPage = hwndDlg; switch(uMsg) { @@ -505,16 +527,18 @@ switch(controlId) { - case IDC_PATTERN: + case IDC_COLOR_BUTTON: { if(command == BN_CLICKED) - OnPatternButton(); + OnColorButton(); + } break; - case IDC_BROWSE: + case IDC_BROWSE_BUTTON: { if(command == BN_CLICKED) OnBrowseButton(); + } break; case IDC_PLACEMENT_COMBO: @@ -523,9 +547,9 @@ { g_placementSelection = SendMessage(g_hPlacementCombo, CB_GETCURSEL, 0, 0); - InvalidateRect(g_hWallpaperPreview, NULL, TRUE); + InvalidateRect(g_hBackgroundPreview, NULL, TRUE); - PropSheet_Changed(GetParent(g_hBackgroundTab), g_hBackgroundTab); + PropSheet_Changed(GetParent(g_hBackgroundPage), g_hBackgroundPage); } } break; @@ -537,9 +561,9 @@ LPDRAWITEMSTRUCT drawItem; drawItem = (LPDRAWITEMSTRUCT)lParam; - if(drawItem->CtlID == IDC_WALLPAPER_PREVIEW) + if(drawItem->CtlID == IDC_BACKGROUND_PREVIEW) { - DrawWallpaperPreview(drawItem); + DrawBackgroundPreview(drawItem); } } break; @@ -553,16 +577,6 @@ case PSN_APPLY: { SetWallpaper(); - - /* Update the current wallapaper list item to the - * currently selected wallpaper */ - LV_ITEM listItem; - listItem.mask = LVIF_PARAM; - listItem.iSubItem = 0; - listItem.iItem = g_currentWallpaperItemId; - listItem.lParam = g_wallpaperSelection; - - ListView_SetItem(g_hWallpaperList, &listItem); return TRUE; } break; _____ Modified: trunk/reactos/lib/cpl/desk/en.rc --- trunk/reactos/lib/cpl/desk/en.rc 2005-02-05 22:48:07 UTC (rev 13428) +++ trunk/reactos/lib/cpl/desk/en.rc 2005-02-06 00:01:21 UTC (rev 13429) @@ -5,15 +5,15 @@ CAPTION "Background" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_WALLPAPER_PREVIEW,"Static",SS_OWNERDRAW,48,10, + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, 150,105,WS_EX_STATICEDGE - CONTROL "",IDC_WALLPAPER_LIST,"SysListView32",LVS_REPORT | + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,7,139,173,71 LTEXT "Select an image to use as your desktop wallpaper:", IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Browse...",IDC_BROWSE,187,175,50,14 - PUSHBUTTON "&Pattern...",IDC_PATTERN,187,195,50,14 + PUSHBUTTON "&Browse...",IDC_BROWSE_BUTTON,187,175,50,14 + PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,195,50,14 LTEXT "Placement:",IDC_STATIC,187,138,36,8 COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP _____ Modified: trunk/reactos/lib/cpl/desk/resource.h --- trunk/reactos/lib/cpl/desk/resource.h 2005-02-05 22:48:07 UTC (rev 13428) +++ trunk/reactos/lib/cpl/desk/resource.h 2005-02-06 00:01:21 UTC (rev 13429) @@ -14,17 +14,20 @@ /* ids */ #define IDC_DESK_ICON 1 +#define IDC_STATIC -1 + #define IDD_BACKGROUND 100 #define IDD_SCREENSAVER 101 #define IDD_APPEARANCE 102 #define IDD_SETTINGS 103 -#define IDC_WALLPAPER_LIST 1000 -#define IDC_BROWSE 1001 -#define IDC_PATTERN 1002 -#define IDC_PLACEMENT_COMBO 1003 -#define IDC_WALLPAPER_PREVIEW 1004 -#define IDC_STATIC -1 +/* Background Page */ +#define IDC_BACKGROUND_LIST 1000 +#define IDC_BACKGROUND_PREVIEW 1001 +#define IDC_BROWSE_BUTTON 1002 +#define IDC_COLOR_BUTTON 1003 +#define IDC_PLACEMENT_COMBO 1004 + #define IDS_CPLNAME 2000 #define IDS_CPLDESCRIPTION 2001

19 years, 10 months

[chorns] 13428: Build smss and system applications

by chorns＠svn.reactos.com

Build smss and system applications Modified: branches/xmlbuildsystem/reactos/lib/uuid/uuid.c Modified: branches/xmlbuildsystem/reactos/subsys/directory.xml Added: branches/xmlbuildsystem/reactos/subsys/smss/smss.xml Added: branches/xmlbuildsystem/reactos/subsys/system/autochk/autochk.xml Added: branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml Added: branches/xmlbuildsystem/reactos/subsys/system/cmd/cmd.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml Added: branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml Added: branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notify hook.xml Added: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml Added: branches/xmlbuildsystem/reactos/subsys/system/notepad/notepad.xml Added: branches/xmlbuildsystem/reactos/subsys/system/regedit/regedit.xml Added: branches/xmlbuildsystem/reactos/subsys/system/regedt32/regedt32.xml Added: branches/xmlbuildsystem/reactos/subsys/system/regsvr32/regsvr32.xml Added: branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.xm l Added: branches/xmlbuildsystem/reactos/subsys/system/services/services.xml Added: branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml Added: branches/xmlbuildsystem/reactos/subsys/system/taskmgr/taskmgr.xml Added: branches/xmlbuildsystem/reactos/subsys/system/userinit/userinit.xml Added: branches/xmlbuildsystem/reactos/subsys/system/vmwinst/vmwinst.xml Added: branches/xmlbuildsystem/reactos/subsys/system/winefile/winefile.xml Added: branches/xmlbuildsystem/reactos/subsys/system/winlogon/winlogon.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/lib/uuid/uuid.c --- branches/xmlbuildsystem/reactos/lib/uuid/uuid.c 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/lib/uuid/uuid.c 2005-02-05 22:48:07 UTC (rev 13428) @@ -85,3 +85,7 @@ DEFINE_GUID(CLSID_StdFont,0x0be35203,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0 x00,0x4b,0xb8,0x51); DEFINE_GUID(CLSID_StdPicture,0x0be35204,0x8f91,0x11ce,0x9d,0xe3,0x00,0xa a,0x00,0x4b,0xb8,0x51); + +DEFINE_GUID(IID_IWebBrowser2,0xd30c1661,0xcdaf,0x11d0,0x8a,0x3e,0x0,0xc 0,0x4f,0xc9,0xe2,0x6e); +DEFINE_GUID(DIID_DWebBrowserEvents2,0x34a715a0,0x6587,0x11d0,0x92,0x4a, 0x0,0x20,0xaf,0xc7,0xac,0x4d); + _____ Modified: branches/xmlbuildsystem/reactos/subsys/directory.xml --- branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -4,6 +4,9 @@ <directory name="ntvdm"> <xi:include href="ntvdm/ntvdm.xml" /> </directory> +<directory name="smss"> + <xi:include href="smss/smss.xml" /> +</directory> <directory name="system"> <xi:include href="system/directory.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/subsys/smss/smss.xml --- branches/xmlbuildsystem/reactos/subsys/smss/smss.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/smss/smss.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,9 @@ +<module name="smss" type="nativecui"> + <include base="smss">.</include> + <define name="_DISABLE_TIDENTS" /> + <library>ntdll</library> + <file>init.c</file> + <file>smapi.c</file> + <file>smss.c</file> + <file>smss.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/autochk/autochk.xml --- branches/xmlbuildsystem/reactos/subsys/system/autochk/autochk.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/autochk/autochk.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,7 @@ +<module name="autochk" type="nativecui"> + <include base="autochk">.</include> + <define name="_DISABLE_TIDENTS" /> + <library>ntdll</library> + <file>autochk.c</file> + <file>autochk.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml --- branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,13 @@ +<module name="calc" type="win32gui"> + <include base="calc">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comctl32</library> + <file>dialog.c</file> + <file>stats.c</file> + <file>winecalc.c</file> + <file>rsrc.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/cmd/cmd.xml --- branches/xmlbuildsystem/reactos/subsys/system/cmd/cmd.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/cmd/cmd.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,62 @@ +<module name="cmd" type="win32cui"> + <include base="ReactOS">include/wine</include> + <include base="cmd">.</include> + <define name="__USE_W32API" /> + <define name="ANONYMOUSUNIONS" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>alias.c</file> + <file>attrib.c</file> + <file>batch.c</file> + <file>beep.c</file> + <file>call.c</file> + <file>chcp.c</file> + <file>choice.c</file> + <file>cls.c</file> + <file>cmd.c</file> + <file>cmdinput.c</file> + <file>cmdtable.c</file> + <file>color.c</file> + <file>console.c</file> + <file>copy.c</file> + <file>date.c</file> + <file>del.c</file> + <file>delay.c</file> + <file>dir.c</file> + <file>dirstack.c</file> + <file>echo.c</file> + <file>error.c</file> + <file>filecomp.c</file> + <file>for.c</file> + <file>free.c</file> + <file>goto.c</file> + <file>history.c</file> + <file>if.c</file> + <file>internal.c</file> + <file>label.c</file> + <file>locale.c</file> + <file>memory.c</file> + <file>misc.c</file> + <file>move.c</file> + <file>msgbox.c</file> + <file>path.c</file> + <file>pause.c</file> + <file>prompt.c</file> + <file>redir.c</file> + <file>ren.c</file> + <file>screen.c</file> + <file>set.c</file> + <file>shift.c</file> + <file>start.c</file> + <file>strtoclr.c</file> + <file>time.c</file> + <file>timer.c</file> + <file>title.c</file> + <file>type.c</file> + <file>ver.c</file> + <file>verify.c</file> + <file>vol.c</file> + <file>where.c</file> + <file>window.c</file> + <file>cmd.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml --- branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -1,3 +1,54 @@ +<directory name="autochk"> + <xi:include href="autochk/autochk.xml" /> +</directory> +<directory name="calc"> + <xi:include href="calc/calc.xml" /> +</directory> +<directory name="cmd"> + <xi:include href="cmd/cmd.xml" /> +</directory> +<directory name="explorer"> + <xi:include href="explorer/explorer.xml" /> +</directory> +<directory name="format"> + <xi:include href="format/format.xml" /> +</directory> +<directory name="notepad"> + <xi:include href="notepad/notepad.xml" /> +</directory> +<directory name="regedit"> + <xi:include href="regedit/regedit.xml" /> +</directory> +<directory name="regedt32"> + <xi:include href="regedt32/regedt32.xml" /> +</directory> +<directory name="regsvr32"> + <xi:include href="regsvr32/regsvr32.xml" /> +</directory> +<directory name="reporterror"> + <xi:include href="reporterror/reporterror.xml" /> +</directory> +<directory name="services"> + <xi:include href="services/services.xml" /> +</directory> +<directory name="setup"> + <xi:include href="setup/setup.xml" /> +</directory> +<directory name="taskmgr"> + <xi:include href="taskmgr/taskmgr.xml" /> +</directory> +<directory name="userinit"> + <xi:include href="userinit/userinit.xml" /> +</directory> +<directory name="vmwinst"> + <xi:include href="vmwinst/vmwinst.xml" /> +</directory> +<directory name="winefile"> + <xi:include href="winefile/winefile.xml" /> +</directory> +<directory name="winlogon"> + <xi:include href="winlogon/winlogon.xml" /> +</directory> <directory name="welcome"> <xi:include href="welcome/welcome.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml --- branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,66 @@ +<module name="explorer" type="win32gui"> + <linkerflag>-fexceptions</linkerflag> + <include base="explorer">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="WIN32" /> + <define name="_ROS_" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0500</define> + <library>uuid</library> + <library>kernel32</library> + <library>gdi32</library> + <library>ws2_32</library> + <library>msimg32</library> + <library>comctl32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>shell32</library> + <library>expat</library> + <library>notifyhook</library> + <directory name="desktop"> + <file>desktop.cpp</file> + </directory> + <directory name="dialogs"> + <file>searchprogram.cpp</file> + <file>settings.cpp</file> + </directory> + <directory name="shell"> + <file>entries.cpp</file> + <file>fatfs.cpp</file> + <file>filechild.cpp</file> + <file>shellfs.cpp</file> + <file>mainframe.cpp</file> + <file>ntobjfs.cpp</file> + <file>pane.cpp</file> + <file>regfs.cpp</file> + <file>shellbrowser.cpp</file> + <file>startup.c</file> + <file>unixfs.cpp</file> + <file>webchild.cpp</file> + <file>winfs.cpp</file> + </directory> + <directory name="taskbar"> + <file>desktopbar.cpp</file> + <file>favorites.cpp</file> + <file>taskbar.cpp</file> + <file>startmenu.cpp</file> + <file>traynotify.cpp</file> + <file>quicklaunch.cpp</file> + </directory> + <directory name="utility"> + <file>shellclasses.cpp</file> + <file>utility.cpp</file> + <file>window.cpp</file> + <file>dragdropimpl.cpp</file> + <file>shellbrowserimpl.cpp</file> + <file>xmlstorage.cpp</file> + </directory> + <file>explorer.cpp</file> + <file>i386-stub-win32.c</file> + <file>explorer.rc</file> +</module> +<directory name="notifyhook"> + <xi:include href="notifyhook/notifyhook.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notify hook.xml --- branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notify hook.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notify hook.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,10 @@ +<module name="notifyhook" type="win32dll"> + <importlibrary definition="notifyhook.def" /> + <include base="notifyhook">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_NOTIFYHOOK_IMPL" /> + <library>kernel32</library> + <file>notifyhook.c</file> + <file>notifyhook.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml --- branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,6 @@ +<module name="format" type="win32cui"> + <include base="format">.</include> + <library>ntdll</library> + <library>fmifs</library> + <file>format.c</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/notepad/notepad.xml --- branches/xmlbuildsystem/reactos/subsys/system/notepad/notepad.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/notepad/notepad.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,14 @@ +<module name="notepad" type="win32gui"> + <include base="notepad">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comdlg32</library> + <file>License_En.c</file> + <file>dialog.c</file> + <file>license.c</file> + <file>main.c</file> + <file>rsrc.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/regedit/regedit.xml --- branches/xmlbuildsystem/reactos/subsys/system/regedit/regedit.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/regedit/regedit.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,28 @@ +<module name="regedit" type="win32gui"> + <include base="regedit">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>uuid</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>comdlg32</library> + <library>ole32</library> + <library>shell32</library> + <library>comctl32</library> + <library>comdlg32</library> + <file>about.c</file> + <file>childwnd.c</file> + <file>edit.c</file> + <file>framewnd.c</file> + <file>hexedit.c</file> + <file>listview.c</file> + <file>main.c</file> + <file>regedit.c</file> + <file>regproc.c</file> + <file>security.c</file> + <file>treeview.c</file> + <file>rsrc.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/regedt32/regedt32.xml --- branches/xmlbuildsystem/reactos/subsys/system/regedt32/regedt32.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/regedt32/regedt32.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,22 @@ +<module name="regedt32" type="win32gui"> + <include base="regedt32">.</include> + <define name="GCC" /> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>comctl32</library> + <library>comdlg32</library> + <file>framewnd.c</file> + <file>childwnd.c</file> + <file>listview.c</file> + <file>treeview.c</file> + <file>settings.c</file> + <file>main.c</file> + <file>regedt32.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/regsvr32/regsvr32.xml --- branches/xmlbuildsystem/reactos/subsys/system/regsvr32/regsvr32.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/regsvr32/regsvr32.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,10 @@ +<module name="regsvr32" type="win32gui"> + <include base="regsvr32">.</include> + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>ole32</library> + <file>regsvr32.c</file> + <file>regsvr32.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.xm l --- branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.xm l 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.xm l 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,17 @@ +<module name="reporterror" type="win32gui"> + <include base="reporterror">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_WIN32_IE">0x501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>ws2_32</library> + <library>comctl32</library> + <library>comdlg32</library> + <library>shell32</library> + <file>reporterror.c</file> + <file>reporterror.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/services/services.xml --- branches/xmlbuildsystem/reactos/subsys/system/services/services.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/services/services.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,10 @@ +<module name="services" type="win32cui"> + <include base="services">.</include> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <file>services.c</file> + <file>database.c</file> + <file>services.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml --- branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,8 @@ +<module name="setup" type="win32gui"> + <include base="setup">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0400</define> + <library>kernel32</library> + <file>setup.c</file> + <file>setup.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/taskmgr/taskmgr.xml --- branches/xmlbuildsystem/reactos/subsys/system/taskmgr/taskmgr.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/taskmgr/taskmgr.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,31 @@ +<module name="taskmgr" type="win32gui"> + <include base="taskmgr">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comctl32</library> + <file>about.c</file> + <file>affinity.c</file> + <file>applpage.c</file> + <file>column.c</file> + <file>dbgchnl.c</file> + <file>debug.c</file> + <file>endproc.c</file> + <file>font.c</file> + <file>graph.c</file> + <file>optnmenu.c</file> + <file>perfdata.c</file> + <file>perfpage.c</file> + <file>priority.c</file> + <file>procpage.c</file> + <file>proclist.c</file> + <file>run.c</file> + <file>trayicon.c</file> + <file>taskmgr.c</file> + <file>graphctl.c</file> + <file>taskmgr.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/userinit/userinit.xml --- branches/xmlbuildsystem/reactos/subsys/system/userinit/userinit.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/userinit/userinit.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,13 @@ +<module name="userinit" type="win32gui"> + <include base="userinit">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <file>userinit.c</file> + <file>userinit.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/vmwinst/vmwinst.xml --- branches/xmlbuildsystem/reactos/subsys/system/vmwinst/vmwinst.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/vmwinst/vmwinst.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,14 @@ +<module name="vmwinst" type="win32gui"> + <include base="vmwinst">.</include> + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>advapi32</library> + <library>comctl32</library> + <library>comdlg32</library> + <library>shell32</library> + <file>vmwinst.c</file> + <file>vmwinst.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/winefile/winefile.xml --- branches/xmlbuildsystem/reactos/subsys/system/winefile/winefile.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/winefile/winefile.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,21 @@ +<module name="winefile" type="win32gui"> + <include base="winefile">.</include> + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="_ROS_" /> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <library>comctl32</library> + <library>comdlg32</library> + <library>shell32</library> + <library>ole32</library> + <library>oleaut32</library> + <file>license.c</file> + <file>winefile.c</file> + <file>winefile.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/winlogon/winlogon.xml --- branches/xmlbuildsystem/reactos/subsys/system/winlogon/winlogon.xml 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/subsys/system/winlogon/winlogon.xml 2005-02-05 22:48:07 UTC (rev 13428) @@ -0,0 +1,17 @@ +<module name="winlogon" type="win32cui"> + <include base="winlogon">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>userenv</library> + <library>secur32</library> + <file>sas.c</file> + <file>setup.c</file> + <file>winlogon.c</file> + <file>wlx.c</file> + <file>winlogon.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-05 22:48:07 UTC (rev 13428) @@ -724,7 +724,9 @@ cflagsMacro ); return; } - else if ( extension == ".cc" || extension == ".CC" || extension == ".cxx" || extension == ".CXX" ) + else if ( extension == ".cc" || extension == ".CC" || + extension == ".cpp" || extension == ".CPP" || + extension == ".cxx" || extension == ".CXX" ) { GenerateGccCommand ( module, sourceFilename, @@ -1259,7 +1261,17 @@ return dependencies; } +bool +MingwModuleHandler::IsCPlusPlusModule ( const Module& module ) const +{ + if ( module.HasFileWithExtensions ( ".cxx", ".CXX" ) ) + return true; + if ( module.HasFileWithExtensions ( ".cpp", ".CPP" ) ) + return true; + return false; +} + static MingwBuildToolModuleHandler buildtool_handler; MingwBuildToolModuleHandler::MingwBuildToolModuleHandler() @@ -1285,7 +1297,7 @@ GenerateMacrosAndTargetsHost ( module ); string linker; - if ( module.HasFileWithExtensions ( ".cxx", ".CXX" ) ) + if ( IsCPlusPlusModule ( module ) ) linker = "${host_gpp}"; else linker = "${host_gcc}"; @@ -1698,7 +1710,7 @@ linkingDependencies.c_str () ); string linker; - if ( module.HasFileWithExtensions ( ".cc", ".CC" ) || module.HasFileWithExtensions ( ".cxx", ".CXX" ) ) + if ( IsCPlusPlusModule ( module ) ) linker = "${gpp}"; else linker = "${gcc}"; @@ -1807,10 +1819,16 @@ objectFilenames.c_str (), importLibraryDependencies.c_str () ); + string linker; + if ( IsCPlusPlusModule ( module ) ) + linker = "${gpp}"; + else + linker = "${gcc}"; + string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", module.entrypoint.c_str () ); GenerateLinkerCommand ( module, - "${gcc}", + linker, linkerParameters, objectFilenames ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-02-05 21:04:17 UTC (rev 13427) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-02-05 22:48:07 UTC (rev 13428) @@ -62,6 +62,7 @@ void GenerateImportLibraryTargetIfNeeded ( const Module& module ) const; std::string GetDefinitionDependencies ( const Module& module ) const; std::string GetLinkingDependencies ( const Module& module ) const; + bool IsCPlusPlusModule ( const Module& module ) const; static FILE* fMakefile; static std::set<std::string> directory_set; private:

19 years, 10 months

[ion] 13427: Prevent buffer overflow on SMP systems. The buffer may be filled with 'Unknown CPU with family ID %ld and model ID %ld. Patch by Herve Poussineau.

by ion＠svn.reactos.com

Prevent buffer overflow on SMP systems. The buffer may be filled with 'Unknown CPU with family ID %ld and model ID %ld. Patch by Herve Poussineau. Modified: trunk/reactos/hal/halx86/mp/processor_mp.c _____ Modified: trunk/reactos/hal/halx86/mp/processor_mp.c --- trunk/reactos/hal/halx86/mp/processor_mp.c 2005-02-05 19:16:14 UTC (rev 13426) +++ trunk/reactos/hal/halx86/mp/processor_mp.c 2005-02-05 21:04:17 UTC (rev 13427) @@ -1220,7 +1220,7 @@ PCHAR HaliMPFamily(ULONG Family, ULONG Model) { - static CHAR str[32]; + static CHAR str[64]; static PCHAR CPUs[] = { "80486DX", "80486DX",

19 years, 10 months

[chorns] 13426: * Build ntvdm

by chorns＠svn.reactos.com

* Build ntvdm * Add win32cui module type support Modified: branches/xmlbuildsystem/reactos/subsys/directory.xml Added: branches/xmlbuildsystem/reactos/subsys/ntvdm/ntvdm.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/subsys/directory.xml --- branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-02-05 18:59:14 UTC (rev 13425) +++ branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-02-05 19:16:14 UTC (rev 13426) @@ -1,6 +1,9 @@ <directory name="csrss"> <xi:include href="csrss/csrss.xml" /> </directory> +<directory name="ntvdm"> + <xi:include href="ntvdm/ntvdm.xml" /> +</directory> <directory name="system"> <xi:include href="system/directory.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/subsys/ntvdm/ntvdm.xml --- branches/xmlbuildsystem/reactos/subsys/ntvdm/ntvdm.xml 2005-02-05 18:59:14 UTC (rev 13425) +++ branches/xmlbuildsystem/reactos/subsys/ntvdm/ntvdm.xml 2005-02-05 19:16:14 UTC (rev 13426) @@ -0,0 +1,12 @@ +<module name="ntvdm" type="win32cui"> + <include base="ntvdm">.</include> + <define name="__USE_W32API" /> + <define name="_DISABLE_TIDENTS" /> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <file>ntvdm.c</file> + <file>ntvdm.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-05 18:59:14 UTC (rev 13425) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-05 19:16:14 UTC (rev 13426) @@ -1720,6 +1720,58 @@ } +static MingwWin32CUIModuleHandler win32cui_handler; + +MingwWin32CUIModuleHandler::MingwWin32CUIModuleHandler () + : MingwModuleHandler ( Win32CUI ) +{ +} + +void +MingwWin32CUIModuleHandler::Process ( const Module& module ) +{ + GeneratePreconditionDependencies ( module ); + GenerateWin32CUIModuleTarget ( module ); + GenerateInvocations ( module ); +} + +void +MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ( const Module& module ) +{ + static string ros_junk ( "$(ROS_TEMPORARY)" ); + string target ( FixupTargetFilename ( module.GetPath () ) ); + string workingDirectory = GetWorkingDirectory ( ); + string objectFilenames = GetObjectFilenames ( module ); + string importLibraryDependencies = GetImportLibraryDependencies ( module ); + + GenerateImportLibraryTargetIfNeeded ( module ); + + if ( module.files.size () > 0 ) + { + GenerateMacrosAndTargetsTarget ( module ); + + fprintf ( fMakefile, "%s: %s %s\n", + target.c_str (), + objectFilenames.c_str (), + importLibraryDependencies.c_str () ); + + string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", + module.entrypoint.c_str () ); + GenerateLinkerCommand ( module, + "${gcc}", + linkerParameters, + objectFilenames ); + } + else + { + fprintf ( fMakefile, ".PHONY: %s\n\n", + target.c_str ()); + fprintf ( fMakefile, "%s:\n\n", + target.c_str ()); + } +} + + static MingwWin32GUIModuleHandler win32gui_handler; MingwWin32GUIModuleHandler::MingwWin32GUIModuleHandler () _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-02-05 18:59:14 UTC (rev 13425) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-02-05 19:16:14 UTC (rev 13426) @@ -243,6 +243,16 @@ }; +class MingwWin32CUIModuleHandler : public MingwModuleHandler +{ +public: + MingwWin32CUIModuleHandler (); + virtual void Process ( const Module& module ); +private: + void GenerateWin32CUIModuleTarget ( const Module& module ); +}; + + class MingwWin32GUIModuleHandler : public MingwModuleHandler { public: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-02-05 18:59:14 UTC (rev 13425) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-02-05 19:16:14 UTC (rev 13426) @@ -275,6 +275,8 @@ return NativeCUI; if ( attribute.value == "win32dll" ) return Win32DLL; + if ( attribute.value == "win32cui" ) + return Win32CUI; if ( attribute.value == "win32gui" ) return Win32GUI; if ( attribute.value == "bootloader" ) @@ -301,6 +303,7 @@ return ".o"; case Kernel: case NativeCUI: + case Win32CUI: case Win32GUI: return ".exe"; case KernelModeDLL: @@ -326,8 +329,6 @@ { case Kernel: return "_NtProcessStartup"; - case Win32GUI: - return "_WinMainCRTStartup"; case KernelModeDLL: return "_DriverEntry@8"; case NativeDLL: @@ -336,6 +337,10 @@ return "_NtProcessStartup@4"; case Win32DLL: return "_DllMain@12"; + case Win32CUI: + return "_mainCRTStartup"; + case Win32GUI: + return "_WinMainCRTStartup"; case KernelModeDriver: return "_DriverEntry@8"; case BuildTool: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-05 18:59:14 UTC (rev 13425) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-05 19:16:14 UTC (rev 13426) @@ -93,6 +93,7 @@ NativeDLL, NativeCUI, Win32DLL, + Win32CUI, Win32GUI, BootLoader, BootSector,

19 years, 10 months

← Newer
1
...
33
34
35
36
37
38
39
...
42
Older →

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 February 2005