Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[hyperion] 36760: Give .gch files an unique path based on module name: allows multiple modules to (safely!) share a single precompiled header. Enjoy rebuilding the whole tree <3 This commit dedicated to hpoussin See issue #3263 for more details.

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 15 08:46:23 2008 New Revision: 36760 URL: http://svn.reactos.org/svn/reactos?rev=36760&view=rev Log: Give .gch files an unique path based on module name: allows multiple modules to (safely!) share a single precompiled header. Enjoy rebuilding the whole tree <3 This commit dedicated to hpoussin See issue #3263 for more details. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Wed Oct 15 08:46:23 2008 @@ -1018,7 +1018,7 @@ if ( !module.pch || !use_pch ) return NULL; return new FileLocation ( IntermediateDirectory, - module.pch->file->relative_path, + module.pch->file->relative_path + "/.gch_" + module.name, module.pch->file->name + ".gch" ); } @@ -2081,14 +2081,14 @@ if ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ) return; - if (module.name != "psdk" && + if (module.name != "psdk" && module.name != "dxsdk") { dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" ); dependencies.push_back ( "$(DXSDK_TARGET) $(dxsdk_HEADERS)" ); } - if (module.name != "errcodes" && + if (module.name != "errcodes" && module.name != "bugcodes" && module.name != "ntstatus") { @@ -3139,9 +3139,9 @@ vSourceFiles.push_back ( reactosDff ); - /* + /* We use only the name and not full FileLocation(ouput) because Iso/LiveIso are an exception to the general rule. - Iso/LiveIso outputs are generated in code base root + Iso/LiveIso outputs are generated in code base root */ string IsoName = module.output->name; @@ -3320,9 +3320,9 @@ const FileLocation *isoboot = bootModule->output; - /* + /* We use only the name and not full FileLocation(ouput) because Iso/LiveIso are an exception to the general rule. - Iso/LiveIso outputs are generated in code base root + Iso/LiveIso outputs are generated in code base root */ IsoName = module.output->name; @@ -3435,7 +3435,7 @@ string targetMacro ( GetTargetMacro (module) ); GenerateRules (); - + const FileLocation *target_file = GetTargetFilename ( module, NULL ); fprintf ( fMakefile, "%s: $(CABMAN_TARGET) | %s\n", targetMacro.c_str (),

16 years, 2 months

[dreimer] 36759: Bug 3791: Translate norwegian update by Lars Martin Hambro

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Oct 15 03:37:47 2008 New Revision: 36759 URL: http://svn.reactos.org/svn/reactos?rev=36759&view=rev Log: Bug 3791: Translate norwegian update by Lars Martin Hambro Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] Wed Oct 15 03:37:47 2008 @@ -110,29 +110,29 @@ IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE 0, 0, 200, 70 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Address" +CAPTION "TCP/IP adresse" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "IP address:", -1, 5, 15, 70, 12 - LTEXT "Subnet mask:", -1, 5, 30, 70, 12 + LTEXT "IP adresse:", -1, 5, 15, 70, 12 + LTEXT "Subnet maske:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Gateway Address" +CAPTION "TCP/IP Gateway Adresse" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 LTEXT "Gateway:", -1, 5, 15, 70, 12 - CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + CHECKBOX "Automatisk metrisk", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&Metrisk:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 @@ -143,18 +143,18 @@ CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Domain Suffix" +CAPTION "TCP/IP Domene suffiks" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP - LTEXT "Domain suffix:", -1, 5, 10, 120, 12 + LTEXT "Domene suffiks:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 @@ -162,68 +162,68 @@ CAPTION "TCP/IP Filtering" FONT 8, "MS Shell Dlg" BEGIN - CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Aktiver TCP/IP-Filtering (Alle kortene)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "", -1, 5, 30, 90, 150 - CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 - CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 + CONTROL "Godta alle", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 + CONTROL "Godta bare", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 - PUSHBUTTON "Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Legg til", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Fjern", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 105, 30, 90, 150 - CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 - CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 + CONTROL "Godta alle", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 + CONTROL "Godta bare", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 - PUSHBUTTON "Add", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Legg til", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Fjern", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 205, 30, 90, 150 - CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 - CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 + CONTROL "Godta alle", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 + CONTROL "Godta bare", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 - PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Legg til", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Fjern", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE 0, 0, 200, 60 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Add Filter" +CAPTION "Legg til filter" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END STRINGTABLE BEGIN IDS_NET_CONNECT "Nettverk tilkobling" - IDS_NO_IPADDR_SET "The adapter requires at least one IP address. Please enter one." - IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." - IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer." + IDS_NO_IPADDR_SET "Kortet trenger minst en IP adresse. Vennligst skriv inn en IP adresse." + IDS_NO_SUBMASK_SET "Du har skrevet en adresse som mangler subnet maske. Vennligst skriv inn et subnet maske." + IDS_TCPFILTERDESC "TCP/IP filtering lar deg kontrollere typen av TCP/IP nettverk trafikk som strekker seg til din datamaskin." IDS_TCPFILTER "TCP/IP Filtering" - IDS_IPADDR "IP address" - IDS_SUBMASK "Subnet mask" + IDS_IPADDR "IP adresse" + IDS_SUBMASK "Subnet maske" IDS_GATEWAY "Gateway" - IDS_METRIC "Metric" - IDS_DHCPACTIVE "DHCP Enabled" - IDS_AUTOMATIC "Automatic" - IDS_NOITEMSEL "You have not selected an item. Select one first." + IDS_METRIC "Metrisk" + IDS_DHCPACTIVE "DHCP aktivert" + IDS_AUTOMATIC "Automatisk" + IDS_NOITEMSEL "Du har ikke valg en enhet. Velg en enhet først." IDS_TCPIP "ReactOS-TCP/IP" - IDS_ADD "Add" + IDS_ADD "Legg til" IDS_MOD "OK" - IDS_TCP_PORTS "TCP Ports" - IDS_UDP_PORTS "UDP Ports" - IDS_IP_PROTO "IP protocols" - IDS_PORT_RANGE "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range." - IDS_PROT_RANGE "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range." - IDS_DUP_NUMBER "The number you are trying to add is already in the list. Please enter a different number." - IDS_DISABLE_FILTER "Disabling this global TCP/IP setting will affect all adapters." - IDS_NO_SUFFIX "The current setting of search method requires at least one DNS suffix. Please enter one or change the setting." - IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." - IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." - IDS_DUP_SUFFIX "The DNS suffix is already on the list." - IDS_DUP_IPADDR "The IP address is already on the list." - IDS_DUP_GW "The default gateway is already on the list." -END + IDS_TCP_PORTS "TCP porter" + IDS_UDP_PORTS "UDP porter" + IDS_IP_PROTO "IP protokoller" + IDS_PORT_RANGE "Port nummere må være større enn 0 og mindre enn 65536. Vennligst skriv inn et nummer innenfor dette området." + IDS_PROT_RANGE "Protokoll nummeret må være større enn 0 og mindre enn 256. Vennligst skriv inn et nummer innenfor dette området." + IDS_DUP_NUMBER "Nummeret som du prøver å legge til er allerede i listen. Vennligst skriv inn et annet nummer." + IDS_DISABLE_FILTER "Deaktivere denne global TCP/IP innstillingen vil påvirke alle kortene." + IDS_NO_SUFFIX "Nåværende innstilling av søke metoden trenger minst et DNS suffiks. Vennligst skriv inn et eller endre innstillingene." + IDS_DOMAIN_SUFFIX "Domene suffiks er ikke et gyldig suffiks." + IDS_DNS_SUFFIX "DNS domene navn ""%s"" er ikke et gyldig DNS navn." + IDS_DUP_SUFFIX "DNS suffiks er allerede på listen." + IDS_DUP_IPADDR "IP adresse er allerede på listen." + IDS_DUP_GW "Standard gateway er allerede på listen." +END

16 years, 2 months

