Ros-diffs September 2012

ros-diffs@reactos.org

17 participants
236 discussions

[akhaldi] 57327: [NTOSKRNL] * Remove spurious parenthesis.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 18 21:49:41 2012 New Revision: 57327 URL: http://svn.reactos.org/svn/reactos?rev=57327&view=rev Log: [NTOSKRNL] * Remove spurious parenthesis. Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Tue Sep 18 21:49:41 2012 @@ -102,7 +102,7 @@ while (NamePosition < Name->Length / sizeof(WCHAR) && ExpressionPosition < Expression->Length / sizeof(WCHAR)) { /* Basic check to test if chars are equal */ - if ((Expression->Buffer[ExpressionPosition] == (IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]))) + if (Expression->Buffer[ExpressionPosition] == (IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition])) { NamePosition++; ExpressionPosition++;

12 years

[akhaldi] 57326: [WIN32SS] * Mark some the lack of parameters in some functions using VOID. Clang now happily compiles them.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 18 21:45:00 2012 New Revision: 57326 URL: http://svn.reactos.org/svn/reactos?rev=57326&view=rev Log: [WIN32SS] * Mark some the lack of parameters in some functions using VOID. Clang now happily compiles them. Modified: trunk/reactos/win32ss/gdi/ntgdi/device.c trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/hook.h trunk/reactos/win32ss/user/win32csr/guiconsole.c trunk/reactos/win32ss/user/win32csr/guiconsole.h Modified: trunk/reactos/win32ss/gdi/ntgdi/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/device.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/device.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/device.c [iso-8859-1] Tue Sep 18 21:45:00 2012 @@ -26,7 +26,7 @@ } BOOL FASTCALL -IntCreatePrimarySurface() +IntCreatePrimarySurface(VOID) { SIZEL SurfSize; SURFOBJ *pso; @@ -66,7 +66,7 @@ } VOID FASTCALL -IntDestroyPrimarySurface() +IntDestroyPrimarySurface(VOID) { UNIMPLEMENTED; } Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Tue Sep 18 21:45:00 2012 @@ -18,7 +18,7 @@ #define IS_DATA_SYNTHESIZED(ce) ((ce)->hData == DATA_SYNTH_USER || (ce)->hData == DATA_SYNTH_KRNL) PWINSTATION_OBJECT static FASTCALL -IntGetWinStaForCbAccess() +IntGetWinStaForCbAccess(VOID) { HWINSTA hWinSta; PWINSTATION_OBJECT pWinStaObj; Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Tue Sep 18 21:45:00 2012 @@ -131,7 +131,7 @@ BOOL FASTCALL -UserLoadApiHook() +UserLoadApiHook(VOID) { return IntLoadHookModule(WH_APIHOOK, 0, FALSE); } @@ -206,7 +206,7 @@ BOOL FASTCALL -UserUnregisterUserApiHook() +UserUnregisterUserApiHook(VOID) { PTHREADINFO pti; Modified: trunk/reactos/win32ss/user/ntuser/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.h [iso-8859-1] Tue Sep 18 21:45:00 2012 @@ -50,9 +50,9 @@ LRESULT FASTCALL UserCallNextHookEx( PHOOK pHook, int Code, WPARAM wParam, LPARAM lParam, BOOL Ansi); BOOL FASTCALL IntUnhookWindowsHook(int,HOOKPROC); -BOOL FASTCALL UserLoadApiHook(); +BOOL FASTCALL UserLoadApiHook(VOID); BOOL IntLoadHookModule(int iHookID, HHOOK hHook, BOOL Unload); -BOOL FASTCALL UserUnregisterUserApiHook(); +BOOL FASTCALL UserUnregisterUserApiHook(VOID); extern PPROCESSINFO ppiUahServer; Modified: trunk/reactos/win32ss/user/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/guic… ============================================================================== --- trunk/reactos/win32ss/user/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/guiconsole.c [iso-8859-1] Tue Sep 18 21:45:00 2012 @@ -1712,7 +1712,7 @@ VOID FASTCALL -GuiConsoleHandleScrollbarMenu() +GuiConsoleHandleScrollbarMenu(VOID) { HMENU hMenu; Modified: trunk/reactos/win32ss/user/win32csr/guiconsole.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/guic… ============================================================================== --- trunk/reactos/win32ss/user/win32csr/guiconsole.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/guiconsole.h [iso-8859-1] Tue Sep 18 21:45:00 2012 @@ -14,5 +14,6 @@ #define CONGUI_UPDATE_TIMER 1 NTSTATUS FASTCALL GuiInitConsole(PCSRSS_CONSOLE Console, BOOL Visible); +VOID FASTCALL GuiConsoleHandleScrollbarMenu(VOID); /*EOF*/

