Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 36093: - Fix a typo which resulted in a read irp being locked with IoWriteAccess and a write irp being locked with IoReadAccess
by cgutman＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: cgutman Date: Tue Sep 9 14:44:15 2008 New Revision: 36093 URL: http://svn.reactos.org/svn/reactos?rev=36093&view=rev Log: - Fix a typo which resulted in a read irp being locked with IoWriteAccess and a write irp being locked with IoReadAccess Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Tue Sep 9 14:44:15 2008 @@ -691,7 +691,7 @@ MmProbeAndLockPages(Irp->MdlAddress, KernelMode, MajorFunction == IRP_MJ_READ ? - IoWriteAccess : IoReadAccess); + IoReadAccess : IoWriteAccess); } _SEH_HANDLE {

1 0

[cfinck] 36092: Giannis Adamopoulos (johnyadams@hotmail.com) - Check if lpLogFont is NULL, so we don't crash if it is. Verified by the GDI32 Wine test, which explicitly checks for this behaviour and doesn't crash under WinXP SP2. See issue #3725 for more details.
by cfinck＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: cfinck Date: Tue Sep 9 12:49:23 2008 New Revision: 36092 URL: http://svn.reactos.org/svn/reactos?rev=36092&view=rev Log: Giannis Adamopoulos (johnyadams(a)hotmail.com) - Check if lpLogFont is NULL, so we don't crash if it is. Verified by the GDI32 Wine test, which explicitly checks for this behaviour and doesn't crash under WinXP SP2. See issue #3725 for more details. Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Tue Sep 9 12:49:23 2008 @@ -391,12 +391,17 @@ EnumFontFamiliesExA (HDC hdc, LPLOGFONTA lpLogfont, FONTENUMPROCA lpEnumFontFamExProc, LPARAM lParam, DWORD dwFlags) { - LOGFONTW LogFontW; - - LogFontA2W(&LogFontW, lpLogfont); + LOGFONTW LogFontW, *pLogFontW; + + if (lpLogfont) + { + LogFontA2W(&LogFontW,lpLogfont); + pLogFontW = &LogFontW; + } + else pLogFontW = NULL; /* no need to convert LogFontW back to lpLogFont b/c it's an [in] parameter only */ - return IntEnumFontFamilies(hdc, &LogFontW, lpEnumFontFamExProc, lParam, FALSE); + return IntEnumFontFamilies(hdc, pLogFontW, lpEnumFontFamExProc, lParam, FALSE); }

1 0

[cwittich] 36091: build resource file as well and set correct include path
by cwittich＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: cwittich Date: Tue Sep 9 11:40:02 2008 New Revision: 36091 URL: http://svn.reactos.org/svn/reactos?rev=36091&view=rev Log: build resource file as well and set correct include path Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] Tue Sep 9 11:40:02 2008 @@ -4,6 +4,7 @@ <importlibrary definition="msxml3.spec.def" /> <include base="msxml3">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="msxml3" root="intermediate">.</include> <dependency>msxml3_v1</dependency> <define name="__WINESRC__" /> <define name="__USE_W32API" /> @@ -54,6 +55,7 @@ <file>docfrag.c</file> <file>domimpl.c</file> <file>entityref.c</file> + <file>version.rc</file> <file>msxml3.spec</file> </module> <module name="msxml3_v1" type="embeddedtypelib">

1 0

[cwittich] 36090: fix the msxml3 typelib
by cwittich＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: cwittich Date: Tue Sep 9 11:16:53 2008 New Revision: 36090 URL: http://svn.reactos.org/svn/reactos?rev=36090&view=rev Log: fix the msxml3 typelib Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/dll/win32/msxml3/version.rc Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] Tue Sep 9 11:16:53 2008 @@ -1,8 +1,10 @@ +<group> <module name="msxml3" type="win32dll" baseaddress="${BASEADDRESS_MSXML3}" installbase="system32" installname="msxml3.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="msxml3.spec.def" /> <include base="msxml3">.</include> <include base="ReactOS">include/reactos/wine</include> + <dependency>msxml3_v1</dependency> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> @@ -52,7 +54,10 @@ <file>docfrag.c</file> <file>domimpl.c</file> <file>entityref.c</file> - <include base="msxml3" root="intermediate">.</include> - <file>msxml3_v1.idl</file> <file>msxml3.spec</file> </module> +<module name="msxml3_v1" type="embeddedtypelib"> + <dependency>stdole2</dependency> + <file>msxml3_v1.idl</file> +</module> +</group> Modified: trunk/reactos/dll/win32/msxml3/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/version.r… ============================================================================== --- trunk/reactos/dll/win32/msxml3/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/version.rc [iso-8859-1] Tue Sep 9 11:16:53 2008 @@ -14,6 +14,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: msxml3_v1.tlb */ +1 TYPELIB LOADONCALL DISCARDABLE msxml3_v1.tlb + #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine MSXML 3.0" #define WINE_FILENAME_STR "msxml3.dll"

