Ros-diffs November 2009

ros-diffs@reactos.org

23 participants
444 discussions

[ablackmann] 43985: Implement support for writing the virtual key to WCHAR translation for different shift states. Only 2 shift states are supported for now, I have to add a lot more output generation code to get at least 3 states up and running.

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Fri Nov 6 01:38:04 2009 New Revision: 43985 URL: http://svn.reactos.org/svn/reactos?rev=43985&view=rev Log: Implement support for writing the virtual key to WCHAR translation for different shift states. Only 2 shift states are supported for now, I have to add a lot more output generation code to get at least 3 states up and running. Modified: trunk/reactos/tools/kbdtool/output.c Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Fri Nov 6 01:38:04 2009 @@ -492,6 +492,7 @@ { CHAR OutputFile[13]; CHAR KeyNameBuffer[50]; + CHAR LineBuffer[256]; BOOLEAN NeedPlus; FILE *FileHandle; ULONG States[8]; @@ -864,7 +865,92 @@ "*\n" "\\***************************************************************************/\n\n"); - /* FIXME: LOTS OF STATE STUFF */ + /* Loop all the states */ + for (i = 2; i <= StateCount; i++) + { + /* Check if this something else than state 2 */ + if (i != 2) + { + /* Not yet supported */ + printf("Extra states not yet supported!\n"); + break;//exit(1); + } + + /* Print the table header */ + fprintf(FileHandle, + "static ALLOC_SECTION_LDATA VK_TO_WCHARS%d aVkToWch%d[] = {\n" + "// | | Shift |", + i, + i); + + /* Print the correct state label */ + for (k = 2; k < i; k++) fprintf(FileHandle, "%-9.9s|", + StateLabel[ShiftStates[k]]); + + /* Print the next separator */ + fprintf(FileHandle, "\n// |=========|=========|"); + + /* Check for extra states and print their separators too */ + for (k = 2; k < i; k++) fprintf(FileHandle, "=========|"); + + /* Finalize the separator header */ + fprintf(FileHandle, "\n"); + + /* Loop all the scan codes */ + for (j = 0; j < 110; j++) + { + /* Check if this is the state for the entry */ + if (i != Layout->Entry[j].StateCount) continue; + + /* Print out the entry for this key */ + fprintf(FileHandle, + " {%-13s,%-7s", + getVKName(Layout->Entry[j].VirtualKey, 1), + CapState[Layout->Entry[j].Cap]); + + /* Initialize the buffer for this line */ + *LineBuffer = '\0'; + + /* FIXME: Loop for states */ + + /* Finish the line */ + fprintf(FileHandle, "},\n"); + + /* Do we have any data at all? */ + if (*LineBuffer != '\0') + { + /* Print it, we're done */ + fprintf(FileHandle, "%s},\n", LineBuffer); + continue; + } + + /* Otherwise, we're done, unless this requires SGCAP data */ + if (Layout->Entry[j].Cap != 2) continue; + + /* Not yet supported */ + printf("SGCAP not yet supported!\n"); + exit(1); + } + + /* Did we only have two states? */ + if (i == 2) + { + /* Print out the built-in table */ + fprintf(FileHandle, + " {VK_TAB ,0 ,'\\t' ,'\\t' },\n" + " {VK_ADD ,0 ,'+' ,'+' },\n" + " {VK_DIVIDE ,0 ,'/' ,'/' },\n" + " {VK_MULTIPLY ,0 ,'*' ,'*' },\n" + " {VK_SUBTRACT ,0 ,'-' ,'-' },\n"); + } + + /* Terminate the table */ + fprintf(FileHandle, " {0 ,0 "); + for (k = 0; k < i; k++) fprintf(FileHandle, ",0 "); + + /* Terminate the structure */ + fprintf(FileHandle, "}\n" "};\n\n"); + } /* Numpad translation table */ fprintf(FileHandle,

15 years, 1 month

[ablackmann] 43984: Add table of shift state combinations, and add table of shift state types.

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Fri Nov 6 01:37:06 2009 New Revision: 43984 URL: http://svn.reactos.org/svn/reactos?rev=43984&view=rev Log: Add table of shift state combinations, and add table of shift state types. Modified: trunk/reactos/tools/kbdtool/data.c trunk/reactos/tools/kbdtool/kbdtool.h Modified: trunk/reactos/tools/kbdtool/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/data.c?rev=4… ============================================================================== --- trunk/reactos/tools/kbdtool/data.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/data.c [iso-8859-1] Fri Nov 6 01:37:06 2009 @@ -58,6 +58,88 @@ {0x10, "KBDSHIFT"}, {0x11, "KBDCTRL"}, {0x12, "KBDALT"} +}; + +/* Table of states */ +PCHAR StateLabel[] = +{ + "", + "Shift", + " Ctrl", + "S+Ctrl", + " Alt", + "Shift+Alt", + " Ctl+Alt", + "S+Ctl+Alt", + " X1 ", + "S+ X1 ", + " C+ X1 ", + "S+C+ X1 ", + " A+X1 ", + "S+ A+X1 ", + " C+A+X1 ", + "S+C+A+X1 ", + " X2 ", + "S+ X2 ", + " C+ X2 ", + "S+C+ X2 ", + " A+ X2 ", + "S+ A+ X2 ", + " C+A+ X2 ", + "S+C+A+ X2 ", + " X1+X2 ", + "S+ X1+X2 ", + " C+ X1+X2 ", + "S+C+ X1+X2 ", + " A+X1+X2 ", + "S+ A+X1+X2 ", + " C+A+X1+X2 ", + "S+C+A+X1+X2 ", + " X3", + "S+ X3", + " C+ X3", + "S+C+ X3", + " A+ X3", + "S+ A+ X3", + " C+A+ X3", + "S+C+A+ X3", + " X1+ X3", + "S+ X1+ X3", + " C+ X1+ X3", + "S+C+ X1+ X3", + " A+X1+ X3", + "S+ A+X1+ X3", + " C+A+X1+ X3", + "S+C+A+X1+ X3", + " X2+X3", + "S+ X2+X3", + " C+ X2+X3", + "S+C+ X2+X3", + " A+ X2+X3", + "S+ A+ X2+X3", + " C+A+ X2+X3", + "S+C+A+ X2+X3", + " X1+X2+X3", + "S+ X1+X2+X3", + " C+ X1+X2+X3", + "S+C+ X1+X2+X3", + " A+X1+X2+X3", + "S+ A+X1+X2+X3", + " C+A+X1+X2+X3", + "S+C+A+X1+X2+X3", + "unexpected", + "unexpected" +}; + +/* Table of Cap States */ +PCHAR CapState[] = +{ + "0", + "CAPLOK", + "SGCAPS", + "CAPLOCK | SGCAPS", + "CAPLOKALTGR", + "CAPLOK | CAPLOKALTGR" }; /* ISO 110-key Keyboard Scancode to Virtual Key Conversion Table */ Modified: trunk/reactos/tools/kbdtool/kbdtool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.h?re… ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] Fri Nov 6 01:37:06 2009 @@ -78,6 +78,8 @@ extern VKNAME VKName[]; extern VKNAME Modifiers[]; extern SCVK ScVk[]; +extern PCHAR StateLabel[]; +extern PCHAR CapState[]; extern LAYOUT g_Layout; extern CHAR gVKeyName[32]; extern CHAR gKBDName[10];

15 years, 1 month

[ablackmann] 43983: Print out more state-related tables and information (still missing one large chunk of data). Print out the key and extended key tables for the layout. Fix up some more code. The C source is almost fully complete for the English US test layout KLC!

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Fri Nov 6 00:58:38 2009 New Revision: 43983 URL: http://svn.reactos.org/svn/reactos?rev=43983&view=rev Log: Print out more state-related tables and information (still missing one large chunk of data). Print out the key and extended key tables for the layout. Fix up some more code. The C source is almost fully complete for the English US test layout KLC! Modified: trunk/reactos/tools/kbdtool/output.c Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Fri Nov 6 00:58:38 2009 @@ -19,6 +19,110 @@ struct tm *Now; /* FUNCTIONS ******************************************************************/ + +VOID +PrintNameTable(FILE* FileHandle, + PKEYNAME KeyName, + BOOL DeadKey) +{ + CHAR CharBuffer[255]; + PKEYNAME NextName; + PCHAR Name, Buffer; + ULONG i; + + /* Loop all key names */ + while (KeyName) + { + /* Go to the next key name */ + NextName = KeyName->Next; + + /* Remember the name and our buffer address */ + Name = KeyName->Name; + Buffer = CharBuffer; + + /* Check if it's an IDS name */ + if (strncmp(Name, "IDS_", 4)) + { + /* No, so start parsing it. First, handle initial quote */ + if (*Name != '\"') *Buffer++ = '\"'; + + /* Next, parse the name */ + while (*Name) + { + /* Check if this is a C-style hex string */ + if ((*Name != '\\') || ((*(Name + 1) != 'x') && (*(Name + 1) != 'X'))) + { + /* It's not, so just copy straight into our buffer */ + *Buffer++ = *Name++; + } + else + { + /* Continue scanning as long as this is a C-style hex string */ + while ((*Name == '\\') && ((*(Name + 1) == 'x') || (*(Name + 1) == 'X'))) + { + /* Copy 6 characters */ + for (i = 0; (*Name) && (i < 6); i++) *Buffer++ = *Name++; + } + + /* Check if we still have something at the end */ + if (*Name) + { + /* Terminate our buffer */ + *Buffer++ = '\"'; + *Buffer++ = ' '; + *Buffer++ = 'L'; + *Buffer++ = '\"'; + } + } + } + + /* Check for terminating quote */ + if (*(Buffer - 1) != '\"') *Buffer++ = '\"'; + + /* Terminate the buffer */ + *Buffer++ = '\0'; + } + else + { + /* Not yet supported */ + printf("IDS Entries not yet handled!\n"); + exit(1); + } + + /* Is this a dead key? */ + if (DeadKey) + { + /* Not yet handled */ + printf("Dead keys not yet handled\n"); + exit(1); + } + else + { + /* Print the entry */ + fprintf(FileHandle, " 0x%02x, L%s,\n", KeyName->Code, CharBuffer); + } + + /* Cleanup allocation */ + free(KeyName->Name); + free(KeyName); + + /* Move on */ + KeyName = NextName; + } + + /* Is this a dead key? */ + if (DeadKey) + { + /* Not yet handled */ + printf("Dead keys not yet handled\n"); + exit(1); + } + else + { + /* Terminate the table */ + fprintf(FileHandle, " 0 , NULL\n"); + } +} BOOLEAN kbd_h(IN PLAYOUT Layout) @@ -728,7 +832,15 @@ "* aVkToWch3[] - Virtual Key to WCHAR translation for 3 shift states\n" "* aVkToWch4[] - Virtual Key to WCHAR translation for 4 shift states\n"); - /* FIXME: STATE STUFF */ + /* Check if there's exta shift states */ + for (i = 5; i < HighestState; i++) + { + /* Print out extra information */ + fprintf(FileHandle, + "* aVkToWch%d[] - Virtual Key to WCHAR translation for %d shift states\n", + i, + i); + } /* Shift state translation table description continue */ fprintf(FileHandle, @@ -752,7 +864,7 @@ "*\n" "\\***************************************************************************/\n\n"); - /* FIXME: STATE STUFF */ + /* FIXME: LOTS OF STATE STUFF */ /* Numpad translation table */ fprintf(FileHandle, @@ -776,7 +888,16 @@ /* Translation tables header */ fprintf(FileHandle,"static ALLOC_SECTION_LDATA VK_TO_WCHAR_TABLE aVkToWcharTable[] = {\n"); - /* FIXME: STATE STUFF */ + /* Loop states higher than 3 */ + for (i = 3; i <= StateCount; i++) + { + /* Print out the extra tables */ + fprintf(FileHandle, + " { (PVK_TO_WCHARS1)aVkToWch%d, %d, sizeof(aVkToWch%d[0]) },\n", + i, + i, + i); + } /* Array of translation tables */ fprintf(FileHandle, @@ -802,7 +923,8 @@ /* Table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_LPWSTR aKeyNames[] = {\n"); - /* FIXME: TODO: Print table */ + /* Print table */ + PrintNameTable(FileHandle, KeyNameData, FALSE); /* Table end */ fprintf(FileHandle, "};\n\n"); @@ -814,7 +936,8 @@ /* Table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_LPWSTR aKeyNamesExt[] = {\n"); - /* FIXME: TODO: Print table */ + /* Print table */ + PrintNameTable(FileHandle, KeyNameExtData, FALSE); /* Table end */ fprintf(FileHandle, "};\n\n"); @@ -833,7 +956,7 @@ { /* Not yet supported */ printf("Dead key data not supported!\n"); - //exit(1); + exit(1); } /* Check for ligature data */ @@ -868,11 +991,11 @@ /* Descriptor dead key data section */ if (DeadKeyData) { - fprintf(FileHandle," aDeadKey,\n\n"); + fprintf(FileHandle, " aDeadKey,\n\n"); } else { - fprintf(FileHandle," NULL,\n\n"); + fprintf(FileHandle, " NULL,\n\n"); } /* Descriptor key name comment */ @@ -884,31 +1007,31 @@ /* Descriptor key name section */ if (KeyNameData) { - fprintf(FileHandle," aKeyNames,\n"); + fprintf(FileHandle, " aKeyNames,\n"); } else { - fprintf(FileHandle," NULL,\n"); + fprintf(FileHandle, " NULL,\n"); } /* Descriptor extended key name section */ if (KeyNameExtData) { - fprintf(FileHandle," aKeyNamesExt,\n"); + fprintf(FileHandle, " aKeyNamesExt,\n"); } else { - fprintf(FileHandle," NULL,\n"); + fprintf(FileHandle, " NULL,\n"); } /* Descriptor dead key name section */ if ((DeadKeyData) && (KeyNameDeadData)) { - fprintf(FileHandle," aKeyNamesDead,\n\n"); + fprintf(FileHandle, " aKeyNamesDead,\n\n"); } else { - fprintf(FileHandle," NULL,\n\n"); + fprintf(FileHandle, " NULL,\n\n"); } /* Descriptor conversion table section */ @@ -927,7 +1050,7 @@ /* FIXME: AttributeData and KLLF_ALTGR stuff */ /* Descriptor locale-specific section */ - fprintf(FileHandle, " MAKELONG(%s, KBD_VERSION),\n\n", (PCHAR)AttributeData); + fprintf(FileHandle, " MAKELONG(%s, KBD_VERSION),\n\n", "0"); /* FIXME */ /* Descriptor ligature data comment */ fprintf(FileHandle, " /*\n * Ligatures\n */\n %d,\n", 0); /* FIXME */ @@ -945,7 +1068,7 @@ } /* Descriptor finish */ - fprintf(FileHandle,"};\n\n"); + fprintf(FileHandle, "};\n\n"); /* Keyboard layout callback function */ if (!FallbackDriver) fprintf(FileHandle,

15 years, 1 month

