Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 26874: - Merge 25417 by hpoussin (Disable some boot options on non-x86 platforms. You can enable them again for specific platforms if needed). - Minor: Add debug_filesystem into DEBUG_CUSTOM, but commented out.
by fireball＠svn.reactos.org 23 May '07

23 May '07

Author: fireball Date: Thu May 24 01:11:35 2007 New Revision: 26874 URL: http://svn.reactos.org/svn/reactos?rev=26874&view=rev Log: - Merge 25417 by hpoussin (Disable some boot options on non-x86 platforms. You can enable them again for specific platforms if needed). - Minor: Add debug_filesystem into DEBUG_CUSTOM, but commented out. Modified: branches/winldr/bootmgr.c branches/winldr/custom.c branches/winldr/debug.c branches/winldr/drivemap.c branches/winldr/include/drivemap.h branches/winldr/include/linux.h branches/winldr/include/miscboot.h branches/winldr/include/options.h branches/winldr/linuxboot.c branches/winldr/miscboot.c Modified: branches/winldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/bootmgr.c?rev=26874&r1=2… ============================================================================== --- branches/winldr/bootmgr.c (original) +++ branches/winldr/bootmgr.c Thu May 24 01:11:35 2007 @@ -119,11 +119,14 @@ } // Install the drive mapper according to this sections drive mappings +#ifdef __i386__ DriveMapMapDrivesInSection(OperatingSystemSectionNames[SelectedOperatingSystem]); +#endif if (_stricmp(SettingValue, "ReactOS") == 0) { LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]); } +#ifdef __i386__ else if (_stricmp(SettingValue, "WindowsNT40") == 0) { LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_NT4); @@ -156,6 +159,7 @@ { LoadAndBootDrive(OperatingSystemSectionNames[SelectedOperatingSystem]); } +#endif } Modified: branches/winldr/custom.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/custom.c?rev=26874&r1=26… ============================================================================== --- branches/winldr/custom.c (original) +++ branches/winldr/custom.c Thu May 24 01:11:35 2007 @@ -33,7 +33,15 @@ VOID OptionMenuCustomBoot(VOID) { - PCSTR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; + PCSTR CustomBootMenuList[] = { +#ifdef __i386__ + "Disk", + "Partition", + "Boot Sector File", + "ReactOS", + "Linux" +#endif /* __i386__ */ + }; ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; @@ -45,6 +53,7 @@ switch (SelectedMenuItem) { +#ifdef __i386__ case 0: // Disk OptionMenuCustomBootDisk(); break; @@ -60,9 +69,11 @@ case 4: // Linux OptionMenuCustomBootLinux(); break; - } -} - +#endif /* __i386__ */ + } +} + +#ifdef __i386__ VOID OptionMenuCustomBootDisk(VOID) { CHAR SectionName[100]; @@ -397,3 +408,4 @@ LoadAndBootLinux(SectionName, "Custom Linux Setup"); } +#endif /* __i386__ */ Modified: branches/winldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/debug.c?rev=26874&r1=268… ============================================================================== --- branches/winldr/debug.c (original) +++ branches/winldr/debug.c Thu May 24 01:11:35 2007 @@ -38,7 +38,7 @@ #elif defined (DEBUG_REACTOS) ULONG DebugPrintMask = DPRINT_REACTOS | DPRINT_REGISTRY; #elif defined (DEBUG_CUSTOM) -ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | +ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | /*DPRINT_FILESYSTEM |*/ DPRINT_REACTOS | DPRINT_WINDOWS | DPRINT_HWDETECT; #else //#elif defined (DEBUG_NONE) ULONG DebugPrintMask = 0; Modified: branches/winldr/drivemap.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/drivemap.c?rev=26874&r1=… ============================================================================== --- branches/winldr/drivemap.c (original) +++ branches/winldr/drivemap.c Thu May 24 01:11:35 2007 @@ -22,6 +22,7 @@ #define NDEBUG #include <debug.h> +#ifdef __i386__ BOOLEAN DriveMapInstalled = FALSE; // Tells us if we have already installed our drive map int 13h handler code ULONG OldInt13HandlerAddress = 0; // Address of BIOS int 13h handler ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler @@ -222,3 +223,4 @@ DriveMapInstalled = FALSE; } } +#endif /* __i386__ */ Modified: branches/winldr/include/drivemap.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/drivemap.h?rev=2… ============================================================================== --- branches/winldr/include/drivemap.h (original) +++ branches/winldr/include/drivemap.h Thu May 24 01:11:35 2007 @@ -20,7 +20,7 @@ #ifndef __DRIVEMAP_H #define __DRIVEMAP_H - +#ifdef __i386__ typedef struct { UCHAR DriveMapCount; // Count of drives currently mapped @@ -39,5 +39,6 @@ extern PVOID DriveMapInt13HandlerEnd; extern ULONG DriveMapOldInt13HandlerAddress; extern DRIVE_MAP_LIST DriveMapInt13HandlerMapList; +#endif /* __i386__ */ #endif // #defined __DRIVEMAP_H Modified: branches/winldr/include/linux.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/linux.h?rev=2687… ============================================================================== --- branches/winldr/include/linux.h (original) +++ branches/winldr/include/linux.h Thu May 24 01:11:35 2007 @@ -22,7 +22,7 @@ #ifndef __LINUX_H #define __LINUX_H - +#ifdef __i386__ #define LINUX_LOADER_TYPE_LILO 0x01 #define LINUX_LOADER_TYPE_LOADLIN 0x11 #define LINUX_LOADER_TYPE_BOOTSECT 0x21 @@ -135,5 +135,6 @@ BOOLEAN LinuxReadKernel(PFILE LinuxKernelFile); BOOLEAN LinuxCheckKernelVersion(VOID); BOOLEAN LinuxReadInitrd(PFILE LinuxInitrdFile); +#endif /* __i386__ */ #endif // defined __LINUX_H Modified: branches/winldr/include/miscboot.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/miscboot.h?rev=2… ============================================================================== --- branches/winldr/include/miscboot.h (original) +++ branches/winldr/include/miscboot.h Thu May 24 01:11:35 2007 @@ -20,8 +20,10 @@ #ifndef __BOOT_H #define __BOOT_H +#ifdef __i386__ VOID LoadAndBootBootSector(PCSTR OperatingSystemName); VOID LoadAndBootPartition(PCSTR OperatingSystemName); VOID LoadAndBootDrive(PCSTR OperatingSystemName); +#endif /* __i386__ */ #endif // defined __BOOT_H Modified: branches/winldr/include/options.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/options.h?rev=26… ============================================================================== --- branches/winldr/include/options.h (original) +++ branches/winldr/include/options.h Thu May 24 01:11:35 2007 @@ -25,10 +25,12 @@ VOID OptionMenuReboot(VOID); VOID OptionMenuCustomBoot(VOID); +#ifdef __i386__ VOID OptionMenuCustomBootDisk(VOID); VOID OptionMenuCustomBootPartition(VOID); VOID OptionMenuCustomBootBootSectorFile(VOID); VOID OptionMenuCustomBootReactOS(VOID); VOID OptionMenuCustomBootLinux(VOID); +#endif /* __i386__ */ #endif // #defined __OPTIONS_H Modified: branches/winldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/linuxboot.c?rev=26874&r1… ============================================================================== --- branches/winldr/linuxboot.c (original) +++ branches/winldr/linuxboot.c Thu May 24 01:11:35 2007 @@ -23,6 +23,7 @@ #define NDEBUG #include <debug.h> +#ifdef __i386__ #define LINUX_READ_CHUNK_SIZE 0x20000 // Read 128k at a time @@ -491,3 +492,4 @@ return TRUE; } +#endif /* __i386__ */ Modified: branches/winldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/miscboot.c?rev=26874&r1=… ============================================================================== --- branches/winldr/miscboot.c (original) +++ branches/winldr/miscboot.c Thu May 24 01:11:35 2007 @@ -19,6 +19,7 @@ #include <freeldr.h> +#ifdef __i386__ VOID LoadAndBootBootSector(PCSTR OperatingSystemName) { PFILE FilePointer; @@ -213,3 +214,4 @@ //DisableA20(); ChainLoadBiosBootSectorCode(); } +#endif /* __i386__ */

