Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 30577: don't crash when Buffer is NULL
by cwittich＠svn.reactos.org 19 Nov '07

19 Nov '07

Author: cwittich Date: Mon Nov 19 15:14:54 2007 New Revision: 30577 URL: http://svn.reactos.org/svn/reactos?rev=30577&view=rev Log: don't crash when Buffer is NULL Modified: trunk/reactos/lib/rtl/dos8dot3.c Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=305… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c (original) +++ trunk/reactos/lib/rtl/dos8dot3.c Mon Nov 19 15:14:54 2007 @@ -255,7 +255,7 @@ if (RtlUpcaseUnicodeStringToCountedOemString( AnsiName, UnicodeName, FALSE ) != STATUS_SUCCESS) return FALSE; - if (AnsiName->Length > 12) return FALSE; + if ((AnsiName->Length > 12) || (AnsiName->Buffer == NULL)) return FALSE; /* a starting . is invalid, except for . and .. */ if (AnsiName->Buffer[0] == '.')

1 0

[fireball] 30576: - Rewrite KdbSymProcessSymbols to use the KD_SYMBOLS_INFO structure kernel sends us. This removes the need for ugly names operations (maybe buggy!), and presents an elegant solution: just finding the needed module by its base address. - As a result, ALL modules get their symbols loaded now. - TODO: Remove KdbSymProcessBootSymbols(), it's used right now to load ntoskrnl and hal symbols during boot process.
by fireball＠svn.reactos.org 19 Nov '07

19 Nov '07

Author: fireball Date: Mon Nov 19 14:26:52 2007 New Revision: 30576 URL: http://svn.reactos.org/svn/reactos?rev=30576&view=rev Log: - Rewrite KdbSymProcessSymbols to use the KD_SYMBOLS_INFO structure kernel sends us. This removes the need for ugly names operations (maybe buggy!), and presents an elegant solution: just finding the needed module by its base address. - As a result, ALL modules get their symbols loaded now. - TODO: Remove KdbSymProcessBootSymbols(), it's used right now to load ntoskrnl and hal symbols during boot process. Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h Mon Nov 19 14:26:52 2007 @@ -89,7 +89,7 @@ IN BOOLEAN LoadFromFile); VOID -KdbSymProcessSymbols(IN PANSI_STRING FileName); +KdbSymProcessSymbols(IN PANSI_STRING FileName, IN PKD_SYMBOLS_INFO SymbolInfo); BOOLEAN KdbSymPrintAddress(IN PVOID Address); @@ -119,12 +119,12 @@ # define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) # define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) -# define KDB_SYMBOLFILE_HOOK(FILENAME) KdbSymProcessSymbols(FILENAME) +# define KDB_SYMBOLFILE_HOOK(FILENAME, SYMBOLINFO) KdbSymProcessSymbols((FILENAME), (SYMBOLINFO)) #else # define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) # define KDB_UNLOADDRIVER_HOOK(MODULE) do { } while (0) -# define KDB_SYMBOLFILE_HOOK(FILENAME) do { } while (0) +# define KDB_SYMBOLFILE_HOOK(FILENAME, SYMBOLINFO) do { } while (0) # define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) #endif Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c Mon Nov 19 14:26:52 2007 @@ -131,7 +131,8 @@ else if (ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) { /* Load symbols. Currently implemented only for KDBG! */ - KDB_SYMBOLFILE_HOOK((PANSI_STRING)ExceptionRecord->ExceptionInformation[1]); + KDB_SYMBOLFILE_HOOK((PANSI_STRING)ExceptionRecord->ExceptionInformation[1], + (PKD_SYMBOLS_INFO)ExceptionRecord->ExceptionInformation[2]); } /* This we can handle: simply bump EIP */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Mon Nov 19 14:26:52 2007 @@ -578,50 +578,77 @@ } VOID -KdbSymProcessSymbols(IN PANSI_STRING AnsiFileName) -{ - ANSI_STRING SystemPrefix, RealPathPrefix, ProperName; - CHAR Buffer[MAX_PATH], RealPathBuffer[MAX_PATH]; - - /* Init our strings for compare operations */ - RtlInitAnsiString(&SystemPrefix, "\\SystemRoot"); - - /* Convert system root to ansi */ - sprintf(RealPathBuffer, "%S", (PWCHAR)&SharedUserData->NtSystemRoot[2]); - RtlInitAnsiString(&RealPathPrefix, RealPathBuffer); - RealPathPrefix.MaximumLength = MAX_PATH; - - /* There are 3 cases: - 1) \SystemRoot\System32\ -> no change - 2) \ReactOS\System32 -> \SystemRoot\System32 - 3) module.dll -> \??\C:\ReactOS\system32\module.dll - */ - if (RtlPrefixString(&SystemPrefix, AnsiFileName, FALSE)) - { - /* Case: \SystemRoot\System32\ , just directly load it */ - KdbSymProcessBootSymbols(AnsiFileName, TRUE, FALSE); - } - else if (RtlPrefixString(&RealPathPrefix, AnsiFileName, FALSE)) - { - /* It's prefixed with a real path, instead of a \SystemRoot. - So build a new, proper name. */ - RtlZeroMemory(Buffer, MAX_PATH); - strcpy(Buffer, "\\SystemRoot"); - strncat(Buffer, - AnsiFileName->Buffer + RealPathPrefix.Length, - AnsiFileName->Length - RealPathPrefix.Length); - - /* Convert it to ANSI_STRING */ - RtlInitAnsiString(&ProperName, Buffer); - - /* Process symbols */ - KdbSymProcessBootSymbols(&ProperName, TRUE, TRUE); +KdbSymProcessSymbols(IN PANSI_STRING AnsiFileName, IN PKD_SYMBOLS_INFO SymbolInfo) +{ + BOOLEAN Found = FALSE; + PLIST_ENTRY ListHead, NextEntry; + PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; + + //DPRINT("KdbSymProcessSymbols(%Z)\n", AnsiFileName); + + /* We use PsLoadedModuleList here, otherwise (in case of + using KeLoaderBlock) all our data will be just lost */ + ListHead = &PsLoadedModuleList; + + /* Found module we are interested in */ + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + if (SymbolInfo->BaseOfDll == LdrEntry->DllBase) + { + Found = TRUE; + break; + } + + /* Go to the next one */ + NextEntry = NextEntry->Flink; + } + + /* Exit if we didn't find the module requested */ + if (!Found) + return; + + DPRINT("Found LdrEntry=%p\n", LdrEntry); + if (!LoadSymbols) + { + LdrEntry->PatchInformation = NULL; + return; + } + + /* Remove symbol info if it already exists */ + if (LdrEntry->PatchInformation != NULL) + { + KdbpSymRemoveCachedFile(LdrEntry->PatchInformation); + } + + /* Load new symbol information */ + if (! RosSymCreateFromMem(LdrEntry->DllBase, + LdrEntry->SizeOfImage, + (PROSSYM_INFO*)&LdrEntry->PatchInformation)) + { + /* Error loading symbol info, try to load it from file */ + KdbpSymLoadModuleSymbols(&LdrEntry->FullDllName, + (PROSSYM_INFO*)&LdrEntry->PatchInformation); + + /* It already added symbols to cache */ } else { - /* Just a bare filename, nothing else. Why? Who knows... */ - KdbSymProcessBootSymbols(AnsiFileName, FALSE, TRUE); - } + /* Add file to cache */ + KdbpSymAddCachedFile(&LdrEntry->FullDllName, LdrEntry->PatchInformation); + } + + DPRINT("Installed symbols: %wZ@%08x-%08x %p\n", + &LdrEntry->BaseDllName, + LdrEntry->DllBase, + LdrEntry->SizeOfImage + (ULONG)LdrEntry->DllBase, + LdrEntry->PatchInformation); + }