12 years

[tkreuzer] 57325: [WIN32K] Allow passing NULL to EngFreeMem, like on Windows. Fixes mode switching with cirrus driver on qemu. CORE-6335 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Sep 18 20:55:15 2012 New Revision: 57325 URL: http://svn.reactos.org/svn/reactos?rev=57325&view=rev Log: [WIN32K] Allow passing NULL to EngFreeMem, like on Windows. Fixes mode switching with cirrus driver on qemu. CORE-6335 #resolve Modified: trunk/reactos/win32ss/gdi/eng/mem.c Modified: trunk/reactos/win32ss/gdi/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mem.c?rev=… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mem.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mem.c [iso-8859-1] Tue Sep 18 20:55:15 2012 @@ -44,7 +44,11 @@ APIENTRY EngFreeMem(PVOID pvBaseAddress) { - ExFreePool(pvBaseAddress); + /* Windows allows to pass NULL */ + if (pvBaseAddress) + { + ExFreePool(pvBaseAddress); + } } /*

12 years

[ekohl] 57324: [SKEL_SERVICE] The HandlerEx control handler is DWORD WINAPI, not VOID WINAPI . Patch by Hermes BELUSCA - MAITO. Fixes ROSAPPS-243.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 18 20:37:51 2012 New Revision: 57324 URL: http://svn.reactos.org/svn/reactos?rev=57324&view=rev Log: [SKEL_SERVICE] The HandlerEx control handler is DWORD WINAPI, not VOID WINAPI . Patch by Hermes BELUSCA - MAITO. Fixes ROSAPPS-243. Modified: trunk/rosapps/templates/skel_service/ServiceMain.c Modified: trunk/rosapps/templates/skel_service/ServiceMain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/skel_service/Ser… ============================================================================== --- trunk/rosapps/templates/skel_service/ServiceMain.c [iso-8859-1] (original) +++ trunk/rosapps/templates/skel_service/ServiceMain.c [iso-8859-1] Tue Sep 18 20:37:51 2012 @@ -100,7 +100,7 @@ } -VOID WINAPI +DWORD WINAPI ServerCtrlHandler(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, @@ -118,29 +118,34 @@ pServInfo->servStatus.dwWin32ExitCode = 0; pServInfo->servStatus.dwWaitHint = 0; UpdateStatus(pServInfo, SERVICE_STOP_PENDING, 1); - break; + return ERROR_SUCCESS; case SERVICE_CONTROL_PAUSE: LogEvent(_T("Setting the service to SERVICE_PAUSED"), 0, 0, LOG_FILE); InterlockedExchange((LONG *)&bPause, TRUE); UpdateStatus(pServInfo, SERVICE_PAUSED, 0); - break; + return ERROR_SUCCESS; case SERVICE_CONTROL_CONTINUE: LogEvent(_T("Setting the service to SERVICE_RUNNING"), 0, 0, LOG_FILE); InterlockedExchange((LONG *)&bPause, FALSE); UpdateStatus(pServInfo, SERVICE_RUNNING, 0); - break; + return ERROR_SUCCESS; case SERVICE_CONTROL_INTERROGATE: - break; + return ERROR_SUCCESS; default: - if (dwControl > 127 && dwControl < 256) /* user defined */ + if (dwControl >= 128 && dwControl <= 255) /* User defined */ + { LogEvent(_T("User defined control code"), 0, 0, LOG_FILE); + return ERROR_SUCCESS; + } else + { LogEvent(_T("ERROR: Bad control code"), 0, 0, LOG_FILE); - break; + return ERROR_INVALID_SERVICE_CONTROL; + } } }

12 years