1 0

[greatlrd] 26873: Fixing CreateDirectDraw crash
by greatlrd＠svn.reactos.org 23 May '07

23 May '07

Author: greatlrd Date: Wed May 23 23:48:54 2007 New Revision: 26873 URL: http://svn.reactos.org/svn/reactos?rev=26873&view=rev Log: Fixing CreateDirectDraw crash Modified: trunk/reactos/dll/directx/ddraw/main.c Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Wed May 23 23:48:54 2007 @@ -33,23 +33,14 @@ DirectDrawCreate (LPGUID lpGUID, LPDIRECTDRAW* lplpDD, LPUNKNOWN pUnkOuter) -{ +{ /* remove this when UML digram are in place this api is finish and is working as it should */ + DX_WINDBG_trace(); - - - /* check see if pUnkOuter is null or not */ - if (pUnkOuter) - { - /* we are using same error code as MS*/ - return CLASS_E_NOAGGREGATION; - } - - /* Create our DirectDraw interface */ - return Create_DirectDraw (lpGUID, lplpDD, &IID_IDirectDraw7, FALSE); + return DirectDrawCreateEx(lpGUID, (LPVOID*)lplpDD, &IID_IDirectDraw2, pUnkOuter); } /*

1 0

[greatlrd] 26872: comment out GetDOURCC data from DDHALINFO for it seam some strang crash.
by greatlrd＠svn.reactos.org 23 May '07

23 May '07

Author: greatlrd Date: Wed May 23 23:27:29 2007 New Revision: 26872 URL: http://svn.reactos.org/svn/reactos?rev=26872&view=rev Log: comment out GetDOURCC data from DDHALINFO for it seam some strang crash. Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Wed May 23 23:27:29 2007 @@ -472,7 +472,7 @@ } DX_STUB_str("Here\n"); - +#if 0 /* Alloc mpFourCC */ mpFourCC = NULL; if (mHALInfo.ddCaps.dwNumFourCCCodes > 0 ) @@ -486,7 +486,9 @@ } } DX_STUB_str("Here\n"); - +#else + mpFourCC = NULL; +#endif /* Alloc mpTextures */ #if 0 mpTextures = NULL;

1 0

[tkreuzer] 26871: - make fontview look closer to MS fontview, patch by roytam1, modified by me. - Create fonts only once - Remove possibility to get page height without drawing See issue #2260 for more details.
by tkreuzer＠svn.reactos.org 23 May '07

23 May '07

Author: tkreuzer Date: Wed May 23 04:25:31 2007 New Revision: 26871 URL: http://svn.reactos.org/svn/reactos?rev=26871&view=rev Log: - make fontview look closer to MS fontview, patch by roytam1, modified by me. - Create fonts only once - Remove possibility to get page height without drawing See issue #2260 for more details. Modified: trunk/rosapps/fontview/display.c trunk/rosapps/fontview/display.h trunk/rosapps/fontview/fontview.c trunk/rosapps/fontview/fontview.rc trunk/rosapps/fontview/lang/en-US.rc Modified: trunk/rosapps/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.c?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.c (original) +++ trunk/rosapps/fontview/display.c Wed May 23 04:25:31 2007 @@ -34,10 +34,17 @@ /* Internal data storage type */ typedef struct { - int nHeight; + int nPageHeight; WCHAR szTypeFaceName[MAX_TYPEFACENAME]; WCHAR szFormat[MAX_FORMAT]; WCHAR szString[MAX_STRING]; + + HFONT hCaptionFont; + HFONT hCharSetFont; + HFONT hSizeFont; + HFONT hFonts[MAX_SIZES]; + int nSizes[MAX_SIZES]; + int nHeights[MAX_SIZES]; } DISPLAYDATA; /* This is the only public function, it registers the class */ @@ -69,9 +76,9 @@ } static int -Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos, BOOL bDraw) -{ - HFONT hOldFont, hFont, hFontNums; +Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos) +{ + HFONT hOldFont; TEXTMETRIC tm; int i, y; const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; @@ -81,65 +88,61 @@ /* This is the location on the DC where we draw */ y = -nYPos; - /* Draw font name */ - hFont = CreateFontW(50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , L"Ms Shell Dlg"); - hOldFont = SelectObject(hDC, hFont); - if (bDraw) + hOldFont = SelectObject(hDC, pData->hCaptionFont); + GetTextMetrics(hDC, &tm); + + if (*pData->szFormat == 0) + { + swprintf(szCaption, pData->szTypeFaceName); + } + else { swprintf(szCaption, L"%s (%s)", pData->szTypeFaceName, pData->szFormat); - TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); - } + } + TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); + y += tm.tmHeight + SPACING1; + + /* Draw a seperation Line */ + SelectObject(hDC, GetStockObject(BLACK_PEN)); + MoveToEx(hDC, 0, y, NULL); + LineTo(hDC, 10000, y); + y += SPACING2; + + /* TODO: Output font info */ + + /* Output Character set */ + hOldFont = SelectObject(hDC, pData->hCharSetFont); GetTextMetrics(hDC, &tm); - y += tm.tmHeight + SPACING1; + swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz"); + TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); + y += tm.tmHeight + 1; + + swprintf(szCaption, L"ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); + y += tm.tmHeight + 1; + + swprintf(szCaption, L"0123456789.:,;(\"~!@#$%^&*')"); + TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); + y += tm.tmHeight + 1; + + /* Draw a seperation Line */ + SelectObject(hDC, GetStockObject(BLACK_PEN)); + MoveToEx(hDC, 0, y, NULL); + LineTo(hDC, 10000, y); + y += SPACING2; + + /* Output the strings for different sizes */ + for (i = 0; i < MAX_SIZES; i++) + { + SelectObject(hDC, pData->hFonts[i]); + TextOutW(hDC, 20, y, pData->szString, wcslen(pData->szString)); + GetTextMetrics(hDC, &tm); + y += tm.tmHeight + 1; + SelectObject(hDC, pData->hSizeFont); + swprintf(szSize, L"%d", nSizes[i]); + TextOutW(hDC, 0, y - 13 - tm.tmDescent, szSize, wcslen(szSize)); + } SelectObject(hDC, hOldFont); - DeleteObject(hFont); - - /* Draw a seperation Line */ - if (bDraw) - { - SelectObject(hDC, GetStockObject(BLACK_PEN)); - MoveToEx(hDC, 0, y, NULL); - LineTo(hDC, 10000, y); - } - y += SPACING2; - - /* Output font info */ - hFont = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , pData->szTypeFaceName); - hOldFont = SelectObject(hDC, hFont); - SelectObject(hDC, hOldFont); - DeleteObject(hFont); - - /* Outout the lines for different sizes */ - hFontNums = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , L"Ms Shell Dlg"); - - for (i = 0; i < 7; i++) - { - hOldFont = SelectObject(hDC, hFontNums); - if (bDraw) - { - swprintf(szSize, L"%d", nSizes[i]); - TextOutW(hDC, 0, y, szSize, wcslen(szSize)); - } - hFont = CreateFontW(nSizes[i], 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , pData->szTypeFaceName); - SelectObject(hDC, hFont); - if (bDraw) - { - TextOutW(hDC, 20, y, pData->szString, wcslen(pData->szString)); - } - GetTextMetrics(hDC, &tm); - y += tm.tmHeight + 2; - SelectObject(hDC, hOldFont); - DeleteObject(hFont); - } - DeleteObject(hFontNums); return y; } @@ -148,13 +151,28 @@ Display_OnCreate(HWND hwnd) { DISPLAYDATA* pData; + const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; + int i; /* Initialize data structure */ pData = malloc(sizeof(DISPLAYDATA)); - pData->nHeight = 0; + pData->nPageHeight = 0; swprintf(pData->szTypeFaceName, L""); swprintf(pData->szFormat, L""); swprintf(pData->szString, L""); + + for (i = 0; i < MAX_SIZES; i++) + { + pData->nSizes[i] = nSizes[i]; + } + + pData->hCaptionFont = CreateFontW(50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"); + + pData->hSizeFont = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"); /* Set the window's GWLP_USERDATA to our data structure */ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pData); @@ -182,7 +200,7 @@ FillRect(ps.hdc, &ps.rcPaint, GetStockObject(WHITE_BRUSH)); /* Draw the text */ - Display_DrawText(ps.hdc, pData, si.nPos, TRUE); + Display_DrawText(ps.hdc, pData, si.nPos); EndPaint(hwnd, &ps); @@ -267,6 +285,7 @@ SetScrollInfo(hwnd, SB_VERT, &si, TRUE); UpdateWindow(hwnd); } + return 0; } @@ -274,17 +293,42 @@ Display_SetTypeFace(HWND hwnd, LPARAM lParam) { DISPLAYDATA* pData; + TEXTMETRIC tm; HDC hDC; RECT rect; SCROLLINFO si; + int i; /* Set the new type face name */ pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); snwprintf(pData->szTypeFaceName, MAX_TYPEFACENAME, (WCHAR*)lParam); + /* Create the new fonts */ + hDC = GetDC(hwnd); + pData->hCharSetFont = CreateFontW(-MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72), 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , pData->szTypeFaceName); + + /* Get font format */ + SelectObject(hDC, pData->hCharSetFont); + GetTextMetrics(hDC, &tm); + if ((tm.tmPitchAndFamily & TMPF_TRUETYPE) == TMPF_TRUETYPE) + { + swprintf(pData->szFormat, L"TrueType"); + } + + for (i = 0; i < MAX_SIZES; i++) + { + pData->hFonts[i] = CreateFontW(MulDiv(pData->nSizes[i], GetDeviceCaps(hDC, LOGPIXELSY), 72), + 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , pData->szTypeFaceName); + SelectObject(hDC, pData->hFonts[i]); + } + /* Calculate new page dimensions */ - hDC = GetDC(hwnd); - pData->nHeight = Display_DrawText(hDC, pData, 0, FALSE); + pData->nPageHeight = Display_DrawText(hDC, pData, 0); ReleaseDC(hwnd, hDC); /* Set the vertical scrolling range and page size */ @@ -292,7 +336,7 @@ si.cbSize = sizeof(si); si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; si.nMin = 0; - si.nMax = pData->nHeight; + si.nMax = pData->nPageHeight; si.nPage = rect.bottom; si.nPos = 0; si.nTrackPos = 0; @@ -318,9 +362,21 @@ Display_OnDestroy(HWND hwnd) { DISPLAYDATA* pData; + int i; + + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + + /* Delete the fonts */ + DeleteObject(pData->hCaptionFont); + DeleteObject(pData->hCharSetFont); + DeleteObject(pData->hSizeFont); + + for (i = 0; i < MAX_SIZES; i++) + { + DeleteObject(pData->hFonts[i]); + } /* Free the data structure */ - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); free(pData); return 0; @@ -353,7 +409,7 @@ return Display_OnDestroy(hwnd); default: - return DefWindowProc (hwnd, message, wParam, lParam); + return DefWindowProcW(hwnd, message, wParam, lParam); } return 0; Modified: trunk/rosapps/fontview/display.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.h?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.h (original) +++ trunk/rosapps/fontview/display.h Wed May 23 04:25:31 2007 @@ -10,6 +10,8 @@ #define MAX_TYPEFACENAME 32 #define MAX_FORMAT 20 +#define MAX_SIZES 7 + extern const WCHAR g_szFontDisplayClassName[]; /* Public function */ Modified: trunk/rosapps/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.c?rev=26… ============================================================================== --- trunk/rosapps/fontview/fontview.c (original) +++ trunk/rosapps/fontview/fontview.c Wed May 23 04:25:31 2007 @@ -23,7 +23,6 @@ #include "fontview.h" HINSTANCE g_hInstance; -WCHAR g_szTitle[MAX_LOADSTRING]; WCHAR g_szTypeFaceName[MAX_TYPEFACENAME]; static const WCHAR g_szFontViewClassName[] = L"FontViewWClass"; @@ -130,7 +129,7 @@ } /* The main window class */ - wincl.cbSize = sizeof (WNDCLASSEX); + wincl.cbSize = sizeof (WNDCLASSEXW); wincl.style = CS_DBLCLKS; wincl.lpfnWndProc = MainWndProc; wincl.cbClsExtra = 0; @@ -154,7 +153,7 @@ hMainWnd = CreateWindowExW( 0, /* Extended possibilites for variation */ g_szFontViewClassName, /* Classname */ - g_szTitle, /* Title Text */ + g_szTypeFaceName, /* Title Text */ WS_OVERLAPPEDWINDOW, /* default window */ CW_USEDEFAULT, /* Windows decides the position */ CW_USEDEFAULT, /* where the window ends up on the screen */ @@ -165,7 +164,7 @@ hThisInstance, /* Program Instance handler */ NULL /* No Window Creation data */ ); - ShowWindow (hMainWnd, nCmdShow); + ShowWindow(hMainWnd, nCmdShow); /* Main message loop */ while (GetMessage (&msg, NULL, 0, 0)) @@ -203,11 +202,11 @@ NULL /* Window Creation data */ ); - /* Init the display window wit the font name */ + /* Init the display window with the font name */ LoadStringW(g_hInstance, IDS_STRING, szString, MAX_STRING); - SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)g_szTypeFaceName); + /* Create the quit button */ LoadStringW(g_hInstance, IDS_QUIT, szQuit, MAX_BUTTONNAME); hButtonQuit = CreateWindowExW( @@ -307,7 +306,7 @@ break; default: /* for messages that we don't deal with */ - return DefWindowProc (hwnd, message, wParam, lParam); + return DefWindowProcW(hwnd, message, wParam, lParam); } return 0; Modified: trunk/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rc?rev=2… ============================================================================== --- trunk/rosapps/fontview/fontview.rc (original) +++ trunk/rosapps/fontview/fontview.rc Wed May 23 04:25:31 2007 @@ -1,5 +1,6 @@ +#include "lang/en-US.rc" #include "lang/de-DE.rc" STRINGTABLE DISCARDABLE Modified: trunk/rosapps/fontview/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/en-US.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/en-US.rc (original) +++ trunk/rosapps/fontview/lang/en-US.rc Wed May 23 04:25:31 2007 @@ -2,13 +2,13 @@ #include "windows.h" #include "../resource.h" -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE { IDS_QUIT, "Quit" IDS_PRINT, "Print" - IDS_STRING, "Jackdaws love my big sphinx of quartz. 123456890" + IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890" IDS_ERROR, "Error" IDS_ERROR_NOMEM, "There's not enough memory to complete the operation." IDS_ERROR_NOFONT, "The file %1 ist not a valid font file." @@ -16,3 +16,4 @@ IDS_ERROR_BADCMD, "No font file given.\nSyntax:\n fontview.exe <font file>" } +