1 0

[cwittich] 36089: add new stdole2 target for the real typelib (the other stdole2.tlb is a dll)
by cwittich＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: cwittich Date: Tue Sep 9 11:15:39 2008 New Revision: 36089 URL: http://svn.reactos.org/svn/reactos?rev=36089&view=rev Log: add new stdole2 target for the real typelib (the other stdole2.tlb is a dll) Modified: trunk/reactos/include/psdk/psdk.rbuild Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Tue Sep 9 11:15:39 2008 @@ -51,4 +51,7 @@ <file>comcat.idl</file> <file>xmldso.idl</file> <file>xmldom.idl</file> +</module> +<module name="stdole2" type="embeddedtypelib"> + <file>stdole2.idl</file> </module>

1 0

[cwittich] 36088: rename stdole2 target to stdole2.tlb
by cwittich＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: cwittich Date: Tue Sep 9 11:14:26 2008 New Revision: 36088 URL: http://svn.reactos.org/svn/reactos?rev=36088&view=rev Log: rename stdole2 target to stdole2.tlb Modified: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Modified: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/stdo… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild [iso-8859-1] Tue Sep 9 11:14:26 2008 @@ -8,10 +8,10 @@ <define name="WINVER">0x501</define> <file>std_ole_v2.idl</file> </module> -<module name="stdole2" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb" entrypoint="0"> +<module name="stdole2.tlb" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb" entrypoint="0"> <importlibrary definition="stdole2.tlb.spec.def" /> - <include base="stdole2">.</include> - <include base="stdole2" root="intermediate">.</include> + <include base="stdole2.tlb">.</include> + <include base="stdole2.tlb" root="intermediate">.</include> <include base="ReactOS">include/reactos/wine</include> <dependency>std_ole_v2</dependency> <define name="__WINESRC__" />

1 0

[cwittich] 36087: open TypeLibs with O_BINARY (patch already send to wine)
by cwittich＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: cwittich Date: Tue Sep 9 11:13:36 2008 New Revision: 36087 URL: http://svn.reactos.org/svn/reactos?rev=36087&view=rev Log: open TypeLibs with O_BINARY (patch already send to wine) Modified: trunk/reactos/tools/widl/typelib.c Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typelib.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typelib.c [iso-8859-1] Tue Sep 9 11:13:36 2008 @@ -359,10 +359,10 @@ file_name = wpp_find_include(importlib->name, NULL); if(file_name) { - fd = open(file_name, O_RDONLY); + fd = open(file_name, O_RDONLY | O_BINARY); free(file_name); }else { - fd = open(importlib->name, O_RDONLY); + fd = open(importlib->name, O_RDONLY | O_BINARY); } if(fd < 0)

1 0

[cwittich] 36086: fix some syntax errors in idl files, deleted unused wtypes.idl
by cwittich＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: cwittich Date: Tue Sep 9 11:11:24 2008 New Revision: 36086 URL: http://svn.reactos.org/svn/reactos?rev=36086&view=rev Log: fix some syntax errors in idl files, deleted unused wtypes.idl Removed: trunk/reactos/include/reactos/idl/wtypes.idl Modified: trunk/reactos/include/reactos/idl/lsa.idl trunk/reactos/include/reactos/idl/ms-dtyp.idl trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Tue Sep 9 11:11:24 2008 @@ -7,11 +7,11 @@ typedef [context_handle] unsigned long LSAPR_HANDLE; typedef LSAPR_HANDLE *PLSAPR_HANDLE; -cpp_quote("#ifndef _WINNT_H"); +cpp_quote("#ifndef _WINNT_H") typedef LARGE_INTEGER LUID; -cpp_quote("#endif"); - -cpp_quote("#ifndef _NTDEF_"); +cpp_quote("#endif") + +cpp_quote("#ifndef _NTDEF_") typedef long NTSTATUS; @@ -21,7 +21,7 @@ [size_is(MaximumLength), length_is(Length)] LPSTR Buffer; } STRING, *PSTRING; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _LSAPR_ACL { BYTE AclRevision; @@ -44,7 +44,7 @@ /* FIXME: should be PLSAPR_ACL Dacl; */ } LSAPR_SECURITY_DESCRIPTOR, *PLSAPR_SECURITY_DESCRIPTOR; -cpp_quote("#if 0"); +cpp_quote("#if 0") typedef enum _SECURITY_IMPERSONATION_LEVEL { SecurityAnonymous = 0, @@ -62,7 +62,7 @@ BYTE EffectiveOnly; } SECURITY_QUALITY_OF_SERVICE, *PSECURITY_QUALITY_OF_SERVICE; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _LSAPR_OBJECT_ATTRIBUTES { DWORD Length; @@ -73,8 +73,6 @@ PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService; } LSAPR_OBJECT_ATTRIBUTES, *PLSAPR_OBJECT_ATTRIBUTES; -typedef unsigned long ACCESS_MASK; - typedef unsigned long SECURITY_INFORMATION; typedef struct _LSAPR_POLICY_PRIVILEGE_DEF { @@ -96,9 +94,9 @@ [size_is(EntriesRead)] PLSAPR_ACCOUNT_INFORMATION Information; } LSAPR_ACCOUNT_ENUM_BUFFER, *PLSAPR_ACCOUNT_ENUM_BUFFER; -cpp_quote("#ifndef _NTSECAPI_H"); +cpp_quote("#ifndef _NTSECAPI_H") typedef RPC_UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _LSAPR_TRUST_INFORMATION { RPC_UNICODE_STRING Name; @@ -111,7 +109,7 @@ DWORD MaxEntries; } LSAPR_REFERENCED_DOMAIN_LIST, *PLSAPR_REFERENCED_DOMAIN_LIST; -cpp_quote("#if 0"); +cpp_quote("#if 0") typedef enum _SID_NAME_USE { SidTypeUser = 1, @@ -126,9 +124,9 @@ SidTypeLabel, } SID_NAME_USE, *PSID_NAME_USE; -cpp_quote("#endif"); - -cpp_quote("#ifndef _NTDEF_"); +cpp_quote("#endif") + +cpp_quote("#ifndef _NTDEF_") typedef struct _LSA_TRANSLATED_SID { SID_NAME_USE Use; @@ -136,7 +134,7 @@ LONG DomainIndex; } LSA_TRANSLATED_SID, *PLSA_TRANSLATED_SID; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _LSAPR_TRANSLATED_SIDS { DWORD Entries; @@ -216,7 +214,7 @@ [size_is(Length)] BYTE *SecurityDescriptor; } LSAPR_SR_SECURITY_DESCRIPTOR, *PLSAPR_SR_SECURITY_DESCRIPTOR; -cpp_quote("#ifndef _NTSECAPI_H"); +cpp_quote("#ifndef _NTSECAPI_H") typedef enum _POLICY_INFORMATION_CLASS { PolicyAuditLogInformation = 1, PolicyAuditEventsInformation, @@ -243,7 +241,7 @@ LARGE_INTEGER TimeToShutdown; DWORD NextAuditRecordId; } POLICY_AUDIT_LOG_INFO, *PPOLICY_AUDIT_LOG_INFO; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _LSAPR_POLICY_AUDIT_EVENTS_INFO { BYTE AuditingMode; @@ -265,7 +263,7 @@ RPC_UNICODE_STRING Name; } LSAPR_POLICY_PD_ACCOUNT_INFO, *PLSAPR_POLICY_PD_ACCOUNT_INFO; -cpp_quote("#ifndef _NTSECAPI_H"); +cpp_quote("#ifndef _NTSECAPI_H") typedef enum _POLICY_LSA_SERVER_ROLE { PolicyServerRoleBackup = 2, PolicyServerRolePrimary, @@ -274,14 +272,14 @@ typedef struct _POLICY_LSA_SERVER_ROLE_INFO { POLICY_LSA_SERVER_ROLE LsaServerRole; } POLICY_LSA_SERVER_ROLE_INFO, *PPOLICY_LSA_SERVER_ROLE_INFO; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _POLICY_LSA_REPLICA_SRCE_INFO { RPC_UNICODE_STRING ReplicaSource; RPC_UNICODE_STRING ReplicaAccountName; } POLICY_LSA_REPLICA_SRCE_INFO, *PPOLICY_LSA_REPLICA_SRCE_INFO; -cpp_quote("#ifndef _WINNT_H"); +cpp_quote("#ifndef _WINNT_H") typedef struct _QUOTA_LIMITS { INT64 PagedPoolLimit; INT64 NonPagedPoolLimit; @@ -290,9 +288,9 @@ INT64 PagefileLimit; LARGE_INTEGER TimeLimit; } QUOTA_LIMITS, *PQUOTA_LIMITS; -cpp_quote("#endif"); - -cpp_quote("#ifndef _NTSECAPI_H"); +cpp_quote("#endif") + +cpp_quote("#ifndef _NTSECAPI_H") typedef struct _POLICY_DEFAULT_QUOTA_INFO { QUOTA_LIMITS QuotaLimits; } POLICY_DEFAULT_QUOTA_INFO, *PPOLICY_DEFAULT_QUOTA_INFO; @@ -301,18 +299,18 @@ LARGE_INTEGER ModifiedId; LARGE_INTEGER DatabaseCreationTime; } POLICY_MODIFICATION_INFO, *PPOLICY_MODIFICATION_INFO; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _POLICY_FULL_SET_INFO { BOOL ShutDownOnFull; } POLICY_FULL_SET_INFO, *PPOLICY_FULL_SET_INFO; -cpp_quote("#ifndef _NTSECAPI_H"); +cpp_quote("#ifndef _NTSECAPI_H") typedef struct _POLICY_AUDIT_FULL_QUERY_INFO { BOOL ShutDownOnFull; BOOL LogIsFull; } POLICY_AUDIT_FULL_QUERY_INFO, *PPOLICY_AUDIT_FULL_QUERY_INFO; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _LSAPR_POLICY_DNS_DOMAIN_INFO { RPC_UNICODE_STRING Name; @@ -345,7 +343,7 @@ [size_is(EntriesRead)] PLSAPR_TRUST_INFORMATION Information; } LSAPR_TRUSTED_ENUM_BUFFER, *PLSAPR_TRUSTED_ENUM_BUFFER; -cpp_quote("#ifndef _NTSECAPI_H"); +cpp_quote("#ifndef _NTSECAPI_H") typedef enum _TRUSTED_INFORMATION_CLASS { TrustedDomainNameInformation = 1, TrustedControllersInformation, @@ -361,7 +359,7 @@ TrustedDomainFullInformation2Internal, TrustedDomainSupportedEncryptionTypes, } TRUSTED_INFORMATION_CLASS, *PTRUSTED_INFORMATION_CLASS; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _LSAPR_TRUSTED_DOMAIN_NAME_INFO { RPC_UNICODE_STRING Name; @@ -372,11 +370,11 @@ [size_is(Entries)] PRPC_UNICODE_STRING Names; } LSAPR_TRUSTED_CONTROLLERS_INFO, *PLSAPR_TRUSTED_CONTROLLERS_INFO; -cpp_quote("#ifndef _NTSECAPI_H"); +cpp_quote("#ifndef _NTSECAPI_H") typedef struct _TRUSTED_POSIX_OFFSET_INFO { DWORD Offset; } TRUSTED_POSIX_OFFSET_INFO, *PTRUSTED_POSIX_OFFSET_INFO; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _LSAPR_CR_CIPHER_VALUE { DWORD Length; @@ -394,7 +392,7 @@ [size_is(Entries)] PRPC_UNICODE_STRING UserRights; } LSAPR_USER_RIGHT_SET, *PLSAPR_USER_RIGHT_SET; -cpp_quote("#ifndef _NTSECAPI_H"); +cpp_quote("#ifndef _NTSECAPI_H") typedef enum _POLICY_DOMAIN_INFORMATION_CLASS { PolicyDomainQualityOfServiceInformation = 1, PolicyDomainEfsInformation = 2, @@ -404,14 +402,14 @@ typedef struct _POLICY_DOMAIN_QUALITY_OF_SERVICE_INFO { DWORD QualityOfService; } POLICY_DOMAIN_QUALITY_OF_SERVICE_INFO, *PPOLICY_DOMAIN_QUALITY_OF_SERVICE_INFO; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _LSAPR_POLICY_DOMAIN_EFS_INFO { DWORD InfoLength; [size_is(InfoLength)] BYTE *EfsBlob; } LSAPR_POLICY_DOMAIN_EFS_INFO, *PLSAPR_POLICY_DOMAIN_EFS_INFO; -cpp_quote("#ifndef _NTSECAPI_H"); +cpp_quote("#ifndef _NTSECAPI_H") typedef struct _POLICY_DOMAIN_KERBEROS_TICKET_INFO { DWORD AuthenticationOptions; LARGE_INTEGER MaxServiceTicketAge; @@ -420,7 +418,7 @@ LARGE_INTEGER MaxClockSkew; LARGE_INTEGER Reserved; } POLICY_DOMAIN_KERBEROS_TICKET_INFO, *PPOLICY_DOMAIN_KERBEROS_TICKET_INFO; -cpp_quote("#endif"); +cpp_quote("#endif") typedef [switch_type(POLICY_DOMAIN_INFORMATION_CLASS)] union _LSAPR_POLICY_DOMAIN_INFORMATION { @@ -518,12 +516,12 @@ [case(TrustedDomainSupportedEncryptionTypes)] TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES TrustedDomainSETs; } LSAPR_TRUSTED_DOMAIN_INFO, *PLSAPR_TRUSTED_DOMAIN_INFO; -cpp_quote("#ifndef _WINNT_H"); +cpp_quote("#ifndef _WINNT_H") typedef struct _LUID { ULONG LowPart; LONG HightPart; } LUID, *PLUID; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _LSAPR_LUID_AND_ATTRIBUTES { LUID Luid; @@ -536,7 +534,7 @@ [size_is(PrivilegeCount)] LSAPR_LUID_AND_ATTRIBUTES Privilege[*]; } LSAPR_PRIVILEGE_SET, *PLSAPR_PRIVILEGE_SET; -cpp_quote("#ifndef _NTSECAPI_H"); +cpp_quote("#ifndef _NTSECAPI_H") typedef enum _LSA_FOREST_TRUST_RECORD_TYPE { ForestTrustTopLevelName = 0, ForestTrustTopLevelNameEx = 1, @@ -587,7 +585,7 @@ DWORD RecordCount; [size_is(RecordCount)] PLSA_FOREST_TRUST_COLLISION_RECORD *Entries; } LSA_FOREST_TRUST_COLLISION_INFORMATION, *PLSA_FOREST_TRUST_COLLISION_INFORMATION; -cpp_quote("#endif"); +cpp_quote("#endif") [ uuid(12345778-1234-abcd-ef00-0123456789ab), Modified: trunk/reactos/include/reactos/idl/ms-dtyp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/ms-dty… ============================================================================== --- trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] Tue Sep 9 11:11:24 2008 @@ -1,5 +1,5 @@ -cpp_quote("#ifndef _DTYP_IDL"); -cpp_quote("#define _DTYP_IDL"); +cpp_quote("#ifndef _DTYP_IDL") +cpp_quote("#define _DTYP_IDL") /* Common data types */ @@ -17,9 +17,9 @@ typedef signed __int64 INT64; typedef signed int LONG32; typedef signed __int64 LONG64; -cpp_quote("#if 0"); +cpp_quote("#if 0") typedef long NTSTATUS; -cpp_quote("#endif"); +cpp_quote("#endif") typedef unsigned __int64 QWORD; typedef short SHORT; typedef __int64 TIME; @@ -50,9 +50,9 @@ typedef ULONG ULONG_PTR; #endif typedef ULONG_PTR SIZE_T; -cpp_quote("#if 0"); +cpp_quote("#if 0") typedef UCHAR *STRING; -cpp_quote("#endif"); +cpp_quote("#endif") typedef DWORD NET_API_STATUS; typedef ULONG_PTR DWORD_PTR; typedef ULONGLONG DWORDLONG, *PDWORDLONG; @@ -65,9 +65,9 @@ typedef [context_handle] void *PCONTEXT_HANDLE, *PPCONTEXT_HANDLE; typedef wchar_t WCHAR, *PWCHAR; -cpp_quote("#if 0"); +cpp_quote("#if 0") typedef wchar_t UNICODE; -cpp_quote("#endif"); +cpp_quote("#endif") typedef const char *LPCSTR; typedef const wchar_t *LPCWSTR; typedef char *PSTR, *LPSTR; @@ -76,7 +76,7 @@ typedef WCHAR *LMSTR; typedef WCHAR *BSTR; -cpp_quote("#if 0"); +cpp_quote("#if 0") #ifdef Unicode typedef LPCWSTR LPCTSTR; typedef LPWSTR LPTSTR; @@ -86,11 +86,11 @@ typedef LPSTR LPTSTR; typedef CHAR TCHAR; #endif -cpp_quote("#endif"); +cpp_quote("#endif") /* Common data structures */ -cpp_quote("#if 0"); +cpp_quote("#if 0") typedef struct _FILETIME { DWORD dwLowDateTime; @@ -110,7 +110,7 @@ typedef DWORD LCID; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _RPC_UNICODE_STRING { USHORT Length; @@ -118,7 +118,7 @@ [size_is(MaximumLength/2), length_is(Length/2)] LPWSTR Buffer; } RPC_UNICODE_STRING, *PRPC_UNICODE_STRING; -cpp_quote("#if 0"); +cpp_quote("#if 0") typedef struct _SYSTEMTIME { WORD wYear; @@ -146,11 +146,11 @@ [size_is(MaximumLength/2), length_is(Length/2)] LPWSTR Buffer; } UNICODE_STRING, *PUNICODE_STRING; -cpp_quote("#endif"); +cpp_quote("#endif") /* Constructed security types */ -cpp_quote("#if 0"); +cpp_quote("#if 0") typedef struct _SID_IDENTIFIER_AUTHORITY { BYTE Value[6]; @@ -271,7 +271,7 @@ typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct _RPC_SID { UCHAR Revision; @@ -280,4 +280,4 @@ [size_is(SubAuthorityCount)] DWORD SubAuthority[]; } RPC_SID, *PRPC_SID; -cpp_quote("#endif /* _DTYP_IDL */"); +cpp_quote("#endif /* _DTYP_IDL */") 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 Sep 9 11:11:24 2008 @@ -15,7 +15,6 @@ const unsigned short SC_MAX_ARGUMENT_LENGTH = 1024; const unsigned short SC_MAX_ARGUMENTS = 1024; -typedef unsigned long SECURITY_INFORMATION; typedef [handle] LPSTR SVCCTL_HANDLEA; typedef [handle] LPWSTR SVCCTL_HANDLEW; typedef [context_handle] unsigned long SC_RPC_HANDLE; @@ -187,7 +186,7 @@ [case(4)] LPSERVICE_FAILURE_ACTIONS_FLAG psfaf; [case(5)] LPSERVICE_SID_INFO pssid; [case(6)] LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO psrp; - [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps;; + [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps; }; } SC_RPC_CONFIG_INFOA, *LPSC_RPC_CONFIG_INFOA; Removed: trunk/reactos/include/reactos/idl/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wtypes… ============================================================================== --- trunk/reactos/include/reactos/idl/wtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/wtypes.idl (removed) @@ -1,26 +1,0 @@ -#define BYTE unsigned char -#define UCHAR unsigned char -#define WORD unsigned short - -#define BOOL int -typedef wchar_t WCHAR; -typedef char CHAR; - -typedef void *PVOID; -typedef BOOL *PBOOL; -typedef unsigned char *LPBYTE; -typedef unsigned long DWORD, *LPDWORD; -typedef CHAR *LPSTR; -typedef WCHAR *LPWSTR; - -#define LPCSTR LPSTR -#define LPCWSTR LPWSTR -#define ULONG unsigned long -#define PBYTE unsigned char* -#define PWSTR wchar_t* - -#define NTSTATUS long -cpp_quote("#if 0") -typedef int GUID; -typedef unsigned long ULONGLONG; -cpp_quote("#endif")

1 0

[sginsberg] 36085: - Add missing FLS_MAXIMUM_AVAILABLE
by sginsberg＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: sginsberg Date: Tue Sep 9 10:57:17 2008 New Revision: 36085 URL: http://svn.reactos.org/svn/reactos?rev=36085&view=rev Log: - Add missing FLS_MAXIMUM_AVAILABLE Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Tue Sep 9 10:57:17 2008 @@ -1794,6 +1794,7 @@ #define INCREF(x) ((((x)&~N_BTMASK)<<N_TSHIFT)|(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT)|((x)&N_BTMASK)) #define DECREF(x) ((((x)>>N_TSHIFT)&~N_BTMASK)|((x)&N_BTMASK)) #define TLS_MINIMUM_AVAILABLE 64 +#define FLS_MAXIMUM_AVAILABLE 128 #define REPARSE_GUID_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_GUID_DATA_BUFFER, GenericReparseBuffer) #define MAXIMUM_REPARSE_DATA_BUFFER_SIZE 16384 #define IO_REPARSE_TAG_RESERVED_ZERO 0

1 0

[janderwald] 36084: - Implement INetCfgComponent_RaisePropertyUi
by janderwald＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: janderwald Date: Tue Sep 9 09:29:25 2008 New Revision: 36084 URL: http://svn.reactos.org/svn/reactos?rev=36084&view=rev Log: - Implement INetCfgComponent_RaisePropertyUi Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c trunk/reactos/dll/win32/netcfgx/netcfg_iface.c trunk/reactos/dll/win32/netcfgx/precomp.h Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/inetcfgc… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Tue Sep 9 09:29:25 2008 @@ -6,6 +6,8 @@ const INetCfgComponent * lpVtbl; LONG ref; NetCfgComponentItem * pItem; + INetCfgComponentPropertyUi * pProperty; + INetCfg * pNCfg; }INetCfgComponentImpl; typedef struct @@ -14,6 +16,7 @@ LONG ref; NetCfgComponentItem * pCurrent; NetCfgComponentItem * pHead; + INetCfg * pNCfg; }IEnumNetCfgComponentImpl; @@ -312,6 +315,103 @@ return E_FAIL; } + +HRESULT +CreateNotificationObject( + INetCfgComponentImpl * This, + INetCfgComponent * iface, + IUnknown *pUnk, + INetCfgComponentPropertyUi ** pOut) +{ + WCHAR szName[150]; + HKEY hKey; + DWORD dwSize, dwType; + GUID CLSID_NotifyObject; + LPOLESTR pStr; + INetCfgComponentPropertyUi * pNCCPU; + INetCfgComponentControl * pNCCC; + HRESULT hr; + LONG lRet; + CLSID ClassGUID, InstanceGUID; + + wcscpy(szName,L"SYSTEM\\CurrentControlSet\\Control\\Network\\"); + + /* get the Class GUID */ + hr = INetCfgComponent_GetClassGuid(iface, &ClassGUID); + if (FAILED(hr)) + return hr; + + hr = StringFromCLSID(&ClassGUID, &pStr); + if (FAILED(hr)) + return hr; + + wcscat(szName, pStr); + CoTaskMemFree(pStr); + wcscat(szName, L"\\"); + + /* get the Class GUID */ + hr = INetCfgComponent_GetInstanceGuid(iface, &InstanceGUID); + if (FAILED(hr)) + return hr; + + hr = StringFromCLSID(&InstanceGUID, &pStr); + if (FAILED(hr)) + return hr; + + wcscat(szName, pStr); + CoTaskMemFree(pStr); + wcscat(szName, L"\\NDI"); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + return E_FAIL; + + dwSize = sizeof(szName); + lRet = RegQueryValueExW(hKey, L"ClsID", NULL, &dwType, (LPBYTE)szName, &dwSize); + RegCloseKey(hKey); + + if (lRet != ERROR_SUCCESS && dwType != REG_SZ) + return E_FAIL; + + hr = CLSIDFromString(szName, &CLSID_NotifyObject); + if (FAILED(hr)) + return E_FAIL; + + hr = CoCreateInstance(&CLSID_NotifyObject, NULL, CLSCTX_INPROC_SERVER, &IID_INetCfgComponentPropertyUi, (LPVOID*)&pNCCPU); + if (FAILED(hr)) + return E_FAIL; + + hr = INetCfgComponentPropertyUi_QueryInterface(pNCCPU, &IID_INetCfgComponentControl, (LPVOID*)&pNCCC); + if (FAILED(hr)) + { + INetCfgComponentPropertyUi_Release(pNCCPU); + return hr; + } + + hr = INetCfgComponentPropertyUi_QueryPropertyUi(pNCCPU, pUnk); + if (FAILED(hr)) + { + INetCfgComponentPropertyUi_Release(pNCCPU); + return hr; + } + + hr = INetCfgComponentControl_Initialize(pNCCC, iface, This->pNCfg, FALSE); + if (FAILED(hr)) + { + INetCfgComponentControl_Release(pNCCC); + INetCfgComponentPropertyUi_Release(pNCCPU); + return hr; + } + + hr = INetCfgComponentPropertyUi_SetContext(pNCCPU, pUnk); + if (FAILED(hr)) + { + INetCfgComponentPropertyUi_Release(pNCCPU); + return hr; + } + *pOut = pNCCPU; + return S_OK; +} + HRESULT STDCALL INetCfgComponent_fnRaisePropertyUi( @@ -320,8 +420,46 @@ IN DWORD dwFlags, IN IUnknown *pUnk) { - - return E_NOTIMPL; + HRESULT hr; + DWORD dwDefPages; + UINT Pages; + PROPSHEETHEADERW pinfo; + HPROPSHEETPAGE * hppages; + INT_PTR iResult; + INetCfgComponentImpl * This = (INetCfgComponentImpl*)iface; + + if (!This->pProperty) + { + hr = CreateNotificationObject(This,iface, pUnk, &This->pProperty); + if (FAILED(hr)) + return hr; + } + + dwDefPages = 1; + hr = INetCfgComponentPropertyUi_MergePropPages(This->pProperty, &dwDefPages, (BYTE**)&hppages, &Pages, hwndParent, NULL); + if (FAILED(hr)) + { + return hr; + } + ZeroMemory(&pinfo, sizeof(PROPSHEETHEADERW)); + pinfo.dwSize = sizeof(PROPSHEETHEADERW); + pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; + pinfo.u3.phpage = hppages; + pinfo.hwndParent = hwndParent; + pinfo.pszCaption = This->pItem->szDisplayName; + + iResult = PropertySheetW(&pinfo); + CoTaskMemFree(hppages); + if (iResult < 0) + { + INetCfgComponentPropertyUi_CancelProperties(This->pProperty); + return E_ABORT; + } + else + { + INetCfgComponentPropertyUi_ApplyProperties(This->pProperty); + return S_OK; + } } static const INetCfgComponentVtbl vt_NetCfgComponent = { @@ -344,7 +482,7 @@ HRESULT STDCALL -INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem) +INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem, INetCfg * pNCfg) { INetCfgComponentImpl *This; @@ -357,7 +495,9 @@ This->ref = 1; This->lpVtbl = (const INetCfgComponent*)&vt_NetCfgComponent; + This->pProperty = NULL; This->pItem = pItem; + This->pNCfg = pNCfg; if (!SUCCEEDED (INetCfgComponent_QueryInterface ((INetCfgComponent*)This, riid, ppv))) { @@ -441,7 +581,7 @@ if (!This->pCurrent) return S_FALSE; - hr = INetCfgComponent_Constructor (NULL, &IID_INetCfgComponent, (LPVOID*)rgelt, This->pCurrent); + hr = INetCfgComponent_Constructor (NULL, &IID_INetCfgComponent, (LPVOID*)rgelt, This->pCurrent, This->pNCfg); if (SUCCEEDED(hr)) { This->pCurrent = This->pCurrent->pNext; @@ -504,7 +644,7 @@ HRESULT STDCALL -IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem) +IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem, INetCfg * pNCfg) { IEnumNetCfgComponentImpl *This; @@ -519,6 +659,7 @@ This->lpVtbl = (const IEnumNetCfgComponent*)&vt_EnumNetCfgComponent; This->pCurrent = pItem; This->pHead = pItem; + This->pNCfg = pNCfg; if (!SUCCEEDED (IEnumNetCfgComponent_QueryInterface ((INetCfgComponent*)This, riid, ppv))) { Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_i… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Tue Sep 9 09:29:25 2008 @@ -425,13 +425,14 @@ FindNetworkComponent( NetCfgComponentItem * pHead, LPCWSTR pszwComponentId, - INetCfgComponent **pComponent) + INetCfgComponent **pComponent, + INetCfg * iface) { while(pHead) { if (!wcsicmp(pHead->szId, pszwComponentId)) { - return INetCfgComponent_Constructor(NULL, &IID_INetCfgComponent, (LPVOID*)pComponent, pHead); + return INetCfgComponent_Constructor(NULL, &IID_INetCfgComponent, (LPVOID*)pComponent, pHead, iface); } pHead = pHead->pNext; } @@ -586,13 +587,13 @@ return NETCFG_E_NOT_INITIALIZED; if (IsEqualGUID(&GUID_DEVCLASS_NET, pguidClass)) - return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pNet); + return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pNet, iface); else if (IsEqualGUID(&GUID_DEVCLASS_NETCLIENT, pguidClass)) - return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pClient); + return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pClient, iface); else if (IsEqualGUID(&GUID_DEVCLASS_NETSERVICE, pguidClass)) - return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pService); + return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pService, iface); else if (IsEqualGUID(&GUID_DEVCLASS_NETTRANS, pguidClass)) - return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pProtocol); + return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pProtocol, iface); else return E_NOINTERFACE; } @@ -611,15 +612,15 @@ if (!This->bInitialized) return NETCFG_E_NOT_INITIALIZED; - hr = FindNetworkComponent(This->pClient, pszwComponentId, pComponent); + hr = FindNetworkComponent(This->pClient, pszwComponentId, pComponent, iface); if (hr == S_OK) return hr; - hr = FindNetworkComponent(This->pService, pszwComponentId, pComponent); + hr = FindNetworkComponent(This->pService, pszwComponentId, pComponent, iface); if (hr == S_OK) return hr; - hr = FindNetworkComponent(This->pProtocol, pszwComponentId, pComponent); + hr = FindNetworkComponent(This->pProtocol, pszwComponentId, pComponent, iface); if (hr == S_OK) return hr; Modified: trunk/reactos/dll/win32/netcfgx/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/precomp.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] Tue Sep 9 09:29:25 2008 @@ -11,6 +11,7 @@ #include <stdio.h> #include <iphlpapi.h> #include <olectl.h> +#include <netcfgn.h> typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); typedef struct { @@ -43,7 +44,7 @@ extern HINSTANCE netcfgx_hInstance; /* inetcfgcomp_iface.c */ -HRESULT STDCALL INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem); -HRESULT STDCALL IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem); +HRESULT STDCALL INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem,INetCfg * iface); +HRESULT STDCALL IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem, INetCfg * iface); #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs