diff --git a/programs/winetest/include/advapi32.pm b/programs/winetest/include/advapi32.pm index 4219d1b975b..a937ed6a424 100644 --- a/programs/winetest/include/advapi32.pm +++ b/programs/winetest/include/advapi32.pm @@ -160,10 +160,13 @@ my $module_declarations = { "RegOpenKeyW" => ["long", ["long", "wstr", "ptr"]], "RegQueryInfoKeyA" => ["long", ["long", "str", "ptr", "ptr", "ptr", "ptr", "ptr", "ptr", "ptr", "ptr", "ptr", "ptr"]], "RegQueryInfoKeyW" => ["long", ["long", "wstr", "ptr", "ptr", "ptr", "ptr", "ptr", "ptr", "ptr", "ptr", "ptr", "ptr"]], + "RegQueryMultipleValuesA" => ["long", ["long", "ptr", "long", "str", "ptr"]], + "RegQueryMultipleValuesW" => ["long", ["long", "ptr", "long", "wstr", "ptr"]], "RegQueryValueA" => ["long", ["long", "str", "str", "ptr"]], "RegQueryValueExA" => ["long", ["long", "str", "ptr", "ptr", "ptr", "ptr"]], "RegQueryValueExW" => ["long", ["long", "wstr", "ptr", "ptr", "ptr", "ptr"]], "RegQueryValueW" => ["long", ["long", "wstr", "wstr", "ptr"]], + "RegReplaceKeyA" => ["long", ["long", "str", "str", "str"]], "RegReplaceKeyW" => ["long", ["long", "wstr", "wstr", "wstr"]], "RegRestoreKeyA" => ["long", ["long", "str", "long"]], "RegRestoreKeyW" => ["long", ["long", "wstr", "long"]], @@ -192,6 +195,7 @@ my $module_declarations = { "SetSecurityDescriptorSacl" => ["long", ["ptr", "long", "ptr", "long"]], "SetServiceStatus" => ["long", ["long", "ptr"]], "SetThreadToken" => ["long", ["ptr", "long"]], + "SetTokenInformation" => ["long", ["long", "long", "ptr", "long"]], "StartServiceA" => ["long", ["long", "long", "ptr"]], "StartServiceCtrlDispatcherA" => ["long", ["ptr"]], "StartServiceCtrlDispatcherW" => ["long", ["ptr"]], diff --git a/programs/winetest/include/comctl32.pm b/programs/winetest/include/comctl32.pm index 3038a8827c5..cba3585e33a 100644 --- a/programs/winetest/include/comctl32.pm +++ b/programs/winetest/include/comctl32.pm @@ -27,79 +27,10 @@ my $module_declarations = { "DrawInsert" => ["void", ["long", "long", "long"]], "CreateUpDownControl" => ["long", ["long", "long", "long", "long", "long", "long", "long", "long", "long", "long", "long", "long"]], "InitCommonControls" => ["void", []], - "CreatePropertySheetPage" => ["long", ["ptr"]], - "CreatePropertySheetPageA" => ["long", ["ptr"]], - "CreatePropertySheetPageW" => ["long", ["ptr"]], - "CreateStatusWindow" => ["long", ["long", "str", "long", "long"]], - "CreateStatusWindowW" => ["long", ["long", "wstr", "long", "long"]], - "CreateToolbarEx" => ["long", ["long", "long", "long", "long", "long", "long", "ptr", "long", "long", "long", "long", "long", "long"]], - "DestroyPropertySheetPage" => ["long", ["long"]], - "DllGetVersion" => ["long", ["ptr"]], - "DllInstall" => ["long", ["long", "wstr"]], - "DrawStatusText" => ["void", ["long", "ptr", "str", "long"]], - "DrawStatusTextW" => ["void", ["long", "ptr", "wstr", "long"]], - "FlatSB_EnableScrollBar" => ["long", ["long", "long", "long"]], - "FlatSB_GetScrollInfo" => ["long", ["long", "long", "ptr"]], - "FlatSB_GetScrollPos" => ["long", ["long", "long"]], - "FlatSB_GetScrollProp" => ["long", ["long", "long", "ptr"]], - "FlatSB_GetScrollRange" => ["long", ["long", "long", "ptr", "ptr"]], - "FlatSB_SetScrollInfo" => ["long", ["long", "long", "ptr", "long"]], - "FlatSB_SetScrollPos" => ["long", ["long", "long", "long", "long"]], - "FlatSB_SetScrollProp" => ["long", ["long", "long", "long", "long"]], - "FlatSB_ShowScrollBar" => ["long", ["long", "long", "long"]], - "GetMUILanguage" => ["long", []], - "ImageList_Add" => ["long", ["long", "long", "long"]], - "ImageList_AddIcon" => ["long", ["long", "long"]], - "ImageList_AddMasked" => ["long", ["long", "long", "long"]], - "ImageList_BeginDrag" => ["long", ["long", "long", "long", "long"]], - "ImageList_Copy" => ["long", ["long", "long", "long", "long", "long"]], - "ImageList_Create" => ["long", ["long", "long", "long", "long", "long"]], - "ImageList_Destroy" => ["long", ["long"]], - "ImageList_DragEnter" => ["long", ["long", "long", "long"]], - "ImageList_DragLeave" => ["long", ["long"]], - "ImageList_DragMove" => ["long", ["long", "long"]], - "ImageList_DragShowNolock" => ["long", ["long"]], - "ImageList_Draw" => ["long", ["long", "long", "long", "long", "long", "long"]], - "ImageList_DrawEx" => ["long", ["long", "long", "long", "long", "long", "long", "long", "long", "long", "long"]], - "ImageList_DrawIndirect" => ["long", ["ptr"]], - "ImageList_Duplicate" => ["long", ["long"]], - "ImageList_EndDrag" => ["long", []], - "ImageList_GetBkColor" => ["long", ["long"]], - "ImageList_GetDragImage" => ["long", ["ptr", "ptr"]], - "ImageList_GetFlags" => ["long", ["long"]], - "ImageList_GetIcon" => ["long", ["long", "long", "long"]], - "ImageList_GetIconSize" => ["long", ["long", "ptr", "ptr"]], - "ImageList_GetImageCount" => ["long", ["long"]], - "ImageList_GetImageInfo" => ["long", ["long", "long", "ptr"]], - "ImageList_GetImageRect" => ["long", ["long", "long", "ptr"]], - "ImageList_LoadImage" => ["long", ["long", "str", "long", "long", "long", "long", "long"]], - "ImageList_LoadImageA" => ["long", ["long", "str", "long", "long", "long", "long", "long"]], - "ImageList_LoadImageW" => ["long", ["long", "wstr", "long", "long", "long", "long", "long"]], - "ImageList_Merge" => ["long", ["long", "long", "long", "long", "long", "long"]], - "ImageList_Read" => ["long", ["ptr"]], - "ImageList_Remove" => ["long", ["long", "long"]], - "ImageList_Replace" => ["long", ["long", "long", "long", "long"]], "Alloc" => ["ptr", ["long"]], "ReAlloc" => ["ptr", ["ptr", "long"]], "Free" => ["long", ["ptr"]], "GetSize" => ["long", ["ptr"]], - "ImageList_ReplaceIcon" => ["long", ["long", "long", "long"]], - "ImageList_SetBkColor" => ["long", ["long", "long"]], - "ImageList_SetDragCursorImage" => ["long", ["long", "long", "long", "long"]], - "ImageList_SetFilter" => ["long", ["long", "long", "long"]], - "ImageList_SetFlags" => ["long", ["long", "long"]], - "ImageList_SetIconSize" => ["long", ["long", "long", "long"]], - "ImageList_SetImageCount" => ["long", ["long", "long"]], - "ImageList_SetOverlayImage" => ["long", ["long", "long", "long"]], - "ImageList_Write" => ["long", ["long", "ptr"]], - "InitCommonControlsEx" => ["long", ["ptr"]], - "InitMUILanguage" => ["void", ["long"]], - "InitializeFlatSB" => ["long", ["long"]], - "PropertySheet" => ["long", ["ptr"]], - "PropertySheetA" => ["long", ["ptr"]], - "PropertySheetW" => ["long", ["ptr"]], - "UninitializeFlatSB" => ["long", ["long"]], - "_TrackMouseEvent" => ["long", ["ptr"]], "CreateMRUListA" => ["long", ["ptr"]], "FreeMRUList" => ["long", ["long"]], "AddMRUStringA" => ["long", ["long", "str"]], @@ -160,7 +91,76 @@ my $module_declarations = { "AddMRUStringW" => ["long", ["long", "wstr"]], "FindMRUStringW" => ["long", ["long", "wstr", "ptr"]], "EnumMRUListW" => ["long", ["long", "long", "ptr", "long"]], - "CreateMRUListLazyW" => ["long", ["ptr", "long", "long", "long"]] + "CreateMRUListLazyW" => ["long", ["ptr", "long", "long", "long"]], + "CreatePropertySheetPage" => ["long", ["ptr"]], + "CreatePropertySheetPageA" => ["long", ["ptr"]], + "CreatePropertySheetPageW" => ["long", ["ptr"]], + "CreateStatusWindow" => ["long", ["long", "str", "long", "long"]], + "CreateStatusWindowW" => ["long", ["long", "wstr", "long", "long"]], + "CreateToolbarEx" => ["long", ["long", "long", "long", "long", "long", "long", "ptr", "long", "long", "long", "long", "long", "long"]], + "DestroyPropertySheetPage" => ["long", ["long"]], + "DllGetVersion" => ["long", ["ptr"]], + "DllInstall" => ["long", ["long", "wstr"]], + "DrawStatusText" => ["void", ["long", "ptr", "str", "long"]], + "DrawStatusTextW" => ["void", ["long", "ptr", "wstr", "long"]], + "FlatSB_EnableScrollBar" => ["long", ["long", "long", "long"]], + "FlatSB_GetScrollInfo" => ["long", ["long", "long", "ptr"]], + "FlatSB_GetScrollPos" => ["long", ["long", "long"]], + "FlatSB_GetScrollProp" => ["long", ["long", "long", "ptr"]], + "FlatSB_GetScrollRange" => ["long", ["long", "long", "ptr", "ptr"]], + "FlatSB_SetScrollInfo" => ["long", ["long", "long", "ptr", "long"]], + "FlatSB_SetScrollPos" => ["long", ["long", "long", "long", "long"]], + "FlatSB_SetScrollProp" => ["long", ["long", "long", "long", "long"]], + "FlatSB_ShowScrollBar" => ["long", ["long", "long", "long"]], + "GetMUILanguage" => ["long", []], + "ImageList_Add" => ["long", ["long", "long", "long"]], + "ImageList_AddIcon" => ["long", ["long", "long"]], + "ImageList_AddMasked" => ["long", ["long", "long", "long"]], + "ImageList_BeginDrag" => ["long", ["long", "long", "long", "long"]], + "ImageList_Copy" => ["long", ["long", "long", "long", "long", "long"]], + "ImageList_Create" => ["long", ["long", "long", "long", "long", "long"]], + "ImageList_Destroy" => ["long", ["long"]], + "ImageList_DragEnter" => ["long", ["long", "long", "long"]], + "ImageList_DragLeave" => ["long", ["long"]], + "ImageList_DragMove" => ["long", ["long", "long"]], + "ImageList_DragShowNolock" => ["long", ["long"]], + "ImageList_Draw" => ["long", ["long", "long", "long", "long", "long", "long"]], + "ImageList_DrawEx" => ["long", ["long", "long", "long", "long", "long", "long", "long", "long", "long", "long"]], + "ImageList_DrawIndirect" => ["long", ["ptr"]], + "ImageList_Duplicate" => ["long", ["long"]], + "ImageList_EndDrag" => ["long", []], + "ImageList_GetBkColor" => ["long", ["long"]], + "ImageList_GetDragImage" => ["long", ["ptr", "ptr"]], + "ImageList_GetFlags" => ["long", ["long"]], + "ImageList_GetIcon" => ["long", ["long", "long", "long"]], + "ImageList_GetIconSize" => ["long", ["long", "ptr", "ptr"]], + "ImageList_GetImageCount" => ["long", ["long"]], + "ImageList_GetImageInfo" => ["long", ["long", "long", "ptr"]], + "ImageList_GetImageRect" => ["long", ["long", "long", "ptr"]], + "ImageList_LoadImage" => ["long", ["long", "str", "long", "long", "long", "long", "long"]], + "ImageList_LoadImageA" => ["long", ["long", "str", "long", "long", "long", "long", "long"]], + "ImageList_LoadImageW" => ["long", ["long", "wstr", "long", "long", "long", "long", "long"]], + "ImageList_Merge" => ["long", ["long", "long", "long", "long", "long", "long"]], + "ImageList_Read" => ["long", ["ptr"]], + "ImageList_Remove" => ["long", ["long", "long"]], + "ImageList_Replace" => ["long", ["long", "long", "long", "long"]], + "ImageList_ReplaceIcon" => ["long", ["long", "long", "long"]], + "ImageList_SetBkColor" => ["long", ["long", "long"]], + "ImageList_SetDragCursorImage" => ["long", ["long", "long", "long", "long"]], + "ImageList_SetFilter" => ["long", ["long", "long", "long"]], + "ImageList_SetFlags" => ["long", ["long", "long"]], + "ImageList_SetIconSize" => ["long", ["long", "long", "long"]], + "ImageList_SetImageCount" => ["long", ["long", "long"]], + "ImageList_SetOverlayImage" => ["long", ["long", "long", "long"]], + "ImageList_Write" => ["long", ["long", "ptr"]], + "InitCommonControlsEx" => ["long", ["ptr"]], + "InitMUILanguage" => ["void", ["long"]], + "InitializeFlatSB" => ["long", ["long"]], + "PropertySheet" => ["long", ["ptr"]], + "PropertySheetA" => ["long", ["ptr"]], + "PropertySheetW" => ["long", ["ptr"]], + "UninitializeFlatSB" => ["long", ["long"]], + "_TrackMouseEvent" => ["long", ["ptr"]] }; &wine::declare("comctl32",%$module_declarations); diff --git a/programs/winetest/include/kernel32.pm b/programs/winetest/include/kernel32.pm index 7315aec291a..6a90b23912d 100644 --- a/programs/winetest/include/kernel32.pm +++ b/programs/winetest/include/kernel32.pm @@ -307,7 +307,6 @@ my $module_declarations = { "GetFullPathNameW" => ["long", ["wstr", "long", "wstr", "ptr"]], "GetHandleContext" => ["long", ["long"]], "GetHandleInformation" => ["long", ["long", "ptr"]], - "GetLargestConsoleWindowSize" => ["long", ["long"]], "GetLastError" => ["long", []], "GetLocalTime" => ["void", ["ptr"]], "GetLocaleInfoA" => ["long", ["long", "long", "str", "long"]], @@ -625,6 +624,7 @@ my $module_declarations = { "SetLastError" => ["void", ["long"]], "SetLocalTime" => ["long", ["ptr"]], "SetLocaleInfoA" => ["long", ["long", "long", "str"]], + "SetLocaleInfoW" => ["long", ["long", "long", "wstr"]], "SetNamedPipeHandleState" => ["long", ["long", "ptr", "ptr", "ptr"]], "SetPriorityClass" => ["long", ["long", "long"]], "SetProcessAffinityMask" => ["long", ["long", "long"]], @@ -654,6 +654,7 @@ my $module_declarations = { "Sleep" => ["void", ["long"]], "SleepEx" => ["long", ["long", "long"]], "SuspendThread" => ["long", ["long"]], + "SwitchToThread" => ["long", []], "SystemTimeToFileTime" => ["long", ["ptr", "ptr"]], "SystemTimeToTzSpecificLocalTime" => ["long", ["ptr", "ptr", "ptr"]], "TerminateProcess" => ["long", ["long", "long"]], diff --git a/programs/winetest/include/ntdll.pm b/programs/winetest/include/ntdll.pm index 712e7bd547b..3995145cc0a 100644 --- a/programs/winetest/include/ntdll.pm +++ b/programs/winetest/include/ntdll.pm @@ -33,7 +33,6 @@ my $module_declarations = { "NtCreateSemaphore" => ["long", ["ptr", "long", "ptr", "long", "long"]], "NtCreateSymbolicLinkObject" => ["long", ["ptr", "long", "ptr", "ptr"]], "NtCreateTimer" => ["long", ["ptr", "long", "ptr", "long"]], - "NtCurrentTeb" => ["ptr", []], "NtDeleteKey" => ["long", ["long"]], "NtDeleteValueKey" => ["long", ["long", "ptr"]], "NtDeviceIoControlFile" => ["long", ["long", "long", "ptr", "ptr", "ptr", "long", "ptr", "long", "ptr", "long"]], @@ -118,8 +117,11 @@ my $module_declarations = { "RtlAppendStringToString" => ["long", ["ptr", "ptr"]], "RtlAppendUnicodeStringToString" => ["long", ["ptr", "ptr"]], "RtlAppendUnicodeToString" => ["long", ["ptr", "wstr"]], + "RtlAreBitsClear" => ["long", ["ptr", "long", "long"]], + "RtlAreBitsSet" => ["long", ["ptr", "long", "long"]], "RtlAssert" => ["void", ["ptr", "ptr", "long", "long"]], - "RtlClearBits" => ["long", ["long", "long", "long"]], + "RtlClearAllBits" => ["void", ["ptr"]], + "RtlClearBits" => ["void", ["ptr", "long", "long"]], "RtlCompactHeap" => ["long", ["long", "long"]], "RtlCompareMemory" => ["long", ["ptr", "ptr", "long"]], "RtlCompareString" => ["long", ["ptr", "ptr", "long"]], @@ -155,7 +157,21 @@ my $module_declarations = { "RtlExtendedIntegerMultiply" => ["longlong", ["long", "long", "long"]], "RtlExtendedLargeIntegerDivide" => ["longlong", ["long", "long", "long", "ptr"]], "RtlFillMemory" => ["void", ["ptr", "long", "long"]], - "RtlFindClearBits" => ["long", ["long", "long", "long"]], + "RtlFillMemoryUlong" => ["void", ["ptr", "long", "long"]], + "RtlFindClearBits" => ["long", ["ptr", "long", "long"]], + "RtlFindClearBitsAndSet" => ["long", ["ptr", "long", "long"]], + "RtlFindClearRuns" => ["long", ["ptr", "ptr", "long", "long"]], + "RtlFindLastBackwardRunClear" => ["long", ["ptr", "long", "ptr"]], + "RtlFindLastBackwardRunSet" => ["long", ["ptr", "long", "ptr"]], + "RtlFindLeastSignificantBit" => ["long", ["long", "long"]], + "RtlFindLongestRunClear" => ["long", ["ptr", "ptr"]], + "RtlFindLongestRunSet" => ["long", ["ptr", "ptr"]], + "RtlFindMostSignificantBit" => ["long", ["long", "long"]], + "RtlFindNextForwardRunClear" => ["long", ["ptr", "long", "ptr"]], + "RtlFindNextForwardRunSet" => ["long", ["ptr", "long", "ptr"]], + "RtlFindSetBits" => ["long", ["ptr", "long", "long"]], + "RtlFindSetBitsAndClear" => ["long", ["ptr", "long", "long"]], + "RtlFindSetRuns" => ["long", ["ptr", "ptr", "long", "long"]], "RtlFirstFreeAce" => ["long", ["ptr", "ptr"]], "RtlFormatCurrentUserKeyPath" => ["long", ["ptr"]], "RtlFreeAnsiString" => ["void", ["ptr"]], @@ -167,17 +183,22 @@ my $module_declarations = { "RtlGetControlSecurityDescriptor" => ["long", ["ptr", "ptr", "ptr"]], "RtlGetDaclSecurityDescriptor" => ["long", ["ptr", "ptr", "ptr", "ptr"]], "RtlGetGroupSecurityDescriptor" => ["long", ["ptr", "ptr", "ptr"]], + "RtlGetLongestNtPathLength" => ["long", []], "RtlGetNtProductType" => ["long", ["ptr"]], + "RtlGetNtVersionNumbers" => ["void", ["ptr", "ptr", "ptr"]], "RtlGetOwnerSecurityDescriptor" => ["long", ["ptr", "ptr", "ptr"]], "RtlGetProcessHeaps" => ["long", ["long", "ptr"]], "RtlGetSaclSecurityDescriptor" => ["long", ["ptr", "ptr", "ptr", "ptr"]], "RtlIdentifierAuthoritySid" => ["ptr", ["ptr"]], + "RtlImageDirectoryEntryToData" => ["ptr", ["long", "long", "long", "ptr"]], "RtlImageNtHeader" => ["ptr", ["long"]], + "RtlImageRvaToSection" => ["ptr", ["ptr", "long", "long"]], + "RtlImageRvaToVa" => ["ptr", ["ptr", "long", "long", "ptr"]], "RtlImpersonateSelf" => ["long", ["long"]], "RtlInitAnsiString" => ["void", ["ptr", "str"]], "RtlInitString" => ["void", ["ptr", "str"]], "RtlInitUnicodeString" => ["void", ["ptr", "wstr"]], - "RtlInitializeBitMap" => ["long", ["long", "long", "long"]], + "RtlInitializeBitMap" => ["void", ["ptr", "ptr", "long"]], "RtlInitializeCriticalSection" => ["long", ["ptr"]], "RtlInitializeCriticalSectionAndSpinCount" => ["long", ["ptr", "long"]], "RtlInitializeGenericTable" => ["long", []], @@ -204,6 +225,8 @@ my $module_declarations = { "RtlNewSecurityObject" => ["long", ["long", "long", "long", "long", "long", "long"]], "RtlNormalizeProcessParams" => ["ptr", ["ptr"]], "RtlNtStatusToDosError" => ["long", ["long"]], + "RtlNumberOfClearBits" => ["long", ["ptr"]], + "RtlNumberOfSetBits" => ["long", ["ptr"]], "RtlOemStringToUnicodeSize" => ["long", ["ptr"]], "RtlOemStringToUnicodeString" => ["long", ["ptr", "ptr", "long"]], "RtlOemToUnicodeN" => ["long", ["wstr", "long", "ptr", "str", "long"]], @@ -218,7 +241,8 @@ my $module_declarations = { "RtlReleaseResource" => ["void", ["ptr"]], "RtlSecondsSince1970ToTime" => ["void", ["long", "ptr"]], "RtlSecondsSince1980ToTime" => ["void", ["long", "ptr"]], - "RtlSetBits" => ["long", ["long", "long", "long"]], + "RtlSetAllBits" => ["void", ["ptr"]], + "RtlSetBits" => ["void", ["ptr", "long", "long"]], "RtlSetDaclSecurityDescriptor" => ["long", ["ptr", "long", "ptr", "long"]], "RtlSetEnvironmentVariable" => ["long", ["long", "ptr", "ptr"]], "RtlSetGroupSecurityDescriptor" => ["long", ["ptr", "ptr", "long"]], diff --git a/programs/winetest/include/ole32.pm b/programs/winetest/include/ole32.pm index 55095321cfc..175abe65567 100644 --- a/programs/winetest/include/ole32.pm +++ b/programs/winetest/include/ole32.pm @@ -29,6 +29,7 @@ my $module_declarations = { "CoGetMarshalSizeMax" => ["long", ["ptr", "ptr", "ptr", "long", "ptr", "long"]], "CoGetPSClsid" => ["long", ["ptr", "ptr"]], "CoGetStandardMarshal" => ["long", ["ptr", "ptr", "long", "ptr", "long", "ptr"]], + "CoGetState" => ["long", ["ptr"]], "CoInitialize" => ["long", ["ptr"]], "CoInitializeWOW" => ["long", ["long", "long"]], "CoIsOle1Class" => ["long", ["ptr"]], @@ -37,8 +38,10 @@ my $module_declarations = { "CoMarshalInterThreadInterfaceInStream" => ["long", ["ptr", "ptr", "ptr"]], "CoMarshalInterface" => ["long", ["ptr", "ptr", "ptr", "long", "ptr", "long"]], "CoRegisterClassObject" => ["long", ["ptr", "ptr", "long", "long", "ptr"]], + "CoRegisterMallocSpy" => ["long", ["ptr"]], "CoRegisterMessageFilter" => ["long", ["ptr", "ptr"]], "CoRevokeClassObject" => ["long", ["long"]], + "CoRevokeMallocSpy" => ["long", []], "CoSetState" => ["long", ["ptr"]], "CoTaskMemAlloc" => ["ptr", ["long"]], "CoTaskMemFree" => ["void", ["ptr"]], @@ -132,6 +135,7 @@ my $module_declarations = { "WriteClassStm" => ["long", ["ptr", "ptr"]], "WriteFmtUserTypeStg" => ["long", ["ptr", "long", "str"]], "CoInitializeEx" => ["long", ["ptr", "long"]], + "CoInitializeSecurity" => ["long", ["ptr", "long", "ptr", "ptr", "long", "long", "ptr", "long", "ptr"]], "CoCreateInstanceEx" => ["long", ["ptr", "ptr", "long", "ptr", "long", "ptr"]], "PropVariantClear" => ["long", ["ptr"]], "CoResumeClassObjects" => ["long", []], @@ -141,7 +145,6 @@ my $module_declarations = { "GetErrorInfo" => ["long", ["long", "ptr"]], "PropVariantCopy" => ["long", ["ptr", "ptr"]], "SetErrorInfo" => ["long", ["long", "ptr"]], - "CoInitializeSecurity" => ["long", ["ptr", "long", "undef", "ptr", "long", "long", "ptr", "long", "ptr"]], "DllEntryPoint" => ["long", ["long", "long", "ptr"]] }; diff --git a/programs/winetest/include/rpcrt4.pm b/programs/winetest/include/rpcrt4.pm index 49811b3f32e..202ee8f1fef 100644 --- a/programs/winetest/include/rpcrt4.pm +++ b/programs/winetest/include/rpcrt4.pm @@ -34,9 +34,9 @@ my $module_declarations = { "RpcStringFreeA" => ["long", ["ptr"]], "UuidCreate" => ["long", ["ptr"]], "UuidCreateSequential" => ["long", ["ptr"]], - "UuidFromStringA" => ["long", ["ptr", "ptr"]], - "UuidFromStringW" => ["long", ["ptr", "ptr"]], - "UuidHash" => ["ptr", ["ptr", "ptr"]], + "UuidFromStringA" => ["long", ["str", "ptr"]], + "UuidFromStringW" => ["long", ["wstr", "ptr"]], + "UuidHash" => ["long", ["ptr", "ptr"]], "UuidToStringA" => ["long", ["ptr", "ptr"]] }; diff --git a/programs/winetest/include/shell32.pm b/programs/winetest/include/shell32.pm index 5bbc5c4469e..642b99f0841 100644 --- a/programs/winetest/include/shell32.pm +++ b/programs/winetest/include/shell32.pm @@ -113,7 +113,12 @@ my $module_declarations = { "SHOutOfMemoryMessageBox" => ["long", ["long", "str", "long"]], "SHWinHelp" => ["long", ["long", "long", "long", "long"]], "DllGetClassObject" => ["long", ["ptr", "ptr", "ptr"]], + "DAD_AutoScroll" => ["long", ["long", "ptr", "ptr"]], + "DAD_DragEnter" => ["long", ["long"]], + "DAD_DragEnterEx" => ["long", ["long", "long", "long"]], + "DAD_DragLeave" => ["long", []], "DragQueryFileW" => ["long", ["long", "long", "wstr", "long"]], + "DAD_DragMove" => ["long", ["long", "long"]], "DragQueryPoint" => ["long", ["long", "ptr"]], "DAD_SetDragImage" => ["long", ["long", "ptr"]], "DAD_ShowDragImage" => ["long", ["long"]], diff --git a/programs/winetest/include/shlwapi.pm b/programs/winetest/include/shlwapi.pm index ec4cb52aa4d..b5f9bbe0a95 100644 --- a/programs/winetest/include/shlwapi.pm +++ b/programs/winetest/include/shlwapi.pm @@ -176,15 +176,20 @@ my $module_declarations = { "SHRegSetPathW" => ["long", ["long", "wstr", "wstr", "wstr", "long"]], "SHRegWriteUSValueA" => ["long", ["long", "str", "long", "ptr", "long", "long"]], "SHRegWriteUSValueW" => ["long", ["long", "wstr", "long", "ptr", "long", "long"]], + "SHReleaseThreadRef" => ["long", ["undef"]], "SHSetThreadRef" => ["long", ["ptr"]], "SHSetValueA" => ["long", ["long", "str", "str", "long", "ptr", "long"]], "SHSetValueW" => ["long", ["long", "wstr", "wstr", "long", "ptr", "long"]], "StrCSpnA" => ["long", ["str", "str"]], + "StrCSpnIA" => ["long", ["str", "str"]], + "StrCSpnIW" => ["long", ["wstr", "wstr"]], "StrCSpnW" => ["long", ["wstr", "wstr"]], "StrCatBuffA" => ["str", ["str", "str", "long"]], "StrCatBuffW" => ["wstr", ["wstr", "wstr", "long"]], "StrCatW" => ["wstr", ["wstr", "wstr"]], "StrChrA" => ["str", ["str", "long"]], + "StrChrIA" => ["str", ["str", "long"]], + "StrChrIW" => ["wstr", ["wstr", "long"]], "StrChrW" => ["wstr", ["wstr", "long"]], "StrCmpIW" => ["long", ["wstr", "wstr"]], "StrCmpNA" => ["long", ["str", "str", "long"]], @@ -198,14 +203,28 @@ my $module_declarations = { "StrDupW" => ["wstr", ["wstr"]], "StrFormatByteSizeA" => ["str", ["long", "str", "long"]], "StrFormatByteSizeW" => ["wstr", ["long", "wstr", "long"]], + "StrFormatKBSizeA" => ["str", ["long", "long", "str", "long"]], + "StrFormatKBSizeW" => ["wstr", ["long", "long", "wstr", "long"]], + "StrFromTimeIntervalA" => ["long", ["str", "long", "long", "long"]], + "StrFromTimeIntervalW" => ["long", ["wstr", "long", "long", "long"]], + "StrIsIntlEqualA" => ["long", ["long", "str", "str", "long"]], + "StrIsIntlEqualW" => ["long", ["long", "wstr", "wstr", "long"]], "StrNCatA" => ["str", ["str", "str", "long"]], "StrNCatW" => ["wstr", ["wstr", "wstr", "long"]], + "StrPBrkA" => ["str", ["str", "str"]], + "StrPBrkW" => ["wstr", ["wstr", "wstr"]], "StrRChrA" => ["str", ["str", "str", "long"]], "StrRChrIA" => ["str", ["str", "str", "long"]], "StrRChrIW" => ["wstr", ["wstr", "wstr", "long"]], "StrRChrW" => ["wstr", ["wstr", "wstr", "long"]], + "StrRStrIA" => ["str", ["str", "str", "str"]], + "StrRStrIW" => ["wstr", ["wstr", "wstr", "wstr"]], "StrRetToBufA" => ["long", ["ptr", "ptr", "str", "long"]], "StrRetToBufW" => ["long", ["ptr", "ptr", "wstr", "long"]], + "StrRetToStrA" => ["long", ["ptr", "ptr", "ptr"]], + "StrRetToStrW" => ["long", ["ptr", "ptr", "ptr"]], + "StrSpnA" => ["long", ["str", "str"]], + "StrSpnW" => ["long", ["wstr", "wstr"]], "StrStrA" => ["str", ["str", "str"]], "StrStrIA" => ["str", ["str", "str"]], "StrStrIW" => ["wstr", ["wstr", "wstr"]], @@ -215,6 +234,7 @@ my $module_declarations = { "StrToIntExW" => ["long", ["wstr", "long", "ptr"]], "StrToIntW" => ["long", ["wstr"]], "StrTrimA" => ["long", ["str", "str"]], + "StrTrimW" => ["long", ["wstr", "wstr"]], "UrlApplySchemeW" => ["long", ["wstr", "wstr", "ptr", "long"]], "UrlCanonicalizeA" => ["long", ["str", "str", "ptr", "long"]], "UrlCanonicalizeW" => ["long", ["wstr", "wstr", "ptr", "long"]], @@ -229,6 +249,7 @@ my $module_declarations = { "UrlGetPartA" => ["long", ["str", "str", "ptr", "long", "long"]], "UrlGetPartW" => ["long", ["wstr", "wstr", "ptr", "long", "long"]], "UrlHashA" => ["long", ["str", "ptr", "long"]], + "UrlHashW" => ["long", ["wstr", "ptr", "long"]], "UrlIsA" => ["long", ["str", "long"]], "UrlIsNoHistoryA" => ["long", ["str"]], "UrlIsNoHistoryW" => ["long", ["wstr"]], @@ -237,7 +258,7 @@ my $module_declarations = { "UrlIsW" => ["long", ["wstr", "long"]], "UrlUnescapeA" => ["long", ["str", "str", "ptr", "long"]], "UrlUnescapeW" => ["long", ["wstr", "wstr", "ptr", "long"]], - "_SHGetInstanceExplorer\@4" => ["long", ["ptr"]], + "_SHGetInstanceExplorer" => ["long", ["ptr"]], "wvnsprintfA" => ["long", ["str", "long", "str", "ptr"]], "wvnsprintfW" => ["long", ["wstr", "long", "wstr", "ptr"]] }; diff --git a/programs/winetest/include/urlmon.pm b/programs/winetest/include/urlmon.pm index 17c39a63a45..e257e7dbc42 100644 --- a/programs/winetest/include/urlmon.pm +++ b/programs/winetest/include/urlmon.pm @@ -21,7 +21,7 @@ my $module_declarations = { "DllRegisterServer" => ["long", []], "DllRegisterServerEx" => ["long", []], "DllUnregisterServer" => ["long", []], - "Extract" => ["long", ["long", "long"]], + "Extract" => ["long", ["long", "str"]], "ObtainUserAgentString" => ["long", ["long", "str", "ptr"]], "RegisterBindStatusCallback" => ["long", ["ptr", "ptr", "ptr", "long"]], "RevokeBindStatusCallback" => ["long", ["ptr", "ptr"]], diff --git a/programs/winetest/include/user32.pm b/programs/winetest/include/user32.pm index 38e98e8dacc..07569c1a198 100644 --- a/programs/winetest/include/user32.pm +++ b/programs/winetest/include/user32.pm @@ -26,6 +26,7 @@ my $module_declarations = { "BeginPaint" => ["long", ["long", "ptr"]], "BringWindowToTop" => ["long", ["long"]], "BroadcastSystemMessage" => ["long", ["long", "ptr", "long", "long", "long"]], + "BroadcastSystemMessageA" => ["long", ["long", "ptr", "long", "long", "long"]], "CalcChildScroll" => ["void", ["long", "long"]], "CallMsgFilterA" => ["long", ["ptr", "long"]], "CallMsgFilterW" => ["long", ["ptr", "long"]],