1 0

[gedmurphy] 26870: re-enable ACPI
by gedmurphy＠svn.reactos.org 22 May '07

22 May '07

Author: gedmurphy Date: Tue May 22 23:33:20 2007 New Revision: 26870 URL: http://svn.reactos.org/svn/reactos?rev=26870&view=rev Log: re-enable ACPI Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Tue May 22 23:33:20 2007 @@ -2695,9 +2695,9 @@ const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI BIOS"); UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0"); static ULONG DeviceIndexPci = 0; - /*const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); + const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); UNICODE_STRING HardwareIdAcpi = RTL_CONSTANT_STRING(L"*PNP0C08\0"); - static ULONG DeviceIndexAcpi = 0;*/ + static ULONG DeviceIndexAcpi = 0; const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController"); UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0"); static ULONG DeviceIndexSerial = 0; @@ -2957,11 +2957,11 @@ pHardwareId = &HardwareIdPci; DeviceIndex = DeviceIndexPci++; } - /*else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) + else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) { pHardwareId = &HardwareIdAcpi; DeviceIndex = DeviceIndexAcpi++; - }*/ + } else { /* Unknown device */ @@ -3083,8 +3083,6 @@ static BOOLEAN INIT_FUNCTION IopIsAcpiComputer(VOID) { - return FALSE; -#if 0 UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier"); UNICODE_STRING AcpiBiosIdentifier = RTL_CONSTANT_STRING(L"ACPI BIOS"); @@ -3216,7 +3214,6 @@ if (hDeviceKey) ZwClose(hDeviceKey); return ret; -#endif } static NTSTATUS INIT_FUNCTION