[mjmartin] 43982: [cdfs] - CdfsVerifyVolume: Disable the delivery of normal Kernel APC's before acquiring resource and re-enable APC's after releasing resource. Fixes ASSERT from ntoskrnl/ex/resource.c. Noticed by Stefan.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri Nov 6 00:43:57 2009 New Revision: 43982 URL: http://svn.reactos.org/svn/reactos?rev=43982&view=rev Log: [cdfs] - CdfsVerifyVolume: Disable the delivery of normal Kernel APC's before acquiring resource and re-enable APC's after releasing resource. Fixes ASSERT from ntoskrnl/ex/resource.c. Noticed by Stefan. Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Fri Nov 6 00:43:57 2009 @@ -466,6 +466,7 @@ Stack = IoGetCurrentIrpStackLocation (Irp); DeviceToVerify = Stack->Parameters.VerifyVolume.DeviceObject; + FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite (&DeviceExt->VcbResource, TRUE); @@ -473,6 +474,7 @@ { DPRINT1 ("Volume has been verified!\n"); ExReleaseResourceLite (&DeviceExt->VcbResource); + FsRtlExitFileSystem(); return STATUS_SUCCESS; } @@ -511,6 +513,7 @@ DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME; ExReleaseResourceLite (&DeviceExt->VcbResource); + FsRtlExitFileSystem(); return Status; }

15 years, 1 month

[tkreuzer] 43981: Update forwarder entries in kernel32.pspec

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 5 23:04:28 2009 New Revision: 43981 URL: http://svn.reactos.org/svn/reactos?rev=43981&view=rev Log: Update forwarder entries in kernel32.pspec Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Nov 5 23:04:28 2009 @@ -72,7 +72,7 @@ @ stdcall CancelIo(long) @ stdcall CancelIoEx(long ptr) @ stdcall CancelSynchronousIo(long) -;@ stdcall CancelThreadpoolIo ; Win 7 +;@ stdcall CancelThreadpoolIo(ptr) ntdll.TpCancelAsyncIoOperation; Win 7 @ stdcall CancelTimerQueueTimer(long long) @ stdcall CancelWaitableTimer(long) @ stdcall ChangeTimerQueueTimer(long long long long) @@ -89,13 +89,13 @@ ;@ stdcall ClosePrivateNamespace ; Win 7 @ stdcall CloseProfileUserMapping() @ stub CloseSystemHandle ; missing in XP SP3 and Win 7 -;@ stdcall CloseThreadpool ; Win 7 -;@ stdcall CloseThreadpoolCleanupGroup ; Win 7 -;@ stdcall CloseThreadpoolCleanupGroupMembers ; Win 7 -;@ stdcall CloseThreadpoolIo ; Win 7 -;@ stdcall CloseThreadpoolTimer ; Win 7 -;@ stdcall CloseThreadpoolWait ; Win 7 -;@ stdcall CloseThreadpoolWork ; Win 7 +;@ stdcall CloseThreadpool(ptr) ntdll.TpReleasePool ; Win 7 +;@ stdcall CloseThreadpoolCleanupGroup(ptr) ntdll.TpReleaseCleanupGroup ; Win 7 +;@ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) ntdll.TpReleaseCleanupGroupMembers ; Win 7 +;@ stdcall CloseThreadpoolIo ntdll.TpReleaseIoCompletion ; Win 7 +;@ stdcall CloseThreadpoolTimer ntdll.TpReleaseTimer ; Win 7 +;@ stdcall CloseThreadpoolWait ntdll.TpReleaseWait ; Win 7 +;@ stdcall CloseThreadpoolWork ntdll.TpReleaseWork ; Win 7 @ stdcall CmdBatNotification(long) @ stdcall CommConfigDialogA(str long ptr) @ stdcall CommConfigDialogW(wstr long ptr) @@ -178,7 +178,7 @@ @ stdcall CreateProcessInternalWSecure() ; missing in Win 7 @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) -;@ stdcall CreateRemoteThreadEx ; Win 7 +;@ stdcall CreateRemoteThreadEx api-ms-win-core-processthreads-l1-1-0.CreateRemoteThreadEx ; Win 7 @ stdcall CreateSemaphoreA(ptr long long str) @ stdcall CreateSemaphoreExA(ptr long long str long long) @ stdcall CreateSemaphoreExW(ptr long long wstr long long) @@ -219,14 +219,14 @@ @ stdcall DefineDosDeviceW(long wstr wstr) @ stdcall DelayLoadFailureHook(str str) @ stdcall DeleteAtom(long) -;@ stdcall DeleteBoundaryDescriptor ; Win 7 +;@ stdcall DeleteBoundaryDescriptor ntdll.RtlDeleteBoundaryDescriptor ; Win 7 @ stdcall DeleteCriticalSection(ptr) ntdll.RtlDeleteCriticalSection @ stdcall DeleteFiber(ptr) @ stdcall DeleteFileA(str) ;@ stdcall DeleteFileTransactedA ; Win 7 ;@ stdcall DeleteFileTransactedW ; Win 7 @ stdcall DeleteFileW(wstr) -;@ stdcall DeleteProcThreadAttributeList ; Win 7 +;@ stdcall DeleteProcThreadAttributeList api-ms-win-core-processthreads-l1-1-0.DeleteProcThreadAttributeList ; Win 7 @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) @@ -238,7 +238,7 @@ @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) @ stdcall DisableThreadLibraryCalls(long) ;@ stdcall DisableThreadProfiling ; Win 7 -;@ stdcall DisassociateCurrentThreadFromCallback ; Win 7 +;@ stdcall DisassociateCurrentThreadFromCallback ntdll.TpDisassociateCallback ; Win 7 @ stdcall DisconnectNamedPipe(long) @ stdcall DnsHostnameToComputerNameA (str ptr ptr) @ stdcall DnsHostnameToComputerNameW (wstr ptr ptr) @@ -296,8 +296,8 @@ @ stdcall EnumerateLocalComputerNamesW(ptr long wstr ptr) @ stdcall EraseTape(ptr long long) @ stdcall EscapeCommFunction(long long) -@ stdcall ExitProcess(long) -@ stdcall ExitThread(long) +@ stdcall ExitProcess(long) ; FIXME: ntdll.RtlExitUserProcess +@ stdcall ExitThread(long) ; FIXME: ntdll.RtlExitUserThread @ stdcall ExitVDM(long long) @ stdcall ExpandEnvironmentStringsA(str ptr long) @ stdcall ExpandEnvironmentStringsW(wstr ptr long) @@ -361,7 +361,7 @@ @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) -;@ stdcall FlushProcessWriteBuffers ; Win 7 +;@ stdcall FlushProcessWriteBuffers ntdll.NtFlushProcessWriteBuffers ; Win 7 @ stdcall FlushViewOfFile(ptr long) @ stdcall FoldStringA(long str long ptr long) @ stdcall FoldStringW(long wstr long ptr long) @@ -372,7 +372,7 @@ @ stdcall FreeEnvironmentStringsW(ptr) @ stdcall FreeLibrary(long) @ stdcall FreeLibraryAndExitThread(long long) -;@ stdcall FreeLibraryWhenCallbackReturns ; Win 7 +;@ stdcall FreeLibraryWhenCallbackReturns ntdll.TpCallbackUnloadDllOnCompletion ; Win 7 @ stdcall FreeResource(long) @ stdcall FreeUserPhysicalPages(long long long) @ stdcall FreeVirtualBuffer(ptr) ; missing in Win 7 @@ -469,7 +469,7 @@ @ stdcall GetCurrentProcess() @ stdcall GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.RtlGetCurrentProcessorNumber -;@ stdcall GetCurrentProcessorNumberEx ; Win 7 +;@ stdcall GetCurrentProcessorNumberEx ntdll.RtlGetCurrentProcessorNumberEx ; Win 7 @ stdcall GetCurrentThread() @ stdcall GetCurrentThreadId() ;@ stdcall GetCurrentUmsThread @@ -491,8 +491,8 @@ @ stdcall GetDriveTypeW(wstr) ;@ stdcall GetDurationFormat ; Win 7 ;@ stdcall GetDurationFormatEx ; Win 7 -;@ stdcall GetDynamicTimeZoneInformation -;@ stdcall GetEnabledExtendedFeatures +;@ stdcall GetDynamicTimeZoneInformation ; Win 7 +;@ stdcall GetEnabledExtendedFeatures api-ms-win-core-xstate-l1-1-0.RtlGetEnabledExtendedFeatures ; Win 7 @ stdcall GetEnvironmentStrings() @ stdcall GetEnvironmentStringsA() GetEnvironmentStrings @ stdcall GetEnvironmentStringsW() @@ -505,7 +505,7 @@ @ stdcall GetExpandedNameA(str ptr) @ stdcall GetExpandedNameW(wstr ptr) ;@ stdcall GetExtendedContextLength ; Win 7 -;@ stdcall GetExtendedFeaturesMask ; Win 7 +;@ stdcall GetExtendedFeaturesMask api-ms-win-core-xstate-l1-1-0.RtlGetExtendedFeaturesMask ; Win 7 @ stdcall GetFileAttributesA(str) @ stdcall GetFileAttributesByHandle(long ptr long) ; missing in Win 7 @ stdcall GetFileAttributesExA(str long ptr) @@ -548,7 +548,7 @@ @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives() @ stdcall GetLogicalProcessorInformation(ptr ptr) -;@ stdcall GetLogicalProcessorInformationEx ; Win 7 +;@ stdcall GetLogicalProcessorInformationEx api-ms-win-core-sysinfo-l1-1-0.GetLogicalProcessorInformationEx ; Win 7 @ stdcall GetLongPathNameA (str long long) ;@ stdcall GetLongPathNameTransactedA ; Win 7 ;@ stdcall GetLongPathNameTransactedW ; Win 7 @@ -775,13 +775,13 @@ ;@ stdcall InitOnceBeginInitialize ; Win 7 ;@ stdcall InitOnceComplete ; Win 7 ;@ stdcall InitOnceExecuteOnce ; Win 7 -;@ stdcall InitOnceInitialize ; Win 7 -;@ stdcall InitializeConditionVariable ; Win 7 -@ stdcall InitializeCriticalSection(ptr) +;@ stdcall InitOnceInitialize ntdll.RtlRunOnceInitialize ; Win 7 +;@ stdcall InitializeConditionVariable ntdll.RtlInitializeConditionVariable ; Win 7 +@ stdcall InitializeCriticalSection(ptr) ; FIXME: ntdll.RtlInitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) ;@ stdcall InitializeCriticalSectionEx(ptr long long) ; missing in XP SP3 ;@ stdcall InitializeExtendedContext ; Win 7 -;@ stdcall InitializeProcThreadAttributeList ; Win 7 +;@ stdcall InitializeProcThreadAttributeList api-ms-win-core-processthreads-l1-1-0.InitializeProcThreadAttributeList ; Win 7 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock @ stdcall InterlockedCompareExchange(ptr long long) ; missing in Win 7 x64 @@ -793,7 +793,7 @@ @ stdcall InterlockedIncrement(ptr) ; missing in Win 7 x64 @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList -;@ stdcall InterlockedPushListSList ; Win 7 +;@ stdcall InterlockedPushListSList ntdll.RtlInterlockedPushListSList ; Win 7 @ stdcall InvalidateConsoleDIBits(long long) @ stub InvalidateNSCache ; missing in XP SP3 and Win 7 @ stdcall IsBadCodePtr(ptr) @@ -815,7 +815,7 @@ @ stdcall IsProcessorFeaturePresent(long) @ stdcall IsSystemResumeAutomatic() ;@ stdcall IsThreadAFiber ; Win 7 -;@ stdcall IsThreadpoolTimerSet ; Win 7 +;@ stdcall IsThreadpoolTimerSet ntdll.TpIsTimerSet ; Win 7 ;@ stdcall IsTimeZoneRedirectionEnabled ; Win 7 ;@ stdcall IsValidCalDateTime ; Win 7 @ stdcall IsValidCodePage(long) @@ -867,7 +867,7 @@ @ stdcall LZSeek(long long long) ;check @ stdcall LZStart() @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection -;@ stdcall LeaveCriticalSectionWhenCallbackReturns ; Win 7 +;@ stdcall LeaveCriticalSectionWhenCallbackReturns ntdll.TpCallbackLeaveCriticalSectionOnCompletion ; Win 7 ;@ stdcall LoadAppInitDlls ; Win 7 @ stdcall LoadLibraryA(str) @ stdcall LoadLibraryExA( str long long) @@ -889,8 +889,8 @@ @ stdcall LocalSize(long) @ stdcall LocalUnlock(long) @ stub LocaleNameToLCID ; missing in XP SP3 -;@ stdcall LocateExtendedFeature ; Win 7 -;@ stdcall LocateLegacyContext ; Win 7 +;@ stdcall LocateExtendedFeature api-ms-win-core-xstate-l1-1-0.RtlLocateExtendedFeature ; Win 7 +;@ stdcall LocateLegacyContext api-ms-win-core-xstate-l1-1-0.RtlLocateLegacyContext ; Win 7 @ stdcall LockFile(long long long long long) @ stdcall LockFileEx(long long long long long ptr) @ stdcall LockResource(long) @@ -943,12 +943,12 @@ ;@ stdcall OpenPrivateNamespaceA ; Win 7 ;@ stdcall OpenPrivateNamespaceW ; Win 7 @ stdcall OpenProcess(long long long) -;@ stdcall OpenProcessToken ; Win 7 +;@ stdcall OpenProcessToken api-ms-win-core-processthreads-l1-1-0.OpenProcessToken ; Win 7 @ stdcall OpenProfileUserMapping() @ stdcall OpenSemaphoreA(long long str) @ stdcall OpenSemaphoreW(long long wstr) @ stdcall OpenThread(long long long) -;@ stdcall OpenThreadToken +;@ stdcall OpenThreadToken api-ms-win-core-processthreads-l1-1-0.OpenThreadToken ; win 7 @ stdcall OpenWaitableTimerA(long long str) @ stdcall OpenWaitableTimerW(long long wstr) @ stdcall OutputDebugStringA(str) @@ -1071,11 +1071,11 @@ @ stdcall RegisterWowExec(long) ;@ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseMutex(long) -;@ stdcall ReleaseMutexWhenCallbackReturns ; Win 7 +;@ stdcall ReleaseMutexWhenCallbackReturns ntdll.TpCallbackReleaseMutexOnCompletion ; Win 7 @ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive @ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared @ stdcall ReleaseSemaphore(long long ptr) -;@ stdcall ReleaseSemaphoreWhenCallbackReturns ; Win 7 +;@ stdcall ReleaseSemaphoreWhenCallbackReturns ntdll.TpCallbackReleaseSemaphoreOnCompletion ; Win 7 @ stdcall RemoveDirectoryA(str) ;@ stdcall RemoveDirectoryTransactedA ; Win 7 ;@ stdcall RemoveDirectoryTransactedW ; Win 7 @@ -1180,8 +1180,8 @@ @ stdcall SetEnvironmentVariableW(wstr wstr) @ stdcall SetErrorMode(long) @ stdcall SetEvent(long) -;@ stdcall SetEventWhenCallbackReturns ; Win 7 -;@ stdcall SetExtendedFeaturesMask ; Win 7 +;@ stdcall SetEventWhenCallbackReturns ntdll.TpCallbackSetEventOnCompletion ; Win 7 +;@ stdcall SetExtendedFeaturesMask api-ms-win-core-xstate-l1-1-0.RtlSetExtendedFeaturesMask ; Win 7 @ stdcall SetFileApisToANSI() @ stdcall SetFileApisToOEM() @ stdcall SetFileAttributesA(str long) @@ -1246,13 +1246,13 @@ @ stdcall SetThreadPriority(long long) @ stdcall SetThreadPriorityBoost(long long) ;@ stdcall SetThreadStackGuarantee ; Win 7 -;@ stdcall SetThreadToken ; Win 7 +;@ stdcall SetThreadToken api-ms-win-core-processthreads-l1-1-0.SetThreadToken ; Win 7 @ stdcall SetThreadUILanguage(long) ;@ stdcall SetThreadpoolStackInformation ; Win 7 -;@ stdcall SetThreadpoolThreadMaximum ; Win 7 +;@ stdcall SetThreadpoolThreadMaximum ntdll.TpSetPoolMaxThreads ; Win 7 ;@ stdcall SetThreadpoolThreadMinimum ; Win 7 -;@ stdcall SetThreadpoolTimer ; Win 7 -;@ stdcall SetThreadpoolWait ; Win 7 +;@ stdcall SetThreadpoolTimer ntdll.TpSetTimer ; Win 7 +;@ stdcall SetThreadpoolWait ntdll.TpSetWait ; Win 7 @ stdcall SetTimeZoneInformation(ptr) @ stdcall SetTimerQueueTimer(long ptr ptr long long long) ;@ stdcall -arch?x86_64 SetUmsThreadInformation @@ -1264,7 +1264,7 @@ @ stdcall SetVolumeMountPointA(str str) @ stdcall SetVolumeMountPointW(wstr wstr) @ stdcall SetWaitableTimer(long ptr long ptr ptr long) -;@ stdcall SetWaitableTimerEx ; Win 7 +;@ stdcall SetWaitableTimerEx api-ms-win-core-threadpool-l1-1-0.SetWaitableTimerEx ; Win 7 @ stdcall SetupComm(long long long) @ stdcall ShowConsoleCursor(long long) @ stdcall SignalObjectAndWait(long long long long) @@ -1275,8 +1275,8 @@ @ stdcall SleepEx(long long) ;@ stdcall SortCloseHandle ; Win 7 ;@ stdcall SortGetHandle ; Win 7 -;@ stdcall StartThreadpoolIo ; Win 7 -;@ stdcall SubmitThreadpoolWork ; Win 7 +;@ stdcall StartThreadpoolIo ntdll.TpStartAsyncIoOperation ; Win 7 +;@ stdcall SubmitThreadpoolWork ntdll.TpPostWork ; Win 7 @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) @ stdcall SwitchToThread() @@ -1298,8 +1298,8 @@ @ stdcall TransactNamedPipe(long ptr long ptr long ptr ptr) @ stdcall TransmitCommChar(long long) @ stdcall TrimVirtualBuffer(ptr) ; missing in Win 7 -;@ stdcall TryAcquireSRWLockExclusive ; Win 7 -;@ stdcall TryAcquireSRWLockShared ; Win 7 +;@ stdcall TryAcquireSRWLockExclusive ntdll.RtlTryAcquireSRWLockExclusive ; Win 7 +;@ stdcall TryAcquireSRWLockShared ntdll.RtlTryAcquireSRWLockShared ; Win 7 @ stdcall TryEnterCriticalSection(ptr) ntdll.RtlTryEnterCriticalSection ;@ stdcall TrySubmitThreadpoolCallback ; Win 7 @ stdcall TzSpecificLocalTimeToSystemTime(ptr ptr ptr) @@ -1316,7 +1316,7 @@ @ stdcall UnregisterWait(long) @ stdcall UnregisterWaitEx(long long) ;@ stdcall UpdateCalendarDayOfWeek ; Win 7 -;@ stdcall UpdateProcThreadAttribute ; Win 7 +;@ stdcall UpdateProcThreadAttribute api-ms-win-core-processthreads-l1-1-0.UpdateProcThreadAttribute ; Win 7 @ stdcall UpdateResourceA(long str str long ptr long) @ stdcall UpdateResourceW(long wstr wstr long ptr long) @ stdcall VDMConsoleOperation(long long) @@ -1349,10 +1349,10 @@ @ stdcall WaitForMultipleObjectsEx(long ptr long long long) @ stdcall WaitForSingleObject(long long) @ stdcall WaitForSingleObjectEx(long long long) -;@ stdcall WaitForThreadpoolIoCallbacks ; Win 7 -;@ stdcall WaitForThreadpoolTimerCallbacks ; Win 7 -;@ stdcall WaitForThreadpoolWaitCallbacks ; Win 7 -;@ stdcall WaitForThreadpoolWorkCallbacks ; Win 7 +;@ stdcall WaitForThreadpoolIoCallbacks ntdll.TpWaitForIoCompletion ; Win 7 +;@ stdcall WaitForThreadpoolTimerCallbacks ntdll.TpWaitForTimer ; Win 7 +;@ stdcall WaitForThreadpoolWaitCallbacks ntdll.TpWaitForWait ; Win 7 +;@ stdcall WaitForThreadpoolWorkCallbacks ntdll.TpWaitForWork ; Win 7 @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) @ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable @@ -1408,9 +1408,9 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall WTSGetActiveConsoleSessionId() ; missing in win 7 ;@ stdcall ZombifyActCtx(ptr) -;@ stdcall -arch=x86_64 __C_specific_handler -;@ stdcall -arch=x86_64 __chkstk -;@ stdcall -arch=x86_64 __misaligned_access +;@ stdcall -arch=x86_64 __C_specific_handler ntdll.__C_specific_handler +;@ stdcall -arch=x86_64 __chkstk ntdll.__chkstk +;@ stdcall -arch=x86_64 __misaligned_access ntdll.__misaligned_access @ stub _DebugOut ; missing in XP SP3 and Win 7 @ stub _DebugPrintf ; missing in XP SP3 and Win 7 @ stdcall _hread(long ptr long) @@ -1418,7 +1418,7 @@ @ stdcall _lclose(long) @ stdcall _lcreat(str long) @ stdcall _llseek(long long long) -;@ stdcall -arch=x86_64 _local_unwind ; Win 7 +;@ stdcall -arch=x86_64 _local_unwind ntdll._local_unwind; Win 7 @ stdcall _lopen(str long) @ stdcall _lread(long ptr long) _hread @ stdcall _lwrite(long ptr long) _hwrite