[khornicek] 36758: update to Mesa3D 7.2

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Oct 15 03:31:54 2008 New Revision: 36758 URL: http://svn.reactos.org/svn/reactos?rev=36758&view=rev Log: update to Mesa3D 7.2 Added: trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/dri_sarea.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_uniform.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_uniform.h (with props) Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/gl.h trunk/reactos/dll/3rdparty/mesa32/include/GL/glext.h trunk/reactos/dll/3rdparty/mesa32/include/GL/glu.h trunk/reactos/dll/3rdparty/mesa32/include/GL/glxext.h trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/dri_interface.h trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/glcore.h trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h trunk/reactos/dll/3rdparty/mesa32/include/GL/wmesa.h trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa.h trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa_x.h trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa_xf86.h trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild trunk/reactos/dll/3rdparty/mesa32/src/Makefile trunk/reactos/dll/3rdparty/mesa32/src/Makefile.mgw trunk/reactos/dll/3rdparty/mesa32/src/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/drivers/common/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/drivers/common/driverfuncs.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/common/driverfuncs.h trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/mesa.def trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wmesa.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def trunk/reactos/dll/3rdparty/mesa32/src/glapi/dispatch.h trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapi.c trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapioffsets.h trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapitable.h trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapitemp.h trunk/reactos/dll/3rdparty/mesa32/src/glapi/glprocs.h trunk/reactos/dll/3rdparty/mesa32/src/glapi/glthread.c trunk/reactos/dll/3rdparty/mesa32/src/glapi/glthread.h trunk/reactos/dll/3rdparty/mesa32/src/main/api_arrayelt.c trunk/reactos/dll/3rdparty/mesa32/src/main/api_loopback.c trunk/reactos/dll/3rdparty/mesa32/src/main/api_noop.c trunk/reactos/dll/3rdparty/mesa32/src/main/api_validate.c trunk/reactos/dll/3rdparty/mesa32/src/main/arrayobj.c trunk/reactos/dll/3rdparty/mesa32/src/main/attrib.c trunk/reactos/dll/3rdparty/mesa32/src/main/attrib.h trunk/reactos/dll/3rdparty/mesa32/src/main/bufferobj.c trunk/reactos/dll/3rdparty/mesa32/src/main/bufferobj.h trunk/reactos/dll/3rdparty/mesa32/src/main/buffers.c trunk/reactos/dll/3rdparty/mesa32/src/main/buffers.h trunk/reactos/dll/3rdparty/mesa32/src/main/colortab.c trunk/reactos/dll/3rdparty/mesa32/src/main/config.h trunk/reactos/dll/3rdparty/mesa32/src/main/context.c trunk/reactos/dll/3rdparty/mesa32/src/main/context.h trunk/reactos/dll/3rdparty/mesa32/src/main/dd.h trunk/reactos/dll/3rdparty/mesa32/src/main/depth.c trunk/reactos/dll/3rdparty/mesa32/src/main/depthstencil.c trunk/reactos/dll/3rdparty/mesa32/src/main/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/main/dlist.c trunk/reactos/dll/3rdparty/mesa32/src/main/drawpix.c trunk/reactos/dll/3rdparty/mesa32/src/main/enable.c trunk/reactos/dll/3rdparty/mesa32/src/main/enums.c trunk/reactos/dll/3rdparty/mesa32/src/main/execmem.c trunk/reactos/dll/3rdparty/mesa32/src/main/extensions.c trunk/reactos/dll/3rdparty/mesa32/src/main/fbobject.c trunk/reactos/dll/3rdparty/mesa32/src/main/fbobject.h trunk/reactos/dll/3rdparty/mesa32/src/main/framebuffer.c trunk/reactos/dll/3rdparty/mesa32/src/main/get.c trunk/reactos/dll/3rdparty/mesa32/src/main/getstring.c trunk/reactos/dll/3rdparty/mesa32/src/main/glheader.h trunk/reactos/dll/3rdparty/mesa32/src/main/hash.c trunk/reactos/dll/3rdparty/mesa32/src/main/image.c trunk/reactos/dll/3rdparty/mesa32/src/main/image.h trunk/reactos/dll/3rdparty/mesa32/src/main/imports.c trunk/reactos/dll/3rdparty/mesa32/src/main/imports.h trunk/reactos/dll/3rdparty/mesa32/src/main/light.c trunk/reactos/dll/3rdparty/mesa32/src/main/lines.c trunk/reactos/dll/3rdparty/mesa32/src/main/mipmap.c trunk/reactos/dll/3rdparty/mesa32/src/main/mipmap.h trunk/reactos/dll/3rdparty/mesa32/src/main/mm.c trunk/reactos/dll/3rdparty/mesa32/src/main/mm.h trunk/reactos/dll/3rdparty/mesa32/src/main/mtypes.h trunk/reactos/dll/3rdparty/mesa32/src/main/points.c trunk/reactos/dll/3rdparty/mesa32/src/main/shaders.c trunk/reactos/dll/3rdparty/mesa32/src/main/state.c trunk/reactos/dll/3rdparty/mesa32/src/main/stencil.c trunk/reactos/dll/3rdparty/mesa32/src/main/texcompress_fxt1.c trunk/reactos/dll/3rdparty/mesa32/src/main/texcompress_s3tc.c trunk/reactos/dll/3rdparty/mesa32/src/main/texenvprogram.c trunk/reactos/dll/3rdparty/mesa32/src/main/texformat.c trunk/reactos/dll/3rdparty/mesa32/src/main/texformat.h trunk/reactos/dll/3rdparty/mesa32/src/main/texformat_tmp.h trunk/reactos/dll/3rdparty/mesa32/src/main/teximage.c trunk/reactos/dll/3rdparty/mesa32/src/main/teximage.h trunk/reactos/dll/3rdparty/mesa32/src/main/texobj.c trunk/reactos/dll/3rdparty/mesa32/src/main/texobj.h trunk/reactos/dll/3rdparty/mesa32/src/main/texrender.c trunk/reactos/dll/3rdparty/mesa32/src/main/texstate.c trunk/reactos/dll/3rdparty/mesa32/src/main/texstate.h trunk/reactos/dll/3rdparty/mesa32/src/main/texstore.c trunk/reactos/dll/3rdparty/mesa32/src/main/texstore.h trunk/reactos/dll/3rdparty/mesa32/src/main/varray.c trunk/reactos/dll/3rdparty/mesa32/src/main/varray.h trunk/reactos/dll/3rdparty/mesa32/src/main/version.h trunk/reactos/dll/3rdparty/mesa32/src/main/vtxfmt_tmp.h trunk/reactos/dll/3rdparty/mesa32/src/math/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_util.h trunk/reactos/dll/3rdparty/mesa32/src/math/m_eval.c trunk/reactos/dll/3rdparty/mesa32/src/math/m_eval.h trunk/reactos/dll/3rdparty/mesa32/src/math/m_translate.h trunk/reactos/dll/3rdparty/mesa32/src/math/m_xform.c trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogparse.c trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogram.c trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogram.h trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogram_syn.h trunk/reactos/dll/3rdparty/mesa32/src/shader/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/shader/nvprogram.c trunk/reactos/dll/3rdparty/mesa32/src/shader/nvprogram.h trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_execute.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_execute.h trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_instruction.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_instruction.h trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_parameter.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_parameter.h trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_print.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_statevars.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_statevars.h trunk/reactos/dll/3rdparty/mesa32/src/shader/program.c trunk/reactos/dll/3rdparty/mesa32/src/shader/program.h trunk/reactos/dll/3rdparty/mesa32/src/shader/programopt.c trunk/reactos/dll/3rdparty/mesa32/src/shader/programopt.h trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_api.c trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_api.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/Makefile trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_120_core.gc trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_120_core_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_builtin_120_common_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_builtin_120_fragment_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_common_builtin.gc trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_common_builtin_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_core.gc trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_core_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_fragment_builtin_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_pp_version.syn trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_pp_version_syn.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_shader.syn trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_shader_syn.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_vertex_builtin_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_builtin.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_builtin.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_codegen.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_codegen.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_function.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_operation.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_operation.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_struct.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_struct.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_variable.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_variable.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_emit.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_emit.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_ir.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_ir.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_label.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_library_noise.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_link.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_link.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_log.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_mem.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_mem.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_preprocess.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_print.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_simplify.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_simplify.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_storage.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_typeinfo.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_typeinfo.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_utility.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_vartable.c trunk/reactos/dll/3rdparty/mesa32/src/sources trunk/reactos/dll/3rdparty/mesa32/src/sparc/glapi_sparc.S trunk/reactos/dll/3rdparty/mesa32/src/swrast/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aaline.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aalinetemp.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aatriangle.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aatritemp.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_accum.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_alpha.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_atifragshader.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_bitmap.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_blend.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_blit.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_buffers.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_context.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_context.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_copypix.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_drawpix.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_feedback.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_fog.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_fragprog.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_lines.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_linetemp.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_logic.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_masking.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_points.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_readpix.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_span.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_span.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_stencil.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texcombine.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texfilter.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texstore.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_triangle.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_tritemp.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_zoom.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/swrast.h trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_context.c trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_context.h trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_triangle.c trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_tritmp.h trunk/reactos/dll/3rdparty/mesa32/src/tnl/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_context.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_context.h trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_draw.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_pipeline.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_fog.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_program.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex_sse.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vp_build.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/tnl.h trunk/reactos/dll/3rdparty/mesa32/src/tnl_dd/t_dd_tritmp.h trunk/reactos/dll/3rdparty/mesa32/src/tnl_dd/t_dd_vb.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo.h trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_context.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec.h trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_api.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_array.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_draw.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_eval.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_rebase.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save.h trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save_api.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save_draw.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save_loopback.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_split.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_split_copy.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_split_inplace.c trunk/reactos/dll/3rdparty/mesa32/src/x86-64/Makefile trunk/reactos/dll/3rdparty/mesa32/src/x86-64/glapi_x86-64.S trunk/reactos/dll/3rdparty/mesa32/src/x86-64/xform4.S trunk/reactos/dll/3rdparty/mesa32/src/x86/Makefile trunk/reactos/dll/3rdparty/mesa32/src/x86/assyntax.h trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86.c trunk/reactos/dll/3rdparty/mesa32/src/x86/glapi_x86.S trunk/reactos/dll/3rdparty/mesa32/src/x86/read_rgba_span_x86.S trunk/reactos/dll/3rdparty/mesa32/src/x86/rtasm/x86sse.c trunk/reactos/dll/3rdparty/mesa32/src/x86/rtasm/x86sse.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/glext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/glu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/glxext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/dri_interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Added: trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/dri_sarea.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/glcore.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/wmesa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa_xf86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… Modified: trunk/reactos/dll/3rdparty/mesa32/src/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/Ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/Makefile.mgw URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/Ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/de… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/common/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/common/driverfuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/common/driverfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/mesa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wmesa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapioffsets.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapitable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapitemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glprocs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glthread.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/api_arrayelt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/api_loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/api_noop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/api_validate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/arrayobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/attrib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/bufferobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/bufferobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/buffers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/buffers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/colortab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/dd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/depth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/depthstencil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/dlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/drawpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/enums.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/execmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/fbobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/fbobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/framebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/get.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/getstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/glheader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/image.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/imports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/imports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mipmap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/points.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/shaders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/stencil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texcompress_fxt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texcompress_s3tc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texenvprogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texformat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texformat_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/teximage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/teximage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texstate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texstore.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/varray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/varray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/vtxfmt_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_util.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_eval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_translate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_xform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogram.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogram_syn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/nvprogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/nvprogram.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_execute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_execute.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_instruction.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_instruction.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_parameter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_parameter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_statevars.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_statevars.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Added: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_uniform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Added: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_uniform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/program.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/programopt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/programopt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_120_core.gc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_120_core_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_builtin_120_common_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_builtin_120_fragment_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_common_builtin.gc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_common_builtin_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_core.gc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_core_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_fragment_builtin_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_pp_version.syn URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_pp_version_syn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_shader.syn URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_shader_syn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_vertex_builtin_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_builtin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_codegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_codegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_operation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_operation.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_struct.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_variable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_variable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_emit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_emit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_ir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_ir.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_label.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_library_noise.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_link.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_log.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_mem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_preprocess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_simplify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_simplify.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_typeinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_typeinfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_vartable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/sources URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/so… Modified: trunk/reactos/dll/3rdparty/mesa32/src/sparc/glapi_sparc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sp… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aaline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aalinetemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aatriangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aatritemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_accum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_alpha.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_atifragshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_blend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_blit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_buffers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_copypix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_drawpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_feedback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_fog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_fragprog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_linetemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_logic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_masking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_points.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_readpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_span.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_span.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_stencil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texcombine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_tritemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_zoom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/swrast.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_tritmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_pipeline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_fog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex_sse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vp_build.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/tnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl_dd/t_dd_tritmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl_dd/t_dd_vb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_rebase.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save_loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_split.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_split_copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_split_inplace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86-64/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86-64/glapi_x86-64.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86-64/xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/assyntax.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/glapi_x86.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/read_rgba_span_x86.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/rtasm/x86sse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/rtasm/x86sse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8…

