Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[gschneider] 38610: Compile audiosrv warning free by defining array parts of GUIDs with braces

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Jan 6 12:09:51 2009 New Revision: 38610 URL: http://svn.reactos.org/svn/reactos?rev=38610&view=rev Log: Compile audiosrv warning free by defining array parts of GUIDs with braces Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/audiosrv.rbuild [iso-8859-1] Tue Jan 6 12:09:51 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" unicode="yes" allowwarnings="true"> +<module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" unicode="yes"> <include base="audiosrv">.</include> <library>kernel32</library> <library>advapi32</library> Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Tue Jan 6 12:09:51 2009 @@ -18,24 +18,24 @@ /* Audio device (as presented by sysaudio) */ #define STATIC_KSCATEGORY_AUDIO_DEVICE \ - 0xFBF6F530L, 0x07B9, 0x11D2, 0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88 + 0xFBF6F530L, 0x07B9, 0x11D2, {0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88} DEFINE_GUIDSTRUCT("FBF6F530-07B9-11D2-A71E-0000F8004788", KSCATEGORY_AUDIO_DEVICE); #define KSCATEGORY_AUDIO_DEVICE DEFINE_GUIDNAMED(KSCATEGORY_AUDIO_DEVICE) /* Preferred devices */ #define STATIC_KSCATEGORY_PREFERRED_WAVEOUT_DEVICE \ - 0xD6C5066EL, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88 + 0xD6C5066EL, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88} DEFINE_GUIDSTRUCT("D6C5066E-72C1-11D2-9755-0000F8004788", KSCATEGORY_PREFERRED_WAVEOUT_DEVICE); #define KSCATEGORY_PREFERRED_WAVEOUT_DEVICE DEFINE_GUIDNAMED(KSCATEGORY_PREFERRED_WAVEOUT_DEVICE) #define STATIC_KSCATEGORY_PREFERRED_WAVEIN_DEVICE \ - 0xD6C50671L, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88 + 0xD6C50671L, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88} DEFINE_GUIDSTRUCT("D6C50671-72C1-11D2-9755-0000F8004788", KSCATEGORY_PREFERRED_WAVEIN_DEVICE); #define KSCATEGORY_PREFERRED_WAVEIN_DEVICE DEFINE_GUIDNAMED(KSCATEGORY_PREFERRED_WAVEIN_DEVICE) #define STATIC_KSCATEGORY_PREFERRED_MIDIOUT_DEVICE \ - 0xD6C50674L, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88 + 0xD6C50674L, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88} DEFINE_GUIDSTRUCT("D6C50674-72C1-11D2-9755-0000F8004788", KSCATEGORY_PREFERRED_MIDIOUT_DEVICE); #define KSCATEGORY_PREFERRED_MIDIOUT_DEVICE DEFINE_GUIDNAMED(KSCATEGORY_PREFERRED_MIDIOUT_DEVICE) @@ -43,44 +43,44 @@ /* Media type categories */ #define STATIC_KSCATEGORY_AUDIO \ - 0x6994AD04L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x6994AD04L, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("6994AD04-93EF-11D0-A3CC-00A0C9223196", KSCATEGORY_AUDIO); #define KSCATEGORY_AUDIO DEFINE_GUIDNAMED(KSCATEGORY_AUDIO) #define STATIC_KSCATEGORY_VIDEO \ - 0x6994AD05L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x6994AD05L, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("6994AD05-93EF-11D0-A3CC-00A0C9223196", KSCATEGORY_VIDEO); #define KSCATEGORY_VIDEO DEFINE_GUIDNAMED(KSCATEGORY_VIDEO) #define STATIC_KSCATEGORY_TEXT \ - 0x6994AD06L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x6994AD06L, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("6994AD06-93EF-11D0-A3CC-00A0C9223196", KSCATEGORY_TEXT); #define KSCATEGORY_TEXT DEFINE_GUIDNAMED(KSCATEGORY_TEXT) #define STATIC_KSCATEGORY_NETWORK \ - 0x67C9CC3CL, 0x69C4, 0x11D2, 0x87, 0x59, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x67C9CC3CL, 0x69C4, 0x11D2, {0x87, 0x59, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("67C9CC3C-69C4-11D2-8759-00A0C9223196", KSCATEGORY_NETWORK); #define KSCATEGORY_NETWORK DEFINE_GUIDNAMED(KSCATEGORY_NETWORK) #define STATIC_KSINTERFACESETID_Media \ - 0x3A13EB40L, 0x30A7, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x3A13EB40L, 0x30A7, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("3A13EB40-30A7-11D0-A5D6-28DB04C10000", KSINTERFACESETID_Media); #define KSINTERFACESETID_Media DEFINE_GUIDNAMED(KSINTERFACESETID_Media) /* ... */ #define STATIC_KSCATEGORY_TOPOLOGY \ - 0xDDA54A40L, 0x1E4C, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00 + 0xDDA54A40L, 0x1E4C, 0x11D1, {0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("DDA54A40-1E4C-11D1-A050-405705C10000", KSCATEGORY_TOPOLOGY); #define KSCATEGORY_TOPOLOGY DEFINE_GUIDNAMED(KSCATEGORY_TOPOLOGY) #define STATIC_KSCATEGORY_VIRTUAL \ - 0x3503EAC4L, 0x1F26, 0x11D1, 0x8A, 0xB0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x3503EAC4L, 0x1F26, 0x11D1, {0x8A, 0xB0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("3503EAC4-1F26-11D1-8AB0-00A0C9223196", KSCATEGORY_VIRTUAL); #define KSCATEGORY_VIRTUAL DEFINE_GUIDNAMED(KSCATEGORY_VIRTUAL) #define STATIC_KSCATEGORY_ACOUSTIC_ECHO_CANCEL \ - 0xBF963D80L, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0xBF963D80L, 0xC559, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("BF963D80-C559-11D0-8A2B-00A0C9255AC1", KSCATEGORY_ACOUSTIC_ECHO_CANCEL); #define KSCATEGORY_ACOUSTIC_ECHO_CANCEL DEFINE_GUIDNAMED(KSCATEGORY_ACOUSTIC_ECHO_CANCEL) @@ -88,22 +88,22 @@ /* Component-specific */ #define STATIC_KSCATEGORY_SYSAUDIO \ - 0xA7C7A5B1L, 0x5AF3, 0x11D1, 0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07 + 0xA7C7A5B1L, 0x5AF3, 0x11D1, {0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07} DEFINE_GUIDSTRUCT("A7C7A5B1-5AF3-11D1-9CED-00A024BF0407", KSCATEGORY_SYSAUDIO); #define KSCATEGORY_SYSAUDIO DEFINE_GUIDNAMED(KSCATEGORY_SYSAUDIO) #define STATIC_KSCATEGORY_WDMAUD \ - 0x3E227E76L, 0x690D, 0x11D2, 0x81, 0x61, 0x00, 0x00, 0xF8, 0x77, 0x5B, 0xF1 + 0x3E227E76L, 0x690D, 0x11D2, {0x81, 0x61, 0x00, 0x00, 0xF8, 0x77, 0x5B, 0xF1} DEFINE_GUIDSTRUCT("3E227E76-690D-11D2-8161-0000F8775BF1", KSCATEGORY_WDMAUD); #define KSCATEGORY_WDMAUD DEFINE_GUIDNAMED(KSCATEGORY_WDMAUD) #define STATIC_KSCATEGORY_AUDIO_GFX \ - 0x9BAF9572L, 0x340C, 0x11D3, 0xAB, 0xDC, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0x6F + 0x9BAF9572L, 0x340C, 0x11D3, {0xAB, 0xDC, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0x6F} DEFINE_GUIDSTRUCT("9BAF9572-340C-11D3-ABDC-00A0C90AB16F", KSCATEGORY_AUDIO_GFX); #define KSCATEGORY_AUDIO_GFX DEFINE_GUIDNAMED(KSCATEGORY_AUDIO_GFX) #define STATIC_KSCATEGORY_AUDIO_SPLITTER \ - 0x9EA331FAL, 0xB91B, 0x45F8, 0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE + 0x9EA331FAL, 0xB91B, 0x45F8, {0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE} DEFINE_GUIDSTRUCT("9EA331FA-B91B-45F8-9285-BD2BC77AFCDE", KSCATEGORY_AUDIO_SPLITTER); #define KSCATEGORY_AUDIO_SPLITTER DEFINE_GUIDNAMED(KSCATEGORY_AUDIO_SPLITTER) @@ -118,7 +118,7 @@ */ #define STATIC_KSCATEGORY_WDMAUD_USE_PIN_NAME \ - 0x47A4FA20L, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88 + 0x47A4FA20L, 0xA251, 0x11D1, {0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88} DEFINE_GUIDSTRUCT("47A4FA20-A251-11D1-A050-0000F8004788", KSCATEGORY_WDMAUD_USE_PIN_NAME); #define KSCATEGORY_WDMAUD_USE_PIN_NAME DEFINE_GUIDNAMED(KSCATEGORY_WDMAUD_USE_PIN_NAME) @@ -129,35 +129,35 @@ // 'vids' #define STATIC_KSDATAFORMAT_TYPE_VIDEO \ - 0x73646976L, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 + 0x73646976L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} DEFINE_GUIDSTRUCT("73646976-0000-0010-8000-00aa00389b71", KSDATAFORMAT_TYPE_VIDEO); #define KSDATAFORMAT_TYPE_VIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_VIDEO) // 'auds' #define STATIC_KSDATAFORMAT_TYPE_AUDIO \ - 0x73647561L, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 + 0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} DEFINE_GUIDSTRUCT("73647561-0000-0010-8000-00aa00389b71", KSDATAFORMAT_TYPE_AUDIO); #define KSDATAFORMAT_TYPE_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_AUDIO) // 'txts' #define STATIC_KSDATAFORMAT_TYPE_TEXT \ - 0x73747874L, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 + 0x73747874L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} DEFINE_GUIDSTRUCT("73747874-0000-0010-8000-00aa00389b71", KSDATAFORMAT_TYPE_TEXT); #define KSDATAFORMAT_TYPE_TEXT DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_TEXT) #define STATIC_KSDATAFORMAT_TYPE_MUSIC \ - 0xE725D360L, 0x62CC, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0xE725D360L, 0x62CC, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("E725D360-62CC-11CF-A5D6-28DB04C10000", KSDATAFORMAT_TYPE_MUSIC); #define KSDATAFORMAT_TYPE_MUSIC DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_MUSIC) // 'mids' #define STATIC_KSDATAFORMAT_TYPE_MIDI \ - 0x7364696DL, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 + 0x7364696DL, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} DEFINE_GUIDSTRUCT("7364696D-0000-0010-8000-00aa00389b71", KSDATAFORMAT_TYPE_MIDI); #define KSDATAFORMAT_TYPE_MIDI DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_MIDI) #define STATIC_KSDATAFORMAT_SUBTYPE_MIDI \ - 0x1D262760L, 0xE957, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x1D262760L, 0xE957, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("1D262760-E957-11CF-A5D6-28DB04C10000", KSDATAFORMAT_SUBTYPE_MIDI); #define KSDATAFORMAT_SUBTYPE_MIDI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MIDI) @@ -167,7 +167,7 @@ */ #define STATIC_KSPROPSETID_Sysaudio \ - 0xCBE3FAA0L, 0xCC75, 0x11D0, 0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6 + 0xCBE3FAA0L, 0xCC75, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6} DEFINE_GUIDSTRUCT("CBE3FAA0-CC75-11D0-B465-00001A1818E6", KSPROPSETID_Sysaudio); #define KSPROPSETID_Sysaudio DEFINE_GUIDNAMED(KSPROPSETID_Sysaudio)

15 years, 11 months

