Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 02/02: [SDK] Guard manifest_[dll|exe].rc against wrong usage.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7861960a884322ef09c13… commit 7861960a884322ef09c138d2667b3b46cf00cac1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Dec 23 22:39:26 2017 +0100 [SDK] Guard manifest_[dll|exe].rc against wrong usage. --- sdk/include/reactos/manifest_dll.rc | 5 +++++ sdk/include/reactos/manifest_exe.rc | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sdk/include/reactos/manifest_dll.rc b/sdk/include/reactos/manifest_dll.rc index 7cf5f92312..3a036bf3a2 100644 --- a/sdk/include/reactos/manifest_dll.rc +++ b/sdk/include/reactos/manifest_dll.rc @@ -1 +1,6 @@ + +#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID +#error please include winuser.h before including me! +#endif + ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" diff --git a/sdk/include/reactos/manifest_exe.rc b/sdk/include/reactos/manifest_exe.rc index f2c34555bc..6e4b3019ee 100644 --- a/sdk/include/reactos/manifest_exe.rc +++ b/sdk/include/reactos/manifest_exe.rc @@ -1 +1,6 @@ + +#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID +#error please include winuser.h before including me! +#endif + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"

7 years

[reactos] 01/02: [DLL] Fix wrong manifest includes.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99c7c93b83c4b62a241a5… commit 99c7c93b83c4b62a241a58e2f3e5e6c5e47ecbc4 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Dec 23 22:38:42 2017 +0100 [DLL] Fix wrong manifest includes. --- dll/3rdparty/mbedtls/mbedtls.rc | 1 + dll/win32/serialui/serialui.rc | 1 + 2 files changed, 2 insertions(+) diff --git a/dll/3rdparty/mbedtls/mbedtls.rc b/dll/3rdparty/mbedtls/mbedtls.rc index 57b99b69eb..c896a1c9f9 100644 --- a/dll/3rdparty/mbedtls/mbedtls.rc +++ b/dll/3rdparty/mbedtls/mbedtls.rc @@ -1,4 +1,5 @@ #include <windef.h> +#include <winuser.h> #define MBEDTLS_CONFIG_H #include <mbedtls/version.h> diff --git a/dll/win32/serialui/serialui.rc b/dll/win32/serialui/serialui.rc index ced6e9c9f8..961054040f 100644 --- a/dll/win32/serialui/serialui.rc +++ b/dll/win32/serialui/serialui.rc @@ -1,4 +1,5 @@ #include <windef.h> +#include <winuser.h> #include "resource.h"

7 years

[reactos] 01/01: [NET] CompareInfo => CompareUserInfo. #179

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c8a3a6e7e00e48787f12… commit 3c8a3a6e7e00e48787f1246cfe9b85fb9624af6c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Dec 24 00:15:58 2017 +0100 [NET] CompareInfo => CompareUserInfo. #179 --- base/applications/network/net/cmdUser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index 7267a553f4..0bc9f2c876 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -13,7 +13,7 @@ static int -CompareInfo(const void *a, +CompareUserInfo(const void *a, const void *b) { return _wcsicmp(((PUSER_INFO_0)a)->usri0_name, @@ -62,7 +62,7 @@ EnumerateUsers(VOID) qsort(pBuffer, dwRead, sizeof(PUSER_INFO_0), - CompareInfo); + CompareUserInfo); for (i = 0; i < dwRead; i++) {

7 years