1 0

[mbosma] 26869: Fix two oversights in GetDisplayMode.
by mbosma＠svn.reactos.org 22 May '07

22 May '07

Author: mbosma Date: Tue May 22 23:30:25 2007 New Revision: 26869 URL: http://svn.reactos.org/svn/reactos?rev=26869&view=rev Log: Fix two oversights in GetDisplayMode. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Tue May 22 23:30:25 2007 @@ -182,14 +182,14 @@ if (pDDSD == NULL) return DDERR_INVALIDPARAMS; - if (pDDSD->dwSize != sizeof(LPDDSURFACEDESC2)) + if (pDDSD->dwSize != sizeof(DDSURFACEDESC2)) return DDERR_INVALIDPARAMS; // FIXME: More stucture members might need to be filled pDDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; - pDDSD->dwHeight = This->lpLcl->lpGbl->vmiData.dwDisplayWidth; - pDDSD->dwWidth = This->lpLcl->lpGbl->vmiData.dwDisplayHeight; + pDDSD->dwHeight = This->lpLcl->lpGbl->vmiData.dwDisplayHeight; + pDDSD->dwWidth = This->lpLcl->lpGbl->vmiData.dwDisplayWidth; pDDSD->ddpfPixelFormat = This->lpLcl->lpGbl->vmiData.ddpfDisplay; pDDSD->dwRefreshRate = This->lpLcl->lpGbl->dwMonitorFrequency; pDDSD->lPitch = This->lpLcl->lpGbl->vmiData.lDisplayPitch;