[cwittich] 38609: -Rob Shearman <robertshearman at gmail.com> Thu Sep 18 2008 widl: Don't automatically add DUMMYUNIONNAME and DUMMYSTRUCTNAME names to anonymous unions and structs. -Rob Shearman <robertshearman at gmail.com> Thu Sep 18 2008 include: Add explicit DUMMYUNIONNAME and DUMMYSTRUCTNAME names to anonymous unions in IDL files.

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 6 11:52:24 2009 New Revision: 38609 URL: http://svn.reactos.org/svn/reactos?rev=38609&view=rev Log: -Rob Shearman <robertshearman at gmail.com> Thu Sep 18 2008 widl: Don't automatically add DUMMYUNIONNAME and DUMMYSTRUCTNAME names to anonymous unions and structs. -Rob Shearman <robertshearman at gmail.com> Thu Sep 18 2008 include: Add explicit DUMMYUNIONNAME and DUMMYSTRUCTNAME names to anonymous unions in IDL files. Modified: trunk/reactos/include/psdk/oaidl.idl trunk/reactos/include/psdk/objidl.idl trunk/reactos/include/psdk/propidl.idl trunk/reactos/include/reactos/idl/svcctl.idl trunk/reactos/tools/widl/header.c Modified: trunk/reactos/include/psdk/oaidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oaidl.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/oaidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/oaidl.idl [iso-8859-1] Tue Jan 6 11:52:24 2009 @@ -286,7 +286,7 @@ [case(VT_DISPATCH|VT_BYREF)] IDispatch **ppdispVal; [case(VT_ARRAY|VT_BYREF)] wireSAFEARRAY *pparray; [case(VT_RECORD, VT_RECORD|VT_BYREF)] wireBRECORD brecVal; - }; + } DUMMYUNIONNAME; }; /* Dispatch */ @@ -313,7 +313,7 @@ [case(VT_CARRAY)] struct tagARRAYDESC *lpadesc; [case(VT_USERDEFINED)] HREFTYPE hreftype; [default] ; - }; + } DUMMYUNIONNAME; VARTYPE vt; } TYPEDESC; @@ -484,7 +484,7 @@ [switch_is(varkind)] union { [case(VAR_PERINSTANCE, VAR_DISPATCH, VAR_STATIC)] ULONG oInst; [case(VAR_CONST)] VARIANT *lpvarValue; - }; + } DUMMYUNIONNAME; ELEMDESC elemdescVar; WORD wVarFlags; VARKIND varkind; Modified: trunk/reactos/include/psdk/objidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objidl.idl?re… ============================================================================== --- trunk/reactos/include/psdk/objidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objidl.idl [iso-8859-1] Tue Jan 6 11:52:24 2009 @@ -1378,7 +1378,6 @@ [size_is(cbData)] byte data[]; } RemSTGMEDIUM; - /* FIXME: C/C++ nameless union version */ typedef struct tagSTGMEDIUM { DWORD tymed; [switch_is(tymed)] union { @@ -1390,7 +1389,7 @@ [case(TYMED_ISTREAM)] IStream *pstm; [case(TYMED_ISTORAGE)] IStorage *pstg; [default] ; - }; + } DUMMYUNIONNAME; [unique] IUnknown *pUnkForRelease; } uSTGMEDIUM; @@ -1425,7 +1424,7 @@ case TYMED_FILE: LPOLESTR lpszFileName; case TYMED_ISTREAM: BYTE_BLOB *pstm; case TYMED_ISTORAGE: BYTE_BLOB *pstg; - }; + } DUMMYUNIONNAME; IUnknown *pUnkForRelease; } userSTGMEDIUM; Modified: trunk/reactos/include/psdk/propidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propidl.idl?r… ============================================================================== --- trunk/reactos/include/psdk/propidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/propidl.idl [iso-8859-1] Tue Jan 6 11:52:24 2009 @@ -201,7 +201,7 @@ [case(VT_BYREF|VT_DISPATCH)] IDispatch **ppdispVal; [case(VT_BYREF|VT_ARRAY)] LPSAFEARRAY *pparray; [case(VT_BYREF|VT_VARIANT)] PROPVARIANT *pvarVal; - }; + } DUMMYUNIONNAME; }; typedef struct tagPROPVARIANT *LPPROPVARIANT; @@ -255,7 +255,7 @@ [case(PRSPEC_PROPID)] PROPID propid; [case(PRSPEC_LPWSTR)] LPOLESTR lpwstr; [default] ; - }; + } DUMMYUNIONNAME; } PROPSPEC; typedef struct tagSTATPROPSTG { Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Tue Jan 6 11:52:24 2009 @@ -188,7 +188,7 @@ [case(5)] LPSERVICE_SID_INFO pssid; [case(6)] LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO psrp; [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps; - }; + } DUMMYUNIONNAME; } SC_RPC_CONFIG_INFOA, *LPSC_RPC_CONFIG_INFOA; typedef struct _SC_RPC_CONFIG_INFOW { @@ -201,7 +201,7 @@ [case(5)] LPSERVICE_SID_INFO pssid; [case(6)] LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO psrp; [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps; - }; + } DUMMYUNIONNAME; } SC_RPC_CONFIG_INFOW, *LPSC_RPC_CONFIG_INFOW; typedef struct _SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_1 { Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=38… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Tue Jan 6 11:52:24 2009 @@ -150,28 +150,8 @@ { if (!v) return; if (v->type) { - const char *name = v->name; - if (name == NULL) { - switch (v->type->type) { - case RPC_FC_STRUCT: - case RPC_FC_CVSTRUCT: - case RPC_FC_CPSTRUCT: - case RPC_FC_CSTRUCT: - case RPC_FC_PSTRUCT: - case RPC_FC_BOGUS_STRUCT: - case RPC_FC_ENCAPSULATED_UNION: - name = "DUMMYSTRUCTNAME"; - break; - case RPC_FC_NON_ENCAPSULATED_UNION: - name = "DUMMYUNIONNAME"; - break; - default: - /* ? */ - break; - } - } indent(h, 0); - write_type_def_or_decl(h, v->type, TRUE, "%s", name); + write_type_def_or_decl(h, v->type, TRUE, "%s", v->name); fprintf(h, ";\n"); } }

15 years, 11 months

[gschneider] 38608: Clean up IntGdiRealizePalette by removing old and/or dead code, misleading descriptions and obsolete numbering.

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Jan 6 11:38:30 2009 New Revision: 38608 URL: http://svn.reactos.org/svn/reactos?rev=38608&view=rev Log: Clean up IntGdiRealizePalette by removing old and/or dead code, misleading descriptions and obsolete numbering. Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Tue Jan 6 11:38:30 2009 @@ -486,24 +486,20 @@ { /* * This function doesn't do any real work now and there's plenty - * of bugs in it (calling SetPalette for high/true-color modes, - * using DEFAULT_PALETTE instead of the device palette, ...). + * of bugs in it. */ - PALOBJ *palPtr, *sysPtr; PPALGDI palGDI, sysGDI; int realized = 0; PDC dc; HPALETTE systemPalette; - //BOOLEAN success; USHORT sysMode, palMode; dc = DC_LockDc(hDC); if (!dc) return 0; - systemPalette = NtGdiGetStockObject((INT)DEFAULT_PALETTE); + systemPalette = NtGdiGetStockObject(DEFAULT_PALETTE); palGDI = PALETTE_LockPalette(dc->DcLevel.hpal); - palPtr = (PALOBJ*) palGDI; if (palGDI == NULL) { @@ -513,7 +509,6 @@ } sysGDI = PALETTE_LockPalette(systemPalette); - sysPtr = (PALOBJ*) sysGDI; if (sysGDI == NULL) { @@ -523,35 +518,16 @@ return 0; } - - // Step 1: Create mapping of system palette\DC palette -#ifndef NO_MAPPING - realized = PALETTE_SetMapping(palPtr, 0, palGDI->NumColors, - (dc->DcLevel.hpal != hPrimaryPalette) || - (dc->DcLevel.hpal == NtGdiGetStockObject(DEFAULT_PALETTE))); -#else - realized = 0; -#endif - - - - // Step 2: // The RealizePalette function modifies the palette for the device associated with the specified device context. If the // device context is a memory DC, the color table for the bitmap selected into the DC is modified. If the device // context is a display DC, the physical palette for that device is modified. if(dc->DC_Type == DC_TYPE_MEMORY) { // Memory managed DC - DPRINT1("win32k: realizepalette unimplemented step 2 for DC_MEMORY\n"); - } else { - DPRINT1("win32k: realizepalette commented out step 2\n"); - /* See bug 733, keep the code for now. - if( ((GDIDEVICE *)dc->pPDev)->DriverFunctions.SetPalette) - { - ASSERT(palGDI->NumColors <= 256); - success = ((GDIDEVICE *)dc->pPDev)->DriverFunctions.SetPalette( - dc->PDev, palPtr, 0, 0, palGDI->NumColors); - }*/ + DPRINT1("RealizePalette unimplemented for memory managed DCs\n"); + } else + { + DPRINT1("RealizePalette unimplemented for device DCs\n"); } // need to pass this to IntEngCreateXlate with palettes unlocked @@ -560,7 +536,7 @@ PALETTE_UnlockPalette(sysGDI); PALETTE_UnlockPalette(palGDI); - // Step 3: Create the XLATEOBJ for device managed DCs + // Create the XLATEOBJ for device managed DCs if(dc->DC_Type != DC_TYPE_MEMORY) { // Device managed DC

15 years, 11 months

[gschneider] 38607: - Fix a coordinate problem that occurred with alphablend in DrawIconEx (32bpp mode only) - Welcome back mixer icon in 32bpp mode! - Note for other invisible icons in that mode: 32bpp icon variants are most likely missing in the *.ico file; ReactOS image bpp conversion functions currently clear the alpha channel -> invisibility - Update function names in debug prints, remove duplicate code, slightly improve code readability

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Jan 6 11:12:07 2009 New Revision: 38607 URL: http://svn.reactos.org/svn/reactos?rev=38607&view=rev Log: - Fix a coordinate problem that occurred with alphablend in DrawIconEx (32bpp mode only) - Welcome back mixer icon in 32bpp mode! - Note for other invisible icons in that mode: 32bpp icon variants are most likely missing in the *.ico file; ReactOS image bpp conversion functions currently clear the alpha channel -> invisibility - Update function names in debug prints, remove duplicate code, slightly improve code readability Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Tue Jan 6 11:12:07 2009 @@ -1569,7 +1569,7 @@ BitmapObj = BITMAPOBJ_LockBitmap(hbmOff); if (BitmapObj == NULL) { - DPRINT1("GDIOBJ_LockObj() failed!\n"); + DPRINT1("BITMAPOBJ_LockBitmap() failed!\n"); goto cleanup; } BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (PVOID)&bm); @@ -1591,7 +1591,7 @@ hOldOffBrush = NtGdiSelectBrush(hdcOff, hbrFlickerFreeDraw); if (!hOldOffBrush) { - DPRINT1("NtGdiSelectBitmap() failed!\n"); + DPRINT1("NtGdiSelectBrush() failed!\n"); goto cleanup; } @@ -1622,21 +1622,18 @@ goto cleanup; } - DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), - (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, - 0, 0, IconSize.cx, IconSize.cy, - ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), FALSE); - - if (!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) - && (diFlags & DI_IMAGE)) - { - DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), - (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, - 0, IconSize.cy, IconSize.cx, IconSize.cy, SRCINVERT, - FALSE); - - diFlags &= ~DI_IMAGE; - } + DoStretchBlt(hdcOff, + (DoFlickerFree || bAlpha ? 0 : xLeft), + (DoFlickerFree || bAlpha ? 0 : yTop), + cxWidth, + cyHeight, + hdcMem, + 0, + 0, + IconSize.cx, + IconSize.cy, + ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), + FALSE); NtGdiSelectBitmap(hdcMem, hOldMem); } @@ -1645,9 +1642,16 @@ { hOldMem = NtGdiSelectBitmap(hdcMem, (hbmColor ? hbmColor : hbmMask)); - DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), - (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, - 0, (hbmColor ? 0 : IconSize.cy), IconSize.cx, IconSize.cy, + DoStretchBlt(hdcOff, + (DoFlickerFree || bAlpha ? 0 : xLeft), + (DoFlickerFree || bAlpha ? 0 : yTop), + cxWidth, + cyHeight, + hdcMem, + 0, + (hbmColor ? 0 : IconSize.cy), + IconSize.cx, + IconSize.cy, ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), NULL != hbmColor); @@ -1659,7 +1663,7 @@ BITMAP bm; BITMAPOBJ *BitmapObj = NULL; PBYTE pBits = NULL; - BLENDFUNCTION BlendFunc; + BLENDFUNCTION BlendFunc; DWORD Pixel; BYTE Red, Green, Blue, Alpha; DWORD Count = 0; @@ -1668,7 +1672,7 @@ BitmapObj = BITMAPOBJ_LockBitmap(hbmOff); if (BitmapObj == NULL) { - DPRINT1("GDIOBJ_LockObj() failed!\n"); + DPRINT1("BITMAPOBJ_LockBitmap() failed!\n"); goto cleanup; } BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (PVOID)&bm);