1 0

[jimtabor] 30575: Fireball found one I missed.
by jimtabor＠svn.reactos.org 19 Nov '07

19 Nov '07

Author: jimtabor Date: Mon Nov 19 13:36:23 2007 New Revision: 30575 URL: http://svn.reactos.org/svn/reactos?rev=30575&view=rev Log: Fireball found one I missed. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Mon Nov 19 13:36:23 2007 @@ -3852,6 +3852,7 @@ ) { PDC Dc; + PDC_ATTR Dc_Attr; HFONT hFont; PTEXTOBJ TextObj; NTSTATUS Status; @@ -3864,7 +3865,9 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - hFont = Dc->Dc_Attr.hlfntNew; + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + hFont = Dc_Attr->hlfntNew; DC_UnlockDc(Dc); TextObj = TEXTOBJ_LockText(hFont);

1 0

[dreimer] 30574: Remove all trailing Spaces. Change the Name shown for the ScreenSaver in the String to a more fitting one. Add a German Resource.
by dreimer＠svn.reactos.org 19 Nov '07

19 Nov '07

Author: dreimer Date: Mon Nov 19 13:04:29 2007 New Revision: 30574 URL: http://svn.reactos.org/svn/reactos?rev=30574&view=rev Log: Remove all trailing Spaces. Change the Name shown for the ScreenSaver in the String to a more fitting one. Add a German Resource. Added: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc (with props) Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c trunk/rosapps/applications/screensavers/butterflies/butterflies.def trunk/rosapps/applications/screensavers/butterflies/butterflies.rc trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc trunk/rosapps/applications/screensavers/butterflies/resource.h Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.c (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.c Mon Nov 19 13:04:29 2007 @@ -1,8 +1,8 @@ #include <windows.h> #include <scrnsave.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> +#include <math.h> +#include <stdio.h> +#include <stdlib.h> #include <GL/gl.h> #include <GL/glu.h> #include "resource.h" @@ -129,11 +129,11 @@ pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER; pfd.cColorBits = 24; pfd.cDepthBits = 24; - + nFormat = ChoosePixelFormat(hDC, &pfd); DescribePixelFormat(hDC, nFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd); SetPixelFormat(hDC, nFormat, &pfd); - + hRC = wglCreateContext(hDC); wglMakeCurrent(hDC, hRC); @@ -157,13 +157,13 @@ glLoadIdentity(); // Reset The Projection Matrix // Calculate The Aspect Ratio Of The Window - gluPerspective (45.0f, (GLfloat)(width)/(GLfloat)(height),1.0f, 1000.0f); + gluPerspective (45.0f, (GLfloat)(width)/(GLfloat)(height),1.0f, 1000.0f); glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix glLoadIdentity(); // Start Of User Initialization LoadGLTextures(); // Load The Textures From Our Resource File - + glClearColor (0.0f, 0.0f, 0.0f, 0.5f); // Black Background glClearDepth (1.0f); // Depth Buffer Setup glDepthFunc (GL_LEQUAL); // The Type Of Depth Testing (Less Or Equal) @@ -174,7 +174,7 @@ glBlendFunc(GL_ONE,GL_SRC_ALPHA); // Set Blending Mode (Cheap / Quick) glEnable(GL_BLEND); - + for (loop=0; loop<50; loop++) // Loop To Initialize 50 Objects { SetObject(loop); // Call SetObject To Assign New Random Values @@ -227,7 +227,7 @@ Sleep(15); // Create A Short Delay (15 Milliseconds) - glFlush (); + glFlush (); } @@ -251,7 +251,7 @@ case WM_COMMAND: switch(LOWORD(wpm)){ case IDOK: - EndDialog(hdlg, LOWORD(wpm)); + EndDialog(hdlg, LOWORD(wpm)); break; case WEBPAGE1: ShellExecute(NULL, "open", "http://nehe.gamedev.net", NULL, NULL, SW_SHOWNORMAL); @@ -264,8 +264,8 @@ return FALSE; } -LRESULT WINAPI ScreenSaverProc(HWND hWnd, UINT message, - WPARAM wParam, LPARAM lParam) +LRESULT WINAPI ScreenSaverProc(HWND hWnd, UINT message, + WPARAM wParam, LPARAM lParam) { static HGLRC hRC; static DWORD timer = 1; @@ -274,33 +274,33 @@ int width; int height; - switch (message) - { - case WM_CREATE: + switch (message) + { + case WM_CREATE: ReadRegistry(); hRC = InitOGLWindow(hWnd); - GetClientRect (hWnd, &WindowRect); + GetClientRect (hWnd, &WindowRect); width = WindowRect.right - WindowRect.left; height = WindowRect.bottom - WindowRect.top; InitOpenGL(width,height); SetTimer(hWnd, timer, 5, NULL); - break; + break; case WM_TIMER: hDC = GetDC(hWnd); Display(); SwapBuffers(hDC); ReleaseDC(hWnd, hDC); break; - case WM_DESTROY: + case WM_DESTROY: wglMakeCurrent(NULL, NULL); wglDeleteContext(hRC); break; - } + } return DefScreenSaverProc(hWnd, message, wParam, lParam); } -BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.def URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.def (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.def Mon Nov 19 13:04:29 2007 @@ -2,9 +2,9 @@ DESCRIPTION 'Lesson38Saver screen saver' -HEAPSIZE 1024 -STACKSIZE 4096 +HEAPSIZE 1024 +STACKSIZE 4096 -EXPORTS - ScreenSaverProc - ScreenSaverConfigureDialog +EXPORTS + ScreenSaverProc + ScreenSaverConfigureDialog Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Mon Nov 19 13:04:29 2007 @@ -10,4 +10,5 @@ #include <reactos/version.rc> +#include "lang/de-DE.rc" #include "lang/en-US.rc" Added: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc Mon Nov 19 13:04:29 2007 @@ -1,0 +1,97 @@ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +#include "afxres.h" +#undef APSTUDIO_READONLY_SYMBOLS +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif + +IDD_DLG_SCREEN DIALOG DISCARDABLE 0, 0, 172, 57 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Schmetterlinge Einstellungen" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,35,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,61,35,50,14 + CONTROL "Schmetterlinge rotieren",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,45,15,85,8 + PUSHBUTTON "Über",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOG DISCARDABLE 0, 0, 149, 79 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Über" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,48,58,56,14 + CTEXT "Schmetterlinge",IDC_STATIC,7,7,135,9 + CTEXT "Demo von: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "Bildschirmschoner von: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DLG_SCREEN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 165 + TOPMARGIN, 7 + BOTTOMMARGIN, 50 + END + + IDD_DLG_ABOUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 142 + TOPMARGIN, 7 + BOTTOMMARGIN, 72 + END +END +#endif + + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif + +IDB_BUTTERFLY1 BITMAP DISCARDABLE "res/butterfly1.bmp" +IDB_BUTTERFLY2 BITMAP DISCARDABLE "res/butterfly2.bmp" +IDB_BUTTERFLY3 BITMAP DISCARDABLE "res/butterfly3.bmp" + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STR_DESCRIP "Schmetterlinge" +END + +#endif + +#ifndef APSTUDIO_INVOKED + +#endif Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc Mon Nov 19 13:04:29 2007 @@ -28,29 +28,29 @@ IDD_DLG_SCREEN DIALOG DISCARDABLE 0, 0, 172, 57 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Butterflies Screen Saver Settings" +CAPTION "Butterflies ScreenSaver Settings" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,7,35,50,14 PUSHBUTTON "Cancel",IDCANCEL,61,35,50,14 - CONTROL "Rotate Butterflies",ROTATE,"Button",BS_AUTOCHECKBOX | + CONTROL "Rotate Butterflies",ROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,56,15,70,8 PUSHBUTTON "About",IDABOUT,115,35,50,14 END IDD_DLG_ABOUT DIALOG DISCARDABLE 0, 0, 149, 79 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About " +CAPTION "About" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,48,58,56,14 - CTEXT "Lesson38Saver",IDC_STATIC,7,7,135,9 + CTEXT "Butterflies ScreenSaver",IDC_STATIC,7,7,135,9 CTEXT "Demo by: NeHe ",IDC_STATIC,7,20,135,8 - CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | NOT WS_GROUP - CTEXT "ScreenSaver by: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + CTEXT "ScreenSaver by: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT WS_GROUP - CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | NOT WS_GROUP END @@ -61,7 +61,7 @@ // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_DLG_SCREEN, DIALOG BEGIN @@ -88,18 +88,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE DISCARDABLE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE DISCARDABLE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE DISCARDABLE BEGIN "\r\n" "\0" @@ -122,9 +122,9 @@ // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN - IDS_STR_DESCRIP "Lesson38Saver" + IDS_STR_DESCRIP "Butterflies" END #endif // English (U.S.) resources Modified: trunk/rosapps/applications/screensavers/butterflies/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/resource.h (original) +++ trunk/rosapps/applications/screensavers/butterflies/resource.h Mon Nov 19 13:04:29 2007 @@ -16,7 +16,7 @@ #define IDD_DLG_SCREEN 2003 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 108

