Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[ion] 25656: - Merge Arty's Mm Page Referencing patch. I was able to complete first-stage setup (albeit only on the second try) and booting to second stage (after three tries). There are still freelist.c bugchecks but this patch is defintely a step in the right direction.
by ion＠svn.reactos.org 28 Jan '07

28 Jan '07

Author: ion Date: Sun Jan 28 19:23:52 2007 New Revision: 25656 URL: http://svn.reactos.org/svn/reactos?rev=25656&view=rev Log: - Merge Arty's Mm Page Referencing patch. I was able to complete first-stage setup (albeit only on the second try) and booting to second stage (after three tries). There are still freelist.c bugchecks but this patch is defintely a step in the right direction. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sun Jan 28 19:23:52 2007 @@ -479,7 +479,9 @@ MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[j].Flags.Zero = 0; MmPageArray[j].Flags.Consumer = MC_NPPOOL; - MmPageArray[j].ReferenceCount = 1; + /* Reference count 2, because we're having ReferenceCount track + MapCount as well. */ + MmPageArray[j].ReferenceCount = 2; MmPageArray[j].MapCount = 1; InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[j].ListEntry); @@ -519,7 +521,7 @@ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Zero = 0; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 1; + MmPageArray[i].ReferenceCount = 2; MmPageArray[i].MapCount = 1; InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[i].ListEntry); @@ -588,6 +590,7 @@ KEBUGCHECK(0); } MmPageArray[Pfn].MapCount++; + MmPageArray[Pfn].ReferenceCount++; KeReleaseSpinLock(&PageListLock, oldIrql); } } @@ -612,6 +615,7 @@ KEBUGCHECK(0); } MmPageArray[Pfn].MapCount--; + MmPageArray[Pfn].ReferenceCount--; KeReleaseSpinLock(&PageListLock, oldIrql); } }

1 0

[dcote] 25655: Added tests for FsRtlGetFileSize() and FsRtlReadMdl()
by dcote＠svn.reactos.org 28 Jan '07

28 Jan '07

Author: dcote Date: Sun Jan 28 07:15:39 2007 New Revision: 25655 URL: http://svn.reactos.org/svn/reactos?rev=25655&view=rev Log: Added tests for FsRtlGetFileSize() and FsRtlReadMdl() Modified: trunk/reactos/ntoskrnl/tests/fsrtl.c Modified: trunk/reactos/ntoskrnl/tests/fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/tests/fsrtl.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/tests/fsrtl.c (original) +++ trunk/reactos/ntoskrnl/tests/fsrtl.c Sun Jan 28 07:15:39 2007 @@ -18,9 +18,15 @@ BOOLEAN FsRtlTest_StartTest() { HANDLE Fh = NULL; + PFILE_OBJECT Pfo = NULL; + + HANDLE DirFh = NULL; + PFILE_OBJECT DirPfo = NULL; + + IO_STATUS_BLOCK IoStatus; - NTSTATUS Return = TRUE; - PFILE_OBJECT Pfo; + BOOLEAN Return; + NTSTATUS Status = STATUS_SUCCESS; LONGLONG i = 0; PCHAR Buffer; @@ -56,7 +62,8 @@ ------------------------------------------------------------------------ */ FsRtlTest_OpenTestFile(&Fh, &Pfo); - + FSRTL_TEST("Opening Test File.",((Pfo != NULL) && (Fh != NULL))); + /* Extract the test variable from the FCB struct */ FcbHeader = (PFSRTL_COMMON_FCB_HEADER)Pfo->FsContext; AllocationSize = &FcbHeader->AllocationSize; @@ -340,12 +347,137 @@ Return = TRUE; - - + if (Pfo) + { + ObDereferenceObject(Pfo); + Pfo = NULL; + } + + if (Fh) + { + ZwClose(Fh); + Fh = NULL; + } + + /* ------------------------------------------------------------------------------------------ + TESTING: + + FsRtlMdlRead(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus) + + FsRtlMdlReadComplete(IN PFILE_OBJECT FileObject, + IN PMDL MemoryDescriptorList) + + ------------------------------------------------------------------------------------------ + */ + + FsRtlTest_OpenTestFile(&Fh, &Pfo); + + /* Extract the test variable from the FCB struct */ + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)Pfo->FsContext; + AllocationSize = &FcbHeader->AllocationSize; + ValidDataLength = &FcbHeader->ValidDataLength; + FileSize = &FcbHeader->FileSize; + + + /* We are going to build a 100k file */ + /* This will inititate caching and build some size */ + Offset.QuadPart = 0; + Length = 100*_1KB; + Return = FsRltTest_WritefileZw(Fh,&Offset,Length, Buffer, &IoStatus); + FSRTL_TEST("FsRtlMdlRead() - Building 100k filesize.",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + + Offset.LowPart = 0x0; + Offset.HighPart = 0x0; + Length = 0x10000; + + /* Testing a 64KB read */ + MdlChain = NULL; + Return = FsRtlMdlRead(Pfo,&Offset,Length,0,&MdlChain,&IoStatus); + FSRTL_TEST("FsRtlMdlRead() - Testing 64k IO",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + FSRTL_TEST("FsRtlMdlRead() - Releasing the MDL",FsRtlMdlReadComplete(Pfo,MdlChain)); + + + /* Testing read past the end of the file */ + Offset.QuadPart = FileSize->QuadPart - (5 * _1KB); + Length = 10 * _1KB; + MdlChain = NULL; + Return = FsRtlMdlRead(Pfo,&Offset,Length,0,&MdlChain,&IoStatus); + FSRTL_TEST("FsRtlMdlRead() - Testing reading past end of file but starting before EOF",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status) && IoStatus.Information == (FileSize->QuadPart-Offset.QuadPart))); + FSRTL_TEST("FsRtlMdlRead() - Releasing the MDL",FsRtlMdlReadComplete(Pfo,MdlChain)); + + Offset.QuadPart = FileSize->QuadPart + 1; + Length = 10 * _1KB; + MdlChain = NULL; + Return = FsRtlMdlRead(Pfo,&Offset,Length,0,&MdlChain,&IoStatus); + FSRTL_TEST("FsRtlMdlRead() - Testing reading past end of file but starting after EOF",(NT_SUCCESS(Return) && (IoStatus.Status == STATUS_END_OF_FILE) && IoStatus.Information == 0)); + + /* Testing FastIoIsNotPossible */ + Offset.LowPart = 0x0; + Offset.HighPart = 0x0; + MdlChain = NULL; + Length = 0x10000; + FcbHeader->IsFastIoPossible = FastIoIsNotPossible; + FSRTL_TEST("FsRtlMdlRead() - FastIo is not possible flag. Wait = TRUE",!FsRtlMdlRead(Pfo,&Offset,Length,0,&MdlChain,&IoStatus)); + + Return = TRUE; + + if (Pfo) + { + ObDereferenceObject(Pfo); + Pfo = NULL; + } + + if (Fh) + { + ZwClose(Fh); + Fh = NULL; + } + + + + /* ------------------------------------------------------------------------------------------ + TESTING: + + FsRtlGetFileSize(IN PFILE_OBJECT FileObject, + IN OUT PLARGE_INTEGER FileSize) + + ------------------------------------------------------------------------------------------ + */ + FsRtlTest_OpenTestFile(&Fh, &Pfo); + FSRTL_TEST("FsRtlGetFileSize() - Opening Test File.",((Pfo != NULL) && (Fh != NULL))); + + FsRtlTest_OpenTestDirectory(&DirFh, &DirPfo); + FSRTL_TEST("FsRtlGetFileSize() - Opening Test Directory.",((DirPfo != NULL) && (DirFh != NULL))); + + Status = FsRtlGetFileSize(Pfo,&OldSize); + FSRTL_TEST("FsRtlGetFileSize() - Get the size of a real file",NT_SUCCESS(Status)); + + Status = FsRtlGetFileSize(DirPfo,&OldSize); + FSRTL_TEST("FsRtlGetFileSize() - Get the size of a directory file",(Status == STATUS_FILE_IS_A_DIRECTORY)); + + /* The test if over. Do clean up */ Cleanup: + if (DirPfo) + { + ObDereferenceObject(DirPfo); + DirPfo = NULL; + } + + if (DirFh) + { + ZwClose(DirFh); + DirFh = NULL; + } if (Pfo) { ObDereferenceObject(Pfo); @@ -442,6 +574,46 @@ ); } + NTSTATUS FsRtlTest_OpenTestDirectory(PHANDLE Pfh, PFILE_OBJECT *Ppfo) { + UNICODE_STRING FileName; + OBJECT_ATTRIBUTES oa; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Return; + + RtlInitUnicodeString(&FileName,L"\\??\\C:\\testdir01"); + + InitializeObjectAttributes( + &oa, + &FileName, + OBJ_KERNEL_HANDLE, + NULL, + NULL; + ); + + Return = IoCreateFile(Pfh, + GENERIC_WRITE, + &oa, + &IoStatus, + 0, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OPEN_IF, + FILE_DIRECTORY_FILE,FILE_SYNCHRONOUS_IO_ALERT | FILE_DELETE_ON_CLOSE, + NULL, + 0, + CreateFileTypeNone, + NULL, + 0); + + Return = ObReferenceObjectByHandle( + *Pfh, + GENERIC_WRITE, + NULL, + KernelMode, + Ppfo, + NULL + ); +} /* All the testing is done from driver entry */ NTSTATUS DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath )

1 0

[hyperion] 25654: Fixed buildtime, re-enabled in build scripts
by hyperion＠svn.reactos.org 28 Jan '07

28 Jan '07