16 years, 2 months

[sserapion] 36757: -Commit WIP. -Used Pipe code from rosdbg. Kudos to gschneider for the great code. -Good bye horrible polling, temporary file deletion and weird live scrolling code!!!

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Oct 15 02:42:35 2008 New Revision: 36757 URL: http://svn.reactos.org/svn/reactos?rev=36757&view=rev Log: -Commit WIP. -Used Pipe code from rosdbg. Kudos to gschneider for the great code. -Good bye horrible polling, temporary file deletion and weird live scrolling code!!! Added: trunk/tools/Qemu GUI/NamedPipe.cs (with props) trunk/tools/Qemu GUI/PipeClient.cs (with props) Modified: trunk/tools/Qemu GUI/AssemblyInfo.cs trunk/tools/Qemu GUI/Data.cs trunk/tools/Qemu GUI/DebugForm.cs trunk/tools/Qemu GUI/ErrorForm.cs trunk/tools/Qemu GUI/MainForm.cs trunk/tools/Qemu GUI/Properties/Resources.Designer.cs trunk/tools/Qemu GUI/Properties/Resources.resx trunk/tools/Qemu GUI/Properties/app.manifest trunk/tools/Qemu GUI/QEmuGUI.csproj trunk/tools/Qemu GUI/Qemu GUI.sln trunk/tools/Qemu GUI/Runner.cs Modified: trunk/tools/Qemu GUI/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/AssemblyInfo.cs?r… ============================================================================== --- trunk/tools/Qemu GUI/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/AssemblyInfo.cs [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -1,5 +1,6 @@ using System.Reflection; using System.Runtime.CompilerServices; +using System.Resources; // // General Information about an assembly is controlled through the following @@ -56,3 +57,4 @@ [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] +[assembly: NeutralResourcesLanguageAttribute("en")] Modified: trunk/tools/Qemu GUI/Data.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Data.cs?rev=36757… ============================================================================== --- trunk/tools/Qemu GUI/Data.cs [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/Data.cs [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -446,8 +446,8 @@ } else if (this.SerialPort.SRedirect) { - /* fix me: use pipes!!!!!! */ - buffer = "-serial file:\"" + this.SerialPort.FileName + "\" "; + //if (this.SerialPort.FileName.Length > 0) + buffer = "-serial pipe:\"com_1\" "; } Modified: trunk/tools/Qemu GUI/DebugForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/DebugForm.cs?rev=… ============================================================================== --- trunk/tools/Qemu GUI/DebugForm.cs [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/DebugForm.cs [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -1,18 +1,13 @@ using System; using System.IO; using System.Diagnostics; -using System.Threading; +using System.ComponentModel; using System.Windows.Forms; namespace Qemu_GUI { public partial class DebugForm : Form { - string talker; - Process proc; - ThreadStart start; - Thread worker; - public DebugForm() { InitializeComponent(); @@ -22,96 +17,55 @@ { this.Close(); } - public void Listen(Process p, string Talker) + public void Listen() { - if (p.HasExited) - return; + this.Show(); - proc = p; - talker = Talker; + BackgroundWorker work = new BackgroundWorker(); + work.DoWork += new DoWorkEventHandler(work_DoWork); + work.RunWorkerAsync(); + } - start = new ThreadStart(ThreadProc); - worker = new Thread(start); - worker.Priority = ThreadPriority.Normal; - this.Show();//show the dialog - worker.Start(); + void work_DoWork(object sender, DoWorkEventArgs e) + { + NamedPipe pipe = new NamedPipe(); + + //it might take a while for qemu to launch and wait for a pipe + System.Threading.Thread.Sleep(1000); + + pipe.CreateClientPipe("com_1"); + + pipe.PipeReceiveEvent += new PipeReceiveEventHandler(PipeRecievedHandler); + pipe.PipeErrorEvent += new PipeErrorEventHandler(PipeErrorHandler); + + pipe.ReadLoop(); } - private void ThreadProc() + + private void PipeErrorHandler(object sender, PipeErrorEventArgs args) { - FileStream log = null; - txtDebug.Text = ""; - string buffer = ""; - string temp = ""; + ErrorForm err = new ErrorForm(); + err.txtError.Text += "PipeErrorHandler:" + Environment.NewLine; + err.txtError.Text += args.ErrorDesc; + err.Show(); + } - /* fix me: writting to a form from a diferent thread, unsafe. */ - try + private void PipeRecievedHandler(object sender, PipeReceiveEventArgs args) + { + WriteString(args.Received); + } + + + private delegate void WriteStringDelegate(string text); + public void WriteString(string text) + { + if (txtDebug.InvokeRequired) + txtDebug.Invoke(new WriteStringDelegate(WriteString), text); + else { - log = new FileStream(talker, FileMode.OpenOrCreate, FileAccess.Read, FileShare.ReadWrite); - while (!proc.HasExited) - { - int data = log.ReadByte(); - if (data != -1) - { - worker.Priority = ThreadPriority.Normal; - buffer += Convert.ToChar(data); - - if (buffer.Contains("\n")) - { - temp = txtDebug.Text + buffer; - txtDebug.Text = ""; - txtDebug.SelectedText = temp; - buffer = ""; - } - } - else - worker.Priority = ThreadPriority.Lowest; - //Thread.Sleep(50);//wait a 1/4 of a second for more data - } - - temp = txtDebug.Text + buffer; - txtDebug.Text = ""; - txtDebug.SelectedText = temp; - log.Close(); - DeleteTalker(); - //txtDebug.Text += "QEMU GUI: Exited listener!" + Environment.NewLine; + txtDebug.AppendText(text); + txtDebug.ScrollToCaret(); } - catch (Exception e) - { - /* fix me: writting to a form from a diferent thread, unsafe. */ - try - { - log.Close(); - txtDebug.Text += "QEMU GUI: Exited listener on exception!" + Environment.NewLine; - txtDebug.Text += e.Message; - } - catch - {} - } - log.Close(); - DeleteTalker(); } - private void DeleteTalker() - { - /* sometimes it takes a while for qemu to free the handle to the file */ - - while (File.Exists(talker)) - { - if (proc.HasExited) - { - worker.Priority = ThreadPriority.Lowest; - - try - { - File.Delete(talker); - if (!File.Exists(talker)) - break; - } - catch - { } - } - } - //MessageBox.Show("Temp File deleted!"); - } private void tsbuttonCopy_Click(object sender, EventArgs e) { @@ -138,7 +92,7 @@ { error = new ErrorForm(); error.txtError.Text = "Exception while trying to save file!" + Environment.NewLine; - error.txtError.Text += ex.Message; + error.txtError.Text = ex.Message ; error.Show(); } log.Close(); Modified: trunk/tools/Qemu GUI/ErrorForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/ErrorForm.cs?rev=… ============================================================================== --- trunk/tools/Qemu GUI/ErrorForm.cs [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/ErrorForm.cs [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -22,4 +22,4 @@ Clipboard.SetText(temp); } } -} +} Modified: trunk/tools/Qemu GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/MainForm.cs?rev=3… ============================================================================== --- trunk/tools/Qemu GUI/MainForm.cs [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/MainForm.cs [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -2,7 +2,6 @@ using System.Drawing; using System.Collections; using System.Windows.Forms; -using System.Threading; using System.Diagnostics; using System.IO; using System.Xml.Serialization; @@ -614,7 +613,7 @@ runner = new Runner(data); if (runner.MountImage() == true) { - Thread.Sleep(500); + System.Threading.Thread.Sleep(500); Process p = new Process(); p.StartInfo.FileName = "explorer"; Added: trunk/tools/Qemu GUI/NamedPipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/NamedPipe.cs?rev=… ============================================================================== --- trunk/tools/Qemu GUI/NamedPipe.cs (added) +++ trunk/tools/Qemu GUI/NamedPipe.cs [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -1,0 +1,206 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.IO; +using System.IO.Pipes; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading; + +namespace Qemu_GUI +{ + public enum ConnectionMode + { + MODE_CLIENT = 0x00000000, + MODE_SERVER = 0x00000001, + MODE_AUTO = 0x00000002 + } + + public class NamedPipe : Pipe + { + public const int PIPE_SIZE = 1024; + + private PipeStream ioStream; /* stream for io operations */ + private String wCommand; /* buffer of a single command line */ + private List<String> cmdList; /*list of commands pending to be written */ + + public event PipeReceiveEventHandler PipeReceiveEvent; + public event PipeErrorEventHandler PipeErrorEvent; + + private static ManualResetEvent newWriteData = new ManualResetEvent(false); + + public NamedPipe() + { + cmdList = new List<string>(); + } + + public bool CreateServerPipe(string name) + { + /* create a pipe and wait for a client */ + NamedPipeServerStream sStream = new NamedPipeServerStream(name, PipeDirection.InOut, 1, + PipeTransmissionMode.Byte, PipeOptions.Asynchronous, PIPE_SIZE, PIPE_SIZE); + sStream.WaitForConnection(); + + if (sStream.IsConnected) + { + ioStream = sStream; + return true; + } + else + { + return false; + } + } + + public bool CreateClientPipe(string name) + { + /* try to connect as a client */ + /* (QEMU -serial pipe or VMware in pipe server mode) */ + try + { + NamedPipeClientStream cStream = new NamedPipeClientStream(".", name, PipeDirection.InOut, PipeOptions.Asynchronous); + cStream.Connect(100); + + if (cStream.IsConnected) + { + ioStream = cStream; + return true; + } + else + { + return false; + } + } + catch (Exception) + { + return false; + } + } + + public bool CreatePipe(string name, ConnectionMode mode) + { + if (name == "" || name == null) + { + return false; + } + switch (mode) + { + case ConnectionMode.MODE_AUTO: + //check if pipe exists, if not create server pipe, wait certain time, check if pipe... + //TODO: server-client lookup should time out + while (true) + { + if (CreateClientPipe(name)) + { + break; + } + if (CreateServerPipe(name)) + { + break; + } + } + return true; + + case ConnectionMode.MODE_CLIENT: + while (!CreateClientPipe(name)) ; + + /* pipe open, everything fine */ + return true; + + case ConnectionMode.MODE_SERVER: + if (CreateServerPipe(name)) + { + /* wait for a client*/ + + return true; + } + break; + } + return false; + } + + public void Close() + { + if (ioStream != null) + ioStream.Close(); + } + + public void WriteLoop() + { + try + { + while (true) + { + if (cmdList.Count > 0) + { + byte[] wBuf = new byte[cmdList[0].Length]; + UTF8Encoding.UTF8.GetBytes(cmdList[0], 0, cmdList[0].Length, wBuf, 0); + + ioStream.Write(wBuf, 0, cmdList[0].Length); + + /* remove written data from commandlist */ + cmdList.RemoveAt(0); + } + else if (cmdList.Count == 0) + { + /* wait until new data is signaled */ + newWriteData.Reset(); + newWriteData.WaitOne(); + } + } + } + catch (Exception e) + { + if (PipeErrorEvent != null) + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); + } + + } + + public void ReadLoop() + { + byte[] buf = new byte[PIPE_SIZE]; + int read = 0; + + try + { + while (true) + { + read = ioStream.Read(buf, 0, PIPE_SIZE); + if (read > 0) + { + if (PipeReceiveEvent != null) + PipeReceiveEvent.Invoke(this, new PipeReceiveEventArgs(UTF8Encoding.UTF8.GetString(buf, 0, read))); + } + else + { + /* connecion closed */ + break; + } + } + } + catch (Exception e) + { + if (PipeErrorEvent != null) + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); + } + } + + public bool Write(string str) + { + /* only forward a complete line */ + wCommand += str; + + if (str[str.Length - 1] == '\r') + { + cmdList.Add(wCommand); + wCommand = null; + + /* wake up the write thread */ + newWriteData.Set(); + } + return true; + } + } + +} Propchange: trunk/tools/Qemu GUI/NamedPipe.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/Qemu GUI/PipeClient.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/PipeClient.cs?rev… ============================================================================== --- trunk/tools/Qemu GUI/PipeClient.cs (added) +++ trunk/tools/Qemu GUI/PipeClient.cs [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -1,0 +1,36 @@ +using System; +using System.Runtime.InteropServices; +using System.Collections.Generic; +using System.IO; +using System.Collections; + +namespace Qemu_GUI +{ + public class PipeReceiveEventArgs + { + public readonly string Received; + public PipeReceiveEventArgs(string received) + { + Received = received; + } + } + public delegate void PipeReceiveEventHandler(object sender, PipeReceiveEventArgs args); + + public class PipeErrorEventArgs + { + public readonly string ErrorDesc; + public PipeErrorEventArgs(string error) + { + ErrorDesc = error; + } + } + public delegate void PipeErrorEventHandler(object sender, PipeErrorEventArgs args); + + public interface Pipe + { + event PipeReceiveEventHandler PipeReceiveEvent; + event PipeErrorEventHandler PipeErrorEvent; + bool Write(string output); + } + +} Propchange: trunk/tools/Qemu GUI/PipeClient.cs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/Qemu GUI/Properties/Resources.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Properties/Resour… ============================================================================== --- trunk/tools/Qemu GUI/Properties/Resources.Designer.cs [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/Properties/Resources.Designer.cs [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -1,7 +1,7 @@ ï»¿//------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.312 +// Runtime Version:2.0.50727.1434 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -153,7 +153,7 @@ internal static System.Drawing.Bitmap preferences_system { get { - object obj = ResourceManager.GetObject("preferences-system", resourceCulture); + object obj = ResourceManager.GetObject("preferences_system", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } Modified: trunk/tools/Qemu GUI/Properties/Resources.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Properties/Resour… ============================================================================== --- trunk/tools/Qemu GUI/Properties/Resources.resx [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/Properties/Resources.resx [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -154,7 +154,7 @@ <data name="harddisk" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\direct\harddisk.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="preferences-system" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <data name="preferences_system" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\preferences-system.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="debug" type="System.Resources.ResXFileRef, System.Windows.Forms"> Modified: trunk/tools/Qemu GUI/Properties/app.manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Properties/app.ma… ============================================================================== --- trunk/tools/Qemu GUI/Properties/app.manifest [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/Properties/app.manifest [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -4,7 +4,13 @@ <security> <applicationRequestMinimum> <defaultAssemblyRequest permissionSetReference="Custom" /> - <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" /> + <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site"> + <IPermission class="System.Security.Permissions.EnvironmentPermission, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" /> + <IPermission class="System.Security.Permissions.FileDialogPermission, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" /> + <IPermission class="System.Security.Permissions.FileIOPermission, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" /> + <IPermission class="System.Security.Permissions.RegistryPermission, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" /> + <IPermission class="System.Security.Permissions.UIPermission, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" /> + </PermissionSet> </applicationRequestMinimum> </security> </trustInfo> Modified: trunk/tools/Qemu GUI/QEmuGUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/QEmuGUI.csproj?re… ============================================================================== --- trunk/tools/Qemu GUI/QEmuGUI.csproj [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/QEmuGUI.csproj [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -1,7 +1,7 @@ -ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> <ProjectType>Local</ProjectType> - <ProductVersion>8.0.50727</ProductVersion> + <ProductVersion>9.0.21022</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{88020C53-D88A-4488-A479-E7ED0310D3D3}</ProjectGuid> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -30,8 +30,10 @@ <GenerateManifests>true</GenerateManifests> <SignManifests>false</SignManifests> <IsWebBootstrapper>false</IsWebBootstrapper> - <TargetZone>LocalIntranet</TargetZone> - <PublishUrl>C:\Documents and Settings\Samuel\Desktop\qemu\</PublishUrl> + <TargetZone>Custom</TargetZone> + <OldToolsVersion>3.5</OldToolsVersion> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <PublishUrl>publish\</PublishUrl> <Install>true</Install> <InstallFrom>Disk</InstallFrom> <UpdateEnabled>false</UpdateEnabled> @@ -41,7 +43,9 @@ <UpdatePeriodically>false</UpdatePeriodically> <UpdateRequired>false</UpdateRequired> <MapFileExtensions>true</MapFileExtensions> - <ApplicationVersion>0.1.0.%2a</ApplicationVersion> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -51,7 +55,7 @@ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow> <ConfigurationOverrideFile> </ConfigurationOverrideFile> - <DefineConstants>DEBUG;TRACE</DefineConstants> + <DefineConstants>DEBUG</DefineConstants> <DocumentationFile> </DocumentationFile> <DebugSymbols>true</DebugSymbols> @@ -69,12 +73,13 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <OutputPath>bin\Release\</OutputPath> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> <BaseAddress>285212672</BaseAddress> <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow> <ConfigurationOverrideFile> </ConfigurationOverrideFile> - <DefineConstants>TRACE</DefineConstants> + <DefineConstants> + </DefineConstants> <DocumentationFile> </DocumentationFile> <DebugSymbols>false</DebugSymbols> @@ -94,6 +99,9 @@ <Reference Include="System"> <Name>System</Name> </Reference> + <Reference Include="System.Core"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> <Reference Include="System.Data"> <Name>System.Data</Name> </Reference> @@ -117,6 +125,7 @@ <Compile Include="AboutForm.Designer.cs"> <DependentUpon>AboutForm.cs</DependentUpon> </Compile> + <Compile Include="PipeClient.cs" /> <Compile Include="DebugForm.cs"> <SubType>Form</SubType> </Compile> @@ -135,6 +144,7 @@ <Compile Include="MainForm.Designer.cs"> <DependentUpon>MainForm.cs</DependentUpon> </Compile> + <Compile Include="NamedPipe.cs" /> <Compile Include="Network.cs" /> <Compile Include="program.cs" /> <Compile Include="Properties\Resources.Designer.cs"> @@ -165,8 +175,18 @@ <ItemGroup> <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> <Visible>False</Visible> - <ProductName>.NET Framework 2.0</ProductName> + <ProductName>.NET Framework 2.0 %28x86%29</ProductName> <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.0"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.0 %28x86%29</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5</ProductName> + <Install>false</Install> </BootstrapperPackage> </ItemGroup> <ItemGroup> Modified: trunk/tools/Qemu GUI/Qemu GUI.sln URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Qemu%20GUI.sln?re… ============================================================================== --- trunk/tools/Qemu GUI/Qemu GUI.sln [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/Qemu GUI.sln [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C# Express 2008 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QEmuGUI", "QEmuGUI.csproj", "{88020C53-D88A-4488-A479-E7ED0310D3D3}" EndProject Global Modified: trunk/tools/Qemu GUI/Runner.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Runner.cs?rev=367… ============================================================================== --- trunk/tools/Qemu GUI/Runner.cs [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/Runner.cs [iso-8859-1] Wed Oct 15 02:42:35 2008 @@ -1,7 +1,5 @@ using System; using System.IO; -using System.Text; -using System.Threading; using System.Diagnostics; using System.Windows.Forms; using System.Security.Permissions; @@ -70,44 +68,28 @@ return false; } - if (data.Debug.SerialPort.SRedirect) - { - /* create a random name */ - string filename = "serial" + DateTime.UtcNow.Ticks.ToString() + ".txt"; - data.Debug.SerialPort.FileName = temp_path + filename; - } - try { p.StartInfo.WorkingDirectory = data.Paths.Qemu; + p.StartInfo.Arguments = data.GetArgv(); + } + catch (Exception e) + { + MessageBox.Show("Invalid path or arguments. Your settings may be corrupt. \nException Information: " + e.Message, "Error"); + return false; + } + + /* show the command line */ + ErrBuffer = "Path:" + Environment.NewLine + p.StartInfo.FileName.ToString() + Environment.NewLine + "Arguments:" + Environment.NewLine + data.GetArgv(); + + try + { + p.Start(); if (data.Debug.SerialPort.SRedirect) { - output = new DebugForm(); - - /* create a unic name */ - string filename = "serial" + DateTime.UtcNow.Ticks.ToString() + ".txt"; - data.Debug.SerialPort.FileName = temp_path + filename; - } - p.StartInfo.Arguments = data.GetArgv(); - } - catch (Exception e) - { - MessageBox.Show("Invalid path or arguments. Your settings may be corrupt. \nException Information: " + e.Message, "Error"); - return false; - } - - /* show the command line */ - ErrBuffer = "Path:" + Environment.NewLine + p.StartInfo.FileName.ToString() + Environment.NewLine + "Arguments:" + Environment.NewLine + data.GetArgv(); - - try - { - p.Start(); - if (data.Debug.SerialPort.SRedirect) - { - output = new DebugForm(); - output.Listen(p, data.Debug.SerialPort.FileName); + output.Listen(); } } catch (Exception e)