1 0

[jimtabor] 30573: Add a test for VM address space when accessing user data.
by jimtabor＠svn.reactos.org 19 Nov '07

19 Nov '07

Author: jimtabor Date: Mon Nov 19 10:41:11 2007 New Revision: 30573 URL: http://svn.reactos.org/svn/reactos?rev=30573&view=rev Log: Add a test for VM address space when accessing user data. Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/misc/misc.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Mon Nov 19 10:41:11 2007 @@ -9,6 +9,7 @@ <library>kernel32</library> <library>advapi32</library> <library>win32ksys</library> + <library>pseh</library> <directory name="include"> <pch>precomp.h</pch> Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Mon Nov 19 10:41:11 2007 @@ -124,8 +124,25 @@ HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); if(pid == NULL || pid == CurrentProcessId) { - *UserData = Entry->UserData; - return TRUE; + // + // Need to test if we have Read & Write access to the VM address space. + // + BOOL Result = TRUE; + if(Entry->UserData) + { + volatile CHAR *Current = (volatile CHAR*)Entry->UserData; + _SEH_TRY + { + *Current = *Current; + } + _SEH_HANDLE + { + Result = FALSE; + } + _SEH_END + } + if (Result) *UserData = Entry->UserData; + return Result; } } SetLastError(ERROR_INVALID_PARAMETER);

