Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 59899: [GDI32] * Fix some print specifiers.
by akhaldi＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: akhaldi Date: Fri Aug 30 10:51:12 2013 New Revision: 59899 URL: http://svn.reactos.org/svn/reactos?rev=59899&view=rev Log: [GDI32] * Fix some print specifiers. Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/gdi32/objects/brush.c trunk/reactos/win32ss/gdi/gdi32/objects/dc.c trunk/reactos/win32ss/gdi/gdi32/objects/font.c Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/mis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] Fri Aug 30 10:51:12 2013 @@ -320,7 +320,7 @@ { if (pBrush_Attr->AttrFlags & ATTR_CACHED) { - DPRINT("Get Handle! Type %d Count %d PEB 0x%x\n", Type, GdiHandleCache->ulNumHandles[Type], NtCurrentTeb()->ProcessEnvironmentBlock); + DPRINT("Get Handle! Type %d Count %lu PEB 0x%p\n", Type, GdiHandleCache->ulNumHandles[Type], NtCurrentTeb()->ProcessEnvironmentBlock); pBrush_Attr->AttrFlags &= ~ATTR_CACHED; hPtr[Number - 1] = NULL; GdiHandleCache->ulNumHandles[Type]--; Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Fri Aug 30 10:51:12 2013 @@ -129,7 +129,7 @@ *size = v5hdr->bV5SizeImage; return 5; } - DPRINT("(%ld): wrong size for header\n", header->biSize ); + DPRINT("(%lu): wrong size for header\n", header->biSize ); return -1; } @@ -527,7 +527,7 @@ return NULL; } - DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,InfoSize,cjBmpScanSize); + DPRINT("pBMI %p, Size bpp %u, dibsize %d, Conv %u, BSS %u\n", Data,bpp,dibsize,InfoSize,cjBmpScanSize); if ( !width || !height ) hBmp = GetStockObject(DEFAULT_BITMAP); @@ -742,9 +742,9 @@ { // We don't die, we continue on with a allocated safe pointer to kernel // space..... - DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,Bits,cjBmpScanSize); + DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %p or Bits: %p & Size: %u\n",pConvertedInfo,Bits,cjBmpScanSize); } - DPRINT("SetDIBitsToDevice Allocate Bits %d!!!\n", cjBmpScanSize); + DPRINT("SetDIBitsToDevice Allocate Bits %u!!!\n", cjBmpScanSize); } if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) @@ -813,7 +813,7 @@ PVOID pvSafeBits = NULL; BOOL Hit = FALSE; - DPRINT("StretchDIBits %x : %x : %d\n", lpBits, lpBitsInfo, iUsage); + DPRINT("StretchDIBits %p : %p : %u\n", lpBits, lpBitsInfo, iUsage); #if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) @@ -888,9 +888,9 @@ { // We don't die, we continue on with a allocated safe pointer to kernel // space..... - DPRINT1("StretchDIBits fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,lpBits,cjBmpScanSize); + DPRINT1("StretchDIBits fail to read BitMapInfo: %p or Bits: %p & Size: %u\n",pConvertedInfo,lpBits,cjBmpScanSize); } - DPRINT("StretchDIBits Allocate Bits %d!!!\n", cjBmpScanSize); + DPRINT("StretchDIBits Allocate Bits %u!!!\n", cjBmpScanSize); } } Modified: trunk/reactos/win32ss/gdi/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/brush.c [iso-8859-1] Fri Aug 30 10:51:12 2013 @@ -421,7 +421,7 @@ pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); pTeb->GdiTebBatch.HDC = hdc; pTeb->GdiBatchCount++; - DPRINT("Loading the Flush!! COUNT-> %d\n", pTeb->GdiBatchCount); + DPRINT("Loading the Flush!! COUNT-> %lu\n", pTeb->GdiBatchCount); if (pTeb->GdiBatchCount >= GDI_BatchLimit) { Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Fri Aug 30 10:51:12 2013 @@ -26,7 +26,7 @@ } else { - DPRINT("WinSpooler.Drv Loaded! hMod -> 0x%x\n", ghSpooler); + DPRINT("WinSpooler.Drv Loaded! hMod -> 0x%p\n", ghSpooler); } if ((!lpwszDevice) && (!lpwszDriver)) @@ -328,7 +328,7 @@ if ((DWORD)hObject & GDI_HANDLE_STOCK_MASK) { // Relax! This is a normal return! - DPRINT("Trying to delete system object 0x%x\n", hObject); + DPRINT("Trying to delete system object 0x%p\n", hObject); return TRUE; } Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] Fri Aug 30 10:51:12 2013 @@ -1082,7 +1082,7 @@ goto end; } - DPRINT("needed = %d\n", needed); + DPRINT("needed = %u\n", needed); if(needed > cbData) { /* Since the supplied buffer isn't big enough, we'll alloc one @@ -1801,7 +1801,7 @@ return FALSE; } if (index >= MAXTCIINDEX || FONT_tci[index].ciCharset == DEFAULT_CHARSET) return FALSE; - DPRINT("Index %d Charset %d CodePage %d FontSig %d\n", + DPRINT("Index %d Charset %u CodePage %u FontSig %lu\n", index,FONT_tci[index].ciCharset,FONT_tci[index].ciACP,FONT_tci[index].fs.fsCsb[0]); memcpy(lpCs, &FONT_tci[index], sizeof(CHARSETINFO)); return TRUE;

1 0

[akhaldi] 59898: [USER32] * Fix some print specifiers.
by akhaldi＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: akhaldi Date: Fri Aug 30 10:25:16 2013 New Revision: 59898 URL: http://svn.reactos.org/svn/reactos?rev=59898&view=rev Log: [USER32] * Fix some print specifiers. Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Fri Aug 30 10:25:16 2013 @@ -41,7 +41,7 @@ WINAPI SetDebugErrorLevel( DWORD dwLevel ) { - DbgPrint("(%ld): stub\n", dwLevel); + DbgPrint("(%lu): stub\n", dwLevel); } Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Fri Aug 30 10:25:16 2013 @@ -285,7 +285,7 @@ info->windowName = HeapAlloc( GetProcessHeap(), 0, sizeof(L"#65535") ); if (info->windowName != NULL) { - wsprintf((LPWSTR)info->windowName, L"#%d", GET_WORD(p + 1)); + wsprintf((LPWSTR)info->windowName, L"#%u", GET_WORD(p + 1)); info->windowNameFree = TRUE; } else

1 0