[tkreuzer] 57323: [MAGNIFY] Fix display of formerly trucated info text in German language. Patch by Robert Naumann (robert dot naumann at ovgu dot de) CORE-6218 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Sep 18 11:05:24 2012 New Revision: 57323 URL: http://svn.reactos.org/svn/reactos?rev=57323&view=rev Log: [MAGNIFY] Fix display of formerly trucated info text in German language. Patch by Robert Naumann (robert dot naumann at ovgu dot de) CORE-6218 #resolve Modified: trunk/reactos/base/applications/magnify/lang/de-DE.rc Modified: trunk/reactos/base/applications/magnify/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/de-DE.rc [iso-8859-1] Tue Sep 18 11:05:24 2012 @@ -54,7 +54,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,193,76,50,14 ICON IDI_ICON,IDC_STATIC,7,17,20,20 - LTEXT "Die Bildschirmlupe ist fÃ¼r Personen mit leichten visuellen EinschrÃ¤nkungen gedacht und stellt lediglich Grundfunktionen zur VerfÃ¼gung. Die meisten Nutzer werden jedoch eine Bildschirmlupe mit mehr Funktionen fÃ¼r die alltÃ¤gliche Nutzung benÃ¶tigen.",IDC_STATIC,36,7,207,33 + LTEXT "Die Bildschirmlupe ist fÃ¼r Personen mit leichten visuellen EinschrÃ¤nkungen gedacht und stellt lediglich Grundfunktionen zur VerfÃ¼gung. Die meisten Nutzer werden jedoch eine Bildschirmlupe mit mehr Funktionen fÃ¼r die alltÃ¤gliche Nutzung benÃ¶tigen.",IDC_STATIC,36,7,207,43 CONTROL "Diese Nachricht nicht mehr anzeigen",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 END

12 years

[tkreuzer] 57322: [PSEH3] Remove excessive '\'

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 17 23:13:02 2012 New Revision: 57322 URL: http://svn.reactos.org/svn/reactos?rev=57322&view=rev Log: [PSEH3] Remove excessive '\' Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Mon Sep 17 23:13:02 2012 @@ -88,7 +88,7 @@ #define _SEH3$_DECLARE_EXCEPT_INTRINSICS() \ inline __attribute__((always_inline, gnu_inline)) \ - unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode; } \ + unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode; } /* This is an asm wrapper around _SEH3$_RegisterFrame */ #define _SEH3$_RegisterFrame(_TrylevelFrame, _DataTable, _Target) \ @@ -139,7 +139,7 @@ _SEH3$_NESTED_FUNC_OPEN(_Name) \ /* Declare the intrinsics for the finally function */ \ inline __attribute__((always_inline, gnu_inline)) \ - int _abnormal_termination() { return (_SEH3$_TrylevelFrame.ScopeTable != 0); } \ + int _abnormal_termination() { return (_SEH3$_TrylevelFrame.ScopeTable != 0); } #define _SEH3$_FILTER(_Filter, _FilterExpression) \ (__builtin_constant_p(_FilterExpression) ? (void*)(unsigned long)(unsigned char)(unsigned long)(_FilterExpression) : _Filter)

12 years

[tkreuzer] 57321: [WIDL] Add VS9 build workaround for widl, like done for wpp. CORE-6636 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 17 22:43:37 2012 New Revision: 57321 URL: http://svn.reactos.org/svn/reactos?rev=57321&view=rev Log: [WIDL] Add VS9 build workaround for widl, like done for wpp. CORE-6636 #resolve Modified: trunk/reactos/tools/widl/CMakeLists.txt Modified: trunk/reactos/tools/widl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/CMakeLists.txt?… ============================================================================== --- trunk/reactos/tools/widl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/widl/CMakeLists.txt [iso-8859-1] Mon Sep 17 22:43:37 2012 @@ -1,8 +1,14 @@ if(MSVC) add_definitions( - -Dsnprintf=_snprintf - -Dvsnprintf=_vsnprintf) + -Dsnprintf=_snprintf) + + # Add this definition for WDK only, VS 9 doesn't like that + if (DEFINED ENV{DDKBUILDENV}) + add_definitions( + -Dvsnprintf=_vsnprintf) + endif() + list(APPEND SOURCE getopt.c) endif()

12 years

[tkreuzer] 57320: [FATX] Restore padding that I commented out to find out the size of the boot sector.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 17 22:37:58 2012 New Revision: 57320 URL: http://svn.reactos.org/svn/reactos?rev=57320&view=rev Log: [FATX] Restore padding that I commented out to find out the size of the boot sector. Modified: trunk/reactos/boot/freeldr/bootsect/fatx.S Modified: trunk/reactos/boot/freeldr/bootsect/fatx.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fatx… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fatx.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fatx.S [iso-8859-1] Mon Sep 17 22:37:58 2012 @@ -574,7 +574,7 @@ * Padding and boot sector signature * ******************************************************************************/ /* Pad to 509 bytes */ - // .org 509 + .org 509 BootPartition: .byte 0