[reactos] 01/01: [NTVDM] Move the def file out of the source files list. Rename some variables and functions. #179

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ef2c4515ef7aa44b3d9c… commit 5ef2c4515ef7aa44b3d9c2eb7360e79f30cffe3f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Dec 24 00:04:15 2017 +0100 [NTVDM] Move the def file out of the source files list. Rename some variables and functions. #179 --- subsystems/mvdm/ntvdm/CMakeLists.txt | 10 +- subsystems/mvdm/ntvdm/dos/dem.c | 2 +- subsystems/mvdm/ntvdm/dos/dem.h | 4 +- subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c | 136 +++++++++++++-------------- subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c | 32 +++---- subsystems/mvdm/ntvdm/hardware/keyboard.c | 58 ++++++------ subsystems/mvdm/ntvdm/hardware/mouse.c | 86 ++++++++--------- 7 files changed, 166 insertions(+), 162 deletions(-) diff --git a/subsystems/mvdm/ntvdm/CMakeLists.txt b/subsystems/mvdm/ntvdm/CMakeLists.txt index 6cdaf7e449..30a4398702 100644 --- a/subsystems/mvdm/ntvdm/CMakeLists.txt +++ b/subsystems/mvdm/ntvdm/CMakeLists.txt @@ -67,12 +67,16 @@ list(APPEND SOURCE utils.c vddsup.c ntvdm.c - ntvdm.h - ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def) + ntvdm.h) file(GLOB ntvdm_rc_deps res/*.*) add_rc_deps(ntvdm.rc ${ntvdm_rc_deps}) -add_executable(ntvdm ${SOURCE} ntvdm.rc) + +add_executable(ntvdm + ${SOURCE} + ntvdm.rc + ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def) + add_pch(ntvdm ntvdm.h SOURCE) set_module_type(ntvdm win32cui UNICODE IMAGEBASE 0x0F000000) target_link_libraries(ntvdm fast486 ${PSEH_LIB}) diff --git a/subsystems/mvdm/ntvdm/dos/dem.c b/subsystems/mvdm/ntvdm/dos/dem.c index 0848d456bf..1c81eacc1c 100644 --- a/subsystems/mvdm/ntvdm/dos/dem.c +++ b/subsystems/mvdm/ntvdm/dos/dem.c @@ -54,7 +54,7 @@ \******************************************************************************/ -VOID BiosCharPrint(CHAR Character) +VOID Dem_BiosCharPrint(CHAR Character) { /* Save AX and BX */ USHORT AX = getAX(); diff --git a/subsystems/mvdm/ntvdm/dos/dem.h b/subsystems/mvdm/ntvdm/dos/dem.h index befbe80dc6..8760e0468f 100644 --- a/subsystems/mvdm/ntvdm/dos/dem.h +++ b/subsystems/mvdm/ntvdm/dos/dem.h @@ -29,9 +29,9 @@ /* FUNCTIONS ******************************************************************/ -VOID BiosCharPrint(CHAR Character); +VOID Dem_BiosCharPrint(CHAR Character); #define BiosDisplayMessage(Format, ...) \ - PrintMessageAnsi(BiosCharPrint, (Format), ##__VA_ARGS__) + PrintMessageAnsi(Dem_BiosCharPrint, (Format), ##__VA_ARGS__) VOID DosCharPrint(CHAR Character); #define DosDisplayMessage(Format, ...) \ diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c index 38da36c23e..8ba74891c9 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c @@ -35,9 +35,9 @@ static PDOS_DEVICE_NODE Node; static RTL_BITMAP AllocBitmap; -static PULONG BitmapBuffer = NULL; -static PEMS_PAGE PageTable = NULL; -static EMS_HANDLE HandleTable[EMS_MAX_HANDLES]; +static PULONG EmsBitmapBuffer = NULL; +static PEMS_PAGE EmsPageTable = NULL; +static EMS_HANDLE EmsHandleTable[EMS_MAX_HANDLES]; static PVOID Mapping[EMS_PHYSICAL_PAGES] = { NULL }; static PVOID MappingBackup[EMS_PHYSICAL_PAGES] = { NULL }; static ULONG EmsTotalPages = 0; @@ -50,12 +50,12 @@ static VOID InitHandlesTable(VOID) { USHORT i; - for (i = 0; i < ARRAYSIZE(HandleTable); i++) + for (i = 0; i < ARRAYSIZE(EmsHandleTable); i++) { - HandleTable[i].Allocated = FALSE; - HandleTable[i].PageCount = 0; - RtlZeroMemory(HandleTable[i].Name, sizeof(HandleTable[i].Name)); - InitializeListHead(&HandleTable[i].PageList); + EmsHandleTable[i].Allocated = FALSE; + EmsHandleTable[i].PageCount = 0; + RtlZeroMemory(EmsHandleTable[i].Name, sizeof(EmsHandleTable[i].Name)); + InitializeListHead(&EmsHandleTable[i].PageList); } } @@ -65,9 +65,9 @@ static PEMS_HANDLE CreateHandle(PUSHORT Handle) USHORT i; /* Handle 0 is reserved (system handle) */ - for (i = 1; i < ARRAYSIZE(HandleTable); i++) + for (i = 1; i < ARRAYSIZE(EmsHandleTable); i++) { - HandleEntry = &HandleTable[i]; + HandleEntry = &EmsHandleTable[i]; if (!HandleEntry->Allocated) { *Handle = i; @@ -87,10 +87,10 @@ static VOID FreeHandle(PEMS_HANDLE HandleEntry) // InitializeListHead(&HandleEntry->PageList); } -static inline PEMS_HANDLE GetHandleRecord(USHORT Handle) +static inline PEMS_HANDLE GetEmsHandleRecord(USHORT Handle) { - if (Handle >= ARRAYSIZE(HandleTable)) return NULL; - return &HandleTable[Handle]; + if (Handle >= ARRAYSIZE(EmsHandleTable)) return NULL; + return &EmsHandleTable[Handle]; } static inline BOOLEAN ValidateHandle(PEMS_HANDLE HandleEntry) @@ -101,7 +101,7 @@ static inline BOOLEAN ValidateHandle(PEMS_HANDLE HandleEntry) static UCHAR EmsFree(USHORT Handle) { PLIST_ENTRY Entry; - PEMS_HANDLE HandleEntry = GetHandleRecord(Handle); + PEMS_HANDLE HandleEntry = GetEmsHandleRecord(Handle); if (!ValidateHandle(HandleEntry)) return EMS_STATUS_INVALID_HANDLE; @@ -111,7 +111,7 @@ static UCHAR EmsFree(USHORT Handle) Entry = Entry->Flink) { PEMS_PAGE PageEntry = (PEMS_PAGE)CONTAINING_RECORD(Entry, EMS_PAGE, Entry); - ULONG PageNumber = ARRAY_INDEX(PageEntry, PageTable); + ULONG PageNumber = ARRAY_INDEX(PageEntry, EmsPageTable); /* Free the page */ RtlClearBits(&AllocBitmap, PageNumber, 1); @@ -158,8 +158,8 @@ static UCHAR EmsAlloc(USHORT NumPages, PUSHORT Handle) for (i = 0; i < RunSize; i++) { - PageTable[RunStart + i].Handle = *Handle; - InsertTailList(&HandleEntry->PageList, &PageTable[RunStart + i].Entry); + EmsPageTable[RunStart + i].Handle = *Handle; + InsertTailList(&HandleEntry->PageList, &EmsPageTable[RunStart + i].Entry); } } @@ -173,7 +173,7 @@ static UCHAR InitSystemHandle(USHORT NumPages) // ULONG i, CurrentIndex = 0; - PEMS_HANDLE HandleEntry = &HandleTable[EMS_SYSTEM_HANDLE]; + PEMS_HANDLE HandleEntry = &EmsHandleTable[EMS_SYSTEM_HANDLE]; /* The system handle must never have been initialized before */ ASSERT(!HandleEntry->Allocated); @@ -209,8 +209,8 @@ static UCHAR InitSystemHandle(USHORT NumPages) for (i = 0; i < RunSize; i++) { - PageTable[RunStart + i].Handle = EMS_SYSTEM_HANDLE; - InsertTailList(&HandleEntry->PageList, &PageTable[RunStart + i].Entry); + EmsPageTable[RunStart + i].Handle = EMS_SYSTEM_HANDLE; + InsertTailList(&HandleEntry->PageList, &EmsPageTable[RunStart + i].Entry); } } @@ -234,7 +234,7 @@ static PEMS_PAGE GetLogicalPage(PEMS_HANDLE HandleEntry, USHORT LogicalPage) static UCHAR EmsMap(USHORT Handle, UCHAR PhysicalPage, USHORT LogicalPage) { PEMS_PAGE PageEntry; - PEMS_HANDLE HandleEntry = GetHandleRecord(Handle); + PEMS_HANDLE HandleEntry = GetEmsHandleRecord(Handle); if (!ValidateHandle(HandleEntry)) return EMS_STATUS_INVALID_HANDLE; @@ -253,7 +253,7 @@ static UCHAR EmsMap(USHORT Handle, UCHAR PhysicalPage, USHORT LogicalPage) if (!PageEntry) return EMS_STATUS_INV_LOGICAL_PAGE; Mapping[PhysicalPage] = (PVOID)((ULONG_PTR)EmsMemory - + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE); + + ARRAY_INDEX(PageEntry, EmsPageTable) * EMS_PAGE_SIZE); return EMS_STATUS_SUCCESS; } @@ -344,9 +344,9 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) USHORT NumOpenHandles = 0; USHORT i; - for (i = 0; i < ARRAYSIZE(HandleTable); i++) + for (i = 0; i < ARRAYSIZE(EmsHandleTable); i++) { - if (HandleTable[i].Allocated) + if (EmsHandleTable[i].Allocated) ++NumOpenHandles; } @@ -358,7 +358,7 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) /* Get Handle Number of Pages */ case 0x4C: { - PEMS_HANDLE HandleEntry = GetHandleRecord(getDX()); + PEMS_HANDLE HandleEntry = GetEmsHandleRecord(getDX()); if (!ValidateHandle(HandleEntry)) { @@ -378,12 +378,12 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) USHORT NumOpenHandles = 0; USHORT i; - for (i = 0; i < ARRAYSIZE(HandleTable); i++) + for (i = 0; i < ARRAYSIZE(EmsHandleTable); i++) { - if (HandleTable[i].Allocated) + if (EmsHandleTable[i].Allocated) { HandlePageInfo->Handle = i; - HandlePageInfo->PageCount = HandleTable[i].PageCount; + HandlePageInfo->PageCount = EmsHandleTable[i].PageCount; ++HandlePageInfo; ++NumOpenHandles; } @@ -430,7 +430,7 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) /* Get/Set Handle Name */ case 0x53: { - PEMS_HANDLE HandleEntry = GetHandleRecord(getDX()); + PEMS_HANDLE HandleEntry = GetEmsHandleRecord(getDX()); if (!ValidateHandle(HandleEntry)) { @@ -474,13 +474,13 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) USHORT NumOpenHandles = 0; USHORT i; - for (i = 0; i < ARRAYSIZE(HandleTable); i++) + for (i = 0; i < ARRAYSIZE(EmsHandleTable); i++) { - if (HandleTable[i].Allocated) + if (EmsHandleTable[i].Allocated) { HandleDir->Handle = i; RtlCopyMemory(HandleDir->Name, - HandleTable[i].Name, + EmsHandleTable[i].Name, sizeof(HandleDir->Name)); ++HandleDir; ++NumOpenHandles; @@ -498,20 +498,20 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) PEMS_HANDLE HandleFound = NULL; USHORT i; - for (i = 0; i < ARRAYSIZE(HandleTable); i++) + for (i = 0; i < ARRAYSIZE(EmsHandleTable); i++) { - if (HandleTable[i].Allocated && + if (EmsHandleTable[i].Allocated && RtlCompareMemory(HandleName, - HandleTable[i].Name, - sizeof(HandleTable[i].Name)) == sizeof(HandleTable[i].Name)) + EmsHandleTable[i].Name, + sizeof(EmsHandleTable[i].Name)) == sizeof(EmsHandleTable[i].Name)) { - HandleFound = &HandleTable[i]; + HandleFound = &EmsHandleTable[i]; break; } } /* Bail out if no handle was found */ - if (i >= ARRAYSIZE(HandleTable)) // HandleFound == NULL + if (i >= ARRAYSIZE(EmsHandleTable)) // HandleFound == NULL { setAH(EMS_STATUS_HANDLE_NOT_FOUND); break; @@ -544,7 +544,7 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) * a program may request. */ setAH(EMS_STATUS_SUCCESS); - setBX(ARRAYSIZE(HandleTable)); + setBX(ARRAYSIZE(EmsHandleTable)); } else { @@ -567,7 +567,7 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) if (Data->SourceType) { /* Expanded memory */ - HandleEntry = GetHandleRecord(Data->SourceHandle); + HandleEntry = GetEmsHandleRecord(Data->SourceHandle); if (!ValidateHandle(HandleEntry)) { setAH(EMS_STATUS_INVALID_HANDLE); @@ -582,7 +582,7 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) } SourcePtr = (PUCHAR)((ULONG_PTR)EmsMemory - + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE + + ARRAY_INDEX(PageEntry, EmsPageTable) * EMS_PAGE_SIZE + Data->SourceOffset); } else @@ -594,7 +594,7 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) if (Data->DestType) { /* Expanded memory */ - HandleEntry = GetHandleRecord(Data->DestHandle); + HandleEntry = GetEmsHandleRecord(Data->DestHandle); if (!ValidateHandle(HandleEntry)) { setAH(EMS_STATUS_INVALID_HANDLE); @@ -609,7 +609,7 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) } DestPtr = (PUCHAR)((ULONG_PTR)EmsMemory - + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE + + ARRAY_INDEX(PageEntry, EmsPageTable) * EMS_PAGE_SIZE + Data->DestOffset); } else @@ -774,24 +774,24 @@ BOOLEAN EmsDrvInitialize(USHORT Segment, ULONG TotalPages) if (!UmaDescReserve(&EmsSegment, &Size)) return FALSE; EmsTotalPages = TotalPages; - BitmapBuffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - ((TotalPages + 31) / 32) * sizeof(ULONG)); - if (BitmapBuffer == NULL) + EmsBitmapBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + ((TotalPages + 31) / 32) * sizeof(ULONG)); + if (EmsBitmapBuffer == NULL) { UmaDescRelease(EmsSegment); return FALSE; } - RtlInitializeBitMap(&AllocBitmap, BitmapBuffer, TotalPages); + RtlInitializeBitMap(&AllocBitmap, EmsBitmapBuffer, TotalPages); - PageTable = (PEMS_PAGE)RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - TotalPages * sizeof(EMS_PAGE)); - if (PageTable == NULL) + EmsPageTable = (PEMS_PAGE)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + TotalPages * sizeof(EMS_PAGE)); + if (EmsPageTable == NULL) { - RtlFreeHeap(RtlGetProcessHeap(), 0, BitmapBuffer); - BitmapBuffer = NULL; + RtlFreeHeap(RtlGetProcessHeap(), 0, EmsBitmapBuffer); + EmsBitmapBuffer = NULL; UmaDescRelease(EmsSegment); return FALSE; @@ -800,10 +800,10 @@ BOOLEAN EmsDrvInitialize(USHORT Segment, ULONG TotalPages) EmsMemory = (PVOID)RtlAllocateHeap(RtlGetProcessHeap(), 0, TotalPages * EMS_PAGE_SIZE); if (EmsMemory == NULL) { - RtlFreeHeap(RtlGetProcessHeap(), 0, PageTable); - PageTable = NULL; - RtlFreeHeap(RtlGetProcessHeap(), 0, BitmapBuffer); - BitmapBuffer = NULL; + RtlFreeHeap(RtlGetProcessHeap(), 0, EmsPageTable); + EmsPageTable = NULL; + RtlFreeHeap(RtlGetProcessHeap(), 0, EmsBitmapBuffer); + EmsBitmapBuffer = NULL; UmaDescRelease(EmsSegment); return FALSE; @@ -821,10 +821,10 @@ BOOLEAN EmsDrvInitialize(USHORT Segment, ULONG TotalPages) RtlFreeHeap(RtlGetProcessHeap(), 0, EmsMemory); EmsMemory = NULL; - RtlFreeHeap(RtlGetProcessHeap(), 0, PageTable); - PageTable = NULL; - RtlFreeHeap(RtlGetProcessHeap(), 0, BitmapBuffer); - BitmapBuffer = NULL; + RtlFreeHeap(RtlGetProcessHeap(), 0, EmsPageTable); + EmsPageTable = NULL; + RtlFreeHeap(RtlGetProcessHeap(), 0, EmsBitmapBuffer); + EmsBitmapBuffer = NULL; UmaDescRelease(EmsSegment); return FALSE; @@ -861,16 +861,16 @@ VOID EmsDrvCleanup(VOID) EmsMemory = NULL; } - if (PageTable) + if (EmsPageTable) { - RtlFreeHeap(RtlGetProcessHeap(), 0, PageTable); - PageTable = NULL; + RtlFreeHeap(RtlGetProcessHeap(), 0, EmsPageTable); + EmsPageTable = NULL; } - if (BitmapBuffer) + if (EmsBitmapBuffer) { - RtlFreeHeap(RtlGetProcessHeap(), 0, BitmapBuffer); - BitmapBuffer = NULL; + RtlFreeHeap(RtlGetProcessHeap(), 0, EmsBitmapBuffer); + EmsBitmapBuffer = NULL; } UmaDescRelease(EmsSegment); diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c index 19216eda0c..09f6a29b11 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c @@ -169,7 +169,7 @@ Fail: /* PRIVATE FUNCTIONS **********************************************************/ -static inline PXMS_HANDLE GetHandleRecord(WORD Handle) +static inline PXMS_HANDLE GetXmsHandleRecord(WORD Handle) { PXMS_HANDLE Entry; if (Handle == 0 || Handle >= XMS_MAX_HANDLES) return NULL; @@ -178,7 +178,7 @@ static inline PXMS_HANDLE GetHandleRecord(WORD Handle) return Entry->Size ? Entry : NULL; } -static inline BOOLEAN ValidateHandle(PXMS_HANDLE HandleEntry) +static inline BOOLEAN ValidateXmsHandle(PXMS_HANDLE HandleEntry) { return (HandleEntry != NULL && HandleEntry->Handle != 0); } @@ -277,12 +277,12 @@ static UCHAR XmsAlloc(WORD Size, PWORD Handle) static UCHAR XmsRealloc(WORD Handle, WORD NewSize) { DWORD BlockNumber; - PXMS_HANDLE HandleEntry = GetHandleRecord(Handle); + PXMS_HANDLE HandleEntry = GetXmsHandleRecord(Handle); DWORD CurrentIndex = 0; ULONG RunStart; ULONG RunSize; - if (!ValidateHandle(HandleEntry)) + if (!ValidateXmsHandle(HandleEntry)) return XMS_STATUS_INVALID_HANDLE; if (HandleEntry->LockCount) @@ -360,9 +360,9 @@ static UCHAR XmsRealloc(WORD Handle, WORD NewSize) static UCHAR XmsFree(WORD Handle) { DWORD BlockNumber; - PXMS_HANDLE HandleEntry = GetHandleRecord(Handle); + PXMS_HANDLE HandleEntry = GetXmsHandleRecord(Handle); - if (!ValidateHandle(HandleEntry)) + if (!ValidateXmsHandle(HandleEntry)) return XMS_STATUS_INVALID_HANDLE; if (HandleEntry->LockCount) @@ -379,9 +379,9 @@ static UCHAR XmsFree(WORD Handle) static UCHAR XmsLock(WORD Handle, PDWORD Address) { - PXMS_HANDLE HandleEntry = GetHandleRecord(Handle); + PXMS_HANDLE HandleEntry = GetXmsHandleRecord(Handle); - if (!ValidateHandle(HandleEntry)) + if (!ValidateXmsHandle(HandleEntry)) return XMS_STATUS_INVALID_HANDLE; if (HandleEntry->LockCount == 0xFF) @@ -396,9 +396,9 @@ static UCHAR XmsLock(WORD Handle, PDWORD Address) static UCHAR XmsUnlock(WORD Handle) { - PXMS_HANDLE HandleEntry = GetHandleRecord(Handle); + PXMS_HANDLE HandleEntry = GetXmsHandleRecord(Handle); - if (!ValidateHandle(HandleEntry)) + if (!ValidateXmsHandle(HandleEntry)) return XMS_STATUS_INVALID_HANDLE; if (!HandleEntry->LockCount) @@ -596,8 +596,8 @@ static VOID WINAPI XmsBopProcedure(LPWORD Stack) if (CopyData->SourceHandle) { - HandleEntry = GetHandleRecord(CopyData->SourceHandle); - if (!ValidateHandle(HandleEntry)) + HandleEntry = GetXmsHandleRecord(CopyData->SourceHandle); + if (!ValidateXmsHandle(HandleEntry)) { setAX(0); setBL(XMS_STATUS_BAD_SRC_HANDLE); @@ -620,8 +620,8 @@ static VOID WINAPI XmsBopProcedure(LPWORD Stack) if (CopyData->DestHandle) { - HandleEntry = GetHandleRecord(CopyData->DestHandle); - if (!ValidateHandle(HandleEntry)) + HandleEntry = GetXmsHandleRecord(CopyData->DestHandle); + if (!ValidateXmsHandle(HandleEntry)) { setAX(0); setBL(XMS_STATUS_BAD_DEST_HANDLE); @@ -686,11 +686,11 @@ static VOID WINAPI XmsBopProcedure(LPWORD Stack) /* Get Handle Information */ case 0x0E: { - PXMS_HANDLE HandleEntry = GetHandleRecord(getDX()); + PXMS_HANDLE HandleEntry = GetXmsHandleRecord(getDX()); UINT i; UCHAR Handles = 0; - if (!ValidateHandle(HandleEntry)) + if (!ValidateXmsHandle(HandleEntry)) { setAX(0); setBL(XMS_STATUS_INVALID_HANDLE); diff --git a/subsystems/mvdm/ntvdm/hardware/keyboard.c b/subsystems/mvdm/ntvdm/hardware/keyboard.c index 6d18b9da89..e1c167e9b9 100644 --- a/subsystems/mvdm/ntvdm/hardware/keyboard.c +++ b/subsystems/mvdm/ntvdm/hardware/keyboard.c @@ -18,22 +18,22 @@ /* PRIVATE VARIABLES **********************************************************/ -static BOOLEAN Reporting = FALSE; +static BOOLEAN KeyboardReporting = FALSE; static BYTE KeyboardId = 0; // We only support basic old-type keyboard -static BYTE DataByteWait = 0; +static BYTE KbdDataByteWait = 0; -static BYTE PS2Port = 0; +static BYTE KbdPS2Port = 0; /* PRIVATE FUNCTIONS **********************************************************/ static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) { /* Check if we were waiting for a data byte */ - if (DataByteWait) + if (KbdDataByteWait) { - PS2QueuePush(PS2Port, KEYBOARD_ACK); + PS2QueuePush(KbdPS2Port, KEYBOARD_ACK); - switch (DataByteWait) + switch (KbdDataByteWait) { /* Set/Reset Mode Indicators */ case 0xED: @@ -52,7 +52,7 @@ static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) // the keyboard by sending keyboard commands and then // performing polling on the port until "valid" data // comes out. - DPRINT1("KeyboardCommand(0x%02X) NOT IMPLEMENTED\n", DataByteWait); + DPRINT1("KeyboardCommand(0x%02X) NOT IMPLEMENTED\n", KbdDataByteWait); break; } @@ -63,7 +63,7 @@ static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) } } - DataByteWait = 0; + KbdDataByteWait = 0; return; } @@ -76,39 +76,39 @@ static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) /* Set Typematic Rate/Delay */ case 0xF3: { - DataByteWait = Command; - PS2QueuePush(PS2Port, KEYBOARD_ACK); + KbdDataByteWait = Command; + PS2QueuePush(KbdPS2Port, KEYBOARD_ACK); break; } /* Echo test command */ case 0xEE: { - PS2QueuePush(PS2Port, 0xEE); + PS2QueuePush(KbdPS2Port, 0xEE); break; } /* Get Keyboard ID */ case 0xF2: { - PS2QueuePush(PS2Port, KEYBOARD_ACK); - PS2QueuePush(PS2Port, KeyboardId); + PS2QueuePush(KbdPS2Port, KEYBOARD_ACK); + PS2QueuePush(KbdPS2Port, KeyboardId); break; } /* Enable Reporting */ case 0xF4: { - Reporting = TRUE; - PS2QueuePush(PS2Port, KEYBOARD_ACK); + KeyboardReporting = TRUE; + PS2QueuePush(KbdPS2Port, KEYBOARD_ACK); break; } /* Disable Reporting */ case 0xF5: { - Reporting = FALSE; - PS2QueuePush(PS2Port, KEYBOARD_ACK); + KeyboardReporting = FALSE; + PS2QueuePush(KbdPS2Port, KEYBOARD_ACK); break; } @@ -116,7 +116,7 @@ static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) case 0xF6: { // So far, nothing to reset - PS2QueuePush(PS2Port, KEYBOARD_ACK); + PS2QueuePush(KbdPS2Port, KEYBOARD_ACK); break; } @@ -129,13 +129,13 @@ static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) * and acknowledged as discussed in: * http://stanislavs.org/helppc/keyboard_commands.html */ - PS2QueuePush(PS2Port, KEYBOARD_ACK); + PS2QueuePush(KbdPS2Port, KEYBOARD_ACK); } /* Resend */ case 0xFE: { - PS2QueuePush(PS2Port, KEYBOARD_ACK); + PS2QueuePush(KbdPS2Port, KEYBOARD_ACK); UNIMPLEMENTED; break; } @@ -144,20 +144,20 @@ static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) case 0xFF: { /* Send ACKnowledge */ - PS2QueuePush(PS2Port, KEYBOARD_ACK); + PS2QueuePush(KbdPS2Port, KEYBOARD_ACK); // So far, nothing to reset /* Send the Basic Assurance Test success code and the device ID */ - PS2QueuePush(PS2Port, KEYBOARD_BAT_SUCCESS); - PS2QueuePush(PS2Port, KeyboardId); + PS2QueuePush(KbdPS2Port, KEYBOARD_BAT_SUCCESS); + PS2QueuePush(KbdPS2Port, KeyboardId); break; } /* Unknown command */ default: { - PS2QueuePush(PS2Port, KEYBOARD_ERROR); + PS2QueuePush(KbdPS2Port, KEYBOARD_ERROR); } } } @@ -170,7 +170,7 @@ VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent) BYTE ScanCode = (BYTE)KeyEvent->wVirtualScanCode; /* Check if we're not reporting */ - if (!Reporting) return; + if (!KeyboardReporting) return; /* If this is a key release, set the highest bit in the scan code */ if (!KeyEvent->bKeyDown) ScanCode |= 0x80; @@ -178,8 +178,8 @@ VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent) /* Push the scan code into the PS/2 queue */ for (i = 0; i < KeyEvent->wRepeatCount; i++) { - if (KeyEvent->dwControlKeyState & ENHANCED_KEY) PS2QueuePush(PS2Port, 0xE0); - PS2QueuePush(PS2Port, ScanCode); + if (KeyEvent->dwControlKeyState & ENHANCED_KEY) PS2QueuePush(KbdPS2Port, 0xE0); + PS2QueuePush(KbdPS2Port, ScanCode); } DPRINT("Press 0x%X\n", ScanCode); @@ -188,7 +188,7 @@ VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent) BOOLEAN KeyboardInit(BYTE PS2Connector) { /* Finish to plug the keyboard to the specified PS/2 port */ - PS2Port = PS2Connector; - PS2SetDeviceCmdProc(PS2Port, NULL, KeyboardCommand); + KbdPS2Port = PS2Connector; + PS2SetDeviceCmdProc(KbdPS2Port, NULL, KeyboardCommand); return TRUE; } diff --git a/subsystems/mvdm/ntvdm/hardware/mouse.c b/subsystems/mvdm/ntvdm/hardware/mouse.c index 493b2bbe93..4b48c0dc54 100644 --- a/subsystems/mvdm/ntvdm/hardware/mouse.c +++ b/subsystems/mvdm/ntvdm/hardware/mouse.c @@ -34,19 +34,19 @@ static MOUSE_MODE Mode, PreviousMode; static COORD Position; static BYTE Resolution; /* Completely ignored */ static BOOLEAN Scaling; /* Completely ignored */ -static BOOLEAN Reporting = FALSE; +static BOOLEAN MouseReporting = FALSE; static BYTE MouseId; static ULONG ButtonState; static SHORT HorzCounter; static SHORT VertCounter; static CHAR ScrollCounter; static BOOLEAN EventsOccurred = FALSE; -static BYTE DataByteWait = 0; +static BYTE MouseDataByteWait = 0; static BYTE ScrollMagicCounter = 0, ExtraButtonMagicCounter = 0; static UINT MouseCycles = 10; -static BYTE PS2Port = 1; +static BYTE MousePS2Port = 1; /* PUBLIC VARIABLES ***********************************************************/ @@ -58,7 +58,7 @@ static VOID MouseResetConfig(VOID) MouseCycles = 10; Resolution = 4; Scaling = FALSE; - Reporting = FALSE; + MouseReporting = FALSE; } static VOID MouseResetCounters(VOID) @@ -146,20 +146,20 @@ static VOID MouseGetPacket(PMOUSE_PACKET Packet) static VOID MouseDispatchPacket(PMOUSE_PACKET Packet) { - PS2QueuePush(PS2Port, Packet->Flags); - PS2QueuePush(PS2Port, Packet->HorzCounter); - PS2QueuePush(PS2Port, Packet->VertCounter); - if (MouseId >= 3) PS2QueuePush(PS2Port, Packet->Extra); + PS2QueuePush(MousePS2Port, Packet->Flags); + PS2QueuePush(MousePS2Port, Packet->HorzCounter); + PS2QueuePush(MousePS2Port, Packet->VertCounter); + if (MouseId >= 3) PS2QueuePush(MousePS2Port, Packet->Extra); } static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) { /* Check if we were waiting for a data byte */ - if (DataByteWait) + if (MouseDataByteWait) { - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); - switch (DataByteWait) + switch (MouseDataByteWait) { /* Set Resolution */ case 0xE8: @@ -210,7 +210,7 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) } } - DataByteWait = 0; + MouseDataByteWait = 0; return; } @@ -223,7 +223,7 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) */ if (Command != 0xEC && Command != 0xFF) { - PS2QueuePush(PS2Port, Command); + PS2QueuePush(MousePS2Port, Command); return; } } @@ -234,7 +234,7 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) case 0xE6: { Scaling = FALSE; - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); break; } @@ -242,7 +242,7 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) case 0xE7: { Scaling = TRUE; - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); break; } @@ -251,8 +251,8 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) /* Set Sample Rate */ case 0xF3: { - DataByteWait = Command; - PS2QueuePush(PS2Port, MOUSE_ACK); + MouseDataByteWait = Command; + PS2QueuePush(MousePS2Port, MOUSE_ACK); break; } @@ -262,13 +262,13 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) BYTE Status = ButtonState & 7; if (Scaling) Status |= 1 << 4; - if (Reporting) Status |= 1 << 5; + if (MouseReporting) Status |= 1 << 5; if (Mode == MOUSE_REMOTE_MODE) Status |= 1 << 6; - PS2QueuePush(PS2Port, MOUSE_ACK); - PS2QueuePush(PS2Port, Status); - PS2QueuePush(PS2Port, Resolution); - PS2QueuePush(PS2Port, (BYTE)(1000 / MouseCycles)); + PS2QueuePush(MousePS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, Status); + PS2QueuePush(MousePS2Port, Resolution); + PS2QueuePush(MousePS2Port, (BYTE)(1000 / MouseCycles)); break; } @@ -278,14 +278,14 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) MouseResetCounters(); Mode = MOUSE_STREAMING_MODE; - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); break; } /* Read Packet */ case 0xEB: { - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); MouseGetPacket(&LastPacket); MouseDispatchPacket(&LastPacket); break; @@ -299,11 +299,11 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) /* Restore the previous mode */ MouseResetCounters(); Mode = PreviousMode; - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); } else { - PS2QueuePush(PS2Port, MOUSE_ERROR); + PS2QueuePush(MousePS2Port, MOUSE_ERROR); } break; @@ -321,7 +321,7 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) MouseResetCounters(); Mode = MOUSE_WRAP_MODE; - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); break; } @@ -331,33 +331,33 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) MouseResetCounters(); Mode = MOUSE_REMOTE_MODE; - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); break; } /* Get Mouse ID */ case 0xF2: { - PS2QueuePush(PS2Port, MOUSE_ACK); - PS2QueuePush(PS2Port, MouseId); + PS2QueuePush(MousePS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MouseId); break; } /* Enable Reporting */ case 0xF4: { - Reporting = TRUE; + MouseReporting = TRUE; MouseResetCounters(); - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); break; } /* Disable Reporting */ case 0xF5: { - Reporting = FALSE; + MouseReporting = FALSE; MouseResetCounters(); - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); break; } @@ -367,14 +367,14 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) /* Reset the configuration and counters */ MouseResetConfig(); MouseResetCounters(); - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); break; } /* Resend */ case 0xFE: { - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); MouseDispatchPacket(&LastPacket); break; } @@ -383,20 +383,20 @@ static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) case 0xFF: { /* Send ACKnowledge */ - PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(MousePS2Port, MOUSE_ACK); MouseReset(); /* Send the Basic Assurance Test success code and the device ID */ - PS2QueuePush(PS2Port, MOUSE_BAT_SUCCESS); - PS2QueuePush(PS2Port, MouseId); + PS2QueuePush(MousePS2Port, MOUSE_BAT_SUCCESS); + PS2QueuePush(MousePS2Port, MouseId); break; } /* Unknown command */ default: { - PS2QueuePush(PS2Port, MOUSE_ERROR); + PS2QueuePush(MousePS2Port, MOUSE_ERROR); } } } @@ -406,7 +406,7 @@ static VOID FASTCALL MouseStreamingCallback(ULONGLONG ElapsedTime) UNREFERENCED_PARAMETER(ElapsedTime); /* Check if we're not in streaming mode, not reporting, or there's nothing to report */ - if (Mode != MOUSE_STREAMING_MODE || !Reporting || !EventsOccurred) return; + if (Mode != MOUSE_STREAMING_MODE || !MouseReporting || !EventsOccurred) return; MouseGetPacket(&LastPacket); MouseDispatchPacket(&LastPacket); @@ -464,8 +464,8 @@ VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent) BOOLEAN MouseInit(BYTE PS2Connector) { /* Finish to plug the mouse to the specified PS/2 port */ - PS2Port = PS2Connector; - PS2SetDeviceCmdProc(PS2Port, NULL, MouseCommand); + MousePS2Port = PS2Connector; + PS2SetDeviceCmdProc(MousePS2Port, NULL, MouseCommand); MouseMutex = CreateMutex(NULL, FALSE, NULL); if (MouseMutex == NULL) return FALSE;