16 years, 2 months

[cgutman] 36756: - Merge aicom-network-fixes up to r36755

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 14 19:32:36 2008 New Revision: 36756 URL: http://svn.reactos.org/svn/reactos?rev=36756&view=rev Log: - Merge aicom-network-fixes up to r36755 Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Tue Oct 14 19:32:36 2008 @@ -614,7 +614,7 @@ if (CharacteristicsLength < MinSize) { - NDIS_DbgPrint(DEBUG_PROTOCOL, ("Bad protocol characteristics.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Bad protocol characteristics.\n")); *Status = NDIS_STATUS_BAD_CHARACTERISTICS; return; } @@ -680,7 +680,7 @@ if(!NT_SUCCESS(NtStatus)) { - NDIS_DbgPrint(MID_TRACE, ("Unable to open protocol configuration\n")); + NDIS_DbgPrint(MIN_TRACE, ("Unable to open protocol configuration\n")); ExFreePool(Protocol); *Status = NDIS_STATUS_FAILURE; return; @@ -698,7 +698,7 @@ NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) { - NDIS_DbgPrint(MID_TRACE, ("Unable to query the Bind value for size\n")); + NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value for size\n")); ZwClose(DriverKeyHandle); ExFreePool(Protocol); *Status = NDIS_STATUS_FAILURE; @@ -800,6 +800,7 @@ } else if(*Status != NDIS_STATUS_PENDING) { + NDIS_DbgPrint(MIN_TRACE, ("ProtocolBindAdapter failed with status 0x%x\n", *Status)); ExFreePool(Protocol); ExFreePool(KeyInformation); *NdisProtocolHandle = NULL; Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Oct 14 19:32:36 2008 @@ -686,7 +686,8 @@ FILE_DEVICE_NETWORK, 0, FALSE, &RawIPDeviceObject); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create RawIP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); return Status; } @@ -695,7 +696,9 @@ FILE_DEVICE_NETWORK, 0, FALSE, &UDPDeviceObject); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create UDP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); return Status; } @@ -704,7 +707,10 @@ FILE_DEVICE_NETWORK, 0, FALSE, &TCPDeviceObject); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create TCP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); return Status; } @@ -713,7 +719,11 @@ EntityList = ExAllocatePool(NonPagedPool, sizeof(TDIEntityID) * MAX_TDI_ENTITIES ); if (!EntityList) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -733,14 +743,25 @@ /* Allocate NDIS packet descriptors */ NdisAllocatePacketPool(&NdisStatus, &GlobalPacketPool, 100, sizeof(PACKET_CONTEXT)); if (NdisStatus != NDIS_STATUS_SUCCESS) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); return STATUS_INSUFFICIENT_RESOURCES; } /* Allocate NDIS buffer descriptors */ NdisAllocateBufferPool(&NdisStatus, &GlobalBufferPool, 100); if (NdisStatus != NDIS_STATUS_SUCCESS) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); return STATUS_INSUFFICIENT_RESOURCES; } @@ -762,19 +783,46 @@ /* Initialize transport level protocol subsystems */ Status = RawIPStartup(); if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); return Status; } Status = UDPStartup(); if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); return Status; } Status = TCPStartup(); if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); + UDPShutdown(); return Status; } @@ -794,15 +842,41 @@ NULL, 0, NULL); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); + UDPShutdown(); + TCPShutdown(); + LANShutdown(); return Status; } /* Open loopback adapter */ - if (!NT_SUCCESS(LoopRegisterAdapter(NULL, NULL))) { + Status = LoopRegisterAdapter(NULL, NULL); + if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); - TiUnload(DriverObject); - return STATUS_INSUFFICIENT_RESOURCES; + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); + UDPShutdown(); + TCPShutdown(); + LANShutdown(); + LANUnregisterProtocol(); + return Status; } /* Use direct I/O */

