Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 52298: [UPDSPAPI] * Fix exports. Thank you, gcc toolchain, for letting this slip without any problems. * Brought to you by the msvc toolchain.
by akhaldi＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: akhaldi Date: Fri Jun 17 10:13:15 2011 New Revision: 52298 URL: http://svn.reactos.org/svn/reactos?rev=52298&view=rev Log: [UPDSPAPI] * Fix exports. Thank you, gcc toolchain, for letting this slip without any problems. * Brought to you by the msvc toolchain. Modified: trunk/reactos/dll/win32/updspapi/updspapi.spec Modified: trunk/reactos/dll/win32/updspapi/updspapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/updspapi/updspap… ============================================================================== --- trunk/reactos/dll/win32/updspapi/updspapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/updspapi/updspapi.spec [iso-8859-1] Fri Jun 17 10:13:15 2011 @@ -67,12 +67,12 @@ @ stub UpdSpSetDynamicStringExA @ stub UpdSpSetDynamicStringExW @ stub UpdSpSetDynamicStringW -@ stdcall UpdSpStringTableAddString(ptr wstr long) setupapi.StringTableAddString -@ stdcall UpdSpStringTableAddStringEx(ptr wstr long ptr long) setupapi.StringTableAddStringEx -@ stdcall UpdSpStringTableDestroy(ptr) setupapi.StringTableDestroy +@ stdcall UpdSpStringTableAddString(ptr wstr long) setupapi.pSetupStringTableAddString +@ stdcall UpdSpStringTableAddStringEx(ptr wstr long ptr long) setupapi.pSetupStringTableAddStringEx +@ stdcall UpdSpStringTableDestroy(ptr) setupapi.pSetupStringTableDestroy @ stub UpdSpStringTableEnum -@ stdcall UpdSpStringTableInitialize() setupapi.StringTableInitialize -@ stdcall UpdSpStringTableInitializeEx(long long) setupapi.StringTableInitializeEx -@ stdcall UpdSpStringTableLookUpString(ptr wstr long) setupapi.StringTableLookUpString -@ stdcall UpdSpStringTableLookUpStringEx(ptr wstr long ptr long) setupapi.StringTableLookUpStringEx +@ stdcall UpdSpStringTableInitialize() setupapi.pSetupStringTableInitialize +@ stdcall UpdSpStringTableInitializeEx(long long) setupapi.pSetupStringTableInitializeEx +@ stdcall UpdSpStringTableLookUpString(ptr wstr long) setupapi.pSetupStringTableLookUpString +@ stdcall UpdSpStringTableLookUpStringEx(ptr wstr long ptr long) setupapi.pSetupStringTableLookUpStringEx @ stdcall UpdSpTermDefaultQueueCallback(ptr) setupapi.SetupTermDefaultQueueCallback

1 0

[akhaldi] 52297: [CMAKE] * Skip dxdiag in msvc builds.
by akhaldi＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: akhaldi Date: Fri Jun 17 09:52:40 2011 New Revision: 52297 URL: http://svn.reactos.org/svn/reactos?rev=52297&view=rev Log: [CMAKE] * Skip dxdiag in msvc builds. Modified: trunk/reactos/base/applications/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Fri Jun 17 09:52:40 2011 @@ -4,7 +4,9 @@ add_subdirectory(charmap) add_subdirectory(cmdutils) add_subdirectory(control) -add_subdirectory(dxdiag) +if(NOT MSVC) + add_subdirectory(dxdiag) # FIXME: msvc build. +endif() add_subdirectory(extrac32) add_subdirectory(findstr) add_subdirectory(fontview)

1 0

[akhaldi] 52296: [OSKITTCP] * Fix msvc build. The tcpip driver compiles and links with msvc as a result.
by akhaldi＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: akhaldi Date: Fri Jun 17 09:43:02 2011 New Revision: 52296 URL: http://svn.reactos.org/svn/reactos?rev=52296&view=rev Log: [OSKITTCP] * Fix msvc build. The tcpip driver compiles and links with msvc as a result. Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] Fri Jun 17 09:43:02 2011 @@ -17,21 +17,8 @@ #define ovbcopy(src,dst,n) memmove(dst,src,n) #define bzero(x,y) memset(x,0,y) #define bcopy(src,dst,n) memcpy(dst,src,n) -#ifdef _MSC_VER -static __inline void panic ( const char* fmt, ... ) -{ - va_list arg; - va_start(arg, fmt); - printf ( "oskit PANIC: " ); - vprintf ( fmt, arg ); - va_end(arg); - // TODO FIXME - print stack trace... - oskittcp_die("<unknown file>",-1); -} -#else//_MSC_VER #define panic(...) do { printf(__VA_ARGS__); \ oskittcp_die(__FILE__,__LINE__); } while(0) -#endif//_MSC_VER #define kmem_malloc(x,y,z) malloc(y,0,0) #endif//_OSKITFREEBSD_H Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] Fri Jun 17 09:43:02 2011 @@ -610,7 +610,7 @@ if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 && (so->so_proto->pr_flags & PR_CONNREQUIRED)) { printf("so: %x\n", so); - __asm__("int3"); + __debugbreak(); error = ENOTCONN; goto release; }

