Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[sedwards] 17268: added shell32 tests. Not enabled just yet

by sedwards＠svn.reactos.com

added shell32 tests. Not enabled just yet Added: trunk/reactos/regtests/winetests/shell32/ Added: trunk/reactos/regtests/winetests/shell32/generated.c Added: trunk/reactos/regtests/winetests/shell32/shell32.xml Added: trunk/reactos/regtests/winetests/shell32/shell32_test.h Added: trunk/reactos/regtests/winetests/shell32/shelllink.c Added: trunk/reactos/regtests/winetests/shell32/shellpath.c Added: trunk/reactos/regtests/winetests/shell32/shlexec.c Added: trunk/reactos/regtests/winetests/shell32/shlfileop.c Added: trunk/reactos/regtests/winetests/shell32/shlfolder.c Added: trunk/reactos/regtests/winetests/shell32/string.c Added: trunk/reactos/regtests/winetests/shell32/testlist.c _____ Added: trunk/reactos/regtests/winetests/shell32/generated.c --- trunk/reactos/regtests/winetests/shell32/generated.c 2005-08-10 19:52:35 UTC (rev 17267) +++ trunk/reactos/regtests/winetests/shell32/generated.c 2005-08-10 20:35:15 UTC (rev 17268) @@ -0,0 +1,1414 @@ +/* File generated automatically from tools/winapi/test.dat; do not edit! */ +/* This file can be copied, modified and distributed without restriction. */ + +/* + * Unit tests for data structure packing + */ + +#define WINVER 0x0501 +#define _WIN32_IE 0x0501 +#define _WIN32_WINNT 0x0501 + +#define WINE_NOWINSOCK + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wtypes.h" +#include "shellapi.h" +#include "winuser.h" +#include "wingdi.h" +#include "shlobj.h" + +#include "wine/test.h" + +/********************************************************************** * + * Compability macros + */ + +#define DWORD_PTR UINT_PTR +#define LONG_PTR INT_PTR +#define ULONG_PTR UINT_PTR + +/********************************************************************** * + * Windows API extension + */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) +# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field) +#elif defined(__GNUC__) +# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field) +#else +/* FIXME: Not sure if is possible to do without compiler extension */ +#endif + +#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) +# define _TYPE_ALIGNMENT(type) __alignof(type) +#elif defined(__GNUC__) +# define _TYPE_ALIGNMENT(type) __alignof__(type) +#else +/* + * FIXME: Not sure if is possible to do without compiler extension + * (if type is not just a name that is, if so the normal) + * TYPE_ALIGNMENT can be used) + */ +#endif + +#if defined(TYPE_ALIGNMENT) && defined(_MSC_VER) && _MSC_VER >= 800 && !defined(__cplusplus) +#pragma warning(disable:4116) +#endif + +#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT) +# define TYPE_ALIGNMENT _TYPE_ALIGNMENT +#endif + +/********************************************************************** * + * Test helper macros + */ + +#ifdef FIELD_ALIGNMENT +# define TEST_FIELD_ALIGNMENT(type, field, align) \ + ok(FIELD_ALIGNMENT(type, field) == align, \ + "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \ + (int)FIELD_ALIGNMENT(type, field)) +#else +# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) +#endif + +#define TEST_FIELD_OFFSET(type, field, offset) \ + ok(FIELD_OFFSET(type, field) == offset, \ + "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \ + (long int)FIELD_OFFSET(type, field)) + +#ifdef _TYPE_ALIGNMENT +#define TEST__TYPE_ALIGNMENT(type, align) \ + ok(_TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", (int)_TYPE_ALIGNMENT(type)) +#else +# define TEST__TYPE_ALIGNMENT(type, align) do { } while (0) +#endif + +#ifdef TYPE_ALIGNMENT +#define TEST_TYPE_ALIGNMENT(type, align) \ + ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", (int)TYPE_ALIGNMENT(type)) +#else +# define TEST_TYPE_ALIGNMENT(type, align) do { } while (0) +#endif + +#define TEST_TYPE_SIZE(type, size) \ + ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", ((int) sizeof(type))) + +/********************************************************************** * + * Test macros + */ + +#define TEST_FIELD(type, field_type, field_name, field_offset, field_size, field_align) \ + TEST_TYPE_SIZE(field_type, field_size); \ + TEST_FIELD_ALIGNMENT(type, field_name, field_align); \ + TEST_FIELD_OFFSET(type, field_name, field_offset); \ + +#define TEST_TYPE(type, size, align) \ + TEST_TYPE_ALIGNMENT(type, align); \ + TEST_TYPE_SIZE(type, size) + +#define TEST_TYPE_POINTER(type, size, align) \ + TEST__TYPE_ALIGNMENT(*(type)0, align); \ + TEST_TYPE_SIZE(*(type)0, size) + +#define TEST_TYPE_SIGNED(type) \ + ok((type) -1 < 0, "(" #type ") -1 < 0\n"); + +#define TEST_TYPE_UNSIGNED(type) \ + ok((type) -1 > 0, "(" #type ") -1 > 0\n"); + +static void test_pack_BLOB(void) +{ + /* BLOB (pack 4) */ + TEST_TYPE(BLOB, 8, 4); + TEST_FIELD(BLOB, ULONG, cbSize, 0, 4, 4); + TEST_FIELD(BLOB, BYTE *, pBlobData, 4, 4, 4); +} + +static void test_pack_BSTR(void) +{ + /* BSTR */ + TEST_TYPE(BSTR, 4, 4); + TEST_TYPE_POINTER(BSTR, 2, 2); +} + +static void test_pack_BSTRBLOB(void) +{ + /* BSTRBLOB (pack 4) */ + TEST_TYPE(BSTRBLOB, 8, 4); + TEST_FIELD(BSTRBLOB, ULONG, cbSize, 0, 4, 4); + TEST_FIELD(BSTRBLOB, BYTE *, pData, 4, 4, 4); +} + +static void test_pack_BYTE_BLOB(void) +{ + /* BYTE_BLOB (pack 4) */ + TEST_TYPE(BYTE_BLOB, 8, 4); + TEST_FIELD(BYTE_BLOB, unsigned long, clSize, 0, 4, 4); + TEST_FIELD(BYTE_BLOB, byte[1], abData, 4, 1, 1); +} + +static void test_pack_BYTE_SIZEDARR(void) +{ + /* BYTE_SIZEDARR (pack 4) */ + TEST_TYPE(BYTE_SIZEDARR, 8, 4); + TEST_FIELD(BYTE_SIZEDARR, unsigned long, clSize, 0, 4, 4); + TEST_FIELD(BYTE_SIZEDARR, byte *, pData, 4, 4, 4); +} + +static void test_pack_CLIPDATA(void) +{ + /* CLIPDATA (pack 4) */ + TEST_TYPE(CLIPDATA, 12, 4); + TEST_FIELD(CLIPDATA, ULONG, cbSize, 0, 4, 4); + TEST_FIELD(CLIPDATA, long, ulClipFmt, 4, 4, 4); + TEST_FIELD(CLIPDATA, BYTE *, pClipData, 8, 4, 4); +} + +static void test_pack_CLIPFORMAT(void) +{ + /* CLIPFORMAT */ + TEST_TYPE(CLIPFORMAT, 2, 2); + TEST_TYPE_UNSIGNED(CLIPFORMAT); +} + +static void test_pack_COAUTHIDENTITY(void) +{ + /* COAUTHIDENTITY (pack 4) */ + TEST_TYPE(COAUTHIDENTITY, 28, 4); + TEST_FIELD(COAUTHIDENTITY, USHORT *, User, 0, 4, 4); + TEST_FIELD(COAUTHIDENTITY, ULONG, UserLength, 4, 4, 4); + TEST_FIELD(COAUTHIDENTITY, USHORT *, Domain, 8, 4, 4); + TEST_FIELD(COAUTHIDENTITY, ULONG, DomainLength, 12, 4, 4); + TEST_FIELD(COAUTHIDENTITY, USHORT *, Password, 16, 4, 4); + TEST_FIELD(COAUTHIDENTITY, ULONG, PasswordLength, 20, 4, 4); + TEST_FIELD(COAUTHIDENTITY, ULONG, Flags, 24, 4, 4); +} + +static void test_pack_COAUTHINFO(void) +{ + /* COAUTHINFO (pack 4) */ + TEST_TYPE(COAUTHINFO, 28, 4); + TEST_FIELD(COAUTHINFO, DWORD, dwAuthnSvc, 0, 4, 4); + TEST_FIELD(COAUTHINFO, DWORD, dwAuthzSvc, 4, 4, 4); + TEST_FIELD(COAUTHINFO, LPWSTR, pwszServerPrincName, 8, 4, 4); + TEST_FIELD(COAUTHINFO, DWORD, dwAuthnLevel, 12, 4, 4); + TEST_FIELD(COAUTHINFO, DWORD, dwImpersonationLevel, 16, 4, 4); + TEST_FIELD(COAUTHINFO, COAUTHIDENTITY *, pAuthIdentityData, 20, 4, 4); + TEST_FIELD(COAUTHINFO, DWORD, dwCapabilities, 24, 4, 4); +} + +static void test_pack_COSERVERINFO(void) +{ + /* COSERVERINFO (pack 4) */ + TEST_TYPE(COSERVERINFO, 16, 4); + TEST_FIELD(COSERVERINFO, DWORD, dwReserved1, 0, 4, 4); + TEST_FIELD(COSERVERINFO, LPWSTR, pwszName, 4, 4, 4); + TEST_FIELD(COSERVERINFO, COAUTHINFO *, pAuthInfo, 8, 4, 4); + TEST_FIELD(COSERVERINFO, DWORD, dwReserved2, 12, 4, 4); +} + +static void test_pack_DWORD_SIZEDARR(void) +{ + /* DWORD_SIZEDARR (pack 4) */ + TEST_TYPE(DWORD_SIZEDARR, 8, 4); + TEST_FIELD(DWORD_SIZEDARR, unsigned long, clSize, 0, 4, 4); + TEST_FIELD(DWORD_SIZEDARR, unsigned long *, pData, 4, 4, 4); +} + +static void test_pack_FLAGGED_BYTE_BLOB(void) +{ + /* FLAGGED_BYTE_BLOB (pack 4) */ + TEST_TYPE(FLAGGED_BYTE_BLOB, 12, 4); + TEST_FIELD(FLAGGED_BYTE_BLOB, unsigned long, fFlags, 0, 4, 4); + TEST_FIELD(FLAGGED_BYTE_BLOB, unsigned long, clSize, 4, 4, 4); + TEST_FIELD(FLAGGED_BYTE_BLOB, byte[1], abData, 8, 1, 1); +} + +static void test_pack_FLAGGED_WORD_BLOB(void) +{ + /* FLAGGED_WORD_BLOB (pack 4) */ + TEST_TYPE(FLAGGED_WORD_BLOB, 12, 4); + TEST_FIELD(FLAGGED_WORD_BLOB, unsigned long, fFlags, 0, 4, 4); + TEST_FIELD(FLAGGED_WORD_BLOB, unsigned long, clSize, 4, 4, 4); + TEST_FIELD(FLAGGED_WORD_BLOB, unsigned short[1], asData, 8, 2, 2); +} + +static void test_pack_HMETAFILEPICT(void) +{ + /* HMETAFILEPICT */ + TEST_TYPE(HMETAFILEPICT, 4, 4); +} + +static void test_pack_HYPER_SIZEDARR(void) +{ + /* HYPER_SIZEDARR (pack 4) */ + TEST_TYPE(HYPER_SIZEDARR, 8, 4); + TEST_FIELD(HYPER_SIZEDARR, unsigned long, clSize, 0, 4, 4); + TEST_FIELD(HYPER_SIZEDARR, hyper *, pData, 4, 4, 4); +} + +static void test_pack_LPBLOB(void) +{ + /* LPBLOB */ + TEST_TYPE(LPBLOB, 4, 4); + TEST_TYPE_POINTER(LPBLOB, 8, 4); +} + +static void test_pack_LPBSTR(void) +{ + /* LPBSTR */ + TEST_TYPE(LPBSTR, 4, 4); + TEST_TYPE_POINTER(LPBSTR, 4, 4); +} + +static void test_pack_LPBSTRBLOB(void) +{ + /* LPBSTRBLOB */ + TEST_TYPE(LPBSTRBLOB, 4, 4); + TEST_TYPE_POINTER(LPBSTRBLOB, 8, 4); +} + +static void test_pack_LPCOLESTR(void) +{ + /* LPCOLESTR */ + TEST_TYPE(LPCOLESTR, 4, 4); + TEST_TYPE_POINTER(LPCOLESTR, 2, 2); +} + +static void test_pack_LPCY(void) +{ + /* LPCY */ + TEST_TYPE(LPCY, 4, 4); +} + +static void test_pack_LPDECIMAL(void) +{ + /* LPDECIMAL */ + TEST_TYPE(LPDECIMAL, 4, 4); +} + +static void test_pack_LPOLESTR(void) +{ + /* LPOLESTR */ + TEST_TYPE(LPOLESTR, 4, 4); + TEST_TYPE_POINTER(LPOLESTR, 2, 2); +} + +static void test_pack_OLECHAR(void) +{ + /* OLECHAR */ + TEST_TYPE(OLECHAR, 2, 2); +} + +static void test_pack_PROPID(void) +{ + /* PROPID */ + TEST_TYPE(PROPID, 4, 4); +} + +static void test_pack_RemHBITMAP(void) +{ + /* RemHBITMAP (pack 4) */ + TEST_TYPE(RemHBITMAP, 8, 4); + TEST_FIELD(RemHBITMAP, unsigned long, cbData, 0, 4, 4); + TEST_FIELD(RemHBITMAP, byte[1], data, 4, 1, 1); +} + +static void test_pack_RemHENHMETAFILE(void) +{ + /* RemHENHMETAFILE (pack 4) */ + TEST_TYPE(RemHENHMETAFILE, 8, 4); + TEST_FIELD(RemHENHMETAFILE, unsigned long, cbData, 0, 4, 4); + TEST_FIELD(RemHENHMETAFILE, byte[1], data, 4, 1, 1); +} + +static void test_pack_RemHGLOBAL(void) +{ + /* RemHGLOBAL (pack 4) */ + TEST_TYPE(RemHGLOBAL, 12, 4); + TEST_FIELD(RemHGLOBAL, long, fNullHGlobal, 0, 4, 4); + TEST_FIELD(RemHGLOBAL, unsigned long, cbData, 4, 4, 4); + TEST_FIELD(RemHGLOBAL, byte[1], data, 8, 1, 1); +} + +static void test_pack_RemHMETAFILEPICT(void) +{ + /* RemHMETAFILEPICT (pack 4) */ + TEST_TYPE(RemHMETAFILEPICT, 20, 4); + TEST_FIELD(RemHMETAFILEPICT, long, mm, 0, 4, 4); + TEST_FIELD(RemHMETAFILEPICT, long, xExt, 4, 4, 4); + TEST_FIELD(RemHMETAFILEPICT, long, yExt, 8, 4, 4); + TEST_FIELD(RemHMETAFILEPICT, unsigned long, cbData, 12, 4, 4); + TEST_FIELD(RemHMETAFILEPICT, byte[1], data, 16, 1, 1); +} + +static void test_pack_RemHPALETTE(void) +{ + /* RemHPALETTE (pack 4) */ + TEST_TYPE(RemHPALETTE, 8, 4); + TEST_FIELD(RemHPALETTE, unsigned long, cbData, 0, 4, 4); + TEST_FIELD(RemHPALETTE, byte[1], data, 4, 1, 1); +} + +static void test_pack_SCODE(void) +{ + /* SCODE */ + TEST_TYPE(SCODE, 4, 4); +} + +static void test_pack_UP_BYTE_BLOB(void) +{ + /* UP_BYTE_BLOB */ + TEST_TYPE(UP_BYTE_BLOB, 4, 4); + TEST_TYPE_POINTER(UP_BYTE_BLOB, 8, 4); +} + +static void test_pack_UP_FLAGGED_BYTE_BLOB(void) +{ + /* UP_FLAGGED_BYTE_BLOB */ + TEST_TYPE(UP_FLAGGED_BYTE_BLOB, 4, 4); + TEST_TYPE_POINTER(UP_FLAGGED_BYTE_BLOB, 12, 4); +} + +static void test_pack_UP_FLAGGED_WORD_BLOB(void) +{ + /* UP_FLAGGED_WORD_BLOB */ + TEST_TYPE(UP_FLAGGED_WORD_BLOB, 4, 4); + TEST_TYPE_POINTER(UP_FLAGGED_WORD_BLOB, 12, 4); +} + +static void test_pack_VARIANT_BOOL(void) +{ + /* VARIANT_BOOL */ + TEST_TYPE(VARIANT_BOOL, 2, 2); + TEST_TYPE_SIGNED(VARIANT_BOOL); +} + +static void test_pack_VARTYPE(void) +{ + /* VARTYPE */ + TEST_TYPE(VARTYPE, 2, 2); + TEST_TYPE_UNSIGNED(VARTYPE); +} + +static void test_pack_WORD_SIZEDARR(void) +{ + /* WORD_SIZEDARR (pack 4) */ + TEST_TYPE(WORD_SIZEDARR, 8, 4); + TEST_FIELD(WORD_SIZEDARR, unsigned long, clSize, 0, 4, 4); + TEST_FIELD(WORD_SIZEDARR, unsigned short *, pData, 4, 4, 4); +} + +static void test_pack_remoteMETAFILEPICT(void) +{ + /* remoteMETAFILEPICT (pack 4) */ + TEST_TYPE(remoteMETAFILEPICT, 16, 4); + TEST_FIELD(remoteMETAFILEPICT, long, mm, 0, 4, 4); + TEST_FIELD(remoteMETAFILEPICT, long, xExt, 4, 4, 4); + TEST_FIELD(remoteMETAFILEPICT, long, yExt, 8, 4, 4); + TEST_FIELD(remoteMETAFILEPICT, userHMETAFILE *, hMF, 12, 4, 4); +} + +static void test_pack_userBITMAP(void) +{ + /* userBITMAP (pack 4) */ + TEST_TYPE(userBITMAP, 28, 4); + TEST_FIELD(userBITMAP, LONG, bmType, 0, 4, 4); + TEST_FIELD(userBITMAP, LONG, bmWidth, 4, 4, 4); + TEST_FIELD(userBITMAP, LONG, bmHeight, 8, 4, 4); + TEST_FIELD(userBITMAP, LONG, bmWidthBytes, 12, 4, 4); + TEST_FIELD(userBITMAP, WORD, bmPlanes, 16, 2, 2); + TEST_FIELD(userBITMAP, WORD, bmBitsPixel, 18, 2, 2); + TEST_FIELD(userBITMAP, ULONG, cbSize, 20, 4, 4); + TEST_FIELD(userBITMAP, byte[1], pBuffer, 24, 1, 1); +} + +static void test_pack_userCLIPFORMAT(void) +{ + /* userCLIPFORMAT (pack 4) */ + TEST_FIELD(userCLIPFORMAT, long, fContext, 0, 4, 4); +} + +static void test_pack_userHBITMAP(void) +{ + /* userHBITMAP (pack 4) */ + TEST_FIELD(userHBITMAP, long, fContext, 0, 4, 4); +} + +static void test_pack_userHENHMETAFILE(void) +{ + /* userHENHMETAFILE (pack 4) */ + TEST_FIELD(userHENHMETAFILE, long, fContext, 0, 4, 4); +} + +static void test_pack_userHGLOBAL(void) +{ + /* userHGLOBAL (pack 4) */ + TEST_FIELD(userHGLOBAL, long, fContext, 0, 4, 4); +} + +static void test_pack_userHMETAFILE(void) +{ + /* userHMETAFILE (pack 4) */ + TEST_FIELD(userHMETAFILE, long, fContext, 0, 4, 4); +} + +static void test_pack_userHMETAFILEPICT(void) +{ + /* userHMETAFILEPICT (pack 4) */ + TEST_FIELD(userHMETAFILEPICT, long, fContext, 0, 4, 4); +} + +static void test_pack_userHPALETTE(void) +{ + /* userHPALETTE (pack 4) */ + TEST_FIELD(userHPALETTE, long, fContext, 0, 4, 4); +} + +static void test_pack_wireBSTR(void) +{ + /* wireBSTR */ + TEST_TYPE(wireBSTR, 4, 4); + TEST_TYPE_POINTER(wireBSTR, 12, 4); +} + +static void test_pack_wireCLIPFORMAT(void) +{ + /* wireCLIPFORMAT */ + TEST_TYPE(wireCLIPFORMAT, 4, 4); +} + +static void test_pack_wireHBITMAP(void) +{ + /* wireHBITMAP */ + TEST_TYPE(wireHBITMAP, 4, 4); +} + +static void test_pack_wireHENHMETAFILE(void) +{ + /* wireHENHMETAFILE */ + TEST_TYPE(wireHENHMETAFILE, 4, 4); +} + +static void test_pack_wireHGLOBAL(void) +{ + /* wireHGLOBAL */ + TEST_TYPE(wireHGLOBAL, 4, 4); +} + +static void test_pack_wireHMETAFILE(void) +{ + /* wireHMETAFILE */ + TEST_TYPE(wireHMETAFILE, 4, 4); +} + +static void test_pack_wireHMETAFILEPICT(void) +{ + /* wireHMETAFILEPICT */ + TEST_TYPE(wireHMETAFILEPICT, 4, 4); +} + +static void test_pack_wireHPALETTE(void) +{ + /* wireHPALETTE */ + TEST_TYPE(wireHPALETTE, 4, 4); +} + +static void test_pack_CLSID(void) +{ + /* CLSID */ + TEST_TYPE(CLSID, 16, 4); +} + +static void test_pack_FMTID(void) +{ + /* FMTID */ + TEST_TYPE(FMTID, 16, 4); +} + +static void test_pack_GUID(void) +{ + /* GUID (pack 4) */ + TEST_TYPE(GUID, 16, 4); + TEST_FIELD(GUID, unsigned long, Data1, 0, 4, 4); + TEST_FIELD(GUID, unsigned short, Data2, 4, 2, 2); + TEST_FIELD(GUID, unsigned short, Data3, 6, 2, 2); + TEST_FIELD(GUID, unsigned char[ 8 ], Data4, 8, 8, 1); +} + +static void test_pack_IID(void) +{ + /* IID */ + TEST_TYPE(IID, 16, 4); +} + +static void test_pack_LPGUID(void) +{ + /* LPGUID */ + TEST_TYPE(LPGUID, 4, 4); + TEST_TYPE_POINTER(LPGUID, 16, 4); +} + +static void test_pack_APPBARDATA(void) +{ + /* APPBARDATA (pack 1) */ + TEST_TYPE(APPBARDATA, 36, 1); + TEST_FIELD(APPBARDATA, DWORD, cbSize, 0, 4, 1); + TEST_FIELD(APPBARDATA, HWND, hWnd, 4, 4, 1); + TEST_FIELD(APPBARDATA, UINT, uCallbackMessage, 8, 4, 1); + TEST_FIELD(APPBARDATA, UINT, uEdge, 12, 4, 1); + TEST_FIELD(APPBARDATA, RECT, rc, 16, 16, 1); + TEST_FIELD(APPBARDATA, LPARAM, lParam, 32, 4, 1); +} + +static void test_pack_DRAGINFOA(void) +{ + /* DRAGINFOA (pack 1) */ + TEST_TYPE(DRAGINFOA, 24, 1); + TEST_FIELD(DRAGINFOA, UINT, uSize, 0, 4, 1); + TEST_FIELD(DRAGINFOA, POINT, pt, 4, 8, 1); + TEST_FIELD(DRAGINFOA, BOOL, fNC, 12, 4, 1); + TEST_FIELD(DRAGINFOA, LPSTR, lpFileList, 16, 4, 1); + TEST_FIELD(DRAGINFOA, DWORD, grfKeyState, 20, 4, 1); +} + +static void test_pack_DRAGINFOW(void) +{ + /* DRAGINFOW (pack 1) */ + TEST_TYPE(DRAGINFOW, 24, 1); + TEST_FIELD(DRAGINFOW, UINT, uSize, 0, 4, 1); + TEST_FIELD(DRAGINFOW, POINT, pt, 4, 8, 1); + TEST_FIELD(DRAGINFOW, BOOL, fNC, 12, 4, 1); + TEST_FIELD(DRAGINFOW, LPWSTR, lpFileList, 16, 4, 1); + TEST_FIELD(DRAGINFOW, DWORD, grfKeyState, 20, 4, 1); +} + +static void test_pack_FILEOP_FLAGS(void) +{ + /* FILEOP_FLAGS */ + TEST_TYPE(FILEOP_FLAGS, 2, 2); + TEST_TYPE_UNSIGNED(FILEOP_FLAGS); +} + +static void test_pack_LPDRAGINFOA(void) +{ + /* LPDRAGINFOA */ + TEST_TYPE(LPDRAGINFOA, 4, 4); + TEST_TYPE_POINTER(LPDRAGINFOA, 24, 1); +} + +static void test_pack_LPDRAGINFOW(void) +{ + /* LPDRAGINFOW */ + TEST_TYPE(LPDRAGINFOW, 4, 4); + TEST_TYPE_POINTER(LPDRAGINFOW, 24, 1); +} + +static void test_pack_LPSHELLEXECUTEINFOA(void) +{ + /* LPSHELLEXECUTEINFOA */ + TEST_TYPE(LPSHELLEXECUTEINFOA, 4, 4); +} + +static void test_pack_LPSHELLEXECUTEINFOW(void) +{ + /* LPSHELLEXECUTEINFOW */ + TEST_TYPE(LPSHELLEXECUTEINFOW, 4, 4); +} + +static void test_pack_LPSHFILEOPSTRUCTA(void) +{ + /* LPSHFILEOPSTRUCTA */ + TEST_TYPE(LPSHFILEOPSTRUCTA, 4, 4); + TEST_TYPE_POINTER(LPSHFILEOPSTRUCTA, 30, 1); +} + +static void test_pack_LPSHFILEOPSTRUCTW(void) +{ + /* LPSHFILEOPSTRUCTW */ + TEST_TYPE(LPSHFILEOPSTRUCTW, 4, 4); + TEST_TYPE_POINTER(LPSHFILEOPSTRUCTW, 30, 1); +} + +static void test_pack_LPSHNAMEMAPPINGA(void) +{ + /* LPSHNAMEMAPPINGA */ + TEST_TYPE(LPSHNAMEMAPPINGA, 4, 4); + TEST_TYPE_POINTER(LPSHNAMEMAPPINGA, 16, 1); +} + +static void test_pack_LPSHNAMEMAPPINGW(void) +{ + /* LPSHNAMEMAPPINGW */ + TEST_TYPE(LPSHNAMEMAPPINGW, 4, 4); + TEST_TYPE_POINTER(LPSHNAMEMAPPINGW, 16, 1); +} + +static void test_pack_NOTIFYICONDATAA(void) +{ + /* NOTIFYICONDATAA (pack 1) */ + TEST_FIELD(NOTIFYICONDATAA, DWORD, cbSize, 0, 4, 1); + TEST_FIELD(NOTIFYICONDATAA, HWND, hWnd, 4, 4, 1); + TEST_FIELD(NOTIFYICONDATAA, UINT, uID, 8, 4, 1); + TEST_FIELD(NOTIFYICONDATAA, UINT, uFlags, 12, 4, 1); + TEST_FIELD(NOTIFYICONDATAA, UINT, uCallbackMessage, 16, 4, 1); + TEST_FIELD(NOTIFYICONDATAA, HICON, hIcon, 20, 4, 1); + TEST_FIELD(NOTIFYICONDATAA, CHAR[128], szTip, 24, 128, 1); + TEST_FIELD(NOTIFYICONDATAA, DWORD, dwState, 152, 4, 1); + TEST_FIELD(NOTIFYICONDATAA, DWORD, dwStateMask, 156, 4, 1); + TEST_FIELD(NOTIFYICONDATAA, CHAR[256], szInfo, 160, 256, 1); +} + +static void test_pack_NOTIFYICONDATAW(void) +{ + /* NOTIFYICONDATAW (pack 1) */ + TEST_FIELD(NOTIFYICONDATAW, DWORD, cbSize, 0, 4, 1); + TEST_FIELD(NOTIFYICONDATAW, HWND, hWnd, 4, 4, 1); + TEST_FIELD(NOTIFYICONDATAW, UINT, uID, 8, 4, 1); + TEST_FIELD(NOTIFYICONDATAW, UINT, uFlags, 12, 4, 1); + TEST_FIELD(NOTIFYICONDATAW, UINT, uCallbackMessage, 16, 4, 1); + TEST_FIELD(NOTIFYICONDATAW, HICON, hIcon, 20, 4, 1); + TEST_FIELD(NOTIFYICONDATAW, WCHAR[128], szTip, 24, 256, 1); + TEST_FIELD(NOTIFYICONDATAW, DWORD, dwState, 280, 4, 1); + TEST_FIELD(NOTIFYICONDATAW, DWORD, dwStateMask, 284, 4, 1); + TEST_FIELD(NOTIFYICONDATAW, WCHAR[256], szInfo, 288, 512, 1); +} + +static void test_pack_PAPPBARDATA(void) +{ + /* PAPPBARDATA */ + TEST_TYPE(PAPPBARDATA, 4, 4); + TEST_TYPE_POINTER(PAPPBARDATA, 36, 1); +} + +static void test_pack_PNOTIFYICONDATAA(void) +{ + /* PNOTIFYICONDATAA */ + TEST_TYPE(PNOTIFYICONDATAA, 4, 4); +} + +static void test_pack_PNOTIFYICONDATAW(void) +{ + /* PNOTIFYICONDATAW */ + TEST_TYPE(PNOTIFYICONDATAW, 4, 4); +} + +static void test_pack_PRINTEROP_FLAGS(void) +{ + /* PRINTEROP_FLAGS */ + TEST_TYPE(PRINTEROP_FLAGS, 2, 2); + TEST_TYPE_UNSIGNED(PRINTEROP_FLAGS); +} + +static void test_pack_SHELLEXECUTEINFOA(void) +{ + /* SHELLEXECUTEINFOA (pack 1) */ + TEST_FIELD(SHELLEXECUTEINFOA, DWORD, cbSize, 0, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, ULONG, fMask, 4, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, HWND, hwnd, 8, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, LPCSTR, lpVerb, 12, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, LPCSTR, lpFile, 16, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, LPCSTR, lpParameters, 20, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, LPCSTR, lpDirectory, 24, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, INT, nShow, 28, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, HINSTANCE, hInstApp, 32, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, LPVOID, lpIDList, 36, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, LPCSTR, lpClass, 40, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, HKEY, hkeyClass, 44, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOA, DWORD, dwHotKey, 48, 4, 1); +} + +static void test_pack_SHELLEXECUTEINFOW(void) +{ + /* SHELLEXECUTEINFOW (pack 1) */ + TEST_FIELD(SHELLEXECUTEINFOW, DWORD, cbSize, 0, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, ULONG, fMask, 4, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, HWND, hwnd, 8, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, LPCWSTR, lpVerb, 12, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, LPCWSTR, lpFile, 16, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, LPCWSTR, lpParameters, 20, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, LPCWSTR, lpDirectory, 24, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, INT, nShow, 28, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, HINSTANCE, hInstApp, 32, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, LPVOID, lpIDList, 36, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, LPCWSTR, lpClass, 40, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, HKEY, hkeyClass, 44, 4, 1); + TEST_FIELD(SHELLEXECUTEINFOW, DWORD, dwHotKey, 48, 4, 1); +} + +static void test_pack_SHFILEINFOA(void) +{ + /* SHFILEINFOA (pack 1) */ + TEST_TYPE(SHFILEINFOA, 352, 1); + TEST_FIELD(SHFILEINFOA, HICON, hIcon, 0, 4, 1); + TEST_FIELD(SHFILEINFOA, int, iIcon, 4, 4, 1); + TEST_FIELD(SHFILEINFOA, DWORD, dwAttributes, 8, 4, 1); + TEST_FIELD(SHFILEINFOA, CHAR[MAX_PATH], szDisplayName, 12, 260, 1); + TEST_FIELD(SHFILEINFOA, CHAR[80], szTypeName, 272, 80, 1); +} + +static void test_pack_SHFILEINFOW(void) +{ + /* SHFILEINFOW (pack 1) */ + TEST_TYPE(SHFILEINFOW, 692, 1); + TEST_FIELD(SHFILEINFOW, HICON, hIcon, 0, 4, 1); + TEST_FIELD(SHFILEINFOW, int, iIcon, 4, 4, 1); + TEST_FIELD(SHFILEINFOW, DWORD, dwAttributes, 8, 4, 1); + TEST_FIELD(SHFILEINFOW, WCHAR[MAX_PATH], szDisplayName, 12, 520, 1); + TEST_FIELD(SHFILEINFOW, WCHAR[80], szTypeName, 532, 160, 1); +} + +static void test_pack_SHFILEOPSTRUCTA(void) +{ + /* SHFILEOPSTRUCTA (pack 1) */ + TEST_TYPE(SHFILEOPSTRUCTA, 30, 1); + TEST_FIELD(SHFILEOPSTRUCTA, HWND, hwnd, 0, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTA, UINT, wFunc, 4, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTA, LPCSTR, pFrom, 8, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTA, LPCSTR, pTo, 12, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTA, FILEOP_FLAGS, fFlags, 16, 2, 1); + TEST_FIELD(SHFILEOPSTRUCTA, BOOL, fAnyOperationsAborted, 18, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTA, LPVOID, hNameMappings, 22, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTA, LPCSTR, lpszProgressTitle, 26, 4, 1); +} + +static void test_pack_SHFILEOPSTRUCTW(void) +{ + /* SHFILEOPSTRUCTW (pack 1) */ + TEST_TYPE(SHFILEOPSTRUCTW, 30, 1); + TEST_FIELD(SHFILEOPSTRUCTW, HWND, hwnd, 0, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTW, UINT, wFunc, 4, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTW, LPCWSTR, pFrom, 8, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTW, LPCWSTR, pTo, 12, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTW, FILEOP_FLAGS, fFlags, 16, 2, 1); + TEST_FIELD(SHFILEOPSTRUCTW, BOOL, fAnyOperationsAborted, 18, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTW, LPVOID, hNameMappings, 22, 4, 1); + TEST_FIELD(SHFILEOPSTRUCTW, LPCWSTR, lpszProgressTitle, 26, 4, 1); +} + +static void test_pack_SHNAMEMAPPINGA(void) +{ + /* SHNAMEMAPPINGA (pack 1) */ + TEST_TYPE(SHNAMEMAPPINGA, 16, 1); + TEST_FIELD(SHNAMEMAPPINGA, LPSTR, pszOldPath, 0, 4, 1); + TEST_FIELD(SHNAMEMAPPINGA, LPSTR, pszNewPath, 4, 4, 1); + TEST_FIELD(SHNAMEMAPPINGA, int, cchOldPath, 8, 4, 1); + TEST_FIELD(SHNAMEMAPPINGA, int, cchNewPath, 12, 4, 1); +} + +static void test_pack_SHNAMEMAPPINGW(void) +{ + /* SHNAMEMAPPINGW (pack 1) */ + TEST_TYPE(SHNAMEMAPPINGW, 16, 1); + TEST_FIELD(SHNAMEMAPPINGW, LPWSTR, pszOldPath, 0, 4, 1); + TEST_FIELD(SHNAMEMAPPINGW, LPWSTR, pszNewPath, 4, 4, 1); + TEST_FIELD(SHNAMEMAPPINGW, int, cchOldPath, 8, 4, 1); + TEST_FIELD(SHNAMEMAPPINGW, int, cchNewPath, 12, 4, 1); +} + +static void test_pack_ITEMIDLIST(void) +{ + /* ITEMIDLIST (pack 1) */ + TEST_TYPE(ITEMIDLIST, 3, 1); + TEST_FIELD(ITEMIDLIST, SHITEMID, mkid, 0, 3, 1); +} + +static void test_pack_LPCITEMIDLIST(void) +{ + /* LPCITEMIDLIST */ + TEST_TYPE(LPCITEMIDLIST, 4, 4); + TEST_TYPE_POINTER(LPCITEMIDLIST, 3, 1); +} + +static void test_pack_LPCSHITEMID(void) +{ + /* LPCSHITEMID */ + TEST_TYPE(LPCSHITEMID, 4, 4); + TEST_TYPE_POINTER(LPCSHITEMID, 3, 1); +} + +static void test_pack_LPITEMIDLIST(void) +{ + /* LPITEMIDLIST */ + TEST_TYPE(LPITEMIDLIST, 4, 4); + TEST_TYPE_POINTER(LPITEMIDLIST, 3, 1); +} + +static void test_pack_LPSHELLDETAILS(void) +{ + /* LPSHELLDETAILS */ + TEST_TYPE(LPSHELLDETAILS, 4, 4); +} + +static void test_pack_LPSHITEMID(void) +{ + /* LPSHITEMID */ + TEST_TYPE(LPSHITEMID, 4, 4); + TEST_TYPE_POINTER(LPSHITEMID, 3, 1); +} + +static void test_pack_LPSTRRET(void) +{ + /* LPSTRRET */ + TEST_TYPE(LPSTRRET, 4, 4); +} + +static void test_pack_SHELLDETAILS(void) +{ + /* SHELLDETAILS (pack 1) */ + TEST_FIELD(SHELLDETAILS, int, fmt, 0, 4, 1); + TEST_FIELD(SHELLDETAILS, int, cxChar, 4, 4, 1); +} + +static void test_pack_SHITEMID(void) +{ + /* SHITEMID (pack 1) */ + TEST_TYPE(SHITEMID, 3, 1); + TEST_FIELD(SHITEMID, WORD, cb, 0, 2, 1); + TEST_FIELD(SHITEMID, BYTE[1], abID, 2, 1, 1); +} + +static void test_pack_STRRET(void) +{ + /* STRRET (pack 4) */ + TEST_FIELD(STRRET, UINT, uType, 0, 4, 4); +} + +static void test_pack_AUTO_SCROLL_DATA(void) +{ + /* AUTO_SCROLL_DATA (pack 1) */ + TEST_TYPE(AUTO_SCROLL_DATA, 48, 1); + TEST_FIELD(AUTO_SCROLL_DATA, int, iNextSample, 0, 4, 1); + TEST_FIELD(AUTO_SCROLL_DATA, DWORD, dwLastScroll, 4, 4, 1); + TEST_FIELD(AUTO_SCROLL_DATA, BOOL, bFull, 8, 4, 1); + TEST_FIELD(AUTO_SCROLL_DATA, POINT[NUM_POINTS], pts, 12, 24, 1); + TEST_FIELD(AUTO_SCROLL_DATA, DWORD[NUM_POINTS], dwTimes, 36, 12, 1); +} + +static void test_pack_BFFCALLBACK(void) +{ + /* BFFCALLBACK */ + TEST_TYPE(BFFCALLBACK, 4, 4); +} + +static void test_pack_BROWSEINFOA(void) +{ + /* BROWSEINFOA (pack 8) */ + TEST_TYPE(BROWSEINFOA, 32, 4); + TEST_FIELD(BROWSEINFOA, HWND, hwndOwner, 0, 4, 4); + TEST_FIELD(BROWSEINFOA, LPCITEMIDLIST, pidlRoot, 4, 4, 4); + TEST_FIELD(BROWSEINFOA, LPSTR, pszDisplayName, 8, 4, 4); + TEST_FIELD(BROWSEINFOA, LPCSTR, lpszTitle, 12, 4, 4); + TEST_FIELD(BROWSEINFOA, UINT, ulFlags, 16, 4, 4); + TEST_FIELD(BROWSEINFOA, BFFCALLBACK, lpfn, 20, 4, 4); + TEST_FIELD(BROWSEINFOA, LPARAM, lParam, 24, 4, 4); + TEST_FIELD(BROWSEINFOA, INT, iImage, 28, 4, 4); +} + +static void test_pack_BROWSEINFOW(void) +{ + /* BROWSEINFOW (pack 8) */ + TEST_TYPE(BROWSEINFOW, 32, 4); + TEST_FIELD(BROWSEINFOW, HWND, hwndOwner, 0, 4, 4); + TEST_FIELD(BROWSEINFOW, LPCITEMIDLIST, pidlRoot, 4, 4, 4); + TEST_FIELD(BROWSEINFOW, LPWSTR, pszDisplayName, 8, 4, 4); + TEST_FIELD(BROWSEINFOW, LPCWSTR, lpszTitle, 12, 4, 4); + TEST_FIELD(BROWSEINFOW, UINT, ulFlags, 16, 4, 4); + TEST_FIELD(BROWSEINFOW, BFFCALLBACK, lpfn, 20, 4, 4); + TEST_FIELD(BROWSEINFOW, LPARAM, lParam, 24, 4, 4); + TEST_FIELD(BROWSEINFOW, INT, iImage, 28, 4, 4); +} + +static void test_pack_CABINETSTATE(void) +{ + /* CABINETSTATE (pack 1) */ + TEST_TYPE(CABINETSTATE, 12, 1); + TEST_FIELD(CABINETSTATE, WORD, cLength, 0, 2, 1); + TEST_FIELD(CABINETSTATE, WORD, nVersion, 2, 2, 1); + TEST_FIELD(CABINETSTATE, UINT, fMenuEnumFilter, 8, 4, 1); +} + +static void test_pack_CIDA(void) +{ + /* CIDA (pack 1) */ + TEST_TYPE(CIDA, 8, 1); + TEST_FIELD(CIDA, UINT, cidl, 0, 4, 1); + TEST_FIELD(CIDA, UINT[1], aoffset, 4, 4, 1); +} + +static void test_pack_CSFV(void) +{ + /* CSFV (pack 1) */ + TEST_FIELD(CSFV, UINT, cbSize, 0, 4, 1); + TEST_FIELD(CSFV, IShellFolder*, pshf, 4, 4, 1); + TEST_FIELD(CSFV, IShellView*, psvOuter, 8, 4, 1); + TEST_FIELD(CSFV, LPCITEMIDLIST, pidl, 12, 4, 1); + TEST_FIELD(CSFV, LONG, lEvents, 16, 4, 1); + TEST_FIELD(CSFV, LPFNVIEWCALLBACK, pfnCallback, 20, 4, 1); +} + +static void test_pack_DROPFILES(void) +{ + /* DROPFILES (pack 1) */ + TEST_TYPE(DROPFILES, 20, 1); + TEST_FIELD(DROPFILES, DWORD, pFiles, 0, 4, 1); + TEST_FIELD(DROPFILES, POINT, pt, 4, 8, 1); + TEST_FIELD(DROPFILES, BOOL, fNC, 12, 4, 1); + TEST_FIELD(DROPFILES, BOOL, fWide, 16, 4, 1); +} + +static void test_pack_FILEDESCRIPTORA(void) +{ + /* FILEDESCRIPTORA (pack 1) */ + TEST_TYPE(FILEDESCRIPTORA, 332, 1); + TEST_FIELD(FILEDESCRIPTORA, DWORD, dwFlags, 0, 4, 1); + TEST_FIELD(FILEDESCRIPTORA, CLSID, clsid, 4, 16, 1); + TEST_FIELD(FILEDESCRIPTORA, SIZEL, sizel, 20, 8, 1); + TEST_FIELD(FILEDESCRIPTORA, POINTL, pointl, 28, 8, 1); + TEST_FIELD(FILEDESCRIPTORA, DWORD, dwFileAttributes, 36, 4, 1); + TEST_FIELD(FILEDESCRIPTORA, FILETIME, ftCreationTime, 40, 8, 1); + TEST_FIELD(FILEDESCRIPTORA, FILETIME, ftLastAccessTime, 48, 8, 1); + TEST_FIELD(FILEDESCRIPTORA, FILETIME, ftLastWriteTime, 56, 8, 1); + TEST_FIELD(FILEDESCRIPTORA, DWORD, nFileSizeHigh, 64, 4, 1); + TEST_FIELD(FILEDESCRIPTORA, DWORD, nFileSizeLow, 68, 4, 1); + TEST_FIELD(FILEDESCRIPTORA, CHAR[MAX_PATH], cFileName, 72, 260, 1); +} + +static void test_pack_FILEDESCRIPTORW(void) +{ + /* FILEDESCRIPTORW (pack 1) */ + TEST_TYPE(FILEDESCRIPTORW, 592, 1); + TEST_FIELD(FILEDESCRIPTORW, DWORD, dwFlags, 0, 4, 1); + TEST_FIELD(FILEDESCRIPTORW, CLSID, clsid, 4, 16, 1); + TEST_FIELD(FILEDESCRIPTORW, SIZEL, sizel, 20, 8, 1); + TEST_FIELD(FILEDESCRIPTORW, POINTL, pointl, 28, 8, 1); + TEST_FIELD(FILEDESCRIPTORW, DWORD, dwFileAttributes, 36, 4, 1); + TEST_FIELD(FILEDESCRIPTORW, FILETIME, ftCreationTime, 40, 8, 1); + TEST_FIELD(FILEDESCRIPTORW, FILETIME, ftLastAccessTime, 48, 8, 1); + TEST_FIELD(FILEDESCRIPTORW, FILETIME, ftLastWriteTime, 56, 8, 1); + TEST_FIELD(FILEDESCRIPTORW, DWORD, nFileSizeHigh, 64, 4, 1); + TEST_FIELD(FILEDESCRIPTORW, DWORD, nFileSizeLow, 68, 4, 1); + TEST_FIELD(FILEDESCRIPTORW, WCHAR[MAX_PATH], cFileName, 72, 520, 1); [truncated at 1000 lines; 3778 more skipped]

