Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 30760: - Fix an awful mistake, which made any request to unload a driver to end up in a BSOD (reading of an uninitialized variable, and again GCC silently missed that).
by fireball＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: fireball Date: Mon Nov 26 00:04:44 2007 New Revision: 30760 URL: http://svn.reactos.org/svn/reactos?rev=30760&view=rev Log: - Fix an awful mistake, which made any request to unload a driver to end up in a BSOD (reading of an uninitialized variable, and again GCC silently missed that). Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Mon Nov 26 00:04:44 2007 @@ -1502,14 +1502,14 @@ NTSTATUS Status; ULONG Type; PDEVICE_NODE DeviceNode; + PDRIVER_OBJECT DriverObject; PLDR_DATA_TABLE_ENTRY ModuleObject; - PDRIVER_OBJECT DriverObject; WCHAR *cur; /* Check if it's an unload request */ if (LoadParams->DriverObject) { - (*DriverObject->DriverUnload)(DriverObject); + (*LoadParams->DriverObject->DriverUnload)(LoadParams->DriverObject); /* Return success and signal the event */ LoadParams->Status = STATUS_SUCCESS;

1 0

[janderwald] 30759: - implement SHCreateDataObject - fix prototype of CIDLData_CreateFromIDArray - remove CIDLData_CreateFromIDArray from undocshell.h as its now documented in shlobj.h
by janderwald＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: janderwald Date: Sun Nov 25 23:41:28 2007 New Revision: 30759 URL: http://svn.reactos.org/svn/reactos?rev=30759&view=rev Log: - implement SHCreateDataObject - fix prototype of CIDLData_CreateFromIDArray - remove CIDLData_CreateFromIDArray from undocshell.h as its now documented in shlobj.h Modified: trunk/reactos/dll/win32/shell32/dataobject.c trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/dll/win32/shell32/undocshell.h Modified: trunk/reactos/dll/win32/shell32/dataobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dataobje… ============================================================================== --- trunk/reactos/dll/win32/shell32/dataobject.c (original) +++ trunk/reactos/dll/win32/shell32/dataobject.c Sun Nov 25 23:41:28 2007 @@ -451,3 +451,17 @@ TRACE("(%p)->(apidl=%p cidl=%u)\n",dto, apidl, cidl); return (LPDATAOBJECT)dto; } + +/************************************************************************* + * SHCreateDataObject [SHELL32.@] + * + */ + +HRESULT WINAPI SHCreateDataObject(LPCITEMIDLIST pidlFolder, UINT cidl, LPCITEMIDLIST* apidl, IDataObject *pdtInner, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IDataObject)) + { + return CIDLData_CreateFromIDArray(pidlFolder, cidl, apidl, ppv); + } + return E_FAIL; +} Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c (original) +++ trunk/reactos/dll/win32/shell32/shellord.c Sun Nov 25 23:41:28 2007 @@ -1816,9 +1816,9 @@ */ HRESULT WINAPI CIDLData_CreateFromIDArray( LPCITEMIDLIST pidlFolder, - DWORD cpidlFiles, + UINT cpidlFiles, LPCITEMIDLIST *lppidlFiles, - LPDATAOBJECT *ppdataObject) + IDataObject **ppdataObject) { UINT i; HWND hwnd = 0; /*FIXME: who should be hwnd of owner? set to desktop */ Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe… ============================================================================== --- trunk/reactos/dll/win32/shell32/undocshell.h (original) +++ trunk/reactos/dll/win32/shell32/undocshell.h Sun Nov 25 23:41:28 2007 @@ -350,12 +350,6 @@ BOOL WINAPI DAD_ShowDragImage(BOOL bShow); -HRESULT WINAPI CIDLData_CreateFromIDArray( - LPCITEMIDLIST pidlFolder, - DWORD cpidlFiles, - LPCITEMIDLIST *lppidlFiles, - LPDATAOBJECT *ppdataObject); - /**************************************************************************** * Path Manipulation Routines */

1 0