1 0

[akhaldi] 52295: [ROSSYM_NEW] * Update dummy.c to reflect the recent changes. The kernel compiles and links now with msvc.
by akhaldi＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: akhaldi Date: Fri Jun 17 09:17:10 2011 New Revision: 52295 URL: http://svn.reactos.org/svn/reactos?rev=52295&view=rev Log: [ROSSYM_NEW] * Update dummy.c to reflect the recent changes. The kernel compiles and links now with msvc. Modified: trunk/reactos/lib/rossym_new/dummy.c Modified: trunk/reactos/lib/rossym_new/dummy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dummy.c?rev… ============================================================================== --- trunk/reactos/lib/rossym_new/dummy.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dummy.c [iso-8859-1] Fri Jun 17 09:17:10 2011 @@ -16,14 +16,22 @@ { } +VOID +RosSymFreeInfo(PROSSYM_LINEINFO LineInfo) +{ +} + BOOLEAN RosSymGetAddressInformation(PROSSYM_INFO RosSymInfo, ULONG_PTR RelativeAddress, - ULONG *LineNumber, - char *FileName, - char *FunctionName) + PROSSYM_LINEINFO RosSymLineInfo) { return FALSE; +} + +VOID +RosSymInit(PROSSYM_CALLBACKS Callbacks) +{ } VOID

1 0