15 years, 1 month

[tkreuzer] 43980: use RtlPcToFileHeader instead of RtlpLookupModuleBase

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 5 21:57:53 2009 New Revision: 43980 URL: http://svn.reactos.org/svn/reactos?rev=43980&view=rev Log: use RtlPcToFileHeader instead of RtlpLookupModuleBase Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Thu Nov 5 21:57:53 2009 @@ -384,63 +384,6 @@ return NULL; } - -PVOID -NTAPI -RtlpLookupModuleBase( - PVOID Address) -{ - NTSTATUS Status; - MEMORY_BASIC_INFORMATION MemoryInformation; - ULONG_PTR Base, Limit; - PIMAGE_DOS_HEADER DosHeader; - PIMAGE_NT_HEADERS NtHeader; - - Status = NtQueryVirtualMemory(NtCurrentProcess(), - Address, - MemoryBasicInformation, - &MemoryInformation, - sizeof(MEMORY_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - /* FIXME: remove these checks? */ - Base = (ULONG_PTR)MemoryInformation.BaseAddress; - Limit = Base + MemoryInformation.RegionSize; - if ( ((ULONG_PTR)Address < Base) || - ((ULONG_PTR)Address >= Limit) ) - { - /* WTF? */ - return NULL; - } - - /* Check if we got the right kind of memory */ - if ( (MemoryInformation.State != MEM_COMMIT) || - (MemoryInformation.Type != MEM_IMAGE) ) - { - return NULL; - } - - /* Check DOS magic */ - DosHeader = MemoryInformation.AllocationBase; - if (DosHeader->e_magic != IMAGE_DOS_MAGIC) - { - return NULL; - } - - /* Check NT header */ - NtHeader = (PVOID)((ULONG_PTR)DosHeader + DosHeader->e_lfanew); - if (NtHeader->Signature != IMAGE_PE_MAGIC) - { - return NULL; - } - - return MemoryInformation.AllocationBase; -} - /* * Ldr Resource support code Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Thu Nov 5 21:57:53 2009 @@ -58,11 +58,6 @@ */ } UNWIND_INFO, *PUNWIND_INFO; -PVOID -NTAPI -RtlpLookupModuleBase( - PVOID Address); - /* FUNCTIONS *****************************************************************/ PRUNTIME_FUNCTION @@ -77,8 +72,7 @@ PIMAGE_DATA_DIRECTORY Directory; /* Find ModuleBase */ - DosHeader = RtlpLookupModuleBase((PVOID)ControlPc); - if (!DosHeader) + if (!RtlPcToFileHeader((PVOID)ControlPc, (PVOID*)&DosHeader)) { return NULL; } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Thu Nov 5 21:57:53 2009 @@ -30,26 +30,26 @@ PVOID NTAPI -RtlpLookupModuleBase( - PVOID Address) +RtlPcToFileHeader( + IN PVOID PcValue, + OUT PVOID *BaseOfImage) { PLDR_DATA_TABLE_ENTRY LdrEntry; BOOLEAN InSystem; - PVOID p; /* Get the base for this file */ - if ((ULONG_PTR)Address > (ULONG_PTR)MmHighestUserAddress) + if ((ULONG_PTR)PcValue > (ULONG_PTR)MmHighestUserAddress) { /* We are in kernel */ - p = KiPcToFileHeader(Address, &LdrEntry, FALSE, &InSystem); + *BaseOfImage = KiPcToFileHeader(PcValue, &LdrEntry, FALSE, &InSystem); } else { /* We are in user land */ - p = KiRosPcToUserFileHeader(Address, &LdrEntry); - } - - return p; + *BaseOfImage = KiRosPcToUserFileHeader(PcValue, &LdrEntry); + } + + return *BaseOfImage; } VOID

15 years, 1 month