7 years

[reactos] 01/01: [NTVDM] Missed this file.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d822478e0663535adba02… commit d822478e0663535adba02603039d84578d39e274 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 23 23:59:39 2017 +0100 [NTVDM] Missed this file. --- subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c index 45ca0bc776..adf335a9a5 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c @@ -22,32 +22,6 @@ #include "memory.h" #include "process.h" -/* PRIVATE FUNCTIONS **********************************************************/ - -/* Taken from base/shell/cmd/console.c */ -static BOOL IsConsoleHandle(HANDLE hHandle) -{ - DWORD dwMode; - - /* Check whether the handle may be that of a console... */ - if ((GetFileType(hHandle) & FILE_TYPE_CHAR) == 0) return FALSE; - - /* - * It may be. Perform another test... The idea comes from the - * MSDN description of the WriteConsole API: - * - * "WriteConsole fails if it is used with a standard handle - * that is redirected to a file. If an application processes - * multilingual output that can be redirected, determine whether - * the output handle is a console handle (one method is to call - * the GetConsoleMode function and check whether it succeeds). - * If the handle is a console handle, call WriteConsole. If the - * handle is not a console handle, the output is redirected and - * you should call WriteFile to perform the I/O." - */ - return GetConsoleMode(hHandle, &dwMode); -} - /* PUBLIC FUNCTIONS ***********************************************************/ VOID DosCopyHandleTable(LPBYTE DestinationTable)