[akhaldi] 52294: [KERNEL32] * Merge 49379 from the cmake branch. Fixes msvc build.
by akhaldi＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: akhaldi Date: Fri Jun 17 08:57:01 2011 New Revision: 52294 URL: http://svn.reactos.org/svn/reactos?rev=52294&view=rev Log: [KERNEL32] * Merge 49379 from the cmake branch. Fixes msvc build. Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Fri Jun 17 08:57:01 2011 @@ -9,8 +9,8 @@ #include "locale_rc.rc" +#include "lang/en-US.rc" #include "lang/de-DE.rc" -#include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[tkreuzer] 52293: [FREELDR] Fix build with good old rbuild
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 08:49:22 2011 New Revision: 52293 URL: http://svn.reactos.org/svn/reactos?rev=52293&view=rev Log: [FREELDR] Fix build with good old rbuild Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.cmake.S (with props) Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Jun 17 08:49:22 2011 @@ -13,11 +13,11 @@ arch/i386/entry.S arch/i386/i386idt.c arch/i386/i386trap.S + arch/i386/i386pnp.cmake.S arch/i386/i386bug.c) if(NOT MSVC) list(APPEND FREELDR_BASE64K_SOURCE arch/i386/drvmap.S - arch/i386/i386pnp.S arch/i386/linux.S arch/i386/multiboot.S arch/i386/mb.S) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S [iso-8859-1] Fri Jun 17 08:49:22 2011 @@ -28,6 +28,11 @@ * * RETURNS: */ +_pnp_bios_entry_point: + .long 0 +_pnp_bios_data_segment: + .word 0 + PUBLIC _PnpBiosSupported _PnpBiosSupported: @@ -77,11 +82,11 @@ mov ax, [esi + 15] shl eax, 16 mov ax, [esi + 0x0D] - mov [BSS_PnpBiosEntryPoint], eax + mov _pnp_bios_entry_point, eax /* Store bios data segment */ mov ax, [esi + 0x1B] - mov word ptr ds:[BSS_PnpBiosDataSegment], ax + mov _pnp_bios_data_segment, ax pnp_not_found: mov eax, edi @@ -99,6 +104,13 @@ * * RETURNS: */ +_pnp_result: + .long 0 +_pnp_node_size: + .word 0 +_pnp_node_count: + .word 0 + PUBLIC _PnpBiosGetDeviceNodeCount _PnpBiosGetDeviceNodeCount: @@ -108,16 +120,39 @@ pusha push es - mov bx, FNID_PnpBiosGetDeviceNodeCount - call i386CallRealMode + call switch_to_real + .code16 + + mov ax, word ptr [_pnp_bios_data_segment] + push ax + + push cs + mov ax, offset _pnp_node_size + push ax + + push cs + mov ax, offset _pnp_node_count + push ax + + push 0 + + call dword ptr [_pnp_bios_entry_point] + add sp, 12 + + movzx ecx, ax + mov _pnp_result, ecx + + + call switch_to_prot + .code32 mov esi, [ebp + 8] - mov ax, [BSS_PnpNodeSize] + mov ax, _pnp_node_size movzx ecx, ax mov [esi], ecx mov esi, [ebp + 12] - mov ax, [BSS_PnpNodeCount] + mov ax, _pnp_node_count movzx ecx, ax mov [esi], eax @@ -127,7 +162,7 @@ mov esp, ebp pop ebp - mov eax, dword ptr [BSS_PnpResult] + mov eax, _pnp_result ret @@ -137,6 +172,14 @@ * * RETURNS: */ +_pnp_buffer_segment: + .word 0 +_pnp_buffer_offset: + .word 0 + +_pnp_node_number: + .byte 0 + EXTERN(_PnpBiosGetDeviceNode) .code32 @@ -149,23 +192,54 @@ /* get current node number */ mov esi, [ebp + 8] mov al, [esi] - mov [BSS_PnpNodeNumber], al + mov _pnp_node_number, al /* convert pointer to node buffer to segment/offset */ mov eax, [ebp + 12] shr eax, 4 and eax, 0xf000 - mov word ptr [BSS_PnpBiosBufferSegment], ax + mov _pnp_buffer_segment, ax mov eax, [ebp + 12] and eax, 0xffff - mov [BSS_PnpBiosBufferOffset], ax - - mov bx, FNID_PnpBiosGetDeviceNode - call i386CallRealMode + mov _pnp_buffer_offset, ax + + call switch_to_real + .code16 + + /* push bios segment */ + mov ax, word ptr [_pnp_bios_data_segment] + push ax + + /* push control flag */ + push 1 + + /* push pointer to node buffer (segment/offset) */ + mov ax, word ptr [_pnp_buffer_segment] + push ax + mov ax, word ptr [_pnp_buffer_offset] + push ax + + /* push pointer to node number (segment/offset) */ + push cs + mov ax, offset _pnp_node_number + push ax + + /* push function number */ + push 1 + + /* call entry point */ + call dword ptr [_pnp_bios_entry_point] + add sp, 14 + + movzx ecx, ax + mov _pnp_result, ecx + + call switch_to_prot + .code32 /* update node number */ mov esi, [ebp + 8] - mov al, [BSS_PnpNodeNumber] + mov al, _pnp_node_number mov [esi], al pop es @@ -174,7 +248,7 @@ mov esp, ebp pop ebp - mov eax, [BSS_PnpResult] + mov eax, _pnp_result ret Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.cmake.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.cmake.S (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.cmake.S [iso-8859-1] Fri Jun 17 08:49:22 2011 @@ -1,0 +1,181 @@ +/* + * FreeLoader + * Copyright (C) 2003 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <asm.inc> +#include <arch/pc/x86common.h> + +.code32 + + +/* + * U32 PnpBiosSupported(VOID); + * + * RETURNS: + */ +PUBLIC _PnpBiosSupported +_PnpBiosSupported: + + push edi + push esi + push ecx + push edx + + xor edi, edi + + /* init esi */ + mov esi, HEX(0F0000) + +pnp_again: + mov eax, [esi] + cmp eax, HEX(506E5024) /* "$PnP" */ + je pnp_found + + cmp esi, HEX(0FFFF0) + je pnp_not_found + +pnp_add: + add esi, 16 + jmp pnp_again + +pnp_found: + /* first calculate the checksum */ + push esi + + push HEX(21) + pop ecx + xor edx, edx + +pnp_loop: + lodsb + add dl, al + loop pnp_loop + + test dl, dl + pop esi + jnz pnp_add + + mov edi, esi + + /* Calculate the bios entry point (far pointer) */ + xor eax, eax + mov ax, [esi + 15] + shl eax, 16 + mov ax, [esi + 0x0D] + mov [BSS_PnpBiosEntryPoint], eax + + /* Store bios data segment */ + mov ax, [esi + 0x1B] + mov word ptr ds:[BSS_PnpBiosDataSegment], ax + +pnp_not_found: + mov eax, edi + + pop edx + pop ecx + pop esi + pop edi + + ret + + +/* + * U32 PnpBiosGetDeviceNodeCount(U32 *NodeSize, U32 *NodeCount); + * + * RETURNS: + */ +PUBLIC _PnpBiosGetDeviceNodeCount +_PnpBiosGetDeviceNodeCount: + + push ebp + mov ebp, esp + + pusha + push es + + mov bx, FNID_PnpBiosGetDeviceNodeCount + call i386CallRealMode + + mov esi, [ebp + 8] + mov ax, [BSS_PnpNodeSize] + movzx ecx, ax + mov [esi], ecx + + mov esi, [ebp + 12] + mov ax, [BSS_PnpNodeCount] + movzx ecx, ax + mov [esi], eax + + pop es + popa + + mov esp, ebp + pop ebp + + mov eax, dword ptr [BSS_PnpResult] + + ret + + +/* + * U32 PnpBiosGetDeviceNode(U8 *NodeId, U8 *NodeBuffer); + * + * RETURNS: + */ +EXTERN(_PnpBiosGetDeviceNode) + .code32 + + push ebp + mov ebp, esp + + pusha + push es + + /* get current node number */ + mov esi, [ebp + 8] + mov al, [esi] + mov [BSS_PnpNodeNumber], al + + /* convert pointer to node buffer to segment/offset */ + mov eax, [ebp + 12] + shr eax, 4 + and eax, 0xf000 + mov word ptr [BSS_PnpBiosBufferSegment], ax + mov eax, [ebp + 12] + and eax, 0xffff + mov [BSS_PnpBiosBufferOffset], ax + + mov bx, FNID_PnpBiosGetDeviceNode + call i386CallRealMode + + /* update node number */ + mov esi, [ebp + 8] + mov al, [BSS_PnpNodeNumber] + mov [esi], al + + pop es + popa + + mov esp, ebp + pop ebp + + mov eax, [BSS_PnpResult] + + ret + +/* EOF */ Propchange: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.cmake.S ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 52292: [FREELDR] - Use new relmode code for PnpBios stuff
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 08:36:49 2011 New Revision: 52292 URL: http://svn.reactos.org/svn/reactos?rev=52292&view=rev Log: [FREELDR] - Use new relmode code for PnpBios stuff Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S [iso-8859-1] Fri Jun 17 08:36:49 2011 @@ -28,11 +28,6 @@ * * RETURNS: */ -_pnp_bios_entry_point: - .long 0 -_pnp_bios_data_segment: - .word 0 - PUBLIC _PnpBiosSupported _PnpBiosSupported: @@ -82,11 +77,11 @@ mov ax, [esi + 15] shl eax, 16 mov ax, [esi + 0x0D] - mov _pnp_bios_entry_point, eax + mov [BSS_PnpBiosEntryPoint], eax /* Store bios data segment */ mov ax, [esi + 0x1B] - mov _pnp_bios_data_segment, ax + mov word ptr ds:[BSS_PnpBiosDataSegment], ax pnp_not_found: mov eax, edi @@ -104,13 +99,6 @@ * * RETURNS: */ -_pnp_result: - .long 0 -_pnp_node_size: - .word 0 -_pnp_node_count: - .word 0 - PUBLIC _PnpBiosGetDeviceNodeCount _PnpBiosGetDeviceNodeCount: @@ -120,39 +108,16 @@ pusha push es - call switch_to_real - .code16 - - mov ax, word ptr [_pnp_bios_data_segment] - push ax - - push cs - mov ax, offset _pnp_node_size - push ax - - push cs - mov ax, offset _pnp_node_count - push ax - - push 0 - - call dword ptr [_pnp_bios_entry_point] - add sp, 12 - - movzx ecx, ax - mov _pnp_result, ecx - - - call switch_to_prot - .code32 + mov bx, FNID_PnpBiosGetDeviceNodeCount + call i386CallRealMode mov esi, [ebp + 8] - mov ax, _pnp_node_size + mov ax, [BSS_PnpNodeSize] movzx ecx, ax mov [esi], ecx mov esi, [ebp + 12] - mov ax, _pnp_node_count + mov ax, [BSS_PnpNodeCount] movzx ecx, ax mov [esi], eax @@ -162,7 +127,7 @@ mov esp, ebp pop ebp - mov eax, _pnp_result + mov eax, dword ptr [BSS_PnpResult] ret @@ -172,14 +137,6 @@ * * RETURNS: */ -_pnp_buffer_segment: - .word 0 -_pnp_buffer_offset: - .word 0 - -_pnp_node_number: - .byte 0 - EXTERN(_PnpBiosGetDeviceNode) .code32 @@ -192,54 +149,23 @@ /* get current node number */ mov esi, [ebp + 8] mov al, [esi] - mov _pnp_node_number, al + mov [BSS_PnpNodeNumber], al /* convert pointer to node buffer to segment/offset */ mov eax, [ebp + 12] shr eax, 4 and eax, 0xf000 - mov _pnp_buffer_segment, ax + mov word ptr [BSS_PnpBiosBufferSegment], ax mov eax, [ebp + 12] and eax, 0xffff - mov _pnp_buffer_offset, ax + mov [BSS_PnpBiosBufferOffset], ax - call switch_to_real - .code16 - - /* push bios segment */ - mov ax, word ptr [_pnp_bios_data_segment] - push ax - - /* push control flag */ - push 1 - - /* push pointer to node buffer (segment/offset) */ - mov ax, word ptr [_pnp_buffer_segment] - push ax - mov ax, word ptr [_pnp_buffer_offset] - push ax - - /* push pointer to node number (segment/offset) */ - push cs - mov ax, offset _pnp_node_number - push ax - - /* push function number */ - push 1 - - /* call entry point */ - call dword ptr [_pnp_bios_entry_point] - add sp, 14 - - movzx ecx, ax - mov _pnp_result, ecx - - call switch_to_prot - .code32 + mov bx, FNID_PnpBiosGetDeviceNode + call i386CallRealMode /* update node number */ mov esi, [ebp + 8] - mov al, _pnp_node_number + mov al, [BSS_PnpNodeNumber] mov [esi], al pop es @@ -248,7 +174,7 @@ mov esp, ebp pop ebp - mov eax, _pnp_result + mov eax, [BSS_PnpResult] ret Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Fri Jun 17 08:36:49 2011 @@ -123,11 +123,15 @@ nop // FIXME: use ljmp16 PMODE_CS:inpmode + hexed 32bit jump + + callback_table: .word Int386 .word SoftReboot .word ChainLoadBiosBootSectorCode .word PxeCallApi + .word PnpBiosGetDeviceNodeCount + .word PnpBiosGetDeviceNode /* 16-bit stack pointer */ @@ -180,6 +184,8 @@ //.org 1024 #include "int386.inc" +#include "pxe.inc" +#include "pnp.inc" #include "helpers.inc" .org (FREELDR_PE_BASE - FREELDR_BASE) Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc [iso-8859-1] Fri Jun 17 08:36:49 2011 @@ -1,0 +1,58 @@ + + +PnpBiosGetDeviceNodeCount: + + mov ax, word ptr [BSS_PnpBiosDataSegment] + push ax + + push cs + mov ax, BSS_PnpNodeSize + push ax + + push cs + mov ax, BSS_PnpNodeCount + push ax + + push 0 + + call dword ptr [BSS_PnpBiosEntryPoint] + add sp, 12 + + movzx ecx, ax + mov dword ptr [BSS_PnpResult], ecx + + ret + + +PnpBiosGetDeviceNode: + + /* push bios segment */ + mov ax, word ptr [BSS_PnpBiosDataSegment] + push ax + + /* push control flag */ + push 1 + + /* push pointer to node buffer (segment/offset) */ + mov ax, word ptr [BSS_PnpBiosBufferSegment] + push ax + mov ax, word ptr [BSS_PnpBiosBufferOffset] + push ax + + /* push pointer to node number (segment/offset) */ + push cs + mov ax, BSS_PnpNodeNumber + push ax + + /* push function number */ + push 1 + + /* call entry point */ + call dword ptr [BSS_PnpBiosEntryPoint] + add sp, 14 + + movzx ecx, ax + mov [BSS_PnpResult], ecx + + ret + Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc [iso-8859-1] Fri Jun 17 08:36:49 2011 @@ -1,0 +1,33 @@ +/* + * FreeLoader + * Copyright (C) 2011 Hervé Poussineau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + +PxeCallApi: + + mov ax, [BSS_PxeBufferSegment] + push ax + mov ax, [BSS_PxeBufferOffset] + push ax + mov ax, [BSS_PxeFunction] + push ax + call dword ptr [BSS_PxeEntryPoint] + add esp, 6 + mov [BSS_PxeResult], ax + + ret Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] Fri Jun 17 08:36:49 2011 @@ -71,15 +71,6 @@ /* hwpci.c */ VOID DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); -/* i386cpu.S */ -ULONG CpuidSupported(VOID); -VOID GetCpuid(ULONG Level, - ULONG *eax, - ULONG *ebx, - ULONG *ecx, - ULONG *edx); -ULONGLONG RDTSC(VOID); - /* i386pnp.S */ ULONG_PTR PnpBiosSupported(VOID); ULONG PnpBiosGetDeviceNodeCount(ULONG *NodeSize, Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Fri Jun 17 08:36:49 2011 @@ -22,16 +22,24 @@ #define DISKREADBUFFER_SIZE 512 /* These addresses specify the realmode "BSS section" layout */ -#define BSS_RealModeEntry (BSS_START + 0) -#define BSS_CallbackAddress (BSS_START + 4) -#define BSS_CallbackReturn (BSS_START + 8) -#define BSS_RegisterSet (BSS_START + 16) /* size = 36 */ -#define BSS_IntVector (BSS_START + 52) -#define BSS_PxeEntryPoint (BSS_START + 56) -#define BSS_PxeBufferSegment (BSS_START + 60) -#define BSS_PxeBufferOffset (BSS_START + 64) -#define BSS_PxeFunction (BSS_START + 68) -#define BSS_PxeResult (BSS_START + 72) +#define BSS_RealModeEntry (BSS_START + 0) +#define BSS_CallbackAddress (BSS_START + 4) +#define BSS_CallbackReturn (BSS_START + 8) +#define BSS_RegisterSet (BSS_START + 16) /* size = 36 */ +#define BSS_IntVector (BSS_START + 52) +#define BSS_PxeEntryPoint (BSS_START + 56) +#define BSS_PxeBufferSegment (BSS_START + 60) +#define BSS_PxeBufferOffset (BSS_START + 64) +#define BSS_PxeFunction (BSS_START + 68) +#define BSS_PxeResult (BSS_START + 72) +#define BSS_PnpBiosEntryPoint (BSS_START + 76) +#define BSS_PnpBiosDataSegment (BSS_START + 80) +#define BSS_PnpBiosBufferSegment (BSS_START + 84) +#define BSS_PnpBiosBufferOffset (BSS_START + 88) +#define BSS_PnpNodeSize (BSS_START + 92) +#define BSS_PnpNodeCount (BSS_START + 96) +#define BSS_PnpNodeNumber (BSS_START + 100) +#define BSS_PnpResult (BSS_START + 104) /* Realmode function IDs */ @@ -39,6 +47,8 @@ #define FNID_SoftReboot 1 #define FNID_ChainLoadBiosBootSectorCode 2 #define FNID_PxeCallApi 3 +#define FNID_PnpBiosGetDeviceNodeCount 4 +#define FNID_PnpBiosGetDeviceNode 5 /* Layout of the REGS structure */ #define REGS_EAX 0