[tkreuzer] 43979: Update kernel32.pspec based on Win7 32 and 64 bit, most stuff commented out so far.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 5 21:35:08 2009 New Revision: 43979 URL: http://svn.reactos.org/svn/reactos?rev=43979&view=rev Log: Update kernel32.pspec based on Win7 32 and 64 bit, most stuff commented out so far. Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Nov 5 21:35:08 2009 @@ -5,14 +5,21 @@ @ stdcall AddAtomW(wstr) @ stdcall AddConsoleAliasA(str str str) ;check @ stdcall AddConsoleAliasW(wstr wstr wstr) ;check +;@ stdcall -arch=x86_64 AddIntegrityLabelToBoundaryDescriptor ; Win 7 @ stdcall AddLocalAlternateComputerNameA(str ptr) @ stdcall AddLocalAlternateComputerNameW(wstr ptr) ;@ stdcall AddRefActCtx(ptr) +;@ stdcall AddSIDToBoundaryDescriptor ; Win 7 +;@ stdcall AddSecureMemoryCacheCallback ; Win 7 @ stdcall AddVectoredContinueHandler(long ptr) ntdll.RtlAddVectoredContinueHandler @ stdcall AddVectoredExceptionHandler(long ptr) ntdll.RtlAddVectoredExceptionHandler +;@ stdcall AdjustCalendarDate ; Win 7 @ stdcall AllocConsole() -@ stub AllocLSCallback ; missing in XP SP3 and 2003 R2 +@ stub AllocLSCallback ; missing in XP SP3 and 2003 R2 and Win 7 @ stdcall AllocateUserPhysicalPages(long ptr ptr) +;@ stdcall AllocateUserPhysicalPagesNuma ; Win 7 +;@ stdcall ApplicationRecoveryFinished ; Win 7 +;@ stdcall ApplicationRecoveryInProgress ; Win 7 @ stdcall AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) @ stdcall AttachConsole(long) @@ -20,18 +27,36 @@ @ stdcall BackupSeek(ptr long long ptr ptr ptr) @ stdcall BackupWrite(ptr ptr long ptr long long ptr) @ stdcall BaseCheckAppcompatCache(long long long ptr) ;check +;@ stdcall BaseCheckAppcompatCacheEx ; Win7 @ stub BaseCheckRunApp -@ stdcall BaseCleanupAppcompatCache() +@ stdcall BaseCleanupAppcompatCache() ; missing in Win 7 @ stdcall BaseCleanupAppcompatCacheSupport(ptr) +;@ stdcall BaseDllReadWriteIniFile ; Win 7 @ stdcall BaseDumpAppcompatCache() @ stdcall BaseFlushAppcompatCache() -@ stdcall BaseInitAppcompatCache() +;@ stdcall BaseFormatObjectAttributes ; Win 7 +;@ stdcall BaseFormatTimeOut ; Win 7 +;@ stdcall BaseGenerateAppCompatData ; Win 7 +;@ stdcall BaseGetNamedObjectDirectory ; Win 7 +@ stdcall BaseInitAppcompatCache() ; missing in Win 7 @ stdcall BaseInitAppcompatCacheSupport() -@ stdcall BaseProcessInitPostImport() +;@ stdcall BaseIsAppcompatInfrastructureDisabled ; Win 7 +@ stdcall BaseProcessInitPostImport() ; missing in Win 7 @ stdcall BaseQueryModuleData(str str ptr ptr ptr) ;check +;@ stdcall BaseThreadInitThunk ; Win 7 +;@ stdcall BaseSetLastNTError ; Win 7, not 64 bit @ stdcall BaseUpdateAppcompatCache(long long long) +;@ stdcall BaseVerifyUnicodeString ; Win 7 +;@ stdcall Basep8BitStringToDynamicUnicodeString ; Win 7 +;@ stdcall BasepAllocateActivationContextActivationBlock ; Win 7 +;@ stdcall BasepAnsiStringToDynamicUnicodeString ; Win 7 +;@ stdcall BasepCheckAppCompat ; Win 7 +;@ stdcall BasepCheckBadapp ; Win 7 @ stub BasepCheckWinSaferRestrictions -@ stub BasepDebugDump ; missing in XP SP3 +@ stub BasepDebugDump ; missing in XP SP3 and Win 7 +;@ stdcall BasepFreeActivationContextActivationBlock ; Win 7 +;@ stdcall BasepFreeAppCompatData ; Win 7 +;@ stdcall BasepMapModuleHandle ; Win 7 @ stdcall Beep(long long) @ stdcall BeginUpdateResourceA(str long) @ stdcall BeginUpdateResourceW(wstr long) @@ -42,13 +67,18 @@ @ stdcall BuildCommDCBW(wstr ptr) @ stdcall CallNamedPipeA(str ptr long ptr long ptr long) @ stdcall CallNamedPipeW(wstr ptr long ptr long ptr long) +;@ stdcall CallbackMayRunLong ; Win 7 @ stdcall CancelDeviceWakeupRequest(long) @ stdcall CancelIo(long) @ stdcall CancelIoEx(long ptr) @ stdcall CancelSynchronousIo(long) +;@ stdcall CancelThreadpoolIo ; Win 7 @ stdcall CancelTimerQueueTimer(long long) @ stdcall CancelWaitableTimer(long) @ stdcall ChangeTimerQueueTimer(long long long long) +;@ stdcall CheckElevation ; Win 7 +;@ stdcall CheckElevationEnabled ; Win 7 +;@ stdcall CheckForReadOnlyResource ; Win 7 @ stdcall CheckNameLegalDOS8Dot3A(str str long long long) @ stdcall CheckNameLegalDOS8Dot3W(wstr str long long long) @ stdcall CheckRemoteDebuggerPresent(long ptr) @@ -56,81 +86,127 @@ @ stdcall ClearCommError(long ptr ptr) @ stdcall CloseConsoleHandle(long) @ stdcall CloseHandle(long) +;@ stdcall ClosePrivateNamespace ; Win 7 @ stdcall CloseProfileUserMapping() -@ stub CloseSystemHandle ; missing in XP SP3 +@ stub CloseSystemHandle ; missing in XP SP3 and Win 7 +;@ stdcall CloseThreadpool ; Win 7 +;@ stdcall CloseThreadpoolCleanupGroup ; Win 7 +;@ stdcall CloseThreadpoolCleanupGroupMembers ; Win 7 +;@ stdcall CloseThreadpoolIo ; Win 7 +;@ stdcall CloseThreadpoolTimer ; Win 7 +;@ stdcall CloseThreadpoolWait ; Win 7 +;@ stdcall CloseThreadpoolWork ; Win 7 @ stdcall CmdBatNotification(long) @ stdcall CommConfigDialogA(str long ptr) @ stdcall CommConfigDialogW(wstr long ptr) +;@ stdcall CompareCalendarDates ; Win 7 @ stdcall CompareFileTime(ptr ptr) @ stdcall CompareStringA(long long str long str long) +;@ stdcall CompareStringEx ; Win 7 +;@ stdcall CompareStringOrdinal ; Win 7 @ stdcall CompareStringW(long long wstr long wstr long) @ stdcall ConnectNamedPipe(long ptr) @ stdcall ConsoleMenuControl(long long long) -@ stub ConsoleSubst ; missing in XP SP3 +@ stub ConsoleSubst ; missing in XP SP3 and Win 7 @ stdcall ContinueDebugEvent(long long long) +;@ stdcall ConvertCalDateTimeToSystemTime ; Win 7 @ stdcall ConvertDefaultLocale (long) @ stdcall ConvertFiberToThread() +;@ stdcall ConvertNLSDayOfWeekToWin32DayOfWeek ; Win 7 +;@ stdcall ConvertSystemTimeToCalDateTime ; Win 7 @ stdcall ConvertThreadToFiber(ptr) @ stdcall ConvertThreadToFiberEx(ptr long) +;@ stdcall CopyExtendedContext ; Win 7 @ stdcall CopyFileA(str str long) @ stdcall CopyFileExA (str str ptr ptr ptr long) @ stdcall CopyFileExW (wstr wstr ptr ptr ptr long) +;@ stdcall CopyFileTransactedA ; Win 7 +;@ stdcall CopyFileTransactedW ; Win 7 @ stdcall CopyFileW(wstr wstr long) @ stdcall CopyLZFile(long long) LZCopy ;@ stdcall CreateActCtxA(ptr) ;@ stdcall CreateActCtxW(ptr) +;@ stdcall CreateBoundaryDescriptorA ; Win 7 +;@ stdcall CreateBoundaryDescriptorW ; Win 7 @ stdcall CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall CreateDirectoryA(str ptr) @ stdcall CreateDirectoryExA(str str ptr) @ stdcall CreateDirectoryExW(wstr wstr ptr) +;@ stdcall CreateDirectoryTransactedA ; Win 7 +;@ stdcall CreateDirectoryTransactedW ; Win 7 @ stdcall CreateDirectoryW(wstr ptr) @ stdcall CreateEventA(ptr long long str) +;@ stdcall CreateEventExA ; Win 7 +;@ stdcall CreateEventExW ; Win 7 @ stdcall CreateEventW(ptr long long wstr) @ stdcall CreateFiber(long ptr ptr) @ stdcall CreateFiberEx(long long long ptr ptr) @ stdcall CreateFileA(str long long ptr long long long) @ stdcall CreateFileMappingA(long ptr long long long str) +;@ stdcall CreateFileMappingNumaA ; Win 7 +;@ stdcall CreateFileMappingNumaW ; Win 7 @ stdcall CreateFileMappingW(long ptr long long long wstr) +;@ stdcall CreateFileTransactedA ; Win 7 +;@ stdcall CreateFileTransactedW ; Win 7 @ stdcall CreateFileW(wstr long long ptr long long long) @ stdcall CreateHardLinkA(str str ptr) +;@ stdcall CreateHardLinkTransactedA ; Win 7 +;@ stdcall CreateHardLinkTransactedW ; Win 7 @ stdcall CreateHardLinkW(wstr wstr ptr) @ stdcall CreateIoCompletionPort(long long long long) @ stdcall CreateJobObjectA(ptr str) @ stdcall CreateJobObjectW(ptr wstr) @ stdcall CreateJobSet(long ptr long) -@ stub CreateKernelThread ; missing in XP SP3 +@ stub CreateKernelThread ; missing in XP SP3 and Win 7 @ stdcall CreateMailslotA(ptr long long ptr) @ stdcall CreateMailslotW(ptr long long ptr) @ stdcall CreateMemoryResourceNotification(ptr) @ stdcall CreateMutexA(ptr long str) +;@ stdcall CreateMutexExA ; Win 7 +;@ stdcall CreateMutexExW ; Win 7 @ stdcall CreateMutexW(ptr long wstr) @ stdcall CreateNamedPipeA(str long long long long long long ptr) @ stdcall CreateNamedPipeW(wstr long long long long long long ptr) -@ stdcall CreateNlsSecurityDescriptor(ptr long long) +@ stdcall CreateNlsSecurityDescriptor(ptr long long) ; missing in Win 7 @ stdcall CreatePipe(ptr ptr ptr long) +;@ stdcall CreatePrivateNamespaceA ; Win 7 +;@ stdcall CreatePrivateNamespaceW ; Win 7 @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) +;@ stdcall CreateProcessAsUserW ; Win 7 @ stdcall CreateProcessInternalA(ptr str str ptr ptr long long ptr str ptr ptr long) @ stdcall CreateProcessInternalW(ptr wstr wstr ptr ptr long long ptr wstr ptr ptr long) -@ stdcall CreateProcessInternalWSecure() +@ stdcall CreateProcessInternalWSecure() ; missing in Win 7 @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) +;@ stdcall CreateRemoteThreadEx ; Win 7 @ stdcall CreateSemaphoreA(ptr long long str) -@ stdcall CreateSemaphoreW(ptr long long wstr) @ stdcall CreateSemaphoreExA(ptr long long str long long) @ stdcall CreateSemaphoreExW(ptr long long wstr long long) -@ stdcall CreateSocketHandle() +@ stdcall CreateSemaphoreW(ptr long long wstr) +@ stdcall CreateSocketHandle() ; missing in Win 7 64 bit @ stdcall CreateSymbolicLinkA(str str long) +;@ stdcall CreateSymbolicLinkTransactedA ; Win 7 +;@ stdcall CreateSymbolicLinkTransactedW ; Win 7 @ stdcall CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) +;@ stdcall CreateThreadpool ; Win 7 +;@ stdcall CreateThreadpoolCleanupGroup ; Win 7 +;@ stdcall CreateThreadpoolIo ; Win 7 +;@ stdcall CreateThreadpoolTimer ; Win 7 +;@ stdcall CreateThreadpoolWait ; Win 7 +;@ stdcall CreateThreadpoolWork ; Win 7 @ stdcall CreateTimerQueue () @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) -@ stdcall CreateVirtualBuffer(long long long) +;@ stdcall arch=x86_64 CreateUmsCompletionList +;@ stdcall arch=x86_64 CreateUmsThreadContext +@ stdcall CreateVirtualBuffer(long long long) ; missing in Win 7 @ stdcall CreateWaitableTimerA(ptr long str) -@ stdcall CreateWaitableTimerW(ptr long wstr) @ stdcall CreateWaitableTimerExA (ptr str long long) @ stdcall CreateWaitableTimerExW (ptr wstr long long) +@ stdcall CreateWaitableTimerW(ptr long wstr) +;@ stdcall CtrlRoutine ; Win 7 ;@ stdcall DeactivateActCtx(long ptr) @ stdcall DebugActiveProcess(long) @ stdcall DebugActiveProcessStop(long) @@ -143,17 +219,26 @@ @ stdcall DefineDosDeviceW(long wstr wstr) @ stdcall DelayLoadFailureHook(str str) @ stdcall DeleteAtom(long) +;@ stdcall DeleteBoundaryDescriptor ; Win 7 @ stdcall DeleteCriticalSection(ptr) ntdll.RtlDeleteCriticalSection @ stdcall DeleteFiber(ptr) @ stdcall DeleteFileA(str) +;@ stdcall DeleteFileTransactedA ; Win 7 +;@ stdcall DeleteFileTransactedW ; Win 7 @ stdcall DeleteFileW(wstr) +;@ stdcall DeleteProcThreadAttributeList ; Win 7 @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) +;@ stdcall -arch=x86_64 DeleteUmsCompletionList +;@ stdcall -arch=x86_64 DeleteUmsThreadContext @ stdcall DeleteVolumeMountPointA(str) ;check @ stdcall DeleteVolumeMountPointW(wstr) ;check +;@ stdcall -arch=x86_64 DequeueUmsCompletionListItems @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) @ stdcall DisableThreadLibraryCalls(long) +;@ stdcall DisableThreadProfiling ; Win 7 +;@ stdcall DisassociateCurrentThreadFromCallback ; Win 7 @ stdcall DisconnectNamedPipe(long) @ stdcall DnsHostnameToComputerNameA (str ptr ptr) @ stdcall DnsHostnameToComputerNameW (wstr ptr ptr) @@ -162,35 +247,48 @@ @ stdcall DosPathToSessionPathW(long wstr wstr) @ stdcall DuplicateConsoleHandle(long long long long) @ stdcall DuplicateHandle(long long long ptr long long long) +;@ stdcall EnableThreadProfiling ; Win 7 @ stdcall EncodePointer(ptr) ntdll.RtlEncodePointer @ stdcall EncodeSystemPointer(ptr) ntdll.RtlEncodeSystemPointer @ stdcall EndUpdateResourceA(long long) @ stdcall EndUpdateResourceW(long long) @ stdcall EnterCriticalSection(ptr) ntdll.RtlEnterCriticalSection +;@ stdcall -arch=x86_64 EnterUmsSchedulingMode @ stdcall EnumCalendarInfoA(ptr long long long) @ stdcall EnumCalendarInfoExA(ptr long long long) +;@ stdcall EnumCalendarInfoExEx ; Win 7 @ stdcall EnumCalendarInfoExW(ptr long long long) @ stdcall EnumCalendarInfoW(ptr long long long) @ stdcall EnumDateFormatsA(ptr long long) @ stdcall EnumDateFormatsExA(ptr long long) +;@ stdcall EnumDateFormatsExEx ; Win 7 @ stdcall EnumDateFormatsExW(ptr long long) @ stdcall EnumDateFormatsW(ptr long long) @ stdcall EnumLanguageGroupLocalesA(ptr long long ptr) @ stdcall EnumLanguageGroupLocalesW(ptr long long ptr) @ stdcall EnumResourceLanguagesA(long str str ptr long) +;@ stdcall EnumResourceLanguagesExA ; Win 7 +;@ stdcall EnumResourceLanguagesExW ; Win 7 @ stdcall EnumResourceLanguagesW(long wstr wstr ptr long) @ stdcall EnumResourceNamesA(long str ptr long) +;@ stdcall EnumResourceNamesExA ; Win 7 +;@ stdcall EnumResourceNamesExW ; Win 7 @ stdcall EnumResourceNamesW(long wstr ptr long) @ stdcall EnumResourceTypesA(long ptr long) +;@ stdcall EnumResourceTypesExA ; Win 7 +;@ stdcall EnumResourceTypesExW ; Win 7 @ stdcall EnumResourceTypesW(long ptr long) @ stdcall EnumSystemCodePagesA(ptr long) @ stdcall EnumSystemCodePagesW(ptr long) +;@ stdcall EnumSystemFirmwareTables ; Win 7 @ stdcall EnumSystemGeoID(long long ptr) @ stdcall EnumSystemLanguageGroupsA(ptr long ptr) @ stdcall EnumSystemLanguageGroupsW(ptr long ptr) @ stdcall EnumSystemLocalesA(ptr long) +;@ stdcall EnumSystemLocalesEx ; Win 7 @ stdcall EnumSystemLocalesW(ptr long) @ stdcall EnumTimeFormatsA(ptr long long) +;@ stdcall EnumTimeFormatsEx ; Win 7 @ stdcall EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesA(ptr long long) @ stdcall EnumUILanguagesW(ptr long long) @@ -205,7 +303,7 @@ @ stdcall ExpandEnvironmentStringsW(wstr ptr long) @ stdcall ExpungeConsoleCommandHistoryA(long) @ stdcall ExpungeConsoleCommandHistoryW(long) -@ stdcall ExtendVirtualBuffer(long long) +@ stdcall ExtendVirtualBuffer(long long) ; missing in Win 7 @ stdcall FatalAppExitA(long str) @ stdcall FatalAppExitW(long wstr) @ stdcall FatalExit(long) @@ -227,15 +325,24 @@ @ stdcall FindFirstFileA(str ptr) @ stdcall FindFirstFileExA(str long ptr long ptr long) @ stdcall FindFirstFileExW(wstr long ptr long ptr long) +;@ stdcall FindFirstFileNameTransactedW ; Win 7 +;@ stdcall FindFirstFileNameW ; Win 7 +;@ stdcall FindFirstFileTransactedA ; Win 7 +;@ stdcall FindFirstFileTransactedW ; Win 7 @ stdcall FindFirstFileW(wstr ptr) +;@ stdcall FindFirstStreamTransactedW ; Win 7 @ stdcall FindFirstStreamW(wstr ptr ptr long) @ stdcall FindFirstVolumeA(ptr long) @ stdcall FindFirstVolumeMountPointA(str ptr long) @ stdcall FindFirstVolumeMountPointW(wstr ptr long) @ stdcall FindFirstVolumeW(ptr long) +;@ stdcall FindNLSString ; Win 7 +;@ stdcall FindNLSStringEx ; Win 7 @ stdcall FindNextChangeNotification(long) @ stdcall FindNextFileA(long ptr) +;@ stdcall FindNextFileNameW ; Win 7 @ stdcall FindNextFileW(long ptr) +;@ stdcall FindNextStreamW ; Win 7 @ stdcall FindNextVolumeA(long ptr long) @ stdcall FindNextVolumeMountPointA(long str long) @ stdcall FindNextVolumeMountPointW(long wstr long) @@ -244,6 +351,7 @@ @ stdcall FindResourceExA(long str str long) @ stdcall FindResourceExW(long wstr wstr long) @ stdcall FindResourceW(long wstr wstr) +;@ stdcall FindStringOrdinal ; Win 7 @ stdcall FindVolumeClose(ptr) @ stdcall FindVolumeMountPointClose(ptr) ;@ stdcall FlsAlloc(ptr) ; missing in XP SP3 @@ -253,6 +361,7 @@ @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) +;@ stdcall FlushProcessWriteBuffers ; Win 7 @ stdcall FlushViewOfFile(ptr long) @ stdcall FoldStringA(long str long ptr long) @ stdcall FoldStringW(long wstr long ptr long) @@ -263,22 +372,35 @@ @ stdcall FreeEnvironmentStringsW(ptr) @ stdcall FreeLibrary(long) @ stdcall FreeLibraryAndExitThread(long long) +;@ stdcall FreeLibraryWhenCallbackReturns ; Win 7 @ stdcall FreeResource(long) @ stdcall FreeUserPhysicalPages(long long long) -@ stdcall FreeVirtualBuffer(ptr) +@ stdcall FreeVirtualBuffer(ptr) ; missing in Win 7 @ stdcall GenerateConsoleCtrlEvent(long long) @ stdcall GetACP() +;@ stdcall GetActiveProcessorCount ; Win 7 +;@ stdcall GetActiveProcessorGroupCount ; Win 7 +;@ stdcall GetApplicationRecoveryCallback ; Win 7 +;@ stdcall GetApplicationRestartSettings ; Win 7 @ stdcall GetAtomNameA(long ptr long) @ stdcall GetAtomNameW(long ptr long) @ stdcall GetBinaryType(str ptr) GetBinaryTypeA @ stdcall GetBinaryTypeA(str ptr) @ stdcall GetBinaryTypeW(wstr ptr) -@ stdcall GetCPFileNameFromRegistry(long wstr long) ;check +@ stdcall GetCPFileNameFromRegistry(long wstr long) ;check missing in Win 7 @ stdcall GetCPInfo(long ptr) @ stdcall GetCPInfoExA(long long ptr) @ stdcall GetCPInfoExW(long long ptr) +;@ stdcall GetCalendarDateFormat ; Win 7 +;@ stdcall GetCalendarDateFormatEx ; Win 7 +;@ stdcall GetCalendarDaysInMonth ; Win 7 +;@ stdcall GetCalendarDifferenceInDays ; Win 7 @ stdcall GetCalendarInfoA(long long long ptr long ptr) +;@ stdcall GetCalendarInfoEx ; Win 7 @ stdcall GetCalendarInfoW(long long long ptr long ptr) +;@ stdcall GetCalendarMonthsInYear ; Win 7 +;@ stdcall GetCalendarSupportedDateRange ; Win 7 +;@ stdcall GetCalendarWeekNumber ; Win 7 @ stdcall GetComPlusPackageInstallStatus() @ stdcall GetCommConfig(long ptr long) @ stdcall GetCommMask(long ptr) @@ -289,6 +411,8 @@ @ stdcall GetCommandLineA() @ stdcall GetCommandLineW() @ stdcall GetCompressedFileSizeA(long ptr) +;@ stdcall GetCompressedFileSizeTransactedA ; Win 7 +;@ stdcall GetCompressedFileSizeTransactedW ; Win 7 @ stdcall GetCompressedFileSizeW(long ptr) @ stdcall GetComputerNameA(ptr ptr) @ stdcall GetComputerNameExA(long ptr ptr) @@ -316,6 +440,7 @@ @ stdcall GetConsoleFontInfo(long long long ptr) @ stdcall GetConsoleFontSize(long long) @ stdcall GetConsoleHardwareState(long long ptr) +;@ stdcall GetConsoleHistoryInfo ; Win 7 @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @@ -323,30 +448,38 @@ @ stdcall GetConsoleKeyboardLayoutNameW(ptr) @ stdcall GetConsoleMode(long ptr) @ stdcall GetConsoleNlsMode(long ptr) +;@ stdcall GetConsoleOriginalTitleA ; Win 7 +;@ stdcall GetConsoleOriginalTitleW ; Win 7 @ stdcall GetConsoleOutputCP() -@ stub GetConsoleProcessList ; missing in XP SP3 +@ stub GetConsoleProcessList ; missing in XP SP3, present in Win 7 @ stdcall GetConsoleScreenBufferInfo(long ptr) +;@ stdcall GetConsoleScreenBufferInfoEx ; Win 7 @ stdcall GetConsoleSelectionInfo(ptr) @ stdcall GetConsoleTitleA(ptr long) @ stdcall GetConsoleTitleW(ptr long) @ stdcall GetConsoleWindow() @ stdcall GetCurrencyFormatA(long long str ptr str long) +;@ stdcall GetCurrencyFormatEx ; Win 7 @ stdcall GetCurrencyFormatW(long long str ptr str long) ;@ stdcall GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) +;@ stdcall GetCurrentConsoleFontEx ; Win 7 @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) @ stdcall GetCurrentProcess() @ stdcall GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.RtlGetCurrentProcessorNumber +;@ stdcall GetCurrentProcessorNumberEx ; Win 7 @ stdcall GetCurrentThread() @ stdcall GetCurrentThreadId() +;@ stdcall GetCurrentUmsThread @ stdcall GetDateFormatA(long long ptr str ptr long) +;@ stdcall GetDateFormatEx ; Win 7 @ stdcall GetDateFormatW(long long ptr wstr ptr long) -@ stub GetDaylightFlag ; missing in XP SP3 +@ stub GetDaylightFlag ; missing in XP SP3 and Win 7 @ stdcall GetDefaultCommConfigA(str ptr long) @ stdcall GetDefaultCommConfigW(wstr ptr long) -@ stdcall GetDefaultSortkeySize(ptr) +@ stdcall GetDefaultSortkeySize(ptr) ; missing in Win 7 @ stdcall GetDevicePowerState(long ptr) @ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) @ stdcall GetDiskFreeSpaceExA (str ptr ptr ptr) @@ -356,23 +489,35 @@ @ stdcall GetDllDirectoryW(long ptr) @ stdcall GetDriveTypeA(str) @ stdcall GetDriveTypeW(wstr) +;@ stdcall GetDurationFormat ; Win 7 +;@ stdcall GetDurationFormatEx ; Win 7 +;@ stdcall GetDynamicTimeZoneInformation +;@ stdcall GetEnabledExtendedFeatures @ stdcall GetEnvironmentStrings() @ stdcall GetEnvironmentStringsA() GetEnvironmentStrings @ stdcall GetEnvironmentStringsW() @ stdcall GetEnvironmentVariableA(str ptr long) @ stdcall GetEnvironmentVariableW(wstr ptr long) +;@ stdcall GetEraNameCountedString ; Win 7 @ stdcall GetErrorMode() @ stdcall GetExitCodeProcess(long ptr) @ stdcall GetExitCodeThread(long ptr) @ stdcall GetExpandedNameA(str ptr) @ stdcall GetExpandedNameW(wstr ptr) +;@ stdcall GetExtendedContextLength ; Win 7 +;@ stdcall GetExtendedFeaturesMask ; Win 7 @ stdcall GetFileAttributesA(str) -@ stdcall GetFileAttributesByHandle(long ptr long) +@ stdcall GetFileAttributesByHandle(long ptr long) ; missing in Win 7 @ stdcall GetFileAttributesExA(str long ptr) @ stdcall GetFileAttributesExW(wstr long ptr) +;@ stdcall GetFileAttributesTransactedA ; Win 7 +;@ stdcall GetFileAttributesTransactedW ; Win 7 @ stdcall GetFileAttributesW(wstr) @ stdcall GetFileBandwidthReservation(long ptr ptr ptr ptr ptr) @ stdcall GetFileInformationByHandle(long ptr) +;@ stdcall GetFileInformationByHandleEx ; Win 7 +;@ stdcall GetFileMUIInfo ; Win 7 +;@ stdcall GetFileMUIPath ; Win 7 @ stdcall GetFileSize(long ptr) @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) @@ -382,53 +527,78 @@ @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFullPathNameA(str long ptr ptr) +;@ stdcall GetFullPathNameTransactedA ; Win 7 +;@ stdcall GetFullPathNameTransactedW ; Win 7 @ stdcall GetFullPathNameW(wstr long ptr ptr) @ stdcall GetGeoInfoA(long long ptr long long) @ stdcall GetGeoInfoW(long long ptr long long) -@ stdcall GetHandleContext(long) +@ stdcall GetHandleContext(long) ; missing on x64 @ stdcall GetHandleInformation(long ptr) -@ stub GetSCallbackTarget ; missing in XP SP3 -@ stub GetSCallbackTemplate ; missing in XP SP3 +@ stub GetSCallbackTarget ; missing in XP SP3 and Win 7 +@ stub GetSCallbackTemplate ; missing in XP SP3 and Win 7 @ stdcall GetLargePageMinimum() @ stdcall GetLargestConsoleWindowSize(long) @ stdcall GetLastError() ntdll.RtlGetLastWin32Error -@ stdcall GetLinguistLangSize(ptr) +@ stdcall GetLinguistLangSize(ptr) ; missing in Win 7 @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) +@ stdcall GetLocaleInfoEx(wstr long wstr long) @ stdcall GetLocaleInfoW(long long ptr long) -@ stdcall GetLocaleInfoEx(wstr long wstr long) @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives() @ stdcall GetLogicalProcessorInformation(ptr ptr) +;@ stdcall GetLogicalProcessorInformationEx ; Win 7 @ stdcall GetLongPathNameA (str long long) +;@ stdcall GetLongPathNameTransactedA ; Win 7 +;@ stdcall GetLongPathNameTransactedW ; Win 7 @ stdcall GetLongPathNameW (wstr long long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) +;@ stdcall GetMaximumProcessorCount ; Win 7 +;@ stdcall GetMaximumProcessorGroupCount ; Win 7 @ stdcall GetModuleFileNameA(long ptr long) @ stdcall GetModuleFileNameW(long ptr long) @ stdcall GetModuleHandleA(str) @ stdcall GetModuleHandleExA(long ptr ptr) @ stdcall GetModuleHandleExW(long ptr ptr) @ stdcall GetModuleHandleW(wstr) +;@ stdcall GetNLSVersion ; Win 7 +;@ stdcall GetNLSVersionEx ; Win 7 +;@ stdcall GetNamedPipeAttribute ; Win 7 +;@ stdcall GetNamedPipeClientComputerNameA ; Win 7 +;@ stdcall GetNamedPipeClientComputerNameW ; Win 7 +;@ stdcall GetNamedPipeClientProcessId ; Win 7 +;@ stdcall GetNamedPipeClientSessionId ; Win 7 @ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) @ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) +;@ stdcall GetNamedPipeServerProcessId ; Win 7 +;@ stdcall GetNamedPipeServerSessionId ; Win 7 @ stdcall GetNativeSystemInfo(ptr) +;@ stdcall -arch=x86_64 GetNextUmsListItem @ stdcall GetNextVDMCommand(long) -@ stdcall GetNlsSectionName(long long double str str double) -@ stdcall GetNumaAvailableMemory(ptr double ptr) +@ stdcall GetNlsSectionName(long long double str str double) ; missing in Win 7 +@ stdcall GetNumaAvailableMemory(ptr double ptr) ; missing in Win 7 @ stdcall GetNumaAvailableMemoryNode(double ptr) +;@ stdcall GetNumaAvailableMemoryNodeEx ; Win 7 @ stdcall GetNumaHighestNodeNumber(ptr) +;@ stdcall GetNumaNodeNumberFromHandle ; Win 7 @ stdcall GetNumaNodeProcessorMask(double ptr) -@ stdcall GetNumaProcessorMap(ptr double ptr) +;@ stdcall GetNumaNodeProcessorMaskEx ; Win 7 +@ stdcall GetNumaProcessorMap(ptr double ptr) ; missing in Win 7 @ stdcall GetNumaProcessorNode(double ptr) +;@ stdcall GetNumaProcessorNodeEx ; Win 7 +;@ stdcall GetNumaProximityNode ; Win 7 +;@ stdcall GetNumaProximityNodeEx ; Win 7 @ stdcall GetNumberFormatA(long long str ptr ptr long) +;@ stdcall GetNumberFormatEx ; Win 7 @ stdcall GetNumberFormatW(long long wstr ptr ptr long) @ stdcall GetNumberOfConsoleFonts() @ stdcall GetNumberOfConsoleInputEvents(long ptr) @ stdcall GetNumberOfConsoleMouseButtons(ptr) @ stdcall GetOEMCP() @ stdcall GetOverlappedResult(long ptr ptr long) +;@ stdcall GetPhysicallyInstalledSystemMemory ; Win 7 @ stdcall GetPriorityClass(long) @ stdcall GetPrivateProfileIntA(str str long str) @ stdcall GetPrivateProfileIntW(wstr wstr long wstr) @@ -442,17 +612,24 @@ @ stdcall GetPrivateProfileStructW(wstr wstr ptr long wstr) @ stdcall GetProcAddress(long str) @ stdcall GetProcessAffinityMask(long ptr ptr) +;@ stdcall GetProcessDEPPolicy ; Win 7 +;@ stdcall GetProcessGroupAffinity ; Win 7 @ stdcall GetProcessHandleCount(long ptr) @ stdcall GetProcessHeap() @ stdcall GetProcessHeaps(long ptr) @ stdcall GetProcessId(long) +;@ stdcall GetProcessIdOfThread ; Win 7 @ stdcall GetProcessIoCounters(long ptr) +;@ stdcall GetProcessPreferredUILanguages ; Win 7 @ stdcall GetProcessPriorityBoost(long ptr) @ stdcall GetProcessShutdownParameters(ptr ptr) @ stdcall GetProcessTimes(long ptr ptr ptr ptr) @ stdcall GetProcessVersion(long) @ stdcall GetProcessWorkingSetSize(long ptr ptr) -@ stub GetProductName ; missing in XP SP3 +;@ stdcall GetProcessWorkingSetSizeEx ; Win 7 +;@ stdcall GetProcessorSystemCycleTime ; Win 7 +;@ stdcall GetProductInfo ; Win 7 +@ stub GetProductName ; missing in XP SP3 and Win 7 @ stdcall GetProfileIntA(str str long) @ stdcall GetProfileIntW(wstr wstr long) @ stdcall GetProfileSectionA(str ptr long) @@ -460,24 +637,31 @@ @ stdcall GetProfileStringA(str str str ptr long) @ stdcall GetProfileStringW(wstr wstr wstr ptr long) @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) -@ stub GetLSCallbackTarget ; missing in XP SP3 -@ stub GetLSCallbackTemplate ; missing in XP SP3 +;@ stdcall GetQueuedCompletionStatusEx ; Win 7 +@ stub GetLSCallbackTarget ; missing in XP SP3 and Win 7 +@ stub GetLSCallbackTemplate ; missing in XP SP3 and Win 7 @ stdcall GetShortPathNameA(str ptr long) @ stdcall GetShortPathNameW(wstr ptr long) @ stdcall GetStartupInfoA(ptr) @ stdcall GetStartupInfoW(ptr) @ stdcall GetStdHandle(long) +;@ stdcall GetStringScripts ; Win 7 @ stdcall GetStringTypeA(long long str long ptr) @ stdcall GetStringTypeExA(long long str long ptr) @ stdcall GetStringTypeExW(long long wstr long ptr) @ stdcall GetStringTypeW(long wstr long ptr) +;@ stdcall GetSystemDEPPolicy ; Win 7 @ stdcall GetSystemDefaultLCID() @ stdcall GetSystemDefaultLangID() +;@ stdcall GetSystemDefaultLocaleName ; Win 7 @ stdcall GetSystemDefaultUILanguage() @ stdcall GetSystemDirectoryA(ptr long) @ stdcall GetSystemDirectoryW(ptr long) +;@ stdcall GetSystemFileCacheSize ; Win 7 +;@ stdcall GetSystemFirmwareTable ; Win 7 @ stdcall GetSystemInfo(ptr) @ stdcall GetSystemPowerStatus(ptr) +;@ stdcall GetSystemPreferredUILanguages ; Win 7 @ stdcall GetSystemRegistryQuota(ptr ptr) @ stdcall GetSystemTime(ptr) @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) @@ -495,27 +679,40 @@ @ stdcall GetTempPathA(long ptr) @ stdcall GetTempPathW(long ptr) @ stdcall GetThreadContext(long ptr) +;@ stdcall GetThreadErrorMode ; Win 7 +;@ stdcall GetThreadGroupAffinity ; Win 7 +;@ stdcall GetThreadIOPendingFlag ; Win 7 @ stdcall GetThreadId(ptr) -@ stdcall GetThreadIOPendingFlag(long ptr) +;@ stdcall GetThreadIdealProcessorEx ; Win 7 +@ stdcall GetThreadIOPendingFlag(long ptr) ; missing in Win 7 @ stdcall GetThreadLocale() +;@ stdcall GetThreadPreferredUILanguages ; Win 7 @ stdcall GetThreadPriority(long) @ stdcall GetThreadPriorityBoost(long ptr) @ stdcall GetThreadSelectorEntry(long long ptr) @ stdcall GetThreadTimes(long ptr ptr ptr ptr) +;@ stdcall GetThreadUILanguage ; Win 7 @ stdcall GetTickCount() @ stdcall -ret64 GetTickCount64() @ stdcall GetTimeFormatA(long long ptr str ptr long) +;@ stdcall GetTimeFormatEx ; Win 7 @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @ stdcall GetTimeZoneInformation(ptr) +;@ stdcall GetTimeZoneInformationForYear ; Win 7 +;@ stdcall GetUILanguageInfo ; Win 7 +;@ stdcall -arch=x86_64 GetUmsCompletionListEvent @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() +;@ stdcall GetUserDefaultLocaleName ; Win 7 @ stdcall GetUserDefaultUILanguage() @ stdcall GetUserGeoID(long) +;@ stdcall GetUserPreferredUILanguages ; Win 7 @ stdcall GetVDMCurrentDirectories(long long) @ stdcall GetVersion() @ stdcall GetVersionExA(ptr) @ stdcall GetVersionExW(ptr) @ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) +;@ stdcall GetVolumeInformationByHandleW ; Win 7 @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) @ stdcall GetVolumeNameForVolumeMountPointA(str ptr long) @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) @@ -555,39 +752,50 @@ @ stdcall HeapAlloc(long long long) ntdll.RtlAllocateHeap @ stdcall HeapCompact(long long) @ stdcall HeapCreate(long long long) -@ stdcall HeapCreateTagsW(long long wstr wstr) +@ stdcall HeapCreateTagsW(long long wstr wstr) ; missing in Win 7 @ stdcall HeapDestroy(long) -@ stdcall HeapExtend(long long ptr long) +@ stdcall HeapExtend(long long ptr long) ; missing in Win 7 @ stdcall HeapFree(long long long) ntdll.RtlFreeHeap @ stdcall HeapLock(long) @ stdcall HeapQueryInformation(long long ptr long ptr) -@ stdcall HeapQueryTagW(long long long long ptr) +@ stdcall HeapQueryTagW(long long long long ptr) ; missing in Win 7 @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap -@ stub HeapSetFlags ; missing in XP SP3 +@ stub HeapSetFlags ; missing in XP SP3 and Win 7 @ stdcall HeapSetInformation(ptr long ptr long) @ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap @ stdcall HeapSummary(long long ptr) @ stdcall HeapUnlock(long) -@ stdcall HeapUsage(long long long long ptr) +@ stdcall HeapUsage(long long long long ptr) ; missing in Win 7 @ stdcall HeapValidate(long long ptr) @ stdcall HeapWalk(long ptr) +;@ stdcall IdnToAscii ; Win 7 +;@ stdcall IdnToNameprepUnicode ; Win 7 +;@ stdcall IdnToUnicode ; Win 7 @ stdcall InitAtomTable(long) +;@ stdcall InitOnceBeginInitialize ; Win 7 +;@ stdcall InitOnceComplete ; Win 7 +;@ stdcall InitOnceExecuteOnce ; Win 7 +;@ stdcall InitOnceInitialize ; Win 7 +;@ stdcall InitializeConditionVariable ; Win 7 @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) ;@ stdcall InitializeCriticalSectionEx(ptr long long) ; missing in XP SP3 +;@ stdcall InitializeExtendedContext ; Win 7 +;@ stdcall InitializeProcThreadAttributeList ; Win 7 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock -@ stdcall InterlockedCompareExchange(ptr long long) -@ stdcall InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 -@ stdcall InterlockedDecrement(ptr) -@ stdcall InterlockedExchange(ptr long) -@ stdcall InterlockedExchangeAdd (ptr long ) +@ stdcall InterlockedCompareExchange(ptr long long) ; missing in Win 7 x64 +@ stdcall InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 ; missing in Win7 x64 +@ stdcall InterlockedDecrement(ptr) ; missing in Win 7 x64 +@ stdcall InterlockedExchange(ptr long) ; missing in Win 7 x64 +@ stdcall InterlockedExchangeAdd (ptr long ) ; missing in Win 7 x64 @ stdcall InterlockedFlushSList(ptr) ntdll.RtlInterlockedFlushSList -@ stdcall InterlockedIncrement(ptr) +@ stdcall InterlockedIncrement(ptr) ; missing in Win 7 x64 @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList +;@ stdcall InterlockedPushListSList ; Win 7 @ stdcall InvalidateConsoleDIBits(long long) -@ stub InvalidateNSCache ; missing in XP SP3 +@ stub InvalidateNSCache ; missing in XP SP3 and Win 7 @ stdcall IsBadCodePtr(ptr) @ stdcall IsBadHugeReadPtr(ptr long) @ stdcall IsBadHugeWritePtr(ptr long) @@ -595,27 +803,80 @@ @ stdcall IsBadStringPtrA(ptr long) @ stdcall IsBadStringPtrW(ptr long) @ stdcall IsBadWritePtr(ptr long) +;@ stdcall IsCalendarLeapDay ; Win 7 +;@ stdcall IsCalendarLeapMonth ; Win 7 +;@ stdcall IsCalendarLeapYear ; Win 7 @ stdcall IsDBCSLeadByte(long) @ stdcall IsDBCSLeadByteEx(long long) @ stdcall IsDebuggerPresent() +;@ stdcall IsNLSDefinedString ; Win 7 +;@ stdcall IsNormalizedString ; Win 7 @ stdcall IsProcessInJob(long long ptr) @ stdcall IsProcessorFeaturePresent(long) @ stdcall IsSystemResumeAutomatic() +;@ stdcall IsThreadAFiber ; Win 7 +;@ stdcall IsThreadpoolTimerSet ; Win 7 +;@ stdcall IsTimeZoneRedirectionEnabled ; Win 7 +;@ stdcall IsValidCalDateTime ; Win 7 @ stdcall IsValidCodePage(long) @ stdcall IsValidLanguageGroup(long long) @ stdcall IsValidLocale(long long) -@ stdcall IsValidUILanguage(long) +;@ stdcall IsValidLocaleName ; Win 7 +@ stdcall IsValidUILanguage(long) ; missing in Win 7 @ stdcall IsWow64Process(ptr ptr) +;@ stdcall K32EmptyWorkingSet ; Win 7 +;@ stdcall K32EnumDeviceDrivers ; Win 7 +;@ stdcall K32EnumPageFilesA ; Win 7 +;@ stdcall K32EnumPageFilesW ; Win 7 +;@ stdcall K32EnumProcessModules ; Win 7 +;@ stdcall K32EnumProcessModulesEx ; Win 7 +;@ stdcall K32EnumProcesses ; Win 7 +;@ stdcall K32GetDeviceDriverBaseNameA ; Win 7 +;@ stdcall K32GetDeviceDriverBaseNameW ; Win 7 +;@ stdcall K32GetDeviceDriverFileNameA ; Win 7 +;@ stdcall K32GetDeviceDriverFileNameW ; Win 7 +;@ stdcall K32GetMappedFileNameA ; Win 7 +;@ stdcall K32GetMappedFileNameW ; Win 7 +;@ stdcall K32GetModuleBaseNameA ; Win 7 +;@ stdcall K32GetModuleBaseNameW ; Win 7 +;@ stdcall K32GetModuleFileNameExA ; Win 7 +;@ stdcall K32GetModuleFileNameExW ; Win 7 +;@ stdcall K32GetModuleInformation ; Win 7 +;@ stdcall K32GetPerformanceInfo ; Win 7 +;@ stdcall K32GetProcessImageFileNameA ; Win 7 +;@ stdcall K32GetProcessImageFileNameW ; Win 7 +;@ stdcall K32GetProcessMemoryInfo ; Win 7 +;@ stdcall K32GetWsChanges ; Win 7 +;@ stdcall K32GetWsChangesEx ; Win 7 +;@ stdcall K32InitializeProcessForWsWatch ; Win 7 +;@ stdcall K32QueryWorkingSet ; Win 7 +;@ stdcall K32QueryWorkingSetEx ; Win 7 @ stdcall LCIDToLocaleName(long wstr long long) ; needed for wine gecko; missing in XP SP3 @ stdcall LCMapStringA(long long str long ptr long) +;@ stdcall LCMapStringEx ; Win 7 @ stdcall LCMapStringW(long long wstr long ptr long) +@ stdcall LZClose(long) +;@ stdcall LZCloseFile ; Win 7 +@ stdcall LZCopy(long long) +;@ stdcall LZCreateFileW ; Win 7 +@ stdcall LZDone() +@ stdcall LZInit(long) +@ stdcall LZOpenFileA(str ptr long) +@ stdcall LZOpenFileW(wstr ptr long) +@ stdcall LZRead(long str long) ;check +@ stdcall LZSeek(long long long) ;check +@ stdcall LZStart() @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection +;@ stdcall LeaveCriticalSectionWhenCallbackReturns ; Win 7 +;@ stdcall LoadAppInitDlls ; Win 7 @ stdcall LoadLibraryA(str) @ stdcall LoadLibraryExA( str long long) @ stdcall LoadLibraryExW(wstr long long) @ stdcall LoadLibraryW(wstr) @ stdcall LoadModule(str ptr) @ stdcall LoadResource(long long) +;@ stdcall LoadStringBaseExW ; Win 7 +;@ stdcall LoadStringBaseW ; Win 7 @ stdcall LocalAlloc(long long) @ stdcall LocalCompact(long) @ stdcall LocalFileTimeToFileTime(ptr ptr) @@ -628,22 +889,16 @@ @ stdcall LocalSize(long) @ stdcall LocalUnlock(long) @ stub LocaleNameToLCID ; missing in XP SP3 +;@ stdcall LocateExtendedFeature ; Win 7 +;@ stdcall LocateLegacyContext ; Win 7 @ stdcall LockFile(long long long long long) @ stdcall LockFileEx(long long long long long ptr) @ stdcall LockResource(long) -@ stdcall LZClose(long) -@ stdcall LZCopy(long long) -@ stdcall LZDone() -@ stdcall LZInit(long) -@ stdcall LZOpenFileA(str ptr long) -@ stdcall LZOpenFileW(wstr ptr long) -@ stdcall LZRead(long str long) ;check -@ stdcall LZSeek(long long long) ;check -@ stdcall LZStart() @ stdcall MapUserPhysicalPages(ptr long ptr) @ stdcall MapUserPhysicalPagesScatter(ptr long ptr) @ stdcall MapViewOfFile(long long long long long) @ stdcall MapViewOfFileEx(long long long long long ptr) +;@ stdcall MapViewOfFileExNuma ; Win 7 @ stdcall Module32First(long ptr) @ stdcall Module32FirstW(long ptr) @ stdcall Module32Next(long ptr) @@ -651,6 +906,8 @@ @ stdcall MoveFileA(str str) @ stdcall MoveFileExA(str str long) @ stdcall MoveFileExW(wstr wstr long) +;@ stdcall MoveFileTransactedA ; Win 7 +;@ stdcall MoveFileTransactedW ; Win 7 @ stdcall MoveFileW(wstr wstr) @ stdcall MoveFileWithProgressA(str str ptr ptr long) @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) @@ -658,27 +915,40 @@ @ stdcall MultiByteToWideChar(long long str long ptr long) @ stdcall NeedCurrentDirectoryForExePathA(str) @ stdcall NeedCurrentDirectoryForExePathW(wstr) -@ stdcall NlsConvertIntegerToString(double double double wstr double) +;@ stdcall NlsCheckPolicy ; Win 7 +@ stdcall NlsConvertIntegerToString(double double double wstr double) ; missing in Win 7 +;@ stdcall NlsEventDataDescCreate ; Win 7 @ stdcall NlsGetCacheUpdateCount() -@ stub NlsResetProcessLocale ; missing in XP SP3 -@ stub NotifyNLSUserCache ; missing in XP SP3 -@ stdcall NumaVirtualQueryNode(long long long long) +@ stub NlsResetProcessLocale ; missing in XP SP3 and Win 7 +;@ stdcall NlsUpdateLocale ; Win 7 +;@ stdcall NlsUpdateSystemLocale ; Win 7 +;@ stdcall NlsWriteEtwEvent ; Win 7 +;@ stdcall NormalizeString ; Win 7 +;@ stdcall NotifyMountMgr ; Win 7 +@ stub NotifyNLSUserCache ; missing in XP SP3 and win 7 +;@ stdcall NotifyUILanguageChange ; Win 7 +@ stdcall NumaVirtualQueryNode(long long long long) ; missing in win 7 @ stdcall OpenConsoleW(wstr long long long) -@ stdcall OpenDataFile(long long) +@ stdcall OpenDataFile(long long) ; missing in Win 7 @ stdcall OpenEventA(long long str) @ stdcall OpenEventW(long long wstr) @ stdcall OpenFile(str ptr long) +;@ stdcall OpenFileById ; Win 7 @ stdcall OpenFileMappingA(long long str) @ stdcall OpenFileMappingW(long long wstr) @ stdcall OpenJobObjectA(long long str) @ stdcall OpenJobObjectW(long long wstr) @ stdcall OpenMutexA(long long str) @ stdcall OpenMutexW(long long wstr) +;@ stdcall OpenPrivateNamespaceA ; Win 7 +;@ stdcall OpenPrivateNamespaceW ; Win 7 @ stdcall OpenProcess(long long long) +;@ stdcall OpenProcessToken ; Win 7 @ stdcall OpenProfileUserMapping() @ stdcall OpenSemaphoreA(long long str) @ stdcall OpenSemaphoreW(long long wstr) @ stdcall OpenThread(long long long) +;@ stdcall OpenThreadToken @ stdcall OpenWaitableTimerA(long long str) @ stdcall OpenWaitableTimerW(long long wstr) @ stdcall OutputDebugStringA(str) @@ -687,6 +957,9 @@ @ stdcall PeekConsoleInputW(ptr ptr long ptr) @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) @ stdcall PostQueuedCompletionStatus(long long ptr ptr) +;@ stdcall PowerClearRequest ; Win 7 +;@ stdcall PowerCreateRequest ; Win 7 +;@ stdcall PowerSetRequest ; Win 7 @ stdcall PrepareTape(ptr long long) @ stdcall PrivCopyFileExW(wstr wstr ptr ptr long long) @ stdcall PrivMoveFileIdentityW(long long long) @@ -697,20 +970,33 @@ @ stdcall ProcessIdToSessionId(long ptr) @ stdcall PulseEvent(long) @ stdcall PurgeComm(long long) +;@ stdcall QueryActCtxSettingsW ; Win 7 ;@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) +@ stdcall QueryFullProcessImageNameA(ptr long str ptr) ; Vista and later +@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) ; Vista and later +;@ stdcall QueryIdleProcessorCycleTime ; Win 7 +;@ stdcall QueryIdleProcessorCycleTimeEx ; Win 7 @ stdcall QueryInformationJobObject(long long ptr long ptr) @ stdcall QueryMemoryResourceNotification(long ptr) -@ stub QueryNumberOfEventLogRecords ; missing in XP SP3 -@ stub QueryOldestEventLogRecord ; missing in XP SP3 +@ stub QueryNumberOfEventLogRecords ; missing in XP SP3 and Win 7 +@ stub QueryOldestEventLogRecord ; missing in XP SP3 and Win 7 @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) -@ stdcall QueryWin31IniFilesMappedToRegistry(long long long long) +;@ stdcall QueryProcessAffinityUpdateMode ; Win 7 +;@ stdcall QueryProcessCycleTime ; Win 7 +;@ stdcall QueryThreadCycleTime ; Win 7 +;@ stdcall QueryThreadProfiling ; Win 7 +;@ stdcall QueryThreadpoolStackInformation ; Win 7 +;@ stdcall -arch=x86_64 QueryUmsThreadInformation +;@ stdcall QueryUnbiasedInterruptTime ; Win 7 +@ stdcall QueryWin31IniFilesMappedToRegistry(long long long long) ; missing in Win 7 @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) +;@ stdcall RaiseFailFastException ; Win 7 @ stub ReOpenFile ;@ stdcall ReOpenFile(ptr long long long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) @@ -728,12 +1014,56 @@ @ stdcall ReadFileEx(long ptr long ptr ptr) @ stdcall ReadFileScatter(long ptr long ptr ptr) @ stdcall ReadProcessMemory(long ptr ptr long ptr) +;@ stdcall ReadThreadProfilingData ; Win 7 +;@ stdcall RegCloseKey ; Win 7 +;@ stdcall RegCreateKeyExA ; Win 7 +;@ stdcall RegCreateKeyExW ; Win 7 +;@ stdcall RegDeleteKeyExA ; Win 7 +;@ stdcall RegDeleteKeyExW ; Win 7 +;@ stdcall RegDeleteTreeA ; Win 7 +;@ stdcall RegDeleteTreeW ; Win 7 +;@ stdcall RegDeleteValueA ; Win 7 +;@ stdcall RegDeleteValueW ; Win 7 +;@ stdcall RegDisablePredefinedCacheEx ; Win 7 +;@ stdcall RegEnumKeyExA ; Win 7 +;@ stdcall RegEnumKeyExW ; Win 7 +;@ stdcall RegEnumValueA ; Win 7 +;@ stdcall RegEnumValueW ; Win 7 +;@ stdcall RegFlushKey ; Win 7 +;@ stdcall RegGetKeySecurity ; Win 7 +;@ stdcall RegGetValueA ; Win 7 +;@ stdcall RegGetValueW ; Win 7 +;@ stdcall RegKrnGetGlobalState ; Win 7 +;@ stdcall RegKrnInitialize ; Win 7 +;@ stdcall RegLoadKeyA ; Win 7 +;@ stdcall RegLoadKeyW ; Win 7 +;@ stdcall RegLoadMUIStringA ; Win 7 +;@ stdcall RegLoadMUIStringW ; Win 7 +;@ stdcall RegNotifyChangeKeyValue ; Win 7 +;@ stdcall RegOpenCurrentUser ; Win 7 +;@ stdcall RegOpenKeyExA ; Win 7 +;@ stdcall RegOpenKeyExW ; Win 7 +;@ stdcall RegOpenUserClassesRoot ; Win 7 +;@ stdcall RegQueryInfoKeyA ; Win 7 +;@ stdcall RegQueryInfoKeyW ; Win 7 +;@ stdcall RegQueryValueExA ; Win 7 +;@ stdcall RegQueryValueExW ; Win 7 +;@ stdcall RegRestoreKeyA ; Win 7 +;@ stdcall RegRestoreKeyW ; Win 7 +;@ stdcall RegSaveKeyExA ; Win 7 +;@ stdcall RegSaveKeyExW ; Win 7 +;@ stdcall RegSetKeySecurity ; Win 7 +;@ stdcall RegSetValueExA ; Win 7 +;@ stdcall RegSetValueExW ; Win 7 +;@ stdcall RegUnLoadKeyA ; Win 7 +;@ stdcall RegUnLoadKeyW ; Win 7 +;@ stdcall RegisterApplicationRecoveryCallback ; Win 7 @ stdcall RegisterApplicationRestart(wstr long) @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long) -@ stub RegisterServiceProcess ; missing in XP SP3 -@ stub RegisterSysMsgHandler ; missing in XP SP3 +@ stub RegisterServiceProcess ; missing in XP SP3 and Win 7 +@ stub RegisterSysMsgHandler ; missing in XP SP3 and win 7 @ stdcall RegisterWaitForInputIdle(ptr) @ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) @ stdcall RegisterWaitForSingleObjectEx(long ptr ptr long long) @@ -741,22 +1071,29 @@ @ stdcall RegisterWowExec(long) ;@ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseMutex(long) -@ stdcall ReleaseSemaphore(long long ptr) +;@ stdcall ReleaseMutexWhenCallbackReturns ; Win 7 @ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive @ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared +@ stdcall ReleaseSemaphore(long long ptr) +;@ stdcall ReleaseSemaphoreWhenCallbackReturns ; Win 7 @ stdcall RemoveDirectoryA(str) +;@ stdcall RemoveDirectoryTransactedA ; Win 7 +;@ stdcall RemoveDirectoryTransactedW ; Win 7 @ stdcall RemoveDirectoryW(wstr) @ stdcall RemoveLocalAlternateComputerNameA(str long) @ stdcall RemoveLocalAlternateComputerNameW(wstr long) +;@ stdcall RemoveSecureMemoryCacheCallback ; Win 7 @ stdcall RemoveVectoredContinueHandler(ptr) ntdll.RtlRemoveVectoredContinueHandler @ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) +;@ stdcall ReplacePartitionUnit ; Win 7 @ stdcall RequestDeviceWakeup(long) @ stdcall RequestWakeupLatency(long) @ stdcall ResetEvent(long) @ stdcall ResetWriteWatch(ptr long) +;@ stdcall ResolveLocaleName ; Win 7 @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) @ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long double) @@ -767,16 +1104,20 @@ @ stdcall -arch=x86_64 RtlDeleteFunctionTable(ptr) @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall -arch=x86_64 RtlInstallFunctionTableCallback(double double long ptr ptr ptr) +@ stdcall -arch=x86_64 RtlLookupFunctionEntry(ptr ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory +@ stdcall -arch=x86_64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=x86_64 RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind -@ stdcall RtlVirtualUnwind(ptr ptr ptr long) ntdll.RtlVirtualUnwind -@ stdcall RtlLookupFunctionEntry(ptr ptr ptr) ntdll.RtlLookupFunctionEntry +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=x86_64 RtlVirtualUnwind(ptr ptr ptr long) ntdll.RtlVirtualUnwind @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory @ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) @ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr) @ stdcall SearchPathA(str str str long ptr ptr) @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) -@ stdcall SetCPGlobal(long) +@ stdcall SetCPGlobal(long) ; missing in Win 7 @ stdcall SetCalendarInfoA(long long long str) @ stdcall SetCalendarInfoW(long long long wstr) @ stdcall SetClientTimeZoneInformation(ptr) @@ -792,7 +1133,7 @@ @ stdcall SetComputerNameW(wstr) @ stdcall SetConsoleActiveScreenBuffer(long) @ stdcall SetConsoleCP(long) -@ stdcall SetConsoleCommandHistoryMode(long) +@ stdcall SetConsoleCommandHistoryMode(long) ; missing in win 7 @ stdcall SetConsoleCtrlHandler(ptr long) @ stdcall SetConsoleCursor(long long) @ stdcall SetConsoleCursorInfo(long ptr) @@ -801,6 +1142,7 @@ @ stdcall SetConsoleDisplayMode(long long ptr) @ stdcall SetConsoleFont(long long) @ stdcall SetConsoleHardwareState(long long long) +;@ stdcall SetConsoleHistoryInfo ; Win 7 @ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) @@ -815,28 +1157,41 @@ @ stdcall SetConsoleOS2OemFormat(long) @ stdcall SetConsoleOutputCP(long) @ stdcall SetConsolePalette(long long long) +;@ stdcall SetConsoleScreenBufferInfoEx ; Win 7 @ stdcall SetConsoleScreenBufferSize(long long) @ stdcall SetConsoleTextAttribute(long long) @ stdcall SetConsoleTitleA(str) @ stdcall SetConsoleTitleW(wstr) @ stdcall SetConsoleWindowInfo(long long ptr) @ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount +;@ stdcall SetCurrentConsoleFontEx ; Win 7 @ stdcall SetCurrentDirectoryA(str) @ stdcall SetCurrentDirectoryW(wstr) -@ stub SetDaylightFlag ; missing in XP SP3 +@ stub SetDaylightFlag ; missing in XP SP3 and Win 7 @ stdcall SetDefaultCommConfigA(str ptr long) @ stdcall SetDefaultCommConfigW(wstr ptr long) @ stdcall SetDllDirectoryA(str) @ stdcall SetDllDirectoryW(wstr) +;@ stdcall SetDynamicTimeZoneInformation ; Win 7 @ stdcall SetEndOfFile(long) +;@ stdcall SetEnvironmentStringsA ; Win 7 +;@ stdcall SetEnvironmentStringsW ; Win 7 @ stdcall SetEnvironmentVariableA(str str) @ stdcall SetEnvironmentVariableW(wstr wstr) @ stdcall SetErrorMode(long) @ stdcall SetEvent(long) +;@ stdcall SetEventWhenCallbackReturns ; Win 7 +;@ stdcall SetExtendedFeaturesMask ; Win 7 @ stdcall SetFileApisToANSI() @ stdcall SetFileApisToOEM() @ stdcall SetFileAttributesA(str long) +;@ stdcall SetFileAttributesTransactedA ; Win 7 +;@ stdcall SetFileAttributesTransactedW ; Win 7 @ stdcall SetFileAttributesW(wstr long) +;@ stdcall SetFileBandwidthReservation ; Win 7 +;@ stdcall SetFileCompletionNotificationModes ; Win 7 +;@ stdcall SetFileInformationByHandle ; Win 7 +;@ stdcall SetFileIoOverlappedRange ; Win 7 @ stdcall SetFilePointer(long long ptr long) @ stdcall SetFilePointerEx(long double ptr long) @ stdcall SetFileShortNameA(long str) @@ -845,7 +1200,7 @@ @ stdcall SetFileValidData(long double) @ stdcall SetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall SetFirmwareEnvironmentVariableW(wstr wstr ptr long) -@ stdcall SetHandleContext(long long) +@ stdcall SetHandleContext(long long) ; missing in Win 7 x64 @ stdcall SetHandleCount(long) @ stdcall SetHandleInformation(long long long) @ stdcall SetInformationJobObject(long long ptr long) @@ -858,13 +1213,21 @@ @ stdcall SetLocaleInfoW(long long wstr) @ stdcall SetMailslotInfo(long long) @ stdcall SetMessageWaitingIndicator(long double) +;@ stdcall SetNamedPipeAttribute ; Win 7 @ stdcall SetNamedPipeHandleState(long ptr ptr ptr) @ stdcall SetPriorityClass(long long) @ stdcall SetProcessAffinityMask(long long) +;@ stdcall SetProcessAffinityUpdateMode ; Win 7 +;@ stdcall SetProcessDEPPolicy ; Win 7 +;@ stdcall SetProcessPreferredUILanguages ; Win 7 @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) @ stdcall SetProcessWorkingSetSize(long long long) +;@ stdcall SetProcessWorkingSetSizeEx ; Win 7 +;@ stdcall SetSearchPathMode ; Win 7 @ stdcall SetStdHandle(long long) +;@ stdcall SetStdHandleEx ; Win 7 +;@ stdcall SetSystemFileCacheSize ; Win 7 @ stdcall SetSystemPowerState(long long) @ stdcall SetSystemTime(ptr) @ stdcall SetSystemTimeAdjustment(long long) @@ -873,14 +1236,26 @@ @ stdcall SetTermsrvAppInstallMode(long) @ stdcall SetThreadAffinityMask(long long) @ stdcall SetThreadContext(long ptr) +;@ stdcall SetThreadErrorMode ; Win 7 @ stdcall SetThreadExecutionState(long) +;@ stdcall SetThreadGroupAffinity ; Win 7 @ stdcall SetThreadIdealProcessor(long long) +;@ stdcall SetThreadIdealProcessorEx ; Win 7 @ stdcall SetThreadLocale(long) +;@ stdcall SetThreadPreferredUILanguages ; Win 7 @ stdcall SetThreadPriority(long long) @ stdcall SetThreadPriorityBoost(long long) +;@ stdcall SetThreadStackGuarantee ; Win 7 +;@ stdcall SetThreadToken ; Win 7 @ stdcall SetThreadUILanguage(long) +;@ stdcall SetThreadpoolStackInformation ; Win 7 +;@ stdcall SetThreadpoolThreadMaximum ; Win 7 +;@ stdcall SetThreadpoolThreadMinimum ; Win 7 +;@ stdcall SetThreadpoolTimer ; Win 7 +;@ stdcall SetThreadpoolWait ; Win 7 @ stdcall SetTimeZoneInformation(ptr) @ stdcall SetTimerQueueTimer(long ptr ptr long long long) +;@ stdcall -arch?x86_64 SetUmsThreadInformation @ stdcall SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) @ stdcall SetVDMCurrentDirectories(long long) @@ -889,12 +1264,19 @@ @ stdcall SetVolumeMountPointA(str str) @ stdcall SetVolumeMountPointW(wstr wstr) @ stdcall SetWaitableTimer(long ptr long ptr ptr long) +;@ stdcall SetWaitableTimerEx ; Win 7 @ stdcall SetupComm(long long long) @ stdcall ShowConsoleCursor(long long) @ stdcall SignalObjectAndWait(long long long long) @ stdcall SizeofResource(long long) @ stdcall Sleep(long) +;@ stdcall SleepConditionVariableCS ; Win 7 +;@ stdcall SleepConditionVariableSRW ; Win 7 @ stdcall SleepEx(long long) +;@ stdcall SortCloseHandle ; Win 7 +;@ stdcall SortGetHandle ; Win 7 +;@ stdcall StartThreadpoolIo ; Win 7 +;@ stdcall SubmitThreadpoolWork ; Win 7 @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) @ stdcall SwitchToThread() @@ -907,41 +1289,51 @@ @ stdcall Thread32First(long ptr) @ stdcall Thread32Next(long ptr) @ stdcall TlsAlloc() -@ stub TlsAllocInternal ; missing in XP SP3 +@ stub TlsAllocInternal ; missing in XP SP3 and Win 7 @ stdcall TlsFree(long) -@ stub TlsFreeInternal ; missing in XP SP3 +@ stub TlsFreeInternal ; missing in XP SP3 and Win 7 @ stdcall TlsGetValue(long) @ stdcall TlsSetValue(long ptr) @ stdcall Toolhelp32ReadProcessMemory(long ptr ptr long ptr) @ stdcall TransactNamedPipe(long ptr long ptr long ptr ptr) @ stdcall TransmitCommChar(long long) -@ stdcall TrimVirtualBuffer(ptr) +@ stdcall TrimVirtualBuffer(ptr) ; missing in Win 7 +;@ stdcall TryAcquireSRWLockExclusive ; Win 7 +;@ stdcall TryAcquireSRWLockShared ; Win 7 @ stdcall TryEnterCriticalSection(ptr) ntdll.RtlTryEnterCriticalSection +;@ stdcall TrySubmitThreadpoolCallback ; Win 7 @ stdcall TzSpecificLocalTimeToSystemTime(ptr ptr ptr) @ stdcall UTRegister(long str str str ptr ptr ptr) @ stdcall UTUnRegister(long) +;@ stdcall -arch=x86_64 UmsThreadYield @ stdcall UnhandledExceptionFilter(ptr) @ stdcall UnlockFile(long long long long long) @ stdcall UnlockFileEx(long long long long ptr) @ stdcall UnmapViewOfFile(ptr) +;@ stdcall UnregisterApplicationRecoveryCallback ; Win 7 +;@ stdcall UnregisterApplicationRestart ; Win 7 @ stdcall UnregisterConsoleIME() @ stdcall UnregisterWait(long) @ stdcall UnregisterWaitEx(long long) +;@ stdcall UpdateCalendarDayOfWeek ; Win 7 +;@ stdcall UpdateProcThreadAttribute ; Win 7 @ stdcall UpdateResourceA(long str str long ptr long) @ stdcall UpdateResourceW(long wstr wstr long ptr long) @ stdcall VDMConsoleOperation(long long) @ stdcall VDMOperationStarted(long) -@ stub ValidateCType ; missing in XP SP3 -@ stub ValidateLocale ; missing in XP SP3 +@ stub ValidateCType ; missing in XP SP3 and Win 7 +@ stub ValidateLocale ; missing in XP SP3 and Win 7 @ stdcall VerLanguageNameA(long str long) @ stdcall VerLanguageNameW(long wstr long) @ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask @ stdcall VerifyConsoleIoHandle(long) +;@ stdcall VerifyScripts ; Win 7 @ stdcall VerifyVersionInfoA(long long double) @ stdcall VerifyVersionInfoW(long long double) @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) -@ stdcall VirtualBufferExceptionHandler(long long long) +;@ stdcall VirtualAllocExNuma ; Win 7 +@ stdcall VirtualBufferExceptionHandler(long long long) ; missing in Win 7 @ stdcall VirtualFree(ptr long long) @ stdcall VirtualFreeEx(long ptr long long) @ stdcall VirtualLock(ptr long) @@ -950,23 +1342,44 @@ @ stdcall VirtualQuery(ptr ptr long) @ stdcall VirtualQueryEx(long ptr ptr long) @ stdcall VirtualUnlock(ptr long) -@ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable -@ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable +;@ stdcall WTSGetActiveConsoleSessionId ; Win 7 @ stdcall WaitCommEvent(long ptr ptr) @ stdcall WaitForDebugEvent(ptr long) @ stdcall WaitForMultipleObjects(long ptr long long) @ stdcall WaitForMultipleObjectsEx(long ptr long long long) @ stdcall WaitForSingleObject(long long) @ stdcall WaitForSingleObjectEx(long long long) +;@ stdcall WaitForThreadpoolIoCallbacks ; Win 7 +;@ stdcall WaitForThreadpoolTimerCallbacks ; Win 7 +;@ stdcall WaitForThreadpoolWaitCallbacks ; Win 7 +;@ stdcall WaitForThreadpoolWorkCallbacks ; Win 7 @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) +@ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable +@ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable +;@ stdcall WerGetFlags ; Win 7 +;@ stdcall WerRegisterFile ; Win 7 +;@ stdcall WerRegisterMemoryBlock ; Win 7 +;@ stdcall WerRegisterRuntimeExceptionModule ; Win 7 +;@ stdcall WerSetFlags ; Win 7 +;@ stdcall WerUnregisterFile ; Win 7 +;@ stdcall WerUnregisterMemoryBlock ; Win 7 +;@ stdcall WerUnregisterRuntimeExceptionModule ; Win 7 +;@ stdcall WerpCleanupMessageMapping ; Win 7 +;@ stdcall WerpInitiateRemoteRecovery ; Win 7 +;@ stdcall WerpNotifyLoadStringResource ; Win 7 +;@ stdcall WerpNotifyLoadStringResourceEx ; Win 7 +;@ stdcall WerpNotifyUseStringResource ; Win 7 +;@ stdcall WerpStringLookup ; Win 7 @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) -#ifdef _M_AMD64 +@ stdcall Wow64DisableWow64FsRedirection(long) @ stdcall Wow64EnableWow64FsRedirection(long) -@ stdcall Wow64DisableWow64FsRedirection(long) +;@ stdcall Wow64GetThreadContext ; Win 7 +;@ stdcall Wow64GetThreadSelectorEntry ; Win 7 @ stdcall Wow64RevertWow64FsRedirection(long) -#endif +;@ stdcall Wow64SetThreadContext ; Win 7 +;@ stdcall Wow64SuspendThread ; Win 7 @ stdcall WriteConsoleA(long ptr long ptr ptr) @ stdcall WriteConsoleInputA(long ptr long ptr) @ stdcall WriteConsoleInputVDMA(long long long long) @@ -993,19 +1406,23 @@ @ stdcall WriteProfileStringA(str str str) @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long) -@ stdcall WTSGetActiveConsoleSessionId() +@ stdcall WTSGetActiveConsoleSessionId() ; missing in win 7 ;@ stdcall ZombifyActCtx(ptr) -@ stub _DebugOut ; missing in XP SP3 -@ stub _DebugPrintf ; missing in XP SP3 +;@ stdcall -arch=x86_64 __C_specific_handler +;@ stdcall -arch=x86_64 __chkstk +;@ stdcall -arch=x86_64 __misaligned_access +@ stub _DebugOut ; missing in XP SP3 and Win 7 +@ stub _DebugPrintf ; missing in XP SP3 and Win 7 @ stdcall _hread(long ptr long) @ stdcall _hwrite(long ptr long) @ stdcall _lclose(long) @ stdcall _lcreat(str long) @ stdcall _llseek(long long long) +;@ stdcall -arch=x86_64 _local_unwind ; Win 7 @ stdcall _lopen(str long) @ stdcall _lread(long ptr long) _hread @ stdcall _lwrite(long ptr long) _hwrite -@ stub dprintf ; missing in XP SP3 +@ stub dprintf ; missing in XP SP3 and Win 7 @ stdcall lstrcat(str str) lstrcatA @ stdcall lstrcatA(str str) @ stdcall lstrcatW(wstr wstr) @@ -1024,7 +1441,11 @@ @ stdcall lstrlen(str) lstrlenA @ stdcall lstrlenA(str) @ stdcall lstrlenW(wstr) - -; Functions added in Win Vista -@ stdcall QueryFullProcessImageNameA(ptr long str ptr) -@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) +;@ stdcall -arch=x86_64 uaw_lstrcmpW ; Win 7 +;@ stdcall -arch=x86_64 uaw_lstrcmpiW ; Win 7 +;@ stdcall -arch=x86_64 uaw_lstrlenW ; Win 7 +;@ stdcall -arch=x86_64 uaw_wcschr ; Win 7 +;@ stdcall -arch=x86_64 uaw_wcscpy ; Win 7 +;@ stdcall -arch=x86_64 uaw_wcsicmp ; Win 7 +;@ stdcall -arch=x86_64 uaw_wcslen ; Win 7 +;@ stdcall -arch=x86_64 uaw_wcsrchr ; Win 7