15 years, 11 months

[cwittich] 38606: update some header/idl

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 6 09:48:55 2009 New Revision: 38606 URL: http://svn.reactos.org/svn/reactos?rev=38606&view=rev Log: update some header/idl Modified: trunk/reactos/include/psdk/richedit.h trunk/reactos/include/psdk/stdole2.idl trunk/reactos/include/psdk/xmldom.idl trunk/reactos/include/psdk/xmldomdid.h Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re… ============================================================================== --- trunk/reactos/include/psdk/richedit.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/richedit.h [iso-8859-1] Tue Jan 6 09:48:55 2009 @@ -516,7 +516,7 @@ typedef struct _editstream { - DWORD dwCookie; + DWORD_PTR dwCookie; DWORD dwError; EDITSTREAMCALLBACK pfnCallback; } EDITSTREAM; Modified: trunk/reactos/include/psdk/stdole2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/stdole2.idl?r… ============================================================================== --- trunk/reactos/include/psdk/stdole2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/stdole2.idl [iso-8859-1] Tue Jan 6 09:48:55 2009 @@ -35,7 +35,7 @@ typedef unsigned long HRESULT; typedef void *VARIANT; typedef unsigned long SCODE; - + typedef struct GUID { unsigned long Data1; unsigned short Data2; @@ -64,7 +64,8 @@ [ odl, - uuid(00000000-0000-0000-C000-000000000046) + uuid(00000000-0000-0000-C000-000000000046), + hidden ] interface IUnknown { @@ -82,7 +83,8 @@ [ odl, - uuid(00020400-0000-0000-C000-000000000046) + uuid(00020400-0000-0000-C000-000000000046), + restricted ] interface IDispatch : IUnknown { @@ -119,7 +121,8 @@ [ odl, - uuid(00020404-0000-0000-C000-000000000046) + uuid(00020404-0000-0000-C000-000000000046), + hidden ] interface IEnumVARIANT : IUnknown { @@ -225,12 +228,12 @@ helpstring("Font Object"), hidden ] - interface IFont { + interface IFont : IUnknown { [propget] HRESULT Name([out, retval] BSTR *pname); [propput] HRESULT Name([in] BSTR pname); [propget] HRESULT Size([out, retval] CURRENCY *psize); - [propput] HRESULT Size([in] BSTR psize); + [propput] HRESULT Size([in] CURRENCY psize); [propget] HRESULT Bold([out, retval] VARIANT_BOOL *pbold); [propput] HRESULT Bold([in] VARIANT_BOOL pbold); @@ -300,7 +303,7 @@ helpstring("Picture Object"), hidden ] - interface IPicture /*: IUnknown*/ { + interface IPicture : IUnknown { [propget] HRESULT Handle([out, retval] OLE_HANDLE *phandle); [propget] HRESULT hPal([out, retval] OLE_HANDLE *phpal); @@ -353,7 +356,7 @@ [id(0x2)] OLE_HANDLE hPal; [id(0x3), readonly] short Type; [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width; - [id(0x5), readonly] OLE_XSIZE_HIMETRIC Height; + [id(0x5), readonly] OLE_YSIZE_HIMETRIC Height; methods: [id(0x6)] void Render(int hdc, long x, Modified: trunk/reactos/include/psdk/xmldom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmldom.idl?re… ============================================================================== --- trunk/reactos/include/psdk/xmldom.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/xmldom.idl [iso-8859-1] Tue Jan 6 09:48:55 2009 @@ -720,6 +720,20 @@ HRESULT filepos([retval, out] long * filePos); } +[ + hidden, + uuid(3efaa427-272f-11d2-836f-0000f87a7782) +] +dispinterface XMLDOMDocumentEvents +{ + properties: + methods: + [id(DISPID_XMLDOMEVENT_ONDATAAVAILABLE)] + HRESULT ondataavailable(); + + [id(DISPID_XMLDOMEVENT_ONREADYSTATECHANGE)] + HRESULT onreadystatechange(); +} [ uuid(2933bf90-7b36-11d2-b20e-00c04f983e60) Modified: trunk/reactos/include/psdk/xmldomdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmldomdid.h?r… ============================================================================== --- trunk/reactos/include/psdk/xmldomdid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/xmldomdid.h [iso-8859-1] Tue Jan 6 09:48:55 2009 @@ -197,5 +197,9 @@ #define DISPID_DOM_ERROR_FILEPOS 0x000000b7 #define DISPID_DOM_ERROR__TOP 0x000000b8 +#define DISPID_XMLDOMEVENT 197 +#define DISPID_XMLDOMEVENT_ONREADYSTATECHANGE DISPID_READYSTATECHANGE +#define DISPID_XMLDOMEVENT_ONDATAAVAILABLE 198 +#define DISPID_XMLDOMEVENT__TOP 199 #endif /* __XMLDOMDID_H__ */

15 years, 11 months

[cwittich] 38605: fpclass -> _fpclass

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 6 04:33:42 2009 New Revision: 38605 URL: http://svn.reactos.org/svn/reactos?rev=38605&view=rev Log: fpclass -> _fpclass Modified: trunk/reactos/lib/3rdparty/libxml2/trionan.c Modified: trunk/reactos/lib/3rdparty/libxml2/trionan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trion… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/trionan.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/trionan.c [iso-8859-1] Tue Jan 6 04:33:42 2009 @@ -58,7 +58,7 @@ # endif #endif /* Small ReactOS hack */ -#define fpclassify fpclass +#define fpclassify _fpclass #include <assert.h> #if defined(TRIO_DOCUMENTATION)

15 years, 11 months