1 0

[tkreuzer] 52291: [FREELDR] convert i386pnp.S to intel sytax
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 07:53:56 2011 New Revision: 52291 URL: http://svn.reactos.org/svn/reactos?rev=52291&view=rev Log: [FREELDR] convert i386pnp.S to intel sytax Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S [iso-8859-1] Fri Jun 17 07:53:56 2011 @@ -17,11 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - .text - .code16 - +#include <asm.inc> #include <arch/pc/x86common.h> +.code32 /* @@ -34,68 +33,68 @@ _pnp_bios_data_segment: .word 0 -EXTERN(_PnpBiosSupported) - .code32 - - pushl %edi - pushl %esi - pushl %ecx - pushl %edx - - xorl %edi,%edi +PUBLIC _PnpBiosSupported +_PnpBiosSupported: + + push edi + push esi + push ecx + push edx + + xor edi, edi /* init esi */ - movl $0xF0000,%esi + mov esi, HEX(0F0000) pnp_again: - movl (%esi),%eax - cmp $0x506E5024,%eax /* "$PnP" */ - je pnp_found - - cmp $0xFFFF0,%esi - je pnp_not_found + mov eax, [esi] + cmp eax, HEX(506E5024) /* "$PnP" */ + je pnp_found + + cmp esi, HEX(0FFFF0) + je pnp_not_found pnp_add: - addl $0x10,%esi - jmp pnp_again + add esi, 16 + jmp pnp_again pnp_found: /* first calculate the checksum */ - pushl %esi - - pushl $0x21 - popl %ecx - xorl %edx, %edx + push esi + + push HEX(21) + pop ecx + xor edx, edx pnp_loop: lodsb - addb %al,%dl - loopl pnp_loop - - testb %dl, %dl - popl %esi - jnz pnp_add - - movl %esi,%edi + add dl, al + loop pnp_loop + + test dl, dl + pop esi + jnz pnp_add + + mov edi, esi /* Calculate the bios entry point (far pointer) */ - xorl %eax,%eax - movw 0x0F(%esi),%ax - shll $16,%eax - movw 0x0D(%esi),%ax - movl %eax,_pnp_bios_entry_point + xor eax, eax + mov ax, [esi + 15] + shl eax, 16 + mov ax, [esi + 0x0D] + mov _pnp_bios_entry_point, eax /* Store bios data segment */ - movw 0x1B(%esi),%ax - movw %ax,_pnp_bios_data_segment + mov ax, [esi + 0x1B] + mov _pnp_bios_data_segment, ax pnp_not_found: - movl %edi,%eax - - popl %edx - popl %ecx - popl %esi - popl %edi + mov eax, edi + + pop edx + pop ecx + pop esi + pop edi ret @@ -112,58 +111,58 @@ _pnp_node_count: .word 0 -EXTERN(_PnpBiosGetDeviceNodeCount) +PUBLIC _PnpBiosGetDeviceNodeCount +_PnpBiosGetDeviceNodeCount: + + push ebp + mov ebp, esp + + pusha + push es + + call switch_to_real + .code16 + + mov ax, word ptr [_pnp_bios_data_segment] + push ax + + push cs + mov ax, offset _pnp_node_size + push ax + + push cs + mov ax, offset _pnp_node_count + push ax + + push 0 + + call dword ptr [_pnp_bios_entry_point] + add sp, 12 + + movzx ecx, ax + mov _pnp_result, ecx + + + call switch_to_prot .code32 - pushl %ebp - movl %esp,%ebp - - pushal - push %es - - call switch_to_real - .code16 - - movw _pnp_bios_data_segment,%ax - pushw %ax - - pushw %cs - movw $(_pnp_node_size),%ax - pushw %ax - - pushw %cs - movw $(_pnp_node_count),%ax - pushw %ax - - pushw $0 - - lcall *_pnp_bios_entry_point - addw $12,%sp - - movzwl %ax,%ecx - movl %ecx,_pnp_result - - - call switch_to_prot - .code32 - - movl 0x08(%ebp),%esi - movw _pnp_node_size,%ax - movzwl %ax,%ecx - movl %ecx, (%esi) - - movl 0x0C(%ebp),%esi - movw _pnp_node_count,%ax - movzwl %ax,%ecx - movl %eax, (%esi) - - pop %es - popal - - movl %ebp,%esp - popl %ebp - - movl _pnp_result,%eax + mov esi, [ebp + 8] + mov ax, _pnp_node_size + movzx ecx, ax + mov [esi], ecx + + mov esi, [ebp + 12] + mov ax, _pnp_node_count + movzx ecx, ax + mov [esi], eax + + pop es + popa + + mov esp, ebp + pop ebp + + mov eax, _pnp_result ret @@ -184,72 +183,72 @@ EXTERN(_PnpBiosGetDeviceNode) .code32 - pushl %ebp - movl %esp,%ebp - - pushal - push %es + push ebp + mov ebp, esp + + pusha + push es /* get current node number */ - movl 0x08(%ebp),%esi - movb (%esi),%al - movb %al,_pnp_node_number + mov esi, [ebp + 8] + mov al, [esi] + mov _pnp_node_number, al /* convert pointer to node buffer to segment/offset */ - movl 0x0C(%ebp),%eax - shrl $4,%eax - andl $0xf000,%eax - movw %ax,_pnp_buffer_segment - movl 0x0C(%ebp),%eax - andl $0xffff,%eax - movw %ax,_pnp_buffer_offset - - call switch_to_real + mov eax, [ebp + 12] + shr eax, 4 + and eax, 0xf000 + mov _pnp_buffer_segment, ax + mov eax, [ebp + 12] + and eax, 0xffff + mov _pnp_buffer_offset, ax + + call switch_to_real .code16 /* push bios segment */ - movw _pnp_bios_data_segment,%ax - pushw %ax + mov ax, word ptr [_pnp_bios_data_segment] + push ax /* push control flag */ - pushw $0x0001 + push 1 /* push pointer to node buffer (segment/offset) */ - movw _pnp_buffer_segment,%ax - pushw %ax - movw _pnp_buffer_offset,%ax - pushw %ax + mov ax, word ptr [_pnp_buffer_segment] + push ax + mov ax, word ptr [_pnp_buffer_offset] + push ax /* push pointer to node number (segment/offset) */ - pushw %cs - movw $(_pnp_node_number),%ax - pushw %ax + push cs + mov ax, offset _pnp_node_number + push ax /* push function number */ - pushw $1 + push 1 /* call entry point */ - lcall *_pnp_bios_entry_point - addw $14,%sp - - movzwl %ax,%ecx - movl %ecx,_pnp_result - - call switch_to_prot + call dword ptr [_pnp_bios_entry_point] + add sp, 14 + + movzx ecx, ax + mov _pnp_result, ecx + + call switch_to_prot .code32 /* update node number */ - movl 0x08(%ebp),%esi - movb _pnp_node_number,%al - movb %al,(%esi) - - pop %es - popal - - movl %ebp,%esp - popl %ebp - - movl _pnp_result,%eax + mov esi, [ebp + 8] + mov al, _pnp_node_number + mov [esi], al + + pop es + popa + + mov esp, ebp + pop ebp + + mov eax, _pnp_result ret