[janderwald] 30758: - add declaration of SHCreateDataObject - fix & move declaration of CIDLData_CreateFromIDArray from shell32
by janderwald＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: janderwald Date: Sun Nov 25 23:39:43 2007 New Revision: 30758 URL: http://svn.reactos.org/svn/reactos?rev=30758&view=rev Log: - add declaration of SHCreateDataObject - fix & move declaration of CIDLData_CreateFromIDArray from shell32 Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Sun Nov 25 23:39:43 2007 @@ -1432,6 +1432,28 @@ REFIID riid, void **ppv); +/**************************************************************************** + * SHCreateDataObject API + */ + +HRESULT WINAPI SHCreateDataObject( + LPCITEMIDLIST pidlFolder, + UINT cidl, + LPCITEMIDLIST* apidl, + IDataObject *pdtInner, + REFIID riid, + void **ppv); + +/**************************************************************************** + * CIDLData_CreateFromIDArray API + */ + +HRESULT WINAPI CIDLData_CreateFromIDArray( + LPCITEMIDLIST pidlFolder, + UINT cidl, + LPCITEMIDLIST* apidl, + IDataObject **ppdtobj); + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

[mpiulachs] 30757: Add missing include glext.h
by mpiulachs＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: mpiulachs Date: Sun Nov 25 23:32:10 2007 New Revision: 30757 URL: http://svn.reactos.org/svn/reactos?rev=30757&view=rev Log: Add missing include glext.h Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c 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 Sun Nov 25 23:32:10 2007 @@ -5,10 +5,8 @@ #include <stdlib.h> #include <GL/gl.h> #include <GL/glu.h> +#include <GL/glext.h> #include "resource.h" - -/* missing declare from gl.h */ -#define GL_BGR_EXT 0x80E0 HINSTANCE hInstance; // Holds The Instance Of The Application

1 0

[greatlrd] 30756: adding stub for wglChoosePixelFormatARB, wglSwapIntervalEXT, wglGetSwapIntervalEXT
by greatlrd＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: greatlrd Date: Sun Nov 25 23:28:04 2007 New Revision: 30756 URL: http://svn.reactos.org/svn/reactos?rev=30756&view=rev Log: adding stub for wglChoosePixelFormatARB, wglSwapIntervalEXT, wglGetSwapIntervalEXT Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Sun Nov 25 23:28:04 2007 @@ -712,3 +712,50 @@ "WGL_EXT_extensions_string WGL_ARB_extensions_string" /*WGL_ARB_pixel_format WGL_ARB_render_texture WGL_ARB_pbuffer*/; } + +GLAPI BOOL GLAPIENTRY +wglChoosePixelFormatARB (HDC hdc, + const int *piAttribIList, + const FLOAT *pfAttribFList, + UINT nMaxFormats, + int *piFormats, + UINT *nNumFormats) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglSwapIntervalEXT (int interval) +{ + /* + WMesaContext ctx = wglGetCurrentContext(); + if (ctx == NULL) { + return FALSE; + } + if (interval < 0) { + interval = 0; + } else if (interval > 3) { + interval = 3; + } + ctx->gl_ctx.swapInterval = interval; + return TRUE; + */ + return FALSE; +} + +GLAPI int GLAPIENTRY +wglGetSwapIntervalEXT (void) +{ + /* + + WMesaContext ctx = wglGetCurrentContext(); + + if (ctx == NULL) { + return -1; + } + return (int)ctx->gl_ctx.swapInterval; + */ + return -1; +} + Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Sun Nov 25 23:28:04 2007 @@ -50,6 +50,9 @@ #include "glapi.h" GLAPI const char * GLAPIENTRY wglGetExtensionsStringEXT (void); +GLAPI BOOL GLAPIENTRY wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); +GLAPI BOOL GLAPIENTRY wglSwapIntervalEXT (int interval); +GLAPI int GLAPIENTRY wglGetSwapIntervalEXT (void); #define MAX_MESA_ATTRS 20 @@ -315,24 +318,25 @@ } wgl_ext[] = { {"wglGetExtensionsStringARB", (PROC)wglGetExtensionsStringARB}, {"wglGetExtensionsStringEXT", (PROC)wglGetExtensionsStringEXT}, -// {"wglSwapIntervalEXT", (PROC)wglSwapIntervalEXT}, -// {"wglGetSwapIntervalEXT", (PROC)wglGetSwapIntervalEXT}, -// {"wglGetDeviceGammaRamp3DFX", (PROC)wglGetDeviceGammaRamp3DFX}, -// {"wglSetDeviceGammaRamp3DFX", (PROC)wglSetDeviceGammaRamp3DFX}, - /* WGL_ARB_pixel_format */ -// {"wglGetPixelFormatAttribivARB", (PROC)wglGetPixelFormatAttribivARB}, -// {"wglGetPixelFormatAttribfvARB", (PROC)wglGetPixelFormatAttribfvARB}, -// {"wglChoosePixelFormatARB", (PROC)wglChoosePixelFormatARB}, - /* WGL_ARB_render_texture */ -// {"wglBindTexImageARB", (PROC)wglBindTexImageARB}, -// {"wglReleaseTexImageARB", (PROC)wglReleaseTexImageARB}, -// {"wglSetPbufferAttribARB", (PROC)wglSetPbufferAttribARB}, -// /* WGL_ARB_pbuffer */ -// {"wglCreatePbufferARB", (PROC)wglCreatePbufferARB}, -// {"wglGetPbufferDCARB", (PROC)wglGetPbufferDCARB}, -// {"wglReleasePbufferDCARB", (PROC)wglReleasePbufferDCARB}, -// {"wglDestroyPbufferARB", (PROC)wglDestroyPbufferARB}, -// {"wglQueryPbufferARB", (PROC)wglQueryPbufferARB}, + {"wglSwapIntervalEXT", (PROC)wglSwapIntervalEXT}, + {"wglGetSwapIntervalEXT", (PROC)wglGetSwapIntervalEXT}, +// {"wglGetPixelFormatAttribivARB", (PROC)wglGetPixelFormatAttribivARB}, +// {"wglGetPixelFormatAttribfvARB", (PROC)wglGetPixelFormatAttribfvARB}, + {"wglChoosePixelFormatARB", (PROC)wglChoosePixelFormatARB}, +// {"wglCreatePbufferARB", (PROC)wglCreatePbufferARB}, +// {"wglGetPbufferDCARB", (PROC)wglGetPbufferDCARB}, +// {"wglReleasePbufferDCARB", (PROC)wglReleasePbufferDCARB}, +// {"wglDestroyPbufferARB", (PROC)wglDestroyPbufferARB}, +// {"wglQueryPbufferARB", (PROC)wglQueryPbufferARB}, +// {"wglSetPbufferAttribARB", (PROC)wglSetPbufferAttribARB}, +// {"wglBindTexImageARB", (PROC)wglBindTexImageARB}, +// {"wglReleaseTexImageARB", (PROC)wglReleaseTexImageARB}, +// {"wglCreateBufferRegionARB", (PROC)wglCreateBufferRegionARB}, +// {"wglDeleteBufferRegionARB", (PROC)wglDeleteBufferRegionARB}, +// {"wglSaveBufferRegionARB", (PROC)wglSaveBufferRegionARB}, +// {"wglRestoreBufferRegionARB", (PROC)wglRestoreBufferRegionARB}, +// {"wglMakeContextCurrentARB", (PROC)wglMakeContextCurrentARB}, +// {"wglGetCurrentReadDCARB", (PROC)wglGetCurrentReadDCARB}, {NULL, NULL} };