[cwittich] 38604: update libxml2 to 2.7.2

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 6 04:24:26 2009 New Revision: 38604 URL: http://svn.reactos.org/svn/reactos?rev=38604&view=rev Log: update libxml2 to 2.7.2 Modified: trunk/reactos/include/reactos/libs/libxml/xmlsave.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h trunk/reactos/lib/3rdparty/libxml2/ChangeLog trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c trunk/reactos/lib/3rdparty/libxml2/NEWS trunk/reactos/lib/3rdparty/libxml2/config.h.in trunk/reactos/lib/3rdparty/libxml2/configure trunk/reactos/lib/3rdparty/libxml2/configure.in trunk/reactos/lib/3rdparty/libxml2/dict.c trunk/reactos/lib/3rdparty/libxml2/libxml2.spec trunk/reactos/lib/3rdparty/libxml2/parser.c trunk/reactos/lib/3rdparty/libxml2/runxmlconf.c trunk/reactos/lib/3rdparty/libxml2/xmlreader.c trunk/reactos/lib/3rdparty/libxml2/xmlsave.c Modified: trunk/reactos/include/reactos/libs/libxml/xmlsave.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… ============================================================================== --- trunk/reactos/include/reactos/libs/libxml/xmlsave.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxml/xmlsave.h [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -30,7 +30,10 @@ XML_SAVE_FORMAT = 1<<0, /* format save output */ XML_SAVE_NO_DECL = 1<<1, /* drop the xml declaration */ XML_SAVE_NO_EMPTY = 1<<2, /* no empty tags */ - XML_SAVE_NO_XHTML = 1<<3 /* disable XHTML1 specific rules */ + XML_SAVE_NO_XHTML = 1<<3, /* disable XHTML1 specific rules */ + XML_SAVE_XHTML = 1<<4, /* force XHTML1 specific rules */ + XML_SAVE_AS_XML = 1<<5, /* force XML serialization on HTML doc */ + XML_SAVE_AS_HTML = 1<<6 /* force HTML serialization on XML doc */ } xmlSaveOption; Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… ============================================================================== --- trunk/reactos/include/reactos/libs/libxml/xmlversion.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxml/xmlversion.h [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -29,21 +29,21 @@ * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.7.1" +#define LIBXML_DOTTED_VERSION "2.7.2" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 20701 +#define LIBXML_VERSION 20702 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "20701" +#define LIBXML_VERSION_STRING "20702" /** * LIBXML_VERSION_EXTRA: @@ -58,7 +58,7 @@ * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20701); +#define LIBXML_TEST_VERSION xmlCheckVersion(20702); #ifndef VMS #if 0 Modified: trunk/reactos/lib/3rdparty/libxml2/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Chang… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/ChangeLog [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/ChangeLog [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -1,3 +1,39 @@ +Fri Oct 3 09:43:45 CEST 2008 Daniel Veillard <daniel(a)veillard.com> + + * configure.in doc/* NEWS: preparing the release of 2.7.2 + * dict.c: fix the Solaris portability issue + * parser.c: additional cleanup on #554660 fix + * test/ent13 result/ent13* result/noent/ent13*: added the + example in the regression test suite. + * HTMLparser.c: handle leading BOM in htmlParseElement() + +Thu Oct 2 22:53:39 CEST 2008 Daniel Veillard <daniel(a)veillard.com> + + * parser.c: fix a nasty bug introduced when cleaning up + entities processing in 2.7.x , fixes #554660 + +Thu Sep 25 18:04:20 CEST 2008 Daniel Veillard <daniel(a)veillard.com> + + * HTMLparser.c: fix an HTML parsing error on large data sections + reported by Mike Day + * test/HTML/utf8bug.html result/HTML/utf8bug.html.err + result/HTML/utf8bug.html.sax result/HTML/utf8bug.html: add the + reproducer to the test suite + +Thu Sep 25 17:35:57 CEST 2008 Daniel Veillard <daniel(a)veillard.com> + + * runxmlconf.c: fix compilation if XPath is not included + +Thu Sep 25 16:54:04 CEST 2008 Daniel Veillard <daniel(a)veillard.com> + + * xmlreader.c: patch from Riccardo Scussat fixing custom error + handlers problems. + +Thu Sep 25 16:30:11 CEST 2008 Daniel Veillard <daniel(a)veillard.com> + + * include/libxml/xmlsave.h xmlsave.c: new options to serialize + as XML/HTML/XHTML and restore old entry point behaviours + Mon Sep 1 16:49:05 CEST 2008 Daniel Veillard <daniel(a)veillard.com> * doc/xml.html doc/news.html configure.in python/setup.py NEWS: Modified: trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/HTMLp… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -2768,6 +2768,7 @@ xmlChar buf[HTML_PARSER_BIG_BUFFER_SIZE + 5]; int nbchar = 0; int cur, l; + int chunk = 0; SHRINK; cur = CUR_CHAR(l); @@ -2798,6 +2799,12 @@ nbchar = 0; } NEXTL(l); + chunk++; + if (chunk > HTML_PARSER_BUFFER_SIZE) { + chunk = 0; + SHRINK; + GROW; + } cur = CUR_CHAR(l); if (cur == 0) { SHRINK; @@ -4113,6 +4120,8 @@ int htmlParseDocument(htmlParserCtxtPtr ctxt) { + xmlChar start[4]; + xmlCharEncoding enc; xmlDtdPtr dtd; xmlInitParser(); @@ -4132,6 +4141,23 @@ if ((ctxt->sax) && (ctxt->sax->setDocumentLocator)) ctxt->sax->setDocumentLocator(ctxt->userData, &xmlDefaultSAXLocator); + if ((ctxt->encoding == (const xmlChar *)XML_CHAR_ENCODING_NONE) && + ((ctxt->input->end - ctxt->input->cur) >= 4)) { + /* + * Get the 4 first bytes and decode the charset + * if enc != XML_CHAR_ENCODING_NONE + * plug some encoding conversion routines. + */ + start[0] = RAW; + start[1] = NXT(1); + start[2] = NXT(2); + start[3] = NXT(3); + enc = xmlDetectCharEncoding(&start[0], 4); + if (enc != XML_CHAR_ENCODING_NONE) { + xmlSwitchEncoding(ctxt, enc); + } + } + /* * Wipe out everything which is before the first '<' */ @@ -4151,10 +4177,10 @@ while (((CUR == '<') && (NXT(1) == '!') && (NXT(2) == '-') && (NXT(3) == '-')) || ((CUR == '<') && (NXT(1) == '?'))) { - htmlParseComment(ctxt); - htmlParsePI(ctxt); + htmlParseComment(ctxt); + htmlParsePI(ctxt); SKIP_BLANKS; - } + } /* Modified: trunk/reactos/lib/3rdparty/libxml2/NEWS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/NEWS?… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/NEWS [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/NEWS [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -15,6 +15,17 @@ to the SVN at http://svn.gnome.org/viewcvs/libxml2/trunk/ code base.Here is the list of public releases: +2.7.2: Oct 3 2008: + - Portability fix: fix solaris compilation problem, fix compilation + if XPath is not configured in + - Bug fixes: nasty entity bug introduced in 2.7.0, restore old behaviour + when saving an HTML doc with an xml dump function, HTML UTF-8 parsing + bug, fix reader custom error handlers (Riccardo Scussat) + + - Improvement: xmlSave options for more flexibility to save as + XML/HTML/XHTML, handle leading BOM in HTML documents + + 2.7.1: Sep 1 2008: - Portability fix: Borland C fix (Moritz Both) - Bug fixes: python serialization wrappers, XPath QName corner Modified: trunk/reactos/lib/3rdparty/libxml2/config.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/config.h.in [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/config.h.in [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -85,6 +85,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the <inttypes.h.h> header file. */ +#undef HAVE_INTTYPES_H_H + /* Define if isinf is there */ #undef HAVE_ISINF Modified: trunk/reactos/lib/3rdparty/libxml2/configure URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/configure [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/configure [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -2191,7 +2191,7 @@ LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=7 -LIBXML_MICRO_VERSION=1 +LIBXML_MICRO_VERSION=2 LIBXML_MICRO_VERSION_SUFFIX= LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION @@ -22663,6 +22663,286 @@ done +for ac_header in stdint.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in inttypes.h.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + for ac_header in time.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -26382,7 +26662,7 @@ { echo "$as_me:$LINENO: checking for type of socket length (socklen_t)" >&5 echo $ECHO_N "checking for type of socket length (socklen_t)... $ECHO_C" >&6; } cat > conftest.$ac_ext <<EOF -#line 26385 "configure" +#line 26665 "configure" #include "confdefs.h" #include <stddef.h> @@ -26393,7 +26673,7 @@ (void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL) ; return 0; } EOF -if { (eval echo configure:26396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then +if { (eval echo configure:26676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then rm -rf conftest* { echo "$as_me:$LINENO: result: socklen_t *" >&5 @@ -26405,7 +26685,7 @@ rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 26408 "configure" +#line 26688 "configure" #include "confdefs.h" #include <stddef.h> @@ -26416,7 +26696,7 @@ (void)getsockopt (1, 1, 1, NULL, (size_t *)NULL) ; return 0; } EOF -if { (eval echo configure:26419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then +if { (eval echo configure:26699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then rm -rf conftest* { echo "$as_me:$LINENO: result: size_t *" >&5 @@ -26428,7 +26708,7 @@ rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 26431 "configure" +#line 26711 "configure" #include "confdefs.h" #include <stddef.h> @@ -26439,7 +26719,7 @@ (void)getsockopt (1, 1, 1, NULL, (int *)NULL) ; return 0; } EOF -if { (eval echo configure:26442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then +if { (eval echo configure:26722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then rm -rf conftest* { echo "$as_me:$LINENO: result: int *" >&5 Modified: trunk/reactos/lib/3rdparty/libxml2/configure.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/configure.in [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/configure.in [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -5,7 +5,7 @@ LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=7 -LIBXML_MICRO_VERSION=1 +LIBXML_MICRO_VERSION=2 LIBXML_MICRO_VERSION_SUFFIX= LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION @@ -378,6 +378,8 @@ AC_CHECK_HEADERS([stdarg.h]) AC_CHECK_HEADERS([sys/stat.h]) AC_CHECK_HEADERS([sys/types.h]) +AC_CHECK_HEADERS([stdint.h]) +AC_CHECK_HEADERS([inttypes.h.h]) AC_CHECK_HEADERS([time.h]) AC_CHECK_HEADERS([ansidecl.h]) AC_CHECK_HEADERS([ieeefp.h]) Modified: trunk/reactos/lib/3rdparty/libxml2/dict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/dict.… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/dict.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/dict.c [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -22,8 +22,12 @@ #include <string.h> #ifdef HAVE_STDINT_H #include <stdint.h> +#else +#ifdef HAVE_INTTYPES_H +#include <inttypes.h> #elif defined(WIN32) typedef unsigned __int32 uint32_t; +#endif #endif #include <libxml/tree.h> #include <libxml/dict.h> Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/libxml2.spec [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/libxml2.spec [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -1,6 +1,6 @@ Summary: Library providing XML and HTML support Name: libxml2 -Version: 2.7.1 +Version: 2.7.2 Release: 1 License: MIT Group: Development/Libraries @@ -128,6 +128,6 @@ %doc doc/python.html %changelog -* Mon Sep 1 2008 Daniel Veillard <veillard(a)redhat.com> -- upstream release 2.7.1 see http://xmlsoft.org/news.html +* Fri Oct 3 2008 Daniel Veillard <veillard(a)redhat.com> +- upstream release 2.7.2 see http://xmlsoft.org/news.html Modified: trunk/reactos/lib/3rdparty/libxml2/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/parser.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/parser.c [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -7215,6 +7215,7 @@ } if (*ptr != ';') { xmlFatalErr(ctxt, XML_ERR_ENTITYREF_SEMICOL_MISSING, NULL); + xmlFree(name); *str = ptr; return(NULL); } @@ -7225,8 +7226,11 @@ * Predefined entites override any extra definition */ ent = xmlGetPredefinedEntity(name); - if (ent != NULL) + if (ent != NULL) { + xmlFree(name); + *str = ptr; return(ent); + } /* * Increate the number of entity references parsed Modified: trunk/reactos/lib/3rdparty/libxml2/runxmlconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/runxm… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/runxmlconf.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/runxmlconf.c [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -11,6 +11,8 @@ #else #include <stdio.h> #endif + +#ifdef LIBXML_XPATH_ENABLED #if !defined(_WIN32) || defined(__CYGWIN__) #include <unistd.h> @@ -605,3 +607,11 @@ fclose(logfile); return(ret); } + +#else /* ! LIBXML_XPATH_ENABLED */ +#include <stdio.h> +int +main(int argc, char **argv) { + fprintf(stderr, "%s need XPath support\n", argv[0]); +} +#endif Modified: trunk/reactos/lib/3rdparty/libxml2/xmlreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlre… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/xmlreader.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/xmlreader.c [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -42,6 +42,27 @@ #endif #ifdef LIBXML_PATTERN_ENABLED #include <libxml/pattern.h> +#endif + +#define MAX_ERR_MSG_SIZE 64000 + +/* + * The following VA_COPY was coded following an example in + * the Samba project. It may not be sufficient for some + * esoteric implementations of va_list (i.e. it may need + * something involving a memcpy) but (hopefully) will be + * sufficient for libxml2. + */ +#ifndef VA_COPY + #ifdef HAVE_VA_COPY + #define VA_COPY(dest, src) va_copy(dest, src) + #else + #ifdef HAVE___VA_COPY + #define VA_COPY(dest,src) __va_copy(dest, src) + #else + #define VA_COPY(dest,src) (dest) = (src) + #endif + #endif #endif /* #define DEBUG_CALLBACKS */ @@ -4500,30 +4521,32 @@ /* helper to build a xmlMalloc'ed string from a format and va_list */ static char * xmlTextReaderBuildMessage(const char *msg, va_list ap) { - int size; + int size = 0; int chars; char *larger; - char *str; - - str = (char *) xmlMallocAtomic(150); - if (str == NULL) { - xmlGenericError(xmlGenericErrorContext, "xmlMalloc failed !\n"); - return NULL; - } - - size = 150; + char *str = NULL; + va_list aq; while (1) { - chars = vsnprintf(str, size, msg, ap); - if ((chars > -1) && (chars < size)) + VA_COPY(aq, ap); + chars = vsnprintf(str, size, msg, aq); + va_end(aq); + if (chars < 0) { + xmlGenericError(xmlGenericErrorContext, "vsnprintf failed !\n"); + if (str) + xmlFree(str); + return NULL; + } + if ((chars < size) || (size == MAX_ERR_MSG_SIZE)) break; - if (chars > -1) - size += chars + 1; - else - size += 100; + if (chars < MAX_ERR_MSG_SIZE) + size = chars + 1; + else + size = MAX_ERR_MSG_SIZE; if ((larger = (char *) xmlRealloc(str, size)) == NULL) { xmlGenericError(xmlGenericErrorContext, "xmlRealloc failed !\n"); - xmlFree(str); + if (str) + xmlFree(str); return NULL; } str = larger; Modified: trunk/reactos/lib/3rdparty/libxml2/xmlsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlsa… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/xmlsave.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/xmlsave.c [iso-8859-1] Tue Jan 6 04:24:26 2009 @@ -757,8 +757,14 @@ return; } #ifdef LIBXML_HTML_ENABLED - if ((cur->type != XML_NAMESPACE_DECL) && (cur->doc != NULL) && - (cur->doc->type == XML_HTML_DOCUMENT_NODE)) { + if (ctxt->options & XML_SAVE_XHTML) { + xhtmlNodeDumpOutput(ctxt, cur); + return; + } + if (((cur->type != XML_NAMESPACE_DECL) && (cur->doc != NULL) && + (cur->doc->type == XML_HTML_DOCUMENT_NODE) && + ((ctxt->options & XML_SAVE_AS_XML) == 0)) || + (ctxt->options & XML_SAVE_AS_HTML)) { htmlNodeDumpOutputInternal(ctxt, cur); return; } @@ -953,7 +959,10 @@ xmlGetCharEncodingName((xmlCharEncoding) cur->charset); } - if (cur->type == XML_HTML_DOCUMENT_NODE) { + if (((cur->type == XML_HTML_DOCUMENT_NODE) && + ((ctxt->options & XML_SAVE_AS_XML) == 0) && + ((ctxt->options & XML_SAVE_XHTML) == 0)) || + (ctxt->options & XML_SAVE_AS_HTML)) { #ifdef LIBXML_HTML_ENABLED if (encoding != NULL) htmlSetMetaEncoding(cur, (const xmlChar *) encoding); @@ -981,7 +990,9 @@ #else return(-1); #endif - } else if (cur->type == XML_DOCUMENT_NODE) { + } else if ((cur->type == XML_DOCUMENT_NODE) || + (ctxt->options & XML_SAVE_AS_XML) || + (ctxt->options & XML_SAVE_XHTML)) { enc = xmlParseCharEncoding((const char*) encoding); if ((encoding != NULL) && (oldctxtenc == NULL) && (buf->encoder == NULL) && (buf->conv == NULL) && @@ -1032,6 +1043,8 @@ } #ifdef LIBXML_HTML_ENABLED + if (ctxt->options & XML_SAVE_XHTML) + is_xhtml = 1; if ((ctxt->options & XML_SAVE_NO_XHTML) == 0) { dtd = xmlGetIntSubset(cur); if (dtd != NULL) { @@ -2123,6 +2136,7 @@ ctxt.format = format; ctxt.encoding = (const xmlChar *) encoding; xmlSaveCtxtInit(&ctxt); + ctxt.options |= XML_SAVE_AS_XML; #ifdef LIBXML_HTML_ENABLED dtd = xmlGetIntSubset(doc); @@ -2208,6 +2222,7 @@ ctxt.format = format; ctxt.encoding = (const xmlChar *) txt_encoding; xmlSaveCtxtInit(&ctxt); + ctxt.options |= XML_SAVE_AS_XML; xmlDocContentDumpOutput(&ctxt, out_doc); xmlOutputBufferFlush(out_buff); if (out_buff->conv != NULL) { @@ -2326,6 +2341,7 @@ ctxt.format = format; ctxt.encoding = (const xmlChar *) encoding; xmlSaveCtxtInit(&ctxt); + ctxt.options |= XML_SAVE_AS_XML; xmlDocContentDumpOutput(&ctxt, cur); ret = xmlOutputBufferClose(buf); @@ -2375,6 +2391,7 @@ ctxt.format = 0; ctxt.encoding = (const xmlChar *) encoding; xmlSaveCtxtInit(&ctxt); + ctxt.options |= XML_SAVE_AS_XML; xmlDocContentDumpOutput(&ctxt, cur); ret = xmlOutputBufferClose(buf); return(ret); @@ -2414,6 +2431,7 @@ ctxt.format = format; ctxt.encoding = (const xmlChar *) encoding; xmlSaveCtxtInit(&ctxt); + ctxt.options |= XML_SAVE_AS_XML; xmlDocContentDumpOutput(&ctxt, cur); ret = xmlOutputBufferClose(buf); return (ret); @@ -2468,6 +2486,7 @@ ctxt.format = format; ctxt.encoding = (const xmlChar *) encoding; xmlSaveCtxtInit(&ctxt); + ctxt.options |= XML_SAVE_AS_XML; xmlDocContentDumpOutput(&ctxt, cur);

