Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[gvg] 18418: Send window-bound timers to the correct message queue
by gvg＠svn.reactos.com 12 Oct '05

12 Oct '05

Send window-bound timers to the correct message queue Modified: trunk/reactos/subsys/win32k/ntuser/timer.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/timer.c --- trunk/reactos/subsys/win32k/ntuser/timer.c 2005-10-12 22:04:07 UTC (rev 18417) +++ trunk/reactos/subsys/win32k/ntuser/timer.c 2005-10-12 22:15:22 UTC (rev 18418) @@ -60,6 +60,7 @@ { PWINDOW_OBJECT Window; UINT_PTR Ret = 0; + PUSER_MESSAGE_QUEUE MessageQueue; DPRINT("IntSetTimer wnd %x id %p elapse %u timerproc %p systemtimer %s\n", Wnd, IDEvent, Elapse, TimerFunc, SystemTimer ? "TRUE" : "FALSE"); @@ -82,6 +83,7 @@ HintIndex = ++IDEvent; IntUnlockWindowlessTimerBitmap(); Ret = IDEvent; + MessageQueue = PsGetWin32Thread()->MessageQueue; } else { @@ -99,6 +101,7 @@ } Ret = IDEvent; + MessageQueue = Window->MessageQueue; } #if 1 @@ -128,7 +131,7 @@ Elapse = 10; } - if (! MsqSetTimer(PsGetWin32Thread()->MessageQueue, Wnd, + if (! MsqSetTimer(MessageQueue, Wnd, IDEvent, Elapse, TimerFunc, SystemTimer ? WM_SYSTIMER : WM_TIMER)) {

1 0

[weiden] 18417: set eol-style to native
by weiden＠svn.reactos.com 12 Oct '05

12 Oct '05

set eol-style to native Modified: trunk/reactos/lib/secur32/secext.c Modified: trunk/reactos/lib/secur32/sspi.c Modified: trunk/reactos/w32api/include/winefs.h _____ Modified: trunk/reactos/lib/secur32/secext.c --- trunk/reactos/lib/secur32/secext.c 2005-10-12 21:39:28 UTC (rev 18416) +++ trunk/reactos/lib/secur32/secext.c 2005-10-12 22:04:07 UTC (rev 18417) @@ -1,61 +1,61 @@ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <lsass/lsass.h> - -#define NDEBUG -#include <debug.h> - -#include <ntsecapi.h> -#include <secext.h> - - -BOOLEAN -WINAPI -GetComputerObjectNameA ( - EXTENDED_NAME_FORMAT extended_name_format, - LPSTR lpstr, - PULONG pulong - ) -{ - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -BOOLEAN -WINAPI -GetComputerObjectNameW ( - EXTENDED_NAME_FORMAT extended_name_format, - LPWSTR lpstr, - PULONG pulong - ) -{ - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - - -BOOLEAN -WINAPI -GetUserNameExA ( - EXTENDED_NAME_FORMAT extended_exe_format, - LPSTR lpstr, - PULONG pulong - ) -{ - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - - -BOOLEAN -WINAPI -GetUserNameExW ( - EXTENDED_NAME_FORMAT extended_exe_format, - LPWSTR lpstr, - PULONG pulong - ) -{ - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <lsass/lsass.h> + +#define NDEBUG +#include <debug.h> + +#include <ntsecapi.h> +#include <secext.h> + + +BOOLEAN +WINAPI +GetComputerObjectNameA ( + EXTENDED_NAME_FORMAT extended_name_format, + LPSTR lpstr, + PULONG pulong + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOLEAN +WINAPI +GetComputerObjectNameW ( + EXTENDED_NAME_FORMAT extended_name_format, + LPWSTR lpstr, + PULONG pulong + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +BOOLEAN +WINAPI +GetUserNameExA ( + EXTENDED_NAME_FORMAT extended_exe_format, + LPSTR lpstr, + PULONG pulong + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +BOOLEAN +WINAPI +GetUserNameExW ( + EXTENDED_NAME_FORMAT extended_exe_format, + LPWSTR lpstr, + PULONG pulong + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} Property changes on: trunk/reactos/lib/secur32/secext.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/secur32/sspi.c --- trunk/reactos/lib/secur32/sspi.c 2005-10-12 21:39:28 UTC (rev 18416) +++ trunk/reactos/lib/secur32/sspi.c 2005-10-12 22:04:07 UTC (rev 18417) @@ -1,35 +1,35 @@ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <lsass/lsass.h> - -#define NDEBUG -#include <debug.h> - -#include <ntsecapi.h> -#include <security.h> -#include <sspi.h> - - - -SECURITY_STATUS -WINAPI -EnumerateSecurityPackagesW ( - PULONG pulong, - PSecPkgInfoW* psecpkginfow - ) -{ - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - - -SECURITY_STATUS -WINAPI -FreeContextBuffer ( - PVOID pvoid - ) -{ - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <lsass/lsass.h> + +#define NDEBUG +#include <debug.h> + +#include <ntsecapi.h> +#include <security.h> +#include <sspi.h> + + + +SECURITY_STATUS +WINAPI +EnumerateSecurityPackagesW ( + PULONG pulong, + PSecPkgInfoW* psecpkginfow + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +SECURITY_STATUS +WINAPI +FreeContextBuffer ( + PVOID pvoid + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} Property changes on: trunk/reactos/lib/secur32/sspi.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/w32api/include/winefs.h --- trunk/reactos/w32api/include/winefs.h 2005-10-12 21:39:28 UTC (rev 18416) +++ trunk/reactos/w32api/include/winefs.h 2005-10-12 22:04:07 UTC (rev 18417) @@ -1,67 +1,67 @@ -typedef struct _CERTIFICATE_BLOB { - DWORD dwCertEncodingType; - DWORD cbData; - PBYTE pbData; -} EFS_CERTIFICATE_BLOB, *PEFS_CERTIFICATE_BLOB; - -typedef struct _EFS_HASH_BLOB { - DWORD cbData; - PBYTE pbData; -} EFS_HASH_BLOB, *PEFS_HASH_BLOB; - -typedef struct _ENCRYPTION_CERTIFICATE { - DWORD cbTotalLength; - SID* pUserSid; - PEFS_CERTIFICATE_BLOB pCertBlob; -} ENCRYPTION_CERTIFICATE, *PENCRYPTION_CERTIFICATE; - -typedef struct _ENCRYPTION_CERTIFICATE_HASH { - DWORD cbTotalLength; - SID* pUserSid; - PEFS_HASH_BLOB pHash; - LPWSTR lpDisplayInformation; -} ENCRYPTION_CERTIFICATE_HASH, *PENCRYPTION_CERTIFICATE_HASH; - -typedef struct _ENCRYPTION_CERTIFICATE_LIST { - DWORD nUsers; - PENCRYPTION_CERTIFICATE* pUsers; -} ENCRYPTION_CERTIFICATE_LIST, *PENCRYPTION_CERTIFICATE_LIST; - -typedef struct _ENCRYPTION_CERTIFICATE_HASH_LIST { - DWORD nCert_Hash; - PENCRYPTION_CERTIFICATE_HASH* pUsers; -} ENCRYPTION_CERTIFICATE_HASH_LIST, *PENCRYPTION_CERTIFICATE_HASH_LIST; - -DWORD WINAPI AddUsersToEncryptedFile ( - LPCWSTR, - PENCRYPTION_CERTIFICATE_LIST - ); - -DWORD WINAPI RemoveUsersFromEncryptedFile ( - LPCWSTR, - PENCRYPTION_CERTIFICATE_HASH_LIST - ); - -BOOL WINAPI EncryptionDisable ( - LPCWSTR, - BOOL - ); - -BOOL WINAPI FileEncryptionStatus ( - LPCTSTR, - LPDWORD - ); - -DWORD WINAPI QueryUsersOnEncryptedFile ( - LPCWSTR, - PENCRYPTION_CERTIFICATE_HASH_LIST* - ); - -void WINAPI FreeEncryptionCertificateHashList ( - PENCRYPTION_CERTIFICATE_HASH_LIST - ); - -DWORD WINAPI QueryRecoveryAgentsOnEncryptedFile ( - LPCWSTR, - PENCRYPTION_CERTIFICATE_HASH_LIST* - ); +typedef struct _CERTIFICATE_BLOB { + DWORD dwCertEncodingType; + DWORD cbData; + PBYTE pbData; +} EFS_CERTIFICATE_BLOB, *PEFS_CERTIFICATE_BLOB; + +typedef struct _EFS_HASH_BLOB { + DWORD cbData; + PBYTE pbData; +} EFS_HASH_BLOB, *PEFS_HASH_BLOB; + +typedef struct _ENCRYPTION_CERTIFICATE { + DWORD cbTotalLength; + SID* pUserSid; + PEFS_CERTIFICATE_BLOB pCertBlob; +} ENCRYPTION_CERTIFICATE, *PENCRYPTION_CERTIFICATE; + +typedef struct _ENCRYPTION_CERTIFICATE_HASH { + DWORD cbTotalLength; + SID* pUserSid; + PEFS_HASH_BLOB pHash; + LPWSTR lpDisplayInformation; +} ENCRYPTION_CERTIFICATE_HASH, *PENCRYPTION_CERTIFICATE_HASH; + +typedef struct _ENCRYPTION_CERTIFICATE_LIST { + DWORD nUsers; + PENCRYPTION_CERTIFICATE* pUsers; +} ENCRYPTION_CERTIFICATE_LIST, *PENCRYPTION_CERTIFICATE_LIST; + +typedef struct _ENCRYPTION_CERTIFICATE_HASH_LIST { + DWORD nCert_Hash; + PENCRYPTION_CERTIFICATE_HASH* pUsers; +} ENCRYPTION_CERTIFICATE_HASH_LIST, *PENCRYPTION_CERTIFICATE_HASH_LIST; + +DWORD WINAPI AddUsersToEncryptedFile ( + LPCWSTR, + PENCRYPTION_CERTIFICATE_LIST + ); + +DWORD WINAPI RemoveUsersFromEncryptedFile ( + LPCWSTR, + PENCRYPTION_CERTIFICATE_HASH_LIST + ); + +BOOL WINAPI EncryptionDisable ( + LPCWSTR, + BOOL + ); + +BOOL WINAPI FileEncryptionStatus ( + LPCTSTR, + LPDWORD + ); + +DWORD WINAPI QueryUsersOnEncryptedFile ( + LPCWSTR, + PENCRYPTION_CERTIFICATE_HASH_LIST* + ); + +void WINAPI FreeEncryptionCertificateHashList ( + PENCRYPTION_CERTIFICATE_HASH_LIST + ); + +DWORD WINAPI QueryRecoveryAgentsOnEncryptedFile ( + LPCWSTR, + PENCRYPTION_CERTIFICATE_HASH_LIST* + ); Property changes on: trunk/reactos/w32api/include/winefs.h ___________________________________________________________________ Name: svn:eol-style + native