16 years, 2 months

[cgutman] 36755: - Change the trace level on some debug prints so you get debug info when a protocol driver fails to be registered - Add a debug print

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 14 18:35:33 2008 New Revision: 36755 URL: http://svn.reactos.org/svn/reactos?rev=36755&view=rev Log: - Change the trace level on some debug prints so you get debug info when a protocol driver fails to be registered - Add a debug print Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Tue Oct 14 18:35:33 2008 @@ -614,7 +614,7 @@ if (CharacteristicsLength < MinSize) { - NDIS_DbgPrint(DEBUG_PROTOCOL, ("Bad protocol characteristics.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Bad protocol characteristics.\n")); *Status = NDIS_STATUS_BAD_CHARACTERISTICS; return; } @@ -680,7 +680,7 @@ if(!NT_SUCCESS(NtStatus)) { - NDIS_DbgPrint(MID_TRACE, ("Unable to open protocol configuration\n")); + NDIS_DbgPrint(MIN_TRACE, ("Unable to open protocol configuration\n")); ExFreePool(Protocol); *Status = NDIS_STATUS_FAILURE; return; @@ -698,7 +698,7 @@ NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) { - NDIS_DbgPrint(MID_TRACE, ("Unable to query the Bind value for size\n")); + NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value for size\n")); ZwClose(DriverKeyHandle); ExFreePool(Protocol); *Status = NDIS_STATUS_FAILURE; @@ -800,6 +800,7 @@ } else if(*Status != NDIS_STATUS_PENDING) { + NDIS_DbgPrint(MIN_TRACE, ("ProtocolBindAdapter failed with status 0x%x\n", *Status)); ExFreePool(Protocol); ExFreePool(KeyInformation); *NdisProtocolHandle = NULL;

16 years, 2 months

[cgutman] 36754: - Fix a crash that happens when DriverEntry doesn't complete successfully - Return the correct status when LoopRegisterAdapter fails

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 14 18:15:22 2008 New Revision: 36754 URL: http://svn.reactos.org/svn/reactos?rev=36754&view=rev Log: - Fix a crash that happens when DriverEntry doesn't complete successfully - Return the correct status when LoopRegisterAdapter fails Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Oct 14 18:15:22 2008 @@ -686,7 +686,8 @@ FILE_DEVICE_NETWORK, 0, FALSE, &RawIPDeviceObject); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create RawIP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); return Status; } @@ -695,7 +696,9 @@ FILE_DEVICE_NETWORK, 0, FALSE, &UDPDeviceObject); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create UDP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); return Status; } @@ -704,7 +707,10 @@ FILE_DEVICE_NETWORK, 0, FALSE, &TCPDeviceObject); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create TCP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); return Status; } @@ -713,7 +719,11 @@ EntityList = ExAllocatePool(NonPagedPool, sizeof(TDIEntityID) * MAX_TDI_ENTITIES ); if (!EntityList) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -733,14 +743,25 @@ /* Allocate NDIS packet descriptors */ NdisAllocatePacketPool(&NdisStatus, &GlobalPacketPool, 100, sizeof(PACKET_CONTEXT)); if (NdisStatus != NDIS_STATUS_SUCCESS) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); return STATUS_INSUFFICIENT_RESOURCES; } /* Allocate NDIS buffer descriptors */ NdisAllocateBufferPool(&NdisStatus, &GlobalBufferPool, 100); if (NdisStatus != NDIS_STATUS_SUCCESS) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); return STATUS_INSUFFICIENT_RESOURCES; } @@ -762,19 +783,46 @@ /* Initialize transport level protocol subsystems */ Status = RawIPStartup(); if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); return Status; } Status = UDPStartup(); if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); return Status; } Status = TCPStartup(); if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); + UDPShutdown(); return Status; } @@ -794,15 +842,41 @@ NULL, 0, NULL); - TiUnload(DriverObject); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); + UDPShutdown(); + TCPShutdown(); + LANShutdown(); return Status; } /* Open loopback adapter */ - if (!NT_SUCCESS(LoopRegisterAdapter(NULL, NULL))) { + Status = LoopRegisterAdapter(NULL, NULL); + if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); - TiUnload(DriverObject); - return STATUS_INSUFFICIENT_RESOURCES; + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + ExFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + IPShutdown(); + RawIPShutdown(); + UDPShutdown(); + TCPShutdown(); + LANShutdown(); + LANUnregisterProtocol(); + return Status; } /* Use direct I/O */

16 years, 2 months