1 0

[peterw] 30755: - Clarify the english in options.exe a bit.
by peterw＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: peterw Date: Sun Nov 25 23:22:55 2007 New Revision: 30755 URL: http://svn.reactos.org/svn/reactos?rev=30755&view=rev Log: - Clarify the english in options.exe a bit. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc Sun Nov 25 23:22:55 2007 @@ -5,7 +5,7 @@ CAPTION "ReactOS Build Environment Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Path to gcc Compiler", 0x0, 10, 107, 100, 15 + LTEXT "Path to MinGW/GCC", 0x0, 10, 107, 100, 15 LTEXT "Background Color", 0x0, 10, 10, 75, 12 COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Font Color", 0x0, 10, 35, 75, 12 @@ -48,25 +48,25 @@ CLR13, "Light Purple" CLR14, "Light Yellow" CLR15, "Bright White" - MSG_NOGCCFOUND, "No GCC compiler found ! Please check your directory." + MSG_NOGCCFOUND, "No MinGW/GCC found! Please check your directory." MSG_FILEFAILED, "Failed to create rosbe-options.cmd!" MSG_DIREFAILED, "Failed to create log directory!" - MSG_SETLOADSUC, "Previous settings loaded successfully" + MSG_SETLOADSUC, "Previous settings loaded successfully." MSG_FINDLOGDIR, "Please choose a directory where the the logs should be stored:" - MSG_FINDMGWDIR, "Please choose the directory where MingW is located:" + MSG_FINDMGWDIR, "Please choose the directory where MinGW/GCC is located:" MSG_FINDOBJDIR, "Please choose the directory where you want to save OBJ Files to:" MSG_FINDOUTDIR, "Please choose the directory where you want to save OUT Files to:" /* Help Strings */ - HLP_BACKCOLORC, "Choose background color for RosBE DOS windows" - HLP_FONTCOLORC, "Choose font color for RosBE DOS windows" - HLP_SBUILDTIME, "Lets you display time used for building at the end of process" - HLP_CCACHEUSED, "Check if you want to use compiler cache" - HLP_STRIPEDEXE, "Check if you want to produice stripped executables" - HLP_FINDMGWDIR, "This parameter lets you define where is MingW located" - HLP_FINDLOGDIR, "This parameter lets you define where will be build logs saved" - HLP_FINDOBJDIR, "This parameter lets you define where will be OBJ files saved" - HLP_FINDOUTDIR, "This parameter lets you define where will be OUT files saved" - HLP_SAVEBUTTON, "Activated when parameters changed, it quits with saving" - HLP_QUITBUTTON, "This button lets you quit configuration without saving" - HLP_DEFAULTMSG, "Go over a control to get help" + HLP_BACKCOLORC, "Choose background color for RosBE DOS windows." + HLP_FONTCOLORC, "Choose font color for RosBE DOS windows." + HLP_SBUILDTIME, "Lets you display the total build time at the end of a build." + HLP_CCACHEUSED, "Check if you want to use ccache (compiler cache)." + HLP_STRIPEDEXE, "Check if you want to produce stripped executables." + HLP_FINDMGWDIR, "This setting lets you define where MinGW/GCC is located." + HLP_FINDLOGDIR, "This setting lets you define where build logs will be saved." + HLP_FINDOBJDIR, "This setting lets you define where OBJ files will be saved." + HLP_FINDOUTDIR, "This setting lets you define where OUT files will be saved." + HLP_SAVEBUTTON, "Activated when a setting is changed, it quits and saves settings." + HLP_QUITBUTTON, "This button lets you quit configuration without saving." + HLP_DEFAULTMSG, "Hover over a control to get help." END