1 0

[gdalsnes] 18416: add stubs to make clamwin run. by Christoph_vW
by gdalsnes＠svn.reactos.com 12 Oct '05

12 Oct '05

add stubs to make clamwin run. by Christoph_vW stub GetNativeSystemInfo better to make cpuz get further. by Christoph_vW stub IsWow64Process better. by me Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/crypt/crypt.c Modified: trunk/reactos/lib/advapi32/sec/ac.c Modified: trunk/reactos/lib/advapi32/sec/sec.c Modified: trunk/reactos/lib/kernel32/misc/stubs.c Modified: trunk/reactos/lib/kernel32/misc/sysinfo.c Added: trunk/reactos/lib/secur32/secext.c Modified: trunk/reactos/lib/secur32/secur32.def Modified: trunk/reactos/lib/secur32/secur32.xml Added: trunk/reactos/lib/secur32/sspi.c Added: trunk/reactos/w32api/include/winefs.h _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-10-12 21:39:28 UTC (rev 18416) @@ -32,7 +32,7 @@ AddAuditAccessAce@24 AddAuditAccessAceEx@28 AddAuditAccessObjectAce@36 -;AddUsersToEncryptedFile@8 +AddUsersToEncryptedFile@8 AdjustTokenGroups@24 AdjustTokenPrivileges@24 AllocateAndInitializeSid@44 @@ -85,7 +85,7 @@ ;ConvertSecurityDescriptorToAccessNamedW=ConvertSecurityDescriptorToAcce ssW@28 ;ConvertSecurityDescriptorToAccessW@28 ;ConvertSecurityDescriptorToStringSecurityDescriptorA@20 -;ConvertSecurityDescriptorToStringSecurityDescriptorW@20 +ConvertSecurityDescriptorToStringSecurityDescriptorW@20 ConvertSidToStringSidA@8 ConvertSidToStringSidW@8 ;ConvertStringSDToSDDomainA@24 @@ -95,7 +95,7 @@ ConvertStringSecurityDescriptorToSecurityDescriptorA@16 ConvertStringSecurityDescriptorToSecurityDescriptorW@16 ;ConvertStringSidToSidA@8 -;ConvertStringSidToSidW@8 +ConvertStringSidToSidW@8 ConvertToAutoInheritPrivateObjectSecurity@24 CopySid@12 ;CreateCodeAuthzLevel@20 @@ -106,7 +106,7 @@ ;CreateProcessAsUserSecure CreateProcessAsUserW@44 ;CreateProcessWithLogonW -;CreateRestrictedToken@36 +CreateRestrictedToken@36 CreateServiceA@52 CreateServiceW@52 ;CreateTraceInstanceId@8 @@ -154,7 +154,7 @@ ;CryptEnumProviderTypesA@24 ;CryptEnumProviderTypesW@24 ;CryptEnumProvidersA@24 -;CryptEnumProvidersW@24 +CryptEnumProvidersW@24 CryptExportKey@24 CryptGenKey@16 CryptGenRandom@12 @@ -179,8 +179,8 @@ ;CryptSignHashW@24 CryptVerifySignatureA@24 CryptVerifySignatureW@24 -;DecryptFileA@8 -;DecryptFileW@8 +DecryptFileA@8 +DecryptFileW@8 DeleteAce@8 DeleteService@4 DeregisterEventSource@4 @@ -208,10 +208,10 @@ ;ElfReportEventA@48 ;ElfReportEventW@48 ;EnableTrace -;EncryptFileA -;EncryptFileW +EncryptFileA@4 +EncryptFileW@4 ;EncryptedFileKeyInfo -;EncryptionDisable +EncryptionDisable@8 EnumDependentServicesA@24 EnumDependentServicesW@24 EnumServiceGroupW@36 @@ -223,13 +223,13 @@ EqualDomainSid@12 EqualPrefixSid@8 EqualSid@8 -;FileEncryptionStatusA -;FileEncryptionStatusW +FileEncryptionStatusA@8 +FileEncryptionStatusW@8 FindFirstFreeAce@8 ;FlushTraceA ;FlushTraceW ;FreeEncryptedFileKeyInfo -;FreeEncryptionCertificateHashList +FreeEncryptionCertificateHashList@4 FreeInheritedFromArray@12 FreeSid@4 ;GetAccessPermissionsForObjectA @@ -237,11 +237,11 @@ GetAce@12 GetAclInformation@16 ;GetAuditedPermissionsFromAclA@16 -;GetAuditedPermissionsFromAclW@16 +GetAuditedPermissionsFromAclW@16 GetCurrentHwProfileA@4 GetCurrentHwProfileW@4 ;GetEffectiveRightsFromAclA@12 -;GetEffectiveRightsFromAclW@12 +GetEffectiveRightsFromAclW@12 ;GetEventLogInformation GetExplicitEntriesFromAclA(a)12=ADVAPI32.GetExplicitEntriesFromAclW GetExplicitEntriesFromAclW@12 @@ -343,7 +343,7 @@ LookupPrivilegeValueW@12 ;LookupSecurityDescriptorPartsA@28 ;LookupSecurityDescriptorPartsW@28 -;LsaAddAccountRights@16 +LsaAddAccountRights@16 ;LsaAddPrivilegesToAccount@8 ;LsaClearAuditLog@4 LsaClose@4 @@ -353,9 +353,9 @@ ;LsaCreateTrustedDomainEx ;LsaDelete@4 ;LsaDeleteTrustedDomain@8 -;LsaEnumerateAccountRights@16 +LsaEnumerateAccountRights@16 ;LsaEnumerateAccounts@20 -;LsaEnumerateAccountsWithUserRight@16 +LsaEnumerateAccountsWithUserRight@16 ;LsaEnumeratePrivileges@20 ;LsaEnumeratePrivilegesOfAccount@8 ;LsaEnumerateTrustedDomains@20 @@ -390,10 +390,10 @@ ;LsaQuerySecurityObject@12 ;LsaQueryTrustedDomainInfo@16 ;LsaQueryTrustedDomainInfoByName -;LsaRemoveAccountRights@20 +LsaRemoveAccountRights@20 ;LsaRemovePrivilegesFromAccount@12 LsaRetrievePrivateData@12 -;LsaSetInformationPolicy@12 +LsaSetInformationPolicy@12 ;LsaSetForestTrustInformation ;LsaSetInformationPolicy ;LsaSetInformationTrustedDomain@12 @@ -448,7 +448,7 @@ ;ProvAccessRightsToNTAccessMask ; ? ;QueryAllTracesA ;QueryAllTracesW -;QueryRecoveryAgentsOnEncryptedFile +QueryRecoveryAgentsOnEncryptedFile@8 ;QueryServiceConfig2A ;QueryServiceConfig2W QueryServiceConfigA@16 @@ -460,7 +460,7 @@ QueryServiceStatusEx@20 ;QueryTraceA ;QueryTraceW -;QueryUsersOnEncryptedFile +QueryUsersOnEncryptedFile@8 ;QueryWindows31FilesMigration@4 ;ReadEncryptedFileRaw ReadEventLogA@28 @@ -539,7 +539,7 @@ ;RegisterTraceGuidsA ;RegisterTraceGuidsW ;RemoveTraceCallback -;RemoveUsersFromEncryptedFile +RemoveUsersFromEncryptedFile@8 ReportEventA@36 ReportEventW@36 RevertToSelf@0 _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt.c --- trunk/reactos/lib/advapi32/crypt/crypt.c 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/lib/advapi32/crypt/crypt.c 2005-10-12 21:39:28 UTC (rev 18416) @@ -27,6 +27,7 @@ #include <advapi32.h> #include "crypt.h" +#include <winefs.h> #define NDEBUG #include <debug.h> @@ -1935,3 +1936,98 @@ DPRINT1("(%p, %lx, %lx): stub [RtlDecryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; } + + +/* + * @unimplemented + */ +DWORD WINAPI AddUsersToEncryptedFile ( + LPCWSTR lpcwstr, + PENCRYPTION_CERTIFICATE_LIST pencryption_certificate_list + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +DWORD WINAPI RemoveUsersFromEncryptedFile ( + LPCWSTR lpcwstr, + PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +BOOL WINAPI EncryptionDisable ( + LPCWSTR, + BOOL + ); + +/* + * @unimplemented + */ +BOOL WINAPI FileEncryptionStatusW ( + LPCWSTR lpcwstr, + LPDWORD lpdword + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +BOOL WINAPI FileEncryptionStatusA ( + LPCSTR lpcstr, + LPDWORD lpdword + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +DWORD WINAPI QueryUsersOnEncryptedFile ( + LPCWSTR lpctstr, + PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +void WINAPI FreeEncryptionCertificateHashList ( + PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return; +} + + +/* + * @unimplemented + */ +DWORD WINAPI QueryRecoveryAgentsOnEncryptedFile ( + LPCWSTR lpctstr, + PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} _____ Modified: trunk/reactos/lib/advapi32/sec/ac.c --- trunk/reactos/lib/advapi32/sec/ac.c 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/lib/advapi32/sec/ac.c 2005-10-12 21:39:28 UTC (rev 18416) @@ -692,5 +692,36 @@ return ErrorCode; } +/* + * @unimplemented + */ +DWORD +STDCALL +GetEffectiveRightsFromAclW( + PACL pacl, + PTRUSTEE_W ptrustee_w, + PACCESS_MASK paccess_mask + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +DWORD +STDCALL +GetAuditedPermissionsFromAclW( + PACL pacl, + PTRUSTEE_W ptrustee_w, + PACCESS_MASK paccess_mask, + PACCESS_MASK paccess_mask2 + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /* EOF */ _____ Modified: trunk/reactos/lib/advapi32/sec/sec.c --- trunk/reactos/lib/advapi32/sec/sec.c 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/lib/advapi32/sec/sec.c 2005-10-12 21:39:28 UTC (rev 18416) @@ -498,4 +498,40 @@ } +/* + * @unimplemented + */ +BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +BOOL WINAPI DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +BOOL WINAPI EncryptFileW(LPCWSTR lpFileName) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +BOOL WINAPI EncryptFileA(LPCSTR lpFileName) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/misc/stubs.c --- trunk/reactos/lib/kernel32/misc/stubs.c 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/lib/kernel32/misc/stubs.c 2005-10-12 21:39:28 UTC (rev 18416) @@ -592,17 +592,6 @@ return 0; } -/* - * @unimplemented - */ -VOID -STDCALL -GetNativeSystemInfo( - LPSYSTEM_INFO lpSystemInfo - ) -{ - STUB; -} /* * @unimplemented @@ -720,7 +709,8 @@ ) { STUB; - return 0; + *Wow64Process = FALSE; + return TRUE; } /* _____ Modified: trunk/reactos/lib/kernel32/misc/sysinfo.c --- trunk/reactos/lib/kernel32/misc/sysinfo.c 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/lib/kernel32/misc/sysinfo.c 2005-10-12 21:39:28 UTC (rev 18416) @@ -198,4 +198,20 @@ return FALSE; } +/* + * @implemented + */ +VOID +STDCALL +GetNativeSystemInfo( + LPSYSTEM_INFO lpSystemInfo + ) +{ + //FIXME: GetNativeSystemInfo should return always the real Hardware Processorarchitecture + // in case a Program is running in 32bit Mode on AMD64 + // GetSystemInfo should return PROCESSOR_ARCHITECTURE_INTEL and + // GetNativeSystemInfo should return PROCESSOR_ARCHITECTURE_AMD64 + GetSystemInfo(lpSystemInfo); +} + /* EOF */ _____ Added: trunk/reactos/lib/secur32/secext.c --- trunk/reactos/lib/secur32/secext.c 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/lib/secur32/secext.c 2005-10-12 21:39:28 UTC (rev 18416) @@ -0,0 +1,61 @@ +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <lsass/lsass.h> + +#define NDEBUG +#include <debug.h> + +#include <ntsecapi.h> +#include <secext.h> + + +BOOLEAN +WINAPI +GetComputerObjectNameA ( + EXTENDED_NAME_FORMAT extended_name_format, + LPSTR lpstr, + PULONG pulong + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOLEAN +WINAPI +GetComputerObjectNameW ( + EXTENDED_NAME_FORMAT extended_name_format, + LPWSTR lpstr, + PULONG pulong + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +BOOLEAN +WINAPI +GetUserNameExA ( + EXTENDED_NAME_FORMAT extended_exe_format, + LPSTR lpstr, + PULONG pulong + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +BOOLEAN +WINAPI +GetUserNameExW ( + EXTENDED_NAME_FORMAT extended_exe_format, + LPWSTR lpstr, + PULONG pulong + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} _____ Modified: trunk/reactos/lib/secur32/secur32.def --- trunk/reactos/lib/secur32/secur32.def 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/lib/secur32/secur32.def 2005-10-12 21:39:28 UTC (rev 18416) @@ -23,16 +23,16 @@ ;@DeleteSecurityPackageA ;@DeleteSecurityPackageW ;@EncryptMessage -;@EnumerateSecurityPackagesA -;@EnumerateSecurityPackagesW +;@EnumerateSecurityPackagesA@8 +EnumerateSecurityPackagesW@8 ;@ExportSecurityContext -;@FreeContextBuffer +FreeContextBuffer@4 ;@FreeCredentialsHandle -;@GetComputerObjectNameA -;@GetComputerObjectNameW +GetComputerObjectNameA@12 +GetComputerObjectNameW@12 ;GetSecurityUserInfo -;@GetUserNameExA -;@GetUserNameExW +GetUserNameExA@12 +GetUserNameExW@12 ;@ImpersonateSecurityContext ;@ImportSecurityContextA ;@ImportSecurityContextW _____ Modified: trunk/reactos/lib/secur32/secur32.xml --- trunk/reactos/lib/secur32/secur32.xml 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/lib/secur32/secur32.xml 2005-10-12 21:39:28 UTC (rev 18416) @@ -3,10 +3,13 @@ <include base="secur32">.</include> <define name="__SECUR32__" /> <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x501</define> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> <file>dllmain.c</file> <file>lsa.c</file> + <file>secext.c</file> + <file>sspi.c</file> <file>secur32.rc</file> </module> _____ Added: trunk/reactos/lib/secur32/sspi.c --- trunk/reactos/lib/secur32/sspi.c 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/lib/secur32/sspi.c 2005-10-12 21:39:28 UTC (rev 18416) @@ -0,0 +1,35 @@ +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <lsass/lsass.h> + +#define NDEBUG +#include <debug.h> + +#include <ntsecapi.h> +#include <security.h> +#include <sspi.h> + + + +SECURITY_STATUS +WINAPI +EnumerateSecurityPackagesW ( + PULONG pulong, + PSecPkgInfoW* psecpkginfow + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +SECURITY_STATUS +WINAPI +FreeContextBuffer ( + PVOID pvoid + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} _____ Added: trunk/reactos/w32api/include/winefs.h --- trunk/reactos/w32api/include/winefs.h 2005-10-12 20:20:18 UTC (rev 18415) +++ trunk/reactos/w32api/include/winefs.h 2005-10-12 21:39:28 UTC (rev 18416) @@ -0,0 +1,67 @@ +typedef struct _CERTIFICATE_BLOB { + DWORD dwCertEncodingType; + DWORD cbData; + PBYTE pbData; +} EFS_CERTIFICATE_BLOB, *PEFS_CERTIFICATE_BLOB; + +typedef struct _EFS_HASH_BLOB { + DWORD cbData; + PBYTE pbData; +} EFS_HASH_BLOB, *PEFS_HASH_BLOB; + +typedef struct _ENCRYPTION_CERTIFICATE { + DWORD cbTotalLength; + SID* pUserSid; + PEFS_CERTIFICATE_BLOB pCertBlob; +} ENCRYPTION_CERTIFICATE, *PENCRYPTION_CERTIFICATE; + +typedef struct _ENCRYPTION_CERTIFICATE_HASH { + DWORD cbTotalLength; + SID* pUserSid; + PEFS_HASH_BLOB pHash; + LPWSTR lpDisplayInformation; +} ENCRYPTION_CERTIFICATE_HASH, *PENCRYPTION_CERTIFICATE_HASH; + +typedef struct _ENCRYPTION_CERTIFICATE_LIST { + DWORD nUsers; + PENCRYPTION_CERTIFICATE* pUsers; +} ENCRYPTION_CERTIFICATE_LIST, *PENCRYPTION_CERTIFICATE_LIST; + +typedef struct _ENCRYPTION_CERTIFICATE_HASH_LIST { + DWORD nCert_Hash; + PENCRYPTION_CERTIFICATE_HASH* pUsers; +} ENCRYPTION_CERTIFICATE_HASH_LIST, *PENCRYPTION_CERTIFICATE_HASH_LIST; + +DWORD WINAPI AddUsersToEncryptedFile ( + LPCWSTR, + PENCRYPTION_CERTIFICATE_LIST + ); + +DWORD WINAPI RemoveUsersFromEncryptedFile ( + LPCWSTR, + PENCRYPTION_CERTIFICATE_HASH_LIST + ); + +BOOL WINAPI EncryptionDisable ( + LPCWSTR, + BOOL + ); + +BOOL WINAPI FileEncryptionStatus ( + LPCTSTR, + LPDWORD + ); + +DWORD WINAPI QueryUsersOnEncryptedFile ( + LPCWSTR, + PENCRYPTION_CERTIFICATE_HASH_LIST* + ); + +void WINAPI FreeEncryptionCertificateHashList ( + PENCRYPTION_CERTIFICATE_HASH_LIST + ); + +DWORD WINAPI QueryRecoveryAgentsOnEncryptedFile ( + LPCWSTR, + PENCRYPTION_CERTIFICATE_HASH_LIST* + );