15 years, 1 month

[ablackmann] 43978: Add more support for shift state output. The tool now updates CharModifiers table based on the shift states present in the layout, building both the modification number and the key name based on the virtual key-> name table.

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Thu Nov 5 20:55:57 2009 New Revision: 43978 URL: http://svn.reactos.org/svn/reactos?rev=43978&view=rev Log: Add more support for shift state output. The tool now updates CharModifiers table based on the shift states present in the layout, building both the modification number and the key name based on the virtual key-> name table. Modified: trunk/reactos/tools/kbdtool/output.c Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Thu Nov 5 20:55:57 2009 @@ -387,11 +387,14 @@ IN PKEYNAME KeyNameDeadData) { CHAR OutputFile[13]; + CHAR KeyNameBuffer[50]; + BOOLEAN NeedPlus; FILE *FileHandle; ULONG States[8]; - ULONG i; + ULONG i, j, k; ULONG HighestState; PVKNAME Entry; + PCHAR p; /* Build the keyboard name and internal name */ strcpy(OutputFile, gKBDName); @@ -636,8 +639,9 @@ for (i = 0; i < 8; i++) States[i] = -1; /* Find the highest set state */ - for (HighestState = 1, i = 0; i < 8 && ShiftStates[i] > -1; i++) - { + for (HighestState = 1, i = 0; (i < 8) && (ShiftStates[i] != -1); i++) + { + /* Save all state values */ States[ShiftStates[i]] = i; if (ShiftStates[i] > HighestState) HighestState = ShiftStates[i]; } @@ -650,7 +654,68 @@ " {\n" " // Modification# // Keys Pressed\n" " // ============= // =============\n", - 2); /* FIXME: STATE STUFF */ + HighestState); + + /* Loop states */ + for (i = 0; i <= HighestState; i++) + { + /* Check for invalid state */ + if (States[i] == -1) + { + /* Invalid state header */ + fprintf(FileHandle, " SHFT_INVALID, // "); + } + else + { + /* Is this the last one? */ + if (i == HighestState) + { + /* Last state header */ + fprintf(FileHandle, " %d // ", States[i]); + } + else + { + /* Normal state header */ + fprintf(FileHandle, " %d, // ", States[i]); + } + + /* State 1 or higher? */ + if (i >= 1) + { + /* J is the loop variable, K is the double */ + for (NeedPlus = 0, j = 0, k = 1; (1 << j) <= i; j++, k = (1 << j)) + { + /* Do we need to add a plus? */ + if (NeedPlus) + { + /* Add it */ + fprintf(FileHandle, "+"); + NeedPlus = FALSE; + } + + /* Check if it's time to add a modifier */ + if (i & k) + { + /* Get the key state name and copy it into our buffer */ + strcpy(KeyNameBuffer, getVKName(Modifiers[j].VirtualKey, 1)); + + /* Go go the 4th char (past the "KBD") and lower name */ + for (p = &KeyNameBuffer[4]; *p; p++) *p = tolower(*p); + + /* Print it */ + fprintf(FileHandle, "%s", &KeyNameBuffer[3]); + + /* We'll need a plus sign next */ + NeedPlus = TRUE; + } + } + } + + /* Terminate the entry */ + fprintf(FileHandle, "\n"); + } + } + /* Modifier conversion table end */ fprintf(FileHandle," }\n" "};\n\n");