7 years

[reactos] 01/01: [NTVDM] Deduplicate IsConsoleHandle() using the correct version pointed by Hermès. #179

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9716814879dc19643663f… commit 9716814879dc19643663f8951d8ad1d681fd1cae Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 23 23:56:04 2017 +0100 [NTVDM] Deduplicate IsConsoleHandle() using the correct version pointed by Hermès. #179 --- subsystems/mvdm/ntvdm/console/console.c | 24 ++++++++++++++++++++++++ subsystems/mvdm/ntvdm/console/video.c | 24 ------------------------ subsystems/mvdm/ntvdm/ntvdm.h | 1 + 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/subsystems/mvdm/ntvdm/console/console.c b/subsystems/mvdm/ntvdm/console/console.c index 72200a103a..db2a468273 100644 --- a/subsystems/mvdm/ntvdm/console/console.c +++ b/subsystems/mvdm/ntvdm/console/console.c @@ -500,6 +500,30 @@ ConsoleCleanup(VOID) if (ConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(ConsoleInput); } +BOOL IsConsoleHandle(HANDLE hHandle) +{ + DWORD dwMode; + + /* Check whether the handle may be that of a console... */ + if ((GetFileType(hHandle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR) + return FALSE; + + /* + * It may be. Perform another test... The idea comes from the + * MSDN description of the WriteConsole API: + * + * "WriteConsole fails if it is used with a standard handle + * that is redirected to a file. If an application processes + * multilingual output that can be redirected, determine whether + * the output handle is a console handle (one method is to call + * the GetConsoleMode function and check whether it succeeds). + * If the handle is a console handle, call WriteConsole. If the + * handle is not a console handle, the output is redirected and + * you should call WriteFile to perform the I/O." + */ + return GetConsoleMode(hHandle, &dwMode); +} + VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent) { switch (MenuEvent->dwCommandId) diff --git a/subsystems/mvdm/ntvdm/console/video.c b/subsystems/mvdm/ntvdm/console/video.c index de2910c90d..d19841b7f2 100644 --- a/subsystems/mvdm/ntvdm/console/video.c +++ b/subsystems/mvdm/ntvdm/console/video.c @@ -436,30 +436,6 @@ static VOID DetachFromConsoleInternal(VOID) TextFramebuffer = NULL; } -static BOOL IsConsoleHandle(HANDLE hHandle) -{ - DWORD dwMode; - - /* Check whether the handle may be that of a console... */ - if ((GetFileType(hHandle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR) - return FALSE; - - /* - * It may be. Perform another test... The idea comes from the - * MSDN description of the WriteConsole API: - * - * "WriteConsole fails if it is used with a standard handle - * that is redirected to a file. If an application processes - * multilingual output that can be redirected, determine whether - * the output handle is a console handle (one method is to call - * the GetConsoleMode function and check whether it succeeds). - * If the handle is a console handle, call WriteConsole. If the - * handle is not a console handle, the output is redirected and - * you should call WriteFile to perform the I/O." - */ - return GetConsoleMode(hHandle, &dwMode); -} - static VOID SetActiveScreenBuffer(HANDLE ScreenBuffer) { ASSERT(ScreenBuffer); diff --git a/subsystems/mvdm/ntvdm/ntvdm.h b/subsystems/mvdm/ntvdm/ntvdm.h index 616cc70aac..60a763fd15 100644 --- a/subsystems/mvdm/ntvdm/ntvdm.h +++ b/subsystems/mvdm/ntvdm/ntvdm.h @@ -103,6 +103,7 @@ UpdateVdmMenuDisks(VOID); BOOL ConsoleAttach(VOID); VOID ConsoleDetach(VOID); VOID ConsoleReattach(HANDLE ConOutHandle); +BOOL IsConsoleHandle(HANDLE hHandle); VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent); VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent);