1 0

[mpiulachs] 30754: - updated blankscr file name
by mpiulachs＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: mpiulachs Date: Sun Nov 25 23:10:29 2007 New Revision: 30754 URL: http://svn.reactos.org/svn/reactos?rev=30754&view=rev Log: - updated blankscr file name Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sun Nov 25 23:10:29 2007 @@ -463,7 +463,7 @@ modules\rosapps\avtest\avtest.sys 1 optional modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional -modules\rosapps\applications\screensavers\scrnsave\scrnsave.scr 1 optional +modules\rosapps\applications\screensavers\scrnsave\blankscr.scr 1 optional modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional modules\rosapps\cmdutils\comp\comp.exe 1 optional

1 0

[mpiulachs] 30753: - Modified butterflies screensaver registry key - Updated scrnsave library reference name - started removing MSVC resource stuff - renamed scrnsave to blankscr to avoid name conflicts with scrnsave library - modified scrnsave (aka blankscr) to use scrnsave library . simplified the code a lot! - various other small changes
by mpiulachs＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: mpiulachs Date: Sun Nov 25 23:09:27 2007 New Revision: 30753 URL: http://svn.reactos.org/svn/reactos?rev=30753&view=rev Log: - Modified butterflies screensaver registry key - Updated scrnsave library reference name - started removing MSVC resource stuff - renamed scrnsave to blankscr to avoid name conflicts with scrnsave library - modified scrnsave (aka blankscr) to use scrnsave library . simplified the code a lot! - various other small changes Added: trunk/rosapps/applications/screensavers/scrnsave/scrnsave.def (with props) Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c trunk/rosapps/applications/screensavers/butterflies/butterflies.def trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild trunk/rosapps/applications/screensavers/butterflies/resource.h trunk/rosapps/applications/screensavers/scrnsave/lang/bg-BG.rc trunk/rosapps/applications/screensavers/scrnsave/lang/de-DE.rc trunk/rosapps/applications/screensavers/scrnsave/lang/en-US.rc trunk/rosapps/applications/screensavers/scrnsave/lang/fr-FR.rc trunk/rosapps/applications/screensavers/scrnsave/lang/lt-LT.rc trunk/rosapps/applications/screensavers/scrnsave/lang/nl-NL.rc trunk/rosapps/applications/screensavers/scrnsave/lang/sk-SK.rc trunk/rosapps/applications/screensavers/scrnsave/lang/uk-UA.rc trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild 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 Sun Nov 25 23:09:27 2007 @@ -14,7 +14,7 @@ GLuint texture[3]; //stores texture objects and display list -LPCTSTR registryPath = ("Software\\tHaPuTeRProductions\\Lesson38Saver"); +LPCTSTR registryPath = ("Software\\Microsoft\\ScreenSavers\\Butterflies"); BOOL dRotate; @@ -299,25 +299,25 @@ { 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; - } + 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; 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 Sun Nov 25 23:09:27 2007 @@ -1,6 +1,6 @@ -NAME LESSON38SAVER.SCR +NAME butterflies.SCR -DESCRIPTION 'Lesson38Saver screen saver' +DESCRIPTION 'OpenGL Butterflies screen saver' HEAPSIZE 1024 STACKSIZE 4096 Modified: 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 (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild Sun Nov 25 23:09:27 2007 @@ -3,7 +3,7 @@ <module name="butterflies" type="win32scr" installbase="system32" installname="butterflies.scr" allowwarnings="true"> <importlibrary definition="butterflies.def" /> <include base="butterflies">.</include> - <library>scrnsavelib</library> + <library>scrnsave</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library> @@ -12,7 +12,7 @@ <library>advapi32</library> <library>shell32</library> - <metadata description = "Butterflies screensaver" /> + <metadata description = "OpenGL Butterflies screensaver" /> <file>butterflies.c</file> <file>butterflies.rc</file> 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 Sun Nov 25 23:09:27 2007 @@ -1,7 +1,4 @@ -//{{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 @@ -14,14 +11,3 @@ #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 Modified: trunk/rosapps/applications/screensavers/scrnsave/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/lang/bg-BG.rc (original) +++ trunk/rosapps/applications/screensavers/scrnsave/lang/bg-BG.rc Sun Nov 25 23:09:27 2007 @@ -2,7 +2,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Ïîäðàçáðàí åêðàíåí ïðåäïàçèòåë" + IDS_DESCRIPTION "Blank" IDS_TITLE "Çà" IDS_TEXT "Íÿìà âúçìîæíîñò çà íàñòðîéêè." END Modified: trunk/rosapps/applications/screensavers/scrnsave/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/lang/de-DE.rc (original) +++ trunk/rosapps/applications/screensavers/scrnsave/lang/de-DE.rc Sun Nov 25 23:09:27 2007 @@ -2,7 +2,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Standard Bildschirmschoner" + IDS_DESCRIPTION "Blank" IDS_TITLE "Über" IDS_TEXT "Keinerlei Einstellungen notwendig." END Modified: trunk/rosapps/applications/screensavers/scrnsave/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/lang/en-US.rc (original) +++ trunk/rosapps/applications/screensavers/scrnsave/lang/en-US.rc Sun Nov 25 23:09:27 2007 @@ -2,7 +2,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Default ScreenSaver" + IDS_DESCRIPTION "Blank" IDS_TITLE "About" IDS_TEXT "No options need to be set." END Modified: trunk/rosapps/applications/screensavers/scrnsave/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/lang/fr-FR.rc (original) +++ trunk/rosapps/applications/screensavers/scrnsave/lang/fr-FR.rc Sun Nov 25 23:09:27 2007 @@ -2,7 +2,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Écran de veille par défaut" + IDS_DESCRIPTION "Blank" IDS_TITLE "À propos de" IDS_TEXT "Il n'y a aucune option à définir." END Modified: trunk/rosapps/applications/screensavers/scrnsave/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/lang/lt-LT.rc (original) +++ trunk/rosapps/applications/screensavers/scrnsave/lang/lt-LT.rc Sun Nov 25 23:09:27 2007 @@ -11,7 +11,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Standartinë ekrano uþsklanda" + IDS_DESCRIPTION "Blank" IDS_TITLE "Apie" IDS_TEXT "Nëra keièiamø parametrø." END Modified: trunk/rosapps/applications/screensavers/scrnsave/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/lang/nl-NL.rc (original) +++ trunk/rosapps/applications/screensavers/scrnsave/lang/nl-NL.rc Sun Nov 25 23:09:27 2007 @@ -2,7 +2,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Standaard Schermbeveiliging" + IDS_DESCRIPTION "Blank" IDS_TITLE "Informatie" IDS_TEXT "Geen dingen om in te stellen." END Modified: trunk/rosapps/applications/screensavers/scrnsave/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/lang/sk-SK.rc (original) +++ trunk/rosapps/applications/screensavers/scrnsave/lang/sk-SK.rc Sun Nov 25 23:09:27 2007 @@ -6,7 +6,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Predvolený etriè obrazovky" + IDS_DESCRIPTION "Blank" IDS_TITLE "Èo je ..." IDS_TEXT "Nie sú potrebné iadne nastavenia." END Modified: trunk/rosapps/applications/screensavers/scrnsave/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/lang/uk-UA.rc (original) +++ trunk/rosapps/applications/screensavers/scrnsave/lang/uk-UA.rc Sun Nov 25 23:09:27 2007 @@ -10,7 +10,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Çàñòàâêà çà çàìîâ÷óâàííÿì" + IDS_DESCRIPTION "Blank" IDS_TITLE "Ïðî" IDS_TEXT "Öÿ çàñòàâêà íå ìàº íàëàøòîâóâàíèõ ïàðàìåòð³â." END Modified: trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c (original) +++ trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c Sun Nov 25 23:09:27 2007 @@ -17,199 +17,42 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include <windows.h> -#include <tchar.h> +#include <windows.h> +#include <scrnsave.h> #include "resource.h" -#define APPNAME _T("Scrnsave") +LRESULT WINAPI ScreenSaverProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static HDC hdc; + static RECT rc; - -HINSTANCE hInstance; - -BOOL fullscreen = FALSE; - - -LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - static POINT ptLast; - static POINT ptCursor; - static BOOL fFirstTime = TRUE; - - switch (msg) - { - case WM_DESTROY: - ShowCursor(TRUE); - PostQuitMessage(0); - break; - - // break out of screen-saver if any keyboard activity - case WM_NOTIFY: - case WM_SYSKEYDOWN: - PostMessage(hwnd, WM_CLOSE, 0, 0); - break; - - // break out of screen-saver if any mouse activity - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MOUSEMOVE: - // If we've got a parent then we must be a preview - if(GetParent(hwnd) != 0) - return 0; - - if(fFirstTime) - { - GetCursorPos(&ptLast); - fFirstTime = FALSE; - } - - GetCursorPos(&ptCursor); - - // if the mouse has moved more than 3 pixels then exit - if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) - PostMessage(hwnd, WM_CLOSE, 0, 0); - - ptLast = ptCursor; - - return 0; - } - - return DefWindowProc(hwnd, msg, wParam, lParam); + switch(message) + { + case WM_CREATE: + break; + case WM_DESTROY: + PostQuitMessage(0); + break; + case WM_ERASEBKGND: + hdc = GetDC(hwnd); + GetClientRect (hwnd, &rc); + FillRect (hdc, &rc, GetStockObject(BLACK_BRUSH)); + ReleaseDC(hwnd,hdc); + break; + case WM_PAINT: + break; + default: + return DefScreenSaverProc(hwnd, message, wParam, lParam); + } + return 0; } -void InitSaver(HWND hwndParent) -{ - WNDCLASS wc; - ZeroMemory(&wc, sizeof(wc)); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = WndProc; - wc.lpszClassName = APPNAME; - wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); - RegisterClass(&wc); - - if (hwndParent != 0) - { - RECT rect; - GetClientRect(hwndParent, &rect); - CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_CHILD, - 0, 0, - rect.right, - rect.bottom, - hwndParent, 0, - hInstance, NULL); - fullscreen = FALSE; - } - else - { - HWND hwnd; - hwnd = CreateWindowEx(WS_EX_TOPMOST, - APPNAME, - APPNAME, - WS_VISIBLE | WS_POPUP, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, 0, - hInstance, NULL); - - SetWindowPos(hwnd, - 0, 0, 0, 0, 0, - SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); - - ShowCursor(FALSE); - fullscreen = TRUE; - } +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + return FALSE; } -VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) +BOOL WINAPI RegisterDialogClasses(HANDLE hInst) { - UCHAR ch = *szCmdLine++; - - if(ch == '-' || ch == '/') - ch = *szCmdLine++; - - if(ch >= 'A' && ch <= 'Z') - ch += 'a' - 'A'; //convert to lower case - - *chOption = ch; - ch = *szCmdLine++; - - if(ch == ':') - ch = *szCmdLine++; - - while(ch == ' ' || ch == '\t') - ch = *szCmdLine++; - - if(isdigit(ch)) - { - unsigned int i = _wtoi(szCmdLine - 1); - *hwndParent = (HWND)i; - } - else - *hwndParent = NULL; + return TRUE; } - -void Configure(void) -{ - TCHAR szTitle[256]; - TCHAR szText[256]; - - LoadString(hInstance, - IDS_TITLE, - szTitle, - 256); - - LoadString(hInstance, - IDS_TEXT, - szText, - 256); - - MessageBox(0, - szText, - szTitle, - MB_OK | MB_ICONWARNING); -} - - -int CALLBACK wWinMain (HINSTANCE hInst, - HINSTANCE hPrev, - LPWSTR lpCmdLine, - int iCmdShow) -{ - HWND hwndParent; - UINT nPreviousState; - UCHAR chOption; - MSG Message; - - hInstance = hInst; - - ParseCommandLine(lpCmdLine, &chOption, &hwndParent); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); - - switch (chOption) - { - case 's': - InitSaver(0); - break; - - case 'p': - InitSaver(hwndParent); - break; - - case 'c': - default: - Configure(); - return 0; - } - - while (GetMessage(&Message, 0, 0, 0)) - DispatchMessage(&Message); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); - - return Message.wParam; -} Added: trunk/rosapps/applications/screensavers/scrnsave/scrnsave.def URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/scrnsave.def (added) +++ trunk/rosapps/applications/screensavers/scrnsave/scrnsave.def Sun Nov 25 23:09:27 2007 @@ -1,0 +1,7 @@ +NAME blankscr.SCR + +DESCRIPTION 'Blank screen saver' + +EXPORTS + ScreenSaverProc + ScreenSaverConfigureDialog Propchange: trunk/rosapps/applications/screensavers/scrnsave/scrnsave.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild (original) +++ trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild Sun Nov 25 23:09:27 2007 @@ -1,12 +1,15 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="scrnsave" type="win32scr" installbase="system32" installname="scrnsave.scr" unicode="true"> +<module name="blankscr" type="win32scr" installbase="system32" installname="scrnsave.scr"> + <importlibrary definition="scrnsave.def" /> + <library>scrnsave</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library> <library>opengl32</library> <library>glu32</library> - <library>winmm</library> + <library>advapi32</library> + <library>shell32</library> <file>scrnsave.c</file> <file>scrnsave.rc</file>