Author: hyperion Date: Sun Jan 28 04:00:24 2007 New Revision: 25654 URL: http://svn.reactos.org/svn/reactos?rev=25654&view=rev Log: Fixed buildtime, re-enabled in build scripts Modified: trunk/tools/RosBE/Build-Multi.cmd trunk/tools/RosBE/Build.cmd trunk/tools/RosBE/Tools/buildtime.c Modified: trunk/tools/RosBE/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Build-Multi.cmd?rev=25… ============================================================================== --- trunk/tools/RosBE/Build-Multi.cmd (original) +++ trunk/tools/RosBE/Build-Multi.cmd Sun Jan 28 04:00:24 2007 @@ -46,7 +46,7 @@ :: Now use mingw32-make to build ReactOS, passing along options, if any. :: if "%1" == "" ( - "%_MINGWMAKE%" -j %CPUCOUNT% 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" -j %CPUCOUNT% 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - "%_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) Modified: trunk/tools/RosBE/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Build.cmd?rev=25654&r1… ============================================================================== --- trunk/tools/RosBE/Build.cmd (original) +++ trunk/tools/RosBE/Build.cmd Sun Jan 28 04:00:24 2007 @@ -30,7 +30,7 @@ :: Now use mingw32-make to build ReactOS, passing along options, if any. :: if "%1" == "" ( - "%_MINGWMAKE%" 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - "%_MINGWMAKE%" %* 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" %* 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) Modified: trunk/tools/RosBE/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/buildtime.c?rev=… ============================================================================== --- trunk/tools/RosBE/Tools/buildtime.c (original) +++ trunk/tools/RosBE/Tools/buildtime.c Sun Jan 28 04:00:24 2007 @@ -3,37 +3,78 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <ctype.h> +#include <wctype.h> +#include <tchar.h> -int main(int argc, char* argv[]) +static LPTSTR SkipSelfArgument(LPTSTR lpszCommandLine) +{ + LPTSTR p = lpszCommandLine; + int quote = 0; + + // Skip leading whitespace + while(*p != 0 && _istspace(*p)) + ++ p; + + if(*p == 0) + return p; + + // Skip argument 0 + // BUGBUG: the assumption is that argument 0 never contains escaped quotes + do + { + if(*p == TEXT('\"')) + { + quote = !quote; + ++ p; + continue; + } + + ++ p; + } + while(*p != 0 && (quote || !_istspace(*p))); + + // Skip trailing whitespace + while(*p != 0 && _istspace(*p)) + ++ p; + + return p; +} + +int main() { LPTSTR CommandLine, FullCommandLine, CommandLineBuffer; time_t StartTime, FinishTime; - float TotalTime; + double TotalTime; int Hour, Minute, Second; - - // - // If nothing is on the command-line exit - // - if (argc == 1) - { - printf("Required parameter not specified. Exiting.\n"); - return 1; - } + int ret; // // Get the command line to pass on. // FullCommandLine = GetCommandLine(); - CommandLine = &FullCommandLine[strlen(argv[0]) + 1]; - CommandLineBuffer = (LPTSTR) malloc((strlen(CommandLine) + 3)); + CommandLine = SkipSelfArgument(FullCommandLine); + + // + // If nothing is on the command-line exit + // + if (CommandLine[0] == 0) + { + fprintf(stderr, "buildtime: required parameter not specified\n"); + return 1; + } + + CommandLineBuffer = malloc((strlen(CommandLine) + 2 + 1)); if (!CommandLineBuffer) { - printf("Unable to allocate memory. Exiting.\n"); + fprintf(stderr, "buildtime: unable to allocate memory\n"); return 1; } - strcpy(CommandLineBuffer, "\""); + + CommandLineBuffer[0] = 0; + //strcat(CommandLineBuffer, "\""); strcat(CommandLineBuffer, CommandLine); - strcat(CommandLineBuffer, "\""); + //strcat(CommandLineBuffer, "\""); // // Grab the starting timestamp. @@ -43,7 +84,7 @@ // // Run the program (Status is 1 on failure). // - system(CommandLineBuffer); + ret = system(CommandLineBuffer); // // Grab the finishing timestamp. @@ -73,5 +114,5 @@ // free(CommandLineBuffer); - return 0; + return ret; }

1 0

[hyperion] 25653: Fixed erroneous path whitespace fix
by hyperion＠svn.reactos.org 28 Jan '07

28 Jan '07

Author: hyperion Date: Sun Jan 28 03:00:39 2007 New Revision: 25653 URL: http://svn.reactos.org/svn/reactos?rev=25653&view=rev Log: Fixed erroneous path whitespace fix Modified: trunk/tools/RosBE/Build-Multi.cmd Modified: trunk/tools/RosBE/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Build-Multi.cmd?rev=25… ============================================================================== --- trunk/tools/RosBE/Build-Multi.cmd (original) +++ trunk/tools/RosBE/Build-Multi.cmd Sun Jan 28 03:00:39 2007 @@ -24,7 +24,7 @@ :: No Option - Number of CPUs. :: -x1 - Number of CPUs, Plus 1. :: -x2 - Number of CPUs, Doubled. -for /f "usebackq" %%i in (`"%ROSBEBASEDIR%\Tools\cpucount.exe -x1"`) do set CPUCOUNT=%%i +for /f "usebackq" %%i in (`"%ROSBEBASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i :: :: Check if config.template.rbuild is newer than config.rbuild,

1 0

[martinf] 25652: update XMLStorage: - optional CDATA embedding by set_content() - fix for handling in XML parser
by martinf＠svn.reactos.org 27 Jan '07

27 Jan '07

Author: martinf Date: Sat Jan 27 23:55:22 2007 New Revision: 25652 URL: http://svn.reactos.org/svn/reactos?rev=25652&view=rev Log: update XMLStorage: - optional CDATA embedding by set_content() - fix for handling in XML parser Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp trunk/reactos/base/shell/explorer/utility/xmlstorage.h Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp Sat Jan 27 23:55:22 2007 @@ -279,12 +279,12 @@ /// encode XML string literals -std::string EncodeXMLString(const XS_String& str) +std::string EncodeXMLString(const XS_String& str, bool cdata) { LPCXSSTR s = str.c_str(); size_t l = XS_len(s); - if (l <= BUFFER_LEN) { + if (!cdata && l<=BUFFER_LEN) { LPXSSTR buffer = (LPXSSTR)alloca(6*sizeof(XS_CHAR)*XS_len(s)); // worst case """ / "'" LPXSSTR o = buffer; @@ -410,10 +410,10 @@ p += 5; } else *o++ = *p; - } else if (*p=='<' && !XS_nicmp(p+1,XS_TEXT("!CDATA["),7)) { - p += 9; - LPCXSSTR e = XS_strstr(p, XS_TEXT("]]>")); + } else if (*p=='<' && !XS_nicmp(p+1,XS_TEXT("![CDATA["),8)) { + LPCXSSTR e = XS_strstr(p+9, XS_TEXT("]]>")); if (e) { + p += 9; size_t l = e - p; memcpy(o, p, l); o += l; Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h Sat Jan 27 23:55:22 2007 @@ -409,7 +409,7 @@ #endif // XS_STRING_UTF8 -extern std::string EncodeXMLString(const XS_String& str); +extern std::string EncodeXMLString(const XS_String& str, bool cdata=false); extern XS_String DecodeXMLString(const XS_String& str); @@ -940,9 +940,9 @@ return DecodeXMLString(ret.c_str()); } - void set_content(const XS_String& s) - { - _content.assign(EncodeXMLString(s.c_str())); + void set_content(const XS_String& s, bool cdata=false) + { + _content.assign(EncodeXMLString(s.c_str(), cdata)); } #ifdef XMLNODE_LOCATION @@ -2391,10 +2391,10 @@ return _stack.top()._attributes[attr_name]; } - void set_content(const XS_String& s) + void set_content(const XS_String& s, bool cdata=false) { if (!_stack.empty()) - _stack.top()._content = EncodeXMLString(s.c_str()); + _stack.top()._content = EncodeXMLString(s.c_str(), cdata); } // public for access in StackEntry

1 0

[janderwald] 25651: - diff2wine
by janderwald＠svn.reactos.org 27 Jan '07

27 Jan '07