1 0

[mbosma] 26868: Change EnumDisplayModes to use EnumDisplaySettingsEx because Nvidia does not set lpModeInfo in DDHALINFO.
by mbosma＠svn.reactos.org 22 May '07

22 May '07

Author: mbosma Date: Tue May 22 16:39:59 2007 New Revision: 26868 URL: http://svn.reactos.org/svn/reactos?rev=26868&view=rev Log: Change EnumDisplayModes to use EnumDisplaySettingsEx because Nvidia does not set lpModeInfo in DDHALINFO. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Tue May 22 16:39:59 2007 @@ -16,38 +16,48 @@ LPDDSURFACEDESC2 pDDSD, LPVOID pContext, LPDDENUMMODESCALLBACK2 pCallback) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + INT iMode = 0; + DEVMODE DevMode; + DX_WINDBG_trace(); if(!pCallback) return DDERR_INVALIDPARAMS; - // FIXME: Process DDEDM_STANDARDVGAMODES flag + DevMode.dmSize = sizeof(DEVMODE); + DevMode.dmDriverExtra = 0; - int i; - for (i=0; i<This->lpLcl->lpGbl->dwNumModes; i++) + while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0) == TRUE) { DDSURFACEDESC2 SurfaceDesc; - // FIXME: do we need to set/test more sturcture members ? + iMode++; + SurfaceDesc.dwSize = sizeof (DDSURFACEDESC2); SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT; - SurfaceDesc.dwHeight = This->lpLcl->lpGbl->lpModeInfo[i].dwWidth; - SurfaceDesc.dwWidth = This->lpLcl->lpGbl->lpModeInfo[i].dwHeight; - SurfaceDesc.lPitch = This->lpLcl->lpGbl->lpModeInfo[i].lPitch; - SurfaceDesc.dwRefreshRate = This->lpLcl->lpGbl->lpModeInfo[i].wRefreshRate; + SurfaceDesc.dwHeight = DevMode.dmPelsHeight; + SurfaceDesc.dwWidth = DevMode.dmPelsWidth; + SurfaceDesc.lPitch = DevMode.dmPelsWidth * DevMode.dmBitsPerPel / 8; + SurfaceDesc.dwRefreshRate = DevMode.dmDisplayFrequency; SurfaceDesc.ddpfPixelFormat.dwSize = sizeof (DDPIXELFORMAT); SurfaceDesc.ddpfPixelFormat.dwFlags = DDPF_RGB; - SurfaceDesc.ddpfPixelFormat.dwRBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwRBitMask; - SurfaceDesc.ddpfPixelFormat.dwGBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwGBitMask; - SurfaceDesc.ddpfPixelFormat.dwBBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwBBitMask; - SurfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwAlphaBitMask; - SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lpModeInfo[i].dwBPP; + // FIXME: get these +/* + SurfaceDesc.ddpfPixelFormat.dwRBitMask = + SurfaceDesc.ddpfPixelFormat.dwGBitMask = + SurfaceDesc.ddpfPixelFormat.dwBBitMask = + SurfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask = +*/ + SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = DevMode.dmBitsPerPel; + // FIXME1: This->lpLcl->lpGbl->dwMonitorFrequency is not set ! if(dwFlags & DDEDM_REFRESHRATES && SurfaceDesc.dwRefreshRate != This->lpLcl->lpGbl->dwMonitorFrequency) { - continue; + //continue; // FIXME2: what is SurfaceDesc.dwRefreshRate supposed to be set to ? } + + // FIXME: Take case when DDEDM_STANDARDVGAMODES flag is not set in account if(pDDSD) { @@ -67,7 +77,8 @@ continue; // FIXME: test for the other members of ddpfPixelFormat as well } - (*pCallback)(&SurfaceDesc, pContext); + if((*pCallback)(&SurfaceDesc, pContext) == DDENUMRET_CANCEL) + return DD_OK; } return DD_OK;