1 0

[mf] 18415: zoomin:
by mf＠svn.reactos.com 12 Oct '05

12 Oct '05

zoomin: - allow to cange zoom factor and display zoom factor - add accelerator table Modified: trunk/rosapps/devutils/zoomin/framewnd.c Modified: trunk/rosapps/devutils/zoomin/framewnd.h Modified: trunk/rosapps/devutils/zoomin/main.c Modified: trunk/rosapps/devutils/zoomin/main.h Modified: trunk/rosapps/devutils/zoomin/resource.h Modified: trunk/rosapps/devutils/zoomin/zoomin.rc _____ Modified: trunk/rosapps/devutils/zoomin/framewnd.c --- trunk/rosapps/devutils/zoomin/framewnd.c 2005-10-12 19:15:54 UTC (rev 18414) +++ trunk/rosapps/devutils/zoomin/framewnd.c 2005-10-12 20:20:18 UTC (rev 18415) @@ -42,11 +42,34 @@ BOOL s_dragging = FALSE; + // zoom range + +#define MIN_ZOOM 1 +#define MAX_ZOOM 16 + + //////////////////////////////////////////////////////////////////////// //////// -// Local module support methods // +// FUNCTION: SetZoom() +// +// PURPOSE: Change zoom level +// +static void SetZoom(HWND hWnd, int factor) +{ + TCHAR buffer[MAX_LOADSTRING]; + if (factor>=MIN_ZOOM && factor<=MAX_ZOOM) { + s_factor = factor; + + SetScrollPos(hWnd, SB_VERT, s_factor, TRUE); + + wsprintf(buffer, TEXT("%s %dx"), szTitle, s_factor); + SetWindowText(hWnd, buffer); + } +} + + //////////////////////////////////////////////////////////////////////// //////// // // FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG) @@ -70,6 +93,10 @@ // TODO: break; + case ID_REFRESH: + InvalidateRect(hWnd, NULL, FALSE); + break; + default: return FALSE; } @@ -89,6 +116,8 @@ switch (message) { case WM_CREATE: SetTimer(hWnd, 0, 200, NULL); // refresh display all 200 ms + SetScrollRange(hWnd, SB_VERT, 1, MAX_ZOOM, FALSE); + SetZoom(hWnd, s_factor); break; case WM_COMMAND: @@ -107,10 +136,11 @@ hdcMem = GetDC(GetDesktopWindow()); GetClientRect(hWnd, &clnt); - size.cx = clnt.right / s_factor; - size.cy = clnt.bottom / s_factor; + size.cx = (clnt.right + s_factor-1) / s_factor; + size.cy = (clnt.bottom + s_factor-1) / s_factor; - StretchBlt(ps.hdc, 0, 0, size.cx*s_factor, size.cy*s_factor, hdcMem, s_srcPos.x, s_srcPos.y, size.cx, size.cy, SRCCOPY); + StretchBlt(ps.hdc, 0, 0, size.cx*s_factor, size.cy*s_factor, + hdcMem, s_srcPos.x, s_srcPos.y, size.cx, size.cy, SRCCOPY); ReleaseDC(GetDesktopWindow(), hdcMem); EndPaint(hWnd, &ps); @@ -181,6 +211,20 @@ } break; + case WM_VSCROLL: + switch(wParam) { + case SB_LINEUP: + case SB_PAGEUP: + SetZoom(hWnd, s_factor-1); + break; + + case SB_LINEDOWN: + case SB_PAGEDOWN: + SetZoom(hWnd, s_factor+1); + break; + } + break; + case WM_DESTROY: KillTimer(hWnd, 0); PostQuitMessage(0); _____ Modified: trunk/rosapps/devutils/zoomin/framewnd.h --- trunk/rosapps/devutils/zoomin/framewnd.h 2005-10-12 19:15:54 UTC (rev 18414) +++ trunk/rosapps/devutils/zoomin/framewnd.h 2005-10-12 20:20:18 UTC (rev 18415) @@ -23,17 +23,10 @@ #ifndef __FRAMEWND_H__ #define __FRAMEWND_H__ -#ifdef __cplusplus -extern "C" { -#endif - - LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); -#ifdef __cplusplus -}; -#endif +#define WNDCLASS_ZOOMIN TEXT("ZOOMIN") -#endif // __FRAMEWND_H__ +#endif // __FRAMEWND_H__ _____ Modified: trunk/rosapps/devutils/zoomin/main.c --- trunk/rosapps/devutils/zoomin/main.c 2005-10-12 19:15:54 UTC (rev 18414) +++ trunk/rosapps/devutils/zoomin/main.c 2005-10-12 20:20:18 UTC (rev 18415) @@ -38,7 +38,6 @@ HMENU hMenuFrame; TCHAR szTitle[MAX_LOADSTRING]; -TCHAR szFrameClass[MAX_LOADSTRING]; //////////////////////////////////////////////////////////////////////// //////// @@ -61,7 +60,7 @@ LoadCursor(0, IDC_ARROW), 0,//(HBRUSH)(COLOR_BTNFACE+1), 0/*lpszMenuName*/, - szFrameClass, + WNDCLASS_ZOOMIN, (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_ZOOMIN), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) }; @@ -70,7 +69,7 @@ hMenuFrame = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_ZOOMIN_MENU)); hFrameWnd = CreateWindowEx(0, (LPCTSTR)(int)hFrameWndClass, szTitle, - WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE, + WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE | WS_VSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, 250, 250, NULL, hMenuFrame, hInstance, NULL/*lpParam*/); @@ -80,6 +79,7 @@ ShowWindow(hFrameWnd, nCmdShow); UpdateWindow(hFrameWnd); + return TRUE; } @@ -97,22 +97,21 @@ int nCmdShow) { MSG msg; - HACCEL hAccel; + HACCEL hAccel; // Initialize global strings LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - LoadString(hInstance, IDC_ZOOMIN, szFrameClass, MAX_LOADSTRING); // Perform application initialization: if (!InitInstance(hInstance, nCmdShow)) { return FALSE; } - hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_ZOOMIN); + hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDR_ZOOMIN)); // Main message loop: while (GetMessage(&msg, (HWND)NULL, 0, 0)) { - if (!TranslateAccelerator(msg.hwnd, hAccel, &msg)) { + if (!TranslateAccelerator(msg.hwnd, hAccel, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); } _____ Modified: trunk/rosapps/devutils/zoomin/main.h --- trunk/rosapps/devutils/zoomin/main.h 2005-10-12 19:15:54 UTC (rev 18414) +++ trunk/rosapps/devutils/zoomin/main.h 2005-10-12 20:20:18 UTC (rev 18415) @@ -23,11 +23,6 @@ #ifndef __MAIN_H__ #define __MAIN_H__ -#ifdef __cplusplus -extern "C" { -#endif - - #include "resource.h" #define MAX_LOADSTRING 100 @@ -40,11 +35,6 @@ extern HMENU hMenuFrame; extern TCHAR szTitle[]; -extern TCHAR szFrameClass[]; -#ifdef __cplusplus -}; -#endif #endif // __MAIN_H__ - _____ Modified: trunk/rosapps/devutils/zoomin/resource.h --- trunk/rosapps/devutils/zoomin/resource.h 2005-10-12 19:15:54 UTC (rev 18414) +++ trunk/rosapps/devutils/zoomin/resource.h 2005-10-12 20:20:18 UTC (rev 18415) @@ -7,9 +7,8 @@ #define IDS_APP_TITLE 103 #define IDI_ZOOMIN 107 #define IDI_SMALL 108 -#define IDC_ZOOMIN 109 -#define IDR_ZOOMIN_MENU 110 -#define IDD_DIALOG1 111 +#define IDR_ZOOMIN_MENU 109 +#define IDR_ZOOMIN 110 #define ID_EDIT_EXIT 32700 #define ID_EDIT_COPY 32701 @@ -17,5 +16,7 @@ #define ID_OPTIONS_REFRESH_RATE 32704 #define ID_HELP_ABOUT 32703 +#define ID_REFRESH 40001 + #define IDC_STATIC -1 _____ Modified: trunk/rosapps/devutils/zoomin/zoomin.rc --- trunk/rosapps/devutils/zoomin/zoomin.rc 2005-10-12 19:15:54 UTC (rev 18414) +++ trunk/rosapps/devutils/zoomin/zoomin.rc 2005-10-12 20:20:18 UTC (rev 18415) @@ -31,12 +31,14 @@ IDR_ZOOMIN_MENU MENU DISCARDABLE BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&xit\tAlt-F4", ID_EDIT_EXIT + END POPUP "&Edit" BEGIN MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY, GRAYED - MENUITEM "&Refresh\tF5", ID_EDIT_REFRESH, GRAYED - MENUITEM SEPARATOR - MENUITEM "E&xit\tAlt-F4", ID_EDIT_EXIT + MENUITEM "&Refresh\tF5", ID_EDIT_REFRESH END POPUP "&Options" BEGIN @@ -69,26 +71,21 @@ //////////////////////////////////////////////////////////////////////// ///// // -// Dialog +// String Table // -IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Sans Serif" +STRINGTABLE DISCARDABLE BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 + IDS_APP_TITLE "ReactOS Zoomin" END //////////////////////////////////////////////////////////////////////// ///// // -// String Table +// Accelerator // -STRINGTABLE DISCARDABLE +IDR_ZOOMIN ACCELERATORS DISCARDABLE BEGIN - IDS_APP_TITLE "ReactOS Zoomin" - IDC_ZOOMIN "ZOOMIN" + VK_F5, ID_REFRESH, VIRTKEY, NOINVERT END