7 years

[reactos] 01/01: [USER32] Add wine/debug.h to the PCH and remove an unneeded wine/unicode.h inclusion.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d93998d6ec0fa6ca13bf… commit 3d93998d6ec0fa6ca13bfafa32afd30147354ce9 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 23 23:42:40 2017 +0100 [USER32] Add wine/debug.h to the PCH and remove an unneeded wine/unicode.h inclusion. --- win32ss/user/user32/controls/appswitch.c | 2 -- win32ss/user/user32/controls/button.c | 2 +- win32ss/user/user32/controls/combo.c | 1 - win32ss/user/user32/controls/edit.c | 2 -- win32ss/user/user32/controls/listbox.c | 2 -- win32ss/user/user32/controls/scrollbar.c | 5 ----- win32ss/user/user32/controls/static.c | 2 -- win32ss/user/user32/include/user32.h | 1 + win32ss/user/user32/misc/dde.c | 2 -- win32ss/user/user32/misc/ddeclient.c | 2 -- win32ss/user/user32/misc/ddemisc.c | 3 +-- win32ss/user/user32/misc/ddeserver.c | 2 -- win32ss/user/user32/misc/desktop.c | 1 - win32ss/user/user32/misc/display.c | 5 ----- win32ss/user/user32/misc/dllmain.c | 1 - win32ss/user/user32/misc/exticon.c | 2 -- win32ss/user/user32/misc/imm.c | 2 -- win32ss/user/user32/misc/logon.c | 6 ------ win32ss/user/user32/misc/object.c | 5 ----- win32ss/user/user32/misc/resources.c | 1 - win32ss/user/user32/misc/stubs.c | 2 -- win32ss/user/user32/misc/timer.c | 6 ------ win32ss/user/user32/misc/usrapihk.c | 3 +-- win32ss/user/user32/misc/winhelp.c | 4 ---- win32ss/user/user32/misc/winsta.c | 2 -- win32ss/user/user32/windows/accel.c | 4 ---- win32ss/user/user32/windows/class.c | 1 - win32ss/user/user32/windows/clipboard.c | 5 ----- win32ss/user/user32/windows/cursoricon.c | 2 -- win32ss/user/user32/windows/dc.c | 7 ------- win32ss/user/user32/windows/defwnd.c | 1 - win32ss/user/user32/windows/dialog.c | 3 --- win32ss/user/user32/windows/draw.c | 4 ---- win32ss/user/user32/windows/hook.c | 4 ---- win32ss/user/user32/windows/input.c | 10 ---------- win32ss/user/user32/windows/mdi.c | 2 -- win32ss/user/user32/windows/menu.c | 3 --- win32ss/user/user32/windows/message.c | 2 -- win32ss/user/user32/windows/messagebox.c | 4 ---- win32ss/user/user32/windows/nonclient.c | 3 --- win32ss/user/user32/windows/rect.c | 6 ------ win32ss/user/user32/windows/spy.c | 3 +-- win32ss/user/user32/windows/text.c | 6 ------ win32ss/user/user32/windows/window.c | 2 -- win32ss/user/user32/windows/winpos.c | 3 --- 45 files changed, 5 insertions(+), 136 deletions(-) diff --git a/win32ss/user/user32/controls/appswitch.c b/win32ss/user/user32/controls/appswitch.c index cd13841107..c776008ad0 100644 --- a/win32ss/user/user32/controls/appswitch.c +++ b/win32ss/user/user32/controls/appswitch.c @@ -15,10 +15,8 @@ // // - #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); #define DIALOG_MARGIN 8 // margin of dialog contents diff --git a/win32ss/user/user32/controls/button.c b/win32ss/user/user32/controls/button.c index 1dc8af3b59..c6f01c8f2c 100644 --- a/win32ss/user/user32/controls/button.c +++ b/win32ss/user/user32/controls/button.c @@ -62,9 +62,9 @@ * - Button_SetImageList * - Button_SetTextMargin */ + #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(button); /* GetWindowLong offsets for window extra information */ diff --git a/win32ss/user/user32/controls/combo.c b/win32ss/user/user32/controls/combo.c index 8ec5bd9994..eb9d6fd86d 100644 --- a/win32ss/user/user32/controls/combo.c +++ b/win32ss/user/user32/controls/combo.c @@ -34,7 +34,6 @@ #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(combo); /* diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index 2eadddb00a..f1db16f8e0 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -46,8 +46,6 @@ #define WIN32_LEAN_AND_MEAN #include <usp10.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(edit); WINE_DECLARE_DEBUG_CHANNEL(combo); WINE_DECLARE_DEBUG_CHANNEL(relay); diff --git a/win32ss/user/user32/controls/listbox.c b/win32ss/user/user32/controls/listbox.c index f440a6d4aa..d149688d71 100644 --- a/win32ss/user/user32/controls/listbox.c +++ b/win32ss/user/user32/controls/listbox.c @@ -32,8 +32,6 @@ #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(listbox); /* Items array granularity */ diff --git a/win32ss/user/user32/controls/scrollbar.c b/win32ss/user/user32/controls/scrollbar.c index 496985a03a..dac106bb70 100644 --- a/win32ss/user/user32/controls/scrollbar.c +++ b/win32ss/user/user32/controls/scrollbar.c @@ -26,15 +26,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* INCLUDES *******************************************************************/ - #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(scrollbar); -/* GLOBAL VARIABLES ***********************************************************/ - /* Definitions for scrollbar hit testing [See SCROLLBARINFO in MSDN] */ #define SCROLL_NOWHERE 0x00 /* Outside the scroll bar */ #define SCROLL_TOP_ARROW 0x01 /* Top or left arrow */ diff --git a/win32ss/user/user32/controls/static.c b/win32ss/user/user32/controls/static.c index b5bca091a5..76d22d9ba1 100644 --- a/win32ss/user/user32/controls/static.c +++ b/win32ss/user/user32/controls/static.c @@ -44,8 +44,6 @@ #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(static); static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ); diff --git a/win32ss/user/user32/include/user32.h b/win32ss/user/user32/include/user32.h index 46923824b5..4993f4694a 100644 --- a/win32ss/user/user32/include/user32.h +++ b/win32ss/user/user32/include/user32.h @@ -54,6 +54,7 @@ /* WINE Headers */ #include <wine/unicode.h> +#include <wine/debug.h> /* Internal User32 Headers */ #include "user32p.h" diff --git a/win32ss/user/user32/misc/dde.c b/win32ss/user/user32/misc/dde.c index 2d959a0974..5500c498a2 100644 --- a/win32ss/user/user32/misc/dde.c +++ b/win32ss/user/user32/misc/dde.c @@ -7,11 +7,9 @@ */ #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ddeml); - BOOL FASTCALL DdeAddPair(HGLOBAL ClientMem, HGLOBAL ServerMem); HGLOBAL FASTCALL DdeGetPair(HGLOBAL ServerMem); diff --git a/win32ss/user/user32/misc/ddeclient.c b/win32ss/user/user32/misc/ddeclient.c index 6f5a5e9c0c..f0959f48d2 100644 --- a/win32ss/user/user32/misc/ddeclient.c +++ b/win32ss/user/user32/misc/ddeclient.c @@ -25,8 +25,6 @@ #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(ddeml); static LRESULT CALLBACK WDML_ClientProc(HWND, UINT, WPARAM, LPARAM); /* only for one client, not conv list */ diff --git a/win32ss/user/user32/misc/ddemisc.c b/win32ss/user/user32/misc/ddemisc.c index 498bdb2885..d94617be1f 100644 --- a/win32ss/user/user32/misc/ddemisc.c +++ b/win32ss/user/user32/misc/ddemisc.c @@ -24,9 +24,8 @@ */ #include <user32.h> + #include "dde_private.h" -#include "wine/unicode.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ddeml); diff --git a/win32ss/user/user32/misc/ddeserver.c b/win32ss/user/user32/misc/ddeserver.c index b6bde97a13..289f87dfbd 100644 --- a/win32ss/user/user32/misc/ddeserver.c +++ b/win32ss/user/user32/misc/ddeserver.c @@ -25,8 +25,6 @@ #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(ddeml); static const WCHAR szServerNameClass[] = L"DDEMLMom"; diff --git a/win32ss/user/user32/misc/desktop.c b/win32ss/user/user32/misc/desktop.c index 49f23c248c..2f78f7b189 100644 --- a/win32ss/user/user32/misc/desktop.c +++ b/win32ss/user/user32/misc/desktop.c @@ -10,7 +10,6 @@ #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); /********************************************************************* diff --git a/win32ss/user/user32/misc/display.c b/win32ss/user/user32/misc/display.c index 7548c8cc59..b3047feeee 100644 --- a/win32ss/user/user32/misc/display.c +++ b/win32ss/user/user32/misc/display.c @@ -5,11 +5,8 @@ * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); #define SIZEOF_DEVMODEA_300 124 @@ -19,8 +16,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); #define SIZEOF_DEVMODEW_400 212 #define SIZEOF_DEVMODEW_500 220 -/* FUNCTIONS *****************************************************************/ - /* * @implemented */ diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c index 0316de135d..5bf68551f7 100644 --- a/win32ss/user/user32/misc/dllmain.c +++ b/win32ss/user/user32/misc/dllmain.c @@ -2,7 +2,6 @@ #include <ndk/cmfuncs.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); #define KEY_LENGTH 1024 diff --git a/win32ss/user/user32/misc/exticon.c b/win32ss/user/user32/misc/exticon.c index 5ae3ea765d..8b65d83430 100644 --- a/win32ss/user/user32/misc/exticon.c +++ b/win32ss/user/user32/misc/exticon.c @@ -24,8 +24,6 @@ #include <user32.h> -#include <wine/debug.h> - /* Start of Hack section */ WINE_DEFAULT_DEBUG_CHANNEL(icon); diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 9c26bcf199..b06bb5da1d 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -11,8 +11,6 @@ #include <user32.h> #include <winnls32.h> - -#include <wine/debug.h> #include <strsafe.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); diff --git a/win32ss/user/user32/misc/logon.c b/win32ss/user/user32/misc/logon.c index 3df5a953f0..bc735aa7ab 100644 --- a/win32ss/user/user32/misc/logon.c +++ b/win32ss/user/user32/misc/logon.c @@ -6,16 +6,10 @@ * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(user32); -/* FUNCTIONS *****************************************************************/ - /* * @implemented */ diff --git a/win32ss/user/user32/misc/object.c b/win32ss/user/user32/misc/object.c index e14eb0402d..812d0d61ee 100644 --- a/win32ss/user/user32/misc/object.c +++ b/win32ss/user/user32/misc/object.c @@ -25,15 +25,10 @@ * 09-05-2001 CSH Created */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); -/* FUNCTIONS *****************************************************************/ - /* * @implemented */ diff --git a/win32ss/user/user32/misc/resources.c b/win32ss/user/user32/misc/resources.c index 9148f2f9b2..3145e718d5 100644 --- a/win32ss/user/user32/misc/resources.c +++ b/win32ss/user/user32/misc/resources.c @@ -1,6 +1,5 @@ #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(resource); #ifndef _CFGMGR32_H_ diff --git a/win32ss/user/user32/misc/stubs.c b/win32ss/user/user32/misc/stubs.c index aa7e75e760..b73397d44b 100644 --- a/win32ss/user/user32/misc/stubs.c +++ b/win32ss/user/user32/misc/stubs.c @@ -11,8 +11,6 @@ #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(user32); /* diff --git a/win32ss/user/user32/misc/timer.c b/win32ss/user/user32/misc/timer.c index ce653a42b2..3988822fe5 100644 --- a/win32ss/user/user32/misc/timer.c +++ b/win32ss/user/user32/misc/timer.c @@ -25,14 +25,8 @@ * 09-05-2001 CSH Created */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> -/* FUNCTIONS *****************************************************************/ - - /* * @implemented */ diff --git a/win32ss/user/user32/misc/usrapihk.c b/win32ss/user/user32/misc/usrapihk.c index 30cefd81f7..7e856d4324 100644 --- a/win32ss/user/user32/misc/usrapihk.c +++ b/win32ss/user/user32/misc/usrapihk.c @@ -11,9 +11,8 @@ * http://www.reactos.org/wiki/RegisterUserApiHook * */ -#include <user32.h> -#include <wine/debug.h> +#include <user32.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); diff --git a/win32ss/user/user32/misc/winhelp.c b/win32ss/user/user32/misc/winhelp.c index 8bb6be9d7e..1e25c11d93 100644 --- a/win32ss/user/user32/misc/winhelp.c +++ b/win32ss/user/user32/misc/winhelp.c @@ -25,12 +25,8 @@ * 23-08-2002 RDD Created from wine sources */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> - /* WinHelp internal structure */ typedef struct { diff --git a/win32ss/user/user32/misc/winsta.c b/win32ss/user/user32/misc/winsta.c index a5ecc5cd62..b3b888747f 100644 --- a/win32ss/user/user32/misc/winsta.c +++ b/win32ss/user/user32/misc/winsta.c @@ -10,10 +10,8 @@ #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winsta); - /* * @implemented */ diff --git a/win32ss/user/user32/windows/accel.c b/win32ss/user/user32/windows/accel.c index d25b01fd83..08995b4c3c 100644 --- a/win32ss/user/user32/windows/accel.c +++ b/win32ss/user/user32/windows/accel.c @@ -26,12 +26,8 @@ * 08/07/2003 KJK Fully implemented */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> - /* this is the 8 byte accel struct used in Win32 resources (internal only) */ typedef struct { diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index caa5931d57..c0ad6a65d3 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -10,7 +10,6 @@ #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); #define USE_VERSIONED_CLASSES diff --git a/win32ss/user/user32/windows/clipboard.c b/win32ss/user/user32/windows/clipboard.c index 955b2c1280..66a4217301 100644 --- a/win32ss/user/user32/windows/clipboard.c +++ b/win32ss/user/user32/windows/clipboard.c @@ -9,17 +9,12 @@ * */ -/* INCLUDES ******************************************************************/ - #include <user32.h> #define NDEBUG -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); -/* FUNCTIONS *****************************************************************/ - /* * @implemented */ diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index 97ce68bf39..ee286580bd 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -8,8 +8,6 @@ #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(cursor); WINE_DECLARE_DEBUG_CHANNEL(icon); //WINE_DECLARE_DEBUG_CHANNEL(resource); diff --git a/win32ss/user/user32/windows/dc.c b/win32ss/user/user32/windows/dc.c index 658c2df03f..6841c37564 100644 --- a/win32ss/user/user32/windows/dc.c +++ b/win32ss/user/user32/windows/dc.c @@ -25,15 +25,8 @@ * 09-05-2001 CSH Created */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> - -/* FUNCTIONS *****************************************************************/ - - BOOL WINAPI GdiReleaseDC(HDC hdc); diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c index 9239775029..7098c34446 100644 --- a/win32ss/user/user32/windows/defwnd.c +++ b/win32ss/user/user32/windows/defwnd.c @@ -11,7 +11,6 @@ #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); /* diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index aa3940199c..7042f45324 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -28,11 +28,8 @@ * 09-05-2001 CSH Created */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); /* MACROS/DEFINITIONS ********************************************************/ diff --git a/win32ss/user/user32/windows/draw.c b/win32ss/user/user32/windows/draw.c index 3cb9f10077..dd1d6dd752 100644 --- a/win32ss/user/user32/windows/draw.c +++ b/win32ss/user/user32/windows/draw.c @@ -28,12 +28,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* INCLUDES *******************************************************************/ - #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(user32); /* GLOBALS *******************************************************************/ diff --git a/win32ss/user/user32/windows/hook.c b/win32ss/user/user32/windows/hook.c index 827638936b..e0cb8e4a04 100644 --- a/win32ss/user/user32/windows/hook.c +++ b/win32ss/user/user32/windows/hook.c @@ -26,12 +26,8 @@ * 09-05-2001 CSH Created */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(user32); typedef struct _NOTIFYEVENT diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 5372e0ce7d..aa398d7dcc 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -25,22 +25,12 @@ * 09-05-2001 CSH Created */ -/* INCLUDES ******************************************************************/ - #include <user32.h> #include <strsafe.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); -/* GLOBALS *******************************************************************/ - - - -/* FUNCTIONS *****************************************************************/ - - /* * @implemented */ diff --git a/win32ss/user/user32/windows/mdi.c b/win32ss/user/user32/windows/mdi.c index b1039081aa..9f25daf86e 100644 --- a/win32ss/user/user32/windows/mdi.c +++ b/win32ss/user/user32/windows/mdi.c @@ -82,8 +82,6 @@ #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(mdi); #define MDI_MAXTITLELENGTH 0xa1 diff --git a/win32ss/user/user32/windows/menu.c b/win32ss/user/user32/windows/menu.c index d95c30008a..231c2f78ae 100644 --- a/win32ss/user/user32/windows/menu.c +++ b/win32ss/user/user32/windows/menu.c @@ -8,10 +8,7 @@ * James Tabor */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> BOOL WINAPI GdiValidateHandle(HGDIOBJ hobj); diff --git a/win32ss/user/user32/windows/message.c b/win32ss/user/user32/windows/message.c index f9ef59fc83..44345e7c54 100644 --- a/win32ss/user/user32/windows/message.c +++ b/win32ss/user/user32/windows/message.c @@ -10,10 +10,8 @@ #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); - #ifdef __i386__ /* For bad applications which provide bad (non stdcall) WndProc */ extern diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index 7d136c2967..2ceb24fe15 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -29,12 +29,8 @@ * 09-05-2001 CSH Created */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(user32); /* DEFINES *******************************************************************/ diff --git a/win32ss/user/user32/windows/nonclient.c b/win32ss/user/user32/windows/nonclient.c index 80d1128b6a..ba2440aacc 100644 --- a/win32ss/user/user32/windows/nonclient.c +++ b/win32ss/user/user32/windows/nonclient.c @@ -19,11 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* INCLUDES *******************************************************************/ - #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); #define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ diff --git a/win32ss/user/user32/windows/rect.c b/win32ss/user/user32/windows/rect.c index 51226e42ca..8b7826d713 100644 --- a/win32ss/user/user32/windows/rect.c +++ b/win32ss/user/user32/windows/rect.c @@ -25,14 +25,8 @@ * 09-05-2001 CSH Created */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> - -/* FUNCTIONS *****************************************************************/ - /* * @implemented */ diff --git a/win32ss/user/user32/windows/spy.c b/win32ss/user/user32/windows/spy.c index cbefeceb33..e17a521222 100644 --- a/win32ss/user/user32/windows/spy.c +++ b/win32ss/user/user32/windows/spy.c @@ -20,13 +20,12 @@ */ #include <user32.h> + #include <wine/commctrl.h> #include <commdlg.h> #include <richedit.h> #include <prsht.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(message); #define SPY_MAX_MSGNUM WM_USER diff --git a/win32ss/user/user32/windows/text.c b/win32ss/user/user32/windows/text.c index ab9f575a6f..a27d68d7ea 100644 --- a/win32ss/user/user32/windows/text.c +++ b/win32ss/user/user32/windows/text.c @@ -25,14 +25,8 @@ * 09-05-2001 CSH Created */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> - -/* FUNCTIONS *****************************************************************/ - static WORD GetC1Type(WCHAR Ch) { diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 75dc96e616..fd006481d1 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -8,11 +8,9 @@ * 06-06-2001 CSH Created */ -/* INCLUDES ******************************************************************/ #define DEBUG #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id ); diff --git a/win32ss/user/user32/windows/winpos.c b/win32ss/user/user32/windows/winpos.c index 5cf21b6455..156b46a28e 100644 --- a/win32ss/user/user32/windows/winpos.c +++ b/win32ss/user/user32/windows/winpos.c @@ -8,11 +8,8 @@ * 06-06-2001 CSH Created */ -/* INCLUDES ******************************************************************/ - #include <user32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); void mirror_rect( const RECT *window_rect, RECT *rect )

7 years

[reactos] 01/01: [REGEDIT] Rename NUM_ICONS and _CmdWndProc(). #179

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17b691f5a92dc37dd22ea… commit 17b691f5a92dc37dd22ea0f62d58e06ff15cdc9c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 23 14:15:02 2017 +0100 [REGEDIT] Rename NUM_ICONS and _CmdWndProc(). #179 --- base/applications/regedit/childwnd.c | 6 +++--- base/applications/regedit/listview.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index 0036536b91..d3a6cd0c5b 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -118,13 +118,13 @@ static void finish_splitbar(HWND hWnd, int x) /******************************************************************************* * - * FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG) + * FUNCTION: ChildWnd_CmdWndProc(HWND, unsigned, WORD, LONG) * * PURPOSE: Processes WM_COMMAND messages for the main frame window. * */ -static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +static BOOL ChildWnd_CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { HTREEITEM hSelection; HKEY hRootKey; @@ -426,7 +426,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa PostMessageW(g_pChildWnd->hAddressBarWnd, WM_KEYUP, VK_RETURN, 0); } - if (!_CmdWndProc(hWnd, message, wParam, lParam)) + if (!ChildWnd_CmdWndProc(hWnd, message, wParam, lParam)) { goto def; } diff --git a/base/applications/regedit/listview.c b/base/applications/regedit/listview.c index 687fb2234b..9d89173e62 100644 --- a/base/applications/regedit/listview.c +++ b/base/applications/regedit/listview.c @@ -20,9 +20,9 @@ #include "regedit.h" -#define CX_ICON 16 -#define CY_ICON 16 -#define NUM_ICONS 2 +#define CX_ICON 16 +#define CY_ICON 16 +#define LISTVIEW_NUM_ICONS 2 int Image_String = 0; int Image_Bin = 0; @@ -284,7 +284,7 @@ static BOOL InitListViewImageLists(HWND hwndLV) /* Create the image list. */ if ((himl = ImageList_Create(CX_ICON, CY_ICON, - ILC_MASK, 0, NUM_ICONS)) == NULL) + ILC_MASK, 0, LISTVIEW_NUM_ICONS)) == NULL) { return FALSE; } @@ -296,7 +296,7 @@ static BOOL InitListViewImageLists(HWND hwndLV) Image_String = ImageList_AddIcon(himl, hico); /* Fail if not all of the images were added. */ - if (ImageList_GetImageCount(himl) < NUM_ICONS) + if (ImageList_GetImageCount(himl) < LISTVIEW_NUM_ICONS) { return FALSE; }