Author: janderwald Date: Sat Jan 27 21:21:10 2007 New Revision: 25651 URL: http://svn.reactos.org/svn/reactos?rev=25651&view=rev Log: - diff2wine Added: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff (with props) Added: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff (added) +++ trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff Sat Jan 27 21:21:10 2007 @@ -1,0 +1,439 @@ +Index: colordlg.c +=================================================================== +--- colordlg.c (revision 25649) ++++ colordlg.c (working copy) +@@ -23,20 +23,7 @@ + sometimes, especially when 2 instances of the + dialog are loaded at the same time */ + +-#include <ctype.h> +-#include <stdlib.h> +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +-#include "windef.h" +-#include "winbase.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "commdlg.h" +-#include "dlgs.h" +-#include "wine/debug.h" +-#include "cderr.h" +-#include "cdlg.h" ++#include <precomp.h> + + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +Index: filedlgbrowser.c +=================================================================== +--- filedlgbrowser.c (revision 25649) ++++ filedlgbrowser.c (working copy) +@@ -19,29 +19,8 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> ++#include <precomp.h> + +-#define COBJMACROS +-#define NONAMELESSUNION +-#define NONAMELESSSTRUCT +- +-#include "windef.h" +-#include "winbase.h" +-#include "winnls.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "winreg.h" +- +-#define NO_SHLWAPI_STREAM +-#include "shlwapi.h" +-#include "filedlgbrowser.h" +-#include "cdlg.h" +-#include "shlguid.h" +-#include "servprov.h" +-#include "wine/debug.h" +- + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + + typedef struct +Index: precomp.h +=================================================================== +--- precomp.h (revision 0) ++++ precomp.h (revision 0) +@@ -0,0 +1,76 @@ ++#ifndef PRECOMP_H__ ++#define PRECOMP_H__ ++ ++#include <ctype.h> ++#include <stdlib.h> ++#include <stdarg.h> ++#include <stdio.h> ++#include <string.h> ++ ++#define COBJMACROS ++#define NONAMELESSUNION ++#define NONAMELESSSTRUCT ++#define NO_SHLWAPI_STREAM ++#define COM_NO_WINDOWS_H ++#define _COMDLG32_ ++ ++#if defined (_MSC_VER) ++#include <windef.h> ++#include <winbase.h> ++#include <wingdi.h> ++#include <winuser.h> ++#include <commdlg.h> ++#include <shellapi.h> ++#include <shlguid.h> ++#include <shlobj.h> ++#include <shlwapi.h> ++#include <guiddef.h> ++#include <dlgs.h> ++#include <cderr.h> ++#endif ++ ++#include "wine/windef.h" ++#include "winbase.h" ++#include "wine/wingdi.h" ++#include "wine/winuser.h" ++#include "wine/commdlg.h" ++#include "wine/shellapi.h" ++ ++#if !defined (_MSC_VER) ++#include "psdk/shlguid.h" ++#include "psdk/shlobj.h" ++#endif ++ ++#include "wine/shlguid.h" ++#include "wine/shlobj.h" ++ ++#if !defined (_MSC_VER) ++#include "psdk/shlguid.h" ++#include "psdk/shlwapi.h" ++#include "wine/shlwapi.h" ++#endif ++ ++#include "wine/winbase16.h" ++#include "wine/winuser16.h" ++#include "wine/guiddef.h" ++#include "wine/dlgs.h" ++#include "wine/debug.h" ++#include "wine/unicode.h" ++ ++#include <cderr.h> ++#include <cdlg.h> ++#include <winspool.h> ++#include <winerror.h> ++#include <winnls.h> ++#include <winreg.h> ++#include <winternl.h> ++ ++//local headers ++#include "cdlg.h" ++#include "printdlg.h" ++#include "filedlgbrowser.h" ++#include "cdlg.h" ++#include "servprov.h" ++#include "filedlg31.h" ++ ++#endif + +Property changes on: precomp.h +___________________________________________________________________ +Name: svn:eol-style + + native + +Index: finddlg32.c +=================================================================== +--- finddlg32.c (revision 25649) ++++ finddlg32.c (working copy) +@@ -19,23 +19,10 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include <stdarg.h> +-#include <string.h> +-#include "windef.h" +-#include "winbase.h" +-#include "winnls.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "commdlg.h" +-#include "cderr.h" +-#include "dlgs.h" +-#include "wine/debug.h" ++#include <precomp.h> + + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +-#include "cdlg.h" +- +- + /*-----------------------------------------------------------------------*/ + + static UINT FindReplaceMessage; +Index: cdlg.h +=================================================================== +--- cdlg.h (revision 25649) ++++ cdlg.h (working copy) +@@ -21,9 +21,7 @@ + #ifndef _WINE_DLL_CDLG_H + #define _WINE_DLL_CDLG_H + +-#define COM_NO_WINDOWS_H +-#include "dlgs.h" +-#include "wownt32.h" ++#include <wownt32.h> + + /* Common dialogs implementation globals */ + #define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ +@@ -155,15 +153,6 @@ + + #define IDS_FAKEDOCTEXT 1300 + +-#include "windef.h" +-#include "winbase.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "winnls.h" +-#include "commctrl.h" +-#include "shlobj.h" +-#include "shellapi.h" +- + /* ITEMIDLIST */ + + extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST); +Index: cdlg32.c +=================================================================== +--- cdlg32.c (revision 25649) ++++ cdlg32.c (working copy) +@@ -19,21 +19,10 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include <stdarg.h> ++#include <precomp.h> + +-#include "windef.h" +-#include "winbase.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "commdlg.h" +-#include "cderr.h" +-#include "wine/debug.h" +- + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +-#include "cdlg.h" +- +- + HINSTANCE COMDLG32_hInstance = 0; + + static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES; +Index: printdlg.c +=================================================================== +--- printdlg.c (revision 25649) ++++ printdlg.c (revision 25650) +@@ -20,32 +20,11 @@ + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +-#include <ctype.h> +-#include <stdlib.h> +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> + +-#define NONAMELESSUNION +-#define NONAMELESSSTRUCT +-#include "windef.h" +-#include "winbase.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "winspool.h" +-#include "winerror.h" ++#include <precomp.h> + +-#include "wine/debug.h" +- +-#include "commdlg.h" +-#include "dlgs.h" +-#include "cderr.h" +- + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +-#include "cdlg.h" +-#include "printdlg.h" +- + /* Yes these constants are the same, but we're just copying win98 */ + #define UPDOWN_ID 0x270f + #define MAX_COPIES 9999 +Index: fontdlg.c +=================================================================== +--- fontdlg.c (revision 25649) ++++ fontdlg.c (working copy) +@@ -19,20 +19,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include <ctype.h> +-#include <stdlib.h> +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +-#include "windef.h" +-#include "winbase.h" +-#include "winnls.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "commdlg.h" +-#include "dlgs.h" +-#include "wine/debug.h" +-#include "cderr.h" ++#include <precomp.h> + + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +Index: filedlg.c +=================================================================== +--- filedlg.c (revision 25649) ++++ filedlg.c (working copy) +@@ -46,40 +46,11 @@ + * + */ + +-#include "config.h" +-#include "wine/port.h" ++//#include "config.h" ++//#include "wine/port.h" + +-#include <ctype.h> +-#include <stdlib.h> +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> ++#include <precomp.h> + +-#define COBJMACROS +-#define NONAMELESSUNION +-#define NONAMELESSSTRUCT +- +-#include "windef.h" +-#include "winbase.h" +-#include "winreg.h" +-#include "winternl.h" +-#include "winnls.h" +-#include "wine/unicode.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "winreg.h" +-#include "commdlg.h" +-#include "dlgs.h" +-#include "cdlg.h" +-#include "filedlg31.h" +-#include "wine/debug.h" +-#include "cderr.h" +-#include "shellapi.h" +-#include "shlguid.h" +-#include "shlobj.h" +-#include "filedlgbrowser.h" +-#include "shlwapi.h" +- + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + + #define UNIMPLEMENTED_FLAGS \ +Index: comdlg32.rbuild +=================================================================== +--- comdlg32.rbuild (revision 25649) ++++ comdlg32.rbuild (working copy) +@@ -30,4 +30,5 @@ + <file>printdlg.c</file> + <file>rsrc.rc</file> + <file>comdlg32.spec</file> ++ <pch>precomp.h</pch> + </module> +Index: filedlg31.c +=================================================================== +--- filedlg31.c (revision 25649) ++++ filedlg31.c (working copy) +@@ -18,33 +18,11 @@ + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +-#include <ctype.h> +-#include <stdlib.h> +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +-#include "windef.h" +-#include "winbase.h" +-#include "winnls.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "wine/unicode.h" +-#include "wine/debug.h" +-#include "cderr.h" +-#include "winreg.h" +-#include "winternl.h" +-#include "winuser.h" +-#include "commdlg.h" +-#include "cderr.h" +-#include "winreg.h" +-#include "winternl.h" +-#include "shlwapi.h" + ++#include <precomp.h> ++ + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +-#include "cdlg.h" +-#include "filedlg31.h" +- + #define BUFFILE 512 + #define BUFFILEALLOC 512 * sizeof(WCHAR) + +Index: filetitle.c +=================================================================== +--- filetitle.c (revision 25649) ++++ filetitle.c (working copy) +@@ -19,22 +19,8 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include <stdarg.h> +-#include <string.h> ++#include <precomp.h> + +-#include "windef.h" +-#include "winbase.h" +-#include "winnls.h" +-#include "winreg.h" +-#include "winternl.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "commdlg.h" +-#include "cdlg.h" +-#include "cdlg16.h" +-#include "wine/unicode.h" +-#include "wine/debug.h" +- + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + + /*********************************************************************** +@@ -49,11 +35,11 @@ + LPWSTR lpWTitle; + + RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile); +- lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR)); ++ lpWTitle = HeapAlloc( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR)); + ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf); + if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL ); + RtlFreeUnicodeString( &strWFile ); +- RtlFreeHeap( GetProcessHeap(), 0, lpWTitle ); ++ HeapFree( GetProcessHeap(), 0, lpWTitle ); + return ret; + } + Propchange: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 25650: - move wine includes to precomp.h - this enables compiling nearly all (printdlg has some issues) of comdlg32 with msvc (first include all standard headers and then include the wine compability headers)
by janderwald＠svn.reactos.org 27 Jan '07

27 Jan '07

Author: janderwald Date: Sat Jan 27 20:52:03 2007 New Revision: 25650 URL: http://svn.reactos.org/svn/reactos?rev=25650&view=rev Log: - move wine includes to precomp.h - this enables compiling nearly all (printdlg has some issues) of comdlg32 with msvc (first include all standard headers and then include the wine compability headers) Added: trunk/reactos/dll/win32/comdlg32/precomp.h (with props) Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h trunk/reactos/dll/win32/comdlg32/cdlg32.c trunk/reactos/dll/win32/comdlg32/colordlg.c trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlg31.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c trunk/reactos/dll/win32/comdlg32/filetitle.c trunk/reactos/dll/win32/comdlg32/finddlg32.c trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/printdlg.c Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg.h (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg.h Sat Jan 27 20:52:03 2007 @@ -21,9 +21,7 @@ #ifndef _WINE_DLL_CDLG_H #define _WINE_DLL_CDLG_H -#define COM_NO_WINDOWS_H -#include "dlgs.h" -#include "wownt32.h" +#include <wownt32.h> /* Common dialogs implementation globals */ #define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ @@ -155,15 +153,6 @@ #define IDS_FAKEDOCTEXT 1300 -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "shlobj.h" -#include "shellapi.h" - /* ITEMIDLIST */ extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST); Modified: trunk/reactos/dll/win32/comdlg32/cdlg32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg32.… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg32.c (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg32.c Sat Jan 27 20:52:03 2007 @@ -19,20 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "cderr.h" -#include "wine/debug.h" +#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - -#include "cdlg.h" - HINSTANCE COMDLG32_hInstance = 0; Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/colordlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/colordlg.c Sat Jan 27 20:52:03 2007 @@ -23,20 +23,7 @@ sometimes, especially when 2 instances of the dialog are loaded at the same time */ -#include <ctype.h> -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "dlgs.h" -#include "wine/debug.h" -#include "cderr.h" -#include "cdlg.h" +#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(commdlg); Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild Sat Jan 27 20:52:03 2007 @@ -30,4 +30,5 @@ <file>printdlg.c</file> <file>rsrc.rc</file> <file>comdlg32.spec</file> + <pch>precomp.h</pch> </module> Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c Sat Jan 27 20:52:03 2007 @@ -46,39 +46,10 @@ * */ -#include "config.h" -#include "wine/port.h" - -#include <ctype.h> -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winternl.h" -#include "winnls.h" -#include "wine/unicode.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "commdlg.h" -#include "dlgs.h" -#include "cdlg.h" -#include "filedlg31.h" -#include "wine/debug.h" -#include "cderr.h" -#include "shellapi.h" -#include "shlguid.h" -#include "shlobj.h" -#include "filedlgbrowser.h" -#include "shlwapi.h" +//#include "config.h" +//#include "wine/port.h" + +#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(commdlg); Modified: trunk/reactos/dll/win32/comdlg32/filedlg31.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg31.c (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg31.c Sat Jan 27 20:52:03 2007 @@ -18,32 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <ctype.h> -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "cderr.h" -#include "winreg.h" -#include "winternl.h" -#include "winuser.h" -#include "commdlg.h" -#include "cderr.h" -#include "winreg.h" -#include "winternl.h" -#include "shlwapi.h" + +#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - -#include "cdlg.h" -#include "filedlg31.h" #define BUFFILE 512 #define BUFFILEALLOC 512 * sizeof(WCHAR) Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c Sat Jan 27 20:52:03 2007 @@ -19,28 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> -#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" - -#define NO_SHLWAPI_STREAM -#include "shlwapi.h" -#include "filedlgbrowser.h" -#include "cdlg.h" -#include "shlguid.h" -#include "servprov.h" -#include "wine/debug.h" +#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(commdlg); Modified: trunk/reactos/dll/win32/comdlg32/filetitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filetit… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filetitle.c (original) +++ trunk/reactos/dll/win32/comdlg32/filetitle.c Sat Jan 27 20:52:03 2007 @@ -19,21 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "winternl.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "cdlg.h" -#include "cdlg16.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(commdlg); @@ -49,11 +35,11 @@ LPWSTR lpWTitle; RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile); - lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR)); + lpWTitle = HeapAlloc( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR)); ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf); if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL ); RtlFreeUnicodeString( &strWFile ); - RtlFreeHeap( GetProcessHeap(), 0, lpWTitle ); + HeapFree( GetProcessHeap(), 0, lpWTitle ); return ret; } Modified: trunk/reactos/dll/win32/comdlg32/finddlg32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/finddlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/finddlg32.c (original) +++ trunk/reactos/dll/win32/comdlg32/finddlg32.c Sat Jan 27 20:52:03 2007 @@ -19,22 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "cderr.h" -#include "dlgs.h" -#include "wine/debug.h" +#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - -#include "cdlg.h" - /*-----------------------------------------------------------------------*/ Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/fontdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/fontdlg.c Sat Jan 27 20:52:03 2007 @@ -19,20 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <ctype.h> -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "dlgs.h" -#include "wine/debug.h" -#include "cderr.h" +#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(commdlg); Added: trunk/reactos/dll/win32/comdlg32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/precomp… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/precomp.h (added) +++ trunk/reactos/dll/win32/comdlg32/precomp.h Sat Jan 27 20:52:03 2007 @@ -1,0 +1,76 @@ +#ifndef PRECOMP_H__ +#define PRECOMP_H__ + +#include <ctype.h> +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#define NO_SHLWAPI_STREAM +#define COM_NO_WINDOWS_H +#define _COMDLG32_ + +#if defined (_MSC_VER) +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <commdlg.h> +#include <shellapi.h> +#include <shlguid.h> +#include <shlobj.h> +#include <shlwapi.h> +#include <guiddef.h> +#include <dlgs.h> +#include <cderr.h> +#endif + +#include "wine/windef.h" +#include "winbase.h" +#include "wine/wingdi.h" +#include "wine/winuser.h" +#include "wine/commdlg.h" +#include "wine/shellapi.h" + +#if !defined (_MSC_VER) +#include "psdk/shlguid.h" +#include "psdk/shlobj.h" +#endif + +#include "wine/shlguid.h" +#include "wine/shlobj.h" + +#if !defined (_MSC_VER) +#include "psdk/shlguid.h" +#include "psdk/shlwapi.h" +#include "wine/shlwapi.h" +#endif + +#include "wine/winbase16.h" +#include "wine/winuser16.h" +#include "wine/guiddef.h" +#include "wine/dlgs.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +#include <cderr.h> +#include <cdlg.h> +#include <winspool.h> +#include <winerror.h> +#include <winnls.h> +#include <winreg.h> +#include <winternl.h> + +//local headers +#include "cdlg.h" +#include "printdlg.h" +#include "filedlgbrowser.h" +#include "cdlg.h" +#include "servprov.h" +#include "filedlg31.h" + +#endif Propchange: trunk/reactos/dll/win32/comdlg32/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c Sat Jan 27 20:52:03 2007 @@ -20,31 +20,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <ctype.h> -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winspool.h" -#include "winerror.h" - -#include "wine/debug.h" - -#include "commdlg.h" -#include "dlgs.h" -#include "cderr.h" + +#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - -#include "cdlg.h" -#include "printdlg.h" /* Yes these constants are the same, but we're just copying win98 */ #define UPDOWN_ID 0x270f