15 years, 1 month

[ablackmann] 43977: Generate modifier table. Generate extended scancode table X. Generate extended scancode table Y.

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Thu Nov 5 20:25:41 2009 New Revision: 43977 URL: http://svn.reactos.org/svn/reactos?rev=43977&view=rev Log: Generate modifier table. Generate extended scancode table X. Generate extended scancode table Y. Modified: trunk/reactos/tools/kbdtool/output.c Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Thu Nov 5 20:25:41 2009 @@ -388,6 +388,10 @@ { CHAR OutputFile[13]; FILE *FileHandle; + ULONG States[8]; + ULONG i; + ULONG HighestState; + PVKNAME Entry; /* Build the keyboard name and internal name */ strcpy(OutputFile, gKBDName); @@ -528,7 +532,28 @@ /* Key name table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_VK aE0VscToVk[] = {\n"); - /* FIXME: Key names */ + /* Loop 110-key table */ + for (i = 0; i < 110; i++) + { + /* Check for non-extended keys */ + if ((Layout->Entry[i].ScanCode & 0xFF00) == 0xE000) + { + /* Which are valid */ + if (Layout->Entry[i].ScanCode != 0xFF) + { + /* And mapped */ + if (Layout->Entry[i].VirtualKey != 0xFF) + { + /* Output them */ + fprintf(FileHandle, + " { 0x%02X, X%02X | KBDEXT }, // %s\n", + Layout->Entry[i].ScanCode, + Layout->Entry[i].ScanCode, + Layout->Entry[i].Name); + } + } + } + } /* Key name table finish */ fprintf(FileHandle, " { 0, 0 }\n};\n\n"); @@ -536,7 +561,28 @@ /* Extended key name table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_VK aE1VscToVk[] = {\n"); - /* FIXME: Extended scancodes */ + /* Loop 110-key table */ + for (i = 0; i < 110; i++) + { + /* Check for extended keys */ + if ((Layout->Entry[i].ScanCode & 0xFF00) == 0xE100) + { + /* Which are valid */ + if (Layout->Entry[i].ScanCode != 0xFF) + { + /* And mapped */ + if (Layout->Entry[i].VirtualKey != 0xFF) + { + /* Output them */ + fprintf(FileHandle, + " { 0x%02X, Y%02X | KBDEXT }, // %s\n", + Layout->Entry[i].ScanCode, + Layout->Entry[i].ScanCode, + Layout->Entry[i].Name); + } + } + } + } /* Extended key name table finish */ fprintf(FileHandle, @@ -559,7 +605,20 @@ /* Modifier table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VK_TO_BIT aVkToBits[] = {\n"); - /* FIXME: Key modifiers */ + /* Loop modifier table */ + i = 0; + Entry = &Modifiers[0]; + while (Entry->VirtualKey) + { + /* Print out entry */ + fprintf(FileHandle, + " { %-12s, %-12s },\n", + getVKName(Entry->VirtualKey, 1), + Entry->Name); + + /* Move to the next one */ + Entry = &Modifiers[++i]; + } /* Modifier table finish */ fprintf(FileHandle, " { 0, 0 }\n};\n\n"); @@ -572,6 +631,16 @@ "* See kbd.h for a full description.\n" "*\n" "\\***************************************************************************/\n\n"); + + /* Zero out local state data */ + for (i = 0; i < 8; i++) States[i] = -1; + + /* Find the highest set state */ + for (HighestState = 1, i = 0; i < 8 && ShiftStates[i] > -1; i++) + { + States[ShiftStates[i]] = i; + if (ShiftStates[i] > HighestState) HighestState = ShiftStates[i]; + } /* Modifier conversion table header */ fprintf(FileHandle,