1 0

[amunger] 18414: Created 0.2.8 branch
by amunger＠svn.reactos.com 12 Oct '05

12 Oct '05

Created 0.2.8 branch Added: branches/ros-branch-0_2_8/ _____ Copied: branches/ros-branch-0_2_8 (from rev 18402, trunk)

1 0

[weiden] 18413: fixed difference in signedness warning
by weiden＠svn.reactos.com 12 Oct '05

12 Oct '05

fixed difference in signedness warning Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-10-12 16:54:34 UTC (rev 18412) +++ trunk/reactos/lib/newdev/newdev.c 2005-10-12 18:56:44 UTC (rev 18413) @@ -23,7 +23,7 @@ SP_DEVINFO_DATA devInfoData; DWORD requiredSize; DWORD regDataType; - PTSTR buffer = NULL; + PBYTE buffer = NULL; SP_DRVINFO_DATA drvInfoData; BOOL ret;

1 0

[hpoussin] 18412: In DevInstallW:
by hpoussin＠svn.reactos.com 12 Oct '05

12 Oct '05

In DevInstallW: - Shut up debug messages - First steps to display messages to the user (retrieve device description before and after device installation) - Change to only one exit point Modified: trunk/reactos/lib/newdev/newdev.c Modified: trunk/reactos/lib/newdev/newdev.h Modified: trunk/reactos/lib/newdev/stubs.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-10-12 14:07:49 UTC (rev 18411) +++ trunk/reactos/lib/newdev/newdev.c 2005-10-12 16:54:34 UTC (rev 18412) @@ -7,28 +7,34 @@ * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ +#define NDEBUG +#include <debug.h> + #include "newdev.h" BOOL WINAPI DevInstallW( - IN HWND Hwnd, - IN HINSTANCE Handle, + IN HWND hWndParent, + IN HINSTANCE hInstance, IN LPCWSTR InstanceId, IN INT Show) { HDEVINFO hDevInfo; SP_DEVINFO_DATA devInfoData; - SP_DRVINFO_DATA_W drvInfoData; - DWORD index; + DWORD requiredSize; + DWORD regDataType; + PTSTR buffer = NULL; + SP_DRVINFO_DATA drvInfoData; BOOL ret; - DPRINT1("Installing device %S\n", InstanceId); + devInfoData.cbSize = 0; /* Tell if the devInfoData is valid */ hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); if (hDevInfo == INVALID_HANDLE_VALUE) { - DPRINT1("SetupDiCreateDeviceInfoListExW() failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCreateDeviceInfoListExW() failed with error 0x%lx\n", GetLastError()); + ret = FALSE; + goto cleanup; } devInfoData.cbSize = sizeof(SP_DEVINFO_DATA); @@ -40,42 +46,66 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiOpenDeviceInfoW() failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiOpenDeviceInfoW() failed with error 0x%lx\n", GetLastError()); + devInfoData.cbSize = 0; + goto cleanup; } + SetLastError(ERROR_GEN_FAILURE); + ret = SetupDiGetDeviceRegistryProperty( + hDevInfo, + &devInfoData, + SPDRP_DEVICEDESC, + &regDataType, + NULL, 0, + &requiredSize); + if (!ret && GetLastError() == ERROR_MORE_DATA && regDataType == REG_SZ) + { + buffer = HeapAlloc(GetProcessHeap(), 0, requiredSize); + if (!buffer) + { + DPRINT("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + ret = SetupDiGetDeviceRegistryProperty( + hDevInfo, + &devInfoData, + SPDRP_DEVICEDESC, + &regDataType, + buffer, requiredSize, + &requiredSize); + } + } + if (!ret) + { + DPRINT("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx\n", GetLastError()); + goto cleanup; + } + + DPRINT("Installing %s (%S)\n", buffer, InstanceId); + ret = SetupDiBuildDriverInfoList(hDevInfo, &devInfoData, SPDIT_COMPATDRIVER); if (!ret) { - DPRINT1("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); + goto cleanup; } -#ifndef NDEBUG - ret = TRUE; - index = 0; - drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); - while (ret) + drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA); + ret = SetupDiEnumDriverInfo( + hDevInfo, + &devInfoData, + SPDIT_COMPATDRIVER, + 0, + &drvInfoData); + if (!ret) { - ret = SetupDiEnumDriverInfoW( - hDevInfo, - &devInfoData, - SPDIT_COMPATDRIVER, - index, - &drvInfoData); - if (!ret) - { - if (GetLastError() != ERROR_NO_MORE_ITEMS) - { - DPRINT1("SetupDiEnumDriverInfoW() failed with error 0x%lx\n", GetLastError()); - return FALSE; - } - break; - } - index++; - DPRINT1("- %S: %S\n", drvInfoData.MfgName, drvInfoData.Description); + DPRINT("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); + goto cleanup; } -#endif + DPRINT("Installing driver %s: %s\n", drvInfoData.MfgName, drvInfoData.Description); ret = SetupDiCallClassInstaller( DIF_SELECTBESTCOMPATDRV, @@ -83,8 +113,8 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiCallClassInstaller(DIF_SELECTBESTCOMPATDRV) failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCallClassInstaller(DIF_SELECTBESTCOMPATDRV) failed with error 0x%lx\n", GetLastError()); + goto cleanup; } ret = SetupDiCallClassInstaller( @@ -93,8 +123,8 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiCallClassInstaller(DIF_ALLOW_INSTALL) failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCallClassInstaller(DIF_ALLOW_INSTALL) failed with error 0x%lx\n", GetLastError()); + goto cleanup; } ret = SetupDiCallClassInstaller( @@ -103,8 +133,8 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_PREANALYZE) failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_PREANALYZE) failed with error 0x%lx\n", GetLastError()); + goto cleanup; } ret = SetupDiCallClassInstaller( @@ -113,8 +143,8 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_POSTANALYZE) failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_POSTANALYZE) failed with error 0x%lx\n", GetLastError()); + goto cleanup; } ret = SetupDiCallClassInstaller( @@ -123,8 +153,8 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES) failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES) failed with error 0x%lx\n", GetLastError()); + goto cleanup; } ret = SetupDiCallClassInstaller( @@ -133,8 +163,8 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS) failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS) failed with error 0x%lx\n", GetLastError()); + goto cleanup; } ret = SetupDiCallClassInstaller( @@ -143,8 +173,8 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiCallClassInstaller(DIF_INSTALLINTERFACES) failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCallClassInstaller(DIF_INSTALLINTERFACES) failed with error 0x%lx\n", GetLastError()); + goto cleanup; } ret = SetupDiCallClassInstaller( @@ -153,8 +183,8 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiCallClassInstaller(DIF_INSTALLDEVICE) failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCallClassInstaller(DIF_INSTALLDEVICE) failed with error 0x%lx\n", GetLastError()); + goto cleanup; } ret = SetupDiCallClassInstaller( @@ -163,8 +193,8 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_FINISHINSTALL) failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_FINISHINSTALL) failed with error 0x%lx\n", GetLastError()); + goto cleanup; } ret = SetupDiCallClassInstaller( @@ -173,23 +203,25 @@ &devInfoData); if (!ret) { - DPRINT1("SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA) failed with error 0x%lx\n", GetLastError()); - return FALSE; + DPRINT("SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA) failed with error 0x%lx\n", GetLastError()); + goto cleanup; } - ret = SetupDiDestroyDriverInfoList(hDevInfo, &devInfoData, SPDIT_COMPATDRIVER); - if (!ret) +cleanup: + if (devInfoData.cbSize != 0) { - DPRINT1("SetupDiDestroyDriverInfoList() failed with error 0x%lx\n", GetLastError()); - return FALSE; + if (!SetupDiDestroyDriverInfoList(hDevInfo, &devInfoData, SPDIT_COMPATDRIVER)) + DPRINT("SetupDiDestroyDriverInfoList() failed with error 0x%lx\n", GetLastError()); } - ret = SetupDiDestroyDeviceInfoList(hDevInfo); - if (!ret) + if (hDevInfo != INVALID_HANDLE_VALUE) { - DPRINT1("SetupDiDestroyDeviceInfoList() failed with error 0x%lx\n", GetLastError()); - return FALSE; + if (!SetupDiDestroyDeviceInfoList(hDevInfo)) + DPRINT("SetupDiDestroyDeviceInfoList() failed with error 0x%lx\n", GetLastError()); } - return TRUE; + if (buffer) + HeapFree(GetProcessHeap(), 0, buffer); + + return ret; } _____ Modified: trunk/reactos/lib/newdev/newdev.h --- trunk/reactos/lib/newdev/newdev.h 2005-10-12 14:07:49 UTC (rev 18411) +++ trunk/reactos/lib/newdev/newdev.h 2005-10-12 16:54:34 UTC (rev 18412) @@ -2,6 +2,4 @@ #include <setupapi.h> ULONG DbgPrint(PCH Format,...); -#define UNIMPLEMENTED \ - DbgPrint("NEWDEV: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) -#define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint + _____ Modified: trunk/reactos/lib/newdev/stubs.c --- trunk/reactos/lib/newdev/stubs.c 2005-10-12 14:07:49 UTC (rev 18411) +++ trunk/reactos/lib/newdev/stubs.c 2005-10-12 16:54:34 UTC (rev 18412) @@ -7,6 +7,9 @@ * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ +//#define NDEBUG +#include <debug.h> + #include "newdev.h" BOOL WINAPI

