Update the generated tests
Francois Gouget
fgouget at free.fr
Tue Aug 24 17:43:52 CDT 2004
Review all the disabled types in test.dat and for each, either re-enable
it or add a comment explaining why it has to be disabled. Some have to
be disabled due to limitations in winapi_test. So the goal for these
will be to improve winapi_test and enable testing for them.
The updated tests compile and run successfully both when compiled with
MSVC and the Windows headers, and when compiled with gcc and the Wine
headers.
Changelog:
* tools/winapi/tests.dat
dlls/gdi/tests/generated.c
dlls/kernel/tests/generated.c
dlls/ntdll/tests/generated.c
dlls/shell32/tests/generated.c
dlls/user/tests/generated.c
dlls/wininet/tests/generated.c
Enable the disabled tests in tests.data or add a comment describing
why the type cannot be tested.
Update the generated files, they compile and run successfully both on
Windows (with the Windows headers) and in Wine.
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
We are Pentium of Borg. You will be approximated. Division is futile.
-------------- next part --------------
Index: tools/winapi/tests.dat
===================================================================
RCS file: /var/cvs/wine/tools/winapi/tests.dat,v
retrieving revision 1.21
diff -u -r1.21 tests.dat
--- tools/winapi/tests.dat 24 Aug 2004 20:16:25 -0000 1.21
+++ tools/winapi/tests.dat 24 Aug 2004 21:38:28 -0000
@@ -36,8 +36,8 @@
CIEXYZTRIPLE
COLOR16
COLORADJUSTMENT
-!DEVMODEA
-!DEVMODEW
+DEVMODEA
+DEVMODEW
DIBSECTION
DISPLAY_DEVICEA
DISPLAY_DEVICEW
@@ -57,7 +57,7 @@
EMRCREATECOLORSPACEW
EMRCREATEDIBPATTERNBRUSHPT
EMRCREATEMONOBRUSH
-!EMRCREATEPALETTE
+!EMRCREATEPALETTE # FIXME: 20040821: Mishandled by winapi_test
EMRCREATEPEN
EMRDELETECOLORSPACE
EMRDELETEOBJECT
@@ -133,7 +133,7 @@
EMRSETMAPPERFLAGS
EMRSETMETARGN
EMRSETMITERLIMIT
-!EMRSETPALETTEENTRIES
+!EMRSETPALETTEENTRIES # FIXME: 20040821: Mishandled by winapi_test
EMRSETPIXELV
EMRSETPOLYFILLMODE
EMRSETROP2
@@ -187,7 +187,7 @@
LOGCOLORSPACEW
LOGFONTA
LOGFONTW
-!LOGPALETTE
+!LOGPALETTE # FIXME: 20040821: Mishandled by winapi_test
LOGPEN
LPABC
LPABCFLOAT
@@ -202,8 +202,8 @@
LPCIEXYZ
LPCIEXYZTRIPLE
LPCOLORADJUSTMENT
-!LPDEVMODEA
-!LPDEVMODEW
+LPDEVMODEA
+LPDEVMODEW
LPDIBSECTION
LPDISPLAY_DEVICEA
LPDISPLAY_DEVICEW
@@ -232,7 +232,7 @@
LPLOGCOLORSPACEW
LPLOGFONTA
LPLOGFONTW
-!LPLOGPALETTE
+!LPLOGPALETTE # FIXME: 20040821: Mishandled by winapi_test
LPLOGPEN
LPMAT2
LPMETAFILEPICT
@@ -242,7 +242,7 @@
LPNEWTEXTMETRICW
LPOUTLINETEXTMETRICA
LPOUTLINETEXTMETRICW
-!LPPALETTEENTRY
+!LPPALETTEENTRY # FIXME: 20040821: Mishandled by winapi_test
LPPANOSE
LPPELARRAY
LPPIXELFORMATDESCRIPTOR
@@ -268,7 +268,7 @@
NEWTEXTMETRICEXW
NEWTEXTMETRICW
NPEXTLOGPEN
-!NPLOGPALETTE
+!NPLOGPALETTE # FIXME: 20040821: Mishandled by winapi_test
OLDFONTENUMPROC
OLDFONTENUMPROCA
OLDFONTENUMPROCW
@@ -276,7 +276,7 @@
OUTLINETEXTMETRICW
PABC
PABCFLOAT
-!PALETTEENTRY
+!PALETTEENTRY # FIXME: 20040821: Mishandled by winapi_test
PANOSE
PATTERN
PBITMAP
@@ -393,7 +393,7 @@
PEMRSETSTRETCHBLTMODE
PEMRSETTEXTALIGN
PEMRSETTEXTCOLOR
-!PEMRSETTEXTJUSTIFICATION
+!PEMRSETTEXTJUSTIFICATION # Wine-only type
PEMRSETVIEWPORTEXTEX
PEMRSETVIEWPORTORGEX
PEMRSETWINDOWEXTEX
@@ -418,7 +418,7 @@
PLOGBRUSH
PLOGFONTA
PLOGFONTW
-!PLOGPALETTE
+!PLOGPALETTE # FIXME: 20040821: Mishandled by winapi_test
PMETAHEADER
PMETARECORD
PNEWTEXTMETRICA
@@ -428,7 +428,7 @@
POLYTEXTW
POUTLINETEXTMETRICA
POUTLINETEXTMETRICW
-!PPALETTEENTRY
+!PPALETTEENTRY # FIXME: 20040821: Mishandled by winapi_test
PPELARRAY
PPIXELFORMATDESCRIPTOR
PPOLYTEXTA
@@ -479,16 +479,16 @@
ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA
ACTIVATION_CONTEXT_BASIC_INFORMATION
BY_HANDLE_FILE_INFORMATION
-!COMMCONFIG
+COMMCONFIG
COMMPROP
COMMTIMEOUTS
-!COMSTAT
+COMSTAT
CREATE_PROCESS_DEBUG_INFO
CREATE_THREAD_DEBUG_INFO
CRITICAL_SECTION
CRITICAL_SECTION_DEBUG
-!DCB
-!DEBUG_EVENT
+DCB
+DEBUG_EVENT
ENUMRESLANGPROCA
ENUMRESLANGPROCW
ENUMRESNAMEPROCA
@@ -498,28 +498,28 @@
EXCEPTION_DEBUG_INFO
EXIT_PROCESS_DEBUG_INFO
EXIT_THREAD_DEBUG_INFO
-!FILETIME
+!FILETIME # FIXME: 20040821: Mishandled by winapi_test
HW_PROFILE_INFOA
HW_PROFILE_INFOW
-!LDT_ENTRY
+!LDT_ENTRY # Architecture dependent
LOAD_DLL_DEBUG_INFO
LPBY_HANDLE_FILE_INFORMATION
-!LPCOMMCONFIG
+LPCOMMCONFIG
LPCOMMPROP
LPCOMMTIMEOUTS
-!LPCOMSTAT
-!LPCONTEXT
+LPCOMSTAT
+!LPCONTEXT # Architecture dependent
LPCRITICAL_SECTION
LPCRITICAL_SECTION_DEBUG
-!LPDCB
-!LPDEBUG_EVENT
+LPDCB
+LPDEBUG_EVENT
LPEXCEPTION_POINTERS
LPEXCEPTION_RECORD
LPFIBER_START_ROUTINE
-!LPFILETIME
+!LPFILETIME # FIXME: 20040821: Mishandled by winapi_test
LPHW_PROFILE_INFOA
LPHW_PROFILE_INFOW
-!LPLDT_ENTRY
+!LPLDT_ENTRY # Architecture dependent
LPLONG
LPMEMORYSTATUS
LPMEMORYSTATUSEX
@@ -530,14 +530,14 @@
LPOSVERSIONINFOW
LPOVERLAPPED
LPOVERLAPPED_COMPLETION_ROUTINE
-!LPPROCESS_HEAP_ENTRY
+LPPROCESS_HEAP_ENTRY
LPPROCESS_INFORMATION
LPPROGRESS_ROUTINE
LPSECURITY_ATTRIBUTES
LPSTARTUPINFOA
LPSTARTUPINFOW
LPSYSTEMTIME
-!LPSYSTEM_INFO
+LPSYSTEM_INFO
LPSYSTEM_POWER_STATUS
LPTHREAD_START_ROUTINE
LPTIME_ZONE_INFORMATION
@@ -545,7 +545,7 @@
LPWIN32_FILE_ATTRIBUTE_DATA
LPWIN32_FIND_DATAA
LPWIN32_FIND_DATAW
-!LPWIN32_STREAM_ID
+LPWIN32_STREAM_ID
MEMORYSTATUS
MEMORYSTATUSEX
OFSTRUCT
@@ -571,17 +571,17 @@
PCRITICAL_SECTION
PCRITICAL_SECTION_DEBUG
PFIBER_START_ROUTINE
-!PFILETIME
+!PFILETIME # FIXME: 20040821: Mishandled by winapi_test
PHKEY
POFSTRUCT
POSVERSIONINFOA
POSVERSIONINFOEXA
POSVERSIONINFOEXW
POSVERSIONINFOW
-!PPROCESS_HEAP_ENTRY
+PPROCESS_HEAP_ENTRY
PPROCESS_INFORMATION
PQUERYACTCTXW_FUNC
-!PROCESS_HEAP_ENTRY
+PROCESS_HEAP_ENTRY
PROCESS_INFORMATION
PSECURITY_ATTRIBUTES
PSYSTEMTIME
@@ -595,7 +595,7 @@
STARTUPINFOW
!SYSLEVEL # Wine-only type
SYSTEMTIME
-!SYSTEM_INFO
+SYSTEM_INFO
SYSTEM_POWER_STATUS
TIME_ZONE_INFORMATION
UNLOAD_DLL_DEBUG_INFO
@@ -640,8 +640,8 @@
CCHAR
CHAR
COLORREF
-!CONTEXT # Architecture dependent layout
-!CONTEXT86 # Architecture dependent layout
+!CONTEXT # Architecture dependent
+!CONTEXT86 # Architecture dependent
DATE
DOUBLE
DWORD
@@ -660,7 +660,7 @@
GENERIC_MAPPING
GLOBALHANDLE
HALF_PTR
-!HANDLE
+HANDLE
HCURSOR
HFILE
HGDIOBJ
@@ -683,21 +683,21 @@
IMAGE_FUNCTION_ENTRY
IMAGE_IMPORT_BY_NAME
IMAGE_IMPORT_DESCRIPTOR
-!IMAGE_LINENUMBER
+IMAGE_LINENUMBER
IMAGE_LOAD_CONFIG_DIRECTORY
IMAGE_NT_HEADERS
IMAGE_OPTIONAL_HEADER
IMAGE_OS2_HEADER
-!IMAGE_RELOCATION
+IMAGE_RELOCATION
IMAGE_RESOURCE_DATA_ENTRY
IMAGE_RESOURCE_DIRECTORY
-!IMAGE_RESOURCE_DIRECTORY_ENTRY
+IMAGE_RESOURCE_DIRECTORY_ENTRY
IMAGE_RESOURCE_DIRECTORY_STRING
IMAGE_RESOURCE_DIR_STRING_U
-!IMAGE_SECTION_HEADER
+IMAGE_SECTION_HEADER
IMAGE_SEPARATE_DEBUG_HEADER
-!IMAGE_SYMBOL
-!IMAGE_THUNK_DATA
+IMAGE_SYMBOL
+IMAGE_THUNK_DATA
IMAGE_TLS_DIRECTORY
IMAGE_VXD_HEADER
INT
@@ -739,7 +739,7 @@
MESSAGE_RESOURCE_BLOCK
MESSAGE_RESOURCE_DATA
MESSAGE_RESOURCE_ENTRY
-!NT_TIB
+NT_TIB
OBJECT_TYPE_LIST
PACCESS_ALLOWED_ACE
PACCESS_DENIED_ACE
@@ -750,7 +750,7 @@
PACL_SIZE_INFORMATION
PCCH
PCH
-!PCONTEXT
+!PCONTEXT # Architecture dependent
PCSTR
PCTSTR
PCWCH
@@ -777,21 +777,21 @@
PIMAGE_FUNCTION_ENTRY
PIMAGE_IMPORT_BY_NAME
PIMAGE_IMPORT_DESCRIPTOR
-!PIMAGE_LINENUMBER
+PIMAGE_LINENUMBER
PIMAGE_LOAD_CONFIG_DIRECTORY
PIMAGE_NT_HEADERS
PIMAGE_OPTIONAL_HEADER
PIMAGE_OS2_HEADER
-!PIMAGE_RELOCATION
+PIMAGE_RELOCATION
PIMAGE_RESOURCE_DATA_ENTRY
PIMAGE_RESOURCE_DIRECTORY
-!PIMAGE_RESOURCE_DIRECTORY_ENTRY
+PIMAGE_RESOURCE_DIRECTORY_ENTRY
PIMAGE_RESOURCE_DIRECTORY_STRING
PIMAGE_RESOURCE_DIR_STRING_U
-!PIMAGE_SECTION_HEADER
+PIMAGE_SECTION_HEADER
PIMAGE_SEPARATE_DEBUG_HEADER
-!PIMAGE_SYMBOL
-!PIMAGE_THUNK_DATA
+PIMAGE_SYMBOL
+PIMAGE_THUNK_DATA
PIMAGE_TLS_CALLBACK
PIMAGE_TLS_DIRECTORY
PIMAGE_VXD_HEADER
@@ -807,7 +807,7 @@
PMESSAGE_RESOURCE_BLOCK
PMESSAGE_RESOURCE_DATA
PMESSAGE_RESOURCE_ENTRY
-!PNT_TIB
+PNT_TIB
POBJECT_TYPE_LIST
POINT
POINTL
@@ -826,12 +826,12 @@
PRTL_OSVERSIONINFOW
PRTL_RESOURCE_DEBUG
PSECURITY_DESCRIPTOR
-!PSECURITY_QUALITY_OF_SERVICE
+PSECURITY_QUALITY_OF_SERVICE
PSID
PSID_IDENTIFIER_AUTHORITY
PSINGLE_LIST_ENTRY
PSIZE
-!PSTACK_FRAME_HEADER
+!PSTACK_FRAME_HEADER # Architecture dependent
PSTR
PSYSTEM_ALARM_ACE
PSYSTEM_AUDIT_ACE
@@ -855,7 +855,7 @@
SECURITY_DESCRIPTOR_CONTROL
SECURITY_DESCRIPTOR_RELATIVE
SECURITY_INFORMATION
-!SECURITY_QUALITY_OF_SERVICE
+SECURITY_QUALITY_OF_SERVICE
SHORT
SID
SID_AND_ATTRIBUTES
@@ -865,7 +865,7 @@
SIZEL
SIZE_T
SSIZE_T
-!STACK_FRAME_HEADER
+!STACK_FRAME_HEADER # Architecture dependent
SYSTEM_ALARM_ACE
SYSTEM_AUDIT_ACE
TCHAR
@@ -875,7 +875,7 @@
TOKEN_PRIMARY_GROUP
TOKEN_PRIVILEGES
TOKEN_SOURCE
-!TOKEN_STATISTICS
+TOKEN_STATISTICS
TOKEN_USER
UCHAR
UHALF_PTR
@@ -936,8 +976,8 @@
AUTO_SCROLL_DATA
BFFCALLBACK
BLOB
-!BROWSEINFOA
-!BROWSEINFOW
+BROWSEINFOA
+BROWSEINFOW
BSTR
BSTRBLOB
BYTE_BLOB
@@ -974,8 +1014,8 @@
IShellIcon
ITEMIDLIST
LPBLOB
-!LPBROWSEINFOA
-!LPBROWSEINFOW
+LPBROWSEINFOA
+LPBROWSEINFOW
LPBSTR
LPBSTRBLOB
LPCABINETSTATE
@@ -997,8 +1037,8 @@
LPSHChangeDWORDAsIDList
LPSHChangeProductKeyAsIDList
LPSHDESCRIPTIONID
-!LPSHELLEXECUTEINFOA
-!LPSHELLEXECUTEINFOW
+LPSHELLEXECUTEINFOA
+LPSHELLEXECUTEINFOW
LPSHELLFLAGSTATE
LPSHELLSTATE
LPSHFILEOPSTRUCTA
@@ -1010,8 +1050,8 @@
NOTIFYICONDATAW
OLECHAR
PAPPBARDATA
-!PBROWSEINFOA
-!PBROWSEINFOW
+PBROWSEINFOA
+PBROWSEINFOW
PNOTIFYICONDATAA
PNOTIFYICONDATAW
PRINTEROP_FLAGS
@@ -1026,8 +1066,8 @@
SHChangeNotifyEntry
SHChangeProductKeyAsIDList
SHDESCRIPTIONID
-!SHELLEXECUTEINFOA
-!SHELLEXECUTEINFOW
+SHELLEXECUTEINFOA
+SHELLEXECUTEINFOW
SHELLFLAGSTATE
SHELLSTATE
SHELLVIEWID
@@ -1220,7 +1260,7 @@
ICONINFO
ICONMETRICSA
ICONMETRICSW
-!INPUT
+INPUT
KBDLLHOOKSTRUCT
KEYBDINPUT
LPACCEL
@@ -1263,7 +1303,7 @@
LPHIGHCONTRASTW
LPICONMETRICSA
LPICONMETRICSW
-!LPINPUT
+LPINPUT
LPKBDLLHOOKSTRUCT
LPKEYBDINPUT
LPMDICREATESTRUCTA
@@ -1273,7 +1313,7 @@
LPMENUINFO
LPMENUITEMINFOA
LPMENUITEMINFOW
-!LPMENUTEMPLATE
+!LPMENUTEMPLATE # FIXME: 20040821: Mishandled by winapi_test
LPMINIMIZEDMETRICS
LPMINMAXINFO
LPMONITORINFO
@@ -1320,7 +1360,7 @@
MENUITEMINFOW
MENUITEMTEMPLATE
MENUITEMTEMPLATEHEADER
-!MENUTEMPLATE
+!MENUTEMPLATE # FIXME: 20040821: Mishandled by winapi_test
MINIMIZEDMETRICS
MINMAXINFO
MONITORENUMPROC
@@ -1366,7 +1406,7 @@
PICONINFO
PICONMETRICSA
PICONMETRICSW
-!PINPUT
+PINPUT
PKBDLLHOOKSTRUCT
PKEYBDINPUT
PMDINEXTMENU
@@ -1561,9 +1601,9 @@
LPINTERNET_PROXY_INFOW
LPINTERNET_STATUS_CALLBACK
LPINTERNET_VERSION_INFO
-LPURL_COMPONENTSA: !INTERNET_SCHEME
-LPURL_COMPONENTSW: !INTERNET_SCHEME
+LPURL_COMPONENTSA
+LPURL_COMPONENTSW
PFN_AUTH_NOTIFY
PFN_DIAL_HANDLER
-URL_COMPONENTSA: !INTERNET_SCHEME
-URL_COMPONENTSW: !INTERNET_SCHEME
+URL_COMPONENTSA
+URL_COMPONENTSW
Index: dlls/gdi/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/gdi/tests/generated.c,v
retrieving revision 1.11
diff -u -r1.11 generated.c
--- dlls/gdi/tests/generated.c 22 Aug 2004 02:07:14 -0000 1.11
+++ dlls/gdi/tests/generated.c 22 Aug 2004 22:32:52 -0000
@@ -318,6 +318,28 @@
TEST_FIELD(COLORADJUSTMENT, SHORT, caRedGreenTint, 22, 2, 2);
}
+static void test_pack_DEVMODEA(void)
+{
+ /* DEVMODEA (pack 4) */
+ TEST_FIELD(DEVMODEA, BYTE[CCHDEVICENAME], dmDeviceName, 0, 32, 1);
+ TEST_FIELD(DEVMODEA, WORD, dmSpecVersion, 32, 2, 2);
+ TEST_FIELD(DEVMODEA, WORD, dmDriverVersion, 34, 2, 2);
+ TEST_FIELD(DEVMODEA, WORD, dmSize, 36, 2, 2);
+ TEST_FIELD(DEVMODEA, WORD, dmDriverExtra, 38, 2, 2);
+ TEST_FIELD(DEVMODEA, DWORD, dmFields, 40, 4, 4);
+}
+
+static void test_pack_DEVMODEW(void)
+{
+ /* DEVMODEW (pack 4) */
+ TEST_FIELD(DEVMODEW, WCHAR[CCHDEVICENAME], dmDeviceName, 0, 64, 2);
+ TEST_FIELD(DEVMODEW, WORD, dmSpecVersion, 64, 2, 2);
+ TEST_FIELD(DEVMODEW, WORD, dmDriverVersion, 66, 2, 2);
+ TEST_FIELD(DEVMODEW, WORD, dmSize, 68, 2, 2);
+ TEST_FIELD(DEVMODEW, WORD, dmDriverExtra, 70, 2, 2);
+ TEST_FIELD(DEVMODEW, DWORD, dmFields, 72, 4, 4);
+}
+
static void test_pack_DIBSECTION(void)
{
/* DIBSECTION (pack 4) */
@@ -1905,6 +1927,18 @@
TEST_TYPE_POINTER(LPCOLORADJUSTMENT, 24, 2);
}
+static void test_pack_LPDEVMODEA(void)
+{
+ /* LPDEVMODEA */
+ TEST_TYPE(LPDEVMODEA, 4, 4);
+}
+
+static void test_pack_LPDEVMODEW(void)
+{
+ /* LPDEVMODEW */
+ TEST_TYPE(LPDEVMODEW, 4, 4);
+}
+
static void test_pack_LPDIBSECTION(void)
{
/* LPDIBSECTION */
@@ -3829,6 +3863,8 @@
test_pack_CIEXYZTRIPLE();
test_pack_COLOR16();
test_pack_COLORADJUSTMENT();
+ test_pack_DEVMODEA();
+ test_pack_DEVMODEW();
test_pack_DIBSECTION();
test_pack_DISPLAY_DEVICEA();
test_pack_DISPLAY_DEVICEW();
@@ -3989,6 +4025,8 @@
test_pack_LPCIEXYZ();
test_pack_LPCIEXYZTRIPLE();
test_pack_LPCOLORADJUSTMENT();
+ test_pack_LPDEVMODEA();
+ test_pack_LPDEVMODEW();
test_pack_LPDIBSECTION();
test_pack_LPDISPLAY_DEVICEA();
test_pack_LPDISPLAY_DEVICEW();
Index: dlls/kernel/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/tests/generated.c,v
retrieving revision 1.12
diff -u -r1.12 generated.c
--- dlls/kernel/tests/generated.c 24 Aug 2004 20:16:25 -0000 1.12
+++ dlls/kernel/tests/generated.c 24 Aug 2004 21:36:17 -0000
@@ -340,6 +340,20 @@
TEST_FIELD(BY_HANDLE_FILE_INFORMATION, DWORD, nFileIndexLow, 48, 4, 4);
}
+static void test_pack_COMMCONFIG(void)
+{
+ /* COMMCONFIG (pack 4) */
+ TEST_TYPE(COMMCONFIG, 52, 4);
+ TEST_FIELD(COMMCONFIG, DWORD, dwSize, 0, 4, 4);
+ TEST_FIELD(COMMCONFIG, WORD, wVersion, 4, 2, 2);
+ TEST_FIELD(COMMCONFIG, WORD, wReserved, 6, 2, 2);
+ TEST_FIELD(COMMCONFIG, DCB, dcb, 8, 28, 4);
+ TEST_FIELD(COMMCONFIG, DWORD, dwProviderSubType, 36, 4, 4);
+ TEST_FIELD(COMMCONFIG, DWORD, dwProviderOffset, 40, 4, 4);
+ TEST_FIELD(COMMCONFIG, DWORD, dwProviderSize, 44, 4, 4);
+ TEST_FIELD(COMMCONFIG, DWORD[1], wcProviderData, 48, 4, 4);
+}
+
static void test_pack_COMMPROP(void)
{
/* COMMPROP (pack 4) */
@@ -375,6 +389,14 @@
TEST_FIELD(COMMTIMEOUTS, DWORD, WriteTotalTimeoutConstant, 16, 4, 4);
}
+static void test_pack_COMSTAT(void)
+{
+ /* COMSTAT (pack 4) */
+ TEST_TYPE(COMSTAT, 12, 4);
+ TEST_FIELD(COMSTAT, DWORD, cbInQue, 4, 4, 4);
+ TEST_FIELD(COMSTAT, DWORD, cbOutQue, 8, 4, 4);
+}
+
static void test_pack_CREATE_PROCESS_DEBUG_INFO(void)
{
/* CREATE_PROCESS_DEBUG_INFO (pack 4) */
@@ -412,6 +434,34 @@
TEST_TYPE(CRITICAL_SECTION_DEBUG, 32, 4);
}
+static void test_pack_DCB(void)
+{
+ /* DCB (pack 4) */
+ TEST_TYPE(DCB, 28, 4);
+ TEST_FIELD(DCB, DWORD, DCBlength, 0, 4, 4);
+ TEST_FIELD(DCB, DWORD, BaudRate, 4, 4, 4);
+ TEST_FIELD(DCB, WORD, wReserved, 12, 2, 2);
+ TEST_FIELD(DCB, WORD, XonLim, 14, 2, 2);
+ TEST_FIELD(DCB, WORD, XoffLim, 16, 2, 2);
+ TEST_FIELD(DCB, BYTE, ByteSize, 18, 1, 1);
+ TEST_FIELD(DCB, BYTE, Parity, 19, 1, 1);
+ TEST_FIELD(DCB, BYTE, StopBits, 20, 1, 1);
+ TEST_FIELD(DCB, char, XonChar, 21, 1, 1);
+ TEST_FIELD(DCB, char, XoffChar, 22, 1, 1);
+ TEST_FIELD(DCB, char, ErrorChar, 23, 1, 1);
+ TEST_FIELD(DCB, char, EofChar, 24, 1, 1);
+ TEST_FIELD(DCB, char, EvtChar, 25, 1, 1);
+ TEST_FIELD(DCB, WORD, wReserved1, 26, 2, 2);
+}
+
+static void test_pack_DEBUG_EVENT(void)
+{
+ /* DEBUG_EVENT (pack 4) */
+ TEST_FIELD(DEBUG_EVENT, DWORD, dwDebugEventCode, 0, 4, 4);
+ TEST_FIELD(DEBUG_EVENT, DWORD, dwProcessId, 4, 4, 4);
+ TEST_FIELD(DEBUG_EVENT, DWORD, dwThreadId, 8, 4, 4);
+}
+
static void test_pack_ENUMRESLANGPROCA(void)
{
/* ENUMRESLANGPROCA */
@@ -507,6 +557,13 @@
TEST_TYPE_POINTER(LPBY_HANDLE_FILE_INFORMATION, 52, 4);
}
+static void test_pack_LPCOMMCONFIG(void)
+{
+ /* LPCOMMCONFIG */
+ TEST_TYPE(LPCOMMCONFIG, 4, 4);
+ TEST_TYPE_POINTER(LPCOMMCONFIG, 52, 4);
+}
+
static void test_pack_LPCOMMPROP(void)
{
/* LPCOMMPROP */
@@ -521,6 +578,13 @@
TEST_TYPE_POINTER(LPCOMMTIMEOUTS, 20, 4);
}
+static void test_pack_LPCOMSTAT(void)
+{
+ /* LPCOMSTAT */
+ TEST_TYPE(LPCOMSTAT, 4, 4);
+ TEST_TYPE_POINTER(LPCOMSTAT, 12, 4);
+}
+
static void test_pack_LPCRITICAL_SECTION(void)
{
/* LPCRITICAL_SECTION */
@@ -533,6 +597,19 @@
TEST_TYPE(LPCRITICAL_SECTION_DEBUG, 4, 4);
}
+static void test_pack_LPDCB(void)
+{
+ /* LPDCB */
+ TEST_TYPE(LPDCB, 4, 4);
+ TEST_TYPE_POINTER(LPDCB, 28, 4);
+}
+
+static void test_pack_LPDEBUG_EVENT(void)
+{
+ /* LPDEBUG_EVENT */
+ TEST_TYPE(LPDEBUG_EVENT, 4, 4);
+}
+
static void test_pack_LPEXCEPTION_POINTERS(void)
{
/* LPEXCEPTION_POINTERS */
@@ -599,6 +676,12 @@
TEST_TYPE(LPOVERLAPPED_COMPLETION_ROUTINE, 4, 4);
}
+static void test_pack_LPPROCESS_HEAP_ENTRY(void)
+{
+ /* LPPROCESS_HEAP_ENTRY */
+ TEST_TYPE(LPPROCESS_HEAP_ENTRY, 4, 4);
+}
+
static void test_pack_LPPROCESS_INFORMATION(void)
{
/* LPPROCESS_INFORMATION */
@@ -640,6 +723,12 @@
TEST_TYPE_POINTER(LPSYSTEMTIME, 16, 2);
}
+static void test_pack_LPSYSTEM_INFO(void)
+{
+ /* LPSYSTEM_INFO */
+ TEST_TYPE(LPSYSTEM_INFO, 4, 4);
+}
+
static void test_pack_LPSYSTEM_POWER_STATUS(void)
{
/* LPSYSTEM_POWER_STATUS */
@@ -864,6 +953,12 @@
TEST_TYPE_POINTER(POFSTRUCT, 136, 2);
}
+static void test_pack_PPROCESS_HEAP_ENTRY(void)
+{
+ /* PPROCESS_HEAP_ENTRY */
+ TEST_TYPE(PPROCESS_HEAP_ENTRY, 4, 4);
+}
+
static void test_pack_PPROCESS_INFORMATION(void)
{
/* PPROCESS_INFORMATION */
@@ -877,6 +972,16 @@
TEST_TYPE(PQUERYACTCTXW_FUNC, 4, 4);
}
+static void test_pack_PROCESS_HEAP_ENTRY(void)
+{
+ /* PROCESS_HEAP_ENTRY (pack 4) */
+ TEST_FIELD(PROCESS_HEAP_ENTRY, LPVOID, lpData, 0, 4, 4);
+ TEST_FIELD(PROCESS_HEAP_ENTRY, DWORD, cbData, 4, 4, 4);
+ TEST_FIELD(PROCESS_HEAP_ENTRY, BYTE, cbOverhead, 8, 1, 1);
+ TEST_FIELD(PROCESS_HEAP_ENTRY, BYTE, iRegionIndex, 9, 1, 1);
+ TEST_FIELD(PROCESS_HEAP_ENTRY, WORD, wFlags, 10, 2, 2);
+}
+
static void test_pack_PROCESS_INFORMATION(void)
{
/* PROCESS_INFORMATION (pack 4) */
@@ -1007,6 +1112,11 @@
TEST_FIELD(SYSTEMTIME, WORD, wMilliseconds, 14, 2, 2);
}
+static void test_pack_SYSTEM_INFO(void)
+{
+ /* SYSTEM_INFO (pack 4) */
+}
+
static void test_pack_SYSTEM_POWER_STATUS(void)
{
/* SYSTEM_POWER_STATUS (pack 4) */
@@ -1109,12 +1219,16 @@
test_pack_ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA();
test_pack_ACTIVATION_CONTEXT_BASIC_INFORMATION();
test_pack_BY_HANDLE_FILE_INFORMATION();
+ test_pack_COMMCONFIG();
test_pack_COMMPROP();
test_pack_COMMTIMEOUTS();
+ test_pack_COMSTAT();
test_pack_CREATE_PROCESS_DEBUG_INFO();
test_pack_CREATE_THREAD_DEBUG_INFO();
test_pack_CRITICAL_SECTION();
test_pack_CRITICAL_SECTION_DEBUG();
+ test_pack_DCB();
+ test_pack_DEBUG_EVENT();
test_pack_ENUMRESLANGPROCA();
test_pack_ENUMRESLANGPROCW();
test_pack_ENUMRESNAMEPROCA();
@@ -1128,10 +1242,14 @@
test_pack_HW_PROFILE_INFOW();
test_pack_LOAD_DLL_DEBUG_INFO();
test_pack_LPBY_HANDLE_FILE_INFORMATION();
+ test_pack_LPCOMMCONFIG();
test_pack_LPCOMMPROP();
test_pack_LPCOMMTIMEOUTS();
+ test_pack_LPCOMSTAT();
test_pack_LPCRITICAL_SECTION();
test_pack_LPCRITICAL_SECTION_DEBUG();
+ test_pack_LPDCB();
+ test_pack_LPDEBUG_EVENT();
test_pack_LPEXCEPTION_POINTERS();
test_pack_LPEXCEPTION_RECORD();
test_pack_LPFIBER_START_ROUTINE();
@@ -1147,12 +1265,14 @@
test_pack_LPOSVERSIONINFOW();
test_pack_LPOVERLAPPED();
test_pack_LPOVERLAPPED_COMPLETION_ROUTINE();
+ test_pack_LPPROCESS_HEAP_ENTRY();
test_pack_LPPROCESS_INFORMATION();
test_pack_LPPROGRESS_ROUTINE();
test_pack_LPSECURITY_ATTRIBUTES();
test_pack_LPSTARTUPINFOA();
test_pack_LPSTARTUPINFOW();
test_pack_LPSYSTEMTIME();
+ test_pack_LPSYSTEM_INFO();
test_pack_LPSYSTEM_POWER_STATUS();
test_pack_LPTHREAD_START_ROUTINE();
test_pack_LPTIME_ZONE_INFORMATION();
@@ -1192,8 +1312,10 @@
test_pack_POSVERSIONINFOEXA();
test_pack_POSVERSIONINFOEXW();
test_pack_POSVERSIONINFOW();
+ test_pack_PPROCESS_HEAP_ENTRY();
test_pack_PPROCESS_INFORMATION();
test_pack_PQUERYACTCTXW_FUNC();
+ test_pack_PROCESS_HEAP_ENTRY();
test_pack_PROCESS_INFORMATION();
test_pack_PSECURITY_ATTRIBUTES();
test_pack_PSYSTEMTIME();
@@ -1206,6 +1328,7 @@
test_pack_STARTUPINFOA();
test_pack_STARTUPINFOW();
test_pack_SYSTEMTIME();
+ test_pack_SYSTEM_INFO();
test_pack_SYSTEM_POWER_STATUS();
test_pack_TIME_ZONE_INFORMATION();
test_pack_UNLOAD_DLL_DEBUG_INFO();
Index: dlls/ntdll/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/tests/generated.c,v
retrieving revision 1.17
diff -u -r1.17 generated.c
--- dlls/ntdll/tests/generated.c 24 Aug 2004 20:16:25 -0000 1.17
+++ dlls/ntdll/tests/generated.c 24 Aug 2004 21:03:50 -0000
@@ -353,6 +353,7 @@
{
/* DWORDLONG */
TEST_TYPE(DWORDLONG, 8, 8);
+ TEST_TYPE_UNSIGNED(DWORDLONG);
}
static void test_pack_EXCEPTION_POINTERS(void)
@@ -417,6 +418,12 @@
TEST_FIELD(GENERIC_MAPPING, ACCESS_MASK, GenericAll, 12, 4, 4);
}
+static void test_pack_HANDLE(void)
+{
+ /* HANDLE */
+ TEST_TYPE(HANDLE, 4, 4);
+}
+
static void test_pack_HRESULT(void)
{
/* HRESULT */
@@ -591,6 +598,11 @@
/* IMAGE_IMPORT_DESCRIPTOR (pack 4) */
}
+static void test_pack_IMAGE_LINENUMBER(void)
+{
+ /* IMAGE_LINENUMBER (pack 2) */
+}
+
static void test_pack_IMAGE_LOAD_CONFIG_DIRECTORY(void)
{
/* IMAGE_LOAD_CONFIG_DIRECTORY (pack 4) */
@@ -699,6 +711,11 @@
TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_expver, 62, 2, 2);
}
+static void test_pack_IMAGE_RELOCATION(void)
+{
+ /* IMAGE_RELOCATION (pack 2) */
+}
+
static void test_pack_IMAGE_RESOURCE_DATA_ENTRY(void)
{
/* IMAGE_RESOURCE_DATA_ENTRY (pack 4) */
@@ -721,6 +738,11 @@
TEST_FIELD(IMAGE_RESOURCE_DIRECTORY, WORD, NumberOfIdEntries, 14, 2, 2);
}
+static void test_pack_IMAGE_RESOURCE_DIRECTORY_ENTRY(void)
+{
+ /* IMAGE_RESOURCE_DIRECTORY_ENTRY (pack 4) */
+}
+
static void test_pack_IMAGE_RESOURCE_DIRECTORY_STRING(void)
{
/* IMAGE_RESOURCE_DIRECTORY_STRING (pack 4) */
@@ -737,6 +759,12 @@
TEST_FIELD(IMAGE_RESOURCE_DIR_STRING_U, WCHAR[ 1 ], NameString, 2, 2, 2);
}
+static void test_pack_IMAGE_SECTION_HEADER(void)
+{
+ /* IMAGE_SECTION_HEADER (pack 4) */
+ TEST_FIELD(IMAGE_SECTION_HEADER, BYTE[IMAGE_SIZEOF_SHORT_NAME], Name, 0, 8, 1);
+}
+
static void test_pack_IMAGE_SEPARATE_DEBUG_HEADER(void)
{
/* IMAGE_SEPARATE_DEBUG_HEADER (pack 4) */
@@ -756,6 +784,16 @@
TEST_FIELD(IMAGE_SEPARATE_DEBUG_HEADER, DWORD[ 2 ], Reserved, 40, 8, 4);
}
+static void test_pack_IMAGE_SYMBOL(void)
+{
+ /* IMAGE_SYMBOL (pack 2) */
+}
+
+static void test_pack_IMAGE_THUNK_DATA(void)
+{
+ /* IMAGE_THUNK_DATA (pack 4) */
+}
+
static void test_pack_IMAGE_TLS_DIRECTORY(void)
{
/* IMAGE_TLS_DIRECTORY (pack 4) */
@@ -939,6 +977,15 @@
TEST_FIELD(MESSAGE_RESOURCE_ENTRY, BYTE[1], Text, 4, 1, 1);
}
+static void test_pack_NT_TIB(void)
+{
+ /* NT_TIB (pack 4) */
+ TEST_FIELD(NT_TIB, struct _EXCEPTION_REGISTRATION_RECORD *, ExceptionList, 0, 4, 4);
+ TEST_FIELD(NT_TIB, PVOID, StackBase, 4, 4, 4);
+ TEST_FIELD(NT_TIB, PVOID, StackLimit, 8, 4, 4);
+ TEST_FIELD(NT_TIB, PVOID, SubSystemTib, 12, 4, 4);
+}
+
static void test_pack_OBJECT_TYPE_LIST(void)
{
/* OBJECT_TYPE_LIST (pack 4) */
@@ -1182,6 +1229,12 @@
TEST_TYPE(PIMAGE_IMPORT_DESCRIPTOR, 4, 4);
}
+static void test_pack_PIMAGE_LINENUMBER(void)
+{
+ /* PIMAGE_LINENUMBER */
+ TEST_TYPE(PIMAGE_LINENUMBER, 4, 4);
+}
+
static void test_pack_PIMAGE_LOAD_CONFIG_DIRECTORY(void)
{
/* PIMAGE_LOAD_CONFIG_DIRECTORY */
@@ -1210,6 +1263,12 @@
TEST_TYPE_POINTER(PIMAGE_OS2_HEADER, 64, 2);
}
+static void test_pack_PIMAGE_RELOCATION(void)
+{
+ /* PIMAGE_RELOCATION */
+ TEST_TYPE(PIMAGE_RELOCATION, 4, 4);
+}
+
static void test_pack_PIMAGE_RESOURCE_DATA_ENTRY(void)
{
/* PIMAGE_RESOURCE_DATA_ENTRY */
@@ -1224,6 +1283,12 @@
TEST_TYPE_POINTER(PIMAGE_RESOURCE_DIRECTORY, 16, 4);
}
+static void test_pack_PIMAGE_RESOURCE_DIRECTORY_ENTRY(void)
+{
+ /* PIMAGE_RESOURCE_DIRECTORY_ENTRY */
+ TEST_TYPE(PIMAGE_RESOURCE_DIRECTORY_ENTRY, 4, 4);
+}
+
static void test_pack_PIMAGE_RESOURCE_DIRECTORY_STRING(void)
{
/* PIMAGE_RESOURCE_DIRECTORY_STRING */
@@ -1238,6 +1303,12 @@
TEST_TYPE_POINTER(PIMAGE_RESOURCE_DIR_STRING_U, 4, 2);
}
+static void test_pack_PIMAGE_SECTION_HEADER(void)
+{
+ /* PIMAGE_SECTION_HEADER */
+ TEST_TYPE(PIMAGE_SECTION_HEADER, 4, 4);
+}
+
static void test_pack_PIMAGE_SEPARATE_DEBUG_HEADER(void)
{
/* PIMAGE_SEPARATE_DEBUG_HEADER */
@@ -1245,6 +1316,18 @@
TEST_TYPE_POINTER(PIMAGE_SEPARATE_DEBUG_HEADER, 48, 4);
}
+static void test_pack_PIMAGE_SYMBOL(void)
+{
+ /* PIMAGE_SYMBOL */
+ TEST_TYPE(PIMAGE_SYMBOL, 4, 4);
+}
+
+static void test_pack_PIMAGE_THUNK_DATA(void)
+{
+ /* PIMAGE_THUNK_DATA */
+ TEST_TYPE(PIMAGE_THUNK_DATA, 4, 4);
+}
+
static void test_pack_PIMAGE_TLS_CALLBACK(void)
{
/* PIMAGE_TLS_CALLBACK */
@@ -1348,6 +1431,12 @@
TEST_TYPE_POINTER(PMESSAGE_RESOURCE_ENTRY, 6, 2);
}
+static void test_pack_PNT_TIB(void)
+{
+ /* PNT_TIB */
+ TEST_TYPE(PNT_TIB, 4, 4);
+}
+
static void test_pack_POBJECT_TYPE_LIST(void)
{
/* POBJECT_TYPE_LIST */
@@ -1419,6 +1508,12 @@
TEST_TYPE(PSECURITY_DESCRIPTOR, 4, 4);
}
+static void test_pack_PSECURITY_QUALITY_OF_SERVICE(void)
+{
+ /* PSECURITY_QUALITY_OF_SERVICE */
+ TEST_TYPE(PSECURITY_QUALITY_OF_SERVICE, 4, 4);
+}
+
static void test_pack_PSID(void)
{
/* PSID */
@@ -1624,6 +1719,12 @@
TEST_TYPE_UNSIGNED(SECURITY_INFORMATION);
}
+static void test_pack_SECURITY_QUALITY_OF_SERVICE(void)
+{
+ /* SECURITY_QUALITY_OF_SERVICE (pack 4) */
+ TEST_FIELD(SECURITY_QUALITY_OF_SERVICE, DWORD, Length, 0, 4, 4);
+}
+
static void test_pack_SHORT(void)
{
/* SHORT */
@@ -1732,6 +1833,14 @@
TEST_FIELD(TOKEN_SOURCE, LUID, SourceIdentifier, 8, 8, 4);
}
+static void test_pack_TOKEN_STATISTICS(void)
+{
+ /* TOKEN_STATISTICS (pack 4) */
+ TEST_FIELD(TOKEN_STATISTICS, LUID, TokenId, 0, 8, 4);
+ TEST_FIELD(TOKEN_STATISTICS, LUID, AuthenticationId, 8, 8, 4);
+ TEST_FIELD(TOKEN_STATISTICS, LARGE_INTEGER, ExpirationTime, 16, 8, 4);
+}
+
static void test_pack_TOKEN_USER(void)
{
/* TOKEN_USER (pack 4) */
@@ -2107,6 +2216,7 @@
test_pack_GENERIC_MAPPING();
test_pack_GLOBALHANDLE();
test_pack_HALF_PTR();
+ test_pack_HANDLE();
test_pack_HCURSOR();
test_pack_HFILE();
test_pack_HGDIOBJ();
@@ -2129,15 +2239,21 @@
test_pack_IMAGE_FUNCTION_ENTRY();
test_pack_IMAGE_IMPORT_BY_NAME();
test_pack_IMAGE_IMPORT_DESCRIPTOR();
+ test_pack_IMAGE_LINENUMBER();
test_pack_IMAGE_LOAD_CONFIG_DIRECTORY();
test_pack_IMAGE_NT_HEADERS();
test_pack_IMAGE_OPTIONAL_HEADER();
test_pack_IMAGE_OS2_HEADER();
+ test_pack_IMAGE_RELOCATION();
test_pack_IMAGE_RESOURCE_DATA_ENTRY();
test_pack_IMAGE_RESOURCE_DIRECTORY();
+ test_pack_IMAGE_RESOURCE_DIRECTORY_ENTRY();
test_pack_IMAGE_RESOURCE_DIRECTORY_STRING();
test_pack_IMAGE_RESOURCE_DIR_STRING_U();
+ test_pack_IMAGE_SECTION_HEADER();
test_pack_IMAGE_SEPARATE_DEBUG_HEADER();
+ test_pack_IMAGE_SYMBOL();
+ test_pack_IMAGE_THUNK_DATA();
test_pack_IMAGE_TLS_DIRECTORY();
test_pack_IMAGE_VXD_HEADER();
test_pack_INT();
@@ -2174,6 +2290,7 @@
test_pack_MESSAGE_RESOURCE_BLOCK();
test_pack_MESSAGE_RESOURCE_DATA();
test_pack_MESSAGE_RESOURCE_ENTRY();
+ test_pack_NT_TIB();
test_pack_OBJECT_TYPE_LIST();
test_pack_PACCESS_ALLOWED_ACE();
test_pack_PACCESS_DENIED_ACE();
@@ -2209,15 +2326,21 @@
test_pack_PIMAGE_FUNCTION_ENTRY();
test_pack_PIMAGE_IMPORT_BY_NAME();
test_pack_PIMAGE_IMPORT_DESCRIPTOR();
+ test_pack_PIMAGE_LINENUMBER();
test_pack_PIMAGE_LOAD_CONFIG_DIRECTORY();
test_pack_PIMAGE_NT_HEADERS();
test_pack_PIMAGE_OPTIONAL_HEADER();
test_pack_PIMAGE_OS2_HEADER();
+ test_pack_PIMAGE_RELOCATION();
test_pack_PIMAGE_RESOURCE_DATA_ENTRY();
test_pack_PIMAGE_RESOURCE_DIRECTORY();
+ test_pack_PIMAGE_RESOURCE_DIRECTORY_ENTRY();
test_pack_PIMAGE_RESOURCE_DIRECTORY_STRING();
test_pack_PIMAGE_RESOURCE_DIR_STRING_U();
+ test_pack_PIMAGE_SECTION_HEADER();
test_pack_PIMAGE_SEPARATE_DEBUG_HEADER();
+ test_pack_PIMAGE_SYMBOL();
+ test_pack_PIMAGE_THUNK_DATA();
test_pack_PIMAGE_TLS_CALLBACK();
test_pack_PIMAGE_TLS_DIRECTORY();
test_pack_PIMAGE_VXD_HEADER();
@@ -2233,6 +2356,7 @@
test_pack_PMESSAGE_RESOURCE_BLOCK();
test_pack_PMESSAGE_RESOURCE_DATA();
test_pack_PMESSAGE_RESOURCE_ENTRY();
+ test_pack_PNT_TIB();
test_pack_POBJECT_TYPE_LIST();
test_pack_POINT();
test_pack_POINTL();
@@ -2251,6 +2375,7 @@
test_pack_PRTL_OSVERSIONINFOW();
test_pack_PRTL_RESOURCE_DEBUG();
test_pack_PSECURITY_DESCRIPTOR();
+ test_pack_PSECURITY_QUALITY_OF_SERVICE();
test_pack_PSID();
test_pack_PSID_IDENTIFIER_AUTHORITY();
test_pack_PSINGLE_LIST_ENTRY();
@@ -2278,6 +2403,7 @@
test_pack_SECURITY_DESCRIPTOR_CONTROL();
test_pack_SECURITY_DESCRIPTOR_RELATIVE();
test_pack_SECURITY_INFORMATION();
+ test_pack_SECURITY_QUALITY_OF_SERVICE();
test_pack_SHORT();
test_pack_SID();
test_pack_SID_AND_ATTRIBUTES();
@@ -2296,6 +2422,7 @@
test_pack_TOKEN_PRIMARY_GROUP();
test_pack_TOKEN_PRIVILEGES();
test_pack_TOKEN_SOURCE();
+ test_pack_TOKEN_STATISTICS();
test_pack_TOKEN_USER();
test_pack_UCHAR();
test_pack_UHALF_PTR();
Index: dlls/shell32/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/tests/generated.c,v
retrieving revision 1.10
diff -u -r1.10 generated.c
--- dlls/shell32/tests/generated.c 22 Aug 2004 22:27:31 -0000 1.10
+++ dlls/shell32/tests/generated.c 24 Aug 2004 21:36:17 -0000
@@ -604,6 +604,18 @@
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 */
@@ -688,6 +700,42 @@
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) */
@@ -758,6 +806,42 @@
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_LPITEMIDLIST(void)
+{
+ /* LPITEMIDLIST */
+ TEST_TYPE(LPITEMIDLIST, 4, 4);
+ TEST_TYPE_POINTER(LPITEMIDLIST, 3, 1);
+}
+
+static void test_pack_LPSHITEMID(void)
+{
+ /* LPSHITEMID */
+ TEST_TYPE(LPSHITEMID, 4, 4);
+ TEST_TYPE_POINTER(LPSHITEMID, 3, 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_AUTO_SCROLL_DATA(void)
{
/* AUTO_SCROLL_DATA (pack 1) */
@@ -775,6 +859,34 @@
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) */
@@ -872,6 +984,20 @@
/* IShellIcon */
}
+static void test_pack_LPBROWSEINFOA(void)
+{
+ /* LPBROWSEINFOA */
+ TEST_TYPE(LPBROWSEINFOA, 4, 4);
+ TEST_TYPE_POINTER(LPBROWSEINFOA, 32, 4);
+}
+
+static void test_pack_LPBROWSEINFOW(void)
+{
+ /* LPBROWSEINFOW */
+ TEST_TYPE(LPBROWSEINFOW, 4, 4);
+ TEST_TYPE_POINTER(LPBROWSEINFOW, 32, 4);
+}
+
static void test_pack_LPCABINETSTATE(void)
{
/* LPCABINETSTATE */
@@ -956,6 +1082,20 @@
TEST_TYPE_POINTER(LPSHELLSTATE, 32, 1);
}
+static void test_pack_PBROWSEINFOA(void)
+{
+ /* PBROWSEINFOA */
+ TEST_TYPE(PBROWSEINFOA, 4, 4);
+ TEST_TYPE_POINTER(PBROWSEINFOA, 32, 4);
+}
+
+static void test_pack_PBROWSEINFOW(void)
+{
+ /* PBROWSEINFOW */
+ TEST_TYPE(PBROWSEINFOW, 4, 4);
+ TEST_TYPE_POINTER(PBROWSEINFOW, 32, 4);
+}
+
static void test_pack_SHChangeDWORDAsIDList(void)
{
/* SHChangeDWORDAsIDList (pack 1) */
@@ -969,6 +1109,9 @@
static void test_pack_SHChangeNotifyEntry(void)
{
/* SHChangeNotifyEntry (pack 1) */
+ TEST_TYPE(SHChangeNotifyEntry, 8, 1);
+ TEST_FIELD(SHChangeNotifyEntry, LPCITEMIDLIST, pidl, 0, 4, 1);
+ TEST_FIELD(SHChangeNotifyEntry, BOOL, fRecursive, 4, 4, 1);
}
static void test_pack_SHChangeProductKeyAsIDList(void)
@@ -982,7 +1125,7 @@
static void test_pack_SHDESCRIPTIONID(void)
{
- /* SHDESCRIPTIONID (pack 1) */
+ /* SHDESCRIPTIONID (pack 8) */
TEST_TYPE(SHDESCRIPTIONID, 20, 4);
TEST_FIELD(SHDESCRIPTIONID, DWORD, dwDescriptionId, 0, 4, 4);
TEST_FIELD(SHDESCRIPTIONID, CLSID, clsid, 4, 16, 4);
@@ -1018,6 +1161,8 @@
test_pack_AUTO_SCROLL_DATA();
test_pack_BFFCALLBACK();
test_pack_BLOB();
+ test_pack_BROWSEINFOA();
+ test_pack_BROWSEINFOW();
test_pack_BSTR();
test_pack_BSTRBLOB();
test_pack_BYTE_BLOB();
@@ -1050,10 +1195,14 @@
test_pack_IID();
test_pack_IShellChangeNotify();
test_pack_IShellIcon();
+ test_pack_ITEMIDLIST();
test_pack_LPBLOB();
+ test_pack_LPBROWSEINFOA();
+ test_pack_LPBROWSEINFOW();
test_pack_LPBSTR();
test_pack_LPBSTRBLOB();
test_pack_LPCABINETSTATE();
+ test_pack_LPCITEMIDLIST();
test_pack_LPCOLESTR();
test_pack_LPCY();
test_pack_LPDECIMAL();
@@ -1066,20 +1215,26 @@
test_pack_LPFILEGROUPDESCRIPTORW();
test_pack_LPGUID();
test_pack_LPIDA();
+ test_pack_LPITEMIDLIST();
test_pack_LPOLESTR();
test_pack_LPSHChangeDWORDAsIDList();
test_pack_LPSHChangeProductKeyAsIDList();
test_pack_LPSHDESCRIPTIONID();
+ test_pack_LPSHELLEXECUTEINFOA();
+ test_pack_LPSHELLEXECUTEINFOW();
test_pack_LPSHELLFLAGSTATE();
test_pack_LPSHELLSTATE();
test_pack_LPSHFILEOPSTRUCTA();
test_pack_LPSHFILEOPSTRUCTW();
+ test_pack_LPSHITEMID();
test_pack_LPSHNAMEMAPPINGA();
test_pack_LPSHNAMEMAPPINGW();
test_pack_NOTIFYICONDATAA();
test_pack_NOTIFYICONDATAW();
test_pack_OLECHAR();
test_pack_PAPPBARDATA();
+ test_pack_PBROWSEINFOA();
+ test_pack_PBROWSEINFOW();
test_pack_PNOTIFYICONDATAA();
test_pack_PNOTIFYICONDATAW();
test_pack_PRINTEROP_FLAGS();
@@ -1094,6 +1249,8 @@
test_pack_SHChangeNotifyEntry();
test_pack_SHChangeProductKeyAsIDList();
test_pack_SHDESCRIPTIONID();
+ test_pack_SHELLEXECUTEINFOA();
+ test_pack_SHELLEXECUTEINFOW();
test_pack_SHELLFLAGSTATE();
test_pack_SHELLSTATE();
test_pack_SHELLVIEWID();
@@ -1101,6 +1258,7 @@
test_pack_SHFILEINFOW();
test_pack_SHFILEOPSTRUCTA();
test_pack_SHFILEOPSTRUCTW();
+ test_pack_SHITEMID();
test_pack_SHNAMEMAPPINGA();
test_pack_SHNAMEMAPPINGW();
test_pack_UP_BYTE_BLOB();
Index: dlls/user/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/tests/generated.c,v
retrieving revision 1.12
diff -u -r1.12 generated.c
--- dlls/user/tests/generated.c 16 Aug 2004 19:46:09 -0000 1.12
+++ dlls/user/tests/generated.c 22 Aug 2004 22:32:52 -0000
@@ -561,6 +561,12 @@
TEST_FIELD(ICONMETRICSW, LOGFONTW, lfFont, 16, 92, 4);
}
+static void test_pack_INPUT(void)
+{
+ /* INPUT (pack 4) */
+ TEST_FIELD(INPUT, DWORD, type, 0, 4, 4);
+}
+
static void test_pack_KBDLLHOOKSTRUCT(void)
{
/* KBDLLHOOKSTRUCT (pack 4) */
@@ -863,6 +869,12 @@
TEST_TYPE_POINTER(LPICONMETRICSW, 108, 4);
}
+static void test_pack_LPINPUT(void)
+{
+ /* LPINPUT */
+ TEST_TYPE(LPINPUT, 4, 4);
+}
+
static void test_pack_LPKBDLLHOOKSTRUCT(void)
{
/* LPKBDLLHOOKSTRUCT */
@@ -1713,6 +1725,12 @@
TEST_TYPE_POINTER(PICONMETRICSW, 108, 4);
}
+static void test_pack_PINPUT(void)
+{
+ /* PINPUT */
+ TEST_TYPE(PINPUT, 4, 4);
+}
+
static void test_pack_PKBDLLHOOKSTRUCT(void)
{
/* PKBDLLHOOKSTRUCT */
@@ -2266,6 +2284,7 @@
test_pack_ICONINFO();
test_pack_ICONMETRICSA();
test_pack_ICONMETRICSW();
+ test_pack_INPUT();
test_pack_KBDLLHOOKSTRUCT();
test_pack_KEYBDINPUT();
test_pack_LPACCEL();
@@ -2308,6 +2327,7 @@
test_pack_LPHIGHCONTRASTW();
test_pack_LPICONMETRICSA();
test_pack_LPICONMETRICSW();
+ test_pack_LPINPUT();
test_pack_LPKBDLLHOOKSTRUCT();
test_pack_LPKEYBDINPUT();
test_pack_LPMDICREATESTRUCTA();
@@ -2408,6 +2428,7 @@
test_pack_PICONINFO();
test_pack_PICONMETRICSA();
test_pack_PICONMETRICSW();
+ test_pack_PINPUT();
test_pack_PKBDLLHOOKSTRUCT();
test_pack_PKEYBDINPUT();
test_pack_PMDINEXTMENU();
Index: dlls/wininet/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/wininet/tests/generated.c,v
retrieving revision 1.5
diff -u -r1.5 generated.c
--- dlls/wininet/tests/generated.c 13 Aug 2004 23:19:37 -0000 1.5
+++ dlls/wininet/tests/generated.c 22 Aug 2004 22:32:52 -0000
@@ -372,6 +372,7 @@
{
/* GROUPID */
TEST_TYPE(GROUPID, 8, 8);
+ TEST_TYPE_SIGNED(GROUPID);
}
static void test_pack_HINTERNET(void)
@@ -874,11 +875,13 @@
static void test_pack_LPURL_COMPONENTSA(void)
{
/* LPURL_COMPONENTSA */
+ TEST_TYPE(LPURL_COMPONENTSA, 4, 4);
}
static void test_pack_LPURL_COMPONENTSW(void)
{
/* LPURL_COMPONENTSW */
+ TEST_TYPE(LPURL_COMPONENTSW, 4, 4);
}
static void test_pack_PFN_AUTH_NOTIFY(void)
More information about the wine-patches
mailing list