1 0

[cgutman] 52290: [NTOSKRNL] - Revert r52289 (I guess 0 is a valid minor function) - Add a comment to prevent anyone else from making the same mistake I did
by cgutman＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: cgutman Date: Fri Jun 17 01:07:26 2011 New Revision: 52290 URL: http://svn.reactos.org/svn/reactos?rev=52290&view=rev Log: [NTOSKRNL] - Revert r52289 (I guess 0 is a valid minor function) - Add a comment to prevent anyone else from making the same mistake I did Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Fri Jun 17 01:07:26 2011 @@ -370,21 +370,10 @@ StackPtr->MajorFunction = IsDevIoCtl ? IRP_MJ_DEVICE_CONTROL : IRP_MJ_FILE_SYSTEM_CONTROL; + StackPtr->MinorFunction = 0; /* Minor function 0 is IRP_MN_USER_FS_REQUEST */ StackPtr->Control = 0; StackPtr->Flags = 0; StackPtr->Parameters.DeviceIoControl.Type3InputBuffer = NULL; - - /* Check if this is a FS control request */ - if (StackPtr->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL) - { - /* It is, so we have to set a minor function */ - StackPtr->MinorFunction = (Irp->RequestorMode == KernelMode) ? IRP_MN_KERNEL_CALL : IRP_MN_USER_FS_REQUEST; - } - else - { - /* Minor function doesn't matter for regular device control requests */ - StackPtr->MinorFunction = 0; - } /* Set the IOCTL Data */ StackPtr->Parameters.DeviceIoControl.IoControlCode = IoControlCode;