15 years, 1 month

[ablackmann] 43976: Add table of modifiers.

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Thu Nov 5 20:24:47 2009 New Revision: 43976 URL: http://svn.reactos.org/svn/reactos?rev=43976&view=rev Log: Add table of modifiers. Modified: trunk/reactos/tools/kbdtool/data.c trunk/reactos/tools/kbdtool/kbdtool.h Modified: trunk/reactos/tools/kbdtool/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/data.c?rev=4… ============================================================================== --- trunk/reactos/tools/kbdtool/data.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/data.c [iso-8859-1] Thu Nov 5 20:24:47 2009 @@ -51,6 +51,13 @@ {0x2d, "INSERT"}, {0xe5, "GROUPSHIFT"}, {0xe6, "RGROUPSHIFT"} +}; +/* Table of modifiers */ +VKNAME Modifiers[] = +{ + {0x10, "KBDSHIFT"}, + {0x11, "KBDCTRL"}, + {0x12, "KBDALT"} }; /* ISO 110-key Keyboard Scancode to Virtual Key Conversion Table */ Modified: trunk/reactos/tools/kbdtool/kbdtool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.h?re… ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] Thu Nov 5 20:24:47 2009 @@ -76,6 +76,7 @@ extern PCHAR gpszFileName; extern FILE* gfpInput; extern VKNAME VKName[]; +extern VKNAME Modifiers[]; extern SCVK ScVk[]; extern LAYOUT g_Layout; extern CHAR gVKeyName[32];

15 years, 1 month

← Newer
1
...
33
34
35
36
37
38
39
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2009