[akhaldi] 59897: [PSDK] * Annotate sspi.h.
by akhaldi＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: akhaldi Date: Fri Aug 30 10:17:22 2013 New Revision: 59897 URL: http://svn.reactos.org/svn/reactos?rev=59897&view=rev Log: [PSDK] * Annotate sspi.h. Modified: trunk/reactos/include/psdk/sspi.h Modified: trunk/reactos/include/psdk/sspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sspi.h?rev=59… ============================================================================== --- trunk/reactos/include/psdk/sspi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sspi.h [iso-8859-1] Fri Aug 30 10:17:22 2013 @@ -126,11 +126,10 @@ #define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 #define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 -typedef struct _SecBuffer -{ - ULONG cbBuffer; - ULONG BufferType; - void *pvBuffer; +typedef struct _SecBuffer { + ULONG cbBuffer; + ULONG BufferType; + _Field_size_bytes_(cbBuffer) void *pvBuffer; } SecBuffer, *PSecBuffer; /* values for BufferType */ @@ -155,11 +154,10 @@ #define SECBUFFER_READONLY_WITH_CHECKSUM 0x10000000 #define SECBUFFER_RESERVED 0x60000000 -typedef struct _SecBufferDesc -{ - ULONG ulVersion; - ULONG cBuffers; - PSecBuffer pBuffers; +typedef struct _SecBufferDesc { + ULONG ulVersion; + ULONG cBuffers; + _Field_size_(cBuffers) PSecBuffer pBuffers; } SecBufferDesc, *PSecBufferDesc; /* values for ulVersion */ @@ -168,10 +166,18 @@ typedef void (SEC_ENTRY *SEC_GET_KEY_FN)(void *Arg, void *Principal, ULONG KeyVer, void **Key, SECURITY_STATUS *Status); -SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesA(PULONG pcPackages, - PSecPkgInfoA *ppPackageInfo); -SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesW(PULONG pcPackages, - PSecPkgInfoW *ppPackageInfo); +SECURITY_STATUS +SEC_ENTRY +EnumerateSecurityPackagesA( + _Out_ PULONG pcPackages, + _Outptr_ PSecPkgInfoA *ppPackageInfo); + +SECURITY_STATUS +SEC_ENTRY +EnumerateSecurityPackagesW( + _Out_ PULONG pcPackages, + _Outptr_ PSecPkgInfoW *ppPackageInfo); + #define EnumerateSecurityPackages WINELIB_NAME_AW(EnumerateSecurityPackages) typedef SECURITY_STATUS (SEC_ENTRY *ENUMERATE_SECURITY_PACKAGES_FN_A)(PULONG, @@ -180,10 +186,20 @@ PSecPkgInfoW *); #define ENUMERATE_SECURITY_PACKAGES_FN WINELIB_NAME_AW(ENUMERATE_SECURITY_PACKAGES_FN_) -SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesA( - PCredHandle phCredential, ULONG ulAttribute, void *pBuffer); -SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesW( - PCredHandle phCredential, ULONG ulAttribute, void *pBuffer); +SECURITY_STATUS +SEC_ENTRY +QueryCredentialsAttributesA( + _In_ PCredHandle phCredential, + _In_ ULONG ulAttribute, + _Inout_ void *pBuffer); + +SECURITY_STATUS +SEC_ENTRY +QueryCredentialsAttributesW( + _In_ PCredHandle phCredential, + _In_ ULONG ulAttribute, + _Inout_ void *pBuffer); + #define QueryCredentialsAttributes WINELIB_NAME_AW(QueryCredentialsAttributes) typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_A) @@ -208,14 +224,32 @@ #define SecPkgCredentials_Names WINELIB_NAME_AW(SecPkgCredentials_Names) -SECURITY_STATUS SEC_ENTRY AcquireCredentialsHandleA( - SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialsUse, - PLUID pvLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, - PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry); -SECURITY_STATUS SEC_ENTRY AcquireCredentialsHandleW( - SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialsUse, - PLUID pvLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, - PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry); +SECURITY_STATUS +SEC_ENTRY +AcquireCredentialsHandleA( + _In_opt_ SEC_CHAR *pszPrincipal, + _In_ SEC_CHAR *pszPackage, + _In_ ULONG fCredentialsUse, + _In_opt_ PLUID pvLogonID, + _In_opt_ PVOID pAuthData, + _In_opt_ SEC_GET_KEY_FN pGetKeyFn, + _In_opt_ PVOID pvGetKeyArgument, + _Out_ PCredHandle phCredential, + _Out_opt_ PTimeStamp ptsExpiry); + +SECURITY_STATUS +SEC_ENTRY +AcquireCredentialsHandleW( + _In_opt_ SEC_WCHAR *pszPrincipal, + _In_ SEC_WCHAR *pszPackage, + _In_ ULONG fCredentialsUse, + _In_opt_ PLUID pvLogonID, + _In_opt_ PVOID pAuthData, + _In_opt_ SEC_GET_KEY_FN pGetKeyFn, + _In_opt_ PVOID pvGetKeyArgument, + _Out_ PCredHandle phCredential, + _Out_opt_ PTimeStamp ptsExpiry); + #define AcquireCredentialsHandle WINELIB_NAME_AW(AcquireCredentialsHandle) /* flags for fCredentialsUse */ @@ -233,29 +267,51 @@ PCredHandle, PTimeStamp); #define ACQUIRE_CREDENTIALS_HANDLE_FN WINELIB_NAME_AW(ACQUIRE_CREDENTIALS_HANDLE_FN_) -SECURITY_STATUS SEC_ENTRY FreeContextBuffer(PVOID pv); - -typedef SECURITY_STATUS (SEC_ENTRY *FREE_CONTEXT_BUFFER_FN)(PVOID); - -SECURITY_STATUS SEC_ENTRY FreeCredentialsHandle(PCredHandle - phCredential); +SECURITY_STATUS SEC_ENTRY FreeContextBuffer(_Inout_ PVOID pv); + +typedef SECURITY_STATUS (SEC_ENTRY *FREE_CONTEXT_BUFFER_FN)(_Inout_ PVOID); + +SECURITY_STATUS +SEC_ENTRY +FreeCredentialsHandle( + _In_ PCredHandle phCredential); #define FreeCredentialHandle FreeCredentialsHandle typedef SECURITY_STATUS (SEC_ENTRY *FREE_CREDENTIALS_HANDLE_FN)(PCredHandle); -SECURITY_STATUS SEC_ENTRY InitializeSecurityContextA( - PCredHandle phCredential, PCtxtHandle phContext, - SEC_CHAR *pszTargetName, ULONG fContextReq, - ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, - ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, - ULONG *pfContextAttr, PTimeStamp ptsExpiry); -SECURITY_STATUS SEC_ENTRY InitializeSecurityContextW( - PCredHandle phCredential, PCtxtHandle phContext, - SEC_WCHAR *pszTargetName, ULONG fContextReq, - ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, - ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, - ULONG *pfContextAttr, PTimeStamp ptsExpiry); +SECURITY_STATUS +SEC_ENTRY +InitializeSecurityContextA( + _In_opt_ PCredHandle phCredential, + _In_opt_ PCtxtHandle phContext, + _In_opt_ SEC_CHAR *pszTargetName, + _In_ ULONG fContextReq, + _In_ ULONG Reserved1, + _In_ ULONG TargetDataRep, + _In_opt_ PSecBufferDesc pInput, + _In_ ULONG Reserved2, + _Inout_opt_ PCtxtHandle phNewContext, + _Inout_opt_ PSecBufferDesc pOutput, + _Out_ ULONG *pfContextAttr, + _Out_opt_ PTimeStamp ptsExpiry); + +SECURITY_STATUS +SEC_ENTRY +InitializeSecurityContextW( + _In_opt_ PCredHandle phCredential, + _In_opt_ PCtxtHandle phContext, + _In_opt_ SEC_WCHAR *pszTargetName, + _In_ ULONG fContextReq, + _In_ ULONG Reserved1, + _In_ ULONG TargetDataRep, + _In_opt_ PSecBufferDesc pInput, + _In_ ULONG Reserved2, + _Inout_opt_ PCtxtHandle phNewContext, + _Inout_opt_ PSecBufferDesc pOutput, + _Out_ ULONG *pfContextAttr, + _Out_opt_ PTimeStamp ptsExpiry); + #define InitializeSecurityContext WINELIB_NAME_AW(InitializeSecurityContext) typedef SECURITY_STATUS (SEC_ENTRY *INITIALIZE_SECURITY_CONTEXT_FN_A) @@ -315,11 +371,18 @@ #define ISC_RET_RESERVED1 0x00100000 #define ISC_RET_FRAGMENT_ONLY 0x00200000 -SECURITY_STATUS SEC_ENTRY AcceptSecurityContext( - PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, - ULONG fContextReq, ULONG TargetDataRep, - PCtxtHandle phNewContext, PSecBufferDesc pOutput, - ULONG *pfContextAttr, PTimeStamp ptsExpiry); +SECURITY_STATUS +SEC_ENTRY +AcceptSecurityContext( + _In_opt_ PCredHandle phCredential, + _In_opt_ PCtxtHandle phContext, + _In_opt_ PSecBufferDesc pInput, + _In_ ULONG fContextReq, + _In_ ULONG TargetDataRep, + _Inout_opt_ PCtxtHandle phNewContext, + _Inout_opt_ PSecBufferDesc pOutput, + _Out_ ULONG *pfContextAttr, + _Out_opt_ PTimeStamp ptsExpiry); typedef SECURITY_STATUS (SEC_ENTRY *ACCEPT_SECURITY_CONTEXT_FN)(PCredHandle, PCtxtHandle, PSecBufferDesc, ULONG, ULONG, PCtxtHandle, @@ -376,27 +439,42 @@ #define SECURITY_NATIVE_DREP 0x00000010 #define SECURITY_NETWORK_DREP 0x00000000 - -SECURITY_STATUS SEC_ENTRY CompleteAuthToken(PCtxtHandle phContext, - PSecBufferDesc pToken); +SECURITY_STATUS +SEC_ENTRY +CompleteAuthToken( + _In_ PCtxtHandle phContext, + _In_ PSecBufferDesc pToken); typedef SECURITY_STATUS (SEC_ENTRY *COMPLETE_AUTH_TOKEN_FN)(PCtxtHandle, PSecBufferDesc); -SECURITY_STATUS SEC_ENTRY DeleteSecurityContext(PCtxtHandle phContext); +SECURITY_STATUS SEC_ENTRY DeleteSecurityContext(_In_ PCtxtHandle phContext); typedef SECURITY_STATUS (SEC_ENTRY *DELETE_SECURITY_CONTEXT_FN)(PCtxtHandle); -SECURITY_STATUS SEC_ENTRY ApplyControlToken(PCtxtHandle phContext, - PSecBufferDesc pInput); +SECURITY_STATUS +SEC_ENTRY +ApplyControlToken( + _In_ PCtxtHandle phContext, + _In_ PSecBufferDesc pInput); typedef SECURITY_STATUS (SEC_ENTRY *APPLY_CONTROL_TOKEN_FN)(PCtxtHandle, PSecBufferDesc); -SECURITY_STATUS SEC_ENTRY QueryContextAttributesA(PCtxtHandle phContext, - ULONG ulAttribute, void *pBuffer); -SECURITY_STATUS SEC_ENTRY QueryContextAttributesW(PCtxtHandle phContext, - ULONG ulAttribute, void *pBuffer); +SECURITY_STATUS +SEC_ENTRY +QueryContextAttributesA( + _In_ PCtxtHandle phContext, + _In_ ULONG ulAttribute, + _Out_ void *pBuffer); + +SECURITY_STATUS +SEC_ENTRY +QueryContextAttributesW( + _In_ PCtxtHandle phContext, + _In_ ULONG ulAttribute, + _Out_ void *pBuffer); + #define QueryContextAttributes WINELIB_NAME_AW(QueryContextAttributes) typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle, @@ -528,10 +606,9 @@ TimeStamp tsPasswordExpires; } SecPkgContext_PasswordExpiry, *PSecPkgContext_PasswordExpiry; -typedef struct _SecPkgContext_SessionKey -{ - ULONG SessionKeyLength; - unsigned char *SessionKey; +typedef struct _SecPkgContext_SessionKey { + ULONG SessionKeyLength; + _Field_size_bytes_(SessionKeyLength) unsigned char *SessionKey; } SecPkgContext_SessionKey, *PSecPkgContext_SessionKey; typedef struct _SecPkgContext_PackageInfoA @@ -632,31 +709,53 @@ char *Target; } SecPkgContext_Target, *PSecPkgContext_Target; -SECURITY_STATUS SEC_ENTRY ImpersonateSecurityContext(PCtxtHandle phContext); +_Check_return_ +SECURITY_STATUS +SEC_ENTRY +ImpersonateSecurityContext( + _In_ PCtxtHandle phContext); typedef SECURITY_STATUS (SEC_ENTRY *IMPERSONATE_SECURITY_CONTEXT_FN) (PCtxtHandle); -SECURITY_STATUS SEC_ENTRY RevertSecurityContext(PCtxtHandle phContext); +SECURITY_STATUS SEC_ENTRY RevertSecurityContext(_In_ PCtxtHandle phContext); typedef SECURITY_STATUS (SEC_ENTRY *REVERT_SECURITY_CONTEXT_FN)(PCtxtHandle); -SECURITY_STATUS SEC_ENTRY MakeSignature(PCtxtHandle phContext, - ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo); +SECURITY_STATUS +SEC_ENTRY +MakeSignature( + _In_ PCtxtHandle phContext, + _In_ ULONG fQOP, + _In_ PSecBufferDesc pMessage, + _In_ ULONG MessageSeqNo); typedef SECURITY_STATUS (SEC_ENTRY *MAKE_SIGNATURE_FN)(PCtxtHandle, ULONG, PSecBufferDesc, ULONG); -SECURITY_STATUS SEC_ENTRY VerifySignature(PCtxtHandle phContext, - PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP); +SECURITY_STATUS +SEC_ENTRY +VerifySignature( + _In_ PCtxtHandle phContext, + _In_ PSecBufferDesc pMessage, + _In_ ULONG MessageSeqNo, + _Out_ PULONG pfQOP); typedef SECURITY_STATUS (SEC_ENTRY *VERIFY_SIGNATURE_FN)(PCtxtHandle, PSecBufferDesc, ULONG, PULONG); -SECURITY_STATUS SEC_ENTRY QuerySecurityPackageInfoA( - SEC_CHAR *pszPackageName, PSecPkgInfoA *ppPackageInfo); -SECURITY_STATUS SEC_ENTRY QuerySecurityPackageInfoW( - SEC_WCHAR *pszPackageName, PSecPkgInfoW *ppPackageInfo); +SECURITY_STATUS +SEC_ENTRY +QuerySecurityPackageInfoA( + _In_ SEC_CHAR *pszPackageName, + _Outptr_ PSecPkgInfoA *ppPackageInfo); + +SECURITY_STATUS +SEC_ENTRY +QuerySecurityPackageInfoW( + _In_ SEC_WCHAR *pszPackageName, + _Outptr_ PSecPkgInfoW *ppPackageInfo); + #define QuerySecurityPackageInfo WINELIB_NAME_AW(QuerySecurityPackageInfo) typedef SECURITY_STATUS (SEC_ENTRY *QUERY_SECURITY_PACKAGE_INFO_FN_A) @@ -665,8 +764,13 @@ (SEC_WCHAR *, PSecPkgInfoW *); #define QUERY_SECURITY_PACKAGE_INFO_FN WINELIB_NAME_AW(QUERY_SECURITY_PACKAGE_INFO_FN_) -SECURITY_STATUS SEC_ENTRY ExportSecurityContext(PCtxtHandle phContext, - ULONG fFlags, PSecBuffer pPackedContext, void **pToken); +SECURITY_STATUS +SEC_ENTRY +ExportSecurityContext( + _In_ PCtxtHandle phContext, + _In_ ULONG fFlags, + _Out_ PSecBuffer pPackedContext, + _Out_ void **pToken); typedef SECURITY_STATUS (SEC_ENTRY *EXPORT_SECURITY_CONTEXT_FN)(PCtxtHandle, ULONG, PSecBuffer, void **); @@ -675,10 +779,22 @@ #define SECPKG_CONTEXT_EXPORT_RESET_NEW 0x00000001 #define SECPKG_CONTEXT_EXPORT_DELETE_OLD 0x00000002 -SECURITY_STATUS SEC_ENTRY ImportSecurityContextA(SEC_CHAR *pszPackage, - PSecBuffer pPackedContext, void *Token, PCtxtHandle phContext); -SECURITY_STATUS SEC_ENTRY ImportSecurityContextW(SEC_WCHAR *pszPackage, - PSecBuffer pPackedContext, void *Token, PCtxtHandle phContext); +SECURITY_STATUS +SEC_ENTRY +ImportSecurityContextA( + _In_ SEC_CHAR *pszPackage, + _In_ PSecBuffer pPackedContext, + _In_ void *Token, + _Out_ PCtxtHandle phContext); + +SECURITY_STATUS +SEC_ENTRY +ImportSecurityContextW( + _In_ SEC_WCHAR *pszPackage, + _In_ PSecBuffer pPackedContext, + _In_ void *Token, + _Out_ PCtxtHandle phContext); + #define ImportSecurityContext WINELIB_NAME_AW(ImportSecurityContext) typedef SECURITY_STATUS (SEC_ENTRY *IMPORT_SECURITY_CONTEXT_FN_A)(SEC_CHAR *, @@ -687,14 +803,30 @@ PSecBuffer, void *, PCtxtHandle); #define IMPORT_SECURITY_CONTEXT_FN WINELIB_NAME_AW(IMPORT_SECURITY_CONTEXT_FN_) -SECURITY_STATUS SEC_ENTRY AddCredentialsA(PCredHandle hCredentials, - SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, - void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, - PTimeStamp ptsExpiry); -SECURITY_STATUS SEC_ENTRY AddCredentialsW(PCredHandle hCredentials, - SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, - void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, - PTimeStamp ptsExpiry); +SECURITY_STATUS +SEC_ENTRY +AddCredentialsA( + _In_ PCredHandle hCredentials, + _In_opt_ SEC_CHAR *pszPrincipal, + _In_ SEC_CHAR *pszPackage, + _In_ ULONG fCredentialUse, + _In_opt_ void *pAuthData, + _In_opt_ SEC_GET_KEY_FN pGetKeyFn, + _In_opt_ void *pvGetKeyArgument, + _Out_opt_ PTimeStamp ptsExpiry); + +SECURITY_STATUS +SEC_ENTRY +AddCredentialsW( + _In_ PCredHandle hCredentials, + _In_opt_ SEC_WCHAR *pszPrincipal, + _In_ SEC_WCHAR *pszPackage, + _In_ ULONG fCredentialUse, + _In_opt_ void *pAuthData, + _In_opt_ SEC_GET_KEY_FN pGetKeyFn, + _In_opt_ void *pvGetKeyArgument, + _Out_opt_ PTimeStamp ptsExpiry); + #define AddCredentials WINELIB_NAME_AW(AddCredentials) typedef SECURITY_STATUS (SEC_ENTRY *ADD_CREDENTIALS_FN_A)(PCredHandle, @@ -704,16 +836,30 @@ SEC_WCHAR *, SEC_WCHAR *, ULONG, void *, SEC_GET_KEY_FN, void *, PTimeStamp); -SECURITY_STATUS SEC_ENTRY QuerySecurityContextToken(PCtxtHandle phContext, - HANDLE *phToken); +SECURITY_STATUS +SEC_ENTRY +QuerySecurityContextToken( + _In_ PCtxtHandle phContext, + _Out_ HANDLE *phToken); typedef SECURITY_STATUS (SEC_ENTRY *QUERY_SECURITY_CONTEXT_TOKEN_FN) (PCtxtHandle, HANDLE *); -SECURITY_STATUS SEC_ENTRY EncryptMessage(PCtxtHandle phContext, ULONG fQOP, - PSecBufferDesc pMessage, ULONG MessageSeqNo); -SECURITY_STATUS SEC_ENTRY DecryptMessage(PCtxtHandle phContext, - PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP); +SECURITY_STATUS +SEC_ENTRY +EncryptMessage( + _In_ PCtxtHandle phContext, + _In_ ULONG fQOP, + _In_ PSecBufferDesc pMessage, + _In_ ULONG MessageSeqNo); + +SECURITY_STATUS +SEC_ENTRY +DecryptMessage( + _In_ PCtxtHandle phContext, + _In_ PSecBufferDesc pMessage, + _In_ ULONG MessageSeqNo, + _Out_opt_ PULONG pfQOP); /* values for EncryptMessage fQOP */ #define SECQOP_WRAP_NO_ENCRYPT 0x80000001 @@ -723,10 +869,22 @@ typedef SECURITY_STATUS (SEC_ENTRY *DECRYPT_MESSAGE_FN)(PCtxtHandle, PSecBufferDesc, ULONG, PULONG); -SECURITY_STATUS SEC_ENTRY SetContextAttributesA(PCtxtHandle phContext, - ULONG ulAttribute, void *pBuffer, ULONG cbBuffer); -SECURITY_STATUS SEC_ENTRY SetContextAttributesW(PCtxtHandle phContext, - ULONG ulAttribute, void *pBuffer, ULONG cbBuffer); +SECURITY_STATUS +SEC_ENTRY +SetContextAttributesA( + _In_ PCtxtHandle phContext, + _In_ ULONG ulAttribute, + _In_reads_bytes_(cbBuffer) void *pBuffer, + _In_ ULONG cbBuffer); + +SECURITY_STATUS +SEC_ENTRY +SetContextAttributesW( + _In_ PCtxtHandle phContext, + _In_ ULONG ulAttribute, + _In_reads_bytes_(cbBuffer) void *pBuffer, + _In_ ULONG cbBuffer); + #define SetContextAttributes WINELIB_NAME_AW(SetContextAttributes) typedef SECURITY_STATUS (SEC_ENTRY *SET_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle,

1 0

[akhaldi] 59896: [CMAKE] * Set the subsystem version as 5.01 for recent MSVC toolchains.
by akhaldi＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: akhaldi Date: Fri Aug 30 10:09:56 2013 New Revision: 59896 URL: http://svn.reactos.org/svn/reactos?rev=59896&view=rev Log: [CMAKE] * Set the subsystem version as 5.01 for recent MSVC toolchains. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=59896… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Fri Aug 30 10:09:56 2013 @@ -104,7 +104,7 @@ function(set_subsystem MODULE SUBSYSTEM) if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 17) - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.0") + add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.01") else() add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM}") endif()

1 0

[ion] 59895: [BASESRV]: Fix critical bug in BaseSrvNlsGetUserInfo.
by ion＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: ion Date: Fri Aug 30 06:53:07 2013 New Revision: 59895 URL: http://svn.reactos.org/svn/reactos?rev=59895&view=rev Log: [BASESRV]: Fix critical bug in BaseSrvNlsGetUserInfo. Modified: trunk/reactos/subsystems/win/basesrv/nls.c Modified: trunk/reactos/subsystems/win/basesrv/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/nls… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Fri Aug 30 06:53:07 2013 @@ -306,7 +306,7 @@ if (NT_SUCCESS(Status)) { /* Do the copy now, then drop the lock */ - RtlCopyMemory(&NlsMsg->NlsUserInfo, pNlsRegUserInfo, NlsMsg->Size); + RtlCopyMemory(NlsMsg->NlsUserInfo, pNlsRegUserInfo, NlsMsg->Size); DPRINT1("NLS Data copy complete\n"); RtlLeaveCriticalSection(&NlsCacheCriticalSection); }