15 years, 11 months

[cwittich] 38603: -don't cast const char to char -handle RPC_X_ENUM_VALUE_OUT_OF_RANGE and RPC_X_BYTE_COUNT_TOO_SMALL in ScmRpcStatusToWinError -add some traces -don't write to NULL pointers, don't do strlen on a NULL pointer

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 6 01:53:04 2009 New Revision: 38603 URL: http://svn.reactos.org/svn/reactos?rev=38603&view=rev Log: -don't cast const char to char -handle RPC_X_ENUM_VALUE_OUT_OF_RANGE and RPC_X_BYTE_COUNT_TOO_SMALL in ScmRpcStatusToWinError -add some traces -don't write to NULL pointers, don't do strlen on a NULL pointer Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/groupdb.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Tue Jan 6 01:53:04 2009 @@ -48,7 +48,7 @@ DWORD -ScmCreateServiceKey(LPWSTR lpServiceName, +ScmCreateServiceKey(LPCWSTR lpServiceName, REGSAM samDesired, PHKEY phKey) { Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Tue Jan 6 01:53:04 2009 @@ -30,7 +30,7 @@ PSERVICE -ScmGetServiceEntryByName(LPWSTR lpServiceName) +ScmGetServiceEntryByName(LPCWSTR lpServiceName) { PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; @@ -59,7 +59,7 @@ PSERVICE -ScmGetServiceEntryByDisplayName(LPWSTR lpDisplayName) +ScmGetServiceEntryByDisplayName(LPCWSTR lpDisplayName) { PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; @@ -148,7 +148,7 @@ DWORD -ScmCreateNewServiceRecord(LPWSTR lpServiceName, +ScmCreateNewServiceRecord(LPCWSTR lpServiceName, PSERVICE *lpServiceRecord) { PSERVICE lpService = NULL; @@ -225,7 +225,7 @@ static DWORD -CreateServiceListEntry(LPWSTR lpServiceName, +CreateServiceListEntry(LPCWSTR lpServiceName, HKEY hServiceKey) { PSERVICE lpService = NULL; Modified: trunk/reactos/base/system/services/groupdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/group… ============================================================================== --- trunk/reactos/base/system/services/groupdb.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/groupdb.c [iso-8859-1] Tue Jan 6 01:53:04 2009 @@ -25,7 +25,7 @@ DWORD ScmSetServiceGroup(PSERVICE lpService, - LPWSTR lpGroupName) + LPCWSTR lpGroupName) { PLIST_ENTRY GroupEntry; PSERVICE_GROUP lpGroup; 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 Jan 6 01:53:04 2009 @@ -1571,13 +1571,13 @@ DWORD ScmCanonDriverImagePath(DWORD dwStartType, - wchar_t *lpServiceName, + const wchar_t *lpServiceName, wchar_t **lpCanonName) { DWORD ServiceNameLen, Result; UNICODE_STRING NtServiceName; WCHAR *RelativeName; - WCHAR *SourceName = lpServiceName; + const WCHAR *SourceName = lpServiceName; /* Calculate the length of the service's name */ ServiceNameLen = wcslen(lpServiceName); @@ -1703,18 +1703,18 @@ /* Function 12 */ DWORD RCreateServiceW( SC_RPC_HANDLE hSCManager, - LPWSTR lpServiceName, - LPWSTR lpDisplayName, + LPCWSTR lpServiceName, + LPCWSTR lpDisplayName, DWORD dwDesiredAccess, DWORD dwServiceType, DWORD dwStartType, DWORD dwErrorControl, - LPWSTR lpBinaryPathName, - LPWSTR lpLoadOrderGroup, + LPCWSTR lpBinaryPathName, + LPCWSTR lpLoadOrderGroup, LPDWORD lpdwTagId, LPBYTE lpDependencies, DWORD dwDependSize, - LPWSTR lpServiceStartName, + LPCWSTR lpServiceStartName, LPBYTE lpPassword, DWORD dwPwSize, LPSC_RPC_HANDLE lpServiceHandle) @@ -2740,7 +2740,7 @@ /* Function 20 */ DWORD RGetServiceDisplayNameW( SC_RPC_HANDLE hSCManager, - LPWSTR lpServiceName, + LPCWSTR lpServiceName, LPWSTR lpDisplayName, DWORD *lpcchBuffer) { @@ -2773,7 +2773,10 @@ if (*lpcchBuffer == 0) { *lpcchBuffer = 1; - *lpDisplayName = '\0'; + if (lpDisplayName != NULL) + { + *lpDisplayName = '\0'; + } } return ERROR_SERVICE_DOES_NOT_EXIST; @@ -2783,7 +2786,7 @@ { dwLength = wcslen(lpService->lpServiceName); - if (lpServiceName != NULL && + if (lpDisplayName != NULL && *lpcchBuffer > dwLength) { wcscpy(lpDisplayName, lpService->lpServiceName); @@ -2811,7 +2814,7 @@ /* Function 21 */ DWORD RGetServiceKeyNameW( SC_RPC_HANDLE hSCManager, - LPWSTR lpDisplayName, + LPCWSTR lpDisplayName, LPWSTR lpServiceName, DWORD *lpcchBuffer) { @@ -2844,7 +2847,10 @@ if (*lpcchBuffer == 0) { *lpcchBuffer = 2; - *lpServiceName = '\0'; + if (lpServiceName != NULL) + { + *lpServiceName = '\0'; + } } return ERROR_SERVICE_DOES_NOT_EXIST; @@ -3774,12 +3780,12 @@ /* Function 32 */ DWORD RGetServiceDisplayNameA( SC_RPC_HANDLE hSCManager, - LPSTR lpServiceName, + LPCSTR lpServiceName, LPSTR lpDisplayName, LPBOUNDED_DWORD_4K lpcchBuffer) { // PMANAGER_HANDLE hManager; - PSERVICE lpService; + PSERVICE lpService = NULL; DWORD dwLength; DWORD dwError; LPWSTR lpServiceNameW; @@ -3797,23 +3803,26 @@ // return ERROR_INVALID_HANDLE; // } - dwLength = strlen(lpServiceName) + 1; - lpServiceNameW = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - dwLength * sizeof(WCHAR)); - if (!lpServiceNameW) - return ERROR_NOT_ENOUGH_MEMORY; - - MultiByteToWideChar(CP_ACP, - 0, - lpServiceName, - strlen(lpServiceName), - lpServiceNameW, - dwLength); - - lpService = ScmGetServiceEntryByName(lpServiceNameW); - - HeapFree(GetProcessHeap(), 0, lpServiceNameW); + if (lpServiceName != NULL) + { + dwLength = strlen(lpServiceName) + 1; + lpServiceNameW = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwLength * sizeof(WCHAR)); + if (!lpServiceNameW) + return ERROR_NOT_ENOUGH_MEMORY; + + MultiByteToWideChar(CP_ACP, + 0, + lpServiceName, + -1, + lpServiceNameW, + dwLength); + + lpService = ScmGetServiceEntryByName(lpServiceNameW); + + HeapFree(GetProcessHeap(), 0, lpServiceNameW); + } if (lpService == NULL) { @@ -3824,7 +3833,10 @@ if (*lpcchBuffer == 0) { *lpcchBuffer = 1; - *lpDisplayName = '\0'; + if (lpDisplayName != NULL) + { + *lpDisplayName = '\0'; + } } return ERROR_SERVICE_DOES_NOT_EXIST; } @@ -3832,7 +3844,7 @@ if (!lpService->lpDisplayName) { dwLength = wcslen(lpService->lpServiceName); - if (lpServiceName != NULL && + if (lpDisplayName != NULL && *lpcchBuffer > dwLength) { WideCharToMultiByte(CP_ACP, @@ -3840,7 +3852,7 @@ lpService->lpServiceName, wcslen(lpService->lpServiceName), lpDisplayName, - *lpcchBuffer, + dwLength + 1, NULL, NULL); return ERROR_SUCCESS; @@ -3857,7 +3869,7 @@ lpService->lpDisplayName, wcslen(lpService->lpDisplayName), lpDisplayName, - *lpcchBuffer, + dwLength + 1, NULL, NULL); return ERROR_SUCCESS; @@ -3875,7 +3887,7 @@ /* Function 33 */ DWORD RGetServiceKeyNameA( SC_RPC_HANDLE hSCManager, - LPSTR lpDisplayName, + LPCSTR lpDisplayName, LPSTR lpServiceName, LPBOUNDED_DWORD_4K lpcchBuffer) { @@ -3900,7 +3912,7 @@ MultiByteToWideChar(CP_ACP, 0, lpDisplayName, - strlen(lpDisplayName), + -1, lpDisplayNameW, dwLength); @@ -3917,21 +3929,24 @@ if (*lpcchBuffer == 0) { *lpcchBuffer = 1; - *lpServiceName = '\0'; + if (lpServiceName != NULL) + { + *lpServiceName = '\0'; + } } return ERROR_SERVICE_DOES_NOT_EXIST; } dwLength = wcslen(lpService->lpServiceName); - if (lpService != NULL && + if (lpServiceName != NULL && *lpcchBuffer > dwLength) { WideCharToMultiByte(CP_ACP, 0, lpService->lpServiceName, wcslen(lpService->lpServiceName), - lpServiceName, + lpServiceName + 1, dwLength, NULL, NULL); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Tue Jan 6 01:53:04 2009 @@ -77,7 +77,7 @@ REGSAM samDesired, PHKEY phKey); -DWORD ScmCreateServiceKey(LPWSTR lpServiceName, +DWORD ScmCreateServiceKey(LPCWSTR lpServiceName, REGSAM samDesired, PHKEY phKey); @@ -104,11 +104,11 @@ DWORD argc, LPWSTR *argv); -PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName); -PSERVICE ScmGetServiceEntryByDisplayName(LPWSTR lpDisplayName); +PSERVICE ScmGetServiceEntryByName(LPCWSTR lpServiceName); +PSERVICE ScmGetServiceEntryByDisplayName(LPCWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); PSERVICE ScmGetServiceEntryByClientHandle(HANDLE Handle); -DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, +DWORD ScmCreateNewServiceRecord(LPCWSTR lpServiceName, PSERVICE *lpServiceRecord); VOID ScmDeleteServiceRecord(PSERVICE lpService); DWORD ScmMarkServiceForDelete(PSERVICE pService); @@ -130,7 +130,7 @@ DWORD ScmCreateGroupList(VOID); DWORD ScmSetServiceGroup(PSERVICE lpService, - LPWSTR lpGroupName); + LPCWSTR lpGroupName); /* rpcserver.c */ Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Tue Jan 6 01:53:04 2009 @@ -36,7 +36,7 @@ (UCHAR *)"\\pipe\\ntsvcs", NULL, (UCHAR **)&pszStringBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcStringBindingCompose returned 0x%x\n", status); return NULL; @@ -45,13 +45,13 @@ /* Set the binding handle that will be used to bind to the server. */ status = RpcBindingFromStringBindingA(pszStringBinding, &hBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcBindingFromStringBinding returned 0x%x\n", status); } status = RpcStringFreeA(&pszStringBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcStringFree returned 0x%x\n", status); } @@ -69,7 +69,7 @@ TRACE("SVCCTL_HANDLEA_unbind() called\n"); status = RpcBindingFree(&hBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcBindingFree returned 0x%x\n", status); } @@ -91,7 +91,7 @@ L"\\pipe\\ntsvcs", NULL, &pszStringBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcStringBindingCompose returned 0x%x\n", status); return NULL; @@ -100,13 +100,13 @@ /* Set the binding handle that will be used to bind to the server. */ status = RpcBindingFromStringBindingW(pszStringBinding, &hBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcBindingFromStringBinding returned 0x%x\n", status); } status = RpcStringFreeW(&pszStringBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcStringFree returned 0x%x\n", status); } @@ -124,7 +124,7 @@ TRACE("SVCCTL_HANDLEW_unbind() called\n"); status = RpcBindingFree(&hBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcBindingFree returned 0x%x\n", status); } @@ -146,7 +146,7 @@ L"\\pipe\\ntsvcs", NULL, &pszStringBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcStringBindingCompose returned 0x%x\n", status); return NULL; @@ -155,13 +155,13 @@ /* Set the binding handle that will be used to bind to the server. */ status = RpcBindingFromStringBindingW(pszStringBinding, &hBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcBindingFromStringBinding returned 0x%x\n", status); } status = RpcStringFreeW(&pszStringBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcStringFree returned 0x%x\n", status); } @@ -179,7 +179,7 @@ TRACE("RPC_SERVICE_STATUS_HANDLE_unbind() called\n"); status = RpcBindingFree(&hBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcBindingFree returned 0x%x\n", status); } @@ -195,6 +195,8 @@ return ERROR_INVALID_HANDLE; case RPC_X_NULL_REF_POINTER: + case RPC_X_ENUM_VALUE_OUT_OF_RANGE: + case RPC_X_BYTE_COUNT_TOO_SMALL: return ERROR_INVALID_PARAMETER; case STATUS_ACCESS_VIOLATION: @@ -759,6 +761,8 @@ LPWSTR lpStr; TRACE("CreateServiceW() called\n"); + TRACE("%p %S %S\n", hSCManager, + lpServiceName, lpDisplayName); /* Calculate the Dependencies length*/ if (lpDependencies != NULL) @@ -781,18 +785,18 @@ { /* Call to services.exe using RPC */ dwError = RCreateServiceW((SC_RPC_HANDLE)hSCManager, - (LPWSTR)lpServiceName, - (LPWSTR)lpDisplayName, + lpServiceName, + lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, - (LPWSTR)lpBinaryPathName, - (LPWSTR)lpLoadOrderGroup, + lpBinaryPathName, + lpLoadOrderGroup, lpdwTagId, (LPBYTE)lpDependencies, dwDependenciesLength, - (LPWSTR)lpServiceStartName, + lpServiceStartName, NULL, /* FIXME: lpPassword */ 0, /* FIXME: dwPasswordLength */ (SC_RPC_HANDLE *)&hService); @@ -1292,6 +1296,8 @@ DWORD dwError; TRACE("GetServiceDisplayNameA() called\n"); + TRACE("%p %s %p %p\n", hSCManager, + debugstr_a(lpServiceName), lpDisplayName, lpcchBuffer); if (!lpDisplayName) *lpcchBuffer = 0; @@ -1299,7 +1305,7 @@ _SEH2_TRY { dwError = RGetServiceDisplayNameA((SC_RPC_HANDLE)hSCManager, - (LPSTR)lpServiceName, + lpServiceName, lpDisplayName, lpcchBuffer); } @@ -1344,7 +1350,7 @@ _SEH2_TRY { dwError = RGetServiceDisplayNameW((SC_RPC_HANDLE)hSCManager, - (LPWSTR)lpServiceName, + lpServiceName, lpDisplayName, lpcchBuffer); } @@ -1386,7 +1392,7 @@ _SEH2_TRY { dwError = RGetServiceKeyNameA((SC_RPC_HANDLE)hSCManager, - (LPSTR)lpDisplayName, + lpDisplayName, lpServiceName, lpcchBuffer); } @@ -1428,7 +1434,7 @@ _SEH2_TRY { dwError = RGetServiceKeyNameW((SC_RPC_HANDLE)hSCManager, - (LPWSTR)lpDisplayName, + lpDisplayName, lpServiceName, lpcchBuffer); } Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Tue Jan 6 01:53:04 2009 @@ -380,6 +380,307 @@ /* Function 12 */ DWORD RCreateServiceW( [in] SC_RPC_HANDLE hSCManager, + [in, string, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR lpServiceName, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR lpDisplayName, + [in] DWORD dwDesiredAccess, + [in] DWORD dwServiceType, + [in] DWORD dwStartType, + [in] DWORD dwErrorControl, + [in, string, range(0, SC_MAX_PATH_LENGTH)] LPCWSTR lpBinaryPathName, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR lpLoadOrderGroup, + [in, out, unique] LPDWORD lpdwTagId, + [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, + [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, + [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPCWSTR lpServiceStartName, + [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, + [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, + [out] LPSC_RPC_HANDLE lpServiceHandle); + + /* Function 13 */ + DWORD REnumDependentServicesW( + [in] SC_RPC_HANDLE hService, + [in] DWORD dwServiceState, + [out, size_is(cbBufSize)] LPBYTE lpServices, + [in, range(0, 1024*256)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, + [out] LPBOUNDED_DWORD_256K lpServicesReturned); + + /* Function 14 */ + DWORD REnumServicesStatusW( + [in] SC_RPC_HANDLE hSCManager, + [in] DWORD dwServiceType, + [in] DWORD dwServiceState, + [out, size_is(dwBufSize)] LPBYTE lpBuffer, + [in, range(0, 1024*256)] DWORD dwBufSize, + [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, + [out] LPBOUNDED_DWORD_256K lpServicesReturned, + [in, out, unique] LPBOUNDED_DWORD_256K lpResumeHandle); + + /* Function 15 */ + DWORD ROpenSCManagerW( + [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEW lpMachineName, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDatabaseName, + [in] DWORD dwDesiredAccess, + [out] LPSC_RPC_HANDLE lpScHandle); + + /* Function 16 */ + DWORD ROpenServiceW( + [in] SC_RPC_HANDLE hSCManager, + [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, + [in] DWORD dwDesiredAccess, + [out] LPSC_RPC_HANDLE lpServiceHandle); + + /* Function 17 */ + DWORD RQueryServiceConfigW( + [in] SC_RPC_HANDLE hService, + [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */ + [in, range(0, 1024*8)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); + + /* Function 18 */ + DWORD RQueryServiceLockStatusW( + [in] SC_RPC_HANDLE hSCManager, + [out] LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus, + [in, range(0, 1024*4)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_4K pcbBytesNeeded); + + /* Function 19 */ + DWORD RStartServiceW( + [in] SC_RPC_HANDLE hService, + [in, range(0, SC_MAX_ARGUMENTS)] DWORD argc, + [in, unique, size_is(argc)] LPSTRING_PTRSW argv); + + /* Function 20 */ + DWORD RGetServiceDisplayNameW( + [in] SC_RPC_HANDLE hSCManager, + [in, string, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR lpServiceName, + [out, string, range(1, 4*1024+1), size_is(*lpcchBuffer + 1)] LPWSTR lpDisplayName, + [in, out] DWORD* lpcchBuffer); + + /* Function 21 */ + DWORD RGetServiceKeyNameW( + [in] SC_RPC_HANDLE hSCManager, + [in, string, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR lpDisplayName, + [out, string, range(1, 4*1024+1), size_is(*lpcchBuffer + 1)] LPWSTR lpServiceName, + [in, out] DWORD* lpcchBuffer); + + /* Function 22 */ + DWORD RI_ScSetServiceBitsA( + [in] RPC_SERVICE_STATUS_HANDLE hServiceStatus, + [in] DWORD dwServiceBits, + [in] BOOL bSetBitsOn, + [in] BOOL bUpdateImmediately, + [in, string, unique] LPSTR lpString); + + /* Function 23 */ + DWORD RChangeServiceConfigA( + [in] SC_RPC_HANDLE hService, + [in] DWORD dwServiceType, + [in] DWORD dwStartType, + [in] DWORD dwErrorControl, + [in, string, unique, range(0, SC_MAX_PATH_LENGTH)] LPSTR lpBinaryPathName, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpLoadOrderGroup, + [in, out, unique] LPDWORD lpdwTagId, + [in, unique, size_is(dwDependSize)] LPSTR lpDependencies, + [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, + [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPSTR lpServiceStartName, + [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, + [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName); + + /* Function 24 */ + DWORD RCreateServiceA( + [in] SC_RPC_HANDLE hSCManager, + [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, + [in] DWORD dwDesiredAccess, + [in] DWORD dwServiceType, + [in] DWORD dwStartType, + [in] DWORD dwErrorControl, + [in, string, range(0, SC_MAX_PATH_LENGTH)] LPSTR lpBinaryPathName, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpLoadOrderGroup, + [in, out, unique] LPDWORD lpdwTagId, + [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, + [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, + [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPSTR lpServiceStartName, + [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, + [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, + [out] LPSC_RPC_HANDLE lpServiceHandle); + + /* Function 25 */ + DWORD REnumDependentServicesA( + [in] SC_RPC_HANDLE hService, + [in] DWORD dwServiceState, + [out, size_is(cbBufSize)] LPBYTE lpServices, + [in, range(0, 1024*256)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, + [out] LPBOUNDED_DWORD_256K lpServicesReturned); + + /* Function 26 */ + DWORD REnumServicesStatusA( + [in] SC_RPC_HANDLE hSCManager, + [in] DWORD dwServiceType, + [in] DWORD dwServiceState, + [out, size_is(dwBufSize)] LPBYTE lpBuffer, + [in, range(0, 1024*256)] DWORD dwBufSize, + [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, + [out] LPBOUNDED_DWORD_256K lpServicesReturned, + [in, out, unique] LPBOUNDED_DWORD_256K lpResumeHandle); + + /* Function 27 */ + DWORD ROpenSCManagerA( + [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEA lpMachineName, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDatabaseName, + [in] DWORD dwDesiredAccess, + [out] LPSC_RPC_HANDLE lpScHandle); + + /* Function 28 */ + DWORD ROpenServiceA( + [in] SC_RPC_HANDLE hSCManager, + [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, + [in] DWORD dwDesiredAccess, + [out] LPSC_RPC_HANDLE lpServiceHandle); + + /* Function 29 */ + DWORD RQueryServiceConfigA( + [in] SC_RPC_HANDLE hService, + [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */ + [in, range(0, 1024*8)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); + + /* Function 30 */ + DWORD RQueryServiceLockStatusA( + [in] SC_RPC_HANDLE hSCManager, + [out] LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus, + [in, range(0, 1024*4)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_4K pcbBytesNeeded); + + /* Function 31 */ + DWORD RStartServiceA( + [in] SC_RPC_HANDLE hService, + [in, range(0, SC_MAX_ARGUMENTS)] DWORD argc, + [in, unique, size_is(argc)] LPSTRING_PTRSA argv); + + /* Function 32 */ + DWORD RGetServiceDisplayNameA( + [in] SC_RPC_HANDLE hSCManager, + [in, string, range(0, SC_MAX_NAME_LENGTH)] LPCSTR lpServiceName, + [out, string, size_is(*lpcchBuffer)] LPSTR lpDisplayName, + [in, out] LPBOUNDED_DWORD_4K lpcchBuffer); + + /* Function 33 */ + DWORD RGetServiceKeyNameA( + [in] SC_RPC_HANDLE hSCManager, + [in, string, range(0, SC_MAX_NAME_LENGTH)] LPCSTR lpDisplayName, + [out, string, size_is(*lpcchBuffer)] LPSTR lpKeyName, + [in, out] LPBOUNDED_DWORD_4K lpcchBuffer); + + /* Function 34 */ + DWORD RI_ScGetCurrentGroupStateW( + [in] SC_RPC_HANDLE hSCManager, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpLoadOrderGroup, + [out] LPDWORD lpState); + + /* Function 35 */ + DWORD REnumServiceGroupW( + [in] SC_RPC_HANDLE hSCManager, + [in] DWORD dwServiceType, + [in] DWORD dwServiceState, + [out, size_is(cbBufSize)] LPBYTE lpBuffer, + [in, range(0, 1024*256)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, + [out] LPBOUNDED_DWORD_256K lpServicesReturned, + [in, out, unique] LPBOUNDED_DWORD_256K lpResumeIndex, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR pszGroupName); + + /* Function 36 */ + DWORD RChangeServiceConfig2A( + [in] SC_RPC_HANDLE hService, + [in] SC_RPC_CONFIG_INFOA Info); + + /* Function 37 */ + DWORD RChangeServiceConfig2W( + [in] SC_RPC_HANDLE hService, + [in] SC_RPC_CONFIG_INFOW Info); + + /* Function 38 */ + DWORD RQueryServiceConfig2A( + [in] SC_RPC_HANDLE hService, + [in] DWORD dwInfoLevel, + [out, size_is(cbBufSize)] LPBYTE lpBuffer, + [in, range(0, 1024*8)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); + + /* Function 39 */ + DWORD RQueryServiceConfig2W( + [in] SC_RPC_HANDLE hService, + [in] DWORD dwInfoLevel, + [out, size_is(cbBufSize)] LPBYTE lpBuffer, + [in, range(0, 1024*8)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); + + /* Function 40 */ + DWORD RQueryServiceStatusEx( + [in] SC_RPC_HANDLE hService, + [in] SC_STATUS_TYPE InfoLevel, + [out, size_is(cbBufSize)] LPBYTE lpBuffer, + [in, range(0, 1024*8)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); + + /* Function 41 */ + DWORD REnumServicesStatusExA( + [in] SC_RPC_HANDLE hSCManager, + [in] SC_ENUM_TYPE InfoLevel, + [in] DWORD dwServiceType, + [in] DWORD dwServiceState, + [out, size_is(cbBufSize)] LPBYTE lpBuffer, + [in, range(0, 1024 * 256)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, + [out] LPBOUNDED_DWORD_256K lpServicesReturned, + [in, out, unique] LPBOUNDED_DWORD_256K lpResumeIndex, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCSTR pszGroupName); + + /* Function 42 */ + DWORD REnumServicesStatusExW( + [in] SC_RPC_HANDLE hSCManager, + [in] SC_ENUM_TYPE InfoLevel, + [in] DWORD dwServiceType, + [in] DWORD dwServiceState, + [out, size_is(cbBufSize)] LPBYTE lpBuffer, + [in, range(0, 1024 * 256)] DWORD cbBufSize, + [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, + [out] LPBOUNDED_DWORD_256K lpServicesReturned, + [in, out, unique] LPBOUNDED_DWORD_256K lpResumeIndex, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR pszGroupName); + + /* Function 43 */ + DWORD RSendTSMessage( + [in] handle_t BindingHandle); /* FIXME */ + + /* Function 44 */ + DWORD RCreateServiceWOW64A( + [in] handle_t BindingHandle, + [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, + [in] DWORD dwDesiredAccess, + [in] DWORD dwServiceType, + [in] DWORD dwStartType, + [in] DWORD dwErrorControl, + [in, string, range(0, SC_MAX_PATH_LENGTH)] LPSTR lpBinaryPathName, + [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpLoadOrderGroup, + [in, out, unique] LPDWORD lpdwTagId, + [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, + [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, + [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPSTR lpServiceStartName, + [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, + [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, + [out] LPSC_RPC_HANDLE lpServiceHandle); + + /* Function 45 */ + DWORD RCreateServiceWOW64W( + [in] handle_t BindingHandle, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDisplayName, [in] DWORD dwDesiredAccess, @@ -396,307 +697,6 @@ [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, [out] LPSC_RPC_HANDLE lpServiceHandle); - /* Function 13 */ - DWORD REnumDependentServicesW( - [in] SC_RPC_HANDLE hService, - [in] DWORD dwServiceState, - [out, size_is(cbBufSize)] LPBYTE lpServices, - [in, range(0, 1024*256)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, - [out] LPBOUNDED_DWORD_256K lpServicesReturned); - - /* Function 14 */ - DWORD REnumServicesStatusW( - [in] SC_RPC_HANDLE hSCManager, - [in] DWORD dwServiceType, - [in] DWORD dwServiceState, - [out, size_is(dwBufSize)] LPBYTE lpBuffer, - [in, range(0, 1024*256)] DWORD dwBufSize, - [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, - [out] LPBOUNDED_DWORD_256K lpServicesReturned, - [in, out, unique] LPBOUNDED_DWORD_256K lpResumeHandle); - - /* Function 15 */ - DWORD ROpenSCManagerW( - [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEW lpMachineName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDatabaseName, - [in] DWORD dwDesiredAccess, - [out] LPSC_RPC_HANDLE lpScHandle); - - /* Function 16 */ - DWORD ROpenServiceW( - [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, - [in] DWORD dwDesiredAccess, - [out] LPSC_RPC_HANDLE lpServiceHandle); - - /* Function 17 */ - DWORD RQueryServiceConfigW( - [in] SC_RPC_HANDLE hService, - [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, - /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */ - [in, range(0, 1024*8)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); - - /* Function 18 */ - DWORD RQueryServiceLockStatusW( - [in] SC_RPC_HANDLE hSCManager, - [out] LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus, - [in, range(0, 1024*4)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_4K pcbBytesNeeded); - - /* Function 19 */ - DWORD RStartServiceW( - [in] SC_RPC_HANDLE hService, - [in, range(0, SC_MAX_ARGUMENTS)] DWORD argc, - [in, unique, size_is(argc)] LPSTRING_PTRSW argv); - - /* Function 20 */ - DWORD RGetServiceDisplayNameW( - [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, - [out, string, range(1, 4*1024+1), size_is(*lpcchBuffer + 1)] LPWSTR lpDisplayName, - [in, out] DWORD* lpcchBuffer); - - /* Function 21 */ - DWORD RGetServiceKeyNameW( - [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDisplayName, - [out, string, range(1, 4*1024+1), size_is(*lpcchBuffer + 1)] LPWSTR lpServiceName, - [in, out] DWORD* lpcchBuffer); - - /* Function 22 */ - DWORD RI_ScSetServiceBitsA( - [in] RPC_SERVICE_STATUS_HANDLE hServiceStatus, - [in] DWORD dwServiceBits, - [in] BOOL bSetBitsOn, - [in] BOOL bUpdateImmediately, - [in, string, unique] LPSTR lpString); - - /* Function 23 */ - DWORD RChangeServiceConfigA( - [in] SC_RPC_HANDLE hService, - [in] DWORD dwServiceType, - [in] DWORD dwStartType, - [in] DWORD dwErrorControl, - [in, string, unique, range(0, SC_MAX_PATH_LENGTH)] LPSTR lpBinaryPathName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpLoadOrderGroup, - [in, out, unique] LPDWORD lpdwTagId, - [in, unique, size_is(dwDependSize)] LPSTR lpDependencies, - [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, - [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPSTR lpServiceStartName, - [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, - [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName); - - /* Function 24 */ - DWORD RCreateServiceA( - [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, - [in] DWORD dwDesiredAccess, - [in] DWORD dwServiceType, - [in] DWORD dwStartType, - [in] DWORD dwErrorControl, - [in, string, range(0, SC_MAX_PATH_LENGTH)] LPSTR lpBinaryPathName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpLoadOrderGroup, - [in, out, unique] LPDWORD lpdwTagId, - [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, - [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, - [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPSTR lpServiceStartName, - [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, - [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, - [out] LPSC_RPC_HANDLE lpServiceHandle); - - /* Function 25 */ - DWORD REnumDependentServicesA( - [in] SC_RPC_HANDLE hService, - [in] DWORD dwServiceState, - [out, size_is(cbBufSize)] LPBYTE lpServices, - [in, range(0, 1024*256)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, - [out] LPBOUNDED_DWORD_256K lpServicesReturned); - - /* Function 26 */ - DWORD REnumServicesStatusA( - [in] SC_RPC_HANDLE hSCManager, - [in] DWORD dwServiceType, - [in] DWORD dwServiceState, - [out, size_is(dwBufSize)] LPBYTE lpBuffer, - [in, range(0, 1024*256)] DWORD dwBufSize, - [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, - [out] LPBOUNDED_DWORD_256K lpServicesReturned, - [in, out, unique] LPBOUNDED_DWORD_256K lpResumeHandle); - - /* Function 27 */ - DWORD ROpenSCManagerA( - [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEA lpMachineName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDatabaseName, - [in] DWORD dwDesiredAccess, - [out] LPSC_RPC_HANDLE lpScHandle); - - /* Function 28 */ - DWORD ROpenServiceA( - [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, - [in] DWORD dwDesiredAccess, - [out] LPSC_RPC_HANDLE lpServiceHandle); - - /* Function 29 */ - DWORD RQueryServiceConfigA( - [in] SC_RPC_HANDLE hService, - [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, - /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */ - [in, range(0, 1024*8)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); - - /* Function 30 */ - DWORD RQueryServiceLockStatusA( - [in] SC_RPC_HANDLE hSCManager, - [out] LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus, - [in, range(0, 1024*4)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_4K pcbBytesNeeded); - - /* Function 31 */ - DWORD RStartServiceA( - [in] SC_RPC_HANDLE hService, - [in, range(0, SC_MAX_ARGUMENTS)] DWORD argc, - [in, unique, size_is(argc)] LPSTRING_PTRSA argv); - - /* Function 32 */ - DWORD RGetServiceDisplayNameA( - [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, - [out, string, size_is(*lpcchBuffer)] LPSTR lpDisplayName, - [in, out] LPBOUNDED_DWORD_4K lpcchBuffer); - - /* Function 33 */ - DWORD RGetServiceKeyNameA( - [in] SC_RPC_HANDLE hSCManager, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, - [out, string, size_is(*lpcchBuffer)] LPSTR lpKeyName, - [in, out] LPBOUNDED_DWORD_4K lpcchBuffer); - - /* Function 34 */ - DWORD RI_ScGetCurrentGroupStateW( - [in] SC_RPC_HANDLE hSCManager, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpLoadOrderGroup, - [out] LPDWORD lpState); - - /* Function 35 */ - DWORD REnumServiceGroupW( - [in] SC_RPC_HANDLE hSCManager, - [in] DWORD dwServiceType, - [in] DWORD dwServiceState, - [out, size_is(cbBufSize)] LPBYTE lpBuffer, - [in, range(0, 1024*256)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, - [out] LPBOUNDED_DWORD_256K lpServicesReturned, - [in, out, unique] LPBOUNDED_DWORD_256K lpResumeIndex, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR pszGroupName); - - /* Function 36 */ - DWORD RChangeServiceConfig2A( - [in] SC_RPC_HANDLE hService, - [in] SC_RPC_CONFIG_INFOA Info); - - /* Function 37 */ - DWORD RChangeServiceConfig2W( - [in] SC_RPC_HANDLE hService, - [in] SC_RPC_CONFIG_INFOW Info); - - /* Function 38 */ - DWORD RQueryServiceConfig2A( - [in] SC_RPC_HANDLE hService, - [in] DWORD dwInfoLevel, - [out, size_is(cbBufSize)] LPBYTE lpBuffer, - [in, range(0, 1024*8)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); - - /* Function 39 */ - DWORD RQueryServiceConfig2W( - [in] SC_RPC_HANDLE hService, - [in] DWORD dwInfoLevel, - [out, size_is(cbBufSize)] LPBYTE lpBuffer, - [in, range(0, 1024*8)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); - - /* Function 40 */ - DWORD RQueryServiceStatusEx( - [in] SC_RPC_HANDLE hService, - [in] SC_STATUS_TYPE InfoLevel, - [out, size_is(cbBufSize)] LPBYTE lpBuffer, - [in, range(0, 1024*8)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); - - /* Function 41 */ - DWORD REnumServicesStatusExA( - [in] SC_RPC_HANDLE hSCManager, - [in] SC_ENUM_TYPE InfoLevel, - [in] DWORD dwServiceType, - [in] DWORD dwServiceState, - [out, size_is(cbBufSize)] LPBYTE lpBuffer, - [in, range(0, 1024 * 256)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, - [out] LPBOUNDED_DWORD_256K lpServicesReturned, - [in, out, unique] LPBOUNDED_DWORD_256K lpResumeIndex, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCSTR pszGroupName); - - /* Function 42 */ - DWORD REnumServicesStatusExW( - [in] SC_RPC_HANDLE hSCManager, - [in] SC_ENUM_TYPE InfoLevel, - [in] DWORD dwServiceType, - [in] DWORD dwServiceState, - [out, size_is(cbBufSize)] LPBYTE lpBuffer, - [in, range(0, 1024 * 256)] DWORD cbBufSize, - [out] LPBOUNDED_DWORD_256K pcbBytesNeeded, - [out] LPBOUNDED_DWORD_256K lpServicesReturned, - [in, out, unique] LPBOUNDED_DWORD_256K lpResumeIndex, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR pszGroupName); - - /* Function 43 */ - DWORD RSendTSMessage( - [in] handle_t BindingHandle); /* FIXME */ - - /* Function 44 */ - DWORD RCreateServiceWOW64A( - [in] handle_t BindingHandle, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, - [in] DWORD dwDesiredAccess, - [in] DWORD dwServiceType, - [in] DWORD dwStartType, - [in] DWORD dwErrorControl, - [in, string, range(0, SC_MAX_PATH_LENGTH)] LPSTR lpBinaryPathName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpLoadOrderGroup, - [in, out, unique] LPDWORD lpdwTagId, - [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, - [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, - [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPSTR lpServiceStartName, - [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, - [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, - [out] LPSC_RPC_HANDLE lpServiceHandle); - - /* Function 45 */ - DWORD RCreateServiceWOW64W( - [in] handle_t BindingHandle, - [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDisplayName, - [in] DWORD dwDesiredAccess, - [in] DWORD dwServiceType, - [in] DWORD dwStartType, - [in] DWORD dwErrorControl, - [in, string, range(0, SC_MAX_PATH_LENGTH)] LPWSTR lpBinaryPathName, - [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpLoadOrderGroup, - [in, out, unique] LPDWORD lpdwTagId, - [in, unique, size_is(dwDependSize)] LPBYTE lpDependencies, - [in, range(0, SC_MAX_DEPEND_SIZE)] DWORD dwDependSize, - [in, string, unique, range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] LPWSTR lpServiceStartName, - [in, unique, size_is(dwPwSize)] LPBYTE lpPassword, - [in, range(0, SC_MAX_PWD_SIZE)] DWORD dwPwSize, - [out] LPSC_RPC_HANDLE lpServiceHandle); - /* Function 46 */ DWORD RQueryServiceTagInfo( [in] handle_t BindingHandle); /* FIXME */

