[WIN32KNT_APITEST] 2 minor code improvements and a first fix (#5980)

- Update .rc filename; addendum to 7ad21a4 (r70458).
- Move one '#include "resource.h"' around to where it is needed.
  Addendum to e1b2e7a (r29284) then ec5e0ea (r48103).
- Adjust all '#include <win32nt.h>'
This commit is contained in:
Serge Gautherie 2023-11-16 21:57:10 +01:00 committed by GitHub
parent 1d8ce79080
commit a5c3bb5bce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 63 additions and 63 deletions

View file

@ -76,7 +76,7 @@ list(APPEND PCH_SKIP_SOURCE
add_executable(win32knt_apitest
${SOURCE}
${PCH_SKIP_SOURCE}
w32knapi.rc)
win32knt.rc)
target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools)
set_module_type(win32knt_apitest win32cui)

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiDdCreateDirectDrawObject)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiDdDeleteDirectDrawObject)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
#include <ddrawi.h>

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiArcInternal)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiBitBlt)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiCombineRgn)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
void Test_NtGdiCreateBitmap_Params(void)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiCreateCompatibleBitmap)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiCreateCompatibleDC)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
/*
HBITMAP

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiDeleteObjectApp)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
HPALETTE
CreateTestPalette()

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiEngCreatePalette)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiEnumFontOpen)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiExcludeClipRect)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiExtSelectClipRgn)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
/*
BOOL

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
NTSTATUS
(NTAPI

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiGetBitmapBits)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
/* taken from gdi32, bitmap.c */
UINT

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiGetFontResourceInfoInternalW)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiGetRandomRgn)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiGetStockObject)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiIntersectClipRect)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiOffsetClipRgn)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
static

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
static HBRUSH hbrush;
static HBITMAP hbitmap;

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiSaveDC)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
void
Test_SelectDIBSection(void)

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiSelectBrush)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiSelectFont)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiSelectPen)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiSetBitmapBits)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
void
ReadBits(HDC hDC, PDWORD OutBits)

View file

@ -5,7 +5,7 @@
* COPYRIGHT: Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtGdiTransformPoints)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
void
Test_HwndRoutine_DeregisterShellHookWindow(HWND hWnd)

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
void
Test_HwndOptRoutine_SetProgmanWindow(void) /* 0x4a */

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
void
Test_HwndParamRoutine_SetWindowContextHelpId(HWND hWnd)

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtUserCallHwndParamLock)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
void
Test_NoParamRoutine_CreateMenu(void) /* 0 */

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtUserCountClipboardFormats)

View file

@ -4,7 +4,7 @@
* PURPOSE: Test for NtUserCreateWindowEx
*/
#include <win32nt.h>
#include "../win32nt.h"
static
inline

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
ULONG gMonitorCount = 0;
HDC ghdcMonitor = 0;

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtUserFindExistingCursorIcon)
{

View file

@ -5,7 +5,7 @@
* COPYRIGHT: Copyright 2022 Thomas Faber (thomas.faber@reactos.org)
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtUserGetAsyncKeyState)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtUserGetClassInfo)
{

View file

@ -5,7 +5,8 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
#include "../resource.h"
START_TEST(NtUserGetIconInfo)
{

View file

@ -5,7 +5,7 @@
* COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
*/
#include <win32nt.h>
#include "../win32nt.h"
#include <pseh/pseh2.h>
typedef BOOL (APIENTRY *FN_NtUserGetKeyboardLayoutName)(PVOID);

View file

@ -5,7 +5,7 @@
* COPYRIGHT: Copyright 2021-2022 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
*/
#include <win32nt.h>
#include "../win32nt.h"
#include <pseh/pseh2.h>
#define MAX_COUNT 8

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtUserGetTitleBarInfo)
{

View file

@ -6,7 +6,7 @@
* Copyright 2021 Hermes Belusca-Maito
*/
#include <win32nt.h>
#include "../win32nt.h"
#define NTOS_MODE_USER
#include <ndk/exfuncs.h>

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtUserRedrawWindow)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtUserScrollDC)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
FORCEINLINE
PALETTEENTRY

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtUserSetTimer)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
#include <winreg.h>

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"
START_TEST(NtUserToUnicodeEx)
{

View file

@ -5,7 +5,7 @@
* PROGRAMMERS:
*/
#include <win32nt.h>
#include "../win32nt.h"

View file

@ -27,7 +27,6 @@
#include <ntgdihdl.h>
#include "../apitest.h"
#include "resource.h"
typedef struct
{