1 0

[ekohl] 25649: set properties
by ekohl＠svn.reactos.org 27 Jan '07

27 Jan '07

Author: ekohl Date: Sat Jan 27 17:53:18 2007 New Revision: 25649 URL: http://svn.reactos.org/svn/reactos?rev=25649&view=rev Log: set properties Modified: trunk/reactos/dll/cpl/desk/preview.c (contents, props changed) trunk/reactos/dll/cpl/desk/preview.h (contents, props changed) Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c (original) +++ trunk/reactos/dll/cpl/desk/preview.c Sat Jan 27 17:53:18 2007 @@ -1,526 +1,526 @@ -/* - * PROJECT: ReactOS Timedate Control Panel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/desk/preview.c - * PURPOSE: Draws the preview control - * COPYRIGHT: Copyright 2006, 2007 Eric Kohl - */ - -#include "desk.h" -#include "preview.h" - -static const TCHAR szPreviewWndClass[] = TEXT("PreviewWndClass"); - -typedef struct _PREVIEW_DATA -{ - HWND hwndParent; - - DWORD clrDesktop; - HBRUSH hbrDesktop; - - DWORD clrWindow; - HBRUSH hbrWindow; - - DWORD clrScrollbar; - HBRUSH hbrScrollbar; - - DWORD clrActiveCaptionText; - DWORD clrInactiveCaptionText; - DWORD clrWindowText; - DWORD clrButtonText; - - INT cxEdge; - INT cyEdge; - - INT cyCaption; - - RECT rcDesktop; - RECT rcInactiveFrame; - RECT rcInactiveCaption; - RECT rcInactiveCaptionButtons; - - RECT rcActiveFrame; - RECT rcActiveCaption; - RECT rcActiveCaptionButtons; - RECT rcActiveMenuBar; - RECT rcSelectedMenuItem; - RECT rcActiveClient; - RECT rcActiveScroll; - - RECT rcDialogFrame; - RECT rcDialogCaption; - RECT rcDialogCaptionButtons; - RECT rcDialogClient; - - RECT rcDialogButton; - - LPTSTR lpInAct; - LPTSTR lpAct; - LPTSTR lpWinTxt; - LPTSTR lpMessBox; - LPTSTR lpMessText; - LPTSTR lpButText; - - LOGFONT lfCaptionFont; - LOGFONT lfMenuFont; - LOGFONT lfMessageFont; - - HFONT hCaptionFont; - HFONT hMenuFont; - HFONT hMessageFont; - - HMENU hMenu; - -} PREVIEW_DATA, *PPREVIEW_DATA; - - - -static VOID -DrawCaptionButtons(HDC hdc, LPRECT lpRect, BOOL bMinMax) -{ - RECT rc3; - RECT rc4; - RECT rc5; - - rc3.left = lpRect->right - 2 - 16; - rc3.top = lpRect->top + 2; - rc3.right = lpRect->right - 2; - rc3.bottom = lpRect->bottom - 2; - - DrawFrameControl(hdc, &rc3, DFC_CAPTION, DFCS_CAPTIONCLOSE); - - if (bMinMax) - { - rc4.left = rc3.left - 16 - 2; - rc4.top = rc3.top; - rc4.right = rc3.right - 16 - 2; - rc4.bottom = rc3.bottom; - - DrawFrameControl(hdc, &rc4, DFC_CAPTION, DFCS_CAPTIONMAX); - - rc5.left = rc4.left - 16; - rc5.top = rc4.top; - rc5.right = rc4.right - 16; - rc5.bottom = rc4.bottom; - - DrawFrameControl(hdc, &rc5, DFC_CAPTION, DFCS_CAPTIONMIN); - } -} - -static VOID -DrawScrollbar(HDC hdc, LPRECT rc, HBRUSH hbrScrollbar) -{ - RECT rcTop; - RECT rcBottom; - RECT rcMiddle; - int width; - - width = rc->right - rc->left; - - rcTop.left = rc->left; - rcTop.right = rc->right; - rcTop.top = rc->top; - rcTop.bottom = rc->top + width; - - rcMiddle.left = rc->left; - rcMiddle.right = rc->right; - rcMiddle.top = rc->top + width; - rcMiddle.bottom = rc->bottom - width; - - rcBottom.left = rc->left; - rcBottom.right = rc->right; - rcBottom.top = rc->bottom - width; - rcBottom.bottom = rc->bottom; - - DrawFrameControl(hdc, &rcTop, DFC_SCROLL, DFCS_SCROLLUP); - DrawFrameControl(hdc, &rcBottom, DFC_SCROLL, DFCS_SCROLLDOWN); - - FillRect(hdc, &rcMiddle, hbrScrollbar); -} - - -static VOID -OnCreate(HWND hwnd, PPREVIEW_DATA pPreviewData) -{ - NONCLIENTMETRICS NonClientMetrics; - - pPreviewData->clrScrollbar = GetSysColor(COLOR_SCROLLBAR); - pPreviewData->hbrScrollbar = CreateSolidBrush(pPreviewData->clrScrollbar); - - pPreviewData->clrDesktop = GetSysColor(COLOR_DESKTOP); - pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->clrDesktop); - pPreviewData->clrWindow = GetSysColor(COLOR_WINDOW); - pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrWindow); - - pPreviewData->clrActiveCaptionText = GetSysColor(COLOR_CAPTIONTEXT); - pPreviewData->clrInactiveCaptionText = GetSysColor(COLOR_INACTIVECAPTIONTEXT); - pPreviewData->clrWindowText = GetSysColor(COLOR_WINDOWTEXT); - pPreviewData->clrButtonText = GetSysColor(COLOR_BTNTEXT); - - pPreviewData->cxEdge = GetSystemMetrics(SM_CXEDGE); - pPreviewData->cyEdge = GetSystemMetrics(SM_CXEDGE); - - pPreviewData->cyCaption = 20; //GetSystemMetrics(SM_CYCAPTION); - - /* load font info */ - NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); - - pPreviewData->lfCaptionFont = NonClientMetrics.lfCaptionFont; - pPreviewData->hCaptionFont = CreateFontIndirect(&pPreviewData->lfCaptionFont); - - pPreviewData->lfMenuFont = NonClientMetrics.lfMenuFont; - pPreviewData->hMenuFont = CreateFontIndirect(&pPreviewData->lfMenuFont); - - pPreviewData->lfMessageFont = NonClientMetrics.lfMessageFont; - pPreviewData->hMessageFont = CreateFontIndirect(&pPreviewData->lfMessageFont); - - /* Load and modify the menu */ - pPreviewData->hMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_PREVIEW_MENU)); - EnableMenuItem(pPreviewData->hMenu, ID_MENU_DISABLED, - MF_BYCOMMAND | MF_DISABLED); - HiliteMenuItem(hwnd, pPreviewData->hMenu, - ID_MENU_SELECTED, MF_BYCOMMAND | MF_HILITE); - -// GetMenuItemRect(hwnd, pPreviewData->hMenu, -// ID_MENU_SELECTED, &pPreviewData->rcSelectedMenuItem); - - - AllocAndLoadString(&pPreviewData->lpInAct, hApplet, IDS_INACTWIN); - AllocAndLoadString(&pPreviewData->lpAct, hApplet, IDS_ACTWIN); - AllocAndLoadString(&pPreviewData->lpWinTxt, hApplet, IDS_WINTEXT); - AllocAndLoadString(&pPreviewData->lpMessBox, hApplet, IDS_MESSBOX); - AllocAndLoadString(&pPreviewData->lpMessText, hApplet, IDS_MESSTEXT); - AllocAndLoadString(&pPreviewData->lpButText, hApplet, IDS_BUTTEXT); -} - - -static VOID -OnSize(INT cx, INT cy, PPREVIEW_DATA pPreviewData) -{ - int width, height; - - /* Get Desktop rectangle */ - pPreviewData->rcDesktop.left = 0; - pPreviewData->rcDesktop.top = 0; - pPreviewData->rcDesktop.right = cx; - pPreviewData->rcDesktop.bottom = cy; - - /* Calculate the inactive window rectangle */ - pPreviewData->rcInactiveFrame.left = pPreviewData->rcDesktop.left + 8; - pPreviewData->rcInactiveFrame.top = pPreviewData->rcDesktop.top + 8; - pPreviewData->rcInactiveFrame.right = pPreviewData->rcDesktop.right - 25; - pPreviewData->rcInactiveFrame.bottom = pPreviewData->rcDesktop.bottom - 30; - - /* Calculate the inactive caption rectangle */ - pPreviewData->rcInactiveCaption.left = pPreviewData->rcInactiveFrame.left + pPreviewData->cxEdge + 1/*3*/ + 1; - pPreviewData->rcInactiveCaption.top = pPreviewData->rcInactiveFrame.top + pPreviewData->cyEdge + 1/*3*/ + 1; - pPreviewData->rcInactiveCaption.right = pPreviewData->rcInactiveFrame.right - pPreviewData->cxEdge - 1/*3*/ - 1; - pPreviewData->rcInactiveCaption.bottom = pPreviewData->rcInactiveFrame.top + pPreviewData->cyCaption /*20*/ + 2; - - /* Calculate the inactive caption buttons rectangle */ - pPreviewData->rcInactiveCaptionButtons.left = pPreviewData->rcInactiveCaption.right - 2 - 2 - 3 * 16; - pPreviewData->rcInactiveCaptionButtons.top = pPreviewData->rcInactiveCaption.top + 2; - pPreviewData->rcInactiveCaptionButtons.right = pPreviewData->rcInactiveCaption.right - 2; - pPreviewData->rcInactiveCaptionButtons.bottom = pPreviewData->rcInactiveCaption.bottom - 2; - - /* Calculate the active window rectangle */ - pPreviewData->rcActiveFrame.left = pPreviewData->rcInactiveFrame.left + 3 + 1; - pPreviewData->rcActiveFrame.top = pPreviewData->rcInactiveCaption.bottom + 1; - pPreviewData->rcActiveFrame.right = pPreviewData->rcDesktop.right - 10; - pPreviewData->rcActiveFrame.bottom = pPreviewData->rcDesktop.bottom - 25; - - /* Calculate the active caption rectangle */ - pPreviewData->rcActiveCaption.left = pPreviewData->rcActiveFrame.left + 3 + 1; - pPreviewData->rcActiveCaption.top = pPreviewData->rcActiveFrame.top + 3 + 1; - pPreviewData->rcActiveCaption.right = pPreviewData->rcActiveFrame.right - 3 - 1; - pPreviewData->rcActiveCaption.bottom = pPreviewData->rcActiveFrame.top + pPreviewData->cyCaption/*20*/ + 2; - - /* Calculate the active caption buttons rectangle */ - pPreviewData->rcActiveCaptionButtons.left = pPreviewData->rcActiveCaption.right - 2 - 2 - 3 * 16; - pPreviewData->rcActiveCaptionButtons.top = pPreviewData->rcActiveCaption.top + 2; - pPreviewData->rcActiveCaptionButtons.right = pPreviewData->rcActiveCaption.right - 2; - pPreviewData->rcActiveCaptionButtons.bottom = pPreviewData->rcActiveCaption.bottom - 2; - - /* Calculate the active menu bar rectangle */ - pPreviewData->rcActiveMenuBar.left = pPreviewData->rcActiveFrame.left + 3 + 1; - pPreviewData->rcActiveMenuBar.top = pPreviewData->rcActiveCaption.bottom + 1; - pPreviewData->rcActiveMenuBar.right = pPreviewData->rcActiveFrame.right - 3 - 1; - pPreviewData->rcActiveMenuBar.bottom = pPreviewData->rcActiveMenuBar.top + 20; - - /* Calculate the active client rectangle */ - pPreviewData->rcActiveClient.left = pPreviewData->rcActiveFrame.left + 3 + 1; - pPreviewData->rcActiveClient.top = pPreviewData->rcActiveMenuBar.bottom; // + 1; - pPreviewData->rcActiveClient.right = pPreviewData->rcActiveFrame.right - 3 - 1; - pPreviewData->rcActiveClient.bottom = pPreviewData->rcActiveFrame.bottom - 3 - 1; - - /* Calculate the active scroll rectangle */ - pPreviewData->rcActiveScroll.left = pPreviewData->rcActiveClient.right - 2 - 16; - pPreviewData->rcActiveScroll.top = pPreviewData->rcActiveClient.top + 2; - pPreviewData->rcActiveScroll.right = pPreviewData->rcActiveClient.right - 2; - pPreviewData->rcActiveScroll.bottom = pPreviewData->rcActiveClient.bottom - 2; - - - /* Dialog window */ - pPreviewData->rcDialogFrame.left = pPreviewData->rcActiveClient.left + 4; - pPreviewData->rcDialogFrame.top = (pPreviewData->rcDesktop.bottom * 60) / 100; - pPreviewData->rcDialogFrame.right = (pPreviewData->rcDesktop.right * 65) / 100; - pPreviewData->rcDialogFrame.bottom = pPreviewData->rcDesktop.bottom - 5; - - /* Calculate the dialog caption rectangle */ - pPreviewData->rcDialogCaption.left = pPreviewData->rcDialogFrame.left + 3; - pPreviewData->rcDialogCaption.top = pPreviewData->rcDialogFrame.top + 3; - pPreviewData->rcDialogCaption.right = pPreviewData->rcDialogFrame.right - 3; - pPreviewData->rcDialogCaption.bottom = pPreviewData->rcDialogFrame.top + 20 + 1; - - /* Calculate the inactive caption buttons rectangle */ - pPreviewData->rcDialogCaptionButtons.left = pPreviewData->rcDialogCaption.right - 2 - 16; - pPreviewData->rcDialogCaptionButtons.top = pPreviewData->rcDialogCaption.top + 2; - pPreviewData->rcDialogCaptionButtons.right = pPreviewData->rcDialogCaption.right - 2; - pPreviewData->rcDialogCaptionButtons.bottom = pPreviewData->rcDialogCaption.bottom - 2; - - /* Calculate the dialog client rectangle */ - pPreviewData->rcDialogClient.left = pPreviewData->rcDialogFrame.left + 3; - pPreviewData->rcDialogClient.top = pPreviewData->rcDialogCaption.bottom + 1; - pPreviewData->rcDialogClient.right = pPreviewData->rcDialogFrame.right - 3; - pPreviewData->rcDialogClient.bottom = pPreviewData->rcDialogFrame.bottom - 3; - - /* Calculate the dialog button rectangle */ - width = 80; - height = 28; - - pPreviewData->rcDialogButton.left = - (pPreviewData->rcDialogClient.right + pPreviewData->rcDialogClient.left - width) / 2; - pPreviewData->rcDialogButton.right = pPreviewData->rcDialogButton.left + width; - pPreviewData->rcDialogButton.bottom = pPreviewData->rcDialogClient.bottom - 2; - pPreviewData->rcDialogButton.top = pPreviewData->rcDialogButton.bottom - height; -} - - -static VOID -OnPaint(HWND hwnd, PPREVIEW_DATA pPreviewData) -{ - PAINTSTRUCT ps; - HFONT hOldFont; - HDC hdc; - RECT rc; - - hdc = BeginPaint(hwnd, &ps); - - /* Desktop */ - FillRect(hdc, &pPreviewData->rcDesktop, pPreviewData->hbrDesktop); - - /* Inactive Window */ - DrawEdge(hdc, &pPreviewData->rcInactiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); - SetTextColor(hdc, pPreviewData->clrInactiveCaptionText); - DrawCaptionTemp(NULL, hdc, &pPreviewData->rcInactiveCaption, pPreviewData->hCaptionFont, - NULL, pPreviewData->lpInAct, DC_GRADIENT | DC_ICON | DC_TEXT); - DrawCaptionButtons(hdc, &pPreviewData->rcInactiveCaption, TRUE); - - /* Active Window */ - DrawEdge(hdc, &pPreviewData->rcActiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); - SetTextColor(hdc, pPreviewData->clrActiveCaptionText); - DrawCaptionTemp(NULL, hdc, &pPreviewData->rcActiveCaption, pPreviewData->hCaptionFont, - NULL, pPreviewData->lpAct, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT); - DrawCaptionButtons(hdc, &pPreviewData->rcActiveCaption, TRUE); - - /* FIXME: Draw the menu bar */ - DrawMenuBarTemp(hwnd, hdc, &pPreviewData->rcActiveMenuBar, - pPreviewData->hMenu /*HMENU hMenu*/, - pPreviewData->hMessageFont /*HFONT hFont*/); - - /* Draw the client area */ - CopyRect(&rc, &pPreviewData->rcActiveClient); - DrawEdge(hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_ADJUST); - FillRect(hdc, &rc, pPreviewData->hbrWindow); - - /* Draw the client text */ - CopyRect(&rc, &pPreviewData->rcActiveClient); - rc.left += 4; - rc.top += 2; - SetTextColor(hdc, pPreviewData->clrWindowText); - hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); - DrawText(hdc, pPreviewData->lpWinTxt, lstrlen(pPreviewData->lpWinTxt), &rc, DT_LEFT); - SelectObject(hdc, hOldFont); - - /* Draw the scroll bar */ - DrawScrollbar(hdc, &pPreviewData->rcActiveScroll, pPreviewData->hbrScrollbar); - - /* Dialog Window */ - DrawEdge(hdc, &pPreviewData->rcDialogFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); - SetTextColor(hdc, pPreviewData->clrActiveCaptionText); - DrawCaptionTemp(NULL, hdc, &pPreviewData->rcDialogCaption, pPreviewData->hCaptionFont, - NULL, pPreviewData->lpMessBox, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT); - DrawCaptionButtons(hdc, &pPreviewData->rcDialogCaption, FALSE); - - /* Draw the dialog text */ - CopyRect(&rc, &pPreviewData->rcDialogClient); - rc.left += 4; - rc.top += 2; - SetTextColor(hdc, RGB(0,0,0)); - hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); - DrawText(hdc, pPreviewData->lpMessText, lstrlen(pPreviewData->lpMessText), &rc, DT_LEFT); - SelectObject(hdc, hOldFont); - - /* Draw Button */ - DrawFrameControl(hdc, &pPreviewData->rcDialogButton, DFC_BUTTON, DFCS_BUTTONPUSH); - CopyRect(&rc, &pPreviewData->rcDialogButton); - SetTextColor(hdc, pPreviewData->clrButtonText); - hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); - DrawText(hdc, pPreviewData->lpButText, lstrlen(pPreviewData->lpButText), &rc, DT_VCENTER | DT_CENTER | DT_SINGLELINE); - SelectObject(hdc, hOldFont); - - EndPaint(hwnd, &ps); -} - - -static VOID -OnLButtonDown(HWND hwnd, int xPos, int yPos, PPREVIEW_DATA pPreviewData) -{ - UINT type = IDX_DESKTOP; - POINT pt; - - pt.x = xPos; - pt.y = yPos; - - if (PtInRect(&pPreviewData->rcInactiveFrame, pt)) - type = IDX_INACTIVE_BORDER; - - if (PtInRect(&pPreviewData->rcInactiveCaption, pt)) - type = IDX_INACTIVE_CAPTION; - - if (PtInRect(&pPreviewData->rcInactiveCaptionButtons, pt)) - type = IDX_CAPTION_BUTTON; - - if (PtInRect(&pPreviewData->rcActiveFrame, pt)) - type = IDX_ACTIVE_BORDER; - - if (PtInRect(&pPreviewData->rcActiveCaption, pt)) - type = IDX_ACTIVE_CAPTION; - - if (PtInRect(&pPreviewData->rcActiveCaptionButtons, pt)) - type = IDX_CAPTION_BUTTON; - - if (PtInRect(&pPreviewData->rcActiveMenuBar, pt)) - type = IDX_MENU; - -// if (PtInRect(&pPreviewData->rcSelectedMenuItem, pt)) -// type = IDX_SELECTION; - - if (PtInRect(&pPreviewData->rcActiveClient, pt)) - type = IDX_WINDOW; - - if (PtInRect(&pPreviewData->rcActiveScroll, pt)) - type = IDX_SCROLLBAR; - - if (PtInRect(&pPreviewData->rcDialogFrame, pt)) - type = IDX_DIALOG; - - if (PtInRect(&pPreviewData->rcDialogCaption, pt)) - type = IDX_ACTIVE_CAPTION; - - if (PtInRect(&pPreviewData->rcDialogCaptionButtons, pt)) - type = IDX_CAPTION_BUTTON; - - if (PtInRect(&pPreviewData->rcDialogButton, pt)) - type = IDX_3D_OBJECTS; - - SendMessage(GetParent(hwnd), WM_USER, 0, type); -} - - -static VOID -OnDestroy(PPREVIEW_DATA pPreviewData) -{ - DeleteObject(pPreviewData->hbrScrollbar); - DeleteObject(pPreviewData->hbrDesktop); - DeleteObject(pPreviewData->hbrWindow); - - DeleteObject(pPreviewData->hCaptionFont); - DeleteObject(pPreviewData->hMenuFont); - DeleteObject(pPreviewData->hMessageFont); - - DestroyMenu(pPreviewData->hMenu); - - LocalFree((HLOCAL)pPreviewData->lpInAct); - LocalFree((HLOCAL)pPreviewData->lpAct); - LocalFree((HLOCAL)pPreviewData->lpWinTxt); - LocalFree((HLOCAL)pPreviewData->lpMessBox); - LocalFree((HLOCAL)pPreviewData->lpMessText); - LocalFree((HLOCAL)pPreviewData->lpButText); -} - - -static LRESULT CALLBACK -PreviewWndProc(HWND hwnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - PPREVIEW_DATA pPreviewData; - - pPreviewData = (PPREVIEW_DATA)GetWindowLongPtr(hwnd, GWLP_USERDATA); - - switch (uMsg) - { - case WM_CREATE: - pPreviewData = (PPREVIEW_DATA)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(PREVIEW_DATA)); - if (!pPreviewData) - return -1; - - SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pPreviewData); - OnCreate(hwnd, pPreviewData); - break; - - case WM_SIZE: - OnSize(LOWORD(lParam), HIWORD(lParam), pPreviewData); - break; - - case WM_PAINT: - OnPaint(hwnd, pPreviewData); - break; - - case WM_LBUTTONDOWN: - OnLButtonDown(hwnd, LOWORD(lParam), HIWORD(lParam), pPreviewData); - break; - - case WM_DESTROY: - OnDestroy(pPreviewData); - HeapFree(GetProcessHeap(), 0, pPreviewData); - break; - - default: - DefWindowProc(hwnd, - uMsg, - wParam, - lParam); - } - - return TRUE; -} - - -BOOL -RegisterPreviewControl(IN HINSTANCE hInstance) -{ - WNDCLASSEX wc = {0}; - - wc.cbSize = sizeof(WNDCLASSEX); - wc.lpfnWndProc = PreviewWndProc; - wc.hInstance = hInstance; - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = (HBRUSH)NULL; //(COLOR_BTNFACE + 1); - wc.lpszClassName = szPreviewWndClass; - - return RegisterClassEx(&wc) != (ATOM)0; -} - - -VOID -UnregisterPreviewControl(IN HINSTANCE hInstance) -{ - UnregisterClass(szPreviewWndClass, - hInstance); -} +/* + * PROJECT: ReactOS Timedate Control Panel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/cpl/desk/preview.c + * PURPOSE: Draws the preview control + * COPYRIGHT: Copyright 2006, 2007 Eric Kohl + */ + +#include "desk.h" +#include "preview.h" + +static const TCHAR szPreviewWndClass[] = TEXT("PreviewWndClass"); + +typedef struct _PREVIEW_DATA +{ + HWND hwndParent; + + DWORD clrDesktop; + HBRUSH hbrDesktop; + + DWORD clrWindow; + HBRUSH hbrWindow; + + DWORD clrScrollbar; + HBRUSH hbrScrollbar; + + DWORD clrActiveCaptionText; + DWORD clrInactiveCaptionText; + DWORD clrWindowText; + DWORD clrButtonText; + + INT cxEdge; + INT cyEdge; + + INT cyCaption; + + RECT rcDesktop; + RECT rcInactiveFrame; + RECT rcInactiveCaption; + RECT rcInactiveCaptionButtons; + + RECT rcActiveFrame; + RECT rcActiveCaption; + RECT rcActiveCaptionButtons; + RECT rcActiveMenuBar; + RECT rcSelectedMenuItem; + RECT rcActiveClient; + RECT rcActiveScroll; + + RECT rcDialogFrame; + RECT rcDialogCaption; + RECT rcDialogCaptionButtons; + RECT rcDialogClient; + + RECT rcDialogButton; + + LPTSTR lpInAct; + LPTSTR lpAct; + LPTSTR lpWinTxt; + LPTSTR lpMessBox; + LPTSTR lpMessText; + LPTSTR lpButText; + + LOGFONT lfCaptionFont; + LOGFONT lfMenuFont; + LOGFONT lfMessageFont; + + HFONT hCaptionFont; + HFONT hMenuFont; + HFONT hMessageFont; + + HMENU hMenu; + +} PREVIEW_DATA, *PPREVIEW_DATA; + + + +static VOID +DrawCaptionButtons(HDC hdc, LPRECT lpRect, BOOL bMinMax) +{ + RECT rc3; + RECT rc4; + RECT rc5; + + rc3.left = lpRect->right - 2 - 16; + rc3.top = lpRect->top + 2; + rc3.right = lpRect->right - 2; + rc3.bottom = lpRect->bottom - 2; + + DrawFrameControl(hdc, &rc3, DFC_CAPTION, DFCS_CAPTIONCLOSE); + + if (bMinMax) + { + rc4.left = rc3.left - 16 - 2; + rc4.top = rc3.top; + rc4.right = rc3.right - 16 - 2; + rc4.bottom = rc3.bottom; + + DrawFrameControl(hdc, &rc4, DFC_CAPTION, DFCS_CAPTIONMAX); + + rc5.left = rc4.left - 16; + rc5.top = rc4.top; + rc5.right = rc4.right - 16; + rc5.bottom = rc4.bottom; + + DrawFrameControl(hdc, &rc5, DFC_CAPTION, DFCS_CAPTIONMIN); + } +} + +static VOID +DrawScrollbar(HDC hdc, LPRECT rc, HBRUSH hbrScrollbar) +{ + RECT rcTop; + RECT rcBottom; + RECT rcMiddle; + int width; + + width = rc->right - rc->left; + + rcTop.left = rc->left; + rcTop.right = rc->right; + rcTop.top = rc->top; + rcTop.bottom = rc->top + width; + + rcMiddle.left = rc->left; + rcMiddle.right = rc->right; + rcMiddle.top = rc->top + width; + rcMiddle.bottom = rc->bottom - width; + + rcBottom.left = rc->left; + rcBottom.right = rc->right; + rcBottom.top = rc->bottom - width; + rcBottom.bottom = rc->bottom; + + DrawFrameControl(hdc, &rcTop, DFC_SCROLL, DFCS_SCROLLUP); + DrawFrameControl(hdc, &rcBottom, DFC_SCROLL, DFCS_SCROLLDOWN); + + FillRect(hdc, &rcMiddle, hbrScrollbar); +} + + +static VOID +OnCreate(HWND hwnd, PPREVIEW_DATA pPreviewData) +{ + NONCLIENTMETRICS NonClientMetrics; + + pPreviewData->clrScrollbar = GetSysColor(COLOR_SCROLLBAR); + pPreviewData->hbrScrollbar = CreateSolidBrush(pPreviewData->clrScrollbar); + + pPreviewData->clrDesktop = GetSysColor(COLOR_DESKTOP); + pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->clrDesktop); + pPreviewData->clrWindow = GetSysColor(COLOR_WINDOW); + pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrWindow); + + pPreviewData->clrActiveCaptionText = GetSysColor(COLOR_CAPTIONTEXT); + pPreviewData->clrInactiveCaptionText = GetSysColor(COLOR_INACTIVECAPTIONTEXT); + pPreviewData->clrWindowText = GetSysColor(COLOR_WINDOWTEXT); + pPreviewData->clrButtonText = GetSysColor(COLOR_BTNTEXT); + + pPreviewData->cxEdge = GetSystemMetrics(SM_CXEDGE); + pPreviewData->cyEdge = GetSystemMetrics(SM_CXEDGE); + + pPreviewData->cyCaption = 20; //GetSystemMetrics(SM_CYCAPTION); + + /* load font info */ + NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + + pPreviewData->lfCaptionFont = NonClientMetrics.lfCaptionFont; + pPreviewData->hCaptionFont = CreateFontIndirect(&pPreviewData->lfCaptionFont); + + pPreviewData->lfMenuFont = NonClientMetrics.lfMenuFont; + pPreviewData->hMenuFont = CreateFontIndirect(&pPreviewData->lfMenuFont); + + pPreviewData->lfMessageFont = NonClientMetrics.lfMessageFont; + pPreviewData->hMessageFont = CreateFontIndirect(&pPreviewData->lfMessageFont); + + /* Load and modify the menu */ + pPreviewData->hMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_PREVIEW_MENU)); + EnableMenuItem(pPreviewData->hMenu, ID_MENU_DISABLED, + MF_BYCOMMAND | MF_DISABLED); + HiliteMenuItem(hwnd, pPreviewData->hMenu, + ID_MENU_SELECTED, MF_BYCOMMAND | MF_HILITE); + +// GetMenuItemRect(hwnd, pPreviewData->hMenu, +// ID_MENU_SELECTED, &pPreviewData->rcSelectedMenuItem); + + + AllocAndLoadString(&pPreviewData->lpInAct, hApplet, IDS_INACTWIN); + AllocAndLoadString(&pPreviewData->lpAct, hApplet, IDS_ACTWIN); + AllocAndLoadString(&pPreviewData->lpWinTxt, hApplet, IDS_WINTEXT); + AllocAndLoadString(&pPreviewData->lpMessBox, hApplet, IDS_MESSBOX); + AllocAndLoadString(&pPreviewData->lpMessText, hApplet, IDS_MESSTEXT); + AllocAndLoadString(&pPreviewData->lpButText, hApplet, IDS_BUTTEXT); +} + + +static VOID +OnSize(INT cx, INT cy, PPREVIEW_DATA pPreviewData) +{ + int width, height; + + /* Get Desktop rectangle */ + pPreviewData->rcDesktop.left = 0; + pPreviewData->rcDesktop.top = 0; + pPreviewData->rcDesktop.right = cx; + pPreviewData->rcDesktop.bottom = cy; + + /* Calculate the inactive window rectangle */ + pPreviewData->rcInactiveFrame.left = pPreviewData->rcDesktop.left + 8; + pPreviewData->rcInactiveFrame.top = pPreviewData->rcDesktop.top + 8; + pPreviewData->rcInactiveFrame.right = pPreviewData->rcDesktop.right - 25; + pPreviewData->rcInactiveFrame.bottom = pPreviewData->rcDesktop.bottom - 30; + + /* Calculate the inactive caption rectangle */ + pPreviewData->rcInactiveCaption.left = pPreviewData->rcInactiveFrame.left + pPreviewData->cxEdge + 1/*3*/ + 1; + pPreviewData->rcInactiveCaption.top = pPreviewData->rcInactiveFrame.top + pPreviewData->cyEdge + 1/*3*/ + 1; + pPreviewData->rcInactiveCaption.right = pPreviewData->rcInactiveFrame.right - pPreviewData->cxEdge - 1/*3*/ - 1; + pPreviewData->rcInactiveCaption.bottom = pPreviewData->rcInactiveFrame.top + pPreviewData->cyCaption /*20*/ + 2; + + /* Calculate the inactive caption buttons rectangle */ + pPreviewData->rcInactiveCaptionButtons.left = pPreviewData->rcInactiveCaption.right - 2 - 2 - 3 * 16; + pPreviewData->rcInactiveCaptionButtons.top = pPreviewData->rcInactiveCaption.top + 2; + pPreviewData->rcInactiveCaptionButtons.right = pPreviewData->rcInactiveCaption.right - 2; + pPreviewData->rcInactiveCaptionButtons.bottom = pPreviewData->rcInactiveCaption.bottom - 2; + + /* Calculate the active window rectangle */ + pPreviewData->rcActiveFrame.left = pPreviewData->rcInactiveFrame.left + 3 + 1; + pPreviewData->rcActiveFrame.top = pPreviewData->rcInactiveCaption.bottom + 1; + pPreviewData->rcActiveFrame.right = pPreviewData->rcDesktop.right - 10; + pPreviewData->rcActiveFrame.bottom = pPreviewData->rcDesktop.bottom - 25; + + /* Calculate the active caption rectangle */ + pPreviewData->rcActiveCaption.left = pPreviewData->rcActiveFrame.left + 3 + 1; + pPreviewData->rcActiveCaption.top = pPreviewData->rcActiveFrame.top + 3 + 1; + pPreviewData->rcActiveCaption.right = pPreviewData->rcActiveFrame.right - 3 - 1; + pPreviewData->rcActiveCaption.bottom = pPreviewData->rcActiveFrame.top + pPreviewData->cyCaption/*20*/ + 2; + + /* Calculate the active caption buttons rectangle */ + pPreviewData->rcActiveCaptionButtons.left = pPreviewData->rcActiveCaption.right - 2 - 2 - 3 * 16; + pPreviewData->rcActiveCaptionButtons.top = pPreviewData->rcActiveCaption.top + 2; + pPreviewData->rcActiveCaptionButtons.right = pPreviewData->rcActiveCaption.right - 2; + pPreviewData->rcActiveCaptionButtons.bottom = pPreviewData->rcActiveCaption.bottom - 2; + + /* Calculate the active menu bar rectangle */ + pPreviewData->rcActiveMenuBar.left = pPreviewData->rcActiveFrame.left + 3 + 1; + pPreviewData->rcActiveMenuBar.top = pPreviewData->rcActiveCaption.bottom + 1; + pPreviewData->rcActiveMenuBar.right = pPreviewData->rcActiveFrame.right - 3 - 1; + pPreviewData->rcActiveMenuBar.bottom = pPreviewData->rcActiveMenuBar.top + 20; + + /* Calculate the active client rectangle */ + pPreviewData->rcActiveClient.left = pPreviewData->rcActiveFrame.left + 3 + 1; + pPreviewData->rcActiveClient.top = pPreviewData->rcActiveMenuBar.bottom; // + 1; + pPreviewData->rcActiveClient.right = pPreviewData->rcActiveFrame.right - 3 - 1; + pPreviewData->rcActiveClient.bottom = pPreviewData->rcActiveFrame.bottom - 3 - 1; + + /* Calculate the active scroll rectangle */ + pPreviewData->rcActiveScroll.left = pPreviewData->rcActiveClient.right - 2 - 16; + pPreviewData->rcActiveScroll.top = pPreviewData->rcActiveClient.top + 2; + pPreviewData->rcActiveScroll.right = pPreviewData->rcActiveClient.right - 2; + pPreviewData->rcActiveScroll.bottom = pPreviewData->rcActiveClient.bottom - 2; + + + /* Dialog window */ + pPreviewData->rcDialogFrame.left = pPreviewData->rcActiveClient.left + 4; + pPreviewData->rcDialogFrame.top = (pPreviewData->rcDesktop.bottom * 60) / 100; + pPreviewData->rcDialogFrame.right = (pPreviewData->rcDesktop.right * 65) / 100; + pPreviewData->rcDialogFrame.bottom = pPreviewData->rcDesktop.bottom - 5; + + /* Calculate the dialog caption rectangle */ + pPreviewData->rcDialogCaption.left = pPreviewData->rcDialogFrame.left + 3; + pPreviewData->rcDialogCaption.top = pPreviewData->rcDialogFrame.top + 3; + pPreviewData->rcDialogCaption.right = pPreviewData->rcDialogFrame.right - 3; + pPreviewData->rcDialogCaption.bottom = pPreviewData->rcDialogFrame.top + 20 + 1; + + /* Calculate the inactive caption buttons rectangle */ + pPreviewData->rcDialogCaptionButtons.left = pPreviewData->rcDialogCaption.right - 2 - 16; + pPreviewData->rcDialogCaptionButtons.top = pPreviewData->rcDialogCaption.top + 2; + pPreviewData->rcDialogCaptionButtons.right = pPreviewData->rcDialogCaption.right - 2; + pPreviewData->rcDialogCaptionButtons.bottom = pPreviewData->rcDialogCaption.bottom - 2; + + /* Calculate the dialog client rectangle */ + pPreviewData->rcDialogClient.left = pPreviewData->rcDialogFrame.left + 3; + pPreviewData->rcDialogClient.top = pPreviewData->rcDialogCaption.bottom + 1; + pPreviewData->rcDialogClient.right = pPreviewData->rcDialogFrame.right - 3; + pPreviewData->rcDialogClient.bottom = pPreviewData->rcDialogFrame.bottom - 3; + + /* Calculate the dialog button rectangle */ + width = 80; + height = 28; + + pPreviewData->rcDialogButton.left = + (pPreviewData->rcDialogClient.right + pPreviewData->rcDialogClient.left - width) / 2; + pPreviewData->rcDialogButton.right = pPreviewData->rcDialogButton.left + width; + pPreviewData->rcDialogButton.bottom = pPreviewData->rcDialogClient.bottom - 2; + pPreviewData->rcDialogButton.top = pPreviewData->rcDialogButton.bottom - height; +} + + +static VOID +OnPaint(HWND hwnd, PPREVIEW_DATA pPreviewData) +{ + PAINTSTRUCT ps; + HFONT hOldFont; + HDC hdc; + RECT rc; + + hdc = BeginPaint(hwnd, &ps); + + /* Desktop */ + FillRect(hdc, &pPreviewData->rcDesktop, pPreviewData->hbrDesktop); + + /* Inactive Window */ + DrawEdge(hdc, &pPreviewData->rcInactiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); + SetTextColor(hdc, pPreviewData->clrInactiveCaptionText); + DrawCaptionTemp(NULL, hdc, &pPreviewData->rcInactiveCaption, pPreviewData->hCaptionFont, + NULL, pPreviewData->lpInAct, DC_GRADIENT | DC_ICON | DC_TEXT); + DrawCaptionButtons(hdc, &pPreviewData->rcInactiveCaption, TRUE); + + /* Active Window */ + DrawEdge(hdc, &pPreviewData->rcActiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); + SetTextColor(hdc, pPreviewData->clrActiveCaptionText); + DrawCaptionTemp(NULL, hdc, &pPreviewData->rcActiveCaption, pPreviewData->hCaptionFont, + NULL, pPreviewData->lpAct, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT); + DrawCaptionButtons(hdc, &pPreviewData->rcActiveCaption, TRUE); + + /* FIXME: Draw the menu bar */ + DrawMenuBarTemp(hwnd, hdc, &pPreviewData->rcActiveMenuBar, + pPreviewData->hMenu /*HMENU hMenu*/, + pPreviewData->hMessageFont /*HFONT hFont*/); + + /* Draw the client area */ + CopyRect(&rc, &pPreviewData->rcActiveClient); + DrawEdge(hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_ADJUST); + FillRect(hdc, &rc, pPreviewData->hbrWindow); + + /* Draw the client text */ + CopyRect(&rc, &pPreviewData->rcActiveClient); + rc.left += 4; + rc.top += 2; + SetTextColor(hdc, pPreviewData->clrWindowText); + hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); + DrawText(hdc, pPreviewData->lpWinTxt, lstrlen(pPreviewData->lpWinTxt), &rc, DT_LEFT); + SelectObject(hdc, hOldFont); + + /* Draw the scroll bar */ + DrawScrollbar(hdc, &pPreviewData->rcActiveScroll, pPreviewData->hbrScrollbar); + + /* Dialog Window */ + DrawEdge(hdc, &pPreviewData->rcDialogFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE); + SetTextColor(hdc, pPreviewData->clrActiveCaptionText); + DrawCaptionTemp(NULL, hdc, &pPreviewData->rcDialogCaption, pPreviewData->hCaptionFont, + NULL, pPreviewData->lpMessBox, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT); + DrawCaptionButtons(hdc, &pPreviewData->rcDialogCaption, FALSE); + + /* Draw the dialog text */ + CopyRect(&rc, &pPreviewData->rcDialogClient); + rc.left += 4; + rc.top += 2; + SetTextColor(hdc, RGB(0,0,0)); + hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); + DrawText(hdc, pPreviewData->lpMessText, lstrlen(pPreviewData->lpMessText), &rc, DT_LEFT); + SelectObject(hdc, hOldFont); + + /* Draw Button */ + DrawFrameControl(hdc, &pPreviewData->rcDialogButton, DFC_BUTTON, DFCS_BUTTONPUSH); + CopyRect(&rc, &pPreviewData->rcDialogButton); + SetTextColor(hdc, pPreviewData->clrButtonText); + hOldFont = SelectObject(hdc, pPreviewData->hMessageFont); + DrawText(hdc, pPreviewData->lpButText, lstrlen(pPreviewData->lpButText), &rc, DT_VCENTER | DT_CENTER | DT_SINGLELINE); + SelectObject(hdc, hOldFont); + + EndPaint(hwnd, &ps); +} + + +static VOID +OnLButtonDown(HWND hwnd, int xPos, int yPos, PPREVIEW_DATA pPreviewData) +{ + UINT type = IDX_DESKTOP; + POINT pt; + + pt.x = xPos; + pt.y = yPos; + + if (PtInRect(&pPreviewData->rcInactiveFrame, pt)) + type = IDX_INACTIVE_BORDER; + + if (PtInRect(&pPreviewData->rcInactiveCaption, pt)) + type = IDX_INACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcInactiveCaptionButtons, pt)) + type = IDX_CAPTION_BUTTON; + + if (PtInRect(&pPreviewData->rcActiveFrame, pt)) + type = IDX_ACTIVE_BORDER; + + if (PtInRect(&pPreviewData->rcActiveCaption, pt)) + type = IDX_ACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcActiveCaptionButtons, pt)) + type = IDX_CAPTION_BUTTON; + + if (PtInRect(&pPreviewData->rcActiveMenuBar, pt)) + type = IDX_MENU; + +// if (PtInRect(&pPreviewData->rcSelectedMenuItem, pt)) +// type = IDX_SELECTION; + + if (PtInRect(&pPreviewData->rcActiveClient, pt)) + type = IDX_WINDOW; + + if (PtInRect(&pPreviewData->rcActiveScroll, pt)) + type = IDX_SCROLLBAR; + + if (PtInRect(&pPreviewData->rcDialogFrame, pt)) + type = IDX_DIALOG; + + if (PtInRect(&pPreviewData->rcDialogCaption, pt)) + type = IDX_ACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcDialogCaptionButtons, pt)) + type = IDX_CAPTION_BUTTON; + + if (PtInRect(&pPreviewData->rcDialogButton, pt)) + type = IDX_3D_OBJECTS; + + SendMessage(GetParent(hwnd), WM_USER, 0, type); +} + + +static VOID +OnDestroy(PPREVIEW_DATA pPreviewData) +{ + DeleteObject(pPreviewData->hbrScrollbar); + DeleteObject(pPreviewData->hbrDesktop); + DeleteObject(pPreviewData->hbrWindow); + + DeleteObject(pPreviewData->hCaptionFont); + DeleteObject(pPreviewData->hMenuFont); + DeleteObject(pPreviewData->hMessageFont); + + DestroyMenu(pPreviewData->hMenu); + + LocalFree((HLOCAL)pPreviewData->lpInAct); + LocalFree((HLOCAL)pPreviewData->lpAct); + LocalFree((HLOCAL)pPreviewData->lpWinTxt); + LocalFree((HLOCAL)pPreviewData->lpMessBox); + LocalFree((HLOCAL)pPreviewData->lpMessText); + LocalFree((HLOCAL)pPreviewData->lpButText); +} + + +static LRESULT CALLBACK +PreviewWndProc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PPREVIEW_DATA pPreviewData; + + pPreviewData = (PPREVIEW_DATA)GetWindowLongPtr(hwnd, GWLP_USERDATA); + + switch (uMsg) + { + case WM_CREATE: + pPreviewData = (PPREVIEW_DATA)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PREVIEW_DATA)); + if (!pPreviewData) + return -1; + + SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pPreviewData); + OnCreate(hwnd, pPreviewData); + break; + + case WM_SIZE: + OnSize(LOWORD(lParam), HIWORD(lParam), pPreviewData); + break; + + case WM_PAINT: + OnPaint(hwnd, pPreviewData); + break; + + case WM_LBUTTONDOWN: + OnLButtonDown(hwnd, LOWORD(lParam), HIWORD(lParam), pPreviewData); + break; + + case WM_DESTROY: + OnDestroy(pPreviewData); + HeapFree(GetProcessHeap(), 0, pPreviewData); + break; + + default: + DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + } + + return TRUE; +} + + +BOOL +RegisterPreviewControl(IN HINSTANCE hInstance) +{ + WNDCLASSEX wc = {0}; + + wc.cbSize = sizeof(WNDCLASSEX); + wc.lpfnWndProc = PreviewWndProc; + wc.hInstance = hInstance; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)NULL; //(COLOR_BTNFACE + 1); + wc.lpszClassName = szPreviewWndClass; + + return RegisterClassEx(&wc) != (ATOM)0; +} + + +VOID +UnregisterPreviewControl(IN HINSTANCE hInstance) +{ + UnregisterClass(szPreviewWndClass, + hInstance); +} Propchange: trunk/reactos/dll/cpl/desk/preview.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/desk/preview.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/cpl/desk/preview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.h (original) +++ trunk/reactos/dll/cpl/desk/preview.h Sat Jan 27 17:53:18 2007 @@ -1,21 +1,21 @@ - -#define IDX_3D_OBJECTS 0 -#define IDX_SCROLLBAR 1 -#define IDX_DESKTOP 2 -#define IDX_DIALOG 3 -#define IDX_WINDOW 4 -#define IDX_APPSPACE 5 -#define IDX_SELECTION 6 -#define IDX_MENU 7 - -#define IDX_QUICKINFO 9 -#define IDX_INACTIVE_BORDER 10 -#define IDX_ACTIVE_BORDER 11 - -#define IDX_INACTIVE_CAPTION 15 -#define IDX_ACTIVE_CAPTION 16 -#define IDX_CAPTION_BUTTON 17 - - -BOOL RegisterPreviewControl(IN HINSTANCE hInstance); -VOID UnregisterPreviewControl(IN HINSTANCE hInstance); + +#define IDX_3D_OBJECTS 0 +#define IDX_SCROLLBAR 1 +#define IDX_DESKTOP 2 +#define IDX_DIALOG 3 +#define IDX_WINDOW 4 +#define IDX_APPSPACE 5 +#define IDX_SELECTION 6 +#define IDX_MENU 7 + +#define IDX_QUICKINFO 9 +#define IDX_INACTIVE_BORDER 10 +#define IDX_ACTIVE_BORDER 11 + +#define IDX_INACTIVE_CAPTION 15 +#define IDX_ACTIVE_CAPTION 16 +#define IDX_CAPTION_BUTTON 17 + + +BOOL RegisterPreviewControl(IN HINSTANCE hInstance); +VOID UnregisterPreviewControl(IN HINSTANCE hInstance); Propchange: trunk/reactos/dll/cpl/desk/preview.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/desk/preview.h ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[weiden] 25648: Make RtlEqualPrefixSid portable
by weiden＠svn.reactos.org 27 Jan '07