15 years, 11 months

[cwittich] 38602: -Vincent Povirk <madewokherd+d41d at gmail.com> Thu Dec 4 2008 widl: Fix string format warning. -Andrew Talbot <andrew.talbot at talbotville.com> Sat Dec 6 2008 widl: Remove unneeded address-of operators from array names.

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 6 01:19:59 2009 New Revision: 38602 URL: http://svn.reactos.org/svn/reactos?rev=38602&view=rev Log: -Vincent Povirk <madewokherd+d41d at gmail.com> Thu Dec 4 2008 widl: Fix string format warning. -Andrew Talbot <andrew.talbot at talbotville.com> Sat Dec 6 2008 widl: Remove unneeded address-of operators from array names. Modified: trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/utils.c trunk/reactos/tools/widl/utils.h Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=386… ============================================================================== --- trunk/reactos/tools/widl/proxy.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/proxy.c [iso-8859-1] Tue Jan 6 01:19:59 2009 @@ -744,11 +744,11 @@ fprintf(proxy, "const ExtendedProxyFileInfo %s_ProxyFileInfo =\n", file_id); fprintf(proxy, "{\n"); - fprintf(proxy, " (const PCInterfaceProxyVtblList*)&_%s_ProxyVtblList,\n", file_id); - fprintf(proxy, " (const PCInterfaceStubVtblList*)&_%s_StubVtblList,\n", file_id); + fprintf(proxy, " (const PCInterfaceProxyVtblList*)_%s_ProxyVtblList,\n", file_id); + fprintf(proxy, " (const PCInterfaceStubVtblList*)_%s_StubVtblList,\n", file_id); fprintf(proxy, " _%s_InterfaceNamesList,\n", file_id); fprintf(proxy, " 0,\n"); - fprintf(proxy, " &_%s_IID_Lookup,\n", file_id); + fprintf(proxy, " _%s_IID_Lookup,\n", file_id); fprintf(proxy, " %d,\n", c); fprintf(proxy, " 1,\n"); fprintf(proxy, " 0,\n"); Modified: trunk/reactos/tools/widl/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.c?rev=386… ============================================================================== --- trunk/reactos/tools/widl/utils.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/utils.c [iso-8859-1] Tue Jan 6 01:19:59 2009 @@ -66,26 +66,20 @@ } +void error_loc(const char *s, ...) +{ + loc_info_t cur_loc = CURRENT_LOCATION; + va_list ap; + va_start(ap, s); + generic_msg(&cur_loc, s, "Error", ap); + va_end(ap); + exit(1); +} + /* yyerror: yacc assumes this is not newline terminated. */ -void parser_error(const char *s, ...) -{ - loc_info_t cur_location = CURRENT_LOCATION; - va_list ap; - va_start(ap, s); - generic_msg(&cur_location, s, "Error", ap); - fprintf(stderr, "\n"); - va_end(ap); - exit(1); -} - -void error_loc(const char *s, ...) -{ - loc_info_t cur_loc = CURRENT_LOCATION; - va_list ap; - va_start(ap, s); - generic_msg(&cur_loc, s, "Error", ap); - va_end(ap); - exit(1); +void parser_error(const char *s) +{ + error_loc("%s\n", s); } void error_loc_info(const loc_info_t *loc_info, const char *s, ...) Modified: trunk/reactos/tools/widl/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.h?rev=386… ============================================================================== --- trunk/reactos/tools/widl/utils.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/utils.h [iso-8859-1] Tue Jan 6 01:19:59 2009 @@ -33,7 +33,7 @@ #define __attribute__(X) #endif -void parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); +void parser_error(const char *s) __attribute__((noreturn)); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); void error(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn));