7 years

[reactos] 01/01: [INTL] Rename some variables and functions. #179

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc93f23830e1444057e8a… commit fc93f23830e1444057e8a18fc0fba10582126b71 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 23 14:07:33 2017 +0100 [INTL] Rename some variables and functions. #179 --- dll/cpl/intl/generalp.c | 12 ++++++------ dll/cpl/intl/intl.c | 8 ++++---- dll/cpl/intl/time.c | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dll/cpl/intl/generalp.c b/dll/cpl/intl/generalp.c index dc3ef3da9d..bee911bc8b 100644 --- a/dll/cpl/intl/generalp.c +++ b/dll/cpl/intl/generalp.c @@ -38,7 +38,7 @@ HWND hList; HWND hLocaleList, hGeoList; -BOOL bSpain = FALSE; +BOOL isSpain = FALSE; GROUPINGDATA GroupingFormats[MAX_GROUPINGFORMATS] = @@ -49,7 +49,7 @@ GroupingFormats[MAX_GROUPINGFORMATS] = }; static BOOL CALLBACK -LocalesEnumProc(LPTSTR lpLocale) +GeneralPropertyPageLocalesEnumProc(LPTSTR lpLocale) { LCID lcid; WCHAR lang[255]; @@ -65,10 +65,10 @@ LocalesEnumProc(LPTSTR lpLocale) if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) || lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT)) { - if (bSpain == FALSE) + if (isSpain == FALSE) { LoadStringW(hApplet, IDS_SPAIN, lang, 255); - bSpain = TRUE; + isSpain = TRUE; } else { @@ -169,8 +169,8 @@ CreateLanguagesList(HWND hwnd) WCHAR langSel[255]; hList = hwnd; - bSpain = FALSE; - EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED); + isSpain = FALSE; + EnumSystemLocalesW(GeneralPropertyPageLocalesEnumProc, LCID_SUPPORTED); /* Select current locale */ /* or should it be System and not user? */ diff --git a/dll/cpl/intl/intl.c b/dll/cpl/intl/intl.c index 6bf35edb8d..440e34469a 100644 --- a/dll/cpl/intl/intl.c +++ b/dll/cpl/intl/intl.c @@ -77,7 +77,7 @@ ResourceMessageBox( } static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam) +InitIntlPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -183,14 +183,14 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData); + InitIntlPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData); psh.nPages++; - InitPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData); + InitIntlPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData); psh.nPages++; if (pGlobalData->bIsUserAdmin) { - InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData); + InitIntlPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData); psh.nPages++; } diff --git a/dll/cpl/intl/time.c b/dll/cpl/intl/time.c index 9920f1881d..2ad1307e8e 100644 --- a/dll/cpl/intl/time.c +++ b/dll/cpl/intl/time.c @@ -26,12 +26,12 @@ #include "intl.h" -static HWND hwndEnum = NULL; +static HWND hwndTimeEnum = NULL; static BOOL CALLBACK TimeFormatEnumProc(PWSTR lpTimeFormatString) { - SendMessageW(hwndEnum, + SendMessageW(hwndTimeEnum, CB_ADDSTRING, 0, (LPARAM)lpTimeFormatString); @@ -62,7 +62,7 @@ InitTimeFormatCB( CB_LIMITTEXT, MAX_TIMEFORMAT, 0); /* Add available time formats to the list */ - hwndEnum = GetDlgItem(hwndDlg, IDC_TIMEFORMAT); + hwndTimeEnum = GetDlgItem(hwndDlg, IDC_TIMEFORMAT); EnumTimeFormatsW(TimeFormatEnumProc, pGlobalData->UserLCID, 0); SendDlgItemMessageW(hwndDlg, IDC_TIMEFORMAT,