1 0

[mpiulachs] 30752: rename scrnsavelib to scrnsave as it's the name for this library on MS's psdk
by mpiulachs＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: mpiulachs Date: Sun Nov 25 23:05:51 2007 New Revision: 30752 URL: http://svn.reactos.org/svn/reactos?rev=30752&view=rev Log: rename scrnsavelib to scrnsave as it's the name for this library on MS's psdk Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild Sun Nov 25 23:05:51 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="scrnsavelib" type="staticlibrary" allowwarnings="true"> +<module name="scrnsave" type="staticlibrary" allowwarnings="true"> <file>scrnsave.c</file> </module> </group>

1 0

[peterw] 30751: - Fix the uninstall previous routine.
by peterw＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: peterw Date: Sun Nov 25 22:44:22 2007 New Revision: 30751 URL: http://svn.reactos.org/svn/reactos?rev=30751&view=rev Log: - Fix the uninstall previous routine. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sun Nov 25 22:44:22 2007 @@ -366,5 +366,34 @@ UninstallPrevious_no: Quit UninstallPrevious_yes: - ExecWait '$R0 _?=$INSTDIR' -FunctionEnd + Var /global PREVIOUSINSTDIR + Push $R0 + Call GetParent + Pop $PREVIOUSINSTDIR + ExecWait '$R0 _?=$PREVIOUSINSTDIR' +FunctionEnd + +Function GetParent + Exch $R0 + Push $R1 + Push $R2 + Push $R3 + + StrCpy $R1 0 + StrLen $R2 $R0 + + loop: + IntOp $R1 $R1 + 1 + IntCmp $R1 $R2 get 0 get + StrCpy $R3 $R0 1 -$R1 + StrCmp $R3 "\" get + Goto loop + + get: + StrCpy $R0 $R0 -$R1 + + Pop $R3 + Pop $R2 + Pop $R1 + Exch $R0 +FunctionEnd

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