[tkreuzer] 36753: - Update CLIENTTHREADINFO structure - Rename W32CLIENTINFO to CLIENTINFO and update members - C_ASERT that CLIENTINFO fits into the TEB

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 14 16:03:20 2008 New Revision: 36753 URL: http://svn.reactos.org/svn/reactos?rev=36753&view=rev Log: - Update CLIENTTHREADINFO structure - Rename W32CLIENTINFO to CLIENTINFO and update members - C_ASERT that CLIENTINFO fits into the TEB Modified: trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Tue Oct 14 16:03:20 2008 @@ -462,12 +462,12 @@ ValidateHwnd(HWND hwnd) { PWINDOW Wnd; - PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + PCLIENTINFO ClientInfo = GetWin32ClientInfo(); ASSERT(ClientInfo != NULL); /* See if the window is cached */ - if (hwnd == ClientInfo->hWND) - return ClientInfo->pvWND; + if (hwnd == ClientInfo->CallbackWnd.hWnd) + return ClientInfo->CallbackWnd.pvWnd; Wnd = ValidateHandle((HANDLE)hwnd, VALIDATE_TYPE_WIN); if (Wnd != NULL) @@ -501,12 +501,12 @@ ValidateHwndNoErr(HWND hwnd) { PWINDOW Wnd; - PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + PCLIENTINFO ClientInfo = GetWin32ClientInfo(); ASSERT(ClientInfo != NULL); /* See if the window is cached */ - if (hwnd == ClientInfo->hWND) - return ClientInfo->pvWND; + if (hwnd == ClientInfo->CallbackWnd.hWnd) + return ClientInfo->CallbackWnd.pvWnd; Wnd = ValidateHandleNoErr((HANDLE)hwnd, VALIDATE_TYPE_WIN); if (Wnd != NULL) Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Tue Oct 14 16:03:20 2008 @@ -193,7 +193,7 @@ WPARAM wParam, LPARAM lParam) { - PW32CLIENTINFO ClientInfo; + PCLIENTINFO ClientInfo; DWORD Flags, Save; PHOOK pHook; LRESULT lResult = 0; Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Tue Oct 14 16:03:20 2008 @@ -1081,7 +1081,7 @@ STDCALL InSendMessage(VOID) { - PCLIENTTHREADINFO pcti = ((PW32CLIENTINFO)GetWin32ClientInfo())->pClientThreadInfo; + PCLIENTTHREADINFO pcti = GetWin32ClientInfo()->pClientThreadInfo; // FIXME("ISM %x\n",pcti); if ( pcti ) { @@ -1103,7 +1103,7 @@ InSendMessageEx( LPVOID lpReserved) { - PCLIENTTHREADINFO pcti = ((PW32CLIENTINFO)GetWin32ClientInfo())->pClientThreadInfo; + PCLIENTTHREADINFO pcti = GetWin32ClientInfo()->pClientThreadInfo; // FIXME("ISMEX %x\n",pcti); if (pcti && !(pcti->CTI_flags & CTI_INSENDMESSAGE)) return ISMEX_NOSEND; else @@ -2336,7 +2336,7 @@ BOOL WINAPI IsInsideMessagePumpHook() { // Fixme: Need to fully implement this! FF uses this and polls it when Min/Max - PCLIENTTHREADINFO pcti = ((PW32CLIENTINFO)GetWin32ClientInfo())->pClientThreadInfo; + PCLIENTTHREADINFO pcti = GetWin32ClientInfo()->pClientThreadInfo; // FIXME("IIMPH %x\n",pcti); return (gfMessagePumpHook && pcti && (pcti->dwcPumpHook > 0)); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Oct 14 16:03:20 2008 @@ -297,6 +297,11 @@ typedef struct _CLIENTTHREADINFO { DWORD CTI_flags; + WORD fsChangeBits; + WORD fsWakeBits; + WORD fsWakeBitsJournal; + WORD fsWakeMask; + LONG timeLastRead; DWORD dwcPumpHook; } CLIENTTHREADINFO, *PCLIENTTHREADINFO; @@ -340,34 +345,39 @@ #define CI_CURTHPRHOOK 0x00000010 -typedef struct _W32CLIENTINFO +typedef struct _CLIENTINFO { ULONG CI_flags; ULONG cSpins; - ULONG ulWindowsVersion; - ULONG ulAppCompatFlags; - ULONG ulAppCompatFlags2; + DWORD dwExpWinVer; + DWORD dwCompatFlags; + DWORD dwCompatFlags2; DWORD dwTIFlags; PVOID pDeskInfo; ULONG_PTR ulClientDelta; PHOOK phkCurrent; ULONG fsHooks; - HWND hWND; // Will be replaced with CALLBACKWND. - PVOID pvWND; // " " + CALLBACKWND CallbackWnd; ULONG Win32ClientInfo; DWORD dwHookCurrent; - ULONG Win32ClientInfo1; + INT cInDDEMLCallback; PCLIENTTHREADINFO pClientThreadInfo; DWORD dwHookData; DWORD dwKeyCache; - ULONG Win32ClientInfo2[7]; + DWORD afKeyState[2]; + DWORD dwAsyncKeyCache; + DWORD afAsyncKeyState[2]; + DWORD afAsyncKeyStateRecentDow[2]; + HKL hKL; USHORT CodePage; - USHORT csCF; - HANDLE hKL; + USHORT achDbcsCF; ULONG Win32ClientInfo3[35]; -} W32CLIENTINFO, *PW32CLIENTINFO; - -#define GetWin32ClientInfo() (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo) +} CLIENTINFO, *PCLIENTINFO; + +/* Make sure it fits exactly into the TEB */ +C_ASSERT(sizeof(CLIENTINFO) == FIELD_OFFSET(TEB, glDispatchTable) - FIELD_OFFSET(TEB, Win32ClientInfo)); + +#define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo)) // Server event activity bits. #define SRV_EVENT_MENU 0x0001 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Tue Oct 14 16:03:20 2008 @@ -116,22 +116,22 @@ { HWND hWndS = *hWnd; PWINDOW_OBJECT Window = UserGetWindowObject(*hWnd); - PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); - - *hWnd = ClientInfo->hWND; - *pWnd = ClientInfo->pvWND; - - ClientInfo->hWND = hWndS; - ClientInfo->pvWND = DesktopHeapAddressToUser(Window->Wnd); + PCLIENTINFO ClientInfo = GetWin32ClientInfo(); + + *hWnd = ClientInfo->CallbackWnd.hWnd; + *pWnd = ClientInfo->CallbackWnd.pvWnd; + + ClientInfo->CallbackWnd.hWnd = hWndS; + ClientInfo->CallbackWnd.pvWnd = DesktopHeapAddressToUser(Window->Wnd); } static VOID IntRestoreTebWndCallback (HWND hWnd, PVOID pWnd) { - PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); - - ClientInfo->hWND = hWnd; - ClientInfo->pvWND = pWnd; + PCLIENTINFO ClientInfo = GetWin32ClientInfo(); + + ClientInfo->CallbackWnd.hWnd = hWnd; + ClientInfo->CallbackWnd.pvWnd = pWnd; } /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Oct 14 16:03:20 2008 @@ -296,7 +296,7 @@ { PHOOK Hook, SaveHook; PW32THREAD Win32Thread; - PW32CLIENTINFO ClientInfo; + PCLIENTINFO ClientInfo; PHOOKTABLE Table; LRESULT Result; PWINSTATION_OBJECT WinStaObj; @@ -886,7 +886,7 @@ BOOL Ansi) { PHOOK HookObj, NextObj; - PW32CLIENTINFO ClientInfo; + PCLIENTINFO ClientInfo; PWINSTATION_OBJECT WinStaObj; NTSTATUS Status; DECLARE_RETURN(LRESULT); @@ -962,7 +962,7 @@ BOOL Ansi) { PWINSTATION_OBJECT WinStaObj; - PW32CLIENTINFO ClientInfo; + PCLIENTINFO ClientInfo; BOOLEAN Global; PETHREAD Thread; PHOOK Hook; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Oct 14 16:03:20 2008 @@ -2110,7 +2110,7 @@ case FNID_CALLWNDPROC: case FNID_CALLWNDPROCRET: { - PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + PCLIENTINFO ClientInfo = GetWin32ClientInfo(); PHOOK NextObj, Hook = ClientInfo->phkCurrent; if (!ClientInfo || !Hook) break; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Tue Oct 14 16:03:20 2008 @@ -437,7 +437,7 @@ { PTEB Teb; PW32THREADINFO ti; - PW32CLIENTINFO ci; + PCLIENTINFO ci; PW32THREAD W32Thread = PsGetCurrentThreadWin32Thread(); if (W32Thread == NULL) @@ -477,7 +477,7 @@ W32Thread->ThreadInfo = ti; /* update the TEB */ Teb = NtCurrentTeb(); - ci = ((PW32CLIENTINFO)Teb->Win32ClientInfo); + ci = GetWin32ClientInfo(); _SEH_TRY { ProbeForWrite(Teb, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Oct 14 16:03:20 2008 @@ -330,13 +330,13 @@ static VOID UserFreeWindowInfo(PW32THREADINFO ti, PWINDOW_OBJECT WindowObject) { - PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + PCLIENTINFO ClientInfo = GetWin32ClientInfo(); PWINDOW Wnd = WindowObject->Wnd; - if (ClientInfo->pvWND == DesktopHeapAddressToUser(WindowObject->Wnd)) + if (ClientInfo->CallbackWnd.pvWnd == DesktopHeapAddressToUser(WindowObject->Wnd)) { - ClientInfo->hWND = NULL; - ClientInfo->pvWND = NULL; + ClientInfo->CallbackWnd.hWnd = NULL; + ClientInfo->CallbackWnd.pvWnd = NULL; } if (Wnd->WindowName.Buffer != NULL)

16 years, 2 months

[fireball] 36752: - Mbcb field of SHARED_CACHE_MAP structure has MBCB type, not MCB.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Oct 14 13:27:15 2008 New Revision: 36752 URL: http://svn.reactos.org/svn/reactos?rev=36752&view=rev Log: - Mbcb field of SHARED_CACHE_MAP structure has MBCB type, not MCB. Modified: trunk/reactos/include/ndk/cctypes.h Modified: trunk/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cctypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cctypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cctypes.h [iso-8859-1] Tue Oct 14 13:27:15 2008 @@ -109,7 +109,7 @@ LIST_ENTRY SharedCacheMapLinks; ULONG Flags; ULONG Status; - PMCB Mbcb; + PMBCB Mbcb; PVOID Section; PKEVENT CreateEvent; PKEVENT WaitOnActiveCount;

16 years, 2 months