1 0

[gedmurphy] 26867: remove unnecessary NDEBUG definitions. freeldr has it's own debugging system.
by gedmurphy＠svn.reactos.org 22 May '07

22 May '07

Author: gedmurphy Date: Tue May 22 15:00:00 2007 New Revision: 26867 URL: http://svn.reactos.org/svn/reactos?rev=26867&view=rev Log: remove unnecessary NDEBUG definitions. freeldr has it's own debugging system. Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c trunk/reactos/boot/freeldr/freeldr/cache/cache.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/disk/partition.c trunk/reactos/boot/freeldr/freeldr/drivemap.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/inifile/parse.c trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/boot/freeldr/freeldr/windows/conversion.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> // Returns a pointer to a CACHE_BLOCK structure Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/cache.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/cache.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> /////////////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> #undef UNIMPLEMENTED Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> BOOLEAN DiskGetActivePartitionEntry(ULONG DriveNumber, Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/drive… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/drivemap.c (original) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> #ifdef __i386__ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> VOID BootMain(LPSTR CmdLine) Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> GEOMETRY Ext2DiskGeometry; // Ext2 file system disk geometry Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ULONG BytesPerSector; /* Number of bytes per sector */ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ///////////////////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ///////////////////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> #define SECTORSIZE 2048 Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Tue May 22 15:00:00 2007 @@ -24,8 +24,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> PNTFS_BOOTSECTOR NtfsBootSector; Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> BOOLEAN IniOpenSection(PCSTR SectionName, ULONG* SectionId) Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/parse.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> PINI_SECTION IniFileSectionListHead = NULL; Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c Tue May 22 15:00:00 2007 @@ -19,8 +19,6 @@ #include <freeldr.h> - -#define NDEBUG #include <debug.h> #ifdef __i386__ Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> #ifdef DBG Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ULONG AllocationCount = 0; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Tue May 22 15:00:00 2007 @@ -21,8 +21,6 @@ #include <freeldr.h> #include <cmlib.h> - -#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Tue May 22 15:00:00 2007 @@ -20,8 +20,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ROS_LOADER_PARAMETER_BLOCK LoaderBlock; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Tue May 22 15:00:00 2007 @@ -19,8 +19,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> static FRLDRHKEY RootKey; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Tue May 22 15:00:00 2007 @@ -20,8 +20,6 @@ #define _NTSYSTEM_ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ROS_LOADER_PARAMETER_BLOCK LoaderBlock; Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> Modified: trunk/reactos/boot/freeldr/freeldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/conversion.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/conversion.c Tue May 22 15:00:00 2007 @@ -11,8 +11,6 @@ #include <freeldr.h> //#include <ndk/ldrtypes.h> - -#define NDEBUG #include <debug.h> /* FUNCTIONS **************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c Tue May 22 15:00:00 2007 @@ -15,8 +15,6 @@ /* INCLUDES ***************************************************************/ #include <freeldr.h> - -#define NDEBUG #include <debug.h> /* FUNCTIONS **************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Tue May 22 15:00:00 2007 @@ -22,8 +22,6 @@ #include <freeldr.h> #include <ndk/ldrtypes.h> - -//#define NDEBUG #include <debug.h> //FIXME: Do a better way to retrieve Arc disk information Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Tue May 22 15:00:00 2007 @@ -11,8 +11,6 @@ #include <freeldr.h> #include <ndk/asm.h> - -#define NDEBUG #include <debug.h> extern ULONG TotalNLSSize; Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Tue May 22 15:00:00 2007 @@ -9,8 +9,6 @@ /* INCLUDES ***************************************************************/ #include <freeldr.h> - -#define NDEBUG #include <debug.h> // The only global var here, used to mark mem pages as NLS in WinLdrTurnOnPaging()