1 0

[jimtabor] 30572: Move gdi functions to dcattr. Tested Qemu with AbiWord.
by jimtabor＠svn.reactos.org 19 Nov '07

19 Nov '07

Author: jimtabor Date: Mon Nov 19 05:48:25 2007 New Revision: 30572 URL: http://svn.reactos.org/svn/reactos?rev=30572&view=rev Log: Move gdi functions to dcattr. Tested Qemu with AbiWord. Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/painting.c trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Mon Nov 19 05:48:25 2007 @@ -194,13 +194,14 @@ return FALSE; } } +#endif PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; /* Check that graphics mode is GM_ADVANCED */ if ( Dc_Attr->iGraphicsMode != GM_ADVANCED ) return FALSE; -#endif + return NtGdiModifyWorldTransform(hDC, (CONST LPXFORM) Xform, iMode); } Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Mon Nov 19 05:48:25 2007 @@ -327,7 +327,6 @@ case GDI_OBJECT_TYPE_EXTPEN: case GDI_OBJECT_TYPE_PEN: { -#if 0 PBRUSH_ATTR Brh_Attr; PTEB pTeb; @@ -351,7 +350,6 @@ if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); return TRUE; } -#endif break; } case GDI_OBJECT_TYPE_BITMAP: @@ -750,13 +748,10 @@ HDC hdc ) { -//#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return CLR_INVALID; return (COLORREF) Dc_Attr->ulPenClr; -//#endif - return NtUserGetDCBrushColor(hdc); } /* @@ -768,13 +763,10 @@ HDC hdc ) { -//#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return CLR_INVALID; return (COLORREF) Dc_Attr->ulPenClr; -//#endif - return NtUserGetDCPenColor(hdc); } /* @@ -787,7 +779,6 @@ COLORREF crColor ) { -//#if 0 PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; @@ -804,8 +795,6 @@ } } return OldColor; -//#endif - return NtUserSetDCBrushColor(hdc, crColor); } /* @@ -818,7 +807,6 @@ COLORREF crColor ) { -//#if 0 PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; @@ -835,8 +823,7 @@ } } return OldColor; -//#endif - return NtUserSetDCPenColor(hdc, crColor); +// return NtUserSetDCPenColor(hdc, crColor); } /* @@ -849,7 +836,6 @@ COLORREF crColor ) { -#if 0 PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; @@ -883,8 +869,7 @@ Dc_Attr->crForegroundClr = crColor; } return OldColor; -#endif - return NtGdiSetTextColor(hdc, crColor); +// return NtGdiSetTextColor(hdc, crColor); } /* @@ -897,7 +882,6 @@ COLORREF crColor ) { -#if 0 PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; @@ -931,8 +915,7 @@ Dc_Attr->crBackgroundClr = crColor; } return OldColor; -#endif - return NtGdiSetBkColor(hdc, crColor); +// return NtGdiSetBkColor(hdc, crColor); } /* @@ -1087,22 +1070,18 @@ LPSIZE lpSize ) { -#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; if ( Dc_Attr->flXform & PAGE_EXTENTS_CHANGED ) // Something was updated, go to kernel. -#endif - return NtGdiGetDCPoint( hdc, GdiGetViewPortExt, (LPPOINT) lpSize ); -#if 0 + return NtGdiGetDCPoint( hdc, GdiGetViewPortExt, (LPPOINT) lpSize ); else { lpSize->cx = Dc_Attr->szlViewportExt.cx; lpSize->cy = Dc_Attr->szlViewportExt.cy; } return TRUE; -#endif } @@ -1113,16 +1092,13 @@ LPPOINT lpPoint ) { -#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; lpPoint->x = Dc_Attr->ptlViewportOrg.x; lpPoint->x = Dc_Attr->ptlViewportOrg.x; return TRUE; -#endif - // Do it this way for now. - return NtGdiGetDCPoint( hdc, GdiGetViewPortOrg, lpPoint ); + // return NtGdiGetDCPoint( hdc, GdiGetViewPortOrg, lpPoint ); } @@ -1133,16 +1109,13 @@ LPSIZE lpSize ) { -#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; lpSize->cx = Dc_Attr->szlWindowExt.cx; lpSize->cy = Dc_Attr->szlWindowExt.cy; return TRUE; -#endif - // Do it this way for now. - return NtGdiGetDCPoint( hdc, GdiGetWindowExt, (LPPOINT) lpSize ); + // return NtGdiGetDCPoint( hdc, GdiGetWindowExt, (LPPOINT) lpSize ); } @@ -1153,16 +1126,13 @@ LPPOINT lpPoint ) { -#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; lpPoint->x = Dc_Attr->ptlWindowOrg.x; lpPoint->x = Dc_Attr->ptlWindowOrg.x; return TRUE; -#endif - // Do it this way for now. - return NtGdiGetDCPoint( hdc, GdiGetWindowOrg, lpPoint ); + //return NtGdiGetDCPoint( hdc, GdiGetWindowOrg, lpPoint ); } /* FIXME: include correct header */ Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Mon Nov 19 05:48:25 2007 @@ -41,26 +41,26 @@ { PDC_ATTR Dc_Attr; + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam2( hDC, META_MOVETO, x, y); + else + { + PLDC pLDC = Dc_Attr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + if (!EMFDRV_MoveTo( hDC, x, y)) return FALSE; + } + } + } + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; - - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam2( hDC, META_MOVETO, x, y); - else - { - PLDC pLDC = Dc_Attr->pvLDC; - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - if (!EMFDRV_MoveTo( hDC, x, y)) return FALSE; - } - } - } if ( Point ) { Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Mon Nov 19 05:48:25 2007 @@ -70,14 +70,11 @@ HDC hDc ) { -#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hDc, (PVOID) &Dc_Attr)) return 0; return Dc_Attr->lTextExtra; -#endif - // Do it this way for now. - return GetDCDWord( hDc, GdiGetTextCharExtra, 0); +// return GetDCDWord( hDc, GdiGetTextCharExtra, 0); } @@ -432,7 +429,7 @@ ) { INT cExtra = 0x80000000; -// PDC_ATTR Dc_Attr; + PDC_ATTR Dc_Attr; if (CharExtra == cExtra) { @@ -444,9 +441,10 @@ { return MFDRV_SetTextCharacterExtra( hDC, CharExtra ); // Wine port. } +#endif if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return cExtra; - if (NtCurrentTeb()->GdiTebBatch.HDC == hDC) + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hDC) { if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) { @@ -456,10 +454,8 @@ } cExtra = Dc_Attr->lTextExtra; Dc_Attr->lTextExtra = CharExtra; - return cExrta; -#endif -// Do this for now. - return GetAndSetDCDWord( hDC, GdiGetSetTextCharExtra, CharExtra, 0, 0, 0 ); -} - - + return cExtra; +// return GetAndSetDCDWord( hDC, GdiGetSetTextCharExtra, CharExtra, 0, 0, 0 ); +} + +