15 years, 11 months

[cwittich] 38601: - Rob Shearman <robertshearman at gmail.com> Sun Nov 30 widl: Fix optimisation for writing out ref pointers to simple structs and base types.

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 6 01:09:07 2009 New Revision: 38601 URL: http://svn.reactos.org/svn/reactos?rev=38601&view=rev Log: - Rob Shearman <robertshearman at gmail.com> Sun Nov 30 widl: Fix optimisation for writing out ref pointers to simple structs and base types. Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Tue Jan 6 01:09:07 2009 @@ -2713,7 +2713,7 @@ } print_file(file, indent, "_StubMsg.Buffer += sizeof("); - write_type_decl(file, var->type, NULL); + write_type_decl(file, is_ptr(type) ? type->ref : type, NULL); fprintf(file, ");\n"); } @@ -2964,47 +2964,29 @@ case RPC_FC_BOGUS_STRUCT: print_phase_function(file, indent, "ComplexStruct", phase, var, start_offset); break; - case RPC_FC_RP: - if (is_base_type( var->type->ref->type )) - { - print_phase_basetype(file, indent, phase, pass, var, var->name); - } - else if (var->type->ref->type == RPC_FC_STRUCT) - { - if (phase != PHASE_BUFFERSIZE && phase != PHASE_FREE) - print_phase_function(file, indent, "SimpleStruct", phase, var, start_offset + 4); - } - else - { - expr_t *iid; - if ((iid = get_attrp( var->attrs, ATTR_IIDIS ))) - { - print_file( file, indent, "_StubMsg.MaxCount = (unsigned long) " ); - write_expr( file, iid, 1, 1, NULL, NULL ); - fprintf( file, ";\n\n" ); - } - print_phase_function(file, indent, "Pointer", phase, var, start_offset); - } - break; default: error("write_remoting_arguments: Unsupported type: %s (0x%02x)\n", var->name, rtype); } } else { - if (last_ptr(var->type) && (pointer_type == RPC_FC_RP) && is_base_type(rtype)) + const type_t *ref = type->ref; + if (type->type == RPC_FC_RP && is_base_type(ref->type)) { if (phase != PHASE_FREE) print_phase_basetype(file, indent, phase, pass, var, var->name); } - else if (last_ptr(var->type) && (pointer_type == RPC_FC_RP) && (rtype == RPC_FC_STRUCT)) + else if (type->type == RPC_FC_RP && ref->type == RPC_FC_STRUCT && + !is_user_type(ref)) { if (phase != PHASE_BUFFERSIZE && phase != PHASE_FREE) - print_phase_function(file, indent, "SimpleStruct", phase, var, start_offset + 4); + print_phase_function(file, indent, "SimpleStruct", + phase, var, + ref->typestring_offset); } else { - if (var->type->ref->type == RPC_FC_IP) + if (ref->type == RPC_FC_IP) print_phase_function(file, indent, "InterfacePointer", phase, var, start_offset); else print_phase_function(file, indent, "Pointer", phase, var, start_offset);

15 years, 11 months

← Newer
1
...
62
63
64
65
66
67
68
...
76
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 January 2009