1 0

[gvg] 18411: Workaround for bug 899
by gvg＠svn.reactos.com 12 Oct '05

12 Oct '05

Workaround for bug 899 Modified: trunk/reactos/subsys/win32k/ntuser/class.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-10-12 13:00:34 UTC (rev 18410) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-10-12 14:07:49 UTC (rev 18411) @@ -68,12 +68,21 @@ VOID FASTCALL DestroyClass(PWNDCLASS_OBJECT Class) { PWINSTATION_OBJECT WinSta; - WinSta = PsGetWin32Thread()->Desktop->WindowStation; ASSERT(Class->refs == 0); RemoveEntryList(&Class->ListEntry); - //FIXME: release ATOM - RtlDeleteAtomFromAtomTable(WinSta->AtomTable, Class->Atom); + + /* FIXME See bug 899 */ + if (NULL != PsGetWin32Thread()) + { + WinSta = PsGetWin32Thread()->Desktop->WindowStation; + //FIXME: release ATOM + RtlDeleteAtomFromAtomTable(WinSta->AtomTable, Class->Atom); + } + else + { + DPRINT1("Can't locate window station, see bug 899\n"); + } ExFreePool(Class); }

1 0

[gvg] 18410: Terminate the new environment with a NULL pointer
by gvg＠svn.reactos.com 12 Oct '05

12 Oct '05

Terminate the new environment with a NULL pointer Modified: trunk/reactos/lib/crt/misc/environ.c _____ Modified: trunk/reactos/lib/crt/misc/environ.c --- trunk/reactos/lib/crt/misc/environ.c 2005-10-12 08:38:45 UTC (rev 18409) +++ trunk/reactos/lib/crt/misc/environ.c 2005-10-12 13:00:34 UTC (rev 18410) @@ -178,6 +178,7 @@ return original_environment; } } + *newenvptr = NULL; return newenv; }

