Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [HTTPAPI] Fix MSVC2010 build.
by Hermès Bélusca-Maïto 03 Nov '19

03 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c9d825b788601e1f15ad… commit 1c9d825b788601e1f15ad657e4768519ddc1bf91 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 16:59:47 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 17:00:58 2019 +0100 [HTTPAPI] Fix MSVC2010 build. --- dll/win32/httpapi/httpapi_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/httpapi/httpapi_main.c b/dll/win32/httpapi/httpapi_main.c index 45fad4d3641..62e90e85677 100644 --- a/dll/win32/httpapi/httpapi_main.c +++ b/dll/win32/httpapi/httpapi_main.c @@ -287,6 +287,7 @@ ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl) { +#ifndef __REACTOS__ struct http_receive_request_params params = { .addr = (ULONG_PTR)request, @@ -294,6 +295,10 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag .flags = flags, .bits = sizeof(void *) * 8, }; +#else + struct http_receive_request_params params = + { (ULONGLONG)(ULONG_PTR)request, id, flags, sizeof(void *) * 8 }; +#endif ULONG ret = ERROR_SUCCESS; OVERLAPPED sync_ovl;

1 0

[reactos] 01/02: [DNSAPI] Fix MSVC build.
by Hermès Bélusca-Maïto 03 Nov '19

03 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b82c191969bd9d34a0fc… commit 4b82c191969bd9d34a0fc116e7e584b161941b9b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 16:59:11 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 17:00:57 2019 +0100 [DNSAPI] Fix MSVC build. --- dll/win32/dnsapi/dnsapi/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/dnsapi/dnsapi/query.c b/dll/win32/dnsapi/dnsapi/query.c index f7de6ab96c8..bc89c8d8ad8 100644 --- a/dll/win32/dnsapi/dnsapi/query.c +++ b/dll/win32/dnsapi/dnsapi/query.c @@ -1103,5 +1103,5 @@ GetCurrentTimeInSeconds(VOID) GetSystemTimeAsFileTime(&Time); memcpy(&lTime, &Time, sizeof(lTime)); lTime.QuadPart -= lAdj.QuadPart; - return (DWORD)(lTime.QuadPart/10000000LLU); + return (DWORD)(lTime.QuadPart/10000000ULL); }

1 0

[reactos] 06/06: [NTOS:KDBG] Enhance the 'tss' command.
by Hermès Bélusca-Maïto 03 Nov '19