1 0

[ion] 59894: [NTDLL/RTL]: Stub and export all the routines that Kernel32 needs.
by ion＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: ion Date: Fri Aug 30 06:34:16 2013 New Revision: 59894 URL: http://svn.reactos.org/svn/reactos?rev=59894&view=rev Log: [NTDLL/RTL]: Stub and export all the routines that Kernel32 needs. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/lib/rtl/actctx.c trunk/reactos/lib/rtl/env.c trunk/reactos/lib/rtl/message.c trunk/reactos/lib/rtl/path.c trunk/reactos/lib/rtl/security.c trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Fri Aug 30 06:34:16 2013 @@ -1,26 +1,5 @@ -;@ stdcall A_SHAFinal ; 6.0 and higher -;@ stdcall A_SHAInit ; 6.0 and higher -;@ stdcall A_SHAUpdate ; 6.0 and higher -;@ stdcall AitFireParentUsageEvent ; 6.1 and higher -;@ stdcall AitLogFeatureUsageByApp ; 6.1 and higher -;@ stdcall AlpcAdjustCompletionListConcurrencyCount ; 6.0 and higher -;@ stdcall AlpcFreeCompletionListMessage ; 6.0 and higher -;@ stdcall AlpcGetCompletionListLastMessageInformation ; 6.0 and higher -;@ stdcall AlpcGetCompletionListMessageAttributes ; 6.0 and higher -;@ stdcall AlpcGetHeaderSize ; 6.0 and higher -;@ stdcall AlpcGetMessageAttribute ; 6.0 and higher -;@ stdcall AlpcGetMessageFromCompletionList ; 6.0 and higher -;@ stdcall AlpcGetOutstandingCompletionListMessageCount ; 6.0 and higher -;@ stdcall AlpcInitializeMessageAttribute ; 6.0 and higher -;@ stdcall AlpcMaxAllowedMessageLength ; 6.0 and higher -;@ stdcall AlpcRegisterCompletionList ; 6.0 and higher -;@ stdcall AlpcRegisterCompletionListWorkerThread ; 6.0 and higher -;@ stdcall AlpcRundownCompletionList ; 6.1 and higher -;@ stdcall AlpcUnregisterCompletionList ; 6.0 and higher -;@ stdcall AlpcUnregisterCompletionListWorkerThread ; 6.0 and higher @ stdcall CsrAllocateCaptureBuffer(long long) -;@ stdcall CsrAllocateCapturePointer ; NT3, NT4 only @ stdcall CsrAllocateMessagePointer(ptr long ptr) @ stdcall CsrCaptureMessageBuffer(ptr ptr long ptr) @ stdcall CsrCaptureMessageMultiUnicodeStringsInPlace(ptr long ptr) @@ -28,9 +7,6 @@ @ stdcall CsrCaptureTimeout(long ptr) @ stdcall CsrClientCallServer(ptr ptr long long) @ stdcall CsrClientConnectToServer(str long ptr ptr ptr) -;@ stdcall CsrClientMaxMessage ; NT3 only -;@ stdcall CsrClientSendMessage ; NT3 only -;@ stdcall CsrClientThreadConnect ; NT3 only @ stdcall CsrFreeCaptureBuffer(ptr) @ stdcall CsrGetProcessId() @ stdcall CsrIdentifyAlertableThread() @@ -38,7 +14,6 @@ @ stdcall CsrProbeForRead(ptr long long) @ stdcall CsrProbeForWrite(ptr long long) @ stdcall CsrSetPriorityClass(ptr ptr) -;@ stdcall CsrpProcessCallbackRequest ; 3.51 only @ stdcall DbgBreakPoint() @ varargs DbgPrint(str) @ varargs DbgPrintEx(long long str) @@ -67,16 +42,16 @@ @ stdcall KiUserApcDispatcher(ptr ptr ptr ptr) @ stdcall KiUserCallbackDispatcher(ptr ptr long) ; CHECKME @ stdcall KiUserExceptionDispatcher(ptr ptr) -;@ stdcall LdrAccessOutOfProcessResource +@ stdcall LdrAccessOutOfProcessResource(ptr ptr ptr ptr ptr) @ stdcall LdrAccessResource(long ptr ptr ptr) @ stdcall LdrAddRefDll(long ptr) ;@ stdcall LdrAlternateResourcesEnabled -;@ stdcall LdrCreateOutOfProcessImage -;@ stdcall LdrDestroyOutOfProcessImage +@ stdcall LdrCreateOutOfProcessImage(long ptr ptr ptr) +@ stdcall LdrDestroyOutOfProcessImage(ptr) @ stdcall LdrDisableThreadCalloutsForDll(long) @ stdcall LdrEnumResources(ptr ptr long ptr ptr) @ stdcall LdrEnumerateLoadedModules(long ptr long) -;@ stdcall LdrFindCreateProcessManifest ; 5.1 and 5.2 only +@ stdcall LdrFindCreateProcessManifest(long ptr ptr long ptr) ; 5.1 and 5.2 only @ stdcall LdrFindEntryForAddress(ptr ptr) @ stdcall LdrFindResourceDirectory_U(long ptr long ptr) ;@ stdcall LdrFindResourceEx_U ; 5.1 and higher @@ -97,7 +72,7 @@ @ stdcall LdrQueryImageFileKeyOption(ptr ptr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) ;@ stdcall LdrSetAppCompatDllRedirectionCallback -;@ stdcall LdrSetDllManifestProber +@ stdcall LdrSetDllManifestProber(ptr) @ stdcall LdrShutdownProcess() @ stdcall LdrShutdownThread() @ stdcall LdrUnloadAlternateResourceModule(ptr) @@ -132,7 +107,6 @@ @ stdcall NtCallbackReturn(ptr long long) @ stdcall NtCancelDeviceWakeupRequest(ptr) @ stdcall NtCancelIoFile(long ptr) -;@ stdcall NtCancelIoFileEx(long ptr ptr) ; 6.0 and higher @ stdcall NtCancelTimer(long ptr) @ stdcall NtClearEvent(long) @ stdcall NtClose(long) @@ -183,7 +157,6 @@ @ stdcall NtDuplicateObject(long long long ptr long long long) @ stdcall NtDuplicateToken(long long long long long long) @ stdcall NtEnumerateBootEntries(ptr ptr) -;@ stdcall NtEnumerateBus ; 3.51 only @ stdcall NtEnumerateKey (long long long long long long) @ stdcall NtEnumerateSystemEnvironmentValuesEx(long ptr long) @ stdcall NtEnumerateValueKey(long long long long long long) @@ -304,11 +277,9 @@ @ stdcall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) @ stdcall NtReadRequestData(ptr ptr long ptr long ptr) @ stdcall NtReadVirtualMemory(long ptr ptr long ptr) -;@ stdcall NtRegisterNewDevice ; 3.51 only @ stdcall NtRegisterThreadTerminatePort(ptr) @ stdcall NtReleaseKeyedEvent(ptr ptr long ptr) @ stdcall NtReleaseMutant(long ptr) -;@ stdcall NtReleaseProcessMutant ; 3.51 only @ stdcall NtReleaseSemaphore(long long ptr) @ stdcall NtRemoveIoCompletion(ptr ptr ptr ptr ptr) @ stdcall NtRemoveProcessDebug(ptr ptr) @@ -343,7 +314,6 @@ @ stdcall NtSetEventBoostPriority(ptr) @ stdcall NtSetHighEventPair(ptr) @ stdcall NtSetHighWaitLowEventPair(ptr) -;@ stdcall NtSetHighWaitLowThread ; 3.51 and 4.0 only @ stdcall NtSetInformationDebugObject(ptr long ptr long ptr) @ stdcall NtSetInformationFile(long long long long long) @ stdcall NtSetInformationJobObject(long long ptr long) @@ -357,7 +327,6 @@ @ stdcall NtSetLdtEntries(long double long double) ; CHECKME @ stdcall NtSetLowEventPair(ptr) @ stdcall NtSetLowWaitHighEventPair(ptr) -;@ stdcall NtSetLowWaitHighThread ; 3.51 and 4.0 only @ stdcall NtSetQuotaInformationFile(ptr ptr ptr long) @ stdcall NtSetSecurityObject(long long ptr) @ stdcall NtSetSystemEnvironmentValue(ptr ptr) @@ -391,11 +360,9 @@ @ stdcall NtUnlockVirtualMemory(long ptr ptr long) @ stdcall NtUnmapViewOfSection(long ptr) @ stdcall NtVdmControl(long ptr) -;@ stdcall NtW32Call(long ptr long ptr ptr) @ stdcall NtWaitForDebugEvent(ptr long ptr ptr) @ stdcall NtWaitForKeyedEvent(ptr ptr long ptr) @ stdcall NtWaitForMultipleObjects(long ptr long long ptr) -;@ stdcall NtWaitForProcessMutant ; 3.51 only @ stdcall NtWaitForSingleObject(long long long) @ stdcall NtWaitHighEventPair(ptr) @ stdcall NtWaitLowEventPair(ptr) @@ -462,7 +429,6 @@ @ stdcall RtlAreAnyAccessesGranted(long long) @ stdcall RtlAreBitsClear(ptr long long) @ stdcall RtlAreBitsSet(ptr long long) -;@ stdcall RtlAssert2 @ stdcall RtlAssert(ptr ptr long ptr) ;@ stdcall RtlCancelTimer @ stdcall -register RtlCaptureContext(ptr) @@ -475,7 +441,6 @@ @ stdcall RtlClearAllBits(ptr) @ stdcall RtlClearBits(ptr long long) ;@ stdcall RtlCloneMemoryStream -;@ stdcall RtlClosePropertySet ; NT 4.0 only ;@ stdcall RtlCommitMemoryStream @ stdcall RtlCompactHeap(long long) @ stdcall RtlCompareMemory(ptr ptr long) @@ -485,7 +450,7 @@ @ stdcall RtlCompressBuffer(long ptr long ptr long long ptr ptr) @ stdcall RtlComputeCrc32(long ptr long) @ stdcall RtlComputeImportTableHash(ptr ptr long) -;@ stdcall RtlComputePrivatizedDllName_U +@ stdcall RtlComputePrivatizedDllName_U(ptr ptr ptr) ;@ stdcall RtlConsoleMultiByteToUnicodeN @ stdcall RtlConvertExclusiveToShared(ptr) @ stdcall -arch=win32 -ret64 RtlConvertLongToLargeInteger(long) @@ -515,7 +480,6 @@ @ stdcall RtlCreateEnvironment(long ptr) @ stdcall RtlCreateHeap(long ptr long long ptr ptr) @ stdcall RtlCreateProcessParameters(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -;@ stdcall RtlCreatePropertySet ; 4.0 only @ stdcall RtlCreateQueryDebugBuffer(long long) @ stdcall RtlCreateRegistryKey(long wstr) @ stdcall RtlCreateSecurityDescriptor(ptr long) @@ -533,12 +497,11 @@ @ stdcall RtlDeNormalizeProcessParams(ptr) @ stdcall RtlDeactivateActivationContext(long long) @ fastcall RtlDeactivateActivationContextUnsafeFast(ptr) -;@ stdcall RtlDebugPrintTimes @ stdcall RtlDecodePointer(ptr) @ stdcall RtlDecodeSystemPointer(ptr) RtlEncodeSystemPointer @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) @ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) -;@ stdcall RtlDefaultNpAcl +@ stdcall RtlDefaultNpAcl(ptr) @ stdcall RtlDelete(ptr) @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) @@ -569,9 +532,9 @@ @ stdcall RtlDoesFileExists_U(wstr) @ stdcall RtlDosApplyFileIsolationRedirection_Ustr(long ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RtlDosPathNameToNtPathName_U(wstr ptr ptr ptr) -;@ stdcall RtlDosPathNameToNtPathName_U_WithStatus ; 5.2 SP1, and higher -@ stdcall RtlDosPathNameToRelativeNtPathName_U(ptr ptr ptr ptr) ; CHECKME -;@ stdcall RtlDosPathNameToRelativeNtPathName_U_WithStatus +@ stdcall RtlDosPathNameToNtPathName_U_WithStatus(wstr ptr ptr ptr) ; 5.2 SP1, and higher +@ stdcall RtlDosPathNameToRelativeNtPathName_U(ptr ptr ptr ptr) +@ stdcall RtlDosPathNameToRelativeNtPathName_U_WithStatus(wstr ptr ptr ptr) @ stdcall RtlDosSearchPath_U(wstr wstr wstr long ptr ptr) @ stdcall RtlDosSearchPath_Ustr(long ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RtlDowncaseUnicodeChar(long) @@ -592,7 +555,6 @@ @ stdcall RtlEnumerateGenericTableLikeADirectory(ptr ptr ptr long ptr ptr ptr) @ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) @ stdcall RtlEnumerateGenericTableWithoutSplayingAvl(ptr ptr) -;@ stdcall RtlEnumerateProperties ; 4.0 only @ stdcall RtlEqualComputerName(ptr ptr) @ stdcall RtlEqualDomainName(ptr ptr) @ stdcall RtlEqualLuid(ptr ptr) @@ -610,7 +572,7 @@ @ stdcall RtlFillMemory(ptr long long) @ stdcall RtlFillMemoryUlong(ptr long long) ;@ stdcall RtlFinalReleaseOutOfProcessMemoryStream -;@ stdcall RtlFindActivationContextSectionGuid +@ stdcall RtlFindActivationContextSectionGuid(long ptr long ptr ptr) @ stdcall RtlFindActivationContextSectionString(long ptr long ptr ptr) @ stdcall RtlFindCharInUnicodeString(long ptr ptr ptr) @ stdcall RtlFindClearBits(ptr long long) @@ -631,11 +593,10 @@ ;@ stdcall RtlFindSetRuns(ptr ptr long long) @ stdcall RtlFirstEntrySList(ptr) @ stdcall RtlFirstFreeAce(ptr ptr) -;@ stdcall RtlFlushPropertySet ; 4.0 only @ stdcall RtlFlushSecureMemoryCache(ptr ptr) @ stdcall RtlFormatCurrentUserKeyPath(ptr) @ stdcall RtlFormatMessage(ptr long long long long ptr ptr long) -;@ stdcall RtlFormatMessageEx +@ stdcall RtlFormatMessageEx(ptr long long long long ptr ptr long long) @ stdcall RtlFreeActivationContextStack(ptr) @ stdcall RtlFreeAnsiString(long) @ stdcall RtlFreeHandle(ptr ptr) @@ -667,11 +628,11 @@ @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetLastNtStatus() @ stdcall RtlGetLastWin32Error() -;@ stdcall RtlGetLengthWithoutLastFullDosOrNtPathElement +@ stdcall RtlGetLengthWithoutLastFullDosOrNtPathElement(long ptr ptr) ; Yes, Microsoft really misspelled this one! ;@ stdcall RtlGetLengthWithoutTrailingPathSeperators @ stdcall RtlGetLongestNtPathLength() -;@ stdcall RtlGetNativeSystemInformation +@ stdcall RtlGetNativeSystemInformation(long long long long) NtQuerySystemInformation @ stdcall RtlGetNextRange(ptr ptr long) @ stdcall RtlGetNtGlobalFlags() @ stdcall RtlGetNtProductType(ptr) @@ -686,7 +647,6 @@ ;@ stdcall RtlGetUnloadEventTrace @ stdcall RtlGetUserInfoHeap(ptr long ptr ptr ptr) @ stdcall RtlGetVersion(ptr) -;@ stdcall RtlGuidToPropertySetName ; 4.0 only @ stdcall RtlHashUnicodeString(ptr long long ptr) @ stdcall RtlIdentifierAuthoritySid(ptr) @ stdcall RtlImageDirectoryEntryToData(long long long ptr) @@ -786,7 +746,7 @@ ;@ stdcall RtlMapSecurityErrorToNtStatus @ stdcall RtlMergeRangeLists(ptr ptr ptr long) @ stdcall RtlMoveMemory(ptr ptr long) -;@ stdcall RtlMultiAppendUnicodeStringBuffer +@ stdcall RtlMultiAppendUnicodeStringBuffer(ptr long ptr) @ stdcall RtlMultiByteToUnicodeN(ptr long ptr ptr long) @ stdcall RtlMultiByteToUnicodeSize(ptr str long) @ stdcall RtlNewInstanceSecurityObject(long long ptr ptr ptr ptr ptr long ptr ptr) @@ -876,7 +836,7 @@ @ stdcall RtlSetCurrentDirectory_U(ptr) @ stdcall RtlSetCurrentEnvironment(wstr ptr) @ stdcall RtlSetDaclSecurityDescriptor(ptr long ptr long) -;@ stdcall RtlSetEnvironmentStrings +@ stdcall RtlSetEnvironmentStrings(wstr long) @ stdcall RtlSetEnvironmentVariable(ptr ptr ptr) @ stdcall RtlSetGroupSecurityDescriptor(ptr ptr long) @ stdcall RtlSetHeapInformation(ptr long ptr ptr) @@ -983,7 +943,7 @@ @ stdcall RtlZeroHeap(ptr long) @ stdcall RtlZeroMemory(ptr long) @ stdcall RtlZombifyActivationContext(ptr) -;@ stdcall RtlpApplyLengthFunction +@ stdcall RtlpApplyLengthFunction(long long ptr ptr) @ stdcall RtlpEnsureBufferSize(ptr ptr ptr) ; CHECKME ;@ stdcall RtlpNotOwnerCriticalSection @ stdcall RtlpNtCreateKey(ptr long ptr long ptr ptr) Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Fri Aug 30 06:34:16 2013 @@ -22,6 +22,56 @@ ULONG AlternateResourceModuleCount; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +LdrFindCreateProcessManifest(IN ULONG Flags, + IN PVOID Image, + IN PVOID IdPath, + IN ULONG IdPathLength, + IN PVOID OutDataEntry) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +LdrDestroyOutOfProcessImage(IN PVOID Image) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +LdrCreateOutOfProcessImage(IN ULONG Flags, + IN HANDLE ProcessHandle, + IN HANDLE DllHandle, + IN PVOID Unknown3) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +LdrAccessOutOfProcessResource(IN PVOID Unknown, + IN PVOID Image, + IN PVOID Unknown1, + IN PVOID Unknown2, + IN PVOID Unknown3) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +VOID +NTAPI +LdrSetDllManifestProber(IN PVOID ProberFunction) +{ + UNIMPLEMENTED; +} BOOLEAN NTAPI Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=59894… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Fri Aug 30 06:34:16 2013 @@ -2778,6 +2778,14 @@ return status; } +NTSTATUS +NTAPI +RtlFindActivationContextSectionGuid(ULONG flags, const GUID *guid, ULONG section_kind, UNICODE_STRING *section_name, PVOID ptr) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* Stubs */ NTSTATUS Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=59894&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Fri Aug 30 06:34:16 2013 @@ -14,6 +14,14 @@ #include <debug.h> /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +RtlSetEnvironmentStrings(IN PWCHAR NewEnvironment, IN ULONG NewEnvironmentSize) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} /* * @implemented Modified: trunk/reactos/lib/rtl/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/message.c?rev=5989… ============================================================================== --- trunk/reactos/lib/rtl/message.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/message.c [iso-8859-1] Fri Aug 30 06:34:16 2013 @@ -122,6 +122,26 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +RtlFormatMessageEx( + PWSTR Message, + UCHAR MaxWidth, + BOOLEAN IgnoreInserts, + BOOLEAN Ansi, + BOOLEAN ArgumentIsArray, + va_list *Arguments, + PWSTR Buffer, + ULONG BufferSize, + ULONG Flags) +{ + DPRINT1("RtlFormatMessage(%S, %u, %s, %s, %s, %s, %p, %lu %lx)\n", + Message, MaxWidth, IgnoreInserts ? "TRUE" : "FALSE", Ansi ? "TRUE" : "FALSE", + ArgumentIsArray ? "TRUE" : "FALSE", (PSTR)Arguments, Buffer, BufferSize, Flags); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} /********************************************************************** * RtlFormatMessage (NTDLL.@) @@ -141,7 +161,7 @@ * RETURNS * NTSTATUS code. * - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -155,12 +175,7 @@ PWSTR Buffer, ULONG BufferSize) { - DPRINT1("RtlFormatMessage(%S, %u, %s, %s, %s, %s, %p, %lu)\n", - Message, MaxWidth, IgnoreInserts ? "TRUE" : "FALSE", Ansi ? "TRUE" : "FALSE", - ArgumentIsArray ? "TRUE" : "FALSE", (PSTR)Arguments, Buffer, BufferSize); - - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + return RtlFormatMessageEx(Message, MaxWidth, IgnoreInserts, Ansi, ArgumentIsArray, Arguments, Buffer, BufferSize, 0); } /* EOF */ Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=59894&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Fri Aug 30 06:34:16 2013 @@ -400,6 +400,37 @@ return (UncPath - FileNameBuffer); } +NTSTATUS +NTAPI +RtlpApplyLengthFunction(IN ULONG Flags, + IN ULONG Type, + IN PVOID UnicodeStringOrUnicodeStringBuffer, + IN PVOID LengthFunction) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +RtlGetLengthWithoutLastFullDosOrNtPathElement(IN ULONG Flags, + IN PWCHAR Path, + OUT PULONG LengthOut) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +RtlComputePrivatizedDllName_U(IN PUNICODE_STRING DllName, + IN PUNICODE_STRING a2, + IN PUNICODE_STRING a3) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + ULONG NTAPI RtlGetFullPathName_Ustr( Modified: trunk/reactos/lib/rtl/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/security.c?rev=598… ============================================================================== --- trunk/reactos/lib/rtl/security.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/security.c [iso-8859-1] Fri Aug 30 06:34:16 2013 @@ -59,6 +59,14 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ + +NTSTATUS +NTAPI +RtlDefaultNpAcl(OUT PACL Acl) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} /* * @unimplemented Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5989… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Fri Aug 30 06:34:16 2013 @@ -27,6 +27,16 @@ /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +RtlMultiAppendUnicodeStringBuffer(IN PVOID Unknown, + IN ULONG Unknown2, + IN PVOID Unknown3) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} /* * @implemented

1 0

[hbelusca] 59893: [NTOS] buzdelabuz2 !! We've unveiled who you are !! Fix header information.
by hbelusca＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: hbelusca Date: Thu Aug 29 22:24:46 2013 New Revision: 59893 URL: http://svn.reactos.org/svn/reactos?rev=59893&view=rev Log: [NTOS] buzdelabuz2 !! We've unveiled who you are !! Fix header information. Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Thu Aug 29 22:24:46 2013 @@ -3,8 +3,9 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/fsrtl/fastio.c * PURPOSE: Provides Fast I/O entrypoints to the Cache Manager - * PROGRAMMERS: buzdelabuz2@gmail.com,alex.ionescu@reactos.org - * Aleksey Bragin <aleksey(a)reactos.org> + * PROGRAMMERS: Dominique Cote (buzdelabuz2(a)gmail.com) + * Alex Ionescu (alex.ionescu(a)reactos.org) + * Aleksey Bragin (aleksey(a)reactos.org) */ /* INCLUDES ******************************************************************/

1 0

[aandrejevic] 59892: [SOFT386] Implement CMC instruction.
by aandrejevic＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: aandrejevic Date: Thu Aug 29 22:18:28 2013 New Revision: 59892 URL: http://svn.reactos.org/svn/reactos?rev=59892&view=rev Log: [SOFT386] Implement CMC instruction. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Aug 29 22:18:28 2013 @@ -269,7 +269,7 @@ Soft386OpcodePrefix, Soft386OpcodePrefix, Soft386OpcodeHalt, - NULL, // TODO: OPCODE 0xF5 NOT SUPPORTED + Soft386OpcodeComplCarry, NULL, // TODO: OPCODE 0xF6 NOT SUPPORTED NULL, // TODO: OPCODE 0xF7 NOT SUPPORTED Soft386OpcodeClearCarry, @@ -782,6 +782,25 @@ BOOLEAN FASTCALL +Soft386OpcodeComplCarry(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xF5); + + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Toggle CF and return success */ + State->Flags.Cf = !State->Flags.Cf; + return TRUE; +} + +BOOLEAN +FASTCALL Soft386OpcodeClearInt(PSOFT386_STATE State, UCHAR Opcode) { /* Make sure this is the right instruction */ Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Thu Aug 29 22:18:28 2013 @@ -105,6 +105,14 @@ BOOLEAN FASTCALL +Soft386OpcodeComplCarry +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL Soft386OpcodeClearInt ( PSOFT386_STATE State,