1 0

[mf] 18409: Fix for Bugzilla Entry 641 - patch from j_anderw at sbox.tugraz.at
by mf＠svn.reactos.com 12 Oct '05

12 Oct '05

Fix for Bugzilla Entry 641 - patch from j_anderw at sbox.tugraz.at Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-10-12 08:14:56 UTC (rev 18408) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-10-12 08:38:45 UTC (rev 18409) @@ -210,6 +210,7 @@ { return FALSE; } + WinStaObject = PsGetWin32Thread()->Desktop->WindowStation; CurInfo = IntGetSysCursorInfo(WinStaObject); @@ -227,6 +228,12 @@ Res = (dX <= CurInfo->DblClickWidth) && (dY <= CurInfo->DblClickHeight); + + if(Res) + { + if(CurInfo->ButtonsDown) + Res = (CurInfo->ButtonsDown == Msg->message); + } } if(Remove) @@ -237,6 +244,7 @@ CurInfo->LastBtnDownX = Msg->pt.x; CurInfo->LastBtnDownY = Msg->pt.y; CurInfo->LastClkWnd = NULL; + CurInfo->ButtonsDown = Msg->message; } else { @@ -244,6 +252,7 @@ CurInfo->LastBtnDownY = Msg->pt.y; CurInfo->LastClkWnd = (HANDLE)Msg->hwnd; CurInfo->LastBtnDown = Msg->time; + CurInfo->ButtonsDown = Msg->message; } }

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005