diff --git a/reactos/dll/3rdparty/mesa32/mesa32.rbuild b/reactos/dll/3rdparty/mesa32/mesa32.rbuild index 5afb01eb1ba..88d4c16cef3 100644 --- a/reactos/dll/3rdparty/mesa32/mesa32.rbuild +++ b/reactos/dll/3rdparty/mesa32/mesa32.rbuild @@ -5,7 +5,6 @@ -enable-stdcall-fixup ntdll kernel32 - msvcrt user32 diff --git a/reactos/dll/cpl/appwiz-new/appwiz.rbuild b/reactos/dll/cpl/appwiz-new/appwiz.rbuild index e284dfb7a0b..1a77bdc7139 100644 --- a/reactos/dll/cpl/appwiz-new/appwiz.rbuild +++ b/reactos/dll/cpl/appwiz-new/appwiz.rbuild @@ -11,7 +11,6 @@ advapi32 user32 comctl32 - msvcrt ole32 uuid shell32 diff --git a/reactos/dll/cpl/appwiz/appwiz.rbuild b/reactos/dll/cpl/appwiz/appwiz.rbuild index 87ba21a755b..9c8370f5bd7 100644 --- a/reactos/dll/cpl/appwiz/appwiz.rbuild +++ b/reactos/dll/cpl/appwiz/appwiz.rbuild @@ -9,7 +9,6 @@ advapi32 user32 comctl32 - msvcrt ole32 uuid shell32 diff --git a/reactos/dll/cpl/console/console.def b/reactos/dll/cpl/console/console.def deleted file mode 100644 index c1622ec4db8..00000000000 --- a/reactos/dll/cpl/console/console.def +++ /dev/null @@ -1,6 +0,0 @@ -LIBRARY console.dll - -EXPORTS -CPlApplet - -; EOF diff --git a/reactos/dll/cpl/console/console.spec b/reactos/dll/cpl/console/console.spec new file mode 100644 index 00000000000..9e552162fb0 --- /dev/null +++ b/reactos/dll/cpl/console/console.spec @@ -0,0 +1 @@ +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/reactos/dll/cpl/desk/desk.rbuild b/reactos/dll/cpl/desk/desk.rbuild index f62e42806cd..4fab693ed21 100644 --- a/reactos/dll/cpl/desk/desk.rbuild +++ b/reactos/dll/cpl/desk/desk.rbuild @@ -18,7 +18,6 @@ shell32 ntdll msimg32 - msvcrt uuid advmon.c appearance.c diff --git a/reactos/dll/cpl/input/input.rbuild b/reactos/dll/cpl/input/input.rbuild index c666613586a..2e28fdc6a90 100644 --- a/reactos/dll/cpl/input/input.rbuild +++ b/reactos/dll/cpl/input/input.rbuild @@ -9,7 +9,6 @@ advapi32 user32 comctl32 - msvcrt gdi32 input.c settings.c diff --git a/reactos/dll/cpl/intl/intl.rbuild b/reactos/dll/cpl/intl/intl.rbuild index bf29868a45b..e25acc8c93e 100644 --- a/reactos/dll/cpl/intl/intl.rbuild +++ b/reactos/dll/cpl/intl/intl.rbuild @@ -11,7 +11,6 @@ comctl32 advapi32 setupapi - msvcrt shell32 currency.c date.c diff --git a/reactos/dll/cpl/joy/joy.rbuild b/reactos/dll/cpl/joy/joy.rbuild index f277e79a79b..8acde89a882 100644 --- a/reactos/dll/cpl/joy/joy.rbuild +++ b/reactos/dll/cpl/joy/joy.rbuild @@ -10,7 +10,6 @@ advapi32 user32 comctl32 - msvcrt ole32 uuid shell32 diff --git a/reactos/dll/cpl/main/main.rbuild b/reactos/dll/cpl/main/main.rbuild index bebfe3e8b0f..6867590fc24 100644 --- a/reactos/dll/cpl/main/main.rbuild +++ b/reactos/dll/cpl/main/main.rbuild @@ -13,7 +13,6 @@ comdlg32 shell32 gdi32 - msvcrt keyboard.c main.c mouse.c diff --git a/reactos/dll/cpl/mmsys/mmsys.rbuild b/reactos/dll/cpl/mmsys/mmsys.rbuild index 80d234d1332..918a87a7d93 100644 --- a/reactos/dll/cpl/mmsys/mmsys.rbuild +++ b/reactos/dll/cpl/mmsys/mmsys.rbuild @@ -8,7 +8,6 @@ kernel32 user32 comctl32 - msvcrt devmgr gdi32 winmm diff --git a/reactos/dll/cpl/odbccp32/odbccp32.rbuild b/reactos/dll/cpl/odbccp32/odbccp32.rbuild index 2bfd476a5c0..925c1587b64 100644 --- a/reactos/dll/cpl/odbccp32/odbccp32.rbuild +++ b/reactos/dll/cpl/odbccp32/odbccp32.rbuild @@ -8,7 +8,6 @@ kernel32 user32 comctl32 - msvcrt odbccp32.c odbccp32.rc diff --git a/reactos/dll/cpl/powercfg/powercfg.rbuild b/reactos/dll/cpl/powercfg/powercfg.rbuild index 32de07e8079..a21c05da971 100644 --- a/reactos/dll/cpl/powercfg/powercfg.rbuild +++ b/reactos/dll/cpl/powercfg/powercfg.rbuild @@ -11,7 +11,6 @@ powrprof comctl32 shell32 - msvcrt advapi32 powercfg.c powershemes.c diff --git a/reactos/dll/cpl/sysdm/sysdm.rbuild b/reactos/dll/cpl/sysdm/sysdm.rbuild index 3794645b895..2e4e351fd4a 100644 --- a/reactos/dll/cpl/sysdm/sysdm.rbuild +++ b/reactos/dll/cpl/sysdm/sysdm.rbuild @@ -9,7 +9,6 @@ kernel32 advapi32 setupapi - msvcrt user32 gdi32 comctl32 diff --git a/reactos/dll/cpl/telephon/telephon.rbuild b/reactos/dll/cpl/telephon/telephon.rbuild index e5ca0f254fd..49e8e385d78 100644 --- a/reactos/dll/cpl/telephon/telephon.rbuild +++ b/reactos/dll/cpl/telephon/telephon.rbuild @@ -10,7 +10,6 @@ advapi32 user32 comctl32 - msvcrt ole32 uuid shell32 diff --git a/reactos/dll/cpl/timedate/timedate.rbuild b/reactos/dll/cpl/timedate/timedate.rbuild index e703d77a0ac..d90012a0b30 100644 --- a/reactos/dll/cpl/timedate/timedate.rbuild +++ b/reactos/dll/cpl/timedate/timedate.rbuild @@ -12,7 +12,6 @@ comctl32 ws2_32 iphlpapi - msvcrt clock.c dateandtime.c internettime.c diff --git a/reactos/dll/cpl/usrmgr/usrmgr.rbuild b/reactos/dll/cpl/usrmgr/usrmgr.rbuild index 798e1d53807..54783ddcaab 100644 --- a/reactos/dll/cpl/usrmgr/usrmgr.rbuild +++ b/reactos/dll/cpl/usrmgr/usrmgr.rbuild @@ -13,7 +13,6 @@ comctl32 ntdll netapi32 - msvcrt extra.c groupprops.c groups.c diff --git a/reactos/dll/directx/ddraw/ddraw.rbuild b/reactos/dll/directx/ddraw/ddraw.rbuild index d91a0f0d608..20dcb778553 100644 --- a/reactos/dll/directx/ddraw/ddraw.rbuild +++ b/reactos/dll/directx/ddraw/ddraw.rbuild @@ -14,7 +14,6 @@ ole32 user32 advapi32 - msvcrt pseh ddraw.rc diff --git a/reactos/dll/directx/directx.rbuild b/reactos/dll/directx/directx.rbuild index 4cee3b3737e..4623a61606e 100644 --- a/reactos/dll/directx/directx.rbuild +++ b/reactos/dll/directx/directx.rbuild @@ -44,7 +44,4 @@ - - - diff --git a/reactos/dll/directx/dsound/dsound.rbuild b/reactos/dll/directx/dsound/dsound.rbuild index 3053ec1308c..f27fe9b205f 100644 --- a/reactos/dll/directx/dsound/dsound.rbuild +++ b/reactos/dll/directx/dsound/dsound.rbuild @@ -17,7 +17,6 @@ ole32 winmm dxguid - msvcrt version.rc buffer.c capture.c diff --git a/reactos/dll/ntdll/def/ntdll_amd64.def b/reactos/dll/ntdll/def/ntdll_amd64.def index 3b1d2fbd903..6d1c9cb0639 100644 --- a/reactos/dll/ntdll/def/ntdll_amd64.def +++ b/reactos/dll/ntdll/def/ntdll_amd64.def @@ -581,6 +581,7 @@ RtlLookupElementGenericTable RtlLookupElementGenericTableAvl RtlLookupElementGenericTableFull RtlLookupElementGenericTableFullAvl +RtlLookupFunctionEntry ;WIN64 RtlMakeSelfRelativeSD RtlMapGenericMask RtlMergeRangeLists diff --git a/reactos/dll/shellext/deskadp/deskadp.rbuild b/reactos/dll/shellext/deskadp/deskadp.rbuild index 7a3d3c23c30..8b454cdd576 100644 --- a/reactos/dll/shellext/deskadp/deskadp.rbuild +++ b/reactos/dll/shellext/deskadp/deskadp.rbuild @@ -11,7 +11,6 @@ comctl32 ole32 uuid - msvcrt deskadp.c shxiface.c deskadp.rc diff --git a/reactos/dll/shellext/deskmon/deskmon.rbuild b/reactos/dll/shellext/deskmon/deskmon.rbuild index 443df5546fa..b78bcba1a99 100644 --- a/reactos/dll/shellext/deskmon/deskmon.rbuild +++ b/reactos/dll/shellext/deskmon/deskmon.rbuild @@ -11,7 +11,6 @@ comctl32 ole32 uuid - msvcrt deskmon.c shxiface.c deskmon.rc diff --git a/reactos/dll/shellext/fontext/fontext.rbuild b/reactos/dll/shellext/fontext/fontext.rbuild index 7986fee6620..c299cd8675a 100644 --- a/reactos/dll/shellext/fontext/fontext.rbuild +++ b/reactos/dll/shellext/fontext/fontext.rbuild @@ -10,7 +10,6 @@ gdi32 ole32 uuid - msvcrt shlwapi lz32 advapi32 diff --git a/reactos/dll/win32/advapi32/advapi32.spec b/reactos/dll/win32/advapi32/advapi32.spec index f8ae684f6a5..b601d258df2 100644 --- a/reactos/dll/win32/advapi32/advapi32.spec +++ b/reactos/dll/win32/advapi32/advapi32.spec @@ -415,7 +415,7 @@ @ stub MakeAbsoluteSD2 @ stdcall MakeAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall MakeSelfRelativeSD(ptr ptr ptr) - @ stdcall MapGenericMask (ptr ptr) NTDLL.RtlMapGenericMask + @ stdcall MapGenericMask(ptr ptr) ntdll.MapGenericMask @ stdcall NotifyBootConfigStatus(long) @ stdcall NotifyChangeEventLog (long long) @ stdcall ObjectCloseAuditAlarmA(str ptr long) diff --git a/reactos/dll/win32/advapi32/sec/misc.c b/reactos/dll/win32/advapi32/sec/misc.c index 2455a7c1608..06cfca8b134 100644 --- a/reactos/dll/win32/advapi32/sec/misc.c +++ b/reactos/dll/win32/advapi32/sec/misc.c @@ -185,7 +185,7 @@ CheckNtMartaPresent(VOID) { DWORD ErrorCode; - if (InterlockedCompareExchangePointer(&NtMarta, + if (InterlockedCompareExchangePointer((PVOID)&NtMarta, NULL, NULL) == NULL) { @@ -196,7 +196,7 @@ CheckNtMartaPresent(VOID) if (ErrorCode == ERROR_SUCCESS) { /* try change the NtMarta pointer */ - if (InterlockedCompareExchangePointer(&NtMarta, + if (InterlockedCompareExchangePointer((PVOID)&NtMarta, &NtMartaStatic, NULL) != NULL) { @@ -223,7 +223,7 @@ CheckNtMartaPresent(VOID) VOID UnloadNtMarta(VOID) { - if (InterlockedExchangePointer(&NtMarta, + if (InterlockedExchangePointer((PVOID)&NtMarta, NULL) != NULL) { FreeLibrary(NtMartaStatic.hDllInstance); diff --git a/reactos/dll/win32/dbghelp/regex.c b/reactos/dll/win32/dbghelp/regex.c index 0410e3ebf35..504b9b4dc1f 100644 --- a/reactos/dll/win32/dbghelp/regex.c +++ b/reactos/dll/win32/dbghelp/regex.c @@ -5790,11 +5790,7 @@ weak_alias (__regexec, regexec) from either regcomp or regexec. We don't use PREG here. */ size_t -regerror (errcode, preg, errbuf, errbuf_size) - int errcode; - const regex_t *preg; - char *errbuf; - size_t errbuf_size; +regerror (int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size) { const char *msg; size_t msg_size; diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild index 6964d56c0a9..9ccf4e5979c 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild +++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild @@ -5,7 +5,6 @@ ntdll kernel32 - msvcrt ws2_32 iphlpapi dhcpcsvc.c diff --git a/reactos/dll/win32/dnsapi/dnsapi.rbuild b/reactos/dll/win32/dnsapi/dnsapi.rbuild index a1fbb53ffdf..ad4b273d6d7 100644 --- a/reactos/dll/win32/dnsapi/dnsapi.rbuild +++ b/reactos/dll/win32/dnsapi/dnsapi.rbuild @@ -9,7 +9,6 @@ ntdll kernel32 user32 - msvcrt ws2_32 iphlpapi diff --git a/reactos/dll/win32/gdi32/gdi32.rbuild b/reactos/dll/win32/gdi32/gdi32.rbuild index f5037eb2829..6bb303e1e1f 100644 --- a/reactos/dll/win32/gdi32/gdi32.rbuild +++ b/reactos/dll/win32/gdi32/gdi32.rbuild @@ -1,5 +1,5 @@ - - + + include 0x0600 diff --git a/reactos/dll/win32/glu32/glu32.rbuild b/reactos/dll/win32/glu32/glu32.rbuild index 3ce372d13ba..4668301fc52 100644 --- a/reactos/dll/win32/glu32/glu32.rbuild +++ b/reactos/dll/win32/glu32/glu32.rbuild @@ -14,7 +14,6 @@ opengl32 kernel32 gdi32 - msvcrt bezierEval.cc diff --git a/reactos/dll/win32/icmp/icmp.rbuild b/reactos/dll/win32/icmp/icmp.rbuild index 295a5653728..e490e9e7ce1 100644 --- a/reactos/dll/win32/icmp/icmp.rbuild +++ b/reactos/dll/win32/icmp/icmp.rbuild @@ -7,7 +7,6 @@ kernel32 ws2_32 wine - msvcrt icmp_main.c icmp.rc icmp.spec diff --git a/reactos/dll/win32/kernel32/kernel32.spec b/reactos/dll/win32/kernel32/kernel32.spec index be042123c53..a5471da0ecc 100644 --- a/reactos/dll/win32/kernel32/kernel32.spec +++ b/reactos/dll/win32/kernel32/kernel32.spec @@ -310,10 +310,10 @@ @ stdcall GetConsoleAliasesW(wstr long wstr) @ stdcall GetConsoleCP() @ stub GetConsoleCharType -@ stdcall GetConsoleCommandHistoryA(long long long) #check -@ stdcall GetConsoleCommandHistoryLengthA(long)#check -@ stdcall GetConsoleCommandHistoryLengthW(long)#check -@ stdcall GetConsoleCommandHistoryW(long long long)#check +@ stdcall GetConsoleCommandHistoryA(long long long) +@ stdcall GetConsoleCommandHistoryLengthA(long) +@ stdcall GetConsoleCommandHistoryLengthW(long) +@ stdcall GetConsoleCommandHistoryW(long long long) @ stdcall GetConsoleCursorInfo(long ptr) @ stub GetConsoleCursorMode @ stdcall GetConsoleDisplayMode(ptr) @@ -763,6 +763,8 @@ @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind +@ stdcall RtlVirtualUnwind(ptr ptr ptr long) ntdll.RtlVirtualUnwind +@ stdcall RtlLookupFunctionEntry(ptr ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory @ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) @ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr) diff --git a/reactos/dll/win32/kernel32/misc/dllmain.c b/reactos/dll/win32/kernel32/misc/dllmain.c index caa13c1b11d..34d09859c6f 100644 --- a/reactos/dll/win32/kernel32/misc/dllmain.c +++ b/reactos/dll/win32/kernel32/misc/dllmain.c @@ -394,6 +394,15 @@ DllMain(HANDLE hDll, return TRUE; } +//wtf +#ifdef _WIN64 +#undef InterlockedIncrement +#undef InterlockedDecrement +#undef InterlockedExchange +#undef InterlockedExchangeAdd +#undef InterlockedCompareExchange +#endif + LONG WINAPI InterlockedIncrement(IN OUT LONG volatile *lpAddend) @@ -408,7 +417,6 @@ InterlockedDecrement(IN OUT LONG volatile *lpAddend) return _InterlockedDecrement(lpAddend); } -#undef InterlockedExchange LONG WINAPI InterlockedExchange(IN OUT LONG volatile *Target, diff --git a/reactos/dll/win32/kernel32/misc/errormsg.c b/reactos/dll/win32/kernel32/misc/errormsg.c index 297f58e9eb7..d3fb5c8ce76 100644 --- a/reactos/dll/win32/kernel32/misc/errormsg.c +++ b/reactos/dll/win32/kernel32/misc/errormsg.c @@ -88,7 +88,7 @@ static LPSTR load_messageA( HMODULE module, UINT id, WORD lang ) TRACE("module = %p, id = %08x\n", module, id ); if (!module) module = GetModuleHandleW( NULL ); - Status = RtlFindMessage( module, (ULONG) RT_MESSAGETABLE, lang, id, &mre ); + Status = RtlFindMessage( module, (ULONG_PTR) RT_MESSAGETABLE, lang, id, &mre ); if (!NT_SUCCESS(Status)) return NULL; @@ -119,7 +119,7 @@ static LPWSTR load_messageW( HMODULE module, UINT id, WORD lang ) TRACE("module = %p, id = %08x\n", module, id ); if (!module) module = GetModuleHandleW( NULL ); - Status = RtlFindMessage( module, (ULONG) RT_MESSAGETABLE, lang, id, &mre ); + Status = RtlFindMessage( module, (ULONG_PTR) RT_MESSAGETABLE, lang, id, &mre ); if (!NT_SUCCESS(Status)) return NULL; diff --git a/reactos/dll/win32/kernel32/misc/toolhelp.c b/reactos/dll/win32/kernel32/misc/toolhelp.c index 1cac914d34a..c2773f7e6a4 100644 --- a/reactos/dll/win32/kernel32/misc/toolhelp.c +++ b/reactos/dll/win32/kernel32/misc/toolhelp.c @@ -400,11 +400,11 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags, ProcessListEntry->dwSize = sizeof(PROCESSENTRY32W); ProcessListEntry->cntUsage = 0; /* no longer used */ - ProcessListEntry->th32ProcessID = (ULONG)ProcessInfo->UniqueProcessId; + ProcessListEntry->th32ProcessID = (ULONG_PTR)ProcessInfo->UniqueProcessId; ProcessListEntry->th32DefaultHeapID = 0; /* no longer used */ ProcessListEntry->th32ModuleID = 0; /* no longer used */ ProcessListEntry->cntThreads = ProcessInfo->NumberOfThreads; - ProcessListEntry->th32ParentProcessID = (ULONG)ProcessInfo->InheritedFromUniqueProcessId; + ProcessListEntry->th32ParentProcessID = (ULONG_PTR)ProcessInfo->InheritedFromUniqueProcessId; ProcessListEntry->pcPriClassBase = ProcessInfo->BasePriority; ProcessListEntry->dwFlags = 0; /* no longer used */ if(ProcessInfo->ImageName.Buffer != NULL) @@ -447,8 +447,8 @@ TH32CreateSnapshotSectionInitialize(DWORD dwFlags, { ThreadListEntry->dwSize = sizeof(THREADENTRY32); ThreadListEntry->cntUsage = 0; /* no longer used */ - ThreadListEntry->th32ThreadID = (ULONG)ThreadInfo->ClientId.UniqueThread; - ThreadListEntry->th32OwnerProcessID = (ULONG)ThreadInfo->ClientId.UniqueProcess; + ThreadListEntry->th32ThreadID = (ULONG_PTR)ThreadInfo->ClientId.UniqueThread; + ThreadListEntry->th32OwnerProcessID = (ULONG_PTR)ThreadInfo->ClientId.UniqueProcess; ThreadListEntry->tpBasePri = ThreadInfo->BasePriority; ThreadListEntry->tpDeltaPri = 0; /* no longer used */ ThreadListEntry->dwFlags = 0; /* no longer used */ diff --git a/reactos/dll/win32/kernel32/synch/critical.c b/reactos/dll/win32/kernel32/synch/critical.c index 65e24bbd356..ac5280a60bd 100644 --- a/reactos/dll/win32/kernel32/synch/critical.c +++ b/reactos/dll/win32/kernel32/synch/critical.c @@ -58,12 +58,27 @@ InitializeCriticalSectionAndSpinCount(OUT LPCRITICAL_SECTION lpCriticalSection, /* * @implemented */ -#if 0 -BOOL WINAPI InitializeCriticalSectionEx( CRITICAL_SECTION *crit, DWORD spincount, DWORD flags ) +BOOL WINAPI InitializeCriticalSectionEx(OUT LPCRITICAL_SECTION lpCriticalSection, + IN DWORD dwSpinCount, + IN DWORD flags ) { - NTSTATUS ret = RtlInitializeCriticalSectionEx( crit, spincount, flags ); - if (ret) RtlRaiseStatus( ret ); - return !ret; + NTSTATUS Status; + + /* FIXME: Flags ignored */ + + /* Initialize the critical section */ + Status = RtlInitializeCriticalSectionAndSpinCount( + (PRTL_CRITICAL_SECTION)lpCriticalSection, + dwSpinCount); + if (!NT_SUCCESS(Status)) + { + /* Set failure code */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Success */ + return TRUE; } -#endif + /* EOF */ diff --git a/reactos/dll/win32/kernel32/thread/amd64/fiber.S b/reactos/dll/win32/kernel32/thread/amd64/fiber.S index 00b3a17fb34..233174bcf78 100644 --- a/reactos/dll/win32/kernel32/thread/amd64/fiber.S +++ b/reactos/dll/win32/kernel32/thread/amd64/fiber.S @@ -12,10 +12,10 @@ #define CONTEXT_FULL 0x10007 #define CONTEXT_FLOATING_POINT 0xF -.globl _SwitchToFiber@4 +.globl _SwitchToFiber .intel_syntax noprefix -_SwitchToFiber@4: +_SwitchToFiber: /* Get the TEB */ mov edx, fs:[KGDT_R3_TEB] diff --git a/reactos/dll/win32/kernel32/thread/amd64/thread.S b/reactos/dll/win32/kernel32/thread/amd64/thread.S index 36bc0c31b14..320c798143f 100644 --- a/reactos/dll/win32/kernel32/thread/amd64/thread.S +++ b/reactos/dll/win32/kernel32/thread/amd64/thread.S @@ -6,11 +6,11 @@ * PROGRAMMER: Alex Ionescu (alex@relsoft.net) */ -.globl _BaseThreadStartupThunk@0 -.globl _BaseProcessStartThunk@0 +.globl _BaseThreadStartupThunk +.globl _BaseProcessStartThunk .intel_syntax noprefix -_BaseThreadStartupThunk@0: +_BaseThreadStartupThunk: /* Start out fresh */ xor rbp, rbp @@ -20,7 +20,7 @@ _BaseThreadStartupThunk@0: push 0 /* Return RIP */ jmp _BaseThreadStartup -_BaseProcessStartThunk@0: +_BaseProcessStartThunk: /* Start out fresh */ xor rbp, rbp diff --git a/reactos/dll/win32/msvcrt/msvcrt.def b/reactos/dll/win32/msvcrt/msvcrt.def index 977477266da..9d75329c60a 100644 --- a/reactos/dll/win32/msvcrt/msvcrt.def +++ b/reactos/dll/win32/msvcrt/msvcrt.def @@ -120,7 +120,7 @@ EXPORTS __fpecode @115 __getmainargs @116 __initenv @117 -; __iob_func @118 + __iob_func @118 __isascii @119 __iscsym @120 __iscsymf @121 @@ -271,10 +271,10 @@ EXPORTS _fileno @265 _findclose @266 _findfirst @267 -; _findfirst64 @268 + _findfirst64 @268 _findfirsti64 @269 _findnext @270 -; _findnext64 @271 + _findnext64 @271 _findnexti64 @272 _finite @273 _flsbuf @274 @@ -316,7 +316,7 @@ EXPORTS ; _getwche @310 _getws @311 _global_unwind2 @312 -; _gmtime64 @313 + _gmtime64 @313 _heapadd @314 _heapchk @315 _heapmin @316 @@ -372,7 +372,7 @@ EXPORTS _lfind @366 _loaddll @367 _local_unwind2 @368 -; _localtime64 @369 + _localtime64 @369 _lock @370 _locking @371 _logb @372 @@ -538,7 +538,7 @@ EXPORTS _tell @532 _telli64 @533 _tempnam @534 -; _time64 @535 + _time64 @535 _timezone @536 DATA _tolower @537 _toupper @538 diff --git a/reactos/dll/win32/opengl32/opengl32.h b/reactos/dll/win32/opengl32/opengl32.h index 6bee7837960..73b8a714e7c 100644 --- a/reactos/dll/win32/opengl32/opengl32.h +++ b/reactos/dll/win32/opengl32/opengl32.h @@ -11,9 +11,7 @@ #ifndef OPENGL32_PRIVATE_H #define OPENGL32_PRIVATE_H -#ifdef _MSC_VER #define snwprintf _snwprintf -#endif #ifdef __cplusplus extern "C" { diff --git a/reactos/dll/win32/shell32/autocomplete.c b/reactos/dll/win32/shell32/autocomplete.c index 0e3663fa9db..71cfffb8e5f 100644 --- a/reactos/dll/win32/shell32/autocomplete.c +++ b/reactos/dll/win32/shell32/autocomplete.c @@ -234,7 +234,7 @@ static HRESULT WINAPI IAutoComplete_fnInit( static const WCHAR lbName[] = {'L','i','s','t','B','o','x',0}; TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", - This, (long)hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); + This, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); if (This->options & ACO_AUTOSUGGEST) TRACE(" ACO_AUTOSUGGEST\n"); if (This->options & ACO_AUTOAPPEND) TRACE(" ACO_AUTOAPPEND\n"); diff --git a/reactos/dll/win32/shell32/changenotify.c b/reactos/dll/win32/shell32/changenotify.c index 5784b8c5d3f..2bddd6ffb67 100644 --- a/reactos/dll/win32/shell32/changenotify.c +++ b/reactos/dll/win32/shell32/changenotify.c @@ -35,7 +35,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = { 0, 0, &SHELL32_ChangenotifyCS, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": SHELL32_ChangenotifyCS") } + 0, 0, { (DWORD_PTR)0/*(__FILE__ ": SHELL32_ChangenotifyCS")*/ } }; static CRITICAL_SECTION SHELL32_ChangenotifyCS = { &critsect_debug, -1, 0, 0, 0, 0 }; @@ -225,7 +225,7 @@ SHChangeNotifyRegister( LeaveCriticalSection(&SHELL32_ChangenotifyCS); - return (ULONG)item; + return PtrToUlong(item); } /************************************************************************* @@ -239,7 +239,7 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify) EnterCriticalSection(&SHELL32_ChangenotifyCS); - node = FindNode((HANDLE)hNotify); + node = FindNode((HANDLE)UlongToPtr(hNotify)); if( node ) DeleteNode(node); diff --git a/reactos/dll/win32/user32/include/dde_private.h b/reactos/dll/win32/user32/include/dde_private.h index bf66d612cd8..c106715dd7f 100644 --- a/reactos/dll/win32/user32/include/dde_private.h +++ b/reactos/dll/win32/user32/include/dde_private.h @@ -212,7 +212,7 @@ extern WDML_CONV* WDML_GetConvFromWnd(HWND hWnd); extern WDML_CONV* WDML_FindConv(WDML_INSTANCE* pInstance, WDML_SIDE side, HSZ hszService, HSZ hszTopic); extern BOOL WDML_PostAck(WDML_CONV* pConv, WDML_SIDE side, WORD appRetCode, - BOOL fBusy, BOOL fAck, UINT pmt, LPARAM lParam, UINT oldMsg); + BOOL fBusy, BOOL fAck, UINT_PTR pmt, LPARAM lParam, UINT oldMsg); extern void WDML_AddLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, UINT wType, HSZ hszItem, UINT wFmt); extern WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, diff --git a/reactos/dll/win32/user32/include/user32.h b/reactos/dll/win32/user32/include/user32.h index 976241bce63..539c2a9637a 100644 --- a/reactos/dll/win32/user32/include/user32.h +++ b/reactos/dll/win32/user32/include/user32.h @@ -77,7 +77,7 @@ DesktopPtrToUser(PVOID Ptr) /* NOTE: This is slow as it requires a call to win32k. This should only be neccessary if a thread wants to access an object on a different desktop */ - return NtUserGetDesktopMapping(Ptr); + return (PVOID)NtUserGetDesktopMapping(Ptr); } } diff --git a/reactos/dll/win32/user32/misc/dde.c b/reactos/dll/win32/user32/misc/dde.c index a5617e9650e..b8a73dfce9f 100644 --- a/reactos/dll/win32/user32/misc/dde.c +++ b/reactos/dll/win32/user32/misc/dde.c @@ -46,7 +46,7 @@ CRITICAL_SECTION_DEBUG critsect_debug = { 0, 0, &WDML_CritSect, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": WDML_CritSect") } + 0, 0, { (DWORD_PTR)0/*(__FILE__ ": WDML_CritSect")*/ } }; CRITICAL_SECTION WDML_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; diff --git a/reactos/dll/win32/user32/misc/ddeserver.c b/reactos/dll/win32/user32/misc/ddeserver.c index 31db147cb45..7427390fa25 100644 --- a/reactos/dll/win32/user32/misc/ddeserver.c +++ b/reactos/dll/win32/user32/misc/ddeserver.c @@ -804,7 +804,7 @@ static WDML_QUEUE_STATE WDML_ServerHandleExecute(WDML_CONV* pConv, WDML_XACT* pX case DDE_FNOTPROCESSED: break; } - WDML_PostAck(pConv, WDML_SERVER_SIDE, 0, fBusy, fAck, (UINT)pXAct->hMem, 0, 0); + WDML_PostAck(pConv, WDML_SERVER_SIDE, 0, fBusy, fAck, (UINT_PTR)pXAct->hMem, 0, 0); return WDML_QS_HANDLED; } diff --git a/reactos/dll/win32/user32/user32.def b/reactos/dll/win32/user32/user32.def deleted file mode 100644 index ab4a7004921..00000000000 --- a/reactos/dll/win32/user32/user32.def +++ /dev/null @@ -1,743 +0,0 @@ -LIBRARY user32.dll - -EXPORTS -ActivateKeyboardLayout@8=NtUserActivateKeyboardLayout@8 -AdjustWindowRect@12 -AdjustWindowRectEx@16 -AlignRects@16 -AllowForegroundActivation@0 -AllowSetForegroundWindow@4 -AnimateWindow@12 -AnyPopup@0 -AppendMenuA@16 -AppendMenuW@16 -ArrangeIconicWindows@4 -AttachThreadInput@12 -BeginDeferWindowPos@4 -BeginPaint@8 -BlockInput@4 -BringWindowToTop@4 -BroadcastSystemMessage=BroadcastSystemMessageA@20 -BroadcastSystemMessageA@20 -BroadcastSystemMessageExA@24 -BroadcastSystemMessageExW@24 -BroadcastSystemMessageW@20 -;BuildReasonArray -;CalcMenuBar -CallMsgFilter=CallMsgFilterA@8 -CallMsgFilterA@8 -CallMsgFilterW@8 -CallNextHookEx@16 -CallWindowProcA@20 -CallWindowProcW@20 -CascadeChildWindows@8 -CascadeWindows@20 -ChangeClipboardChain@8 -ChangeDisplaySettingsA@8 -ChangeDisplaySettingsExA@20 -ChangeDisplaySettingsExW@20 -ChangeDisplaySettingsW@8 -ChangeMenuA@20 -ChangeMenuW@20 -CharLowerA@4 -CharLowerBuffA@8 -CharLowerBuffW@8 -CharLowerW@4 -CharNextA@4 -CharNextExA@12 -CharNextW@4 -CharPrevA@8 -CharPrevExA@16 -CharPrevW@8 -CharToOemA@8 -CharToOemBuffA@12 -CharToOemBuffW@12 -CharToOemW@8 -CharUpperA@4 -CharUpperBuffA@8 -CharUpperBuffW@8 -CharUpperW@4 -CheckDlgButton@12 -CheckMenuItem@12 -CheckMenuRadioItem@20 -CheckRadioButton@16 -ChildWindowFromPoint@12 -ChildWindowFromPointEx@16 -;CliImmSetHotKey -ClientThreadSetup@0 -ClientToScreen@8 -ClipCursor@4 -CloseClipboard@0 -CloseDesktop@4 -CloseWindow@4 -CloseWindowStation@4 -CopyAcceleratorTableA@12 -CopyAcceleratorTableW@12 -CopyCursor@4 -CopyIcon@4 -CopyImage@20 -CopyRect@8 -CountClipboardFormats@0 -CreateAcceleratorTableA@8 -CreateAcceleratorTableW@8 -CreateCaret@16 -CreateCursor@28 -CreateDesktopA@24 -CreateDesktopW@24 -CreateDialogIndirectParamA@20 -CreateDialogIndirectParamAorW@24 -CreateDialogIndirectParamW@20 -CreateDialogParamA@20 -CreateDialogParamW@20 -CreateIcon@28 -CreateIconFromResource@16 -CreateIconFromResourceEx@28 -CreateIconIndirect@4 -CreateMDIWindowA@40 -CreateMDIWindowW@40 -CreateMenu@0 -CreatePopupMenu@0 -;CreateSystemThreads -CreateWindowExA@48 -CreateWindowExW@48 -CreateWindowStationA@16 -CreateWindowStationW@16 -CsrBroadcastSystemMessageExW@24 -CtxInitUser32@0 -DdeAbandonTransaction@12 -DdeAccessData@8 -DdeAddData@16 -DdeClientTransaction@32 -DdeCmpStringHandles@8 -DdeConnect@16 -DdeConnectList@20 -DdeCreateDataHandle@28 -DdeCreateStringHandleA@12 -DdeCreateStringHandleW@12 -DdeDisconnect@4 -DdeDisconnectList@4 -DdeEnableCallback@12 -DdeFreeDataHandle@4 -DdeFreeStringHandle@8 -DdeGetData@16 -DdeGetLastError@4 -DdeGetQualityOfService@12 -DdeImpersonateClient@4 -DdeInitializeA@16 -DdeInitializeW@16 -DdeKeepStringHandle@8 -DdeNameService@16 -DdePostAdvise@12 -DdeQueryConvInfo@12 -DdeQueryNextServer@8 -DdeQueryStringA@20 -DdeQueryStringW@20 -DdeReconnect@4 -DdeSetQualityOfService@12 -DdeSetUserHandle@12 -DdeUnaccessData@4 -DdeUninitialize@4 -DefDlgProcA@16 -DefDlgProcW@16 -DefFrameProcA@20 -DefFrameProcW@20 -DefMDIChildProcA@16 -DefMDIChildProcW@16 -DefRawInputProc@12 -DefWindowProcA@16 -DefWindowProcW@16 -DeferWindowPos@32 -DeleteMenu@12 -DeregisterShellHookWindow@4 -DestroyAcceleratorTable@4 -DestroyCaret@0 -DestroyCursor@4 -DestroyIcon@4 -DestroyMenu@4 -;DestroyReasons -DestroyWindow@4 -;DeviceEventWorker -DialogBoxIndirectParamA@20 -DialogBoxIndirectParamAorW@24 -DialogBoxIndirectParamW@20 -DialogBoxParamA@20 -DialogBoxParamW@20 -DisableProcessWindowsGhosting@0 -DispatchMessageA@4 -DispatchMessageW@4 -DisplayExitWindowsWarnings@4 -DlgDirListA@20 -DlgDirListComboBoxA@20 -DlgDirListComboBoxW@20 -DlgDirListW@20 -DlgDirSelectComboBoxExA@16 -DlgDirSelectComboBoxExW@16 -DlgDirSelectExA@16 -DlgDirSelectExW@16 -DragDetect@12 -DragObject@20 -DrawAnimatedRects@16 -DrawCaption@16 -DrawCaptionTempA@28 -DrawCaptionTempW@28 -DrawEdge@16 -DrawFocusRect@8 -DrawFrame@16 -DrawFrameControl@16 -DrawIcon@16 -DrawIconEx@36 -DrawMenuBar@4 -DrawMenuBarTemp@20 -DrawStateA@40 -DrawStateW@40 -DrawTextA@20 -DrawTextExA@24 -DrawTextExW@24 -DrawTextW@20 -EditWndProc=EditWndProcA@16 -EmptyClipboard@0 -EnableMenuItem@12 -EnableScrollBar@12 -EnableWindow@8 -EndDeferWindowPos@4 -EndDialog@8 -EndMenu@0 -EndPaint@8 -EndTask@12 -EnterReaderModeHelper@4 -EnumChildWindows@12 -EnumClipboardFormats@4 -EnumDesktopWindows@12 -EnumDesktopsA@12 -EnumDesktopsW@12 -EnumDisplayDevicesA@16 -EnumDisplayDevicesW@16 -EnumDisplayMonitors@16 -EnumDisplaySettingsA@12 -EnumDisplaySettingsExA@16 -EnumDisplaySettingsExW@16 -EnumDisplaySettingsW@12 -EnumPropsA@8 -EnumPropsExA@12 -EnumPropsExW@12 -EnumPropsW@8 -EnumThreadWindows@12 -EnumWindowStationsA@8 -EnumWindowStationsW@8 -EnumWindows@8 -EqualRect@8 -ExcludeUpdateRgn@8 -ExitWindowsEx@8 -FillRect@12 -FindWindowA@8 -FindWindowExA@16 -FindWindowExW@16 -FindWindowW@8 -FlashWindow@8 -FlashWindowEx@4 -FrameRect@12 -FreeDDElParam@8 -;FullScreenControl -GetAccCursorInfo@4 -GetActiveWindow@0 -GetAltTabInfo=GetAltTabInfoA@20 -GetAltTabInfoA@20 -GetAltTabInfoW@20 -GetAncestor@8 -GetAppCompatFlags@4 -GetAppCompatFlags2@4 -GetAsyncKeyState@4 -GetCapture@0 -GetCaretBlinkTime@0 -GetCaretPos@4 -GetClassInfoA@12 -GetClassInfoExA@12 -GetClassInfoExW@12 -GetClassInfoW@12 -GetClassLongA@8 -GetClassLongW@8 -GetClassNameA@12 -GetClassNameW@12 -GetClassWord@8 -GetClientRect@8 -GetClipCursor@4 -GetClipboardData@4 -GetClipboardFormatNameA@12 -GetClipboardFormatNameW@12 -GetClipboardOwner@0 -GetClipboardSequenceNumber@0 -GetClipboardViewer@0 -GetComboBoxInfo@8 -GetCursor@0 -;GetCursorFrameInfo -GetCursorInfo@4 -GetCursorPos@4 -GetDC@4 -GetDCEx@12 -GetDesktopWindow@0 -GetDialogBaseUnits@0 -GetDlgCtrlID@4 -GetDlgItem@8 -GetDlgItemInt@16 -GetDlgItemTextA@16 -GetDlgItemTextW@16 -GetDoubleClickTime@0 -GetFocus@0 -GetForegroundWindow@0 -GetGUIThreadInfo@8 -GetGuiResources@8 -GetIconInfo@8 -GetInputDesktop@0 -GetInputState@0 -GetInternalWindowPos@12 -GetKBCodePage@0 -GetKeyNameTextA@12 -GetKeyNameTextW@12 -GetKeyState@4 -GetKeyboardLayout@4 -GetKeyboardLayoutList@8=NtUserGetKeyboardLayoutList@8 -GetKeyboardLayoutNameA@4 -GetKeyboardLayoutNameW@4 -GetKeyboardState@4 -GetKeyboardType@4 -GetLastActivePopup@4 -GetLastInputInfo@4 -GetLayeredWindowAttributes@16=NtUserGetLayeredWindowAttributes@16 -GetListBoxInfo@4 -GetMenu@4 -GetMenuBarInfo@16 -GetMenuCheckMarkDimensions@0 -GetMenuContextHelpId@4 -GetMenuDefaultItem@12 -GetMenuInfo@8 -GetMenuItemCount@4 -GetMenuItemID@8 -GetMenuItemInfoA@16 -GetMenuItemInfoW@16 -GetMenuItemRect@16 -GetMenuState@12 -GetMenuStringA@20 -GetMenuStringW@20 -GetMessageA@16 -GetMessageExtraInfo@0 -GetMessagePos@0 -GetMessageTime@0 -GetMessageW@16 -GetMonitorInfoA@8 -GetMonitorInfoW@8 -GetMouseMovePointsEx@20 -GetNextDlgGroupItem@12 -GetNextDlgTabItem@12 -GetOpenClipboardWindow@0 -GetParent@4 -GetPriorityClipboardFormat@8 -GetProcessDefaultLayout@4 -GetProcessWindowStation@0 -GetProgmanWindow@0 -GetPropA@8 -GetPropW@8 -GetQueueStatus@4 -GetRawInputBuffer@12 -GetRawInputData@20 -GetRawInputDeviceInfoA@16 -GetRawInputDeviceInfoW@16 -GetRawInputDeviceList@12 -;GetReasonTitleFromReasonCode -GetRegisteredRawInputDevices@12 -GetScrollBarInfo@12 -GetScrollInfo@12 -GetScrollPos@8 -GetScrollRange@16 -GetShellWindow@0 -GetSubMenu@8 -GetSysColor@4 -GetSysColorBrush@4 -GetSystemMenu@8 -GetSystemMetrics@4 -GetTabbedTextExtentA@20 -GetTabbedTextExtentW@20 -GetTaskmanWindow@0 -GetThreadDesktop@4 -GetTitleBarInfo@8 -GetTopWindow@4 -GetUpdateRect@12 -GetUpdateRgn@12 -GetUserObjectInformationA@20 -GetUserObjectInformationW@20 -GetUserObjectSecurity@20 -;GetWinStationInfo -GetWindow@8 -GetWindowContextHelpId@4 -GetWindowDC@4 -GetWindowInfo@8 -GetWindowLongA@8 -GetWindowLongW@8 -GetWindowModuleFileName=GetWindowModuleFileNameA@12 -GetWindowModuleFileNameA@12 -GetWindowModuleFileNameW@12 -GetWindowPlacement@8 -GetWindowRect@8 -GetWindowRgn@8 -GetWindowRgnBox@8 -GetWindowTextA@12 -GetWindowTextLengthA@4 -GetWindowTextLengthW@4 -GetWindowTextW@12 -GetWindowThreadProcessId@8 -GetWindowWord@8 -GrayStringA@36 -GrayStringW@36 -HideCaret@4=NtUserHideCaret@4 -HiliteMenuItem@16 -IMPGetIMEA@8 -IMPGetIMEW@8 -IMPQueryIMEA@4 -IMPQueryIMEW@4 -IMPSetIMEA@8 -IMPSetIMEW@8 -ImpersonateDdeClientWindow@8 -InSendMessage@0 -InSendMessageEx@4 -InflateRect@12 -InitializeLpkHooks@4 -InitializeWin32EntryTable@4 -InsertMenuA@20 -InsertMenuItemA@16 -InsertMenuItemW@16 -InsertMenuW@20 -InternalGetWindowText@12 -IntersectRect@12 -InvalidateRect@12=NtUserInvalidateRect@12 -InvalidateRgn@12 -InvertRect@8 -IsCharAlphaA@4 -IsCharAlphaNumericA@4 -IsCharAlphaNumericW@4 -IsCharAlphaW@4 -IsCharLowerA@4 -IsCharLowerW@4 -IsCharUpperA@4 -IsCharUpperW@4 -IsChild@8 -IsClipboardFormatAvailable@4 -IsDialogMessage=IsDialogMessageA@8 -IsDialogMessageA@8 -IsDialogMessageW@8 -IsDlgButtonChecked@8 -IsGUIThread@4 -IsHungAppWindow@4 -IsIconic@4 -IsMenu@4 -IsRectEmpty@4 -IsServerSideWindow@4 -IsWindow@4 -IsWindowEnabled@4 -IsWindowInDestroy@4 -IsWindowUnicode@4 -IsWindowVisible@4 -IsWinEventHookInstalled@4 -IsZoomed@4 -KillSystemTimer@8 -KillTimer@8 -LoadAcceleratorsA@8 -LoadAcceleratorsW@8 -LoadBitmapA@8 -LoadBitmapW@8 -LoadCursorA@8 -LoadCursorFromFileA@4 -LoadCursorFromFileW@4 -LoadCursorW@8 -LoadIconA@8 -LoadIconW@8 -LoadImageA@24 -LoadImageW@24 -LoadKeyboardLayoutA@8 -LoadKeyboardLayoutEx@12 -LoadKeyboardLayoutW@8 -LoadLocalFonts@0 -LoadMenuA@8 -LoadMenuIndirectA@4 -LoadMenuIndirectW@4 -LoadMenuW@8 -LoadRemoteFonts@0 -LoadStringA@16 -LoadStringW@16 -LockSetForegroundWindow@4 -LockWindowStation@4 -LockWindowUpdate@4 -LockWorkStation@0 -LookupIconIdFromDirectory@8 -LookupIconIdFromDirectoryEx@20 -MBToWCSEx@24 -MapDialogRect@8 -MapVirtualKeyA@8 -MapVirtualKeyExA@12 -MapVirtualKeyExW@12 -MapVirtualKeyW@8 -MapWindowPoints@16 -MB_GetString@4 -MenuItemFromPoint@16 -MenuWindowProcA@16 -MenuWindowProcW@16 -MessageBeep@4 -MessageBoxA@16 -MessageBoxExA@20 -MessageBoxExW@20 -MessageBoxIndirectA@4 -MessageBoxIndirectW@4 -MessageBoxTimeoutA@24 -MessageBoxTimeoutW@24 -MessageBoxW@16 -ModifyMenuA@20 -ModifyMenuW@20 -MonitorFromPoint@12 -MonitorFromRect@8 -MonitorFromWindow@8 -MoveWindow@24 -MsgWaitForMultipleObjects@20 -MsgWaitForMultipleObjectsEx@20 -NotifyWinEvent@16 -OemKeyScan@4 -OemToCharA@8 -OemToCharBuffA@12 -OemToCharBuffW@12 -OemToCharW@8 -OffsetRect@12 -OpenClipboard@4 -OpenDesktopA@16 -OpenDesktopW@16 -OpenIcon@4 -OpenInputDesktop@12 -OpenWindowStationA@12 -OpenWindowStationW@12 -PackDDElParam@12 -PaintDesktop@4 -;PaintMenuBar -PeekMessageA@20 -PeekMessageW@20 -PostMessageA@16 -PostMessageW@16 -PostQuitMessage@4 -PostThreadMessageA@16 -PostThreadMessageW@16 -PrintWindow@12 -PrivateCsrssManualGuiCheck@4 -PrivateCsrssInitialized@0 -PrivateExtractIconExA@20 -PrivateExtractIconExW@20 -PrivateExtractIconsA@32 -PrivateExtractIconsW@32 -;PrivateKDBreakPoint -;PrivateSetDbgTag -;PrivateSetRipFlags -PtInRect@12 -;QuerySendMessage -;QueryUserCounters -RealChildWindowFromPoint@12 -RealGetWindowClass=RealGetWindowClassA@12 -RealGetWindowClassA@12 -RealGetWindowClassW@12 -ReasonCodeNeedsBugID@4 -ReasonCodeNeedsComment@4 -;RecordShutdownReason -RedrawWindow@16 -RegisterClassA@4 -RegisterClassExA@4 -RegisterClassExW@4 -RegisterClassW@4 -RegisterClipboardFormatA@4 -RegisterClipboardFormatW@4 -RegisterDeviceNotificationA@12=RegisterDeviceNotificationW@12 -RegisterDeviceNotificationW@12 -RegisterHotKey@16 -RegisterLogonProcess@8 -RegisterMessagePumpHook@4 -RegisterRawInputDevices@12 -RegisterServicesProcess@4 -RegisterShellHookWindow@4 -RegisterSystemThread@8 -RegisterUserApiHook@8 -RegisterTasklist@4 -RegisterWindowMessageA@4 -RegisterWindowMessageW@4 -ReleaseCapture@0 -ReleaseDC@8 -RemoveMenu@12 -RemovePropA@8 -RemovePropW@8 -ReplyMessage@4 -;ResolveDesktopForWOW -ReuseDDElParam@20 -ScreenToClient@8 -ScrollChildren@16 -ScrollDC@28 -ScrollWindow@20 -ScrollWindowEx@32 -SendDlgItemMessageA@20 -SendDlgItemMessageW@20 -SendIMEMessageExA@8 -SendIMEMessageExW@8 -SendInput@12 -SendMessageA@16 -SendMessageCallbackA@24 -SendMessageCallbackW@24 -SendMessageTimeoutA@28 -SendMessageTimeoutW@28 -SendMessageW@16 -SendNotifyMessageA@16 -SendNotifyMessageW@16 -SetActiveWindow@4 -SetCapture@4 -SetCaretBlinkTime@4 -SetCaretPos@8 -SetClassLongA@12 -SetClassLongW@12 -SetClassWord@12 -SetClipboardData@8 -SetClipboardViewer@4 -;SetConsoleReserveKeys -SetCursor@4 -;SetCursorContents -SetCursorPos@8 -SetDebugErrorLevel@4 -SetDeskWallpaper@4 -SetDlgItemInt@16 -SetDlgItemTextA@12 -SetDlgItemTextW@12 -SetDoubleClickTime@4 -SetFocus@4 -SetForegroundWindow@4 -SetInternalWindowPos@16 -SetKeyboardState@4 -SetLastErrorEx@8 -SetLayeredWindowAttributes@16=NtUserSetLayeredWindowAttributes@16 -SetLogonNotifyWindow@8 -SetMenu@8 -SetMenuContextHelpId@8 -SetMenuDefaultItem@12 -SetMenuInfo@8 -SetMenuItemBitmaps@20 -SetMenuItemInfoA@16 -SetMenuItemInfoW@16 -SetMessageExtraInfo@4 -SetMessageQueue@4 -SetParent@8 -SetProcessDefaultLayout@4 -SetProcessWindowStation@4 -SetProgmanWindow@4 -SetPropA@12 -SetPropW@12 -SetRect@20 -SetRectEmpty@4 -SetScrollInfo@16 -SetScrollPos@16 -SetScrollRange@20 -SetShellWindow@4 -SetShellWindowEx@8 -SetSysColors@12 -SetSysColorsTemp@12 -SetSystemCursor@8 -SetSystemMenu@8 -SetSystemTimer@16 -SetTaskmanWindow@4 -SetThreadDesktop@4 -SetTimer@16 -SetUserObjectInformationA@16 -SetUserObjectInformationW@16 -SetUserObjectSecurity@12 -SetWinEventHook@28 -SetWindowContextHelpId@8 -SetWindowLongA@12 -SetWindowLongW@12 -SetWindowPlacement@8 -SetWindowPos@28 -SetWindowRgn@12 -SetWindowStationUser@16 -SetWindowTextA@8 -SetWindowTextW@8 -SetWindowWord@12 -SetWindowsHookA@8 -SetWindowsHookExA@16 -SetWindowsHookExW@16 -SetWindowsHookW@8 -ShowCaret@4=NtUserShowCaret@4 -ShowCursor@4 -ShowOwnedPopups@8 -ShowScrollBar@12 -ShowStartGlass@4 -ShowWindow@8 -ShowWindowAsync@8 -SoftModalMessageBox@4 -SubtractRect@12 -SwapMouseButton@4 -SwitchDesktop@4 -SwitchToThisWindow@8 -SystemParametersInfoA@16 -SystemParametersInfoW@16 -TabbedTextOutA@32 -TabbedTextOutW@32 -TileChildWindows@8 -TileWindows@20 -ToAscii@20 -ToAsciiEx@24 -ToUnicode@24 -ToUnicodeEx@28 -TrackMouseEvent@4 -TrackPopupMenu@28 -TrackPopupMenuEx@24 -TranslateAccelerator=TranslateAcceleratorA@12 -TranslateAcceleratorA@12 -TranslateAcceleratorW@12 -TranslateMDISysAccel@8 -TranslateMessage@4 -TranslateMessageEx@8 -UnhookWinEvent@4=NtUserUnhookWinEvent@4 -UnhookWindowsHook@8 -UnhookWindowsHookEx@4=NtUserUnhookWindowsHookEx@4 -UnionRect@12 -UnloadKeyboardLayout@4=NtUserUnloadKeyboardLayout@4 -UnlockWindowStation@4 -UnpackDDElParam@16 -UnregisterClassA@8 -UnregisterClassW@8 -UnregisterDeviceNotification@4 -UnregisterHotKey@8=NtUserUnregisterHotKey@8 -UnregisterMessagePumpHook@0 -UnregisterUserApiHook@0 -UpdateLayeredWindow@36 -UpdatePerUserSystemParameters@8 -UpdateWindow@4 -User32InitializeImmEntryTable@4 -UserClientDllInitialize=DllMain@12 -UserHandleGrantAccess@12 -;UserLpkPSMTextOut -;UserLpkTabbedTextOut -UserRealizePalette@4 -;UserRegisterWowHandlers -;VRipOutput -;VTagOutput -ValidateRect@8 -ValidateRgn@8 -VkKeyScanA@4 -VkKeyScanExA@8 -VkKeyScanExW@8 -VkKeyScanW@4 -WCSToMBEx@24 -WINNLSEnableIME@8 -WINNLSGetEnableStatus@4 -WINNLSGetIMEHotkey@4 -WaitForInputIdle@8 -WaitMessage@0 -;Win32PoolAllocationStats -WinHelpA@16 -WinHelpW@16 -WindowFromDC@4 -WindowFromPoint@8 -keybd_event@16 -mouse_event@20 -wsprintfA -wsprintfW -wvsprintfA@12 -wvsprintfW@12 - -; EOF diff --git a/reactos/dll/win32/user32/user32.rbuild b/reactos/dll/win32/user32/user32.rbuild index dcdd6727d1e..63c32e179af 100644 --- a/reactos/dll/win32/user32/user32.rbuild +++ b/reactos/dll/win32/user32/user32.rbuild @@ -1,5 +1,5 @@ - - + + . include include/reactos/subsys @@ -75,4 +75,5 @@ winpos.c user32.rc + user32.spec diff --git a/reactos/dll/win32/user32/user32.spec b/reactos/dll/win32/user32/user32.spec new file mode 100644 index 00000000000..e4c633eb052 --- /dev/null +++ b/reactos/dll/win32/user32/user32.spec @@ -0,0 +1,769 @@ +@ stdcall ActivateKeyboardLayout(long long) NtUserActivateKeyboardLayout +@ stdcall AdjustWindowRect(ptr long long) +@ stdcall AdjustWindowRectEx(ptr long long long) +@ stdcall AlignRects(ptr long long long) +@ stdcall AllowForegroundActivation() +@ stdcall AllowSetForegroundWindow (long) +@ stdcall AnimateWindow(long long long) +@ stdcall AnyPopup() +@ stdcall AppendMenuA(long long long ptr) +@ stdcall AppendMenuW(long long long ptr) +@ stdcall ArrangeIconicWindows(long) +@ stdcall AttachThreadInput(long long long) +@ stdcall BeginDeferWindowPos(long) +@ stdcall BeginPaint(long ptr) +@ stdcall BlockInput(long) +@ stdcall BringWindowToTop(long) +@ stdcall BroadcastSystemMessage(long ptr long long long) BroadcastSystemMessageA +@ stdcall BroadcastSystemMessageA(long ptr long long long) +@ stdcall BroadcastSystemMessageExA(long ptr long long long ptr) +@ stdcall BroadcastSystemMessageExW(long ptr long long long ptr) +@ stdcall BroadcastSystemMessageW(long ptr long long long) +# @ stub BuildReasonArray +@ stdcall CalcChildScroll(long long) +# @ stub CalcMenuBar +@ stdcall CallMsgFilter(ptr long) CallMsgFilterA +@ stdcall CallMsgFilterA(ptr long) +@ stdcall CallMsgFilterW(ptr long) +@ stdcall CallNextHookEx(long long long long) +@ stdcall CallWindowProcA(ptr long long long long) +@ stdcall CallWindowProcW(ptr long long long long) +@ stdcall CascadeChildWindows(long long) +@ stdcall CascadeWindows(long long ptr long ptr) +@ stdcall ChangeClipboardChain(long long) +@ stdcall ChangeDisplaySettingsA(ptr long) +@ stdcall ChangeDisplaySettingsExA(str ptr long long ptr) +@ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) +@ stdcall ChangeDisplaySettingsW(ptr long) +@ stdcall ChangeMenuA(long long ptr long long) +@ stdcall ChangeMenuW(long long ptr long long) +@ stdcall CharLowerA(str) +@ stdcall CharLowerBuffA(str long) +@ stdcall CharLowerBuffW(wstr long) +@ stdcall CharLowerW(wstr) +@ stdcall CharNextA(str) +@ stdcall CharNextExA(long str long) +# @ stdcall CharNextExW(long wstr long) +@ stdcall CharNextW(wstr) +@ stdcall CharPrevA(str str) +@ stdcall CharPrevExA(long str str long) +# @ stdcall CharPrevExW(long wstr wstr long) +@ stdcall CharPrevW(wstr wstr) +@ stdcall CharToOemA(str ptr) +@ stdcall CharToOemBuffA(str ptr long) +@ stdcall CharToOemBuffW(wstr ptr long) +@ stdcall CharToOemW(wstr ptr) +@ stdcall CharUpperA(str) +@ stdcall CharUpperBuffA(str long) +@ stdcall CharUpperBuffW(wstr long) +@ stdcall CharUpperW(wstr) +@ stdcall CheckDlgButton(long long long) +@ stdcall CheckMenuItem(long long long) +@ stdcall CheckMenuRadioItem(long long long long long) +@ stdcall CheckRadioButton(long long long long) +@ stdcall ChildWindowFromPoint(long double) +@ stdcall ChildWindowFromPointEx(long double long) +@ stub CliImmSetHotKey +@ stub ClientThreadConnect +@ stub ClientThreadSetup +@ stdcall ClientToScreen(long ptr) +@ stdcall ClipCursor(ptr) +@ stdcall CloseClipboard() +@ stdcall CloseDesktop(long) +@ stdcall CloseWindow(long) +@ stdcall CloseWindowStation(long) +@ stdcall CopyAcceleratorTableA(long ptr long) +@ stdcall CopyAcceleratorTableW(long ptr long) +@ stdcall CopyIcon(long) +@ stdcall CopyImage(long long long long long) +@ stdcall CopyRect(ptr ptr) +@ stdcall CountClipboardFormats() +@ stdcall CreateAcceleratorTableA(ptr long) +@ stdcall CreateAcceleratorTableW(ptr long) +@ stdcall CreateCaret(long long long long) +@ stdcall CreateCursor(long long long long long ptr ptr) +@ stdcall CreateDesktopA(str str ptr long long ptr) +@ stdcall CreateDesktopW(wstr wstr ptr long long ptr) +@ stdcall CreateDialogIndirectParamA(long ptr long ptr long) +@ stdcall CreateDialogIndirectParamAorW(long ptr long ptr long long) +@ stdcall CreateDialogIndirectParamW(long ptr long ptr long) +@ stdcall CreateDialogParamA(long ptr long ptr long) +@ stdcall CreateDialogParamW(long ptr long ptr long) +@ stdcall CreateIcon(long long long long long ptr ptr) +@ stdcall CreateIconFromResource (ptr long long long) +@ stdcall CreateIconFromResourceEx(ptr long long long long long long) +@ stdcall CreateIconIndirect(ptr) +@ stdcall CreateMDIWindowA(ptr ptr long long long long long long long long) +@ stdcall CreateMDIWindowW(ptr ptr long long long long long long long long) +@ stdcall CreateMenu() +@ stdcall CreatePopupMenu() +# @ stub CreateSystemThreads +@ stdcall CreateWindowExA(long str str long long long long long long long long ptr) +@ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) +@ stdcall CreateWindowStationA(str long long ptr) +@ stdcall CreateWindowStationW(wstr long long ptr) +@ stdcall CsrBroadcastSystemMessageExW(long ptr long long long ptr) +@ stdcall CtxInitUser32() +@ stdcall DdeAbandonTransaction(long long long) +@ stdcall DdeAccessData(long ptr) +@ stdcall DdeAddData(long ptr long long) +@ stdcall DdeClientTransaction(ptr long long long long long long ptr) +@ stdcall DdeCmpStringHandles(long long) +@ stdcall DdeConnect(long long long ptr) +@ stdcall DdeConnectList(long long long long ptr) +@ stdcall DdeCreateDataHandle(long ptr long long long long long) +@ stdcall DdeCreateStringHandleA(long str long) +@ stdcall DdeCreateStringHandleW(long wstr long) +@ stdcall DdeDisconnect(long) +@ stdcall DdeDisconnectList(long) +@ stdcall DdeEnableCallback(long long long) +@ stdcall DdeFreeDataHandle(long) +@ stdcall DdeFreeStringHandle(long long) +@ stdcall DdeGetData(long ptr long long) +@ stdcall DdeGetLastError(long) +@ stdcall DdeGetQualityOfService(long long ptr) +@ stdcall DdeImpersonateClient(long) +@ stdcall DdeInitializeA(ptr ptr long long) +@ stdcall DdeInitializeW(ptr ptr long long) +@ stdcall DdeKeepStringHandle(long long) +@ stdcall DdeNameService(long long long long) +@ stdcall DdePostAdvise(long long long) +@ stdcall DdeQueryConvInfo(long long ptr) +@ stdcall DdeQueryNextServer(long long) +@ stdcall DdeQueryStringA(long long ptr long long) +@ stdcall DdeQueryStringW(long long ptr long long) +@ stdcall DdeReconnect(long) +@ stdcall DdeSetQualityOfService(long ptr ptr) +@ stdcall DdeSetUserHandle (long long long) +@ stdcall DdeUnaccessData(long) +@ stdcall DdeUninitialize(long) +@ stdcall DefDlgProcA(long long long long) +@ stdcall DefDlgProcW(long long long long) +@ stdcall DefFrameProcA(long long long long long) +@ stdcall DefFrameProcW(long long long long long) +@ stdcall DefMDIChildProcA(long long long long) +@ stdcall DefMDIChildProcW(long long long long) +@ stdcall DefRawInputProc(ptr long long) +@ stdcall DefWindowProcA(long long long long) +@ stdcall DefWindowProcW(long long long long) +@ stdcall DeferWindowPos(long long long long long long long long) +@ stdcall DeleteMenu(long long long) +@ stdcall DeregisterShellHookWindow (long) +@ stdcall DestroyAcceleratorTable(long) +@ stdcall DestroyCaret() +@ stdcall DestroyCursor(long) +@ stdcall DestroyIcon(long) +@ stdcall DestroyMenu(long) +# @ stub DestroyReasons +@ stdcall DestroyWindow(long) +# @ stub DeviceEventWorker +@ stdcall DialogBoxIndirectParamA(long ptr long ptr long) +@ stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long) +@ stdcall DialogBoxIndirectParamW(long ptr long ptr long) +@ stdcall DialogBoxParamA(long str long ptr long) +@ stdcall DialogBoxParamW(long wstr long ptr long) +# @ stub DisableProcessWindowsGhosting +@ stdcall DispatchMessageA(ptr) +@ stdcall DispatchMessageW(ptr) +# @ stub DisplayExitWindowsWarnings +@ stdcall DlgDirListA(long str long long long) +@ stdcall DlgDirListComboBoxA(long ptr long long long) +@ stdcall DlgDirListComboBoxW(long ptr long long long) +@ stdcall DlgDirListW(long wstr long long long) +@ stdcall DlgDirSelectComboBoxExA(long ptr long long) +@ stdcall DlgDirSelectComboBoxExW(long ptr long long) +@ stdcall DlgDirSelectExA(long ptr long long) +@ stdcall DlgDirSelectExW(long ptr long long) +@ stdcall DragDetect(long double) +@ stdcall DragObject(long long long long long) +@ stdcall DrawAnimatedRects(long long ptr ptr) +@ stdcall DrawCaption(long long ptr long) +@ stdcall DrawCaptionTempA(long long ptr long long str long) +@ stdcall DrawCaptionTempW(long long ptr long long wstr long) +@ stdcall DrawEdge(long ptr long long) +@ stdcall DrawFocusRect(long ptr) +@ stub DrawFrame +@ stdcall DrawFrameControl(long ptr long long) +@ stdcall DrawIcon(long long long long) +@ stdcall DrawIconEx(long long long long long long long long long) +@ stdcall DrawMenuBar(long) +@ stdcall DrawMenuBarTemp(long long long long long) +@ stdcall DrawStateA(long long ptr long long long long long long long) +@ stdcall DrawStateW(long long ptr long long long long long long long) +@ stdcall DrawTextA(long str long ptr long) +@ stdcall DrawTextExA(long str long ptr long ptr) +@ stdcall DrawTextExW(long wstr long ptr long ptr) +@ stdcall DrawTextW(long wstr long ptr long) +@ stdcall EditWndProc(long long long long) EditWndProcA +@ stdcall EmptyClipboard() +@ stdcall EnableMenuItem(long long long) +@ stdcall EnableScrollBar(long long long) +@ stdcall EnableWindow(long long) +@ stdcall EndDeferWindowPos(long) +@ stdcall EndDialog(long long) +@ stdcall EndMenu() +@ stdcall EndPaint(long ptr) +@ stub EndTask +# @ stub EnterReaderModeHelper +@ stdcall EnumChildWindows(long ptr long) +@ stdcall EnumClipboardFormats(long) +@ stdcall EnumDesktopWindows(long ptr ptr) +@ stdcall EnumDesktopsA(ptr ptr long) +@ stdcall EnumDesktopsW(ptr ptr long) +@ stub EnumDisplayDeviceModesA #(str long ptr long) +@ stub EnumDisplayDeviceModesW #(wstr long ptr long) +@ stdcall EnumDisplayDevicesA(ptr long ptr long) +@ stdcall EnumDisplayDevicesW(ptr long ptr long) +@ stdcall EnumDisplayMonitors(long ptr ptr long) +@ stdcall EnumDisplaySettingsA(str long ptr) +@ stdcall EnumDisplaySettingsExA(str long ptr long) +@ stdcall EnumDisplaySettingsExW(wstr long ptr long) +@ stdcall EnumDisplaySettingsW(wstr long ptr ) +@ stdcall EnumPropsA(long ptr) +@ stdcall EnumPropsExA(long ptr long) +@ stdcall EnumPropsExW(long ptr long) +@ stdcall EnumPropsW(long ptr) +@ stdcall EnumThreadWindows(long ptr long) +@ stdcall EnumWindowStationsA(ptr long) +@ stdcall EnumWindowStationsW(ptr long) +@ stdcall EnumWindows(ptr long) +@ stdcall EqualRect(ptr ptr) +@ stdcall ExcludeUpdateRgn(long long) +@ stdcall ExitWindowsEx(long long) +@ stdcall FillRect(long ptr long) +@ stdcall FindWindowA(str str) +@ stdcall FindWindowExA(long long str str) +@ stdcall FindWindowExW(long long wstr wstr) +@ stdcall FindWindowW(wstr wstr) +@ stdcall FlashWindow(long long) +@ stdcall FlashWindowEx(ptr) +@ stdcall FrameRect(long ptr long) +@ stdcall FreeDDElParam(long long) +@ stdcall GetActiveWindow() +@ stdcall GetAltTabInfo(long long ptr ptr long) GetAltTabInfoA +@ stdcall GetAltTabInfoA(long long ptr ptr long) +@ stdcall GetAltTabInfoW(long long ptr ptr long) +@ stdcall GetAncestor(long long) +@ stdcall GetAppCompatFlags(long) +@ stdcall GetAppCompatFlags2(long) +@ stdcall GetAsyncKeyState(long) +@ stdcall GetCapture() +@ stdcall GetCaretBlinkTime() +@ stdcall GetCaretPos(ptr) +@ stdcall GetClassInfoA(long str ptr) +@ stdcall GetClassInfoExA(long str ptr) +@ stdcall GetClassInfoExW(long wstr ptr) +@ stdcall GetClassInfoW(long wstr ptr) +@ stdcall GetClassLongA(long long) +@ stdcall GetClassLongW(long long) +@ stub GetClassLongPtrA +@ stub GetClassLongPtrW +@ stdcall GetClassNameA(long ptr long) +@ stdcall GetClassNameW(long ptr long) +@ stdcall GetClassWord(long long) +@ stdcall GetClientRect(long long) +@ stdcall GetClipCursor(ptr) +@ stdcall GetClipboardData(long) +@ stdcall GetClipboardFormatNameA(long ptr long) +@ stdcall GetClipboardFormatNameW(long ptr long) +@ stdcall GetClipboardOwner() +@ stdcall GetClipboardSequenceNumber () +@ stdcall GetClipboardViewer() +@ stdcall GetComboBoxInfo(long ptr) +@ stdcall GetCursor() +# @ stub GetCursorFrameInfo +@ stdcall GetCursorInfo(ptr) +@ stdcall GetCursorPos(ptr) +@ stdcall GetDC(long) +@ stdcall GetDCEx(long long long) +@ stdcall GetDesktopWindow() +@ stdcall GetDialogBaseUnits() +@ stdcall GetDlgCtrlID(long) +@ stdcall GetDlgItem(long long) +@ stdcall GetDlgItemInt(long long ptr long) +@ stdcall GetDlgItemTextA(long long ptr long) +@ stdcall GetDlgItemTextW(long long ptr long) +@ stdcall GetDoubleClickTime() +@ stdcall GetFocus() +@ stdcall GetForegroundWindow() +@ stdcall GetGUIThreadInfo(long ptr) +@ stdcall GetGuiResources(long long) +@ stdcall GetIconInfo(long ptr) +@ stdcall GetInputDesktop() +@ stdcall GetInputState() +@ stdcall GetInternalWindowPos(long ptr ptr) +@ stdcall GetKBCodePage() +@ stdcall GetKeyNameTextA(long ptr long) +@ stdcall GetKeyNameTextW(long ptr long) +@ stdcall GetKeyState(long) +@ stdcall GetKeyboardLayout(long) +@ stdcall GetKeyboardLayoutList(long ptr) NtUserGetKeyboardLayoutList +@ stdcall GetKeyboardLayoutNameA(ptr) +@ stdcall GetKeyboardLayoutNameW(ptr) +@ stdcall GetKeyboardState(ptr) +@ stdcall GetKeyboardType(long) +@ stdcall GetLastActivePopup(long) +@ stdcall GetLastInputInfo(ptr) +@ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) NtUserGetLayeredWindowAttributes +# @ stub GetListBoxInfo +@ stdcall GetMenu(long) +@ stdcall GetMenuBarInfo(long long long ptr) +@ stdcall GetMenuCheckMarkDimensions() +@ stdcall GetMenuContextHelpId(long) +@ stdcall GetMenuDefaultItem(long long long) +@ stub GetMenuIndex +@ stdcall GetMenuInfo(long ptr) +@ stdcall GetMenuItemCount(long) +@ stdcall GetMenuItemID(long long) +@ stdcall GetMenuItemInfoA(long long long ptr) +@ stdcall GetMenuItemInfoW(long long long ptr) +@ stdcall GetMenuItemRect(long long long ptr) +@ stdcall GetMenuState(long long long) +@ stdcall GetMenuStringA(long long ptr long long) +@ stdcall GetMenuStringW(long long ptr long long) +@ stdcall GetMessageA(ptr long long long) +@ stdcall GetMessageExtraInfo() +@ stdcall GetMessagePos() +@ stdcall GetMessageTime() +@ stdcall GetMessageW(ptr long long long) +@ stdcall GetMonitorInfoA(long ptr) +@ stdcall GetMonitorInfoW(long ptr) +@ stdcall GetMouseMovePointsEx(long ptr ptr long long) +@ stdcall GetNextDlgGroupItem(long long long) +@ stdcall GetNextDlgTabItem(long long long) +# @ stub GetNextQueueWindow +@ stdcall GetOpenClipboardWindow() +@ stdcall GetParent(long) +@ stdcall GetPriorityClipboardFormat(ptr long) +@ stdcall GetProcessDefaultLayout(ptr) +@ stdcall GetProcessWindowStation() +@ stdcall GetProgmanWindow () +@ stdcall GetPropA(long str) +@ stdcall GetPropW(long wstr) +@ stdcall GetQueueStatus(long) +@ stdcall GetRawInputBuffer(ptr ptr long) +@ stdcall GetRawInputData(ptr long ptr ptr long) +@ stdcall GetRawInputDeviceInfoA(ptr long ptr ptr) +@ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) +@ stdcall GetRawInputDeviceList(ptr ptr long) +# @ stub GetReasonTitleFromReasonCode +@ stdcall GetRegisteredRawInputDevices(ptr ptr long) +@ stdcall GetScrollBarInfo(long long ptr) +@ stdcall GetScrollInfo(long long ptr) +@ stdcall GetScrollPos(long long) +@ stdcall GetScrollRange(long long ptr ptr) +@ stdcall GetShellWindow() +@ stdcall GetSubMenu(long long) +@ stdcall GetSysColor(long) +@ stdcall GetSysColorBrush(long) +@ stdcall GetSystemMenu(long long) +@ stdcall GetSystemMetrics(long) +@ stdcall GetTabbedTextExtentA(long str long long ptr) +@ stdcall GetTabbedTextExtentW(long wstr long long ptr) +@ stdcall GetTaskmanWindow () +@ stdcall GetThreadDesktop(long) +@ stdcall GetTitleBarInfo(long ptr) +@ stdcall GetTopWindow(long) +@ stdcall GetUpdateRect(long ptr long) +@ stdcall GetUpdateRgn(long long long) +@ stdcall GetUserObjectInformationA (long long ptr long ptr) +@ stdcall GetUserObjectInformationW (long long ptr long ptr) +@ stdcall GetUserObjectSecurity (long ptr ptr long ptr) +# @ stub GetWinStationInfo +@ stdcall GetWindow(long long) +@ stdcall GetWindowContextHelpId(long) +@ stdcall GetWindowDC(long) +@ stdcall GetWindowInfo(long ptr) +@ stdcall GetWindowLongA(long long) +@ stub GetWindowLongPtrA +@ stub GetWindowLongPtrW +@ stdcall GetWindowLongW(long long) +@ stdcall GetWindowModuleFileName(long ptr long) GetWindowModuleFileNameA +@ stdcall GetWindowModuleFileNameA(long ptr long) +@ stdcall GetWindowModuleFileNameW(long ptr long) +@ stdcall GetWindowPlacement(long ptr) +@ stdcall GetWindowRect(long ptr) +@ stdcall GetWindowRgn(long long) +@ stdcall GetWindowRgnBox(long ptr) +@ stdcall GetWindowTextA(long ptr long) +@ stdcall GetWindowTextLengthA(long) +@ stdcall GetWindowTextLengthW(long) +@ stdcall GetWindowTextW(long ptr long) +@ stdcall GetWindowThreadProcessId(long ptr) +@ stdcall GetWindowWord(long long) +@ stdcall GrayStringA(long long ptr long long long long long long) +@ stdcall GrayStringW(long long ptr long long long long long long) +# @ stub HasSystemSleepStarted +@ stdcall HideCaret(long) NtUserHideCaret +@ stdcall HiliteMenuItem(long long long long) +@ stdcall IMPGetIMEA(long ptr) +@ stdcall IMPGetIMEW(long ptr) +@ stdcall IMPQueryIMEA(ptr) +@ stdcall IMPQueryIMEW(ptr) +@ stdcall IMPSetIMEA(long ptr) +@ stdcall IMPSetIMEW(long ptr) +@ stdcall ImpersonateDdeClientWindow(long long) +@ stdcall InSendMessage() +@ stdcall InSendMessageEx(ptr) +@ stdcall InflateRect(ptr long long) +# @ stub InitSharedTable +# @ stub InitTask +# @ stub InitializeLpkHooks +# @ stub InitializeWin32EntryTable +@ stdcall InsertMenuA(long long long long ptr) +@ stdcall InsertMenuItemA(long long long ptr) +@ stdcall InsertMenuItemW(long long long ptr) +@ stdcall InsertMenuW(long long long long ptr) +@ stdcall InternalGetWindowText(long long long) +@ stdcall IntersectRect(ptr ptr ptr) +@ stdcall InvalidateRect(long ptr long) NtUserInvalidateRect +@ stdcall InvalidateRgn(long long long) +@ stdcall InvertRect(long ptr) +@ stdcall IsCharAlphaA(long) +@ stdcall IsCharAlphaNumericA(long) +@ stdcall IsCharAlphaNumericW(long) +@ stdcall IsCharAlphaW(long) +@ stdcall IsCharLowerA(long) +@ stdcall IsCharLowerW(long) +@ stdcall IsCharUpperA(long) +@ stdcall IsCharUpperW(long) +@ stdcall IsChild(long long) +@ stdcall IsClipboardFormatAvailable(long) +@ stdcall IsDialogMessage(long ptr) IsDialogMessageA +@ stdcall IsDialogMessageA(long ptr) +@ stdcall IsDialogMessageW(long ptr) +@ stdcall IsDlgButtonChecked(long long) +@ stdcall IsGUIThread(long) +@ stdcall IsHungAppWindow(long) +# @ stub IsHungThread +@ stdcall IsIconic(long) +@ stdcall IsMenu(long) +@ stdcall IsRectEmpty(ptr) +@ stdcall IsServerSideWindow(long) +@ stdcall IsWinEventHookInstalled(long) +@ stdcall IsWindow(long) +@ stdcall IsWindowEnabled(long) +@ stdcall IsWindowInDestroy(long) +@ stdcall IsWindowUnicode(long) +@ stdcall IsWindowVisible(long) +@ stdcall IsZoomed(long) +@ stdcall KillSystemTimer(long long) +@ stdcall KillTimer(long long) +@ stdcall LoadAcceleratorsA(long str) +@ stdcall LoadAcceleratorsW(long wstr) +@ stdcall LoadBitmapA(long str) +@ stdcall LoadBitmapW(long wstr) +@ stdcall LoadCursorA(long str) +@ stdcall LoadCursorFromFileA(str) +@ stdcall LoadCursorFromFileW(wstr) +@ stdcall LoadCursorW(long wstr) +@ stdcall LoadIconA(long str) +@ stdcall LoadIconW(long wstr) +@ stdcall LoadImageA(long str long long long long) +@ stdcall LoadImageW(long wstr long long long long) +@ stdcall LoadKeyboardLayoutA(str long) +# @ stub LoadKeyboardLayoutEx +@ stdcall LoadKeyboardLayoutW(wstr long) +@ stdcall LoadLocalFonts() +@ stdcall LoadMenuA(long str) +@ stdcall LoadMenuIndirectA(ptr) +@ stdcall LoadMenuIndirectW(ptr) +@ stdcall LoadMenuW(long wstr) +@ stub LoadRemoteFonts +@ stdcall LoadStringA(long long ptr long) +@ stdcall LoadStringW(long long ptr long) +@ stdcall LockSetForegroundWindow (long) +@ stub LockWindowStation +@ stdcall LockWindowUpdate(long) +@ stub LockWorkStation +@ stdcall LookupIconIdFromDirectory(ptr long) +@ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) +@ stub MBToWCSEx +@ stdcall MB_GetString(ptr) +@ stdcall MapDialogRect(long ptr) +@ stdcall MapVirtualKeyA(long long) +@ stdcall MapVirtualKeyExA(long long long) +@ stdcall MapVirtualKeyExW(long long long) +@ stdcall MapVirtualKeyW(long long) +@ stdcall MapWindowPoints(long long ptr long) +@ stdcall MenuItemFromPoint(long long double) +@ stdcall MenuWindowProcA (long long long long) +@ stdcall MenuWindowProcW (long long long long) +@ stdcall MessageBeep(long) +@ stdcall MessageBoxA(long str str long) +@ stdcall MessageBoxExA(long str str long long) +@ stdcall MessageBoxExW(long wstr wstr long long) +@ stdcall MessageBoxIndirectA(ptr) +@ stdcall MessageBoxIndirectW(ptr) +# @ stub MessageBoxTimeoutA +# @ stub MessageBoxTimeoutW +@ stdcall MessageBoxW(long wstr wstr long) +# @ stub ModifyAccess +@ stdcall ModifyMenuA(long long long long ptr) +@ stdcall ModifyMenuW(long long long long ptr) +@ stdcall MonitorFromPoint(double long) +@ stdcall MonitorFromRect(ptr long) +@ stdcall MonitorFromWindow(long long) +@ stdcall MoveWindow(long long long long long long) +@ stdcall MsgWaitForMultipleObjects(long ptr long long long) +@ stdcall MsgWaitForMultipleObjectsEx(long ptr long long long) +@ stdcall NotifyWinEvent(long long long long) +@ stdcall OemKeyScan(long) +@ stdcall OemToCharA(ptr ptr) +@ stdcall OemToCharBuffA(ptr ptr long) +@ stdcall OemToCharBuffW(ptr ptr long) +@ stdcall OemToCharW(ptr ptr) +@ stdcall OffsetRect(ptr long long) +@ stdcall OpenClipboard(long) +@ stdcall OpenDesktopA(str long long long) +@ stdcall OpenDesktopW(wstr long long long) +@ stdcall OpenIcon(long) +@ stdcall OpenInputDesktop(long long long) +@ stdcall OpenWindowStationA(str long long) +@ stdcall OpenWindowStationW(wstr long long) +@ stdcall PackDDElParam(long long long) +@ stdcall PaintDesktop(long) +# @ stub PaintMenuBar +@ stdcall PeekMessageA(ptr long long long long) +@ stdcall PeekMessageW(ptr long long long long) +@ stub PlaySoundEvent +@ stdcall PostMessageA(long long long long) +@ stdcall PostMessageW(long long long long) +@ stdcall PostQuitMessage(long) +@ stdcall PostThreadMessageA(long long long long) +@ stdcall PostThreadMessageW(long long long long) +# @ stub PrintWindow +@ stdcall PrivateExtractIconExA(str long ptr ptr long) +@ stdcall PrivateExtractIconExW(wstr long ptr ptr long) +@ stdcall PrivateExtractIconsA (str long long long ptr ptr long long) +@ stdcall PrivateExtractIconsW (wstr long long long ptr ptr long long) +# @ stub PrivateSetDbgTag +# @ stub PrivateSetRipFlags +@ stdcall PtInRect(ptr double) +@ stub QuerySendMessage +# @ stub QueryUserCounters +@ stdcall RealChildWindowFromPoint(long double) +@ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA +@ stdcall RealGetWindowClassA(long ptr long) +@ stdcall RealGetWindowClassW(long ptr long) +# @ stub ReasonCodeNeedsBugID +# @ stub ReasonCodeNeedsComment +# @ stub RecordShutdownReason +@ stdcall RedrawWindow(long ptr long long) +@ stdcall RegisterClassA(ptr) +@ stdcall RegisterClassExA(ptr) +@ stdcall RegisterClassExW(ptr) +@ stdcall RegisterClassW(ptr) +@ stdcall RegisterClipboardFormatA(str) +@ stdcall RegisterClipboardFormatW(wstr) +@ stdcall RegisterDeviceNotificationA(long ptr long) RegisterDeviceNotificationW +@ stdcall RegisterDeviceNotificationW(long ptr long) +@ stdcall RegisterHotKey(long long long long) +@ stdcall RegisterLogonProcess(long long) +# @ stub RegisterMessagePumpHook +@ stub RegisterNetworkCapabilities +@ stdcall RegisterRawInputDevices(ptr long long) +@ stdcall RegisterServicesProcess(long) +@ stdcall RegisterShellHookWindow (long) +@ stdcall RegisterSystemThread(long long) +@ stdcall RegisterTasklist (long) +# @ stub RegisterUserApiHook +@ stdcall RegisterWindowMessageA(str) +@ stdcall RegisterWindowMessageW(wstr) +@ stdcall ReleaseCapture() +@ stdcall ReleaseDC(long long) +@ stdcall RemoveMenu(long long long) +@ stdcall RemovePropA(long str) +@ stdcall RemovePropW(long wstr) +@ stdcall ReplyMessage(long) +@ stub ResetDisplay +# @ stub ResolveDesktopForWOW +@ stdcall ReuseDDElParam(long long long long long) +@ stdcall ScreenToClient(long ptr) +@ stdcall ScrollChildren(long long long long) +@ stdcall ScrollDC(long long long ptr ptr long ptr) +@ stdcall ScrollWindow(long long long ptr ptr) +@ stdcall ScrollWindowEx(long long long ptr ptr long ptr long) +@ stdcall SendDlgItemMessageA(long long long long long) +@ stdcall SendDlgItemMessageW(long long long long long) +@ stdcall SendIMEMessageExA(long long) +@ stdcall SendIMEMessageExW(long long) +@ stdcall SendInput(long ptr long) +@ stdcall SendMessageA(long long long long) +@ stdcall SendMessageCallbackA(long long long long ptr long) +@ stdcall SendMessageCallbackW(long long long long ptr long) +@ stdcall SendMessageTimeoutA(long long long long long long ptr) +@ stdcall SendMessageTimeoutW(long long long long long long ptr) +@ stdcall SendMessageW(long long long long) +@ stdcall SendNotifyMessageA(long long long long) +@ stdcall SendNotifyMessageW(long long long long) +@ stub ServerSetFunctionPointers +@ stdcall SetActiveWindow(long) +@ stdcall SetCapture(long) +@ stdcall SetCaretBlinkTime(long) +@ stdcall SetCaretPos(long long) +@ stdcall SetClassLongA(long long long) +@ stub SetClassLongPtrA #(long long long) +@ stub SetClassLongPtrW #(long long long) +@ stdcall SetClassLongW(long long long) +@ stdcall SetClassWord(long long long) +@ stdcall SetClipboardData(long long) +@ stdcall SetClipboardViewer(long) +# @ stub SetConsoleReserveKeys +@ stdcall SetCursor(long) +@ stub SetCursorContents +@ stdcall SetCursorPos(long long) +@ stdcall SetDebugErrorLevel(long) +@ stdcall SetDeskWallPaper(ptr) +# @ stub SetDesktopBitmap +@ stdcall SetDlgItemInt(long long long long) +@ stdcall SetDlgItemTextA(long long str) +@ stdcall SetDlgItemTextW(long long wstr) +@ stdcall SetDoubleClickTime(long) +@ stdcall SetFocus(long) +@ stdcall SetForegroundWindow(long) +@ stdcall SetInternalWindowPos(long long ptr ptr) +@ stdcall SetKeyboardState(ptr) +@ stdcall SetLastErrorEx(long long) +@ stdcall SetLayeredWindowAttributes(ptr long long long) win32k.NtUserSetLayeredWindowAttributes +@ stdcall SetLogonNotifyWindow(long long) +@ stdcall SetMenu(long long) +@ stdcall SetMenuContextHelpId(long long) +@ stdcall SetMenuDefaultItem(long long long) +@ stdcall SetMenuInfo(long ptr) +@ stdcall SetMenuItemBitmaps(long long long long long) +@ stdcall SetMenuItemInfoA(long long long ptr) +@ stdcall SetMenuItemInfoW(long long long ptr) +@ stdcall SetMessageExtraInfo(long) +@ stdcall SetMessageQueue(long) +@ stdcall SetParent(long long) +@ stdcall SetProcessDefaultLayout(long) +@ stub SetProcessDPIAware +@ stdcall SetProcessWindowStation(long) +@ stdcall SetProgmanWindow (long) +@ stdcall SetPropA(long str long) +@ stdcall SetPropW(long wstr long) +@ stdcall SetRect(ptr long long long long) +@ stdcall SetRectEmpty(ptr) +@ stdcall SetScrollInfo(long long ptr long) +@ stdcall SetScrollPos(long long long long) +@ stdcall SetScrollRange(long long long long long) +@ stdcall SetShellWindow(long) +@ stdcall SetShellWindowEx (long long) +@ stdcall SetSysColors(long ptr ptr) +@ stdcall SetSysColorsTemp(ptr ptr long) +@ stdcall SetSystemCursor(long long) +@ stdcall SetSystemMenu(long long) +@ stdcall SetSystemTimer(long long long ptr) +@ stdcall SetTaskmanWindow (long) +@ stdcall SetThreadDesktop(long) +@ stdcall SetTimer(long long long ptr) +@ stdcall SetUserObjectInformationA(long long ptr long) +@ stdcall SetUserObjectInformationW(long long ptr long) +@ stdcall SetUserObjectSecurity(long ptr ptr) +@ stdcall SetWinEventHook(long long long ptr long long long) +@ stdcall SetWindowContextHelpId(long long) +@ stub SetWindowFullScreenState +@ stdcall SetWindowLongA(long long long) +@ stub SetWindowLongPtrA #(long long long) +@ stub SetWindowLongPtrW #(long long long) +@ stdcall SetWindowLongW(long long long) +@ stdcall SetWindowPlacement(long ptr) +@ stdcall SetWindowPos(long long long long long long long) +@ stdcall SetWindowRgn(long long long) +@ stdcall SetWindowStationUser(long long long long) +@ stdcall SetWindowText(long str) SetWindowTextA +@ stdcall SetWindowTextA(long str) +@ stdcall SetWindowTextW(long wstr) +@ stdcall SetWindowWord(long long long) +@ stdcall SetWindowsHookA(long ptr) +@ stdcall SetWindowsHookExA(long long long long) +@ stdcall SetWindowsHookExW(long long long long) +@ stdcall SetWindowsHookW(long ptr) +@ stdcall ShowCaret(long) +@ stdcall ShowCursor(long) +@ stdcall ShowOwnedPopups(long long) +@ stdcall ShowScrollBar(long long long) +@ stub ShowStartGlass +@ stdcall ShowWindow(long long) +@ stdcall ShowWindowAsync(long long) +# @ stub SoftModalMessageBox +@ stdcall SubtractRect(ptr ptr ptr) +@ stdcall SwapMouseButton(long) +@ stdcall SwitchDesktop(long) +@ stdcall SwitchToThisWindow(long long) +# @ stub SysErrorBox +@ stdcall SystemParametersInfoA(long long ptr long) +@ stdcall SystemParametersInfoW(long long ptr long) +@ stdcall TabbedTextOutA(long long long str long long ptr long) +@ stdcall TabbedTextOutW(long long long wstr long long ptr long) +@ stdcall TileChildWindows(long long) +@ stdcall TileWindows(long long ptr long ptr) +@ stdcall ToAscii(long long ptr ptr long) +@ stdcall ToAsciiEx(long long ptr ptr long long) +@ stdcall ToUnicode(long long ptr ptr long long) +@ stdcall ToUnicodeEx(long long ptr ptr long long long) +@ stdcall TrackMouseEvent(ptr) +@ stdcall TrackPopupMenu(long long long long long long ptr) +@ stdcall TrackPopupMenuEx(long long long long long ptr) +@ stdcall TranslateAccelerator(long long ptr) TranslateAcceleratorA +@ stdcall TranslateAcceleratorA(long long ptr) +@ stdcall TranslateAcceleratorW(long long ptr) +@ stdcall TranslateMDISysAccel(long ptr) +@ stdcall TranslateMessage(ptr) +# @ stub TranslateMessageEx +@ stdcall UnhookWinEvent(long) +@ stdcall UnhookWindowsHook(long ptr) +@ stdcall UnhookWindowsHookEx(long) +@ stdcall UnionRect(ptr ptr ptr) +@ stdcall UnloadKeyboardLayout(long) +@ stub UnlockWindowStation +@ stdcall UnpackDDElParam(long long ptr ptr) +@ stdcall UnregisterClassA(str long) +@ stdcall UnregisterClassW(wstr long) +@ stdcall UnregisterDeviceNotification(long) +@ stdcall UnregisterHotKey(long long) +# @ stub UnregisterMessagePumpHook +# @ stub UnregisterUserApiHook +@ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) +@ stdcall UpdatePerUserSystemParameters(long long) +@ stdcall UpdateWindow(long) +@ stdcall User32InitializeImmEntryTable(ptr) +@ stdcall UserClientDllInitialize(long long ptr) DllMain +@ stub UserHandleGrantAccess +# @ stub UserIsSystemResumeAutomatic +# @ stub UserLpkPSMTextOut +# @ stub UserLpkTabbedTextOut +@ stdcall UserRealizePalette(long) +@ stub UserRegisterWowHandlers +# @ stub UserSetDeviceHoldState +@ stdcall UserSignalProc(long long long long) +# @ stub VRipOutput +# @ stub VTagOutput +@ stdcall ValidateRect(long ptr) +@ stdcall ValidateRgn(long long) +@ stdcall VkKeyScanA(long) +@ stdcall VkKeyScanExA(long long) +@ stdcall VkKeyScanExW(long long) +@ stdcall VkKeyScanW(long) +@ stub WCSToMBEx +@ stdcall WINNLSEnableIME(long long) +@ stdcall WINNLSGetEnableStatus(long) +@ stdcall WINNLSGetIMEHotkey(long) +@ stub WNDPROC_CALLBACK +@ stdcall WaitForInputIdle(long long) +@ stdcall WaitMessage() +# @ stub Win32PoolAllocationStats +@ stdcall WinHelpA(long str long long) +@ stdcall WinHelpW(long wstr long long) +# @ stub WinOldAppHackoMatic +@ stdcall WindowFromDC(long) +@ stdcall WindowFromPoint(double) +# @ stub YieldTask +# @ stub _SetProcessDefaultLayout +@ stdcall keybd_event(long long long long) +@ stdcall mouse_event(long long long long long) +@ varargs wsprintfA(str str) +@ varargs wsprintfW(wstr wstr) +@ stdcall wvsprintfA(ptr str ptr) +@ stdcall wvsprintfW(ptr wstr ptr) diff --git a/reactos/dll/win32/user32/windows/draw.c b/reactos/dll/win32/user32/windows/draw.c index f635010d20f..ba2bca01c5b 100644 --- a/reactos/dll/win32/user32/windows/draw.c +++ b/reactos/dll/win32/user32/windows/draw.c @@ -1826,7 +1826,7 @@ FillRect(HDC hDC, CONST RECT *lprc, HBRUSH hbr) if (hbr <= (HBRUSH)(COLOR_MENUBAR + 1)) { - hbr = GetSysColorBrush((int)hbr - 1); + hbr = GetSysColorBrush(PtrToUlong(hbr) - 1); } if ((prevhbr = SelectObject(hDC, hbr)) == NULL) { diff --git a/reactos/dll/win32/user32/windows/menu.c b/reactos/dll/win32/user32/windows/menu.c index bf187f4c4e6..ce6a82b101e 100644 --- a/reactos/dll/win32/user32/windows/menu.c +++ b/reactos/dll/win32/user32/windows/menu.c @@ -4523,7 +4523,7 @@ InsertMenuA( HMENU hMenu, UINT uPosition, UINT uFlags, - UINT_PTR uIDNewItem, + UINT uIDNewItem, LPCSTR lpNewItem) { MENUITEMINFOA mii; @@ -4645,7 +4645,7 @@ InsertMenuW( HMENU hMenu, UINT uPosition, UINT uFlags, - UINT_PTR uIDNewItem, + UINT uIDNewItem, LPCWSTR lpNewItem) { MENUITEMINFOW mii; @@ -4784,7 +4784,7 @@ ModifyMenuA( HMENU hMnu, UINT uPosition, UINT uFlags, - UINT_PTR uIDNewItem, + UINT uIDNewItem, LPCSTR lpNewItem) { ROSMENUINFO mi; @@ -4831,7 +4831,7 @@ ModifyMenuW( HMENU hMnu, UINT uPosition, UINT uFlags, - UINT_PTR uIDNewItem, + UINT uIDNewItem, LPCWSTR lpNewItem) { ROSMENUINFO mi; diff --git a/reactos/dll/win32/winmm/midimap/midimap.rbuild b/reactos/dll/win32/winmm/midimap/midimap.rbuild index 901479650ef..6573f5d48bf 100644 --- a/reactos/dll/win32/winmm/midimap/midimap.rbuild +++ b/reactos/dll/win32/winmm/midimap/midimap.rbuild @@ -12,7 +12,6 @@ advapi32 user32 winmm - msvcrt midimap.c midimap.rc midimap.spec diff --git a/reactos/dll/win32/ws2_32/misc/stubs.c b/reactos/dll/win32/ws2_32/misc/stubs.c index 9418b53a4b1..1c77ef91fe6 100644 --- a/reactos/dll/win32/ws2_32/misc/stubs.c +++ b/reactos/dll/win32/ws2_32/misc/stubs.c @@ -31,7 +31,7 @@ getpeername(IN SOCKET s, return SOCKET_ERROR; } - if (!ReferenceProviderByHandle((HANDLE)s, &Provider)) + if (!ReferenceProviderByHandle((HANDLE)(ULONG_PTR)(s), &Provider)) { WSASetLastError(WSAENOTSOCK); return SOCKET_ERROR; diff --git a/reactos/dll/win32/ws2_32/ws2_32.rbuild b/reactos/dll/win32/ws2_32/ws2_32.rbuild index 1fa4a54bd0c..08d974ab554 100644 --- a/reactos/dll/win32/ws2_32/ws2_32.rbuild +++ b/reactos/dll/win32/ws2_32/ws2_32.rbuild @@ -1,5 +1,5 @@ - + include include/reactos/wine @@ -27,4 +27,6 @@ async.c ws2_32.rc + ws2_32.spec + diff --git a/reactos/dll/win32/ws2_32/ws2_32.spec b/reactos/dll/win32/ws2_32/ws2_32.spec new file mode 100644 index 00000000000..bbcafc0659b --- /dev/null +++ b/reactos/dll/win32/ws2_32/ws2_32.spec @@ -0,0 +1,119 @@ +1 stdcall accept(long ptr ptr) WS_accept +2 stdcall bind(long ptr long) WS_bind +3 stdcall closesocket(long) WS_closesocket +4 stdcall connect(long ptr long) WS_connect +5 stdcall getpeername(long ptr ptr) WS_getpeername +6 stdcall getsockname(long ptr ptr) WS_getsockname +7 stdcall getsockopt(long long long ptr ptr) WS_getsockopt +8 stdcall htonl(long) WS_htonl +9 stdcall htons(long) WS_htons +10 stdcall ioctlsocket(long long ptr) WS_ioctlsocket +11 stdcall inet_addr(str) WS_inet_addr +12 stdcall inet_ntoa(ptr) WS_inet_ntoa +13 stdcall listen(long long) WS_listen +14 stdcall ntohl(long) WS_ntohl +15 stdcall ntohs(long) WS_ntohs +16 stdcall recv(long ptr long long) WS_recv +17 stdcall recvfrom(long ptr long long ptr ptr) WS_recvfrom +18 stdcall select(long ptr ptr ptr ptr) WS_select +19 stdcall send(long ptr long long) WS_send +20 stdcall sendto(long ptr long long ptr long) WS_sendto +21 stdcall setsockopt(long long long ptr long) WS_setsockopt +22 stdcall shutdown(long long) WS_shutdown +23 stdcall socket(long long long) WS_socket +51 stdcall gethostbyaddr(ptr long long) WS_gethostbyaddr +52 stdcall gethostbyname(str) WS_gethostbyname +53 stdcall getprotobyname(str) WS_getprotobyname +54 stdcall getprotobynumber(long) WS_getprotobynumber +55 stdcall getservbyname(str str) WS_getservbyname +56 stdcall getservbyport(long str) WS_getservbyport +57 stdcall gethostname(ptr long) WS_gethostname + +101 stdcall WSAAsyncSelect(long long long long) +102 stdcall WSAAsyncGetHostByAddr(long long ptr long long ptr long) +103 stdcall WSAAsyncGetHostByName(long long str ptr long) +104 stdcall WSAAsyncGetProtoByNumber(long long long ptr long) +105 stdcall WSAAsyncGetProtoByName(long long str ptr long) +106 stdcall WSAAsyncGetServByPort(long long long str ptr long) +107 stdcall WSAAsyncGetServByName(long long str str ptr long) +108 stdcall WSACancelAsyncRequest(long) +109 stdcall WSASetBlockingHook(ptr) +110 stdcall WSAUnhookBlockingHook() +111 stdcall WSAGetLastError() +112 stdcall WSASetLastError(long) +113 stdcall WSACancelBlockingCall() +114 stdcall WSAIsBlocking() +115 stdcall WSAStartup(long ptr) +116 stdcall WSACleanup() + +151 stdcall __WSAFDIsSet(long ptr) + +500 stub WEP + +@ stdcall GetAddrInfoW(wstr wstr ptr ptr) +@ stdcall WSApSetPostRoutine(ptr) +@ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) +@ stdcall WSAAccept(long ptr ptr ptr long) +@ stdcall WSAAddressToStringA(ptr long ptr ptr ptr) +@ stdcall WSAAddressToStringW(ptr long ptr ptr ptr) +@ stdcall WSACloseEvent(long) +@ stdcall WSAConnect(long ptr long ptr ptr ptr ptr) +@ stdcall WSACreateEvent () +@ stdcall WSADuplicateSocketA(long long ptr) +@ stdcall WSADuplicateSocketW(long long ptr) +@ stdcall WSAEnumNameSpaceProvidersA(ptr ptr) +@ stdcall WSAEnumNameSpaceProvidersW(ptr ptr) +@ stdcall WSAEnumNetworkEvents(long long ptr) +@ stdcall WSAEnumProtocolsA(ptr ptr ptr) +@ stdcall WSAEnumProtocolsW(ptr ptr ptr) +@ stdcall WSAEventSelect(long long long) +@ stdcall WSAGetOverlappedResult(long ptr ptr long ptr) +@ stdcall WSAGetQOSByName(long ptr ptr) +@ stdcall WSAGetServiceClassInfoA(ptr ptr ptr ptr) +@ stdcall WSAGetServiceClassInfoW(ptr ptr ptr ptr) +@ stdcall WSAGetServiceClassNameByClassIdA(ptr ptr ptr) +@ stdcall WSAGetServiceClassNameByClassIdW(ptr ptr ptr) +@ stdcall WSAHtonl(long long ptr) +@ stdcall WSAHtons(long long ptr) +@ stdcall WSAInstallServiceClassA(ptr) +@ stdcall WSAInstallServiceClassW(ptr) +@ stdcall WSAIoctl(long long ptr long ptr long ptr ptr ptr) +@ stdcall WSAJoinLeaf(long ptr long ptr ptr ptr ptr long) +@ stdcall WSALookupServiceBeginA(ptr long ptr) +@ stdcall WSALookupServiceBeginW(ptr long ptr) +@ stdcall WSALookupServiceEnd(long) +@ stdcall WSALookupServiceNextA(long long ptr ptr) +@ stdcall WSALookupServiceNextW(long long ptr ptr) +@ stub WSANSPIoctl +@ stdcall WSANtohl(long long ptr) +@ stdcall WSANtohs(long long ptr) +@ stdcall WSAProviderConfigChange(ptr ptr ptr) +@ stdcall WSARecv(long ptr long ptr ptr ptr ptr) +@ stdcall WSARecvDisconnect(long ptr) +@ stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr ) +@ stdcall WSARemoveServiceClass(ptr) +@ stdcall WSAResetEvent(long) kernel32.ResetEvent +@ stdcall WSASend(long ptr long ptr long ptr ptr) +@ stdcall WSASendDisconnect(long ptr) +@ stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) +@ stdcall WSASetEvent(long) kernel32.SetEvent +@ stdcall WSASetServiceA(ptr long long) +@ stdcall WSASetServiceW(ptr long long) +@ stdcall WSASocketA(long long long ptr long long) +@ stdcall WSASocketW(long long long ptr long long) +@ stdcall WSAStringToAddressA(str long ptr ptr ptr) +@ stdcall WSAStringToAddressW(wstr long ptr ptr ptr) +@ stdcall WSAWaitForMultipleEvents(long ptr long long long) kernel32.WaitForMultipleObjectsEx +@ stdcall WSCDeinstallProvider(ptr ptr) +@ stdcall WSCEnableNSProvider(ptr long) +@ stdcall WSCEnumProtocols(ptr ptr ptr ptr) +@ stdcall WSCGetProviderPath(ptr ptr ptr ptr) +@ stdcall WSCInstallNameSpace(wstr wstr long long ptr) +@ stdcall WSCInstallProvider(ptr wstr ptr long ptr) +@ stdcall WSCUnInstallNameSpace(ptr) +@ stub WSCUpdateProvider +@ stub WSCWriteNameSpaceOrder +@ stdcall WSCWriteProviderOrder(ptr long) +@ stdcall freeaddrinfo(ptr) WS_freeaddrinfo +@ stdcall getaddrinfo(str str ptr ptr) WS_getaddrinfo +@ stdcall getnameinfo(ptr long ptr long ptr long long) WS_getnameinfo