1 0

[aandrejevic] 59891: [SOFT386] Add Soft386OpcodeHalt to the opcode table.
by aandrejevic＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: aandrejevic Date: Thu Aug 29 22:11:33 2013 New Revision: 59891 URL: http://svn.reactos.org/svn/reactos?rev=59891&view=rev Log: [SOFT386] Add Soft386OpcodeHalt to the opcode table. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Aug 29 22:11:33 2013 @@ -268,7 +268,7 @@ NULL, // Invalid Soft386OpcodePrefix, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0xF4 NOT SUPPORTED + Soft386OpcodeHalt, NULL, // TODO: OPCODE 0xF5 NOT SUPPORTED NULL, // TODO: OPCODE 0xF6 NOT SUPPORTED NULL, // TODO: OPCODE 0xF7 NOT SUPPORTED Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Thu Aug 29 22:11:33 2013 @@ -135,4 +135,12 @@ UCHAR Opcode ); +BOOLEAN +FASTCALL +Soft386OpcodeHalt +( + PSOFT386_STATE State, + UCHAR Opcode +); + #endif // _OPCODES_H_

1 0

[aandrejevic] 59890: [SOFT386] Add checks for illegal prefixes. Implement HLT and PAUSE.
by aandrejevic＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: aandrejevic Date: Thu Aug 29 22:07:53 2013 New Revision: 59890 URL: http://svn.reactos.org/svn/reactos?rev=59890&view=rev Log: [SOFT386] Add checks for illegal prefixes. Implement HLT and PAUSE. Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/soft386.c Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Thu Aug 29 22:07:53 2013 @@ -148,6 +148,13 @@ ULONG Port, PVOID Buffer, ULONG Size +); + +typedef +VOID +(NTAPI *SOFT386_IDLE_PROC) +( + PSOFT386_STATE State ); typedef union _SOFT386_REG @@ -280,6 +287,7 @@ SOFT386_MEM_WRITE_PROC MemWriteCallback; SOFT386_IO_READ_PROC IoReadCallback; SOFT386_IO_WRITE_PROC IoWriteCallback; + SOFT386_IDLE_PROC IdleCallback; SOFT386_REG GeneralRegs[SOFT386_NUM_GEN_REGS]; SOFT386_SEG_REG SegmentRegs[SOFT386_NUM_SEG_REGS]; SOFT386_REG InstPtr; @@ -291,6 +299,7 @@ ULONG ExceptionCount; ULONG PrefixFlags; INT SegmentOverride; + BOOLEAN HardwareInt; }; /* FUNCTIONS ******************************************************************/ Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Aug 29 22:07:53 2013 @@ -600,7 +600,8 @@ if (State->PrefixFlags & SOFT386_PREFIX_REP) { - // TODO: Handle PAUSE instruction. + /* Idle cycle */ + State->IdleCallback(State); } return TRUE; @@ -748,6 +749,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF8); + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + /* Clear CF and return success */ State->Flags.Cf = FALSE; return TRUE; @@ -760,6 +768,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF9); + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + /* Set CF and return success*/ State->Flags.Cf = TRUE; return TRUE; @@ -771,6 +786,13 @@ { /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFA); + + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } /* Check for protected mode */ if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) @@ -805,6 +827,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFB); + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + /* Check for protected mode */ if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) { @@ -838,6 +867,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFC); + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + /* Clear DF and return success */ State->Flags.Df = FALSE; return TRUE; @@ -850,7 +886,42 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFD); + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + /* Set DF and return success*/ State->Flags.Df = TRUE; return TRUE; } + +BOOLEAN +FASTCALL +Soft386OpcodeHalt(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xF4); + + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Privileged instructions can only be executed under CPL = 0 */ + if (State->SegmentRegs[SOFT386_REG_CS].Dpl != 0) + { + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + + /* Halt */ + while (!State->HardwareInt) State->IdleCallback(State); + + /* Return success */ + return TRUE; +} Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Thu Aug 29 22:07:53 2013 @@ -201,6 +201,7 @@ SOFT386_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback; SOFT386_IO_READ_PROC IoReadCallback = State->IoReadCallback; SOFT386_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback; + SOFT386_IDLE_PROC IdleCallback = State->IdleCallback; /* Clear the entire structure */ RtlZeroMemory(State, sizeof(*State)); @@ -234,6 +235,7 @@ State->MemWriteCallback = MemWriteCallback; State->IoReadCallback = IoReadCallback; State->IoWriteCallback = IoWriteCallback; + State->IdleCallback = IdleCallback; } VOID

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