1 0

[mpiulachs] 30571: Add butterfiles OpenGL screen saver to build
by mpiulachs＠svn.reactos.org 19 Nov '07

19 Nov '07

Author: mpiulachs Date: Mon Nov 19 04:26:33 2007 New Revision: 30571 URL: http://svn.reactos.org/svn/reactos?rev=30571&view=rev Log: Add butterfiles OpenGL screen saver to build Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/screensavers.rbuild (original) +++ trunk/rosapps/applications/screensavers/screensavers.rbuild Mon Nov 19 04:26:33 2007 @@ -16,4 +16,7 @@ <directory name="mazescr"> <xi:include href="mazescr/mazescr.rbuild" /> </directory> + <directory name="butterflies"> + <xi:include href="butterflies/butterflies.rbuild" /> + </directory> </group>

1 0

[mpiulachs] 30570: Cool flying butterflies screen saver. It uses the new scrnsave library. All screen savers *should* be modified to use this library inset of replicating a large amount of code Original work by Jeff Molofee tutorials (http://nehe.gamedev.net) basically converted from C++ to C and adapted as a windows screensaver
by mpiulachs＠svn.reactos.org 19 Nov '07

19 Nov '07

Author: mpiulachs Date: Mon Nov 19 04:11:35 2007 New Revision: 30570 URL: http://svn.reactos.org/svn/reactos?rev=30570&view=rev Log: Cool flying butterflies screen saver. It uses the new scrnsave library. All screen savers *should* be modified to use this library inset of replicating a large amount of code Original work by Jeff Molofee tutorials (http://nehe.gamedev.net) basically converted from C++ to C and adapted as a windows screensaver Added: trunk/rosapps/applications/screensavers/butterflies/ trunk/rosapps/applications/screensavers/butterflies/butterflies.c (with props) trunk/rosapps/applications/screensavers/butterflies/butterflies.def (with props) trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild (with props) trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (with props) trunk/rosapps/applications/screensavers/butterflies/lang/ trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc (with props) trunk/rosapps/applications/screensavers/butterflies/res/ trunk/rosapps/applications/screensavers/butterflies/res/butterfly1.bmp (with props) trunk/rosapps/applications/screensavers/butterflies/res/butterfly2.bmp (with props) trunk/rosapps/applications/screensavers/butterflies/res/butterfly3.bmp (with props) trunk/rosapps/applications/screensavers/butterflies/resource.h (with props) Added: trunk/rosapps/applications/screensavers/butterflies/butterflies.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.c (added) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.c Mon Nov 19 04:11:35 2007 @@ -1,0 +1,336 @@ +#include <windows.h> +#include <scrnsave.h> +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <GL/gl.h> +#include <GL/glu.h> +#include "resource.h" + +/* missing declare from gl.h */ +#define GL_BGR_EXT 0x80E0 + +HINSTANCE hInstance; // Holds The Instance Of The Application + +GLuint texture[3]; //stores texture objects and display list + +LPCTSTR registryPath = ("Software\\tHaPuTeRProductions\\Lesson38Saver"); +BOOL dRotate; + + +struct object // Create A Structure Called Object +{ + int tex; // Integer Used To Select Our Texture + float x; // X Position + float y; // Y Position + float z; // Z Position + float yi; // Y Increase Speed (Fall Speed) + float spinz; // Z Axis Spin + float spinzi; // Z Axis Spin Speed + float flap; // Flapping Triangles :) + float fi; // Flap Direction (Increase Value) +}; + +struct object obj[50]; +//object obj[50]; // Create 50 Objects Using The Object Structure + +void SetDefaults() +{ + dRotate = TRUE; +} + +void ReadRegistry(){ + LONG result; + HKEY skey; + DWORD valtype, valsize, val; + + SetDefaults(); + + result = RegOpenKeyEx(HKEY_CURRENT_USER, registryPath, 0, KEY_READ, &skey); + if(result != ERROR_SUCCESS) + return; + + valsize=sizeof(val); + + result = RegQueryValueEx(skey, "Rotate", 0, &valtype, (LPBYTE)&val, &valsize); + if(result == ERROR_SUCCESS) + dRotate = val; + RegCloseKey(skey); +} + +void WriteRegistry(){ + LONG result; + HKEY skey; + DWORD val, disp; + + result = RegCreateKeyEx(HKEY_CURRENT_USER, registryPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey, &disp); + if(result != ERROR_SUCCESS) + return; + + val = dRotate; + RegSetValueEx(skey, "Rotate", 0, REG_DWORD, (CONST BYTE*)&val, sizeof(val)); + + RegCloseKey(skey); +} + +void SetObject(int loop) // Sets The Initial Value Of Each Object (Random) +{ + obj[loop].tex=rand()%3; // Texture Can Be One Of 3 Textures + obj[loop].x=rand()%34-17.0f; // Random x Value From -17.0f To 17.0f + obj[loop].y=18.0f; // Set y Position To 18 (Off Top Of Screen) + obj[loop].z=-((rand()%30000/1000.0f)+10.0f); // z Is A Random Value From -10.0f To -40.0f + obj[loop].spinzi=(rand()%10000)/5000.0f-1.0f; // spinzi Is A Random Value From -1.0f To 1.0f + obj[loop].flap=0.0f; // flap Starts Off At 0.0f; + obj[loop].fi=0.05f+(rand()%100)/1000.0f; // fi Is A Random Value From 0.05f To 0.15f + obj[loop].yi=0.001f+(rand()%1000)/10000.0f; // yi Is A Random Value From 0.001f To 0.101f +} + +void LoadGLTextures() // Creates Textures From Bitmaps In The Resource File +{ + HBITMAP hBMP; // Handle Of The Bitmap + BITMAP BMP; // Bitmap Structure + int loop; + + // The ID Of The 3 Bitmap Images We Want To Load From The Resource File + byte Texture[]={ IDB_BUTTERFLY1, IDB_BUTTERFLY2, IDB_BUTTERFLY3 }; + + glGenTextures(sizeof(Texture), &texture[0]); // Generate 3 Textures (sizeof(Texture)=3 ID's) + for (loop=0; loop<sizeof(Texture); loop++) // Loop Through All The ID's (Bitmap Images) + { + hBMP=(HBITMAP)LoadImage(GetModuleHandle(NULL),MAKEINTRESOURCE(Texture[loop]), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + if (hBMP) // Does The Bitmap Exist? + { // If So... + GetObject(hBMP,sizeof(BMP), &BMP); // Get The Object + // hBMP: Handle To Graphics Object + // sizeof(BMP): Size Of Buffer For Object Information + // Buffer For Object Information + glPixelStorei(GL_UNPACK_ALIGNMENT,4); // Pixel Storage Mode (Word Alignment / 4 Bytes) + glBindTexture(GL_TEXTURE_2D, texture[loop]); // Bind Our Texture + glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); // Linear Filtering + glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); // Mipmap Linear Filtering + + // Generate Mipmapped Texture (3 Bytes, Width, Height And Data From The BMP) + gluBuild2DMipmaps(GL_TEXTURE_2D, 3, BMP.bmWidth, BMP.bmHeight, GL_BGR_EXT, GL_UNSIGNED_BYTE, BMP.bmBits); + } + } +} + +HGLRC InitOGLWindow(HWND hWnd) +{ + HDC hDC = GetDC(hWnd); + HGLRC hRC = 0; + PIXELFORMATDESCRIPTOR pfd; + int nFormat; + + ZeroMemory(&pfd, sizeof(PIXELFORMATDESCRIPTOR)); + + pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR); + pfd.nVersion = 1; + pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER; + pfd.cColorBits = 24; + pfd.cDepthBits = 24; + + nFormat = ChoosePixelFormat(hDC, &pfd); + DescribePixelFormat(hDC, nFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd); + SetPixelFormat(hDC, nFormat, &pfd); + + hRC = wglCreateContext(hDC); + wglMakeCurrent(hDC, hRC); + + ReleaseDC(hWnd, hDC); + + return hRC; +} + +void InitOpenGL(GLsizei width, GLsizei height) +{ + int loop; + + if (height==0) // Prevent A Divide By Zero By + { + height=1; // Making Height Equal One + } + + glViewport(0,0,width,height); // Reset The Current Viewport + + glMatrixMode(GL_PROJECTION); // Select The Projection Matrix + glLoadIdentity(); // Reset The Projection Matrix + + // Calculate The Aspect Ratio Of The Window + gluPerspective (45.0f, (GLfloat)(width)/(GLfloat)(height),1.0f, 1000.0f); + + glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix + glLoadIdentity(); + // Start Of User Initialization + LoadGLTextures(); // Load The Textures From Our Resource File + + glClearColor (0.0f, 0.0f, 0.0f, 0.5f); // Black Background + glClearDepth (1.0f); // Depth Buffer Setup + glDepthFunc (GL_LEQUAL); // The Type Of Depth Testing (Less Or Equal) + glDisable(GL_DEPTH_TEST); // Disable Depth Testing + glShadeModel (GL_SMOOTH); // Select Smooth Shading + glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); // Set Perspective Calculations To Most Accurate + glEnable(GL_TEXTURE_2D); // Enable Texture Mapping + glBlendFunc(GL_ONE,GL_SRC_ALPHA); // Set Blending Mode (Cheap / Quick) + glEnable(GL_BLEND); + + + for (loop=0; loop<50; loop++) // Loop To Initialize 50 Objects + { + SetObject(loop); // Call SetObject To Assign New Random Values + } + +} + +void Display() +{ + int loop; + glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear Screen And Depth Buffer + + for (loop=0; loop<50; loop++) // Loop Of 50 (Draw 50 Objects) + { + glLoadIdentity (); // Reset The Modelview Matrix + glBindTexture(GL_TEXTURE_2D, texture[obj[loop].tex]); // Bind Our Texture + glTranslatef(obj[loop].x,obj[loop].y,obj[loop].z); // Position The Object + glRotatef(45.0f,1.0f,0.0f,0.0f); // Rotate On The X-Axis + if (dRotate) + { + glRotatef((obj[loop].spinz),0.0f,0.0f,1.0f); // Spin On The Z-Axis + } + glBegin(GL_TRIANGLES); // Begin Drawing Triangles + // First Triangle _____ + glTexCoord2f(1.0f,1.0f); glVertex3f( 1.0f, 1.0f, 0.0f); // (2)| / (1) + glTexCoord2f(0.0f,1.0f); glVertex3f(-1.0f, 1.0f, obj[loop].flap); // | / + glTexCoord2f(0.0f,0.0f); glVertex3f(-1.0f,-1.0f, 0.0f); // (3)|/ + + // Second Triangle + glTexCoord2f(1.0f,1.0f); glVertex3f( 1.0f, 1.0f, 0.0f); // /|(1) + glTexCoord2f(0.0f,0.0f); glVertex3f(-1.0f,-1.0f, 0.0f); // / | + glTexCoord2f(1.0f,0.0f); glVertex3f( 1.0f,-1.0f, obj[loop].flap); // (2)/____|(3) + + glEnd(); // Done Drawing Triangles + + obj[loop].y-=obj[loop].yi; // Move Object Down The Screen + obj[loop].spinz+=obj[loop].spinzi; // Increase Z Rotation By spinzi + obj[loop].flap+=obj[loop].fi; // Increase flap Value By fi + + if (obj[loop].y<-18.0f) // Is Object Off The Screen? + { + SetObject(loop); // If So, Reassign New Values + } + + if ((obj[loop].flap>1.0f) || (obj[loop].flap<-1.0f)) // Time To Change Flap Direction? + { + obj[loop].fi=-obj[loop].fi; // Change Direction By Making fi = -fi + } + } + + Sleep(15); // Create A Short Delay (15 Milliseconds) + + glFlush (); + +} + +BOOL AboutProc(HWND hdlg, UINT msg, WPARAM wpm, LPARAM lpm){ + /* + switch(msg){ + case WM_CTLCOLORSTATIC: + if(HWND(lpm) == GetDlgItem(hdlg, WEBPAGE1)) + { + SetTextColor(HDC(wpm), RGB(0,0,255)); + SetBkColor(HDC(wpm), COLORREF(GetSysColor(COLOR_3DFACE))); + return(int(GetSysColorBrush(COLOR_3DFACE))); + } + if(HWND(lpm) == GetDlgItem(hdlg, WEBPAGE2)) + { + SetTextColor(HDC(wpm), RGB(0,0,255)); + SetBkColor(HDC(wpm), COLORREF(GetSysColor(COLOR_3DFACE))); + return(int(GetSysColorBrush(COLOR_3DFACE))); + } + break; + case WM_COMMAND: + switch(LOWORD(wpm)){ + case IDOK: + EndDialog(hdlg, LOWORD(wpm)); + break; + case WEBPAGE1: + ShellExecute(NULL, "open", "http://nehe.gamedev.net", NULL, NULL, SW_SHOWNORMAL); + break; + case WEBPAGE2: + ShellExecute(NULL, "open", "http://www.thaputer.com", NULL, NULL, SW_SHOWNORMAL); + break; + } + }*/ + return FALSE; +} + +LRESULT WINAPI ScreenSaverProc(HWND hWnd, UINT message, + WPARAM wParam, LPARAM lParam) +{ + static HGLRC hRC; + static DWORD timer = 1; + HDC hDC; + RECT WindowRect; + int width; + int height; + + switch (message) + { + case WM_CREATE: + ReadRegistry(); + hRC = InitOGLWindow(hWnd); + GetClientRect (hWnd, &WindowRect); + width = WindowRect.right - WindowRect.left; + height = WindowRect.bottom - WindowRect.top; + InitOpenGL(width,height); + SetTimer(hWnd, timer, 5, NULL); + break; + case WM_TIMER: + hDC = GetDC(hWnd); + Display(); + SwapBuffers(hDC); + ReleaseDC(hWnd, hDC); + break; + case WM_DESTROY: + wglMakeCurrent(NULL, NULL); + wglDeleteContext(hRC); + break; + } + + return DefScreenSaverProc(hWnd, message, wParam, lParam); +} + +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, + WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + ReadRegistry(); + CheckDlgButton(hDlg, ROTATE, dRotate); + return TRUE; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + dRotate = (IsDlgButtonChecked(hDlg, ROTATE) == BST_CHECKED); + WriteRegistry(); + EndDialog(hDlg, TRUE); + return TRUE; + case IDCANCEL: + EndDialog(hDlg, TRUE); + break; + case IDABOUT: + //DialogBox(hInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hDlg, DLGPROC(AboutProc)); + break; + } + } + + return FALSE; +} + +BOOL WINAPI RegisterDialogClasses(HANDLE hInst) +{ + return TRUE; +} + Propchange: trunk/rosapps/applications/screensavers/butterflies/butterflies.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/butterflies.def URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.def (added) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.def Mon Nov 19 04:11:35 2007 @@ -1,0 +1,10 @@ +NAME LESSON38SAVER.SCR + +DESCRIPTION 'Lesson38Saver screen saver' + +HEAPSIZE 1024 +STACKSIZE 4096 + +EXPORTS + ScreenSaverProc + ScreenSaverConfigureDialog Propchange: trunk/rosapps/applications/screensavers/butterflies/butterflies.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild (added) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild Mon Nov 19 04:11:35 2007 @@ -1,0 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="butterflies" type="win32scr" installbase="system32" installname="butterflies.scr" allowwarnings="true"> + <importlibrary definition="butterflies.def" /> + <include base="butterflies">.</include> + <library>scrnsavelib</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>opengl32</library> + <library>glu32</library> + <library>advapi32</library> + + <metadata description = "Butterflies screensaver" /> + + <file>butterflies.c</file> + <file>butterflies.rc</file> +</module> Propchange: trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Mon Nov 19 04:11:35 2007 @@ -1,0 +1,13 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Butterflies ScreenSaver\0" +#define REACTOS_STR_INTERNAL_NAME "butterflies\0" +#define REACTOS_STR_ORIGINAL_FILENAME "butterflies.scr\0" + +#include <reactos/version.rc> + +#include "lang/en-US.rc" Propchange: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc Mon Nov 19 04:11:35 2007 @@ -1,0 +1,144 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_DLG_SCREEN DIALOG DISCARDABLE 0, 0, 172, 57 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Butterflies Screen Saver Settings" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,35,50,14 + PUSHBUTTON "Cancel",IDCANCEL,61,35,50,14 + CONTROL "Rotate Butterflies",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,56,15,70,8 + PUSHBUTTON "About",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOG DISCARDABLE 0, 0, 149, 79 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About " +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,48,58,56,14 + CTEXT "Lesson38Saver",IDC_STATIC,7,7,135,9 + CTEXT "Demo by: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "ScreenSaver by: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DLG_SCREEN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 165 + TOPMARGIN, 7 + BOTTOMMARGIN, 50 + END + + IDD_DLG_ABOUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 142 + TOPMARGIN, 7 + BOTTOMMARGIN, 72 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_BUTTERFLY1 BITMAP DISCARDABLE "res/butterfly1.bmp" +IDB_BUTTERFLY2 BITMAP DISCARDABLE "res/butterfly2.bmp" +IDB_BUTTERFLY3 BITMAP DISCARDABLE "res/butterfly3.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STR_DESCRIP "Lesson38Saver" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/res/butterfly1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/butterflies/res/butterfly1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/applications/screensavers/butterflies/res/butterfly2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/butterflies/res/butterfly2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/applications/screensavers/butterflies/res/butterfly3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/butterflies/res/butterfly3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/applications/screensavers/butterflies/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/resource.h (added) +++ trunk/rosapps/applications/screensavers/butterflies/resource.h Mon Nov 19 04:11:35 2007 @@ -1,0 +1,27 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by Lesson38Saver.rc +// +#define IDS_STR_DESCRIP 1 +#define IDABOUT 3 +#define IDI_ICON_SCREEN 100 +#define IDB_BUTTERFLY1 103 +#define IDB_BUTTERFLY2 104 +#define IDB_BUTTERFLY3 105 +#define IDI_ICON 106 +#define IDD_DLG_ABOUT 107 +#define ROTATE 1000 +#define WEBPAGE1 1001 +#define WEBPAGE2 1002 +#define IDD_DLG_SCREEN 2003 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 108 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1003 +#define _APS_NEXT_SYMED_VALUE 106 +#endif +#endif Propchange: trunk/rosapps/applications/screensavers/butterflies/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 30569: add scrnsave to build
by mpiulachs＠svn.reactos.org 19 Nov '07

19 Nov '07

Author: mpiulachs Date: Mon Nov 19 03:44:52 2007 New Revision: 30569 URL: http://svn.reactos.org/svn/reactos?rev=30569&view=rev Log: add scrnsave to build Modified: trunk/reactos/lib/sdk/sdk.rbuild Modified: trunk/reactos/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/sdk.rbuild?rev=305… ============================================================================== --- trunk/reactos/lib/sdk/sdk.rbuild (original) +++ trunk/reactos/lib/sdk/sdk.rbuild Mon Nov 19 03:44:52 2007 @@ -20,4 +20,7 @@ <directory name="wdmguid"> <xi:include href="wdmguid/wdmguid.rbuild" /> </directory> + <directory name="scrnsave"> + <xi:include href="scrnsave/scrnsave.rbuild" /> + </directory> </group>

1 0

[mpiulachs] 30568: Move scrnsave to a more correct location as it's a static library part of MS DDK
by mpiulachs＠svn.reactos.org 19 Nov '07

19 Nov '07

Author: mpiulachs Date: Mon Nov 19 03:35:39 2007 New Revision: 30568 URL: http://svn.reactos.org/svn/reactos?rev=30568&view=rev Log: Move scrnsave to a more correct location as it's a static library part of MS DDK Added: trunk/reactos/lib/sdk/scrnsave/ - copied from r30567, trunk/reactos/dll/win32/scrnsave/ Removed: trunk/reactos/dll/win32/scrnsave/ Modified: trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Mon Nov 19 03:35:39 2007 @@ -331,7 +331,4 @@ <directory name="wtsapi32"> <xi:include href="wtsapi32/wtsapi32.rbuild" /> </directory> -<directory name="scrnsave"> - <xi:include href="scrnsave/scrnsave.rbuild" /> -</directory> </group>

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