12 years

[tkreuzer] 57319: [FATX] Rewrite FAT bootsector. It's written to eventually replace FAT12, FAT16 and FAT32 bootsectors using the same code. Currently only used for FAT16. The complete (!) code to l...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 17 21:44:55 2012 New Revision: 57319 URL: http://svn.reactos.org/svn/reactos?rev=57319&view=rev Log: [FATX] Rewrite FAT bootsector. It's written to eventually replace FAT12, FAT16 and FAT32 bootsectors using the same code. Currently only used for FAT16. The complete (!) code to load freeldr has been put into a single 512 byte sector. CHS support is not implemented atm, but there's plenty space left (41 bytes). Fixes boot on harddisks smaller than 513 MB. CORE-6610 #resolve Added: trunk/reactos/boot/freeldr/bootsect/fatx.S (with props) Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Mon Sep 17 21:44:55 2012 @@ -4,7 +4,7 @@ CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00) CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) -CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) +CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000) Added: trunk/reactos/boot/freeldr/bootsect/fatx.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fatx… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fatx.S (added) +++ trunk/reactos/boot/freeldr/bootsect/fatx.S [iso-8859-1] Mon Sep 17 21:44:55 2012 @@ -1,0 +1,587 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Bootsector + * FILE: fatx.S + * PURPOSE: Combined FAT16 and FAT32 boot sector + * PROGRAMMERS: Brian Palmer + * Timo Kreuzer + */ + + +/* + * Layout of a FAT volume: + * + * |--------------------------------------------------------- + * | * BootSector | + * | * FS Information Sector (FAT32 only) | ReservedSectors + * | * ... more reserved sectors ... | + * |-------------------------------------------------------- + * | * FAT 1 | NumberOfFats + * | * FAT 2 | * + * | * [more FATs] | SectorsPerFat + * |--------------------------------------------------------- + * | * Root Directory (FAT12/FAT16 only) | MaxRootEntries / 16 + * |--------------------------------------------------------- + * | * File data | + * | .... | + * |---------------------------------------- + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> +#include "../freeldr/include/arch/pc/x86common.h" + +#define ADDRESS_FOR_DIRENTRIES HEX(10000) + +SizeOfDataArea = 32 + +/* Put the stack below the data area */ +BootSectorStackTop = (HEX(7c00) - SizeOfDataArea) + +/* Data area offsets for uninitialized data */ +DataAreaStart = BootSectorStackTop + 0 /* dword */ +#ifndef FAT32 +RootDirStartSector = BootSectorStackTop + 4 /* dword */ +#endif +BiosCHSDriveSize = BootSectorStackTop + 8 /* dword */ +LBASectorsRead = BootSectorStackTop + 12 /* dword */ +ReadSectorsOffset = BootSectorStackTop + 16 /* word */ +ReadClusterOffset = BootSectorStackTop + 18 /* word */ +PutCharsOffset = BootSectorStackTop + 20 /* word */ + +/* Macro for bp relative memory access to reduce code size */ +#define BP_REL(x) ss:[bp + x - BootSectorStackTop] + +/* The code starts at 0x7c00 */ +// org 7c00h + +.code16 + +/****************************************************************************** + * BIOS Parameter Block (BPB) * + ******************************************************************************/ +/* We have 3 bytes at the entry point to jump over the data area */ +start: + jmp short main + nop + +/* Here starts the BIOS Parameter Block (BPB) data. + The real data will be copied during install */ +OEMName: + .ascii "FrLdr1.0" +BytesPerSector: + .word 512 +SectorsPerCluster: + .byte 0 +ReservedSectors: + .word 32 +NumberOfFats: + .byte 2 +MaxRootEntries: + .word 0 // Always zero for FAT32 volumes +TotalSectors: + .word 0 // Always zero for FAT32 volumes +MediaDescriptor: + .byte HEX(0f8) +SectorsPerFat: + .word 0 // Always zero for FAT32 volumes +SectorsPerTrack: + .word 0 +NumberOfHeads: + .word 0 +HiddenSectors: + .long 0 +TotalSectorsBig: + .long 0 + +/* Extra data for FAT32 volumes */ +#ifdef FAT32 +SectorsPerFatBig: + .long 0 +ExtendedFlags: + .word 0 +FSVersion: + .word 0 +RootDirStartCluster: + .long 0 +FSInfoSector: + .word 0 +BackupBootSector: + .word 6 +Reserved1: + .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +#endif // FAT32 + +BootDrive: + .byte 0 +Reserved: + .byte 0 +ExtendSig: + .byte HEX(29) +SerialNumber: + .long 0 +VolumeLabel: + .ascii "NO NAME " +FileSystem: + .ascii "FATxx " + + +/****************************************************************************** + * String data * + ******************************************************************************/ + +filename: + .ascii "FREELDR SYS" + +msgBootFailure: + .ascii "Load failed!", CR, LF, NUL + +msgAnyKey: + .ascii "Press any key to reboot...", NUL + + +/****************************************************************************** + * Main code entry * + * Input: DL = Boot drive * + ******************************************************************************/ +main: + /* First setup the segment registers */ + xor ax, ax + mov ds, ax + mov ss, ax + + /* Load the stack pointer */ + mov sp, BootSectorStackTop + + /* Load bp for relative memory access, which saves us some bytes of code + size, when used with 32 bit instructions */ + mov bp, sp + + /* Load the boot drive from the BPB into al */ + mov al, byte ptr ds:[BootDrive] + + /* Check if it's valid */ + cmp al, HEX(0ff) + je .SaveBootDrive + + /* Copy it into dl */ + mov dl, al + +.SaveBootDrive: + /* Save the bootdrive in the BPB */ + mov byte ptr ds:[BootDrive], dl + + +/****************************************************************************** + * Get drive parameters * + ******************************************************************************/ + + /* Call INT 13 to get the drive parameters: + AH = 08h + DL = drive (bit 7 set for hard disk) + ES:DI = 0000h:0000h to guard against BIOS bugs */ + xor di, di + mov ah, 8 + int HEX(13) + + /* Return from INT 13h/08h: + CF set on error -> AH = status (07h) + CF clear if successful -> AH = 00h + AL = 00h on at least some BIOSes + BL = drive type (AT/PS2 floppies only) + CH = low eight bits of maximum cylinder number + CL = bits 0:5 maximum sector number, bits 7:8 high two bits of maximum cylinder number + DH = maximum head number + DL = number of drives + ES:DI -> drive parameter table (floppies only) */ + + /* Check for failure */ + jc BootFailure + + +/****************************************************************************** + * Calculate drive size * + ******************************************************************************/ + + movzx ebx, ch // Put the low 8-bits of the cylinder count into EBX + mov bh, cl // Put the high 2-bits in BH + shr bh, 6 // Shift them into position, now BX contains the cylinder count + + and cl, HEX(3f) // Mask off cylinder bits from sector count + movzx ecx, cl // Move the sectors per track into ECX + + movzx eax, dh // Move the heads into EAX + + inc eax // Make it one based because the bios returns it zero based + inc ebx // Make the cylinder count one based also + mul ecx // Multiply heads with the sectors per track, result in edx:eax + mul ebx // Multiply the cylinders with (heads * sectors) [stored in edx:eax already] + + // We now have the total number of sectors as reported + // by the bios in eax, so store it in our variable + mov dword ptr BP_REL(BiosCHSDriveSize), eax + + +/****************************************************************************** + * Load the FAT * + ******************************************************************************/ + + /* Load the number of first sector of the FAT into eax */ + movzx eax, word ptr BP_REL(ReservedSectors) + add eax, dword ptr BP_REL(HiddenSectors) + + /* Load sector count into ecx */ +#if FAT32 + mov ecx, BP_REL(SectorsPerFatBig) +#else + movzx ecx, word ptr BP_REL(SectorsPerFat) +#endif + + /* Save FAT sector and size for later use */ + pushad + + /* Point ES:DI to the memory that is later the disk read buffer for freeldr. + This way we cannot overwrite our FAT with freeldr data */ + mov bx, DISKREADBUFFER / 16 + mov es,bx + xor di, di + + /* Read the sectors */ + call ReadSectors + + /* Restore FAT sector and size */ + popad + + +/****************************************************************************** + * Get root directory / data area start * + ******************************************************************************/ + + /* Copy reserved + hidden sectors to EBX */ + mov ebx, eax + + /* Calculate (NumberOfFats * SectorsPerFat) */ + movzx eax, byte ptr BP_REL(NumberOfFats) + mul ecx + + /* Add reserved sectors and hidden sectors */ + add eax, ebx + +#ifndef FAT32 + /* Save the starting sector of the root directory */ + mov dword ptr BP_REL(RootDirStartSector), eax + + /* Calculate number of sectors for the root dir: + sectors = MaxRootEntries * 32 / 512 (rounded up!) */ + movzx ebx, word ptr BP_REL(MaxRootEntries) + add ebx, 15 + shr ebx, 4 + + /* Add the root dir start sector and save it as DataAreaStart */ + add ebx, eax + mov dword ptr BP_REL(DataAreaStart), ebx +#else + mov dword ptr BP_REL(DataAreaStart), eax + + /* On FAT32 volumes the root dir start cluster is stored in the BPB */ + mov eax, dword ptr BP_REL(RootDirStartCluster) +#endif + + +/****************************************************************************** + * Search the root directory for freeldr * + ******************************************************************************/ +.SearchForFreeldr: + + /* Load ES with the segment where we put the dir entries */ + mov bx, ADDRESS_FOR_DIRENTRIES / 16 + mov es, bx + + /* Set the address offset to 0 */ + xor di, di + +#ifdef FAT32 + /* Read the dir cluster. This loads the next cluster into EAX */ + call ReadCluster + + /* Calculate the numer of dir entries in this cluster: + dx = SectorsPerCluster * 512 / 32 */ + movzx dx, byte ptr ds:[SectorsPerCluster] + shl dx, 4 +#else + /* Set the number of sectors to read to 1 */ + xor cx, cx + inc cx + + /* Read the sector, but preserve ES */ + push es + call ReadSectors + pop es + + /* Set entry count to entries per sector */ + mov dx, (512 / 32) +#endif + + /* Load the start offset of the dir entries into ebx */ + xor bx, bx + +.CheckDirEntry: + /* Load the address of the name into di */ + mov di, bx + + /* If the first byte of the entry is 0 then we have reached the end */ + cmp byte ptr es:[di], ch + jz BootFailure + + /* Compare with freeldr file name */ + mov si, offset filename + mov cx, 11 + repe cmpsb + + /* Check if we found the file */ + jz .FoundFreeLoader + + /* File didn't match, go to next entry */ + add bx, 32 + + /* Decrement entry count and check if we reached the end */ + dec dx + jnz .CheckDirEntry + +#if FAT32 + /* Check to see if this was the last cluster in the chain */ + cmp eax, HEX(0ffffff8) + jnb BootFailure +#endif + + /* Repeat the search process with the next sector / cluster. + eax is already incremented in ReadSectors / ReadCluster */ + jmp .SearchForFreeldr + + +/****************************************************************************** + * Load freeldr * + ******************************************************************************/ +.FoundFreeLoader: + + /* Load the cluster number of freeldr into eax */ +#if FAT32 +#error unsupported +#else + movzx eax, word ptr es:[bx + HEX(1A)] +#endif + + /* Load es:di with the freeldr start address */ + mov dx, FREELDR_BASE / 16 + mov es, dx + xor di, di + +.LoadNextCluster: + /* Load the cluster to the current address. EAX is adjusted to the next + cluster and ES is adjusted for the next read */ + call ReadCluster + + /* Check if this is the last cluster in the chain */ +#if FAT32 + cmp eax, HEX(0ffffff8) +#elif FAT12 + cmp ax, HEX(0ff8) +#else + cmp ax, HEX(0fff8) +#endif + jb .LoadNextCluster + + /* Load boot drive into DL, boot partition into DH */ + mov dl, byte ptr ds:[BootDrive] + mov dh, byte ptr ds:[BootPartition] + + /* Now the complete freeldr imag is loaded. + Jump to the realmode entry point. */ + ljmp16 0, FREELDR_BASE + + + +BootFailure: + mov si, offset msgBootFailure + call PutChars + + +Reboot: + /* Output "Press any key to reboot" message */ + mov si, offset msgAnyKey + call PutChars + + /* Wait for a keypress */ + xor ax, ax + int HEX(16) + + /* Reboot */ + int HEX(19) + + +/****************************************************************************** + * PROCEDURE ReadCluster * + * Input: EAX = Cluster number, ES:DI = Target * + * Modifies: EAX (next cluster number), BX, DX (undefined) * + ******************************************************************************/ +ReadCluster: + + pushad + + // StartSector = ((Cluster - 2) * SectorsPerCluster) + SectorsForFat + ReservedSectors + HiddenSectors + // StartSector = ((Cluster - 2) * SectorsPerCluster) + DataAreaStart + + /* Substract 2 */ + dec eax + dec eax + + /* Multiply with SectorsPerCluster */ + movzx ecx, byte ptr BP_REL(SectorsPerCluster) + mul ecx + + /* Add DataAreaStart */ + add eax, dword ptr BP_REL(DataAreaStart) + + /* Call ReadSectors. EAX = SectorNumber, ECX = SectorsPerCluster */ + call ReadSectors + + /* Restore the cluster number */ + popad + + /* Save ES */ + push es + +#if FAT32 +#error FAT23 not implemented +#elif FAT12 +#error FAT12 not implemented +#else + /* DX:AX = AX * 2 (since FAT16 entries are 2 bytes) */ + mov bx, 2 + mul bx + + /* Shift DX, so that it is the segment offset: DX = DX * (64K / 16) */ + shl dx, 12 + + /* Put segment address of FAT into ES */ + add dx, DISKREADBUFFER / 16 + mov es, dx + + /* Put the FAT entry offset into EBX for indirect mov */ + mov bx, ax + + /* Put the content of the FAT entry into AX */ + mov ax, es:[bx] +#endif + + /* Restore ES and return */ + pop es + ret + + +/****************************************************************************** + * PROCEDURE ReadSectors * + * Input: EAX = Sector start number, ECX = number of sectors, ES:DI = Target * + * Modifies: EAX (incremented by sector count), CX = 0, ES (incremented), * + * EBX undefined * + ******************************************************************************/ +ReadSectors: + /* We could possibly also implement CHS, but it's currently unimplemented */ +//jmp $ +ReadSectorsLBA: + + /* Copy number of sectors to ebx */ + movzx ebx, cx + + /* Since the LBA calls only support 0x7F sectors at a time, + we will limit ourselves to 64 */ + cmp bx, 64 + jbe .ReadSectorsLBA2 + mov bx, 64 + +.ReadSectorsLBA2: + + /* Save logical sector number & sector count */ + pushad + + /* Setup the disk address packet on the stack */ + .byte HEX(66) // size overwrite prefix for next push + push 0 // Put 64-bit logical block address (high part) on stack + push eax // Put 64-bit logical block address (low part) on stack + push es // Put transfer segment on stack + push di // Put transfer offset on stack + push bx // Set transfer count (for this round) + push 16 // Set size of packet to 16 + + /* Point si to the disk address packet on stack */ + mov si, sp + + /* Set the drive number */ + mov dl, byte ptr ds:[BootDrive] +//jmp $ + /* Call INT 13h, AH = 42h - Extended Read + Input: ... + Modifies: ... */ + mov ah, HEX(42) + int HEX(13) +//jmp $ + /* Check for failure */ + jc BootFailure + + /* Remove disk address packet from stack */ + add sp, 16 + + /* Adjust ES to point to the next sector */ + shl bx, 5 + mov ax, es + add ax, bx + mov es, ax + + /* Restore sector count & logical sector number */ + popad + + /* Adjust the sector number to the next sector we need to read + by adding the number of sectors that we read */ + add eax, ebx + + /* Adjust remaining sectors */ + sub cx, bx + jnz ReadSectorsLBA + + /* return */ + ret + + + +/****************************************************************************** + * PROCEDURE PutChars * + * Input: ESI = Points to string to be printed * + * Modifies: AL, AH, SI * + ******************************************************************************/ +PutChars2: + mov ah, HEX(0e) + mov bx, 7 + int HEX(10) +PutChars: + lodsb + or al, al + jnz short PutChars2 + ret + + +/****************************************************************************** + * Padding and boot sector signature * + ******************************************************************************/ + /* Pad to 509 bytes */ + // .org 509 + +BootPartition: + .byte 0 + +BootSignature: + .word HEX(0aa55) // BootSector signature + +.endcode16 + +END Propchange: trunk/reactos/boot/freeldr/bootsect/fatx.S ------------------------------------------------------------------------------ svn:eol-style = native