7 years

[reactos] 01/01: [SYSDM] Rename some functions. #179

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eff73544ec3a67b90b683… commit eff73544ec3a67b90b683a7bfe35d58db965a7a9 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 23 14:05:07 2017 +0100 [SYSDM] Rename some functions. #179 --- dll/cpl/sysdm/environment.c | 10 +++++----- dll/cpl/sysdm/hardprof.c | 6 +++--- dll/cpl/sysdm/userprofile.c | 4 ++-- dll/cpl/sysdm/virtmem.c | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dll/cpl/sysdm/environment.c b/dll/cpl/sysdm/environment.c index 9d80c8f26b..e6d9fe39ae 100644 --- a/dll/cpl/sysdm/environment.c +++ b/dll/cpl/sysdm/environment.c @@ -270,7 +270,7 @@ GetEnvironmentVariables(HWND hwndListView, static VOID -SetListViewColumns(HWND hwndListView) +SetEnvironmentDialogListViewColumns(HWND hwndListView) { RECT rect; LV_COLUMN column; @@ -296,7 +296,7 @@ SetListViewColumns(HWND hwndListView) static VOID -OnInitDialog(HWND hwndDlg) +OnInitEnvironmentDialog(HWND hwndDlg) { HWND hwndListView; @@ -305,7 +305,7 @@ OnInitDialog(HWND hwndDlg) (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); - SetListViewColumns(hwndListView); + SetEnvironmentDialogListViewColumns(hwndListView); GetEnvironmentVariables(hwndListView, HKEY_CURRENT_USER, @@ -324,7 +324,7 @@ OnInitDialog(HWND hwndDlg) (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); - SetListViewColumns(hwndListView); + SetEnvironmentDialogListViewColumns(hwndListView); GetEnvironmentVariables(hwndListView, HKEY_LOCAL_MACHINE, @@ -690,7 +690,7 @@ EnvironmentDlgProc(HWND hwndDlg, switch (uMsg) { case WM_INITDIALOG: - OnInitDialog(hwndDlg); + OnInitEnvironmentDialog(hwndDlg); break; case WM_COMMAND: diff --git a/dll/cpl/sysdm/hardprof.c b/dll/cpl/sysdm/hardprof.c index 7d8c6335f1..328e320b2c 100644 --- a/dll/cpl/sysdm/hardprof.c +++ b/dll/cpl/sysdm/hardprof.c @@ -659,11 +659,11 @@ GetProfiles(HWND hwndDlg) static BOOL -OnInitDialog(HWND hwndDlg) +OnInitHardProfDialog(HWND hwndDlg) { DWORD dwWaitInterval; - DPRINT("OnInitDialog()\n"); + DPRINT("OnInitHardProfDialog()\n"); SendMessage(GetDlgItem(hwndDlg, IDC_HRDPROFUP), BM_SETIMAGE,(WPARAM)IMAGE_ICON, @@ -732,7 +732,7 @@ HardProfDlgProc(HWND hwndDlg, switch (uMsg) { case WM_INITDIALOG: - return OnInitDialog(hwndDlg); + return OnInitHardProfDialog(hwndDlg); case WM_DESTROY: if (pProfileData != NULL) diff --git a/dll/cpl/sysdm/userprofile.c b/dll/cpl/sysdm/userprofile.c index dce308f4e4..d0608389dd 100644 --- a/dll/cpl/sysdm/userprofile.c +++ b/dll/cpl/sysdm/userprofile.c @@ -111,7 +111,7 @@ AddUserProfiles(HWND hwndListView) static VOID -OnInitDialog(HWND hwndDlg) +OnInitUserProfileDialog(HWND hwndDlg) { /* Initialize the list view control */ SetListViewColumns(GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST)); @@ -137,7 +137,7 @@ UserProfileDlgProc(HWND hwndDlg, switch (uMsg) { case WM_INITDIALOG: - OnInitDialog(hwndDlg); + OnInitUserProfileDialog(hwndDlg); break; case WM_COMMAND: diff --git a/dll/cpl/sysdm/virtmem.c b/dll/cpl/sysdm/virtmem.c index 2e6117475d..e80b33ce98 100644 --- a/dll/cpl/sysdm/virtmem.c +++ b/dll/cpl/sysdm/virtmem.c @@ -597,7 +597,7 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem) static VOID -OnOk(PVIRTMEM pVirtMem) +OnVirtMemDialogOk(PVIRTMEM pVirtMem) { if (pVirtMem->bModified != FALSE) { @@ -613,7 +613,7 @@ OnOk(PVIRTMEM pVirtMem) static VOID -OnInitDialog(HWND hwnd, PVIRTMEM pVirtMem) +OnInitVirtMemDialog(HWND hwnd, PVIRTMEM pVirtMem) { INT i; @@ -684,7 +684,7 @@ VirtMemDlgProc(HWND hwndDlg, SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pVirtMem); - OnInitDialog(hwndDlg, pVirtMem); + OnInitVirtMemDialog(hwndDlg, pVirtMem); break; case WM_DESTROY: @@ -699,7 +699,7 @@ VirtMemDlgProc(HWND hwndDlg, return TRUE; case IDOK: - OnOk(pVirtMem); + OnVirtMemDialogOk(pVirtMem); EndDialog(hwndDlg, pVirtMem->bModified); return TRUE;

7 years

← Newer
1
...
7
8
9
10
11
12
13
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2017