27 Jan '07

Author: weiden Date: Sat Jan 27 17:06:01 2007 New Revision: 25648 URL: http://svn.reactos.org/svn/reactos?rev=25648&view=rev Log: Make RtlEqualPrefixSid portable Modified: trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sid.c?rev=25648&r1… ============================================================================== --- trunk/reactos/lib/rtl/sid.c (original) +++ trunk/reactos/lib/rtl/sid.c Sat Jan 27 17:06:01 2007 @@ -303,14 +303,22 @@ RtlEqualPrefixSid(IN PSID Sid1_, IN PSID Sid2_) { - PISID Sid1 = Sid1_; - PISID Sid2 = Sid2_; - - PAGED_CODE_RTL(); - - return(Sid1->SubAuthorityCount == Sid2->SubAuthorityCount && - !RtlCompareMemory(Sid1, Sid2, - (Sid1->SubAuthorityCount - 1) * sizeof(DWORD) + 8)); + PISID Sid1 = Sid1_; + PISID Sid2 = Sid2_; + SIZE_T SidLen; + + PAGED_CODE_RTL(); + + if (Sid1->SubAuthorityCount == Sid2->SubAuthorityCount) + { + SidLen = FIELD_OFFSET(SID, + SubAuthority[Sid1->SubAuthorityCount]); + return RtlCompareMemory(Sid1, + Sid2, + SidLen) == SidLen; + } + + return FALSE; }

1 0

[greatlrd] 25647: fixing comping error adding a new line to cacls.c
by greatlrd＠svn.reactos.org 27 Jan '07

27 Jan '07

Author: greatlrd Date: Sat Jan 27 15:34:15 2007 New Revision: 25647 URL: http://svn.reactos.org/svn/reactos?rev=25647&view=rev Log: fixing comping error adding a new line to cacls.c Modified: branches/ros-branch-0_3_1/reactos/base/applications/cacls/cacls.c Modified: branches/ros-branch-0_3_1/reactos/base/applications/cacls/cacls.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/cacls/cacls.c (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/cacls/cacls.c Sat Jan 27 15:34:15 2007 @@ -596,3 +596,4 @@ return 0; } +

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 January 2007