03 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8826ee8ff7c77cbcb8c91… commit 8826ee8ff7c77cbcb8c91cecc483cdc02e950e51 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 03:44:55 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:08:40 2019 +0100 [NTOS:KDBG] Enhance the 'tss' command. We allow specifying manually the TSS selector number or its descriptor address, and dump more information from the associated KTSS structure. Also add the KdbpRetrieveTss() helper to retrieve the PKTSS from its corresponding selector number. It will also be useful for future improvements. --- ntoskrnl/kdbg/kdb_cli.c | 147 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 134 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index d3d2a908997..fd93246afa7 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -178,7 +178,7 @@ static const struct { "ldt", "ldt", "Display the local descriptor table.", KdbpCmdGdtLdtIdt }, { "idt", "idt", "Display the interrupt descriptor table.", KdbpCmdGdtLdtIdt }, { "pcr", "pcr", "Display the processor control region.", KdbpCmdPcr }, - { "tss", "tss", "Display a task state segment.", KdbpCmdTss }, + { "tss", "tss [selector|*descaddr]", "Display the current task state segment, or the one specified by its selector number or descriptor address.", KdbpCmdTss }, /* Others */ { NULL, NULL, "Others", NULL }, @@ -987,6 +987,52 @@ KdbpCmdRegs( return TRUE; } +static PKTSS +KdbpRetrieveTss( + IN USHORT TssSelector, + OUT PULONG pType OPTIONAL, + IN PKDESCRIPTOR pGdtr OPTIONAL) +{ + KDESCRIPTOR Gdtr; + KGDTENTRY Desc; + PKTSS Tss; + + /* Retrieve the Global Descriptor Table (user-provided or system) */ + if (pGdtr) + Gdtr = *pGdtr; + else + Ke386GetGlobalDescriptorTable(&Gdtr.Limit); + + /* Check limits */ + if ((TssSelector & (sizeof(KGDTENTRY) - 1)) || + (TssSelector < sizeof(KGDTENTRY)) || + (TssSelector + sizeof(KGDTENTRY) - 1 > Gdtr.Limit)) + { + return NULL; + } + + /* Retrieve the descriptor */ + if (!NT_SUCCESS(KdbpSafeReadMemory(&Desc, + (PVOID)(Gdtr.Base + TssSelector), + sizeof(KGDTENTRY)))) + { + return NULL; + } + + /* Check for TSS32(Avl) or TSS32(Busy) */ + if (Desc.HighWord.Bits.Type != 9 && Desc.HighWord.Bits.Type != 11) + { + return NULL; + } + if (pType) *pType = Desc.HighWord.Bits.Type; + + Tss = (PKTSS)(ULONG_PTR)(Desc.BaseLow | + Desc.HighWord.Bytes.BaseMid << 16 | + Desc.HighWord.Bytes.BaseHi << 24); + + return Tss; +} + static BOOLEAN KdbpTrapFrameFromPrevTss( PKTRAP_FRAME TrapFrame) @@ -2164,18 +2210,93 @@ KdbpCmdTss( ULONG Argc, PCHAR Argv[]) { - KTSS *Tss = KeGetPcr()->TSS; - - KdbpPrint("Current TSS is at 0x%p.\n", Tss); - KdbpPrint(" Eip: 0x%08x\n" - " Es: 0x%04x\n" - " Cs: 0x%04x\n" - " Ss: 0x%04x\n" - " Ds: 0x%04x\n" - " Fs: 0x%04x\n" - " Gs: 0x%04x\n" - " IoMapBase: 0x%04x\n", - Tss->Eip, Tss->Es, Tss->Cs, Tss->Ds, Tss->Fs, Tss->Gs, Tss->IoMapBase); + USHORT TssSelector; + PKTSS Tss = NULL; + + if (Argc >= 2) + { + /* + * Specified TSS via its selector [selector] or descriptor address [*descaddr]. + * Note that we ignore any other argument values. + */ + PCHAR Param, pszNext; + ULONG ulValue; + + Param = Argv[1]; + if (Argv[1][0] == '*') + ++Param; + + ulValue = strtoul(Param, &pszNext, 0); + if (pszNext && *pszNext) + { + KdbpPrint("Invalid TSS specification.\n"); + return TRUE; + } + + if (Argv[1][0] == '*') + { + /* Descriptor specified */ + TssSelector = 0; // Unknown selector! + // TODO: Room for improvement: Find the TSS descriptor + // in the GDT so as to validate it. + Tss = (PKTSS)(ULONG_PTR)ulValue; + if (!Tss) + { + KdbpPrint("Invalid 32-bit TSS descriptor.\n"); + return TRUE; + } + } + else + { + /* Selector specified, retrive the corresponding TSS */ + TssSelector = (USHORT)ulValue; + Tss = KdbpRetrieveTss(TssSelector, NULL, NULL); + if (!Tss) + { + KdbpPrint("Invalid 32-bit TSS selector.\n"); + return TRUE; + } + } + } + + if (!Tss) + { + /* If no TSS was specified, use the current TSS descriptor */ + TssSelector = Ke386GetTr(); + Tss = KeGetPcr()->TSS; + // NOTE: If everything works OK, Tss is the current TSS corresponding to the TR selector. + } + + KdbpPrint("%s TSS 0x%04x is at 0x%p.\n", + (Tss == KeGetPcr()->TSS) ? "Current" : "Specified", TssSelector, Tss); + KdbpPrint(" Backlink: 0x%04x\n" + " Ss0:Esp0: 0x%04x:0x%08x\n" + // NOTE: Ss1:Esp1 and Ss2:Esp2: are in the NotUsed1 field. + " CR3: 0x%08x\n" + " EFlags: 0x%08x\n" + " Eax: 0x%08x\n" + " Ebx: 0x%08x\n" + " Ecx: 0x%08x\n" + " Edx: 0x%08x\n" + " Esi: 0x%08x\n" + " Edi: 0x%08x\n" + " Eip: 0x%08x\n" + " Esp: 0x%08x\n" + " Ebp: 0x%08x\n" + " Cs: 0x%04x\n" + " Ss: 0x%04x\n" + " Ds: 0x%04x\n" + " Es: 0x%04x\n" + " Fs: 0x%04x\n" + " Gs: 0x%04x\n" + " LDT: 0x%04x\n" + " Flags: 0x%04x\n" + " IoMapBase: 0x%04x\n", + Tss->Backlink, Tss->Ss0, Tss->Esp0, Tss->CR3, Tss->EFlags, + Tss->Eax, Tss->Ebx, Tss->Ecx, Tss->Edx, Tss->Esi, Tss->Edi, + Tss->Eip, Tss->Esp, Tss->Ebp, + Tss->Cs, Tss->Ss, Tss->Ds, Tss->Es, Tss->Fs, Tss->Gs, + Tss->LDT, Tss->Flags, Tss->IoMapBase); return TRUE; }

1 0

[reactos] 05/06: [NTOS:KDBG] Augment the 'cregs' command by also displaying the task segment register. Update the help message.
by Hermès Bélusca-Maïto 03 Nov '19

03 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc0c721ff88630c287460… commit dc0c721ff88630c2874609c8feb3d41c0f702f37 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 03:33:53 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:08:39 2019 +0100 [NTOS:KDBG] Augment the 'cregs' command by also displaying the task segment register. Update the help message. --- ntoskrnl/kdbg/kdb_cli.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 1211a274383..d3d2a908997 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -146,7 +146,7 @@ static const struct { "disasm", "disasm [address] [L count]", "Disassemble count instructions at address.", KdbpCmdDisassembleX }, { "x", "x [address] [L count]", "Display count dwords, starting at address.", KdbpCmdDisassembleX }, { "regs", "regs", "Display general purpose registers.", KdbpCmdRegs }, - { "cregs", "cregs", "Display control registers.", KdbpCmdRegs }, + { "cregs", "cregs", "Display control, descriptor table and task segment registers.", KdbpCmdRegs }, { "sregs", "sregs", "Display status registers.", KdbpCmdRegs }, { "dregs", "dregs", "Display debug registers.", KdbpCmdRegs }, { "bt", "bt [*frameaddr|thread id]", "Prints current backtrace or from given frame address.", KdbpCmdBackTrace }, @@ -873,8 +873,9 @@ KdbpCmdRegs( Tf->Ecx, Tf->Edx, Tf->Esi, Tf->Edi, Tf->Ebp); - KdbpPrint("EFLAGS 0x%08x ", Tf->EFlags); + /* Display the EFlags */ + KdbpPrint("EFLAGS 0x%08x ", Tf->EFlags); for (i = 0; i < 32; i++) { if (i == 1) @@ -894,14 +895,13 @@ KdbpCmdRegs( KdbpPrint(EflagsBits[i]); } } - KdbpPrint("\n"); } else if (Argv[0][0] == 'c') /* cregs */ { ULONG Cr0, Cr2, Cr3, Cr4; KDESCRIPTOR Gdtr = {0, 0, 0}, Idtr = {0, 0, 0}; - USHORT Ldtr; + USHORT Ldtr, Tr; static const PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, " WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL, @@ -911,19 +911,20 @@ KdbpCmdRegs( NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + /* Retrieve the control registers */ Cr0 = KdbCurrentTrapFrame->Cr0; Cr2 = KdbCurrentTrapFrame->Cr2; Cr3 = KdbCurrentTrapFrame->Cr3; Cr4 = KdbCurrentTrapFrame->Cr4; - /* Get descriptor table regs */ + /* Retrieve the descriptor table and task segment registers */ Ke386GetGlobalDescriptorTable(&Gdtr.Limit); Ldtr = Ke386GetLocalDescriptorTable(); __sidt(&Idtr.Limit); + Tr = Ke386GetTr(); /* Display the control registers */ KdbpPrint("CR0 0x%08x ", Cr0); - for (i = 0; i < 32; i++) { if (!Cr0Bits[i]) @@ -932,12 +933,12 @@ KdbpCmdRegs( if ((Cr0 & (1 << i)) != 0) KdbpPrint(Cr0Bits[i]); } + KdbpPrint("\n"); - KdbpPrint("\nCR2 0x%08x\n", Cr2); + KdbpPrint("CR2 0x%08x\n", Cr2); KdbpPrint("CR3 0x%08x Pagedir-Base 0x%08x %s%s\n", Cr3, (Cr3 & 0xfffff000), (Cr3 & (1 << 3)) ? " PWT" : "", (Cr3 & (1 << 4)) ? " PCD" : "" ); KdbpPrint("CR4 0x%08x ", Cr4); - for (i = 0; i < 32; i++) { if (!Cr4Bits[i]) @@ -946,11 +947,13 @@ KdbpCmdRegs( if ((Cr4 & (1 << i)) != 0) KdbpPrint(Cr4Bits[i]); } + KdbpPrint("\n"); - /* Display the descriptor table regs */ - KdbpPrint("\nGDTR Base 0x%08x Size 0x%04x\n", Gdtr.Base, Gdtr.Limit); - KdbpPrint("LDTR 0x%04x\n", Ldtr); - KdbpPrint("IDTR Base 0x%08x Size 0x%04x\n", Idtr.Base, Idtr.Limit); + /* Display the descriptor table and task segment registers */ + KdbpPrint("GDTR Base 0x%08x Size 0x%04x\n", Gdtr.Base, Gdtr.Limit); + KdbpPrint("LDTR 0x%04x\n", Ldtr); + KdbpPrint("IDTR Base 0x%08x Size 0x%04x\n", Idtr.Base, Idtr.Limit); + KdbpPrint("TR 0x%04x\n", Tr); } else if (Argv[0][0] == 's') /* sregs */ {

1 0

[reactos] 04/06: [NTOS:KDBG] Use fixed-length hexadecimal printing for addresses.
by Hermès Bélusca-Maïto 03 Nov '19

03 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89b44cfa074c337959530… commit 89b44cfa074c33795953033ba42236dc414ade91 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 02:17:15 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:08:39 2019 +0100 [NTOS:KDBG] Use fixed-length hexadecimal printing for addresses. --- ntoskrnl/kdbg/kdb_cli.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 1cafedd8686..1211a274383 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -797,7 +797,7 @@ KdbpCmdDisassembleX( while (Count > 0) { if (!KdbSymPrintAddress((PVOID)Address, NULL)) - KdbpPrint("<%x>:", Address); + KdbpPrint("<%08x>:", Address); else KdbpPrint(":"); @@ -2116,7 +2116,7 @@ KdbpCmdPcr( { PKIPCR Pcr = (PKIPCR)KeGetPcr(); - KdbpPrint("Current PCR is at 0x%08x.\n", (INT)Pcr); + KdbpPrint("Current PCR is at 0x%p.\n", Pcr); KdbpPrint(" Tib.ExceptionList: 0x%08x\n" " Tib.StackBase: 0x%08x\n" " Tib.StackLimit: 0x%08x\n" @@ -2163,7 +2163,7 @@ KdbpCmdTss( { KTSS *Tss = KeGetPcr()->TSS; - KdbpPrint("Current TSS is at 0x%08x.\n", (INT)Tss); + KdbpPrint("Current TSS is at 0x%p.\n", Tss); KdbpPrint(" Eip: 0x%08x\n" " Es: 0x%04x\n" " Cs: 0x%04x\n" @@ -3470,7 +3470,7 @@ KdbpCliMainLoop( { if (!KdbSymPrintAddress((PVOID)KdbCurrentTrapFrame->Tf.Eip, &KdbCurrentTrapFrame->Tf)) { - KdbpPrint("<%x>", KdbCurrentTrapFrame->Tf.Eip); + KdbpPrint("<%08x>", KdbCurrentTrapFrame->Tf.Eip); } KdbpPrint(": ");

1 0

[reactos] 03/06: [NTOS:KDBG] Whitespace, minor code style and help-text style fixes.
by Hermès Bélusca-Maïto 03 Nov '19

03 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0d59e745db2e9fdead47… commit f0d59e745db2e9fdead47ba40c3b8cbe4ea465e9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 02:14:17 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:08:38 2019 +0100 [NTOS:KDBG] Whitespace, minor code style and help-text style fixes. --- ntoskrnl/kdbg/kdb_cli.c | 103 ++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index b4d750db304..1cafedd8686 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -144,19 +144,19 @@ static const struct { NULL, NULL, "Data", NULL }, { "?", "? expression", "Evaluate expression.", KdbpCmdEvalExpression }, { "disasm", "disasm [address] [L count]", "Disassemble count instructions at address.", KdbpCmdDisassembleX }, - { "x", "x [address] [L count]", "Display count dwords, starting at addr.", KdbpCmdDisassembleX }, + { "x", "x [address] [L count]", "Display count dwords, starting at address.", KdbpCmdDisassembleX }, { "regs", "regs", "Display general purpose registers.", KdbpCmdRegs }, { "cregs", "cregs", "Display control registers.", KdbpCmdRegs }, { "sregs", "sregs", "Display status registers.", KdbpCmdRegs }, { "dregs", "dregs", "Display debug registers.", KdbpCmdRegs }, - { "bt", "bt [*frameaddr|thread id]", "Prints current backtrace or from given frame addr", KdbpCmdBackTrace }, + { "bt", "bt [*frameaddr|thread id]", "Prints current backtrace or from given frame address.", KdbpCmdBackTrace }, #ifdef __ROS_DWARF__ - { "dt", "dt [mod] [type] [addr]", "Print a struct. Addr is optional.", KdbpCmdPrintStruct }, + { "dt", "dt [mod] [type] [addr]", "Print a struct. The address is optional.", KdbpCmdPrintStruct }, #endif /* Flow control */ { NULL, NULL, "Flow control", NULL }, - { "cont", "cont", "Continue execution (leave debugger)", KdbpCmdContinue }, + { "cont", "cont", "Continue execution (leave debugger).", KdbpCmdContinue }, { "step", "step [count]", "Execute single instructions, stepping into interrupts.", KdbpCmdStep }, { "next", "next [count]", "Execute single instructions, skipping calls and reps.", KdbpCmdStep }, { "bl", "bl", "List breakpoints.", KdbpCmdBreakPointList }, @@ -174,17 +174,17 @@ static const struct /* System information */ { NULL, NULL, "System info", NULL }, { "mod", "mod [address]", "List all modules or the one containing address.", KdbpCmdMod }, - { "gdt", "gdt", "Display global descriptor table.", KdbpCmdGdtLdtIdt }, - { "ldt", "ldt", "Display local descriptor table.", KdbpCmdGdtLdtIdt }, - { "idt", "idt", "Display interrupt descriptor table.", KdbpCmdGdtLdtIdt }, - { "pcr", "pcr", "Display processor control region.", KdbpCmdPcr }, - { "tss", "tss", "Display task state segment.", KdbpCmdTss }, + { "gdt", "gdt", "Display the global descriptor table.", KdbpCmdGdtLdtIdt }, + { "ldt", "ldt", "Display the local descriptor table.", KdbpCmdGdtLdtIdt }, + { "idt", "idt", "Display the interrupt descriptor table.", KdbpCmdGdtLdtIdt }, + { "pcr", "pcr", "Display the processor control region.", KdbpCmdPcr }, + { "tss", "tss", "Display a task state segment.", KdbpCmdTss }, /* Others */ { NULL, NULL, "Others", NULL }, { "bugcheck", "bugcheck", "Bugchecks the system.", KdbpCmdBugCheck }, { "reboot", "reboot", "Reboots the system.", KdbpCmdReboot}, - { "filter", "filter [error|warning|trace|info|level]+|-[componentname|default]", "Enable/disable debug channels", KdbpCmdFilter }, + { "filter", "filter [error|warning|trace|info|level]+|-[componentname|default]", "Enable/disable debug channels.", KdbpCmdFilter }, { "set", "set [var] [value]", "Sets var to value or displays value of var.", KdbpCmdSet }, { "dmesg", "dmesg", "Display debug messages on screen, with navigation on pages.", KdbpCmdDmesg }, { "kmsg", "kmsg", "Kernel dmesg. Alias for dmesg.", KdbpCmdDmesg }, @@ -194,8 +194,8 @@ static const struct { "!poolfind", "!poolfind Tag [Pool]", "Search for pool tag allocations.", ExpKdbgExtPoolFind }, { "!filecache", "!filecache", "Display cache usage.", ExpKdbgExtFileCache }, { "!defwrites", "!defwrites", "Display cache write values.", ExpKdbgExtDefWrites }, - { "!irpfind", "!irpfind [Pool [startaddress [criteria data]]]", "Lists IRPs potentially matching criteria", ExpKdbgExtIrpFind }, - { "!handle", "!handle [Handle]", "Displays info about handles", ExpKdbgExtHandle }, + { "!irpfind", "!irpfind [Pool [startaddress [criteria data]]]", "Lists IRPs potentially matching criteria.", ExpKdbgExtIrpFind }, + { "!handle", "!handle [Handle]", "Displays info about handles.", ExpKdbgExtHandle }, }; /* FUNCTIONS *****************************************************************/ @@ -1888,7 +1888,7 @@ KdbpCmdMod( return TRUE; } -/*!\brief Displays GDT, LDT or IDTd. +/*!\brief Displays GDT, LDT or IDT. */ static BOOLEAN KdbpCmdGdtLdtIdt( @@ -2186,7 +2186,6 @@ KdbpCmdBugCheck( { /* Set the flag and quit looping */ KdbpBugCheckRequested = TRUE; - return FALSE; } @@ -2216,41 +2215,41 @@ KdbpCmdDmesg( ULONG Argc, PCHAR Argv[]) { - ULONG beg, end; + ULONG beg, end; + + KdbpIsInDmesgMode = TRUE; /* Toggle logging flag */ + if (!KdpDmesgBuffer) + { + KdbpPrint("Dmesg: error, buffer is not allocated! /DEBUGPORT=SCREEN kernel param required for dmesg.\n"); + return TRUE; + } + + KdbpPrint("*** Dmesg *** TotalWritten=%lu, BufferSize=%lu, CurrentPosition=%lu\n", + KdbDmesgTotalWritten, KdpDmesgBufferSize, KdpDmesgCurrentPosition); + + /* Pass data to the pager */ + end = KdpDmesgCurrentPosition; + beg = (end + KdpDmesgFreeBytes) % KdpDmesgBufferSize; + + /* No roll-overs, and overwritten=lost bytes */ + if (KdbDmesgTotalWritten <= KdpDmesgBufferSize) + { + /* Show buffer (KdpDmesgBuffer + beg, num) */ + KdbpPager(KdpDmesgBuffer, KdpDmesgCurrentPosition); + } + else + { + /* Show 2 buffers: (KdpDmesgBuffer + beg, KdpDmesgBufferSize - beg) + * and: (KdpDmesgBuffer, end) */ + KdbpPager(KdpDmesgBuffer + beg, KdpDmesgBufferSize - beg); + KdbpPrint("*** Dmesg: buffer rollup ***\n"); + KdbpPager(KdpDmesgBuffer, end); + } + KdbpPrint("*** Dmesg: end of output ***\n"); + + KdbpIsInDmesgMode = FALSE; /* Toggle logging flag */ - KdbpIsInDmesgMode = TRUE; /* Toggle logging flag */ - if (!KdpDmesgBuffer) - { - KdbpPrint("Dmesg: error, buffer is not allocated! /DEBUGPORT=SCREEN kernel param required for dmesg.\n"); return TRUE; - } - - KdbpPrint("*** Dmesg *** TotalWritten=%lu, BufferSize=%lu, CurrentPosition=%lu\n", - KdbDmesgTotalWritten, KdpDmesgBufferSize, KdpDmesgCurrentPosition); - - // Pass data to the pager: - end = KdpDmesgCurrentPosition; - beg = (end + KdpDmesgFreeBytes) % KdpDmesgBufferSize; - - // no roll-overs, and overwritten=lost bytes - if (KdbDmesgTotalWritten <= KdpDmesgBufferSize) - { - // show buffer (KdpDmesgBuffer + beg, num) - KdbpPager(KdpDmesgBuffer, KdpDmesgCurrentPosition); - } - else - { - // show 2 buffers: (KdpDmesgBuffer + beg, KdpDmesgBufferSize - beg) - // and: (KdpDmesgBuffer, end) - KdbpPager(KdpDmesgBuffer + beg, KdpDmesgBufferSize - beg); - KdbpPrint("*** Dmesg: buffer rollup ***\n"); - KdbpPager(KdpDmesgBuffer, end); - } - KdbpPrint("*** Dmesg: end of output ***\n"); - - KdbpIsInDmesgMode = FALSE; /* Toggle logging flag */ - - return TRUE; } /*!\brief Sets or displays a config variables value. @@ -2308,10 +2307,10 @@ KdbpCmdSet( continue; if (!KdbpGetEnterCondition(l, TRUE, &ConditionFirst)) - ASSERT(0); + ASSERT(FALSE); if (!KdbpGetEnterCondition(l, FALSE, &ConditionLast)) - ASSERT(0); + ASSERT(FALSE); KdbpPrint(" #%02d %-20s %-8s %-8s\n", l, ExceptionNames[l], KDB_ENTER_CONDITION_TO_STRING(ConditionFirst), @@ -2389,10 +2388,10 @@ KdbpCmdSet( else /* Argc >= 3 */ { if (!KdbpGetEnterCondition(l, TRUE, &ConditionFirst)) - ASSERT(0); + ASSERT(FALSE); if (!KdbpGetEnterCondition(l, FALSE, &ConditionLast)) - ASSERT(0); + ASSERT(FALSE); if (l < (RTL_NUMBER_OF(ExceptionNames) - 1)) { @@ -2918,7 +2917,7 @@ KdbpPager( break; /* Calculate the number of lines which will be printed in the terminal - * when outputting the current line + * when outputting the current line. */ if (i > 0) RowsPrintedByTerminal = (i + KdbNumberOfColsPrinted - 1) / KdbNumberOfColsTerminal;

1 0

[reactos] 02/06: [NTOS:KD] Check for valid LoaderBlock and LoaderBlock->LoadOptions pointers when calling KdInitSystem() in BootPhase == 0.
by Hermès Bélusca-Maïto 03 Nov '19

03 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=954f7c06609ffd9545fe3… commit 954f7c06609ffd9545fe35ffb6fe0096079ddb1c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 2 01:07:29 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:08:33 2019 +0100 [NTOS:KD] Check for valid LoaderBlock and LoaderBlock->LoadOptions pointers when calling KdInitSystem() in BootPhase == 0. --- ntoskrnl/kd/kdinit.c | 62 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/ntoskrnl/kd/kdinit.c b/ntoskrnl/kd/kdinit.c index 3a7071d5cb3..f5e1c489709 100644 --- a/ntoskrnl/kd/kdinit.c +++ b/ntoskrnl/kd/kdinit.c @@ -84,7 +84,6 @@ KdpGetDebugMode(PCHAR Currentp2) } } } - /* Check for Debug Log Debugging */ else if (!_strnicmp(p2, "FILE", 4)) { @@ -100,7 +99,6 @@ KdpGetDebugMode(PCHAR Currentp2) KdpLogFileName.Buffer = p1; } } - /* Check for BOCHS Debugging */ else if (!_strnicmp(p2, "BOCHS", 5)) { @@ -108,7 +106,6 @@ KdpGetDebugMode(PCHAR Currentp2) p2 += 5; KdpDebugMode.Bochs = TRUE; } - /* Check for GDB Debugging */ else if (!_strnicmp(p2, "GDB", 3)) { @@ -122,7 +119,6 @@ KdpGetDebugMode(PCHAR Currentp2) SharedUserData->KdDebuggerEnabled = TRUE; WrapperInitRoutine = KdpGdbStubInit; } - /* Check for PICE Debugging */ else if (!_strnicmp(p2, "PICE", 4)) { @@ -175,39 +171,55 @@ KdInitSystem(ULONG BootPhase, { ULONG Value; ULONG i; - PCHAR CommandLine, Port, BaudRate, Irq; + PCHAR CommandLine, Port = NULL, BaudRate = NULL, Irq = NULL; /* Set Default Port Options */ if (BootPhase == 0) { - /* Get the Command Line */ - CommandLine = LoaderBlock->LoadOptions; - - /* Upcase it */ - _strupr(CommandLine); - - /* XXX Check for settings that we support */ - if (strstr(CommandLine, "NODEBUG")) KdDebuggerEnabled = FALSE; - else if (strstr(CommandLine, "CRASHDEBUG")) KdDebuggerEnabled = FALSE; - else if (strstr(CommandLine, "DEBUG")) + /* Check if we have a loader block */ + if (LoaderBlock) { - /* Enable the kernel debugger */ - KdDebuggerNotPresent = FALSE; - KdDebuggerEnabled = TRUE; + /* Check if we have a command line */ + CommandLine = LoaderBlock->LoadOptions; + if (CommandLine) + { + /* Upcase it */ + _strupr(CommandLine); + + /* XXX Check for settings that we support */ + if (strstr(CommandLine, "NODEBUG")) KdDebuggerEnabled = FALSE; + else if (strstr(CommandLine, "CRASHDEBUG")) KdDebuggerEnabled = FALSE; + else if (strstr(CommandLine, "DEBUG")) + { + /* Enable the kernel debugger */ + KdDebuggerNotPresent = FALSE; + KdDebuggerEnabled = TRUE; #ifdef KDBG - /* Get the KDBG Settings */ - KdbpGetCommandLineSettings(LoaderBlock->LoadOptions); + /* Get the KDBG Settings */ + KdbpGetCommandLineSettings(LoaderBlock->LoadOptions); #endif + } + + /* Get the port and baud rate */ + Port = strstr(CommandLine, "DEBUGPORT"); + BaudRate = strstr(CommandLine, "BAUDRATE"); + Irq = strstr(CommandLine, "IRQ"); + } + else + { + /* No command line options? Disable debugger by default */ + KdDebuggerEnabled = FALSE; + } + } + else + { + /* Called from a bugcheck or a re-enable. Unconditionally enable KD */ + KdDebuggerEnabled = TRUE; } /* Let user-mode know our state */ SharedUserData->KdDebuggerEnabled = KdDebuggerEnabled; - /* Get the port and baud rate */ - Port = strstr(CommandLine, "DEBUGPORT"); - BaudRate = strstr(CommandLine, "BAUDRATE"); - Irq = strstr(CommandLine, "IRQ"); - /* Check if we got the /DEBUGPORT parameter(s) */ while (Port) {

1 0

[reactos] 01/06: [NTOS:KD] Whitespace fixes + fix helper function name.
by Hermès Bélusca-Maïto 03 Nov '19

03 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef5f034974c1850ab3fe1… commit ef5f034974c1850ab3fe196e82231e2d7c9610b9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 2 01:02:35 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:07:32 2019 +0100 [NTOS:KD] Whitespace fixes + fix helper function name. --- ntoskrnl/kd/i386/kdmemsup.c | 8 ++++---- ntoskrnl/kd64/kdapi.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/kd/i386/kdmemsup.c b/ntoskrnl/kd/i386/kdmemsup.c index 3f14bcdc9c3..7616734ce53 100644 --- a/ntoskrnl/kd/i386/kdmemsup.c +++ b/ntoskrnl/kd/i386/kdmemsup.c @@ -118,7 +118,7 @@ KdpTranslateAddress(ULONG_PTR Addr, PULONG_PTR ResultAddr) { ULONG_PTR CR3Value = __readcr3(); ULONG_PTR CR4Value = __readcr4(); - ULONG_PTR PageDirectory = (CR3Value & ~(PAGE_SIZE-1)) + + ULONG_PTR PageDirectory = (CR3Value & ~(PAGE_SIZE-1)) + ((Addr >> 22) * sizeof(ULONG)); ULONG_PTR PageDirectoryEntry = KdpPhysRead(PageDirectory, sizeof(ULONG)); @@ -137,7 +137,7 @@ KdpTranslateAddress(ULONG_PTR Addr, PULONG_PTR ResultAddr) } else { - ULONG_PTR PageTableAddr = + ULONG_PTR PageTableAddr = (PageDirectoryEntry & ~(PAGE_SIZE-1)) + ((Addr >> PAGE_SHIFT) & PAGE_TABLE_MASK) * sizeof(ULONG); ULONG_PTR PageTableEntry = KdpPhysRead(PageTableAddr, sizeof(ULONG)); @@ -165,7 +165,7 @@ KdpSafeReadMemory(ULONG_PTR Addr, LONG Len, PVOID Value) } memset(Value, 0, Len); - + if (!KdpTranslateAddress(Addr, &ResultPhysAddr)) return FALSE; @@ -199,7 +199,7 @@ KdpSafeWriteMemory(ULONG_PTR Addr, LONG Len, ULONGLONG Value) memcpy((PVOID)Addr, &Value, Len); return TRUE; } - + if (!KdpTranslateAddress(Addr, &ResultPhysAddr)) return FALSE; diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c index 9256225f94c..bfb7283ee1a 100644 --- a/ntoskrnl/kd64/kdapi.c +++ b/ntoskrnl/kd64/kdapi.c @@ -529,7 +529,7 @@ KdpWriteVirtualMemory(IN PDBGKD_MANIPULATE_STATE64 State, VOID NTAPI -KdpReadPhysicalmemory(IN PDBGKD_MANIPULATE_STATE64 State, +KdpReadPhysicalMemory(IN PDBGKD_MANIPULATE_STATE64 State, IN PSTRING Data, IN PCONTEXT Context) { @@ -592,7 +592,7 @@ KdpReadPhysicalmemory(IN PDBGKD_MANIPULATE_STATE64 State, VOID NTAPI -KdpWritePhysicalmemory(IN PDBGKD_MANIPULATE_STATE64 State, +KdpWritePhysicalMemory(IN PDBGKD_MANIPULATE_STATE64 State, IN PSTRING Data, IN PCONTEXT Context) { @@ -1395,13 +1395,13 @@ SendPacket: case DbgKdReadPhysicalMemoryApi: /* Read physical memory */ - KdpReadPhysicalmemory(&ManipulateState, &Data, Context); + KdpReadPhysicalMemory(&ManipulateState, &Data, Context); break; case DbgKdWritePhysicalMemoryApi: /* Write physical memory */ - KdpWritePhysicalmemory(&ManipulateState, &Data, Context); + KdpWritePhysicalMemory(&ManipulateState, &Data, Context); break; case DbgKdQuerySpecialCallsApi:

1 0

[reactos] 01/01: [DNSAPI][PSDK] Implement GetCurrentTimeInSeconds() and fix DnsQuery_A/UTF8/W()
by Eric Kohl 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=158fda5cdffe09626a097… commit 158fda5cdffe09626a09730f9a0832b0d7ea9353 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 2 23:59:06 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 2 23:59:06 2019 +0100 [DNSAPI][PSDK] Implement GetCurrentTimeInSeconds() and fix DnsQuery_A/UTF8/W() --- dll/win32/dnsapi/dnsapi/query.c | 44 +++++++++++++++++++++++--------------- dll/win32/dnsapi/dnsapi/stubs.c | 7 ------ sdk/include/psdk/windns.h | 6 +++--- sdk/include/reactos/windns_undoc.h | 4 ++++ 4 files changed, 34 insertions(+), 27 deletions(-) diff --git a/dll/win32/dnsapi/dnsapi/query.c b/dll/win32/dnsapi/dnsapi/query.c index 2daa2803663..f7de6ab96c8 100644 --- a/dll/win32/dnsapi/dnsapi/query.c +++ b/dll/win32/dnsapi/dnsapi/query.c @@ -16,6 +16,7 @@ #define NDEBUG #include <debug.h> + /* DnsQuery **************************** * Begin a DNS query, and allow the result to be placed in the application * supplied result pointer. The result can be manipulated with the record @@ -155,7 +156,7 @@ DnsQuery_CodePage(UINT CodePage, LPCSTR Name, WORD Type, DWORD Options, - PIP4_ARRAY Servers, + PVOID Extra, PDNS_RECORD *QueryResultSet, PVOID *Reserved) { @@ -163,7 +164,7 @@ DnsQuery_CodePage(UINT CodePage, PWCHAR Buffer; DNS_STATUS Status; PDNS_RECORD QueryResultWide; - PDNS_RECORD ConvertedRecord = 0, LastRecord = 0; + PDNS_RECORD ConvertedRecord = NULL, LastRecord = NULL; if (Name == NULL) return ERROR_INVALID_PARAMETER; @@ -184,7 +185,7 @@ DnsQuery_CodePage(UINT CodePage, return ERROR_INVALID_PARAMETER; } - Status = DnsQuery_W(Buffer, Type, Options, Servers, &QueryResultWide, Reserved); + Status = DnsQuery_W(Buffer, Type, Options, Extra, &QueryResultWide, Reserved); while (Status == ERROR_SUCCESS && QueryResultWide) { @@ -308,7 +309,7 @@ DnsQuery_CodePage(UINT CodePage, } if (LastRecord) - LastRecord->pNext = 0; + LastRecord->pNext = NULL; /* The name */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); @@ -322,22 +323,22 @@ DNS_STATUS WINAPI DnsQuery_A(LPCSTR Name, WORD Type, DWORD Options, - PIP4_ARRAY Servers, + PVOID Extra, PDNS_RECORD *QueryResultSet, PVOID *Reserved) { - return DnsQuery_CodePage(CP_ACP, Name, Type, Options, Servers, QueryResultSet, Reserved); + return DnsQuery_CodePage(CP_ACP, Name, Type, Options, Extra, QueryResultSet, Reserved); } DNS_STATUS WINAPI DnsQuery_UTF8(LPCSTR Name, WORD Type, DWORD Options, - PIP4_ARRAY Servers, + PVOID Extra, PDNS_RECORD *QueryResultSet, PVOID *Reserved) { - return DnsQuery_CodePage(CP_UTF8, Name, Type, Options, Servers, QueryResultSet, Reserved); + return DnsQuery_CodePage(CP_UTF8, Name, Type, Options, Extra, QueryResultSet, Reserved); } WCHAR @@ -725,7 +726,7 @@ DNS_STATUS WINAPI DnsQuery_W(LPCWSTR Name, WORD Type, DWORD Options, - PIP4_ARRAY Servers, + PVOID Extra, PDNS_RECORD *QueryResultSet, PVOID *Reserved) { @@ -922,14 +923,6 @@ DnsQuery_W(LPCWSTR Name, } RtlFreeHeap(RtlGetProcessHeap(), 0, network_info); - if (Servers) - { - for (i = 0; i < Servers->AddrCount; i++) - { - adns_addserver(astate, *((struct in_addr *)&Servers->AddrArray[i])); - } - } - if (!adns_numservers(astate)) { /* There are no servers to query so bail out */ @@ -1095,3 +1088,20 @@ DnsFlushResolverCache(VOID) return (Status == ERROR_SUCCESS); } + +DNS_STATUS +WINAPI +GetCurrentTimeInSeconds(VOID) +{ + FILETIME Time; + FILETIME Adjustment; + ULARGE_INTEGER lTime, lAdj; + SYSTEMTIME st = {1970, 1, 0, 1, 0, 0, 0}; + + SystemTimeToFileTime(&st, &Adjustment); + memcpy(&lAdj, &Adjustment, sizeof(lAdj)); + GetSystemTimeAsFileTime(&Time); + memcpy(&lTime, &Time, sizeof(lTime)); + lTime.QuadPart -= lAdj.QuadPart; + return (DWORD)(lTime.QuadPart/10000000LLU); +} diff --git a/dll/win32/dnsapi/dnsapi/stubs.c b/dll/win32/dnsapi/dnsapi/stubs.c index f474f34695b..0a4bf59db55 100644 --- a/dll/win32/dnsapi/dnsapi/stubs.c +++ b/dll/win32/dnsapi/dnsapi/stubs.c @@ -807,13 +807,6 @@ DnsWriteReverseNameStringForIpAddress() return ERROR_OUTOFMEMORY; } -DNS_STATUS WINAPI -GetCurrentTimeInSeconds() -{ - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - DNS_STATUS WINAPI DnsNotifyResolver() { diff --git a/sdk/include/psdk/windns.h b/sdk/include/psdk/windns.h index c989c9b4809..0c7433de660 100644 --- a/sdk/include/psdk/windns.h +++ b/sdk/include/psdk/windns.h @@ -741,7 +741,7 @@ DnsQuery_A( _In_ PCSTR pszName, _In_ WORD wType, _In_ DWORD Options, - _Inout_opt_ PIP4_ARRAY pExtra, + _Inout_opt_ PVOID pExtra, _Outptr_result_maybenull_ PDNS_RECORD *ppQueryResults, _Outptr_opt_result_maybenull_ PVOID *pReserved); @@ -751,7 +751,7 @@ DnsQuery_W( _In_ PCWSTR pszName, _In_ WORD wType, _In_ DWORD Options, - _Inout_opt_ PIP4_ARRAY pExtra, + _Inout_opt_ PVOID pExtra, _Outptr_result_maybenull_ PDNS_RECORD *ppQueryResults, _Outptr_opt_result_maybenull_ PVOID *pReserved); @@ -761,7 +761,7 @@ DnsQuery_UTF8( _In_ PCSTR pszName, _In_ WORD wType, _In_ DWORD Options, - _Inout_opt_ PIP4_ARRAY pExtra, + _Inout_opt_ PVOID pExtra, _Outptr_result_maybenull_ PDNS_RECORD *ppQueryResults, _Outptr_opt_result_maybenull_ PVOID *pReserved); diff --git a/sdk/include/reactos/windns_undoc.h b/sdk/include/reactos/windns_undoc.h index 01e6f412095..cb2e5abdbe4 100644 --- a/sdk/include/reactos/windns_undoc.h +++ b/sdk/include/reactos/windns_undoc.h @@ -27,6 +27,10 @@ WINAPI DnsGetCacheDataTable( _Out_ PDNS_CACHE_ENTRY *DnsCache); +DNS_STATUS +WINAPI +GetCurrentTimeInSeconds(VOID); + #endif /* __WIDL__ */ #ifdef __cplusplus

1 0

[reactos] 01/01: [DNSAPI] Add missing exported functions
by Eric Kohl 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01bd090db0b1bc3439af3… commit 01bd090db0b1bc3439af3b698a7285546f386233 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 2 18:47:36 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 2 18:48:31 2019 +0100 [DNSAPI] Add missing exported functions --- dll/win32/dnsapi/CMakeLists.txt | 1 + dll/win32/dnsapi/dnsapi.spec | 68 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt index a0edb35c99b..244e764e697 100644 --- a/dll/win32/dnsapi/CMakeLists.txt +++ b/dll/win32/dnsapi/CMakeLists.txt @@ -25,6 +25,7 @@ list(APPEND SOURCE add_library(dnsapi MODULE ${SOURCE} dnsapi.rc + ${CMAKE_CURRENT_BINARY_DIR}/dnsapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def) set_module_type(dnsapi win32dll) diff --git a/dll/win32/dnsapi/dnsapi.spec b/dll/win32/dnsapi/dnsapi.spec index 64ce27a4b3e..bb69e12d333 100644 --- a/dll/win32/dnsapi/dnsapi.spec +++ b/dll/win32/dnsapi/dnsapi.spec @@ -1,3 +1,5 @@ +@ stub BreakRecordsIntoBlob +@ stub CombineRecordsInBlob @ stdcall DnsAcquireContextHandle_A(long ptr ptr) @ stdcall DnsAcquireContextHandle_UTF8(long ptr ptr) @ stdcall DnsAcquireContextHandle_W(long ptr ptr) @@ -5,9 +7,11 @@ @ stdcall DnsAddRecordSet_UTF8() @ stdcall DnsAddRecordSet_W() @ stdcall DnsAllocateRecord() -@ stdcall DnsApiHeapReset() @ stdcall DnsApiAlloc(long) +@ stdcall DnsApiHeapReset() @ stdcall DnsApiFree(ptr) +@ stub DnsApiRealloc +@ stub DnsApiSetDebugGlobals @ stdcall DnsAsyncRegisterHostAddrs_A() @ stdcall DnsAsyncRegisterHostAddrs_UTF8() @ stdcall DnsAsyncRegisterHostAddrs_W() @@ -37,7 +41,9 @@ @ stdcall DnsFlushResolverCacheEntry_A(str) @ stdcall DnsFlushResolverCacheEntry_UTF8() @ stdcall DnsFlushResolverCacheEntry_W() +@ stdcall DnsFree(ptr long) @ stdcall DnsFreeAdapterInformation() +@ stub DnsFreeConfigStructure @ stdcall DnsFreeNetworkInformation() @ stdcall DnsFreeSearchInformation() @ stdcall DnsGetBufferLengthForStringCopy() @@ -56,6 +62,7 @@ @ stdcall DnsGetPrimaryDomainName_UTF8() @ stdcall DnsGetPrimaryDomainName_W() @ stdcall DnsGetSearchInformation() +@ stub DnsGlobals @ stdcall DnsIpv6AddressToString() @ stdcall DnsIpv6StringToAddress() @ stdcall DnsIsAdapterDomainNameRegistrationEnabled() @@ -70,17 +77,20 @@ @ stdcall DnsModifyRecordsInSet_A(ptr ptr long ptr ptr ptr) @ stdcall DnsModifyRecordsInSet_UTF8(ptr ptr long ptr ptr ptr) @ stdcall DnsModifyRecordsInSet_W(ptr ptr long ptr ptr ptr) -@ stdcall DnsNameCompare_A(str str) @ stdcall DnsNameCompareEx_A() @ stdcall DnsNameCompareEx_UTF8() @ stdcall DnsNameCompareEx_W() +@ stdcall DnsNameCompare_A(str str) @ stdcall DnsNameCompare_W(wstr wstr) + @ stdcall DnsNameCopy() @ stdcall DnsNameCopyAllocate() @ stdcall DnsNotifyResolver() -@ stdcall DnsQuery_A(str long long ptr ptr ptr) +@ stub DnsNotifyResolverClusterIp +@ stub DnsNotifyResolverEx @ stdcall DnsQueryConfig(long long wstr ptr ptr ptr) @ stdcall DnsQueryEx() +@ stdcall DnsQuery_A(str long long ptr ptr ptr) @ stdcall DnsQuery_UTF8(str long long ptr ptr ptr) @ stdcall DnsQuery_W(wstr long long ptr ptr ptr) @ stdcall DnsRecordBuild_UTF8() @@ -94,6 +104,7 @@ @ stdcall DnsRecordStringForType() @ stdcall DnsRecordStringForWritableType() @ stdcall DnsRecordTypeForName() +@ stub DnsRegisterClusterAddress @ stdcall DnsRelationalCompare_UTF8() @ stdcall DnsRelationalCompare_W() @ stdcall DnsReleaseContextHandle(ptr) @@ -128,5 +139,54 @@ @ stdcall DnsWriteQuestionToBuffer_UTF8(ptr ptr str long long long) @ stdcall DnsWriteQuestionToBuffer_W(ptr ptr wstr long long long) @ stdcall DnsWriteReverseNameStringForIpAddress() +@ stub Dns_AddRecordsToMessage +@ stub Dns_AllocateMsgBuf +@ stub Dns_BuildPacket +@ stub Dns_CacheSocketCleanup +@ stub Dns_CacheSocketInit +@ stub Dns_CleanupWinsock +@ stub Dns_CloseConnection +@ stub Dns_CloseHostFile +@ stub Dns_CloseSocket +@ stub Dns_CreateMulticastSocket +@ stub Dns_CreateSocket +@ stub Dns_CreateSocketEx +@ stub Dns_FindAuthoritativeZoneLib +@ stub Dns_GetIpAddresses +@ stub Dns_GetLocalIpAddressArray +@ stub Dns_GetRandomXid +@ stub Dns_InitializeMsgRemoteSockaddr +@ stub Dns_InitializeWinsock +@ stub Dns_InitQueryTimeouts +@ stub Dns_OpenHostFile +@ stub Dns_OpenTcpConnectionAndSend +@ stub Dns_ParseMessage +@ stub Dns_ParsePacketRecord +@ stub Dns_PingAdapterServers +@ stub Dns_ReadHostFileLine +@ stub Dns_ReadPacketName +@ stub Dns_ReadPacketNameAllocate +@ stub Dns_ReadRecordStructureFromPacket +@ stub Dns_RecvTcp +@ stub Dns_ResetNetworkInfo +@ stub Dns_SendAndRecvUdp +@ stub Dns_SendEx +@ stub Dns_SetRecordDatalength +@ stub Dns_SkipPacketName +@ stub Dns_SkipToRecord +@ stub Dns_UpdateLib +@ stub Dns_UpdateLibEx +@ stub Dns_WriteDottedNameToPacket +@ stub Dns_WriteQuestionToMessage +@ stub Dns_WriteRecordStructureToPacketEx @ stdcall GetCurrentTimeInSeconds() -@ stdcall DnsFree(ptr long) +@ stub GetRecordsForLocalName +@ stub NetInfo_Build +@ stub NetInfo_Clean +@ stub NetInfo_Copy +@ stub NetInfo_Free +@ stub NetInfo_IsForUpdate +@ stub NetInfo_ResetServerPriorities +@ stub QueryDirectEx +@ stub Query_Main +@ stub Reg_ReadGlobalsEx

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs