Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[tkreuzer] 66573: [INCLUDE/CRT] - Move all intrinsic prototypes to intrin.h and remove duplicated declatations from msc/intrin.h and mingw/intrin_x86.h - Fix some intrinsic prototypes for GCC - Fix...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 5 21:09:36 2015 New Revision: 66573 URL: http://svn.reactos.org/svn/reactos?rev=66573&view=rev Log: [INCLUDE/CRT] - Move all intrinsic prototypes to intrin.h and remove duplicated declatations from msc/intrin.h and mingw/intrin_x86.h - Fix some intrinsic prototypes for GCC - Fix some SAL annotations for intrinsics Modified: trunk/reactos/include/crt/intrin.h trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/msc/intrin.h trunk/reactos/include/crt/stdlib.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/crt/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/intrin.h?rev=6… Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=6…

9 years, 8 months

[tkreuzer] 66572: [CRT] Remove definition of __JUMP_BUFFER and include setjmp.h instead, where it is defined.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 5 21:09:12 2015 New Revision: 66572 URL: http://svn.reactos.org/svn/reactos?rev=66572&view=rev Log: [CRT] Remove definition of __JUMP_BUFFER and include setjmp.h instead, where it is defined. Modified: trunk/reactos/lib/sdk/crt/except/i386/unwind.c Modified: trunk/reactos/lib/sdk/crt/except/i386/unwind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/i386/un… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/i386/unwind.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/i386/unwind.c [iso-8859-1] Thu Mar 5 21:09:12 2015 @@ -1,6 +1,7 @@ #define WIN32_NO_STATUS #include <precomp.h> #define NTOS_MODE_USER +#include <setjmp.h> #include <ndk/umtypes.h> #include <ndk/extypes.h> #include <ndk/rtlfuncs.h> @@ -24,23 +25,6 @@ PEXCEPTION_POINTERS xpointers; } MSVCRT_EXCEPTION_FRAME; - -typedef struct __JUMP_BUFFER -{ - unsigned long Ebp; - unsigned long Ebx; - unsigned long Edi; - unsigned long Esi; - unsigned long Esp; - unsigned long Eip; - unsigned long Registration; - unsigned long TryLevel; - /* Start of new struct members */ - unsigned long Cookie; - unsigned long UnwindFunc; - unsigned long UnwindData[6]; -} _JUMP_BUFFER; - void _local_unwind2(MSVCRT_EXCEPTION_FRAME *RegistrationFrame, LONG TryLevel);

9 years, 8 months

[tkreuzer] 66571: [INCLUDE] #undef some constants in arc.h to avoid conflicts with errno.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 5 21:08:58 2015 New Revision: 66571 URL: http://svn.reactos.org/svn/reactos?rev=66571&view=rev Log: [INCLUDE] #undef some constants in arc.h to avoid conflicts with errno.h Modified: trunk/reactos/include/reactos/arc/arc.h Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] Thu Mar 5 21:08:58 2015 @@ -2,6 +2,30 @@ #define _ARC_ typedef ULONG ARC_STATUS; + +/* Avoid conflicts with errno.h */ +#undef E2BIG +#undef EACCES +#undef EAGAIN +#undef EBADF +#undef EBUSY +#undef EFAULT +#undef EINVAL +#undef EIO +#undef EISDIR +#undef EMFILE +#undef EMLINK +#undef ENAMETOOLONG +#undef ENODEV +#undef ENOENT +#undef ENOEXEC +#undef ENOMEM +#undef ENOSPC +#undef ENOTDIR +#undef ENOTTY +#undef ENXIO +#undef EROFS +#undef EMAXIMUM typedef enum _ARC_CODES {

9 years, 8 months

[hbelusca] 66570: Small source tree cleanup: - Remove leftovers from rbuild era. - Remove .hgeol that was introduced in r53995 in an attempt to have Mercury "get[ing] native line endings": <@hbelus...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 5 20:43:25 2015 New Revision: 66570 URL: http://svn.reactos.org/svn/reactos?rev=66570&view=rev Log: Small source tree cleanup: - Remove leftovers from rbuild era. - Remove .hgeol that was introduced in r53995 in an attempt to have Mercury "get[ing] native line endings": <@hbelusca> tkreuzer - hi tkreuzer! do you know whether you still need this .hgeol file at the root of our source tree? <@tkreuzer> hbelusca: no, feel free to delete it - rgenstat/llmosrt.c --> llmsort.c (take it from cdmake); this is however an unused tool in our build toolchain. Added: trunk/reactos/tools/rgenstat/llmsort.c - copied unchanged from r66568, trunk/reactos/tools/cdmake/llmsort.c Removed: trunk/reactos/.hgeol trunk/reactos/depmap.xsl trunk/reactos/tools/rgenstat/llmosrt.c trunk/reactos/vreport.xsl Removed: trunk/reactos/.hgeol URL: http://svn.reactos.org/svn/reactos/trunk/reactos/.hgeol?rev=66569 ============================================================================== --- trunk/reactos/.hgeol [iso-8859-1] (original) +++ trunk/reactos/.hgeol (removed) @@ -1,31 +0,0 @@ -[patterns] -**.txt = native -**.cmake = native -**.asm = native -**.S = native -**.cxx = native -**.cpp = native -**.hpp = native -**.hxx = native -**.c = native -**.h = native -**.py = native -**.rc = native -**.html = native -**.bat = native -**.cmd = native -**.mak = native -**makefile = native -**.manifest = native -**.properties = native -**.dsp = native -**.sln = native -**.vcproj = native -**.gen = native -**.bmp = BIN -**.cur = BIN -**.ico = BIN -**.jpg = BIN -**.png = BIN -tgzsrc = LF -scripts/ba = LF Removed: trunk/reactos/depmap.xsl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/depmap.xsl?rev=66569 ============================================================================== --- trunk/reactos/depmap.xsl [iso-8859-1] (original) +++ trunk/reactos/depmap.xsl (removed) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> -<xsl:template match="/"> -<html> -<head> -<title>ReactOS Dependency Map</title> -</head> -<body> -<h1>ReactOS Dependency Map</h1> -<table border="1"> - <tr bgcolor="#9acd32"> - <th align="left">Module Name</th> - <th align="left">Module Location</th> - <th align="left">Other Module Usage</th> - <th align="left">Module Re-Usage</th> - </tr> - <xsl:for-each select="components/component"> - <tr> - <td><xsl:value-of select="name"/></td> - <td><xsl:value-of select="base"/></td> - <td><xsl:value-of select="lib_count"/></td> - <td><xsl:value-of select="ref_count"/></td> - </tr> - </xsl:for-each> - </table> - </body> - </html> -</xsl:template> - -</xsl:stylesheet> Removed: trunk/reactos/tools/rgenstat/llmosrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/llmosrt.c?r… ============================================================================== --- trunk/reactos/tools/rgenstat/llmosrt.c [iso-8859-1] (original) +++ trunk/reactos/tools/rgenstat/llmosrt.c (removed) @@ -1,105 +0,0 @@ -/* A Linked-List Memory Sort - by Philip J. Erdelsky - pje(a)acm.org - http://www.alumni.caltech.edu/~pje/ -*/ - -/* According to his website, this file was released into the public domain by Phillip J. Erdelsky */ - - -#include <stdio.h> - -void *sort_linked_list(void *p, unsigned index, int (*compare)(void *, void *)) -{ - unsigned base; - unsigned long block_size; - - struct record - { - struct record *next[1]; - /* other members not directly accessed by this function */ - }; - - struct tape - { - struct record *first, *last; - unsigned long count; - } tape[4]; - - /* Distribute the records alternately to tape[0] and tape[1]. */ - - tape[0].count = tape[1].count = 0L; - tape[0].first = NULL; - base = 0; - while (p != NULL) - { - struct record *next = ((struct record *)p)->next[index]; - ((struct record *)p)->next[index] = tape[base].first; - tape[base].first = ((struct record *)p); - tape[base].count++; - p = next; - base ^= 1; - } - - /* If the list is empty or contains only a single record, then */ - /* tape[1].count == 0L and this part is vacuous. */ - - for (base = 0, block_size = 1L; tape[base+1].count != 0L; - base ^= 2, block_size <<= 1) - { - int dest; - struct tape *tape0, *tape1; - tape0 = tape + base; - tape1 = tape + base + 1; - dest = base ^ 2; - tape[dest].count = tape[dest+1].count = 0; - for (; tape0->count != 0; dest ^= 1) - { - unsigned long n0, n1; - struct tape *output_tape = tape + dest; - n0 = n1 = block_size; - while (1) - { - struct record *chosen_record; - struct tape *chosen_tape; - if (n0 == 0 || tape0->count == 0) - { - if (n1 == 0 || tape1->count == 0) - break; - chosen_tape = tape1; - n1--; - } - else if (n1 == 0 || tape1->count == 0) - { - chosen_tape = tape0; - n0--; - } - else if ((*compare)(tape0->first, tape1->first) > 0) - { - chosen_tape = tape1; - n1--; - } - else - { - chosen_tape = tape0; - n0--; - } - chosen_tape->count--; - chosen_record = chosen_tape->first; - chosen_tape->first = chosen_record->next[index]; - if (output_tape->count == 0) - output_tape->first = chosen_record; - else - output_tape->last->next[index] = chosen_record; - output_tape->last = chosen_record; - output_tape->count++; - } - } - } - - if (tape[base].count > 1L) - tape[base].last->next[index] = NULL; - return tape[base].first; -} - -/* EOF */ Removed: trunk/reactos/vreport.xsl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/vreport.xsl?rev=66569 ============================================================================== --- trunk/reactos/vreport.xsl [iso-8859-1] (original) +++ trunk/reactos/vreport.xsl (removed) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> -<xsl:template match="/"> -<html> -<head> -<title>ReactOS Component Version Report</title> -</head> -<body> -<h1>ReactOS Component Version Report</h1> -<table border="1"> - <tr bgcolor="#9acd32"> - <th align="left">Module Name</th> - <th align="left">Module Location</th> - <th align="left">Version</th> - <th align="left">Date</th> - <th align="left">Owner</th> - </tr> - <xsl:for-each select="components/component"> - <tr> - <td><xsl:value-of select="name"/></td> - <td><xsl:value-of select="base"/></td> - <td><xsl:value-of select="version"/></td> - <td><xsl:value-of select="date"/></td> - <td><xsl:value-of select="owner"/></td> - </tr> - </xsl:for-each> - </table> - </body> - </html> -</xsl:template> - -</xsl:stylesheet>

9 years, 8 months

[spetreolle] 66569: [EXT2FS] No drive in media is not an error condition. The hardware reporting no 'ghost' floppy drives like vmware don't show this trace.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Mar 5 16:13:44 2015 New Revision: 66569 URL: http://svn.reactos.org/svn/reactos?rev=66569&view=rev Log: [EXT2FS] No drive in media is not an error condition. The hardware reporting no 'ghost' floppy drives like vmware don't show this trace. Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] Thu Mar 5 16:13:44 2015 @@ -788,7 +788,7 @@ if (Status == STATUS_NO_MEDIA_IN_DEVICE) { - DbgPrint("Ext2PerformVerifyDiskRead NO MEDIA in DEVICE!!! BS!!\n"); + DebugTrace(DEBUG_TRACE_MOUNT, "NO MEDIA in DEVICE!", 0); return FALSE; }

9 years, 8 months

[hbelusca] 66568: [KEYBOARDLAYOUTS]: Improve on r61053 and r64791 by moving the keyboard layout LD script to its correct directory.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 5 15:04:25 2015 New Revision: 66568 URL: http://svn.reactos.org/svn/reactos?rev=66568&view=rev Log: [KEYBOARDLAYOUTS]: Improve on r61053 and r64791 by moving the keyboard layout LD script to its correct directory. Added: trunk/reactos/dll/keyboard/kbdlayout.lds - copied unchanged from r66567, trunk/reactos/kbdlayout.lds Removed: trunk/reactos/kbdlayout.lds Modified: trunk/reactos/dll/keyboard/CMakeLists.txt Modified: trunk/reactos/dll/keyboard/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] Thu Mar 5 15:04:25 2015 @@ -99,7 +99,7 @@ add_target_link_flags(${_keyboard_layout} "/ignore:4254 /SECTION:.data,ER /MERGE:.text=.data /MERGE:.rdata=.data /MERGE:.bss=.data /MERGE:.edata=.data") else() # Use a custom linker script - add_target_link_flags(${_keyboard_layout} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds") + add_target_link_flags(${_keyboard_layout} "-Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/kbdlayout.lds") endif() if (STACK_PROTECTOR) Removed: trunk/reactos/kbdlayout.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/kbdlayout.lds?rev=66567 ============================================================================== --- trunk/reactos/kbdlayout.lds [iso-8859-1] (original) +++ trunk/reactos/kbdlayout.lds (removed) @@ -1,35 +0,0 @@ -SECTIONS -{ - .data __image_base__ + __section_alignment__ : - { - *(.data) - *(SORT(.data*)) - *(.rdata) - *(SORT(.rdata*)) - *(.text) - *(SORT(.text*)) - *(.bss) - *(COMMON) - } - - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - } - - .edata BLOCK(__section_alignment__) : - { - *(.edata) - } - - /DISCARD/ : - { - *(*) - } -}

9 years, 8 months

[hbelusca] 66567: [WELCOME]: Port all the extra features that we usually need for our custom releases for FOSDEM, CLT, etc... See r62439, r66116 and r66121 (in particular keep the <msg> feature, it...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 4 22:37:51 2015 New Revision: 66567 URL: http://svn.reactos.org/svn/reactos?rev=66567&view=rev Log: [WELCOME]: Port all the extra features that we usually need for our custom releases for FOSDEM, CLT, etc... See r62439, r66116 and r66121 (in particular keep the <msg> feature, it can be useful for some cases. It's not because you remove it that you'll gain 100 MB in the CD-ROM!). Modified: trunk/reactos/base/setup/welcome/CMakeLists.txt trunk/reactos/base/setup/welcome/welcome.c Modified: trunk/reactos/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/CMakeLi… ============================================================================== --- trunk/reactos/base/setup/welcome/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/CMakeLists.txt [iso-8859-1] Wed Mar 4 22:37:51 2015 @@ -1,5 +1,5 @@ add_executable(welcome welcome.c welcome.rc) set_module_type(welcome win32gui UNICODE) -add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll) +add_importlibs(welcome gdi32 user32 shell32 msvcrt kernel32 ntdll) add_cd_file(TARGET welcome DESTINATION reactos NO_CAB FOR bootcd) Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Wed Mar 4 22:37:51 2015 @@ -27,6 +27,8 @@ * This utility can be customized by modifying the resources. * Please do NOT change the source code in order to customize this * utility but change the resources! + * + * TODO: Use instead a XML file! */ #include <stdarg.h> @@ -34,6 +36,7 @@ #include <winbase.h> #include <wingdi.h> #include <winuser.h> +#include <shellapi.h> #include <reactos/version.h> #include <tchar.h> #include <winnls.h> @@ -47,7 +50,13 @@ #define TITLE_HEIGHT 93 #define MAX_NUMBER_TOPICS 10 - +#define TOPIC_DESC_LENGTH 1024 + +/* + * Disable this define if you want to revert back to the old behaviour, i.e. + * opening files with CreateProcess. This defines uses ShellExecute instead. + */ +#define USE_SHELL_EXECUTE /* GLOBALS ******************************************************************/ @@ -97,6 +106,7 @@ /* FUNCTIONS ****************************************************************/ +#ifndef USE_SHELL_EXECUTE static VOID ShowLastWin32Error(HWND hWnd) { @@ -118,6 +128,7 @@ LocalFree(lpMessageBuffer); } } +#endif int WINAPI _tWinMain(HINSTANCE hInst, @@ -269,15 +280,21 @@ static BOOL RunApplication(int nTopic) { +#ifndef USE_SHELL_EXECUTE PROCESS_INFORMATION ProcessInfo; STARTUPINFO StartupInfo; - TCHAR AppName[256]; TCHAR CurrentDir[256]; +#else + TCHAR Parameters[2]; +#endif + TCHAR AppName[512]; int nLength; InvalidateRect(hWndMain, NULL, TRUE); +#ifndef USE_SHELL_EXECUTE GetCurrentDirectory(ARRAYSIZE(CurrentDir), CurrentDir); +#endif nLength = LoadString(hInstance, IDS_TOPICACTION0 + nTopic, AppName, ARRAYSIZE(AppName)); if (nLength == 0) @@ -286,12 +303,29 @@ if (!_tcsicmp(AppName, TEXT("<exit>"))) return FALSE; + if (!_tcsnicmp(AppName, TEXT("<msg>"), 5)) + { + MessageBox(hWndMain, AppName + 5, TEXT("ReactOS"), MB_OK | MB_TASKMODAL); + return TRUE; + } + if (_tcsicmp(AppName, TEXT("explorer.exe")) == 0) { +#ifndef USE_SHELL_EXECUTE _tcscat(AppName, TEXT(" ")); _tcscat(AppName, CurrentDir); - } - +#else + _tcscpy(Parameters, TEXT("\\")); +#endif + } +#ifdef USE_SHELL_EXECUTE + else + { + *Parameters = 0; + } +#endif + +#ifndef USE_SHELL_EXECUTE ZeroMemory(&StartupInfo, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpTitle = TEXT("Test"); @@ -307,6 +341,9 @@ CloseHandle(ProcessInfo.hProcess); CloseHandle(ProcessInfo.hThread); +#else + ShellExecute(NULL, NULL, AppName, Parameters, NULL, SW_SHOWDEFAULT); +#endif return TRUE; } @@ -557,7 +594,7 @@ HFONT hOldFont; RECT rcTitle, rcDescription; TCHAR szTopicTitle[80]; - TCHAR szTopicDesc[256]; + TCHAR szTopicDesc[TOPIC_DESC_LENGTH]; int nLength; BITMAP bmpInfo; TCHAR version[50];

9 years, 8 months

[hbelusca] 66566: Errm... fix build.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 4 22:13:31 2015 New Revision: 66566 URL: http://svn.reactos.org/svn/reactos?rev=66566&view=rev Log: Errm... fix build. Modified: trunk/reactos/base/setup/welcome/welcome.c Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Wed Mar 4 22:13:31 2015 @@ -653,7 +653,7 @@ SetBkMode(hdc, TRANSPARENT); /* Draw version information */ - _tsprintf(version, TEXT("ReactOS %d.%d.%d"), + _stprintf(version, TEXT("ReactOS %d.%d.%d"), KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR, KERNEL_VERSION_PATCH_LEVEL); @@ -712,7 +712,7 @@ UNREFERENCED_PARAMETER(hWnd); UNREFERENCED_PARAMETER(wParam); - if (lpDis->hWndItem == hWndCloseButton) + if (lpDis->hwndItem == hWndCloseButton) { DrawFrameControl(lpDis->hDC, &lpDis->rcItem, @@ -743,7 +743,7 @@ InflateRect(&lpDis->rcItem, -10, -4); OffsetRect(&lpDis->rcItem, 0, 1); - GetWindowText(lpDis->hWndItem, szText, ARRAYSIZE(szText)); + GetWindowText(lpDis->hwndItem, szText, ARRAYSIZE(szText)); SetTextColor(lpDis->hDC, 0x00000000); iBkMode = SetBkMode(lpDis->hDC, TRANSPARENT); DrawText(lpDis->hDC, szText, -1, &lpDis->rcItem, DT_TOP | DT_LEFT | DT_WORDBREAK);

9 years, 8 months

[hbelusca] 66565: [WELCOME]: Code style changes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 4 22:10:49 2015 New Revision: 66565 URL: http://svn.reactos.org/svn/reactos?rev=66565&view=rev Log: [WELCOME]: Code style changes only. Modified: trunk/reactos/base/setup/welcome/welcome.c Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Wed Mar 4 22:10:49 2015 @@ -46,18 +46,20 @@ #define TITLE_WIDTH 480 #define TITLE_HEIGHT 93 +#define MAX_NUMBER_TOPICS 10 + /* GLOBALS ******************************************************************/ -TCHAR szFrameClass [] = TEXT("WelcomeWindowClass"); -TCHAR szAppTitle [80]; +TCHAR szFrameClass[] = TEXT("WelcomeWindowClass"); +TCHAR szAppTitle[80]; HINSTANCE hInstance; -HWND hwndMain = 0; -HWND hwndDefaultTopic = 0; - -HDC hdcMem = 0; +HWND hWndMain = NULL; +HWND hWndDefaultTopic = NULL; + +HDC hdcMem = NULL; int nTopic = -1; int nDefaultTopic = -1; @@ -66,17 +68,17 @@ ULONG ulInnerHeight = (TITLE_WIDTH * 3) / 4; ULONG ulTitleHeight = TITLE_HEIGHT + 3; -HBITMAP hTitleBitmap = 0; -HBITMAP hDefaultTopicBitmap = 0; -HBITMAP hTopicBitmap[10]; -HWND hwndTopicButton[10]; -HWND hwndCloseButton; -HWND hwndCheckButton; - -HFONT hfontTopicButton; -HFONT hfontTopicTitle; -HFONT hfontTopicDescription; -HFONT hfontCheckButton; +HBITMAP hTitleBitmap = NULL; +HBITMAP hDefaultTopicBitmap = NULL; +HBITMAP hTopicBitmap[MAX_NUMBER_TOPICS]; +HWND hWndTopicButton[MAX_NUMBER_TOPICS]; +HWND hWndCloseButton = NULL; +HWND hWndCheckButton = NULL; + +HFONT hFontTopicButton; +HFONT hFontTopicTitle; +HFONT hFontTopicDescription; +HFONT hFontCheckButton; HBRUSH hbrLightBlue; HBRUSH hbrDarkBlue; @@ -90,13 +92,13 @@ INT_PTR CALLBACK -MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); /* FUNCTIONS ****************************************************************/ static VOID -ShowLastWin32Error(HWND hwnd) +ShowLastWin32Error(HWND hWnd) { LPTSTR lpMessageBuffer = NULL; DWORD dwError = GetLastError(); @@ -108,7 +110,7 @@ (LPTSTR)&lpMessageBuffer, 0, NULL)) { - MessageBox(hwnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR); + MessageBox(hWnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR); } if (lpMessageBuffer) @@ -119,767 +121,767 @@ int WINAPI _tWinMain(HINSTANCE hInst, - HINSTANCE hPrevInstance, - LPTSTR lpszCmdLine, - int nCmdShow) -{ - WNDCLASSEX wndclass; - MSG msg; - int xPos; - int yPos; - int xWidth; - int yHeight; - RECT rcWindow; - HICON hMainIcon; - HMENU hSystemMenu; - DWORD dwStyle = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | - WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; - BITMAP BitmapInfo; - - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpszCmdLine); - - switch (GetUserDefaultUILanguage()) - { - case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): - SetProcessDefaultLayout(LAYOUT_RTL); - break; - - default: - break; - } - - hInstance = hInst; - - /* Load icons */ - hMainIcon = LoadIcon (hInstance, MAKEINTRESOURCE(IDI_MAIN)); - - /* Register the window class */ - wndclass.style = CS_HREDRAW | CS_VREDRAW; - wndclass.lpfnWndProc = (WNDPROC)MainWndProc; - wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = 0; - wndclass.hInstance = hInstance; - wndclass.hIcon = hMainIcon; - wndclass.hCursor = LoadCursor (NULL, IDC_ARROW); - wndclass.hbrBackground = 0; - wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = szFrameClass; - - wndclass.cbSize = sizeof(WNDCLASSEX); - wndclass.hIconSm = 0; - - RegisterClassEx(&wndclass); - - hTitleBitmap = LoadBitmap (hInstance, MAKEINTRESOURCE(IDB_TITLEBITMAP)); - if (hTitleBitmap != NULL) - { - GetObject(hTitleBitmap, sizeof(BITMAP), &BitmapInfo); - ulInnerWidth = BitmapInfo.bmWidth; - ulInnerHeight = (ulInnerWidth * 3) / 4; - ulTitleHeight = BitmapInfo.bmHeight + 3; - DeleteObject(hTitleBitmap); - } - ulInnerHeight -= GetSystemMetrics(SM_CYCAPTION); - - rcWindow.top = 0; - rcWindow.bottom = ulInnerHeight - 1; - rcWindow.left = 0; - rcWindow.right = ulInnerWidth - 1; - - AdjustWindowRect(&rcWindow, - dwStyle, - FALSE); - xWidth = rcWindow.right - rcWindow.left; - yHeight = rcWindow.bottom - rcWindow.top; - - xPos = (GetSystemMetrics(SM_CXSCREEN) - xWidth) / 2; - yPos = (GetSystemMetrics(SM_CYSCREEN) - yHeight) / 2; - - rcTitlePanel.top = 0; - rcTitlePanel.bottom = ulTitleHeight; - rcTitlePanel.left = 0; - rcTitlePanel.right = ulInnerWidth - 1; - - rcLeftPanel.top = rcTitlePanel.bottom; - rcLeftPanel.bottom = ulInnerHeight - 1; - rcLeftPanel.left = 0; - rcLeftPanel.right = ulInnerWidth / 3; - - rcRightPanel.top = rcLeftPanel.top; - rcRightPanel.bottom = rcLeftPanel.bottom; - rcRightPanel.left = rcLeftPanel.right; - rcRightPanel.right = ulInnerWidth - 1; - - if (!LoadString(hInstance, (UINT_PTR)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) - _tcscpy(szAppTitle, TEXT("ReactOS Welcome")); - - /* Create main window */ - hwndMain = CreateWindow(szFrameClass, - szAppTitle, - dwStyle, - xPos, - yPos, - xWidth, - yHeight, - 0, - 0, - hInstance, - NULL); - - hSystemMenu = GetSystemMenu(hwndMain, FALSE); - if(hSystemMenu) - { - RemoveMenu(hSystemMenu, SC_SIZE, MF_BYCOMMAND); - RemoveMenu(hSystemMenu, SC_MAXIMIZE, MF_BYCOMMAND); - } - - ShowWindow(hwndMain, nCmdShow); - UpdateWindow(hwndMain); - - while (GetMessage(&msg, NULL, 0, 0) != FALSE) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - return(msg.wParam); + HINSTANCE hPrevInstance, + LPTSTR lpszCmdLine, + int nCmdShow) +{ + WNDCLASSEX wndclass; + MSG msg; + int xPos; + int yPos; + int xWidth; + int yHeight; + RECT rcWindow; + HICON hMainIcon; + HMENU hSystemMenu; + DWORD dwStyle = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + BITMAP BitmapInfo; + + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpszCmdLine); + + switch (GetUserDefaultUILanguage()) + { + case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): + SetProcessDefaultLayout(LAYOUT_RTL); + break; + + default: + break; + } + + hInstance = hInst; + + /* Load icons */ + hMainIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); + + /* Register the window class */ + wndclass.cbSize = sizeof(WNDCLASSEX); + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = (WNDPROC)MainWndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = hInstance; + wndclass.hIcon = hMainIcon; + wndclass.hIconSm = NULL; + wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); + wndclass.hbrBackground = NULL; + wndclass.lpszMenuName = NULL; + wndclass.lpszClassName = szFrameClass; + + RegisterClassEx(&wndclass); + + hTitleBitmap = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TITLEBITMAP)); + if (hTitleBitmap != NULL) + { + GetObject(hTitleBitmap, sizeof(BITMAP), &BitmapInfo); + ulInnerWidth = BitmapInfo.bmWidth; + ulInnerHeight = (ulInnerWidth * 3) / 4; + ulTitleHeight = BitmapInfo.bmHeight + 3; + DeleteObject(hTitleBitmap); + } + ulInnerHeight -= GetSystemMetrics(SM_CYCAPTION); + + rcWindow.top = 0; + rcWindow.bottom = ulInnerHeight - 1; + rcWindow.left = 0; + rcWindow.right = ulInnerWidth - 1; + + AdjustWindowRect(&rcWindow, dwStyle, FALSE); + xWidth = rcWindow.right - rcWindow.left; + yHeight = rcWindow.bottom - rcWindow.top; + + xPos = (GetSystemMetrics(SM_CXSCREEN) - xWidth) / 2; + yPos = (GetSystemMetrics(SM_CYSCREEN) - yHeight) / 2; + + rcTitlePanel.top = 0; + rcTitlePanel.bottom = ulTitleHeight; + rcTitlePanel.left = 0; + rcTitlePanel.right = ulInnerWidth - 1; + + rcLeftPanel.top = rcTitlePanel.bottom; + rcLeftPanel.bottom = ulInnerHeight - 1; + rcLeftPanel.left = 0; + rcLeftPanel.right = ulInnerWidth / 3; + + rcRightPanel.top = rcLeftPanel.top; + rcRightPanel.bottom = rcLeftPanel.bottom; + rcRightPanel.left = rcLeftPanel.right; + rcRightPanel.right = ulInnerWidth - 1; + + if (!LoadString(hInstance, (UINT_PTR)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, ARRAYSIZE(szAppTitle))) + _tcscpy(szAppTitle, TEXT("ReactOS Welcome")); + + /* Create main window */ + hWndMain = CreateWindow(szFrameClass, + szAppTitle, + dwStyle, + xPos, + yPos, + xWidth, + yHeight, + 0, + 0, + hInstance, + NULL); + + hSystemMenu = GetSystemMenu(hWndMain, FALSE); + if(hSystemMenu) + { + RemoveMenu(hSystemMenu, SC_SIZE, MF_BYCOMMAND); + RemoveMenu(hSystemMenu, SC_MAXIMIZE, MF_BYCOMMAND); + } + + ShowWindow(hWndMain, nCmdShow); + UpdateWindow(hWndMain); + + while (GetMessage(&msg, NULL, 0, 0) != FALSE) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return msg.wParam; } INT_PTR CALLBACK -ButtonSubclassWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - LONG i; - - if (uMsg == WM_MOUSEMOVE) - { - i = GetWindowLongPtr(hWnd, GWL_ID); - if (nTopic != i) - { - nTopic = i; - SetFocus(hWnd); - InvalidateRect(hwndMain, &rcRightPanel, TRUE); - } - } - - return(CallWindowProc(fnOldBtn, hWnd, uMsg, wParam, lParam)); +ButtonSubclassWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + LONG i; + + if (uMsg == WM_MOUSEMOVE) + { + i = GetWindowLongPtr(hWnd, GWL_ID); + if (nTopic != i) + { + nTopic = i; + SetFocus(hWnd); + InvalidateRect(hWndMain, &rcRightPanel, TRUE); + } + } + + return CallWindowProc(fnOldBtn, hWnd, uMsg, wParam, lParam); } static BOOL RunApplication(int nTopic) { - PROCESS_INFORMATION ProcessInfo; - STARTUPINFO StartupInfo; - TCHAR AppName[256]; - TCHAR CurrentDir[256]; - int nLength; - - InvalidateRect(hwndMain, NULL, TRUE); - - GetCurrentDirectory(256, CurrentDir); - - nLength = LoadString(hInstance, IDS_TOPICACTION0 + nTopic, AppName, 256); - if (nLength == 0) + PROCESS_INFORMATION ProcessInfo; + STARTUPINFO StartupInfo; + TCHAR AppName[256]; + TCHAR CurrentDir[256]; + int nLength; + + InvalidateRect(hWndMain, NULL, TRUE); + + GetCurrentDirectory(ARRAYSIZE(CurrentDir), CurrentDir); + + nLength = LoadString(hInstance, IDS_TOPICACTION0 + nTopic, AppName, ARRAYSIZE(AppName)); + if (nLength == 0) + return TRUE; + + if (!_tcsicmp(AppName, TEXT("<exit>"))) + return FALSE; + + if (_tcsicmp(AppName, TEXT("explorer.exe")) == 0) + { + _tcscat(AppName, TEXT(" ")); + _tcscat(AppName, CurrentDir); + } + + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpTitle = TEXT("Test"); + StartupInfo.dwFlags = STARTF_USESHOWWINDOW; + StartupInfo.wShowWindow = SW_SHOWNORMAL; + + if (!CreateProcess(NULL, AppName, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, + NULL, CurrentDir, &StartupInfo, &ProcessInfo)) + { + ShowLastWin32Error(hWndMain); + return TRUE; + } + + CloseHandle(ProcessInfo.hProcess); + CloseHandle(ProcessInfo.hThread); + return TRUE; - - if (!_tcsicmp(AppName, TEXT("<exit>"))) - return FALSE; - - if (_tcsicmp(AppName, TEXT("explorer.exe")) == 0) - { - _tcscat(AppName, TEXT(" ")); - _tcscat(AppName, CurrentDir); - } - - ZeroMemory(&StartupInfo, sizeof(StartupInfo)); - StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpTitle = TEXT("Test"); - StartupInfo.dwFlags = STARTF_USESHOWWINDOW; - StartupInfo.wShowWindow = SW_SHOWNORMAL; - - if (!CreateProcess(NULL, AppName, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, - NULL, CurrentDir, &StartupInfo, &ProcessInfo)) - { - ShowLastWin32Error(hwndMain); - return TRUE; - } - - CloseHandle(ProcessInfo.hProcess); - CloseHandle(ProcessInfo.hThread); - - return TRUE; } static VOID SubclassButton(HWND hWnd) { - fnOldBtn = (WNDPROC)SetWindowLongPtr(hWnd, GWL_WNDPROC, (DWORD_PTR)ButtonSubclassWndProc); + fnOldBtn = (WNDPROC)SetWindowLongPtr(hWnd, GWL_WNDPROC, (DWORD_PTR)ButtonSubclassWndProc); } static DWORD GetButtonHeight(HDC hDC, - HFONT hFont, - LPCTSTR szText, - DWORD dwWidth) -{ - HFONT hOldFont; - RECT rect; - - rect.left = 0; - rect.right = dwWidth - 20; - rect.top = 0; - rect.bottom = 25; - - hOldFont = (HFONT) SelectObject(hDC, hFont); - DrawText(hDC, szText, -1, &rect, DT_TOP | DT_CALCRECT | DT_WORDBREAK); - SelectObject(hDC, hOldFont); - - return(rect.bottom-rect.top + 14); + HFONT hFont, + LPCTSTR szText, + DWORD dwWidth) +{ + HFONT hOldFont; + RECT rect; + + rect.left = 0; + rect.right = dwWidth - 20; + rect.top = 0; + rect.bottom = 25; + + hOldFont = (HFONT)SelectObject(hDC, hFont); + DrawText(hDC, szText, -1, &rect, DT_TOP | DT_CALCRECT | DT_WORDBREAK); + SelectObject(hDC, hOldFont); + + return (rect.bottom-rect.top + 14); } static LRESULT OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam) { - TCHAR szText[80]; - int i,nLength; - HDC ScreenDC; - DWORD dwTop; - DWORD dwHeight = 0; - - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(lParam); - - hbrLightBlue = CreateSolidBrush(LIGHT_BLUE); - hbrDarkBlue = CreateSolidBrush(DARK_BLUE); - hbrRightPanel = CreateSolidBrush(0x00FFFFFF); - - /* Topic title font */ - hfontTopicTitle = CreateFont(-18,0,0,0,FW_NORMAL, - FALSE,FALSE,FALSE,ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - FF_DONTCARE, - TEXT("Arial")); - - /* Topic description font */ - hfontTopicDescription = CreateFont(-11,0,0,0,FW_THIN, - FALSE,FALSE,FALSE,ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - FF_DONTCARE, - TEXT("Arial")); - - /* Topic button font */ - hfontTopicButton = CreateFont(-11,0,0,0,FW_BOLD, - FALSE,FALSE,FALSE,ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - FF_DONTCARE, - TEXT("Arial")); - - /* Load title bitmap */ - if (hTitleBitmap != 0) - hTitleBitmap = LoadBitmap (hInstance, MAKEINTRESOURCE(IDB_TITLEBITMAP)); - - /* Load topic bitmaps */ - hDefaultTopicBitmap = LoadBitmap (hInstance, MAKEINTRESOURCE(IDB_DEFAULTTOPICBITMAP)); - for (i=0;i < 10; i++) - { - hTopicBitmap[i] = LoadBitmap (hInstance, MAKEINTRESOURCE(IDB_TOPICBITMAP0+i)); - } - - ScreenDC = GetWindowDC(hWnd); - hdcMem = CreateCompatibleDC (ScreenDC); - ReleaseDC(hWnd, ScreenDC); - - /* load and create buttons */ - dwTop = rcLeftPanel.top; - for (i = 0; i < 10; i++) - { - nLength = LoadString(hInstance, IDS_TOPICBUTTON0 + i, szText, 80); - if (nLength > 0) - { - dwHeight = GetButtonHeight(hdcMem, - hfontTopicButton, - szText, - rcLeftPanel.right - rcLeftPanel.left); - - hwndTopicButton[i] = CreateWindow(TEXT("BUTTON"), - szText, - WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | BS_MULTILINE | BS_OWNERDRAW, - rcLeftPanel.left, - dwTop, - rcLeftPanel.right - rcLeftPanel.left, - dwHeight, - hWnd, - (HMENU)IntToPtr(i), - hInstance, - NULL); - hwndDefaultTopic = hwndTopicButton[i]; - nDefaultTopic = i; - SubclassButton(hwndTopicButton[i]); - SendMessage(hwndTopicButton[i], WM_SETFONT, (WPARAM)hfontTopicButton, MAKELPARAM(TRUE,0)); - } - else - { - hwndTopicButton[i] = 0; - } - - dwTop += dwHeight; - } - - /* Create exit button */ - nLength = LoadString(hInstance, IDS_CLOSETEXT, szText, 80); - if (nLength > 0) - { - hwndCloseButton = CreateWindow(TEXT("BUTTON"), - szText, - WS_VISIBLE | WS_CHILD | BS_FLAT, - rcRightPanel.right - 10 - 57, - rcRightPanel.bottom - 10 - 21, - 57, - 21, - hWnd, - (HMENU)IDC_CLOSEBUTTON, - hInstance, - NULL); - hwndDefaultTopic = 0; - nDefaultTopic = -1; - SendMessage(hwndCloseButton, WM_SETFONT, (WPARAM)hfontTopicButton, MAKELPARAM(TRUE,0)); - } - else - { - hwndCloseButton = 0; - } - - /* Create checkbox */ - nLength = LoadString(hInstance, IDS_CHECKTEXT,szText,80); - if (nLength > 0) - { - hfontCheckButton = CreateFont(-10,0,0,0,FW_THIN,FALSE,FALSE,FALSE,ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - FF_DONTCARE, - TEXT("Tahoma")); - - hwndCheckButton = CreateWindow(TEXT("BUTTON"), - szText, - WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX, - rcLeftPanel.left + 8, - rcLeftPanel.bottom - 8 - 13, - rcLeftPanel.right - rcLeftPanel.left - 16, - 13, - hWnd, - (HMENU)IDC_CHECKBUTTON, - hInstance, - NULL); - SendMessage(hwndCheckButton, WM_SETFONT, (WPARAM)hfontCheckButton, MAKELPARAM(TRUE,0)); - } - else - { - hwndCheckButton = 0; - hfontCheckButton = 0; - } - - return 0; + TCHAR szText[80]; + int i,nLength; + HDC ScreenDC; + DWORD dwTop; + DWORD dwHeight = 0; + + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + + hbrLightBlue = CreateSolidBrush(LIGHT_BLUE); + hbrDarkBlue = CreateSolidBrush(DARK_BLUE); + hbrRightPanel = CreateSolidBrush(0x00FFFFFF); + + /* Topic title font */ + hFontTopicTitle = CreateFont(-18, 0, 0, 0, FW_NORMAL, + FALSE, FALSE, FALSE, + ANSI_CHARSET, + OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + FF_DONTCARE, + TEXT("Arial")); + + /* Topic description font */ + hFontTopicDescription = CreateFont(-11, 0, 0, 0, FW_THIN, + FALSE, FALSE, FALSE, + ANSI_CHARSET, + OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + FF_DONTCARE, + TEXT("Arial")); + + /* Topic button font */ + hFontTopicButton = CreateFont(-11, 0, 0, 0, FW_BOLD, + FALSE, FALSE, FALSE, + ANSI_CHARSET, + OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + FF_DONTCARE, + TEXT("Arial")); + + /* Load title bitmap */ + if (hTitleBitmap != NULL) + hTitleBitmap = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TITLEBITMAP)); + + /* Load topic bitmaps */ + hDefaultTopicBitmap = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_DEFAULTTOPICBITMAP)); + for (i = 0; i < ARRAYSIZE(hTopicBitmap); i++) + { + hTopicBitmap[i] = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TOPICBITMAP0 + i)); + } + + ScreenDC = GetWindowDC(hWnd); + hdcMem = CreateCompatibleDC(ScreenDC); + ReleaseDC(hWnd, ScreenDC); + + /* load and create buttons */ + dwTop = rcLeftPanel.top; + for (i = 0; i < ARRAYSIZE(hWndTopicButton); i++) + { + nLength = LoadString(hInstance, IDS_TOPICBUTTON0 + i, szText, ARRAYSIZE(szText)); + if (nLength > 0) + { + dwHeight = GetButtonHeight(hdcMem, + hFontTopicButton, + szText, + rcLeftPanel.right - rcLeftPanel.left); + + hWndTopicButton[i] = CreateWindow(TEXT("BUTTON"), + szText, + WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | BS_MULTILINE | BS_OWNERDRAW, + rcLeftPanel.left, + dwTop, + rcLeftPanel.right - rcLeftPanel.left, + dwHeight, + hWnd, + (HMENU)IntToPtr(i), + hInstance, + NULL); + hWndDefaultTopic = hWndTopicButton[i]; + nDefaultTopic = i; + SubclassButton(hWndTopicButton[i]); + SendMessage(hWndTopicButton[i], WM_SETFONT, (WPARAM)hFontTopicButton, MAKELPARAM(TRUE, 0)); + } + else + { + hWndTopicButton[i] = NULL; + } + + dwTop += dwHeight; + } + + /* Create exit button */ + nLength = LoadString(hInstance, IDS_CLOSETEXT, szText, ARRAYSIZE(szText)); + if (nLength > 0) + { + hWndCloseButton = CreateWindow(TEXT("BUTTON"), + szText, + WS_VISIBLE | WS_CHILD | BS_FLAT, + rcRightPanel.right - 10 - 57, + rcRightPanel.bottom - 10 - 21, + 57, + 21, + hWnd, + (HMENU)IDC_CLOSEBUTTON, + hInstance, + NULL); + hWndDefaultTopic = NULL; + nDefaultTopic = -1; + SendMessage(hWndCloseButton, WM_SETFONT, (WPARAM)hFontTopicButton, MAKELPARAM(TRUE, 0)); + } + else + { + hWndCloseButton = NULL; + } + + /* Create checkbox */ + nLength = LoadString(hInstance, IDS_CHECKTEXT, szText, ARRAYSIZE(szText)); + if (nLength > 0) + { + hFontCheckButton = CreateFont(-10, 0, 0, 0, FW_THIN, + FALSE, FALSE, FALSE, + ANSI_CHARSET, + OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + FF_DONTCARE, + TEXT("Tahoma")); + + hWndCheckButton = CreateWindow(TEXT("BUTTON"), + szText, + WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX, + rcLeftPanel.left + 8, + rcLeftPanel.bottom - 8 - 13, + rcLeftPanel.right - rcLeftPanel.left - 16, + 13, + hWnd, + (HMENU)IDC_CHECKBUTTON, + hInstance, + NULL); + SendMessage(hWndCheckButton, WM_SETFONT, (WPARAM)hFontCheckButton, MAKELPARAM(TRUE, 0)); + } + else + { + hWndCheckButton = NULL; + hFontCheckButton = NULL; + } + + return 0; } static LRESULT OnCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - - if (LOWORD(wParam) == IDC_CLOSEBUTTON) - { - DestroyWindow(hWnd); - } - else if ((LOWORD(wParam) < 10)) - { - if (RunApplication(LOWORD(wParam)) == FALSE) - { - DestroyWindow(hWnd); - } - } - return 0; + UNREFERENCED_PARAMETER(lParam); + + if (LOWORD(wParam) == IDC_CLOSEBUTTON) + { + DestroyWindow(hWnd); + } + else if ((LOWORD(wParam) < MAX_NUMBER_TOPICS)) + { + if (RunApplication(LOWORD(wParam)) == FALSE) + DestroyWindow(hWnd); + } + return 0; } static VOID PaintBanner(HDC hdc, LPRECT rcPanel) { - HBITMAP hOldBitmap; - HBRUSH hOldBrush; - - /* Title bitmap */ - hOldBitmap = (HBITMAP) SelectObject(hdcMem, hTitleBitmap); - BitBlt(hdc, - rcPanel->left, - rcPanel->top, - rcPanel->right - rcPanel->left, - rcPanel->bottom - 3, - hdcMem, 0, 0, SRCCOPY); - SelectObject(hdcMem, hOldBitmap); - - /* Dark blue line */ - hOldBrush = (HBRUSH) SelectObject(hdc, hbrDarkBlue); - PatBlt(hdc, - rcPanel->left, - rcPanel->bottom - 3, - rcPanel->right - rcPanel->left, - 3, - PATCOPY); - - SelectObject(hdc, hOldBrush); + HBITMAP hOldBitmap; + HBRUSH hOldBrush; + + /* Title bitmap */ + hOldBitmap = (HBITMAP)SelectObject(hdcMem, hTitleBitmap); + BitBlt(hdc, + rcPanel->left, + rcPanel->top, + rcPanel->right - rcPanel->left, + rcPanel->bottom - 3, + hdcMem, 0, 0, SRCCOPY); + SelectObject(hdcMem, hOldBitmap); + + /* Dark blue line */ + hOldBrush = (HBRUSH)SelectObject(hdc, hbrDarkBlue); + PatBlt(hdc, + rcPanel->left, + rcPanel->bottom - 3, + rcPanel->right - rcPanel->left, + 3, + PATCOPY); + + SelectObject(hdc, hOldBrush); } static LRESULT OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam) { - HPEN hPen; - HPEN hOldPen; - HDC hdc; - PAINTSTRUCT ps; - HBITMAP hOldBitmap = 0; - HBRUSH hOldBrush; - HFONT hOldFont; - RECT rcTitle, rcDescription; - TCHAR szTopicTitle[80]; - TCHAR szTopicDesc[256]; - int nLength; - BITMAP bmpInfo; - TCHAR version[50]; - - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(lParam); - - hdc = BeginPaint(hWnd, &ps); - - /* Banner panel */ - PaintBanner(hdc, &rcTitlePanel); - - /* Left panel */ - hOldBrush = (HBRUSH) SelectObject (hdc, hbrLightBlue); - PatBlt(hdc, - rcLeftPanel.left, - rcLeftPanel.top, - rcLeftPanel.right - rcLeftPanel.left, - rcLeftPanel.bottom - rcLeftPanel.top, - PATCOPY); - SelectObject(hdc, hOldBrush); - - /* Right panel */ - hOldBrush = (HBRUSH) SelectObject (hdc, WHITE_BRUSH); - PatBlt(hdc, - rcRightPanel.left, - rcRightPanel.top, - rcRightPanel.right - rcRightPanel.left, - rcRightPanel.bottom - rcRightPanel.top, - PATCOPY); - SelectObject(hdc, hOldBrush); - - /* Draw dark verical line */ - hPen = CreatePen(PS_SOLID, 0, DARK_BLUE); - hOldPen = (HPEN) SelectObject(hdc, hPen); - MoveToEx(hdc, rcRightPanel.left, rcRightPanel.top, NULL); - LineTo(hdc, rcRightPanel.left, rcRightPanel.bottom); - SelectObject(hdc, hOldPen); - DeleteObject(hPen); - - /* Draw topic bitmap */ - if ((nTopic == -1) && (hDefaultTopicBitmap != 0)) - { - GetObject(hDefaultTopicBitmap, sizeof(BITMAP), &bmpInfo); - hOldBitmap = (HBITMAP) SelectObject (hdcMem, hDefaultTopicBitmap); - BitBlt(hdc, - rcRightPanel.right - bmpInfo.bmWidth, - rcRightPanel.bottom - bmpInfo.bmHeight, - bmpInfo.bmWidth, - bmpInfo.bmHeight, - hdcMem, - 0, - 0, - SRCCOPY); - } - else if ((nTopic != -1) && (hTopicBitmap[nTopic] != 0)) - { - GetObject(hTopicBitmap[nTopic], sizeof(BITMAP), &bmpInfo); - hOldBitmap = (HBITMAP) SelectObject (hdcMem, hTopicBitmap[nTopic]); - BitBlt(hdc, - rcRightPanel.right - bmpInfo.bmWidth, - rcRightPanel.bottom - bmpInfo.bmHeight, - bmpInfo.bmWidth, - bmpInfo.bmHeight, - hdcMem, - 0, - 0, - SRCCOPY); - } - - if (nTopic == -1) - { - nLength = LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szTopicTitle, 80); - } - else - { - nLength = LoadString(hInstance, IDS_TOPICTITLE0 + nTopic, szTopicTitle, 80); - if (nLength == 0) - nLength = LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szTopicTitle, 80); - } - - if (nTopic == -1) - { - nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, 256); - } - else - { - nLength = LoadString(hInstance, IDS_TOPICDESC0 + nTopic, szTopicDesc, 256); - if (nLength == 0) - nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, 256); - } - - SetBkMode(hdc, TRANSPARENT); - - /* Draw version information */ - wsprintf(version, TEXT("ReactOS %d.%d.%d"), - KERNEL_VERSION_MAJOR, - KERNEL_VERSION_MINOR, - KERNEL_VERSION_PATCH_LEVEL); - - rcTitle.left = rcLeftPanel.left + 8; - rcTitle.right = rcLeftPanel.right - 5; - rcTitle.top = rcLeftPanel.bottom - 40; - rcTitle.bottom = rcLeftPanel.bottom - 5; - hOldFont = (HFONT) SelectObject(hdc, hfontTopicDescription); - DrawText(hdc, version, -1, &rcTitle, DT_BOTTOM | DT_CALCRECT | DT_SINGLELINE); - DrawText(hdc, version, -1, &rcTitle, DT_BOTTOM | DT_SINGLELINE); - SelectObject(hdc, hOldFont); - - /* Draw topic title */ - rcTitle.left = rcRightPanel.left + 12; - rcTitle.right = rcRightPanel.right - 8; - rcTitle.top = rcRightPanel.top + 8; - rcTitle.bottom = rcTitle.top + 57; - hOldFont = (HFONT) SelectObject(hdc, hfontTopicTitle); - DrawText(hdc, szTopicTitle, -1, &rcTitle, DT_TOP | DT_CALCRECT); - - SetTextColor(hdc, DARK_BLUE); - DrawText(hdc, szTopicTitle, -1, &rcTitle, DT_TOP); - - /* Draw topic description */ - rcDescription.left = rcRightPanel.left + 12; - rcDescription.right = rcRightPanel.right - 8; - rcDescription.top = rcTitle.bottom + 8; - rcDescription.bottom = rcRightPanel.bottom - 20; - - SelectObject(hdc, hfontTopicDescription); - SetTextColor(hdc, 0x00000000); - DrawText(hdc, szTopicDesc, -1, &rcDescription, DT_TOP | DT_WORDBREAK); - - SetBkMode(hdc, OPAQUE); - SelectObject(hdc, hOldFont); - - SelectObject (hdcMem, hOldBrush); - SelectObject (hdcMem, hOldBitmap); - - EndPaint(hWnd, &ps); - - return 0; + HPEN hPen; + HPEN hOldPen; + HDC hdc; + PAINTSTRUCT ps; + HBITMAP hOldBitmap = NULL; + HBRUSH hOldBrush; + HFONT hOldFont; + RECT rcTitle, rcDescription; + TCHAR szTopicTitle[80]; + TCHAR szTopicDesc[256]; + int nLength; + BITMAP bmpInfo; + TCHAR version[50]; + + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + + hdc = BeginPaint(hWnd, &ps); + + /* Banner panel */ + PaintBanner(hdc, &rcTitlePanel); + + /* Left panel */ + hOldBrush = (HBRUSH)SelectObject(hdc, hbrLightBlue); + PatBlt(hdc, + rcLeftPanel.left, + rcLeftPanel.top, + rcLeftPanel.right - rcLeftPanel.left, + rcLeftPanel.bottom - rcLeftPanel.top, + PATCOPY); + SelectObject(hdc, hOldBrush); + + /* Right panel */ + hOldBrush = (HBRUSH)SelectObject(hdc, WHITE_BRUSH); + PatBlt(hdc, + rcRightPanel.left, + rcRightPanel.top, + rcRightPanel.right - rcRightPanel.left, + rcRightPanel.bottom - rcRightPanel.top, + PATCOPY); + SelectObject(hdc, hOldBrush); + + /* Draw dark verical line */ + hPen = CreatePen(PS_SOLID, 0, DARK_BLUE); + hOldPen = (HPEN)SelectObject(hdc, hPen); + MoveToEx(hdc, rcRightPanel.left, rcRightPanel.top, NULL); + LineTo(hdc, rcRightPanel.left, rcRightPanel.bottom); + SelectObject(hdc, hOldPen); + DeleteObject(hPen); + + /* Draw topic bitmap */ + if ((nTopic == -1) && (hDefaultTopicBitmap != NULL)) + { + GetObject(hDefaultTopicBitmap, sizeof(BITMAP), &bmpInfo); + hOldBitmap = (HBITMAP)SelectObject(hdcMem, hDefaultTopicBitmap); + BitBlt(hdc, + rcRightPanel.right - bmpInfo.bmWidth, + rcRightPanel.bottom - bmpInfo.bmHeight, + bmpInfo.bmWidth, + bmpInfo.bmHeight, + hdcMem, + 0, + 0, + SRCCOPY); + } + else if ((nTopic != -1) && (hTopicBitmap[nTopic] != NULL)) + { + GetObject(hTopicBitmap[nTopic], sizeof(BITMAP), &bmpInfo); + hOldBitmap = (HBITMAP)SelectObject(hdcMem, hTopicBitmap[nTopic]); + BitBlt(hdc, + rcRightPanel.right - bmpInfo.bmWidth, + rcRightPanel.bottom - bmpInfo.bmHeight, + bmpInfo.bmWidth, + bmpInfo.bmHeight, + hdcMem, + 0, + 0, + SRCCOPY); + } + + if (nTopic == -1) + { + nLength = LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szTopicTitle, ARRAYSIZE(szTopicTitle)); + } + else + { + nLength = LoadString(hInstance, IDS_TOPICTITLE0 + nTopic, szTopicTitle, ARRAYSIZE(szTopicTitle)); + if (nLength == 0) + nLength = LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szTopicTitle, ARRAYSIZE(szTopicTitle)); + } + + if (nTopic == -1) + { + nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, ARRAYSIZE(szTopicDesc)); + } + else + { + nLength = LoadString(hInstance, IDS_TOPICDESC0 + nTopic, szTopicDesc, ARRAYSIZE(szTopicDesc)); + if (nLength == 0) + nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, ARRAYSIZE(szTopicDesc)); + } + + SetBkMode(hdc, TRANSPARENT); + + /* Draw version information */ + _tsprintf(version, TEXT("ReactOS %d.%d.%d"), + KERNEL_VERSION_MAJOR, + KERNEL_VERSION_MINOR, + KERNEL_VERSION_PATCH_LEVEL); + + rcTitle.left = rcLeftPanel.left + 8; + rcTitle.right = rcLeftPanel.right - 5; + rcTitle.top = rcLeftPanel.bottom - 40; + rcTitle.bottom = rcLeftPanel.bottom - 5; + hOldFont = (HFONT)SelectObject(hdc, hFontTopicDescription); + DrawText(hdc, version, -1, &rcTitle, DT_BOTTOM | DT_CALCRECT | DT_SINGLELINE); + DrawText(hdc, version, -1, &rcTitle, DT_BOTTOM | DT_SINGLELINE); + SelectObject(hdc, hOldFont); + + /* Draw topic title */ + rcTitle.left = rcRightPanel.left + 12; + rcTitle.right = rcRightPanel.right - 8; + rcTitle.top = rcRightPanel.top + 8; + rcTitle.bottom = rcTitle.top + 57; + hOldFont = (HFONT)SelectObject(hdc, hFontTopicTitle); + DrawText(hdc, szTopicTitle, -1, &rcTitle, DT_TOP | DT_CALCRECT); + + SetTextColor(hdc, DARK_BLUE); + DrawText(hdc, szTopicTitle, -1, &rcTitle, DT_TOP); + + /* Draw topic description */ + rcDescription.left = rcRightPanel.left + 12; + rcDescription.right = rcRightPanel.right - 8; + rcDescription.top = rcTitle.bottom + 8; + rcDescription.bottom = rcRightPanel.bottom - 20; + + SelectObject(hdc, hFontTopicDescription); + SetTextColor(hdc, 0x00000000); + DrawText(hdc, szTopicDesc, -1, &rcDescription, DT_TOP | DT_WORDBREAK); + + SetBkMode(hdc, OPAQUE); + SelectObject(hdc, hOldFont); + + SelectObject(hdcMem, hOldBrush); + SelectObject(hdcMem, hOldBitmap); + + EndPaint(hWnd, &ps); + + return 0; } static LRESULT OnDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam) { - LPDRAWITEMSTRUCT lpDis = (LPDRAWITEMSTRUCT)lParam; - HPEN hPen, hOldPen; - HBRUSH hOldBrush; - TCHAR szText[80]; - int iBkMode; - - UNREFERENCED_PARAMETER(hWnd); - UNREFERENCED_PARAMETER(wParam); - - if (lpDis->hwndItem == hwndCloseButton) - { - DrawFrameControl(lpDis->hDC, - &lpDis->rcItem, - DFC_BUTTON, - DFCS_BUTTONPUSH | DFCS_FLAT); - } - else - { - if (lpDis->CtlID == (ULONG)nTopic) - hOldBrush = (HBRUSH) SelectObject(lpDis->hDC, hbrRightPanel); - else - hOldBrush = (HBRUSH) SelectObject(lpDis->hDC, hbrLightBlue); - - PatBlt(lpDis->hDC, - lpDis->rcItem.left, - lpDis->rcItem.top, - lpDis->rcItem.right, - lpDis->rcItem.bottom, - PATCOPY); - SelectObject(lpDis->hDC, hOldBrush); - - hPen = CreatePen(PS_SOLID, 0, DARK_BLUE); - hOldPen = (HPEN) SelectObject(lpDis->hDC, hPen); - MoveToEx(lpDis->hDC, lpDis->rcItem.left, lpDis->rcItem.bottom-1, NULL); - LineTo(lpDis->hDC, lpDis->rcItem.right, lpDis->rcItem.bottom-1); - SelectObject(lpDis->hDC, hOldPen); - DeleteObject(hPen); - - InflateRect(&lpDis->rcItem, -10, -4); - OffsetRect(&lpDis->rcItem, 0, 1); - GetWindowText(lpDis->hwndItem, szText, 80); - SetTextColor(lpDis->hDC, 0x00000000); - iBkMode = SetBkMode(lpDis->hDC, TRANSPARENT); - DrawText(lpDis->hDC, szText, -1, &lpDis->rcItem, DT_TOP | DT_LEFT | DT_WORDBREAK); - SetBkMode(lpDis->hDC, iBkMode); - } - - return 0; + LPDRAWITEMSTRUCT lpDis = (LPDRAWITEMSTRUCT)lParam; + HPEN hPen, hOldPen; + HBRUSH hOldBrush; + TCHAR szText[80]; + int iBkMode; + + UNREFERENCED_PARAMETER(hWnd); + UNREFERENCED_PARAMETER(wParam); + + if (lpDis->hWndItem == hWndCloseButton) + { + DrawFrameControl(lpDis->hDC, + &lpDis->rcItem, + DFC_BUTTON, + DFCS_BUTTONPUSH | DFCS_FLAT); + } + else + { + if (lpDis->CtlID == (ULONG)nTopic) + hOldBrush = (HBRUSH)SelectObject(lpDis->hDC, hbrRightPanel); + else + hOldBrush = (HBRUSH)SelectObject(lpDis->hDC, hbrLightBlue); + + PatBlt(lpDis->hDC, + lpDis->rcItem.left, + lpDis->rcItem.top, + lpDis->rcItem.right, + lpDis->rcItem.bottom, + PATCOPY); + SelectObject(lpDis->hDC, hOldBrush); + + hPen = CreatePen(PS_SOLID, 0, DARK_BLUE); + hOldPen = (HPEN)SelectObject(lpDis->hDC, hPen); + MoveToEx(lpDis->hDC, lpDis->rcItem.left, lpDis->rcItem.bottom - 1, NULL); + LineTo(lpDis->hDC, lpDis->rcItem.right, lpDis->rcItem.bottom - 1); + SelectObject(lpDis->hDC, hOldPen); + DeleteObject(hPen); + + InflateRect(&lpDis->rcItem, -10, -4); + OffsetRect(&lpDis->rcItem, 0, 1); + GetWindowText(lpDis->hWndItem, szText, ARRAYSIZE(szText)); + SetTextColor(lpDis->hDC, 0x00000000); + iBkMode = SetBkMode(lpDis->hDC, TRANSPARENT); + DrawText(lpDis->hDC, szText, -1, &lpDis->rcItem, DT_TOP | DT_LEFT | DT_WORDBREAK); + SetBkMode(lpDis->hDC, iBkMode); + } + + return 0; } static LRESULT OnMouseMove(HWND hWnd, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(lParam); - - if (nTopic != -1) - { - nTopic = -1; - SetFocus(hWnd); - InvalidateRect(hwndMain, &rcRightPanel, TRUE); - } - - return 0; + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + + if (nTopic != -1) + { + nTopic = -1; + SetFocus(hWnd); + InvalidateRect(hWndMain, &rcRightPanel, TRUE); + } + + return 0; } static LRESULT OnCtlColorStatic(HWND hWnd, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(hWnd); - - if ((HWND)lParam == hwndCheckButton) - { - SetBkColor((HDC)wParam, LIGHT_BLUE); - return((LRESULT)hbrLightBlue); - } - - return 0; + UNREFERENCED_PARAMETER(hWnd); + + if ((HWND)lParam == hWndCheckButton) + { + SetBkColor((HDC)wParam, LIGHT_BLUE); + return (LRESULT)hbrLightBlue; + } + + return 0; } static LRESULT OnActivate(HWND hWnd, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(hWnd); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(lParam); - nTopic = -1; - InvalidateRect(hwndMain, &rcRightPanel, TRUE); - - return(0); + UNREFERENCED_PARAMETER(hWnd); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + nTopic = -1; + InvalidateRect(hWndMain, &rcRightPanel, TRUE); + + return 0; } static LRESULT OnDestroy(HWND hWnd, WPARAM wParam, LPARAM lParam) { - int i; - - UNREFERENCED_PARAMETER(hWnd); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(lParam); - - for (i=0;i<10;i++) - { - if (hwndTopicButton[i] != 0) - DestroyWindow(hwndTopicButton[i]); - } - - if (hwndCloseButton != 0) - DestroyWindow(hwndCloseButton); - - if (hwndCheckButton != 0) - DestroyWindow(hwndCheckButton); - - DeleteDC(hdcMem); - - /* delete bitmaps */ - DeleteObject(hDefaultTopicBitmap); - DeleteObject(hTitleBitmap); - for (i=0;i<10;i++) - { - if (hTopicBitmap[i] != 0) - DeleteObject(hTopicBitmap[i]); - } - - DeleteObject(hfontTopicTitle); - DeleteObject(hfontTopicDescription); - DeleteObject(hfontTopicButton); - - if (hfontCheckButton != 0) - DeleteObject(hfontCheckButton); - - DeleteObject(hbrLightBlue); - DeleteObject(hbrDarkBlue); - DeleteObject(hbrRightPanel); - - return 0; + int i; + + UNREFERENCED_PARAMETER(hWnd); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + + for (i = 0; i < ARRAYSIZE(hWndTopicButton); i++) + { + if (hWndTopicButton[i] != NULL) + DestroyWindow(hWndTopicButton[i]); + } + + if (hWndCloseButton != NULL) + DestroyWindow(hWndCloseButton); + + if (hWndCheckButton != NULL) + DestroyWindow(hWndCheckButton); + + DeleteDC(hdcMem); + + /* Delete bitmaps */ + DeleteObject(hDefaultTopicBitmap); + DeleteObject(hTitleBitmap); + for (i = 0; i < ARRAYSIZE(hTopicBitmap); i++) + { + if (hTopicBitmap[i] != NULL) + DeleteObject(hTopicBitmap[i]); + } + + DeleteObject(hFontTopicTitle); + DeleteObject(hFontTopicDescription); + DeleteObject(hFontTopicButton); + + if (hFontCheckButton != NULL) + DeleteObject(hFontCheckButton); + + DeleteObject(hbrLightBlue); + DeleteObject(hbrDarkBlue); + DeleteObject(hbrRightPanel); + + return 0; } INT_PTR CALLBACK MainWndProc(HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch(uMsg) - { - case WM_CREATE: - return(OnCreate(hWnd, wParam, lParam)); - - case WM_COMMAND: - return(OnCommand(hWnd, wParam, lParam)); - - case WM_ACTIVATE: - return(OnActivate(hWnd, wParam, lParam)); - - case WM_PAINT: - return(OnPaint(hWnd, wParam, lParam)); - - case WM_DRAWITEM: - return(OnDrawItem(hWnd, wParam, lParam)); - - case WM_CTLCOLORSTATIC: - return(OnCtlColorStatic(hWnd, wParam, lParam)); - - case WM_MOUSEMOVE: - return(OnMouseMove(hWnd, wParam, lParam)); - - case WM_DESTROY: - OnDestroy(hWnd, wParam, lParam); - PostQuitMessage(0); - return(0); - } - - return(DefWindowProc(hWnd, uMsg, wParam, lParam)); + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_CREATE: + return OnCreate(hWnd, wParam, lParam); + + case WM_COMMAND: + return OnCommand(hWnd, wParam, lParam); + + case WM_ACTIVATE: + return OnActivate(hWnd, wParam, lParam); + + case WM_PAINT: + return OnPaint(hWnd, wParam, lParam); + + case WM_DRAWITEM: + return OnDrawItem(hWnd, wParam, lParam); + + case WM_CTLCOLORSTATIC: + return OnCtlColorStatic(hWnd, wParam, lParam); + + case WM_MOUSEMOVE: + return OnMouseMove(hWnd, wParam, lParam); + + case WM_DESTROY: + OnDestroy(hWnd, wParam, lParam); + PostQuitMessage(0); + return 0; + } + + return DefWindowProc(hWnd, uMsg, wParam, lParam); } /* EOF */

9 years, 8 months

[hbelusca] 66564: [WELCOME!]: Fix CID 515150 (and warn if the app that we start cannot be started). By Ricardo Hanke. CORE-9325 #resolve #comment Fixed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 4 21:42:09 2015 New Revision: 66564 URL: http://svn.reactos.org/svn/reactos?rev=66564&view=rev Log: [WELCOME!]: Fix CID 515150 (and warn if the app that we start cannot be started). By Ricardo Hanke. CORE-9325 #resolve #comment Fixed, thanks! Modified: trunk/reactos/base/setup/welcome/welcome.c Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Wed Mar 4 21:42:09 2015 @@ -95,6 +95,28 @@ /* FUNCTIONS ****************************************************************/ +static VOID +ShowLastWin32Error(HWND hwnd) +{ + LPTSTR lpMessageBuffer = NULL; + DWORD dwError = GetLastError(); + + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwError, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpMessageBuffer, + 0, NULL)) + { + MessageBox(hwnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR); + } + + if (lpMessageBuffer) + { + LocalFree(lpMessageBuffer); + } +} + int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, @@ -277,10 +299,12 @@ StartupInfo.dwFlags = STARTF_USESHOWWINDOW; StartupInfo.wShowWindow = SW_SHOWNORMAL; - CreateProcess(NULL, AppName, NULL, NULL, FALSE, CREATE_NEW_CONSOLE,NULL, - CurrentDir, - &StartupInfo, - &ProcessInfo); + if (!CreateProcess(NULL, AppName, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, + NULL, CurrentDir, &StartupInfo, &ProcessInfo)) + { + ShowLastWin32Error(hwndMain); + return TRUE; + } CloseHandle(ProcessInfo.hProcess); CloseHandle(ProcessInfo.hThread);

9 years, 8 months

← Newer
1
...
41
42
43
44
45
46
47
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2015