19 years, 4 months

[gdalsnes] 17267: more stuff

by gdalsnes＠svn.reactos.com

more stuff Modified: branches/win32k rewrite attempt/win32k/eng/driverobj.c Modified: branches/win32k rewrite attempt/win32k/include/desktop.h Modified: branches/win32k rewrite attempt/win32k/include/input.h Modified: branches/win32k rewrite attempt/win32k/include/msgqueue.h Modified: branches/win32k rewrite attempt/win32k/include/ntuser.h Modified: branches/win32k rewrite attempt/win32k/include/painting.h Modified: branches/win32k rewrite attempt/win32k/include/prop.h Modified: branches/win32k rewrite attempt/win32k/include/timer.h Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h Modified: branches/win32k rewrite attempt/win32k/include/vis.h Added: branches/win32k rewrite attempt/win32k/include/win32.h Modified: branches/win32k rewrite attempt/win32k/include/win32k.h Modified: branches/win32k rewrite attempt/win32k/include/window.h Modified: branches/win32k rewrite attempt/win32k/main/dllmain.c Modified: branches/win32k rewrite attempt/win32k/misc/copy.c Modified: branches/win32k rewrite attempt/win32k/ntuser/caret.c Modified: branches/win32k rewrite attempt/win32k/ntuser/desktop.c Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c Modified: branches/win32k rewrite attempt/win32k/ntuser/hook.c Modified: branches/win32k rewrite attempt/win32k/ntuser/hotkey.c Modified: branches/win32k rewrite attempt/win32k/ntuser/input.c Modified: branches/win32k rewrite attempt/win32k/ntuser/keyboard.c Modified: branches/win32k rewrite attempt/win32k/ntuser/message.c Modified: branches/win32k rewrite attempt/win32k/ntuser/misc.c Modified: branches/win32k rewrite attempt/win32k/ntuser/msgqueue.c Modified: branches/win32k rewrite attempt/win32k/ntuser/painting.c Modified: branches/win32k rewrite attempt/win32k/ntuser/timer.c Modified: branches/win32k rewrite attempt/win32k/ntuser/vis.c Modified: branches/win32k rewrite attempt/win32k/ntuser/window.c Modified: branches/win32k rewrite attempt/win32k/ntuser/winpos.c Modified: branches/win32k rewrite attempt/win32k/w32k.h _____ Modified: branches/win32k rewrite attempt/win32k/eng/driverobj.c --- branches/win32k rewrite attempt/win32k/eng/driverobj.c 2005-08-10 19:52:19 UTC (rev 17266) +++ branches/win32k rewrite attempt/win32k/eng/driverobj.c 2005-08-10 19:52:35 UTC (rev 17267) @@ -1,174 +1,174 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: GDI DRIVEROBJ Functions - * FILE: subsys/win32k/eng/driverobj.c - * PROGRAMER: Gregor Anich - * REVISION HISTORY: - * 04/01/2005: Created - */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -/*!\brief Called when the process is terminated. - * - * Calls the free-proc for each existing DRIVEROBJ. - * - * \param Process Pointer to the EPROCESS struct for the process beeing terminated. - * \param Win32Process Pointer to the W32PROCESS - */ -VOID FASTCALL -IntEngCleanupDriverObjs(struct _EPROCESS *Process, - PW32PROCESS Win32Process) -{ - PDRIVERGDI DrvObjInt; - - IntEngLockProcessDriverObjs(PsGetWin32Process()); - while (!IsListEmpty(&Win32Process->DriverObjListHead)) - { - DrvObjInt = CONTAINING_RECORD(Win32Process->DriverObjListHead.Flink, - DRIVERGDI, ListEntry); - IntEngUnLockProcessDriverObjs(PsGetWin32Process()); - EngDeleteDriverObj((HDRVOBJ)(&DrvObjInt->DriverObj), TRUE, FALSE); - IntEngLockProcessDriverObjs(PsGetWin32Process()); - } - IntEngUnLockProcessDriverObjs(PsGetWin32Process()); -} - - -/* - * @implemented - */ -HDRVOBJ -STDCALL -EngCreateDriverObj( - IN PVOID pvObj, - IN FREEOBJPROC pFreeObjProc, - IN HDEV hdev - ) -{ - PDRIVERGDI DrvObjInt; - PDRIVEROBJ DrvObjUser; - - /* Create DRIVEROBJ */ - DrvObjInt = EngAllocMem(0, sizeof (DRIVERGDI), TAG_DRIVEROBJ); - if (DrvObjInt == NULL) - { - DPRINT1("Failed to allocate memory for a DRIVERGDI structure!\n"); - return NULL; - } - - /* fill user object */ - DrvObjUser = GDIToObj(DrvObjInt, DRIVER); - DrvObjUser->pvObj = pvObj; - DrvObjUser->pFreeProc = pFreeObjProc; - DrvObjUser->hdev = hdev; - DrvObjUser->dhpdev = ((GDIDEVICE*)hdev)->PDev; - - /* fill internal object */ - ExInitializeFastMutex(&DrvObjInt->Lock); - IntEngLockProcessDriverObjs(PsGetWin32Process()); - InsertTailList(&PsGetWin32Process()->DriverObjListHead, &DrvObjInt->ListEntry); - IntEngUnLockProcessDriverObjs(PsGetWin32Process()); - - return (HDRVOBJ)DrvObjUser; -} - - -/* - * @implemented - */ -BOOL -STDCALL -EngDeleteDriverObj( - IN HDRVOBJ hdo, - IN BOOL bCallBack, - IN BOOL bLocked - ) -{ - PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; - PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); - - /* Make sure the obj is locked */ - if (!bLocked) - { - if (!ExTryToAcquireFastMutex(&DrvObjInt->Lock)) - { - return FALSE; - } - } - - /* Call the free-proc */ - if (bCallBack) - { - if (!DrvObjUser->pFreeProc(DrvObjUser)) - { - return FALSE; - } - } - - /* Free the DRIVEROBJ */ - IntEngLockProcessDriverObjs(PsGetWin32Process()); - RemoveEntryList(&DrvObjInt->ListEntry); - IntEngUnLockProcessDriverObjs(PsGetWin32Process()); - EngFreeMem(DrvObjInt); - - return TRUE; -} - - -/* - * @implemented - */ -PDRIVEROBJ -STDCALL -EngLockDriverObj( IN HDRVOBJ hdo ) -{ - PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; - PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); - - if (!ExTryToAcquireFastMutex(&DrvObjInt->Lock)) - { - return NULL; - } - - return DrvObjUser; -} - - -/* - * @implemented - */ -BOOL -STDCALL -EngUnlockDriverObj ( IN HDRVOBJ hdo ) -{ - PDRIVERGDI DrvObjInt = ObjToGDI((PDRIVEROBJ)hdo, DRIVER); - - ExReleaseFastMutex(&DrvObjInt->Lock); - return TRUE; -} - -/* EOF */ - +/* + * ReactOS W32 Subsystem + * Copyright (C) 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: GDI DRIVEROBJ Functions + * FILE: subsys/win32k/eng/driverobj.c + * PROGRAMER: Gregor Anich + * REVISION HISTORY: + * 04/01/2005: Created + */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + +/*!\brief Called when the process is terminated. + * + * Calls the free-proc for each existing DRIVEROBJ. + * + * \param Process Pointer to the EPROCESS struct for the process beeing terminated. + * \param Win32Process Pointer to the W32PROCESS + */ +VOID FASTCALL +IntEngCleanupDriverObjs(struct _EPROCESS *Process, + PW32PROCESS Win32Process) +{ + PDRIVERGDI DrvObjInt; + + IntEngLockProcessDriverObjs(PsGetWin32Process()); + while (!IsListEmpty(&Win32Process->DriverObjListHead)) + { + DrvObjInt = CONTAINING_RECORD(Win32Process->DriverObjListHead.Flink, + DRIVERGDI, ListEntry); + IntEngUnLockProcessDriverObjs(PsGetWin32Process()); + EngDeleteDriverObj((HDRVOBJ)(&DrvObjInt->DriverObj), TRUE, FALSE); + IntEngLockProcessDriverObjs(PsGetWin32Process()); + } + IntEngUnLockProcessDriverObjs(PsGetWin32Process()); +} + + +/* + * @implemented + */ +HDRVOBJ +STDCALL +EngCreateDriverObj( + IN PVOID pvObj, + IN FREEOBJPROC pFreeObjProc, + IN HDEV hdev + ) +{ + PDRIVERGDI DrvObjInt; + PDRIVEROBJ DrvObjUser; + + /* Create DRIVEROBJ */ + DrvObjInt = EngAllocMem(0, sizeof (DRIVERGDI), TAG_DRIVEROBJ); + if (DrvObjInt == NULL) + { + DPRINT1("Failed to allocate memory for a DRIVERGDI structure!\n"); + return NULL; + } + + /* fill user object */ + DrvObjUser = GDIToObj(DrvObjInt, DRIVER); + DrvObjUser->pvObj = pvObj; + DrvObjUser->pFreeProc = pFreeObjProc; + DrvObjUser->hdev = hdev; + DrvObjUser->dhpdev = ((GDIDEVICE*)hdev)->PDev; + + /* fill internal object */ + ExInitializeFastMutex(&DrvObjInt->Lock); + IntEngLockProcessDriverObjs(PsGetWin32Process()); + InsertTailList(&PsGetWin32Process()->DriverObjListHead, &DrvObjInt->ListEntry); + IntEngUnLockProcessDriverObjs(PsGetWin32Process()); + + return (HDRVOBJ)DrvObjUser; +} + + +/* + * @implemented + */ +BOOL +STDCALL +EngDeleteDriverObj( + IN HDRVOBJ hdo, + IN BOOL bCallBack, + IN BOOL bLocked + ) +{ + PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; + PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); + + /* Make sure the obj is locked */ + if (!bLocked) + { + if (!ExTryToAcquireFastMutex(&DrvObjInt->Lock)) + { + return FALSE; + } + } + + /* Call the free-proc */ + if (bCallBack) + { + if (!DrvObjUser->pFreeProc(DrvObjUser)) + { + return FALSE; + } + } + + /* Free the DRIVEROBJ */ + IntEngLockProcessDriverObjs(PsGetWin32Process()); + RemoveEntryList(&DrvObjInt->ListEntry); + IntEngUnLockProcessDriverObjs(PsGetWin32Process()); + EngFreeMem(DrvObjInt); + + return TRUE; +} + + +/* + * @implemented + */ +PDRIVEROBJ +STDCALL +EngLockDriverObj( IN HDRVOBJ hdo ) +{ + PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; + PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); + + if (!ExTryToAcquireFastMutex(&DrvObjInt->Lock)) + { + return NULL; + } + + return DrvObjUser; +} + + +/* + * @implemented + */ +BOOL +STDCALL +EngUnlockDriverObj ( IN HDRVOBJ hdo ) +{ + PDRIVERGDI DrvObjInt = ObjToGDI((PDRIVEROBJ)hdo, DRIVER); + + ExReleaseFastMutex(&DrvObjInt->Lock); + return TRUE; +} + +/* EOF */ + _____ Modified: branches/win32k rewrite attempt/win32k/include/desktop.h --- branches/win32k rewrite attempt/win32k/include/desktop.h 2005-08-10 19:52:19 UTC (rev 17266) +++ branches/win32k rewrite attempt/win32k/include/desktop.h 2005-08-10 19:52:35 UTC (rev 17267) @@ -16,7 +16,7 @@ /* Pointer to the associated window station. */ struct _WINSTATION_OBJECT *WindowStation; /* Pointer to the active queue. */ - PVOID ActiveMessageQueue; + PW32THREAD ActiveWThread; /* Rectangle of the work area */ RECT WorkArea; /* Handle of the desktop window. */ @@ -70,11 +70,11 @@ HWND FASTCALL IntGetCurrentThreadDesktopWindow(VOID); -PUSER_MESSAGE_QUEUE FASTCALL -UserGetFocusMessageQueue(VOID); +PW32THREAD FASTCALL +UserGetFocusThread(VOID); VOID FASTCALL -IntSetFocusMessageQueue(PUSER_MESSAGE_QUEUE NewQueue); +IntSetFocusThread(PW32THREAD Thread); PDESKTOP_OBJECT FASTCALL UserGetActiveDesktop(VOID); _____ Modified: branches/win32k rewrite attempt/win32k/include/input.h --- branches/win32k rewrite attempt/win32k/include/input.h 2005-08-10 19:52:19 UTC (rev 17266) +++ branches/win32k rewrite attempt/win32k/include/input.h 2005-08-10 19:52:35 UTC (rev 17267) @@ -7,8 +7,8 @@ InitInputImpl(VOID); NTSTATUS FASTCALL InitKeyboardImpl(VOID); -PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue(VOID); -VOID W32kUnregisterPrimitiveMessageQueue(VOID); +PW32THREAD W32kGetPrimitiveWThread(VOID); +VOID W32kUnregisterPrimitiveWThread(VOID); PKBDTABLES W32kGetDefaultKeyLayout(VOID); VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout, BYTE Prefix); BOOL FASTCALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt); _____ Modified: branches/win32k rewrite attempt/win32k/include/msgqueue.h --- branches/win32k rewrite attempt/win32k/include/msgqueue.h 2005-08-10 19:52:19 UTC (rev 17266) +++ branches/win32k rewrite attempt/win32k/include/msgqueue.h 2005-08-10 19:52:35 UTC (rev 17267) @@ -74,11 +74,6 @@ typedef struct _USER_MESSAGE_QUEUE { - /* Reference counter, only access this variable with interlocked functions! */ - LONG References; - - /* Owner of the message queue */ - struct _ETHREAD *Thread; /* Queue of messages sent to the queue. */ LIST_ENTRY SentMessagesListHead; /* Queue of messages posted to the queue. */ @@ -87,8 +82,7 @@ LIST_ENTRY NotifyMessagesListHead; /* Queue for hardware messages for the queue. */ LIST_ENTRY HardwareMessagesListHead; - /* List of expired timers */ - //LIST_ENTRY ExpiredTimersList; + /* Number of expired timers for this thread */ ULONG TimerCount; /* Lock for the hardware message list. */ KMUTEX HardwareLock; @@ -130,149 +124,16 @@ /* Desktop that the message queue is attached to */ struct _DESKTOP_OBJECT *Desktop; - PUSER_THREAD_INPUT Input; } USER_MESSAGE_QUEUE, *PUSER_MESSAGE_QUEUE; -BOOL FASTCALL -MsqIsHung(PUSER_MESSAGE_QUEUE MessageQueue); -NTSTATUS FASTCALL -MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, - HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, - UINT uTimeout, BOOL Block, BOOL HookMessage, - ULONG_PTR *uResult); -PUSER_MESSAGE FASTCALL -MsqCreateMessage(LPMSG Msg, BOOLEAN FreeLParam); -VOID FASTCALL -MsqDestroyMessage(PUSER_MESSAGE Message); -VOID FASTCALL -MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, - MSG* Msg, BOOLEAN FreeLParam, DWORD MessageBits); -VOID FASTCALL -MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode); -BOOLEAN STDCALL -MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, - IN BOOLEAN Hardware, - IN BOOLEAN Remove, - IN HWND Wnd, - IN UINT MsgFilterLow, - IN UINT MsgFilterHigh, - OUT PUSER_MESSAGE* Message); -BOOLEAN FASTCALL -MsqInitializeMessageQueue(struct _ETHREAD *Thread, PUSER_MESSAGE_QUEUE MessageQueue); -VOID FASTCALL -MsqCleanupMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue); -PUSER_MESSAGE_QUEUE FASTCALL -MsqCreateMessageQueue(struct _ETHREAD *Thread); -PUSER_MESSAGE_QUEUE FASTCALL -MsqGetHardwareMessageQueue(VOID); -NTSTATUS FASTCALL -MsqInitializeImpl(VOID); -BOOLEAN FASTCALL -MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue); -NTSTATUS FASTCALL -MsqWaitForNewMessages(PUSER_MESSAGE_QUEUE MessageQueue, HWND WndFilter, - UINT MsgFilterMin, UINT MsgFilterMax); -VOID FASTCALL -MsqSendNotifyMessage(PUSER_MESSAGE_QUEUE MessageQueue, - PUSER_SENT_MESSAGE_NOTIFY NotifyMessage); -VOID FASTCALL -MsqIncPaintCountQueue(PUSER_MESSAGE_QUEUE Queue); -VOID FASTCALL -MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue); -void cp(char* f, int l); -//#define IntSendMessage(a,b,c,d) (cp(__FILE__,__LINE__), IIntSendMessage(a,b,c,d)) -LRESULT FASTCALL -IntSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); -LRESULT FASTCALL -IntPostOrSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); -LRESULT FASTCALL -IntSendMessageTimeout(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult); -LRESULT FASTCALL -IntDispatchMessage(MSG* Msg); -BOOL FASTCALL -IntTranslateKbdMessage(LPMSG lpMsg, HKL dwhkl); -VOID FASTCALL -MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); -VOID FASTCALL -MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam); -VOID FASTCALL -MsqInsertSystemMessage(MSG* Msg); -BOOL FASTCALL -MsqIsDblClk(LPMSG Msg, BOOL Remove); -inline BOOL MsqIsSignaled( PUSER_MESSAGE_QUEUE queue ); -inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); -inline VOID MsqClearQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); -BOOL STDCALL IntInitMessagePumpHook(); -BOOL STDCALL IntUninitMessagePumpHook(); -#define MAKE_LONG(x, y) ((((y) & 0xFFFF) << 16) | ((x) & 0xFFFF)) -PHOOKTABLE FASTCALL MsqGetHooks(PUSER_MESSAGE_QUEUE Queue); -VOID FASTCALL MsqSetHooks(PUSER_MESSAGE_QUEUE Queue, PHOOKTABLE Hooks); -LPARAM FASTCALL MsqSetMessageExtraInfo(LPARAM lParam); -LPARAM FASTCALL MsqGetMessageExtraInfo(VOID); - -#define IntLockHardwareMessageQueue(MsgQueue) \ - KeWaitForMutexObject(&(MsgQueue)->HardwareLock, UserRequest, KernelMode, FALSE, NULL) - -#define IntUnLockHardwareMessageQueue(MsgQueue) \ - KeReleaseMutex(&(MsgQueue)->HardwareLock, FALSE) - -#define IntReferenceMessageQueue(MsgQueue) \ - InterlockedIncrement(&(MsgQueue)->References) - - - -#define IS_BTN_MESSAGE(message,code) \ - ((message) == WM_LBUTTON##code || \ - (message) == WM_MBUTTON##code || \ - (message) == WM_RBUTTON##code || \ - (message) == WM_XBUTTON##code || \ - (message) == WM_NCLBUTTON##code || \ - (message) == WM_NCMBUTTON##code || \ - (message) == WM_NCRBUTTON##code || \ - (message) == WM_NCXBUTTON##code ) - -HANDLE FASTCALL -IntMsqSetWakeMask(DWORD WakeMask); - -BOOL FASTCALL -IntMsqClearWakeMask(VOID); - -BOOLEAN FASTCALL -MsqSetTimer(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, - UINT_PTR IDEvent, UINT Period, TIMERPROC TimerFunc, - UINT Msg); -BOOLEAN FASTCALL -MsqKillTimer(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, - UINT_PTR IDEvent, UINT Msg); -BOOLEAN FASTCALL -MsqGetTimerMessage(PUSER_MESSAGE_QUEUE MessageQueue, - HWND WndFilter, UINT MsgFilterMin, UINT MsgFilterMax, - MSG *Msg, BOOLEAN Restart); -BOOLEAN FASTCALL -MsqGetFirstTimerExpiry(PUSER_MESSAGE_QUEUE MessageQueue, - HWND WndFilter, UINT MsgFilterMin, UINT MsgFilterMax, - PLARGE_INTEGER FirstTimerExpiry); - #endif /* _WIN32K_MSGQUEUE_H */ /* EOF */ _____ Modified: branches/win32k rewrite attempt/win32k/include/ntuser.h --- branches/win32k rewrite attempt/win32k/include/ntuser.h 2005-08-10 19:52:19 UTC (rev 17266) +++ branches/win32k rewrite attempt/win32k/include/ntuser.h 2005-08-10 19:52:35 UTC (rev 17267) @@ -113,13 +113,13 @@ /* typedef enum { - otUnknown = 0, + otFree = 0, otClass, - otWindow, + otWnd, otMenu, - otAcceleratorTable, - otCursorIcon, - otHookProc, + otAccel, + otCursor, + otHook, otMonitor } USER_OBJECT_TYPE; */ @@ -134,6 +134,7 @@ USER_CURSOR_ICON, USER_HOOK_PROC, USER_MONITOR + } USER_OBJECT_TYPE; _____ Modified: branches/win32k rewrite attempt/win32k/include/painting.h --- branches/win32k rewrite attempt/win32k/include/painting.h 2005-08-10 19:52:19 UTC (rev 17266) +++ branches/win32k rewrite attempt/win32k/include/painting.h 2005-08-10 19:52:35 UTC (rev 17267) @@ -1,28 +0,0 @@ -#ifndef _WIN32K_PAINTING_H -#define _WIN32K_PAINTING_H - -#include <include/class.h> -#include <include/msgqueue.h> -#include <include/window.h> - -VOID FASTCALL -IntValidateParent(PWINDOW_OBJECT Child, HRGN ValidRegion); -BOOL FASTCALL -UserRedrawWindow(PWINDOW_OBJECT Wnd, const RECT* UpdateRect, HRGN UpdateRgn, ULONG Flags); -BOOL FASTCALL -IntGetPaintMessage(HWND hWnd, UINT MsgFilterMin, UINT MsgFilterMax, PW32THREAD Thread, - MSG *Message, BOOL Remove); -//BOOL STDCALL -//NtUserValidateRgn(HWND hWnd, HRGN hRgn); - - -BOOL FASTCALL UserValidateRgn(PWINDOW_OBJECT hWnd, HRGN hRgn); - - -#define IntLockWindowUpdate(Window) \ - ExAcquireFastMutex(&Window->UpdateLock) - -#define IntUnLockWindowUpdate(Window) \ - ExReleaseFastMutex(&Window->UpdateLock) - -#endif /* _WIN32K_PAINTING_H */ _____ Modified: branches/win32k rewrite attempt/win32k/include/prop.h --- branches/win32k rewrite attempt/win32k/include/prop.h 2005-08-10 19:52:19 UTC (rev 17266) +++ branches/win32k rewrite attempt/win32k/include/prop.h 2005-08-10 19:52:35 UTC (rev 17267) @@ -8,17 +8,6 @@ ATOM Atom; } PROPERTY, *PPROPERTY; -BOOL FASTCALL -IntSetProp(PWINDOW_OBJECT Wnd, ATOM Atom, HANDLE Data); -PPROPERTY FASTCALL -IntGetProp(PWINDOW_OBJECT WindowObject, ATOM Atom); - -#define IntLockWindowProperties(Window) \ - ExAcquireFastMutex(&Window->PropListLock) - -#define IntUnLockWindowProperties(Window) \ - ExReleaseFastMutex(&Window->PropListLock) - #endif /* _WIN32K_PROP_H */ _____ Modified: branches/win32k rewrite attempt/win32k/include/timer.h --- branches/win32k rewrite attempt/win32k/include/timer.h 2005-08-10 19:52:19 UTC (rev 17266) +++ branches/win32k rewrite attempt/win32k/include/timer.h 2005-08-10 19:52:35 UTC (rev 17267) @@ -7,7 +7,7 @@ LIST_ENTRY ListEntry; LARGE_INTEGER ExpiryTime; PWINDOW_OBJECT Wnd; - PUSER_MESSAGE_QUEUE Queue; + PW32THREAD WThread; UINT_PTR IDEvent; UINT Period; TIMERPROC TimerFunc; _____ Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h --- branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-08-10 19:52:19 UTC (rev 17266) +++ branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-08-10 19:52:35 UTC (rev 17267) @@ -6,6 +6,10 @@ DWORD FASTCALL UserGetKeyState(DWORD key); +BOOL FASTCALL +IntTranslateKbdMessage(LPMSG lpMsg, HKL dwhkl); + + /******************** HANDLE.C ***************/ VOID UserInitHandleTable(PUSER_HANDLE_TABLE ht, PVOID mem, ULONG bytes); @@ -14,7 +18,15 @@ PVOID UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ); PVOID UserGetNextHandle(PUSER_HANDLE_TABLE ht, HANDLE* handle, USER_OBJECT_TYPE type ); +/************* PROP.C *****************/ +BOOL FASTCALL +IntSetProp(PWINDOW_OBJECT Wnd, ATOM Atom, HANDLE Data); + +PPROPERTY FASTCALL +IntGetProp(PWINDOW_OBJECT WindowObject, ATOM Atom); + + /************* DESKTOP.C *****************/ inline PDESKTOP_OBJECT FASTCALL UserGetCurrentDesktop(); @@ -47,7 +59,25 @@ UserSetFocus(PWINDOW_OBJECT Wnd OPTIONAL); -/* painting.c */ +/******************** PAINTING.C ********************************/ + +VOID FASTCALL +IntValidateParent(PWINDOW_OBJECT Child, HRGN ValidRegion); +BOOL FASTCALL +UserRedrawWindow(PWINDOW_OBJECT Wnd, const RECT* UpdateRect, HRGN UpdateRgn, ULONG Flags); +BOOL FASTCALL +IntGetPaintMessage(HWND hWnd, UINT MsgFilterMin, UINT MsgFilterMax, PW32THREAD Thread, + MSG *Message, BOOL Remove); + +BOOL FASTCALL UserValidateRgn(PWINDOW_OBJECT hWnd, HRGN hRgn); + + +#define IntLockWindowUpdate(Window) \ + ExAcquireFastMutex(&Window->UpdateLock) + +#define IntUnLockWindowUpdate(Window) \ + ExReleaseFastMutex(&Window->UpdateLock) + DWORD FASTCALL UserInvalidateRect(PWINDOW_OBJECT Wnd, CONST RECT *Rect, BOOL Erase); @@ -58,10 +88,37 @@ INT FASTCALL UserGetUpdateRgn(PWINDOW_OBJECT Window, HRGN hRgn, BOOL bErase); -/* message.c */ +/******************** MESSAGE.C ********************************/ + BOOL FASTCALL UserPostMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); +LRESULT FASTCALL +IntSendMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam); + +LRESULT FASTCALL +IntPostOrSendMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam); + +LRESULT FASTCALL +IntSendMessageTimeout(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uFlags, + UINT uTimeout, + ULONG_PTR *uResult); + +LRESULT FASTCALL +IntDispatchMessage(MSG* Msg); + + + /************************ WINDOW.C *****************************/ inline VOID FASTCALL UserFreeWindowObject(PWINDOW_OBJECT Wnd); @@ -126,8 +183,9 @@ DWORD FASTCALL UserShowScrollBar(PWINDOW_OBJECT Wnd, int wBar, DWORD bShow); -/* timer.c */ +/************************* TIMER.C ****************************/ + inline VOID FASTCALL UserFreeTimer(PTIMER_ENTRY Timer); @@ -141,16 +199,20 @@ UserSetNextPendingTimer(); VOID FASTCALL -UserRemoveTimersQueue(PUSER_MESSAGE_QUEUE Queue); +UserRemoveTimersThread(PW32THREAD W32Thread); -/* hook.c*/ + +/********************* HOOK.C *****************/ + PHOOK FASTCALL HookCreate(HHOOK* hHook); PHOOK FASTCALL HookGet(HHOOK hHook); -/* class.c */ +/********************* CLASS.C *****************/ + + VOID FASTCALL ClassReferenceClass(PWNDCLASS_OBJECT Class); @@ -185,7 +247,7 @@ CursorGet(HCURSOR hCursor); -/* monitor.c */ +/******************* MONITOR.C ********************/ PMONITOR_OBJECT FASTCALL UserCreateMonitorObject(HANDLE* h); @@ -219,7 +281,7 @@ PTIMER_ENTRY FASTCALL UserFindExpiredTimer( - PUSER_MESSAGE_QUEUE Queue, + PW32THREAD W32Thread, PWINDOW_OBJECT Wnd OPTIONAL, UINT MsgFilterMin, UINT MsgFilterMax, @@ -233,6 +295,138 @@ UINT Message ); + +BOOL FASTCALL +MsqIsHung(PUSER_MESSAGE_QUEUE MessageQueue); +NTSTATUS FASTCALL +MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, + HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, + UINT uTimeout, BOOL Block, BOOL HookMessage, + ULONG_PTR *uResult); +PUSER_MESSAGE FASTCALL +MsqCreateMessage(LPMSG Msg, BOOLEAN FreeLParam); +VOID FASTCALL +MsqDestroyMessage(PUSER_MESSAGE Message); +VOID FASTCALL +MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, + MSG* Msg, BOOLEAN FreeLParam, DWORD MessageBits); +VOID FASTCALL +MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode); +BOOLEAN STDCALL +MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, + IN BOOLEAN Hardware, + IN BOOLEAN Remove, + IN HWND Wnd, + IN UINT MsgFilterLow, + IN UINT MsgFilterHigh, + OUT PUSER_MESSAGE* Message); +BOOLEAN FASTCALL +MsqInitializeMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue); +VOID FASTCALL +MsqCleanupMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue); +BOOLEAN FASTCALL +MsqCreateMessageQueue(PW32THREAD WThread); +PUSER_MESSAGE_QUEUE FASTCALL +MsqGetHardwareMessageQueue(VOID); +NTSTATUS FASTCALL +MsqInitializeImpl(VOID); +BOOLEAN FASTCALL +MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue); +NTSTATUS FASTCALL +MsqWaitForNewMessages(PUSER_MESSAGE_QUEUE MessageQueue, HWND WndFilter, + UINT MsgFilterMin, UINT MsgFilterMax); +VOID FASTCALL +MsqSendNotifyMessage(PUSER_MESSAGE_QUEUE MessageQueue, + PUSER_SENT_MESSAGE_NOTIFY NotifyMessage); +VOID FASTCALL +MsqIncPaintCountQueue(PUSER_MESSAGE_QUEUE Queue); +VOID FASTCALL +MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue); + +void cp(char* f, int l); +//#define IntSendMessage(a,b,c,d) (cp(__FILE__,__LINE__), IIntSendMessage(a,b,c,d)) + + + +VOID FASTCALL +MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); +VOID FASTCALL +MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam); +VOID FASTCALL +MsqInsertSystemMessage(MSG* Msg); +BOOL FASTCALL +MsqIsDblClk(LPMSG Msg, BOOL Remove); + +inline BOOL MsqIsSignaled( PUSER_MESSAGE_QUEUE queue ); +inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); +inline VOID MsqClearQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); + +BOOL STDCALL IntInitMessagePumpHook(); +BOOL STDCALL IntUninitMessagePumpHook(); + +#define MAKE_LONG(x, y) ((((y) & 0xFFFF) << 16) | ((x) & 0xFFFF)) + +PHOOKTABLE FASTCALL MsqGetHooks(PUSER_MESSAGE_QUEUE Queue); +VOID FASTCALL MsqSetHooks(PUSER_MESSAGE_QUEUE Queue, PHOOKTABLE Hooks); + +LPARAM FASTCALL MsqSetMessageExtraInfo(LPARAM lParam); +LPARAM FASTCALL MsqGetMessageExtraInfo(VOID); + +#define IntLockHardwareMessageQueue(MsgQueue) \ + KeWaitForMutexObject(&(MsgQueue)->HardwareLock, UserRequest, KernelMode, FALSE, NULL) + +#define IntUnLockHardwareMessageQueue(MsgQueue) \ + KeReleaseMutex(&(MsgQueue)->HardwareLock, FALSE) + +#define IntReferenceMessageQueue(MsgQueue) \ + InterlockedIncrement(&(MsgQueue)->References) + + + +#define IS_BTN_MESSAGE(message,code) \ + ((message) == WM_LBUTTON##code || \ + (message) == WM_MBUTTON##code || \ + (message) == WM_RBUTTON##code || \ + (message) == WM_XBUTTON##code || \ + (message) == WM_NCLBUTTON##code || \ + (message) == WM_NCMBUTTON##code || \ + (message) == WM_NCRBUTTON##code || \ + (message) == WM_NCXBUTTON##code ) + +HANDLE FASTCALL +IntMsqSetWakeMask(DWORD WakeMask); + +BOOL FASTCALL +IntMsqClearWakeMask(VOID); + +BOOLEAN FASTCALL +MsqSetTimer(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, + UINT_PTR IDEvent, UINT Period, TIMERPROC TimerFunc, + UINT Msg); +BOOLEAN FASTCALL +MsqKillTimer(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, + UINT_PTR IDEvent, UINT Msg); +BOOLEAN FASTCALL +MsqGetTimerMessage(PW32THREAD W32Thread, + HWND WndFilter, UINT MsgFilterMin, UINT MsgFilterMax, + MSG *Msg, BOOLEAN Restart); +BOOLEAN FASTCALL +MsqGetFirstTimerExpiry(PUSER_MESSAGE_QUEUE MessageQueue, + HWND WndFilter, UINT MsgFilterMin, UINT MsgFilterMax, + PLARGE_INTEGER FirstTimerExpiry); + + + +/**************************** VIS.C ************************/ + +HRGN FASTCALL +VIS_ComputeVisibleRegion(PWINDOW_OBJECT Window, BOOLEAN ClientArea, + BOOLEAN ClipChildren, BOOLEAN ClipSiblings); + +VOID FASTCALL +VIS_WindowLayoutChanged(PWINDOW_OBJECT Window, HRGN UncoveredRgn); + + /**************************** NTUSER.C ************************/ inline PVOID FASTCALL UserAlloc(SIZE_T bytes); @@ -241,6 +435,8 @@ inline PVOID FASTCALL UserAllocZeroTag(SIZE_T bytes, ULONG tag); inline VOID FASTCALL UserFree(PVOID mem); +VOID FASTCALL +DestroyThreadWindows(PW32THREAD W32Thread); /* windc.c */ @@ -256,7 +452,7 @@ /* div */ #define UserGetCurrentQueue() \ -((PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue) +((PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->Queue) _____ Modified: branches/win32k rewrite attempt/win32k/include/vis.h --- branches/win32k rewrite attempt/win32k/include/vis.h 2005-08-10 19:52:19 UTC (rev 17266) +++ branches/win32k rewrite attempt/win32k/include/vis.h 2005-08-10 19:52:35 UTC (rev 17267) @@ -1,26 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32k subsystem - * PURPOSE: Visibility computations interface definition - * FILE: include/win32k/vis.h - * PROGRAMMER: Ge van Geldorp (ge(a)gse.nl) - * - */ - -#ifndef _WIN32K_VIS_H -#define _WIN32K_VIS_H - -#include <include/window.h> - -HRGN FASTCALL -VIS_ComputeVisibleRegion(PWINDOW_OBJECT Window, BOOLEAN ClientArea, [truncated at 1000 lines; 2592 more skipped]

19 years, 4 months

[gdalsnes] 17266: some stuff

by gdalsnes＠svn.reactos.com

some stuff Modified: branches/win32k rewrite attempt/inc_w32k/misc.h Modified: branches/win32k rewrite attempt/inc_w32k/ntuser.h Deleted: branches/win32k rewrite attempt/inc_w32k/win32.h _____ Modified: branches/win32k rewrite attempt/inc_w32k/misc.h --- branches/win32k rewrite attempt/inc_w32k/misc.h 2005-08-10 19:19:13 UTC (rev 17265) +++ branches/win32k rewrite attempt/inc_w32k/misc.h 2005-08-10 19:52:19 UTC (rev 17266) @@ -6,8 +6,5 @@ #define W32PF_MANUALGUICHECK (0x0002) #define W32PF_CREATEDWINORDC (0x0004) -VOID -FASTCALL -DestroyThreadWindows(struct _ETHREAD *Thread); #endif /* __WIN32K_MISC_H */ _____ Modified: branches/win32k rewrite attempt/inc_w32k/ntuser.h --- branches/win32k rewrite attempt/inc_w32k/ntuser.h 2005-08-10 19:19:13 UTC (rev 17265) +++ branches/win32k rewrite attempt/inc_w32k/ntuser.h 2005-08-10 19:52:19 UTC (rev 17266) @@ -1,8 +1,6 @@ #ifndef __WIN32K_NTUSER_H #define __WIN32K_NTUSER_H -//#define WM_SYSTIMER 280 - ULONG STDCALL NtUserGetSystemMetrics(ULONG Index); _____ Deleted: branches/win32k rewrite attempt/inc_w32k/win32.h --- branches/win32k rewrite attempt/inc_w32k/win32.h 2005-08-10 19:19:13 UTC (rev 17265) +++ branches/win32k rewrite attempt/inc_w32k/win32.h 2005-08-10 19:52:19 UTC (rev 17266) @@ -1,43 +0,0 @@ -#ifndef __INCLUDE_NAPI_WIN32_H -#define __INCLUDE_NAPI_WIN32_H - -#include <pshpack1.h> - -typedef struct _W32THREAD -{ - PVOID MessageQueue; - FAST_MUTEX WindowListLock; - LIST_ENTRY WindowListHead; - LIST_ENTRY W32CallbackListHead; - struct _KBDTABLES* KeyboardLayout; - struct _DESKTOP_OBJECT* Desktop; - HANDLE hDesktop; - DWORD MessagePumpHookValue; - BOOLEAN IsExiting; -} W32THREAD, *PW32THREAD; - -#include <poppack.h> - - -typedef struct _W32PROCESS -{ - FAST_MUTEX ClassListLock; - LIST_ENTRY ClassListHead; - FAST_MUTEX MenuListLock; - LIST_ENTRY MenuListHead; - FAST_MUTEX PrivateFontListLock; - LIST_ENTRY PrivateFontListHead; - FAST_MUTEX DriverObjListLock; - LIST_ENTRY DriverObjListHead; - struct _KBDTABLES* KeyboardLayout; - ULONG Flags; - LONG GDIObjects; - LONG UserObjects; -} W32PROCESS, *PW32PROCESS; - -PW32THREAD STDCALL -PsGetWin32Thread(VOID); -PW32PROCESS STDCALL -PsGetWin32Process(VOID); - -#endif /* __INCLUDE_NAPI_WIN32_H */

19 years, 4 months

[gdalsnes] 17265: move WM_SYSTIMER where it belongs

by gdalsnes＠svn.reactos.com

move WM_SYSTIMER where it belongs Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-08-10 18:42:27 UTC (rev 17264) +++ trunk/reactos/include/win32k/ntuser.h 2005-08-10 19:19:13 UTC (rev 17265) @@ -1,7 +1,6 @@ #ifndef __WIN32K_NTUSER_H #define __WIN32K_NTUSER_H -#define WM_SYSTIMER 280 ULONG STDCALL NtUserGetSystemMetrics(ULONG Index); _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-08-10 18:42:27 UTC (rev 17264) +++ trunk/reactos/w32api/include/winuser.h 2005-08-10 19:19:13 UTC (rev 17265) @@ -1497,6 +1497,7 @@ #define WM_TCARD 82 #define WM_TIMECHANGE 30 #define WM_TIMER 275 +#define WM_SYSTIMER 280 #define WM_UNDO 772 #define WM_USER 1024 #define WM_USERCHANGED 84

19 years, 4 months

[gdalsnes] 17264: add missing define

by gdalsnes＠svn.reactos.com

add missing define Modified: trunk/reactos/w32api/include/oleacc.h _____ Modified: trunk/reactos/w32api/include/oleacc.h --- trunk/reactos/w32api/include/oleacc.h 2005-08-10 18:10:45 UTC (rev 17263) +++ trunk/reactos/w32api/include/oleacc.h 2005-08-10 18:42:27 UTC (rev 17264) @@ -108,6 +108,7 @@ #define STATE_SYSTEM_PRESSED 0x00000008 #define STATE_SYSTEM_CHECKED 0x00000010 #define STATE_SYSTEM_MIXED 0x00000020 +#define STATE_SYSTEM_INDETERMINATE STATE_SYSTEM_MIXED #define STATE_SYSTEM_READONLY 0x00000040 #define STATE_SYSTEM_HOTTRACKED 0x00000080 #define STATE_SYSTEM_DEFAULT 0x00000100

19 years, 4 months

[greatlrd] 17263: Windows 2000 does not always zerofill data if you are using heap_zero fill. to be 100% sure everything are zero fill, we need zerofil the whole object before instate

by greatlrd＠svn.reactos.com

Windows 2000 does not always zerofill data if you are using heap_zero fill. to be 100% sure everything are zero fill, we need zerofil the whole object before instate Modified: trunk/reactos/lib/ddraw/main.c _____ Modified: trunk/reactos/lib/ddraw/main.c --- trunk/reactos/lib/ddraw/main.c 2005-08-10 18:09:44 UTC (rev 17262) +++ trunk/reactos/lib/ddraw/main.c 2005-08-10 18:10:45 UTC (rev 17263) @@ -21,6 +21,8 @@ if (This == NULL) return E_OUTOFMEMORY; + ZeroMemory(This,sizeof(IDirectDrawImpl)); + This->lpVtbl = &DirectDraw_VTable; This->ref = 1; *pIface = (LPDIRECTDRAW)This;

19 years, 4 months

[gdalsnes] 17262: move W32PROCESS/W32THREAD into win32\include bcause they are win32k private structs

by gdalsnes＠svn.reactos.com

move W32PROCESS/W32THREAD into win32\include bcause they are win32k private structs Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/pstypes.h Deleted: trunk/reactos/include/win32k/win32.h Added: trunk/reactos/subsys/win32k/include/win32.h Modified: trunk/reactos/subsys/win32k/include/win32k.h Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/include/ndk/psfuncs.h --- trunk/reactos/include/ndk/psfuncs.h 2005-08-10 17:49:57 UTC (rev 17261) +++ trunk/reactos/include/ndk/psfuncs.h 2005-08-10 18:09:44 UTC (rev 17262) @@ -14,6 +14,12 @@ /* PROTOTYPES ****************************************************************/ +struct _W32THREAD* STDCALL +PsGetWin32Thread(VOID); + +struct _W32PROCESS* STDCALL +PsGetWin32Process(VOID); + PVOID STDCALL PsGetProcessWin32Process(PEPROCESS Process); _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-08-10 17:49:57 UTC (rev 17261) +++ trunk/reactos/include/ndk/pstypes.h 2005-08-10 18:09:44 UTC (rev 17262) @@ -91,6 +91,9 @@ /* TYPES *********************************************************************/ +struct _W32THREAD; +struct _W32PROCESS; + struct _ETHREAD; typedef struct _DESCRIPTOR_TABLE_ENTRY _____ Deleted: trunk/reactos/include/win32k/win32.h --- trunk/reactos/include/win32k/win32.h 2005-08-10 17:49:57 UTC (rev 17261) +++ trunk/reactos/include/win32k/win32.h 2005-08-10 18:09:44 UTC (rev 17262) @@ -1,43 +0,0 @@ -#ifndef __INCLUDE_NAPI_WIN32_H -#define __INCLUDE_NAPI_WIN32_H - -#include <pshpack1.h> - -typedef struct _W32THREAD -{ - PVOID MessageQueue; - FAST_MUTEX WindowListLock; - LIST_ENTRY WindowListHead; - LIST_ENTRY W32CallbackListHead; - struct _KBDTABLES* KeyboardLayout; - struct _DESKTOP_OBJECT* Desktop; - HANDLE hDesktop; - DWORD MessagePumpHookValue; - BOOLEAN IsExiting; -} W32THREAD, *PW32THREAD; - -#include <poppack.h> - - -typedef struct _W32PROCESS -{ - FAST_MUTEX ClassListLock; - LIST_ENTRY ClassListHead; - FAST_MUTEX MenuListLock; - LIST_ENTRY MenuListHead; - FAST_MUTEX PrivateFontListLock; - LIST_ENTRY PrivateFontListHead; - FAST_MUTEX DriverObjListLock; - LIST_ENTRY DriverObjListHead; - struct _KBDTABLES* KeyboardLayout; - ULONG Flags; - LONG GDIObjects; - LONG UserObjects; -} W32PROCESS, *PW32PROCESS; - -PW32THREAD STDCALL -PsGetWin32Thread(VOID); -PW32PROCESS STDCALL -PsGetWin32Process(VOID); - -#endif /* __INCLUDE_NAPI_WIN32_H */ _____ Copied: trunk/reactos/subsys/win32k/include/win32.h (from rev 17221, trunk/reactos/include/win32k/win32.h) --- trunk/reactos/include/win32k/win32.h 2005-08-09 00:02:24 UTC (rev 17221) +++ trunk/reactos/subsys/win32k/include/win32.h 2005-08-10 18:09:44 UTC (rev 17262) @@ -0,0 +1,39 @@ +#ifndef __INCLUDE_NAPI_WIN32_H +#define __INCLUDE_NAPI_WIN32_H + +#include <pshpack1.h> + +typedef struct _W32THREAD +{ + struct _USER_MESSAGE_QUEUE* MessageQueue; + FAST_MUTEX WindowListLock; + LIST_ENTRY WindowListHead; + LIST_ENTRY W32CallbackListHead; + struct _KBDTABLES* KeyboardLayout; + struct _DESKTOP_OBJECT* Desktop; + HANDLE hDesktop; + DWORD MessagePumpHookValue; + BOOLEAN IsExiting; +} W32THREAD, *PW32THREAD; + +#include <poppack.h> + + +typedef struct _W32PROCESS +{ + FAST_MUTEX ClassListLock; + LIST_ENTRY ClassListHead; + FAST_MUTEX MenuListLock; + LIST_ENTRY MenuListHead; + FAST_MUTEX PrivateFontListLock; + LIST_ENTRY PrivateFontListHead; + FAST_MUTEX DriverObjListLock; + LIST_ENTRY DriverObjListHead; + struct _KBDTABLES* KeyboardLayout; + ULONG Flags; + LONG GDIObjects; + LONG UserObjects; +} W32PROCESS, *PW32PROCESS; + + +#endif /* __INCLUDE_NAPI_WIN32_H */ _____ Modified: trunk/reactos/subsys/win32k/include/win32k.h --- trunk/reactos/subsys/win32k/include/win32k.h 2005-08-10 17:49:57 UTC (rev 17261) +++ trunk/reactos/subsys/win32k/include/win32k.h 2005-08-10 18:09:44 UTC (rev 17262) @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ /* Internal Win32k Headers */ +#include <include/win32.h> #include <include/ssec.h> #include <include/accelerator.h> #include <include/callback.h> _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-08-10 17:49:57 UTC (rev 17261) +++ trunk/reactos/subsys/win32k/w32k.h 2005-08-10 18:09:44 UTC (rev 17262) @@ -39,7 +39,6 @@ /* External Win32K Header */ #include <win32k/win32k.h> -#include <win32k/win32.h> /* Internal Win32K Header */ #include "include/win32k.h"

19 years, 4 months

[hbirr] 17261: Fixed the base detection in RtlUnicodeStringToInteger again.

by hbirr＠svn.reactos.com

Fixed the base detection in RtlUnicodeStringToInteger again. Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-08-10 17:48:13 UTC (rev 17260) +++ trunk/reactos/lib/rtl/unicode.c 2005-08-10 17:49:57 UTC (rev 17261) @@ -876,7 +876,7 @@ USHORT CharsRemaining = str->Length / sizeof(WCHAR); WCHAR wchCurrent; int digit; - ULONG newbase = 10; + ULONG newbase = 0; ULONG RunningTotal = 0; char bMinus = 0; @@ -911,9 +911,11 @@ newbase = 16; } /* if */ } - if (base == 0) { + if (base == 0 && newbase == 0) { + base = 10; + } else if (base == 0 && newbase != 0) { base = newbase; - } else if ((base != newbase) || + } else if ((newbase != 0 && base != newbase) || (base != 2 && base != 8 && base != 10 && base != 16)) { return STATUS_INVALID_PARAMETER;

19 years, 4 months

[gdalsnes] 17260: fix horribly broken ftol. this fixes abiword 2.0.3

by gdalsnes＠svn.reactos.com

fix horribly broken ftol. this fixes abiword 2.0.3 Modified: trunk/reactos/lib/rtl/i386/math.S _____ Modified: trunk/reactos/lib/rtl/i386/math.S --- trunk/reactos/lib/rtl/i386/math.S 2005-08-10 17:19:13 UTC (rev 17259) +++ trunk/reactos/lib/rtl/i386/math.S 2005-08-10 17:48:13 UTC (rev 17260) @@ -204,6 +204,11 @@ .intel_syntax noprefix +/* + * This routine is called by MSVC-generated code to convert from floating point + * to integer representation. The floating point number to be converted is + * on the top of the floating point stack. + */ __ftol: /* Set up stack frame */ push ebp @@ -214,10 +219,11 @@ wait mov ax, [ebp-2] or ah, 0xC + mov [ebp-4], ax fldcw [ebp-4] /* Do the conversion */ - fistp qword ptr [ebp-8] + fistp qword ptr [ebp-12] /* Restore rounding mode */ fldcw [ebp-2]

19 years, 4 months

[royce] 17259: registry entries to install .inf files. No clue if this is correct.

by royce＠svn.reactos.com

registry entries to install .inf files. No clue if this is correct. Modified: trunk/reactos/bootdata/hivecls.inf _____ Modified: trunk/reactos/bootdata/hivecls.inf --- trunk/reactos/bootdata/hivecls.inf 2005-08-10 16:33:49 UTC (rev 17258) +++ trunk/reactos/bootdata/hivecls.inf 2005-08-10 17:19:13 UTC (rev 17259) @@ -9,6 +9,11 @@ HKCR,"exefile\Defaulticon","",0x00000000,"%1" HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*" +; Show icons for inf (installation) files +HKCR,".inf","",0x00000000,"inffile" +HKCR,"inffile\DefaultIcon","",0x00000000,"%SystemRoot%\System32\shell32 .dll,-151" +HKCR,"inffile\shell\Install\command","",0x00020000,"%SystemRoot%\System 32\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" + ; Show icons for shortcuts in shell views (lnkfile is handled specially in shell32) ; Don't display extension for shortcuts HKCR,".lnk","",0x00000000,"lnkfile"

19 years, 4 months

← Newer
1
...
31
32
33
34
35
36
37
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005