1 0

[mbosma] 26866: Fix another typo.
by mbosma＠svn.reactos.org 22 May '07

22 May '07

Author: mbosma Date: Tue May 22 14:58:27 2007 New Revision: 26866 URL: http://svn.reactos.org/svn/reactos?rev=26866&view=rev Log: Fix another typo. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c Tue May 22 14:58:27 2007 @@ -33,7 +33,7 @@ } #endif - if(hwnd && IsWindow(hwnd)) + if(hwnd && !IsWindow(hwnd)) return DDERR_INVALIDPARAMS; /* Tests suggest that we need one of them: */

1 0

[mbosma] 26865: Fix a typo and improve a test.
by mbosma＠svn.reactos.org 22 May '07

22 May '07

Author: mbosma Date: Tue May 22 14:57:53 2007 New Revision: 26865 URL: http://svn.reactos.org/svn/reactos?rev=26865&view=rev Log: Fix a typo and improve a test. Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Tue May 22 14:57:53 2007 @@ -119,12 +119,12 @@ /* Here we go */ DWORD dwNumCodes, *lpCodes; - TEST (DirectDraw->GetFourCCCodes(NULL, NULL) == DDERR_INVALIDPARAMS); - TEST ( DirectDraw->GetFourCCCodes(NULL, lpCodes) == DDERR_INVALIDPARAMS ); + TEST (DirectDraw->GetFourCCCodes(NULL, (PDWORD)0xdeadbeef) == DDERR_INVALIDPARAMS); TEST (DirectDraw->GetFourCCCodes(&dwNumCodes, NULL) == DD_OK && dwNumCodes); lpCodes = (PDWORD)HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)*dwNumCodes); *lpCodes = 0; + TEST ( DirectDraw->GetFourCCCodes(NULL, lpCodes) == DDERR_INVALIDPARAMS ); TEST (DirectDraw->GetFourCCCodes(&dwNumCodes, lpCodes) == DD_OK && *lpCodes ); DirectDraw->Release(); Modified: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Tue May 22 14:57:53 2007 @@ -22,7 +22,7 @@ if (DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) != DD_OK) { - printf("ERROR: you not set cooperative level\n"); + printf("ERROR: Could not set cooperative level\n"); DirectDraw->Release(); return 0; } @@ -207,4 +207,4 @@ DirectDraw->Release(); return TRUE; -} +}

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