12 years

[mnordell] 57318: winetest addition that QueryInterface with NULL dest behaves as it should.

by mnordell＠svn.reactos.org

Author: mnordell Date: Mon Sep 17 20:33:22 2012 New Revision: 57318 URL: http://svn.reactos.org/svn/reactos?rev=57318&view=rev Log: winetest addition that QueryInterface with NULL dest behaves as it should. Added: trunk/rostests/winetests/msxml3/msxml3_ros.diff Modified: trunk/rostests/winetests/msxml3/domdoc.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Mon Sep 17 20:33:22 2012 @@ -1447,6 +1447,9 @@ #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) +#define EXPECT_NOT_HR(hr,hr_exp) \ + ok(hr != hr_exp, "got 0x%08x, expected not 0x%08x\n", hr, hr_exp) + static const WCHAR szEmpty[] = { 0 }; static const WCHAR szIncomplete[] = { '<','?','x','m','l',' ', @@ -4244,6 +4247,30 @@ free_bstrs(); } +/* + * This function is to display that xmlnodelist_QueryInterface + * generates SEGV for these conditions, and once fixed make sure + * it never does it again. + */ +static void verify_nodelist_query_interface(IXMLDOMNodeList *node_list) +{ + HRESULT hr; + /* + * NOTE: The following calls are supposed to test wine's + * xmlnodelist_QueryInterface behaving properly. + * While we should be able to expect E_POINTER (due to the NULL pointer), + * it seems MS' own implementation(s) violate the spec and return + * E_INVALIDARG. To not get cought be a potentially correct implementation + * in the future, we check for NOT S_OK. + */ + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, NULL); + EXPECT_NOT_HR(hr, S_OK); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); + EXPECT_NOT_HR(hr, S_OK); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IXMLDOMNodeList, NULL); + EXPECT_NOT_HR(hr, S_OK); +} + static void test_get_childNodes(void) { IXMLDOMNodeList *node_list, *node_list2; @@ -4270,6 +4297,8 @@ hr = IXMLDOMElement_get_childNodes( element, &node_list ); EXPECT_HR(hr, S_OK); + + verify_nodelist_query_interface(node_list); hr = IXMLDOMNodeList_get_length( node_list, &len ); EXPECT_HR(hr, S_OK); Added: trunk/rostests/winetests/msxml3/msxml3_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/msxml3_r… ============================================================================== --- trunk/rostests/winetests/msxml3/msxml3_ros.diff (added) +++ trunk/rostests/winetests/msxml3/msxml3_ros.diff [iso-8859-1] Mon Sep 17 20:33:22 2012 @@ -1,0 +1,54 @@ +Index: domdoc.c +=================================================================== +--- domdoc.c (revision 57310) ++++ domdoc.c (working copy) +@@ -1447,6 +1447,9 @@ + #define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + ++#define EXPECT_NOT_HR(hr,hr_exp) \ ++ ok(hr != hr_exp, "got 0x%08x, expected not 0x%08x\n", hr, hr_exp) ++ + static const WCHAR szEmpty[] = { 0 }; + static const WCHAR szIncomplete[] = { + '<','?','x','m','l',' ', +@@ -4244,6 +4247,30 @@ + free_bstrs(); + } + ++/* ++ * This function is to display that xmlnodelist_QueryInterface ++ * generates SEGV for these conditions, and once fixed make sure ++ * it never does it again. ++ */ ++static void verify_nodelist_query_interface(IXMLDOMNodeList *node_list) ++{ ++ HRESULT hr; ++ /* ++ * NOTE: The following calls are supposed to test wine's ++ * xmlnodelist_QueryInterface behaving properly. ++ * While we should be able to expect E_POINTER (due to the NULL pointer), ++ * it seems MS' own implementation(s) violate the spec and return ++ * E_INVALIDARG. To not get cought be a potentially correct implementation ++ * in the future, we check for NOT S_OK. ++ */ ++ hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, NULL); ++ EXPECT_NOT_HR(hr, S_OK); ++ hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); ++ EXPECT_NOT_HR(hr, S_OK); ++ hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IXMLDOMNodeList, NULL); ++ EXPECT_NOT_HR(hr, S_OK); ++} ++ + static void test_get_childNodes(void) + { + IXMLDOMNodeList *node_list, *node_list2; +@@ -4271,6 +4298,8 @@ + hr = IXMLDOMElement_get_childNodes( element, &node_list ); + EXPECT_HR(hr, S_OK); + ++ verify_nodelist_query_interface(node_list); ++ + hr = IXMLDOMNodeList_get_length( node_list, &len ); + EXPECT_HR(hr, S_OK); + ok( len == 4, "len %d\n", len);

12 years

← Newer
1
...
10
11
12
13
14
15
16
...
24
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 September 2012