1 0

[cgutman] 52289: [NTOSKRNL] - Fix a critical bug in IopDeviceFsIoControl which caused all FSCTL requests sent via NtFsControlFile and ZwFsControlFile to fail
by cgutman＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: cgutman Date: Fri Jun 17 00:57:55 2011 New Revision: 52289 URL: http://svn.reactos.org/svn/reactos?rev=52289&view=rev Log: [NTOSKRNL] - Fix a critical bug in IopDeviceFsIoControl which caused all FSCTL requests sent via NtFsControlFile and ZwFsControlFile to fail Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Fri Jun 17 00:57:55 2011 @@ -370,10 +370,21 @@ StackPtr->MajorFunction = IsDevIoCtl ? IRP_MJ_DEVICE_CONTROL : IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = 0; StackPtr->Control = 0; StackPtr->Flags = 0; StackPtr->Parameters.DeviceIoControl.Type3InputBuffer = NULL; + + /* Check if this is a FS control request */ + if (StackPtr->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL) + { + /* It is, so we have to set a minor function */ + StackPtr->MinorFunction = (Irp->RequestorMode == KernelMode) ? IRP_MN_KERNEL_CALL : IRP_MN_USER_FS_REQUEST; + } + else + { + /* Minor function doesn't matter for regular device control requests */ + StackPtr->MinorFunction = 0; + } /* Set the IOCTL Data */ StackPtr->Parameters.DeviceIoControl.IoControlCode = IoControlCode;

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