[mjmartin] 36751: - REnumServicesStatusA/REnumServicesStatusExA: Call REnumServicesStatusW/REnumServicesStatusExW to do the work eliminating duplicate code. - lpResumeIndex and lpResumeHandle are set to 0 on success.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Tue Oct 14 12:55:44 2008 New Revision: 36751 URL: http://svn.reactos.org/svn/reactos?rev=36751&view=rev Log: - REnumServicesStatusA/REnumServicesStatusExA: Call REnumServicesStatusW/REnumServicesStatusExW to do the work eliminating duplicate code. - lpResumeIndex and lpResumeHandle are set to 0 on success. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Tue Oct 14 12:55:44 2008 @@ -2371,7 +2371,7 @@ dwRequiredSize += dwSize; } - if (dwError != ERROR_MORE_DATA) + if (dwError == 0) { *pcbBytesNeeded = 0; if (lpResumeHandle) *lpResumeHandle = 0; @@ -3375,208 +3375,84 @@ LPBOUNDED_DWORD_256K lpServicesReturned, LPBOUNDED_DWORD_256K lpResumeHandle) { - PMANAGER_HANDLE hManager; - PSERVICE lpService; - DWORD dwError = ERROR_SUCCESS; - PLIST_ENTRY ServiceEntry; - PSERVICE CurrentService; - DWORD dwState; - DWORD dwRequiredSize; + LPENUM_SERVICE_STATUSW lpStatusPtrW = NULL; + LPENUM_SERVICE_STATUSA lpStatusPtrA = NULL; + LPWSTR lpStringPtrW; + LPSTR lpStringPtrA; + DWORD dwError; DWORD dwServiceCount; - DWORD dwSize; - DWORD dwLastResumeCount = 0; - LPENUM_SERVICE_STATUSA lpStatusPtr; - LPSTR lpStringPtr; DPRINT("REnumServicesStatusA() called\n"); - if (ScmShutdown) - return ERROR_SHUTDOWN_IN_PROGRESS; - - hManager = (PMANAGER_HANDLE)hSCManager; - if (!hManager || hManager->Handle.Tag != MANAGER_TAG) - { - DPRINT1("Invalid manager handle!\n"); - return ERROR_INVALID_HANDLE; - } - - *pcbBytesNeeded = 0; - *lpServicesReturned = 0; - - if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) - { - DPRINT1("Not a valid Service Type!\n"); - return ERROR_INVALID_PARAMETER; - } - - if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) - { - DPRINT1("Not a valid Service State!\n"); - return ERROR_INVALID_PARAMETER; - } - - /* Check access rights */ - if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, - SC_MANAGER_ENUMERATE_SERVICE)) - { - DPRINT1("Insufficient access rights! 0x%lx\n", - hManager->Handle.DesiredAccess); - return ERROR_ACCESS_DENIED; - } - - if (lpResumeHandle) dwLastResumeCount = *lpResumeHandle; - - /* FIXME: Lock the service list shared */ - - lpService = ScmGetServiceEntryByResumeCount(dwLastResumeCount); - if (lpService == NULL) - { - dwError = ERROR_SUCCESS; - goto Done; - } - - dwRequiredSize = 0; - dwServiceCount = 0; - - for (ServiceEntry = &lpService->ServiceListEntry; - ServiceEntry != &ServiceListHead; - ServiceEntry = ServiceEntry->Flink) - { - CurrentService = CONTAINING_RECORD(ServiceEntry, - SERVICE, - ServiceListEntry); - - if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) - continue; - - dwState = SERVICE_ACTIVE; - if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) - dwState = SERVICE_INACTIVE; - - if ((dwState & dwServiceState) == 0) - continue; - - dwSize = sizeof(ENUM_SERVICE_STATUSA) + - wcslen(CurrentService->lpServiceName) + 1 + - wcslen(CurrentService->lpDisplayName) + 1; - - if (dwRequiredSize + dwSize > dwBufSize) - { - DPRINT("Service name: %S no fit\n", CurrentService->lpServiceName); - break; - } - - DPRINT("Service name: %S fit\n", CurrentService->lpServiceName); - dwRequiredSize += dwSize; - dwServiceCount++; - dwLastResumeCount = CurrentService->dwResumeCount; - } - - DPRINT("dwRequiredSize: %lu\n", dwRequiredSize); - DPRINT("dwServiceCount: %lu\n", dwServiceCount); - - for (; - ServiceEntry != &ServiceListHead; - ServiceEntry = ServiceEntry->Flink) - { - CurrentService = CONTAINING_RECORD(ServiceEntry, - SERVICE, - ServiceListEntry); - - if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) - continue; - - dwState = SERVICE_ACTIVE; - if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) - dwState = SERVICE_INACTIVE; - - if ((dwState & dwServiceState) == 0) - continue; - - dwRequiredSize += sizeof(ENUM_SERVICE_STATUSA) + - wcslen(CurrentService->lpServiceName) + 1 + - wcslen(CurrentService->lpDisplayName) + 1; - - dwError = ERROR_MORE_DATA; - } - - DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); - - if (lpResumeHandle) *lpResumeHandle = dwLastResumeCount; - *lpServicesReturned = dwServiceCount; - *pcbBytesNeeded = dwRequiredSize; - - lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpBuffer; - lpStringPtr = (LPSTR)((ULONG_PTR)lpBuffer + - dwServiceCount * sizeof(ENUM_SERVICE_STATUSA)); - - dwRequiredSize = 0; - for (ServiceEntry = &lpService->ServiceListEntry; - ServiceEntry != &ServiceListHead; - ServiceEntry = ServiceEntry->Flink) - { - CurrentService = CONTAINING_RECORD(ServiceEntry, - SERVICE, - ServiceListEntry); - - if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) - continue; - - dwState = SERVICE_ACTIVE; - if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) - dwState = SERVICE_INACTIVE; - - if ((dwState & dwServiceState) == 0) - continue; - - dwSize = sizeof(ENUM_SERVICE_STATUSA) + - wcslen(CurrentService->lpServiceName) + 1 + - wcslen(CurrentService->lpDisplayName) + 1; - - if (dwRequiredSize + dwSize > dwBufSize) - break; - + if ((dwBufSize > 0) && (lpBuffer)) + { + lpStatusPtrW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwBufSize); + if (!lpStatusPtrW) + { + DPRINT1("Failed to allocate buffer!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + } + + dwError = REnumServicesStatusW(BindingHandle, + hSCManager, + dwServiceType, + dwServiceState, + (LPBYTE)lpStatusPtrW, + dwBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle); + + /* if no services were returned then we are Done */ + if (*lpServicesReturned == 0) goto Done; + + lpStatusPtrA = (LPENUM_SERVICE_STATUSA)lpBuffer; + lpStringPtrA = (LPSTR)((ULONG_PTR)lpBuffer + + *lpServicesReturned * sizeof(ENUM_SERVICE_STATUSA)); + lpStringPtrW = (LPWSTR)((ULONG_PTR)lpStatusPtrW + + *lpServicesReturned * sizeof(ENUM_SERVICE_STATUSW)); + + for (dwServiceCount = 0; dwServiceCount < *lpServicesReturned; dwServiceCount++) + { /* Copy the service name */ WideCharToMultiByte(CP_ACP, 0, - CurrentService->lpServiceName, + lpStringPtrW, -1, - lpStringPtr, - wcslen(CurrentService->lpServiceName), + lpStringPtrA, + wcslen(lpStringPtrW), 0, 0); - lpStatusPtr->lpServiceName = (LPSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); - lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1); + + lpStatusPtrA->lpServiceName = (LPSTR)((ULONG_PTR)lpStringPtrA - (ULONG_PTR)lpBuffer); + lpStringPtrA += wcslen(lpStringPtrW) + 1; + lpStringPtrW += wcslen(lpStringPtrW) + 1; /* Copy the display name */ WideCharToMultiByte(CP_ACP, 0, - CurrentService->lpDisplayName, + lpStringPtrW, -1, - lpStringPtr, - wcslen(CurrentService->lpDisplayName), + lpStringPtrA, + wcslen(lpStringPtrW), 0, 0); - lpStatusPtr->lpDisplayName = (LPSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); - lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1); + + lpStatusPtrA->lpDisplayName = (LPSTR)((ULONG_PTR)lpStringPtrA - (ULONG_PTR)lpBuffer); + lpStringPtrA += wcslen(lpStringPtrW) + 1; + lpStringPtrW += wcslen(lpStringPtrW) + 1; /* Copy the status information */ - memcpy(&lpStatusPtr->ServiceStatus, - &CurrentService->Status, + memcpy(&lpStatusPtrA->ServiceStatus, + &lpStatusPtrW->ServiceStatus, sizeof(SERVICE_STATUS)); - lpStatusPtr++; - dwRequiredSize += dwSize; - } - - if (dwError != ERROR_MORE_DATA) - { - *pcbBytesNeeded = 0; - if (lpResumeHandle) *lpResumeHandle = 0; + lpStatusPtrA++; } Done:; - /* FIXME: Unlock the service list */ + if (lpStatusPtrW) HeapFree(GetProcessHeap(), 0, lpStatusPtrW); DPRINT("REnumServicesStatusA() done (Error %lu)\n", dwError); @@ -4521,81 +4397,24 @@ LPBOUNDED_DWORD_256K lpResumeIndex, LPCSTR pszGroupName) { - PMANAGER_HANDLE hManager; - PSERVICE lpService; - DWORD dwError = ERROR_SUCCESS; - PLIST_ENTRY ServiceEntry; - PSERVICE CurrentService; - DWORD dwState; - DWORD dwRequiredSize; + LPENUM_SERVICE_STATUS_PROCESSW lpStatusPtrW = NULL; + LPENUM_SERVICE_STATUS_PROCESSA lpStatusPtrA = NULL; + LPWSTR lpStringPtrW; + LPSTR lpStringPtrA; + LPWSTR pszGroupNameW = NULL; + DWORD dwError; DWORD dwServiceCount; - DWORD dwSize; - DWORD dwLastResumeCount = 0; - LPENUM_SERVICE_STATUS_PROCESSA lpStatusPtr; - LPSTR lpStringPtr; - LPWSTR pszGroupNameW = NULL; DPRINT("REnumServicesStatusExA() called\n"); - if (ScmShutdown) - return ERROR_SHUTDOWN_IN_PROGRESS; - - if (InfoLevel != SC_ENUM_PROCESS_INFO) - return ERROR_INVALID_LEVEL; - - hManager = (PMANAGER_HANDLE)hSCManager; - if (!hManager || hManager->Handle.Tag != MANAGER_TAG) - { - DPRINT1("Invalid manager handle!\n"); - return ERROR_INVALID_HANDLE; - } - - *pcbBytesNeeded = 0; - *lpServicesReturned = 0; - - if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) - { - DPRINT1("Not a valid Service Type!\n"); - return ERROR_INVALID_PARAMETER; - } - - if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) - { - DPRINT1("Not a valid Service State!\n"); - return ERROR_INVALID_PARAMETER; - } - - /* Check access rights */ - if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, - SC_MANAGER_ENUMERATE_SERVICE)) - { - DPRINT1("Insufficient access rights! 0x%lx\n", - hManager->Handle.DesiredAccess); - return ERROR_ACCESS_DENIED; - } - - if (lpResumeIndex) dwLastResumeCount = *lpResumeIndex; - - /* FIXME: Lock the service list shared */ - - lpService = ScmGetServiceEntryByResumeCount(dwLastResumeCount); - if (lpService == NULL) - { - dwError = ERROR_SUCCESS; - goto Done; - } - - dwRequiredSize = 0; - dwServiceCount = 0; - if (pszGroupName) { pszGroupNameW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (strlen(pszGroupName) + 1) * sizeof(WCHAR)); - if (!pszGroupNameW) - { - DPRINT1("Failed to allocate buffer!\n"); - return ERROR_NOT_ENOUGH_MEMORY; - } + if (!pszGroupNameW) + { + DPRINT1("Failed to allocate buffer!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } MultiByteToWideChar(CP_ACP, 0, pszGroupName, @@ -4604,208 +4423,81 @@ strlen(pszGroupName) + 1); } - for (ServiceEntry = &lpService->ServiceListEntry; - ServiceEntry != &ServiceListHead; - ServiceEntry = ServiceEntry->Flink) - { - CurrentService = CONTAINING_RECORD(ServiceEntry, - SERVICE, - ServiceListEntry); - - if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) - continue; - - dwState = SERVICE_ACTIVE; - if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) - dwState = SERVICE_INACTIVE; - - if ((dwState & dwServiceState) == 0) - continue; - - if (pszGroupNameW) - { - if (*pszGroupNameW == 0) - { - if (CurrentService->lpGroup != NULL) - continue; - } - else - { - if ((CurrentService->lpGroup == NULL) || - _wcsicmp(pszGroupNameW, CurrentService->lpGroup->lpGroupName)) - continue; - } - } - - dwSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW) + - (wcslen(CurrentService->lpServiceName) + 1) + - (wcslen(CurrentService->lpDisplayName) + 1); - - if (dwRequiredSize + dwSize <= cbBufSize) - { - DPRINT("Service name: %S fit\n", CurrentService->lpServiceName); - dwRequiredSize += dwSize; - dwServiceCount++; - dwLastResumeCount = CurrentService->dwResumeCount; - } - else - { - DPRINT("Service name: %S no fit\n", CurrentService->lpServiceName); - break; - } - - } - - DPRINT("dwRequiredSize: %lu\n", dwRequiredSize); - DPRINT("dwServiceCount: %lu\n", dwServiceCount); - - for (; - ServiceEntry != &ServiceListHead; - ServiceEntry = ServiceEntry->Flink) - { - CurrentService = CONTAINING_RECORD(ServiceEntry, - SERVICE, - ServiceListEntry); - - if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) - continue; - - dwState = SERVICE_ACTIVE; - if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) - dwState = SERVICE_INACTIVE; - - if ((dwState & dwServiceState) == 0) - continue; - - if (pszGroupNameW) - { - if (*pszGroupNameW == 0) - { - if (CurrentService->lpGroup != NULL) - continue; - } - else - { - if ((CurrentService->lpGroup == NULL) || - _wcsicmp(pszGroupNameW, CurrentService->lpGroup->lpGroupName)) - continue; - } - } - - dwRequiredSize += (sizeof(ENUM_SERVICE_STATUS_PROCESSW) + - (wcslen(CurrentService->lpServiceName) + 1) + - (wcslen(CurrentService->lpDisplayName) + 1)); - - dwError = ERROR_MORE_DATA; - } - - DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); - - if (lpResumeIndex) *lpResumeIndex = dwLastResumeCount; - *lpServicesReturned = dwServiceCount; - *pcbBytesNeeded = dwRequiredSize; - - /* If there was no services that matched */ - if (!dwServiceCount) - { - dwError = ERROR_SERVICE_DOES_NOT_EXIST; - goto Done; - } - - lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSA)lpBuffer; - lpStringPtr = (LPSTR)((ULONG_PTR)lpBuffer + - dwServiceCount * sizeof(ENUM_SERVICE_STATUS_PROCESSA)); - - dwRequiredSize = 0; - for (ServiceEntry = &lpService->ServiceListEntry; - ServiceEntry != &ServiceListHead; - ServiceEntry = ServiceEntry->Flink) - { - CurrentService = CONTAINING_RECORD(ServiceEntry, - SERVICE, - ServiceListEntry); - - if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) - continue; - - dwState = SERVICE_ACTIVE; - if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) - dwState = SERVICE_INACTIVE; - - if ((dwState & dwServiceState) == 0) - continue; - - if (pszGroupNameW) - { - if (*pszGroupNameW == 0) - { - if (CurrentService->lpGroup != NULL) - continue; - } - else - { - if ((CurrentService->lpGroup == NULL) || - _wcsicmp(pszGroupNameW, CurrentService->lpGroup->lpGroupName)) - continue; - } - } - - dwSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW) + - ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + - ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); - - if (dwRequiredSize + dwSize <= cbBufSize) - { - /* Copy the service name */ - WideCharToMultiByte(CP_ACP, - 0, - CurrentService->lpServiceName, - -1, - lpStringPtr, - wcslen(CurrentService->lpServiceName), - 0, - 0); - lpStatusPtr->lpServiceName = (LPSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); - lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1); - - /* Copy the display name */ - WideCharToMultiByte(CP_ACP, - 0, - CurrentService->lpDisplayName, - -1, - lpStringPtr, - wcslen(CurrentService->lpDisplayName), - 0, - 0); - lpStatusPtr->lpDisplayName = (LPSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); - lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1); - - /* Copy the status information */ - memcpy(&lpStatusPtr->ServiceStatusProcess, - &CurrentService->Status, - sizeof(SERVICE_STATUS)); - lpStatusPtr->ServiceStatusProcess.dwProcessId = CurrentService->ProcessId; /* FIXME */ - lpStatusPtr->ServiceStatusProcess.dwServiceFlags = 0; /* FIXME */ - - lpStatusPtr++; - dwRequiredSize += dwSize; - } - else - { - break; - } - } - - if (dwError != ERROR_MORE_DATA) - { - *pcbBytesNeeded = 0; - if (lpResumeIndex) *lpResumeIndex = 0; + if ((cbBufSize > 0) && (lpBuffer)) + { + lpStatusPtrW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbBufSize); + if (!lpStatusPtrW) + { + DPRINT1("Failed to allocate buffer!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + } + + dwError = REnumServicesStatusExW(BindingHandle, + hSCManager, + InfoLevel, + dwServiceType, + dwServiceState, + (LPBYTE)lpStatusPtrW, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeIndex, + pszGroupNameW); + + /* if no services were returned then we are Done */ + if (*lpServicesReturned == 0) goto Done; + + lpStatusPtrA = (LPENUM_SERVICE_STATUS_PROCESSA)lpBuffer; + lpStringPtrA = (LPSTR)((ULONG_PTR)lpBuffer + + *lpServicesReturned * sizeof(ENUM_SERVICE_STATUS_PROCESSA)); + lpStringPtrW = (LPWSTR)((ULONG_PTR)lpStatusPtrW + + *lpServicesReturned * sizeof(ENUM_SERVICE_STATUS_PROCESSW)); + + for (dwServiceCount = 0; dwServiceCount < *lpServicesReturned; dwServiceCount++) + { + /* Copy the service name */ + WideCharToMultiByte(CP_ACP, + 0, + lpStringPtrW, + -1, + lpStringPtrA, + wcslen(lpStringPtrW), + 0, + 0); + + lpStatusPtrA->lpServiceName = (LPSTR)((ULONG_PTR)lpStringPtrA - (ULONG_PTR)lpBuffer); + lpStringPtrA += wcslen(lpStringPtrW) + 1; + lpStringPtrW += wcslen(lpStringPtrW) + 1; + + /* Copy the display name */ + WideCharToMultiByte(CP_ACP, + 0, + lpStringPtrW, + -1, + lpStringPtrA, + wcslen(lpStringPtrW), + 0, + 0); + + lpStatusPtrA->lpDisplayName = (LPSTR)((ULONG_PTR)lpStringPtrA - (ULONG_PTR)lpBuffer); + lpStringPtrA += wcslen(lpStringPtrW) + 1; + lpStringPtrW += wcslen(lpStringPtrW) + 1; + + /* Copy the status information */ + memcpy(&lpStatusPtrA->ServiceStatusProcess, + &lpStatusPtrW->ServiceStatusProcess, + sizeof(SERVICE_STATUS)); + + lpStatusPtrA->ServiceStatusProcess.dwProcessId = lpStatusPtrW->ServiceStatusProcess.dwProcessId; /* FIXME */ + lpStatusPtrA->ServiceStatusProcess.dwServiceFlags = 0; /* FIXME */ + lpStatusPtrA++; } Done:; - /* Unlock the service list */ - - if (pszGroupNameW) HeapFree(GetProcessHeap(),0,pszGroupNameW); + if (pszGroupNameW) HeapFree(GetProcessHeap(), 0, pszGroupNameW); + + if (lpStatusPtrW) HeapFree(GetProcessHeap(), 0, lpStatusPtrW); DPRINT("REnumServicesStatusExA() done (Error %lu)\n", dwError); @@ -5073,7 +4765,7 @@ } } - if (dwError != ERROR_MORE_DATA) + if (dwError == 0) { *pcbBytesNeeded = 0; if (lpResumeIndex) *lpResumeIndex = 0;

16 years, 2 months

← Newer
1
...
34
35
36
37
38
39
40
...
52
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 October 2008