mirror of
https://github.com/reactos/reactos.git
synced 2025-07-06 00:51:22 +00:00
[SOLITAIRE]
Change "Ok/Cancel" to "Yes/No". Lee Schroeder (=spaceseel=AT=gmail=DOT=com=), bug #6606. [CPL][WIN32K] Fix indentation, comments, debug messages. Lioncash (=mathew1800=AT=gmail=DOT=com=), bug #6562, bug #6621. svn path=/trunk/; revision=54535
This commit is contained in:
parent
62e97bd800
commit
267dcf71eb
138 changed files with 724 additions and 733 deletions
|
@ -567,8 +567,8 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION);
|
ret = MessageBox(hwnd, MsgQuit, szAppName, MB_YESNO|MB_ICONQUESTION);
|
||||||
if (ret == IDOK)
|
if (ret == IDYES)
|
||||||
{
|
{
|
||||||
WinHelp(hwnd, szHelpPath, HELP_QUIT, 0);
|
WinHelp(hwnd, szHelpPath, HELP_QUIT, 0);
|
||||||
DestroyWindow(hwnd);
|
DestroyWindow(hwnd);
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include "lang/ro-RO.rc"
|
#include "lang/ro-RO.rc"
|
||||||
#include "lang/ru-RU.rc"
|
#include "lang/ru-RU.rc"
|
||||||
#include "lang/sk-SK.rc"
|
#include "lang/sk-SK.rc"
|
||||||
|
#include "lang/sv-SE.rc"
|
||||||
#include "lang/uk-UA.rc"
|
#include "lang/uk-UA.rc"
|
||||||
#include "lang/zh-CN.rc"
|
#include "lang/zh-CN.rc"
|
||||||
#include "lang/zh-TW.rc"
|
#include "lang/zh-TW.rc"
|
||||||
|
|
|
@ -76,7 +76,7 @@ ReadSettings(PGLOBAL_DATA pGlobalData)
|
||||||
|
|
||||||
pGlobalData->uCaretBlinkTime = GetCaretBlinkTime();
|
pGlobalData->uCaretBlinkTime = GetCaretBlinkTime();
|
||||||
|
|
||||||
/* get sound settings */
|
/* Get sound settings */
|
||||||
pGlobalData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY);
|
pGlobalData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY);
|
||||||
SystemParametersInfo(SPI_GETSOUNDSENTRY,
|
SystemParametersInfo(SPI_GETSOUNDSENTRY,
|
||||||
sizeof(SOUNDSENTRY),
|
sizeof(SOUNDSENTRY),
|
||||||
|
|
|
@ -21,7 +21,7 @@ typedef struct _APPLET
|
||||||
|
|
||||||
typedef struct _GLOBAL_DATA
|
typedef struct _GLOBAL_DATA
|
||||||
{
|
{
|
||||||
/* keyboard page */
|
/* Keyboard page */
|
||||||
STICKYKEYS stickyKeys;
|
STICKYKEYS stickyKeys;
|
||||||
STICKYKEYS oldStickyKeys;
|
STICKYKEYS oldStickyKeys;
|
||||||
FILTERKEYS filterKeys;
|
FILTERKEYS filterKeys;
|
||||||
|
@ -30,11 +30,11 @@ typedef struct _GLOBAL_DATA
|
||||||
TOGGLEKEYS oldToggleKeys;
|
TOGGLEKEYS oldToggleKeys;
|
||||||
BOOL bKeyboardPref;
|
BOOL bKeyboardPref;
|
||||||
|
|
||||||
/* sound page */
|
/* Sound page */
|
||||||
SOUNDSENTRY ssSoundSentry;
|
SOUNDSENTRY ssSoundSentry;
|
||||||
BOOL bShowSounds;
|
BOOL bShowSounds;
|
||||||
|
|
||||||
/* display page */
|
/* Display page */
|
||||||
HIGHCONTRAST highContrast;
|
HIGHCONTRAST highContrast;
|
||||||
UINT uCaretBlinkTime;
|
UINT uCaretBlinkTime;
|
||||||
UINT uCaretWidth;
|
UINT uCaretWidth;
|
||||||
|
@ -42,10 +42,10 @@ typedef struct _GLOBAL_DATA
|
||||||
RECT rcCaret;
|
RECT rcCaret;
|
||||||
RECT rcOldCaret;
|
RECT rcOldCaret;
|
||||||
|
|
||||||
/* mouse page */
|
/* Mouse page */
|
||||||
MOUSEKEYS mouseKeys;
|
MOUSEKEYS mouseKeys;
|
||||||
|
|
||||||
/* general page */
|
/* General page */
|
||||||
ACCESSTIMEOUT accessTimeout;
|
ACCESSTIMEOUT accessTimeout;
|
||||||
SERIALKEYS serialKeys;
|
SERIALKEYS serialKeys;
|
||||||
TCHAR szActivePort[MAX_PATH];
|
TCHAR szActivePort[MAX_PATH];
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
//vertaald door Lionel Lowie
|
// Vertaald door Lionel Lowie
|
||||||
//major update jansssens
|
// Major update jansssens
|
||||||
|
|
||||||
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
|
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/* metrics */
|
/* Metrics */
|
||||||
#define PROPSHEETWIDTH 380
|
#define PROPSHEETWIDTH 380
|
||||||
#define PROPSHEETHEIGHT 228
|
#define PROPSHEETHEIGHT 228
|
||||||
#define PROPSHEETPADDING 6
|
#define PROPSHEETPADDING 6
|
||||||
|
|
||||||
/* icons */
|
/* Icons */
|
||||||
#define IDI_CPLSYSTEM 1500
|
#define IDI_CPLSYSTEM 1500
|
||||||
#define IDI_APPICO 1501
|
#define IDI_APPICO 1501
|
||||||
#define IDI_INSTICO 1502
|
#define IDI_INSTICO 1502
|
||||||
|
@ -13,20 +13,20 @@
|
||||||
#define IDI_DOWNLOADICO 1504
|
#define IDI_DOWNLOADICO 1504
|
||||||
#define IDI_APPINETICO 1505
|
#define IDI_APPINETICO 1505
|
||||||
|
|
||||||
/* dialogs */
|
/* Dialogs */
|
||||||
#define IDD_SHORTCUT_LOCATION 203
|
#define IDD_SHORTCUT_LOCATION 203
|
||||||
#define IDD_SHORTCUT_FINISH 204
|
#define IDD_SHORTCUT_FINISH 204
|
||||||
|
|
||||||
/* bitmaps */
|
/* Bitmaps */
|
||||||
#define IDB_WATERMARK 5001
|
#define IDB_WATERMARK 5001
|
||||||
|
|
||||||
/* strings */
|
/* Strings */
|
||||||
#define IDS_CPLSYSTEMNAME 1001
|
#define IDS_CPLSYSTEMNAME 1001
|
||||||
#define IDS_CPLSYSTEMDESCRIPTION 2001
|
#define IDS_CPLSYSTEMDESCRIPTION 2001
|
||||||
#define IDS_CREATE_SHORTCUT 2021
|
#define IDS_CREATE_SHORTCUT 2021
|
||||||
#define IDS_ERROR_NOT_FOUND 2022
|
#define IDS_ERROR_NOT_FOUND 2022
|
||||||
|
|
||||||
/* controls */
|
/* Controls */
|
||||||
#define IDC_SHORTCUT_LOCATION 107
|
#define IDC_SHORTCUT_LOCATION 107
|
||||||
#define IDC_SHORTCUT_BROWSE 108
|
#define IDC_SHORTCUT_BROWSE 108
|
||||||
#define IDC_SHORTCUT_NAME 109
|
#define IDC_SHORTCUT_NAME 109
|
||||||
|
|
|
@ -92,7 +92,7 @@ ColorsProc(
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* options have already been applied */
|
/* Options have already been applied */
|
||||||
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
|
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
@ -121,7 +121,7 @@ ColorsProc(
|
||||||
red = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_GETPOS, 0, 0);
|
red = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_GETPOS, 0, 0);
|
||||||
if (HIWORD(red))
|
if (HIWORD(red))
|
||||||
{
|
{
|
||||||
//TODO: handle error
|
// TODO: Handle error
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
red = LOBYTE(red);
|
red = LOBYTE(red);
|
||||||
|
@ -132,7 +132,7 @@ ColorsProc(
|
||||||
green = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_GETPOS, 0, 0);
|
green = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_GETPOS, 0, 0);
|
||||||
if (HIWORD(green))
|
if (HIWORD(green))
|
||||||
{
|
{
|
||||||
//TODO: handle error
|
// TODO: Handle error
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
green = LOBYTE(green);
|
green = LOBYTE(green);
|
||||||
|
@ -143,7 +143,7 @@ ColorsProc(
|
||||||
blue = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_GETPOS, 0, 0);
|
blue = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_GETPOS, 0, 0);
|
||||||
if (HIWORD(blue))
|
if (HIWORD(blue))
|
||||||
{
|
{
|
||||||
//TODO: handle error
|
// TODO: Handle error
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
blue = LOBYTE(blue);
|
blue = LOBYTE(blue);
|
||||||
|
@ -201,7 +201,7 @@ ColorsProc(
|
||||||
|
|
||||||
if (index == pConInfo->ActiveStaticControl)
|
if (index == pConInfo->ActiveStaticControl)
|
||||||
{
|
{
|
||||||
/* same static control was re-clicked */
|
/* Same static control was re-clicked */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -209,7 +209,7 @@ ColorsProc(
|
||||||
SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(pConInfo->Colors[index]), FALSE);
|
SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(pConInfo->Colors[index]), FALSE);
|
||||||
SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(pConInfo->Colors[index]), FALSE);
|
SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(pConInfo->Colors[index]), FALSE);
|
||||||
|
|
||||||
/* update global struct */
|
/* Update global struct */
|
||||||
if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_SCREEN_TEXT))
|
if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_SCREEN_TEXT))
|
||||||
{
|
{
|
||||||
pConInfo->ScreenText = pConInfo->Colors[index];
|
pConInfo->ScreenText = pConInfo->Colors[index];
|
||||||
|
@ -236,7 +236,6 @@ ColorsProc(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,7 +71,7 @@ AllocConsoleInfo()
|
||||||
void
|
void
|
||||||
InitConsoleDefaults(PConsoleInfo pConInfo)
|
InitConsoleDefaults(PConsoleInfo pConInfo)
|
||||||
{
|
{
|
||||||
/* initialize struct */
|
/* Initialize struct */
|
||||||
pConInfo->InsertMode = TRUE;
|
pConInfo->InsertMode = TRUE;
|
||||||
pConInfo->HistoryBufferSize = 50;
|
pConInfo->HistoryBufferSize = 50;
|
||||||
pConInfo->NumberOfHistoryBuffers = 5;
|
pConInfo->NumberOfHistoryBuffers = 5;
|
||||||
|
@ -142,7 +142,7 @@ ApplyConsoleInfo(HWND hwndDlg, PConsoleInfo pConInfo)
|
||||||
|
|
||||||
if (res == IDCANCEL)
|
if (res == IDCANCEL)
|
||||||
{
|
{
|
||||||
/* dont destroy when user presses cancel */
|
/* Don't destroy when user presses cancel */
|
||||||
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE);
|
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE);
|
||||||
}
|
}
|
||||||
else if ( res == IDC_RADIO_APPLY_ALL )
|
else if ( res == IDC_RADIO_APPLY_ALL )
|
||||||
|
@ -175,8 +175,8 @@ InitApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
|
||||||
/*
|
/*
|
||||||
* console.dll shares information with win32csr with wParam, lParam
|
* console.dll shares information with win32csr with wParam, lParam
|
||||||
*
|
*
|
||||||
* wParam is a pointer to an ConsoleInfo struct
|
* wParam is a pointer to a ConsoleInfo struct
|
||||||
* lParam is a boolean parameter which specifies wheter defaults should be shown
|
* lParam is a boolean parameter which specifies whether defaults should be shown
|
||||||
*/
|
*/
|
||||||
|
|
||||||
pConInfo = AllocConsoleInfo();
|
pConInfo = AllocConsoleInfo();
|
||||||
|
@ -187,14 +187,14 @@ InitApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
|
||||||
|
|
||||||
if (lParam)
|
if (lParam)
|
||||||
{
|
{
|
||||||
/* use defaults */
|
/* Use defaults */
|
||||||
InitConsoleDefaults(pConInfo);
|
InitConsoleDefaults(pConInfo);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (IsBadReadPtr((const void *)pSharedInfo, sizeof(ConsoleInfo)))
|
if (IsBadReadPtr((const void *)pSharedInfo, sizeof(ConsoleInfo)))
|
||||||
{
|
{
|
||||||
/* use defaults */
|
/* Use defaults */
|
||||||
InitConsoleDefaults(pConInfo);
|
InitConsoleDefaults(pConInfo);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -306,4 +306,3 @@ DllMain(
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo);
|
||||||
#define PM_APPLY_CONSOLE_INFO (WM_APP + 100)
|
#define PM_APPLY_CONSOLE_INFO (WM_APP + 100)
|
||||||
|
|
||||||
|
|
||||||
//globals
|
// Globals
|
||||||
extern HINSTANCE hApplet;
|
extern HINSTANCE hApplet;
|
||||||
|
|
||||||
#endif /* CONSOLE_H__ */
|
#endif /* CONSOLE_H__ */
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include "console.h"
|
#include "console.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo)
|
void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo)
|
||||||
{
|
{
|
||||||
HBRUSH hBrush;
|
HBRUSH hBrush;
|
||||||
|
@ -30,46 +29,46 @@ void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//TODO
|
// TODO:
|
||||||
// calculate pos correctly when console centered
|
// Calculate pos correctly when console centered
|
||||||
startx = sizex / 3;
|
startx = sizex / 3;
|
||||||
starty = sizey / 3;
|
starty = sizey / 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO
|
// TODO:
|
||||||
// strech console when bold fonts are selected
|
// Strech console when bold fonts are selected
|
||||||
endx = drawItem->rcItem.right - startx + 15;
|
endx = drawItem->rcItem.right - startx + 15;
|
||||||
endy = starty + sizey / 3;
|
endy = starty + sizey / 3;
|
||||||
|
|
||||||
/* draw console size */
|
/* Draw console size */
|
||||||
SetRect(&cRect, startx, starty, endx, endy);
|
SetRect(&cRect, startx, starty, endx, endy);
|
||||||
FillRect(drawItem->hDC, &cRect, GetSysColorBrush(COLOR_WINDOWFRAME));
|
FillRect(drawItem->hDC, &cRect, GetSysColorBrush(COLOR_WINDOWFRAME));
|
||||||
|
|
||||||
/* draw console border */
|
/* Draw console border */
|
||||||
SetRect(&fRect, startx + 1, starty + 1, cRect.right - 1, cRect.bottom - 1);
|
SetRect(&fRect, startx + 1, starty + 1, cRect.right - 1, cRect.bottom - 1);
|
||||||
FrameRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER));
|
FrameRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER));
|
||||||
|
|
||||||
/* draw left box */
|
/* Draw left box */
|
||||||
SetRect(&fRect, startx + 3, starty + 3, startx + 5, starty + 5);
|
SetRect(&fRect, startx + 3, starty + 3, startx + 5, starty + 5);
|
||||||
FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER));
|
FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER));
|
||||||
|
|
||||||
/* draw window title */
|
/* Draw window title */
|
||||||
SetRect(&fRect, startx + 7, starty + 3, cRect.right - 9, starty + 5);
|
SetRect(&fRect, startx + 7, starty + 3, cRect.right - 9, starty + 5);
|
||||||
FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVECAPTION));
|
FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVECAPTION));
|
||||||
|
|
||||||
/* draw first right box */
|
/* Draw first right box */
|
||||||
SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5);
|
SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5);
|
||||||
FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER));
|
FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER));
|
||||||
|
|
||||||
/* draw second right box */
|
/* Draw second right box */
|
||||||
SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5);
|
SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5);
|
||||||
FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER));
|
FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER));
|
||||||
|
|
||||||
/* draw scrollbar */
|
/* Draw scrollbar */
|
||||||
SetRect(&fRect, cRect.right - 5, fRect.bottom + 1, cRect.right - 3, cRect.bottom - 3);
|
SetRect(&fRect, cRect.right - 5, fRect.bottom + 1, cRect.right - 3, cRect.bottom - 3);
|
||||||
FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_SCROLLBAR));
|
FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_SCROLLBAR));
|
||||||
|
|
||||||
/* draw console background */
|
/* Draw console background */
|
||||||
hBrush = CreateSolidBrush(pConInfo->ScreenBackground);
|
hBrush = CreateSolidBrush(pConInfo->ScreenBackground);
|
||||||
SetRect(&fRect, startx + 3, starty + 6, cRect.right - 6, cRect.bottom - 3);
|
SetRect(&fRect, startx + 3, starty + 6, cRect.right - 6, cRect.bottom - 3);
|
||||||
FillRect(drawItem->hDC, &fRect, hBrush);
|
FillRect(drawItem->hDC, &fRect, hBrush);
|
||||||
|
@ -107,7 +106,7 @@ void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo)
|
||||||
FillRect(drawItem->hDC, &drawItem->rcItem, hBrush);
|
FillRect(drawItem->hDC, &drawItem->rcItem, hBrush);
|
||||||
if (ntColor == nbkColor)
|
if (ntColor == nbkColor)
|
||||||
{
|
{
|
||||||
/* text has same color -> invisible */
|
/* Text has same color -> invisible */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,7 +119,6 @@ void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
INT_PTR
|
INT_PTR
|
||||||
CALLBACK
|
CALLBACK
|
||||||
LayoutProc(
|
LayoutProc(
|
||||||
|
@ -167,7 +165,7 @@ LayoutProc(
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//FIXME calculate window pos from xres, yres
|
// FIXME: Calculate window pos from xres, yres
|
||||||
SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, 88, FALSE);
|
SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, 88, FALSE);
|
||||||
SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, 88, FALSE);
|
SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, 88, FALSE);
|
||||||
EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE);
|
EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE);
|
||||||
|
@ -251,7 +249,7 @@ LayoutProc(
|
||||||
|
|
||||||
if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_HEIGHT)
|
if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_HEIGHT)
|
||||||
{
|
{
|
||||||
/* automatically adjust screen buffer size when window size enlarges */
|
/* Automatically adjust screen buffer size when window size enlarges */
|
||||||
if (wwidth >= swidth)
|
if (wwidth >= swidth)
|
||||||
{
|
{
|
||||||
SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, wwidth, TRUE);
|
SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, wwidth, TRUE);
|
||||||
|
@ -269,7 +267,7 @@ LayoutProc(
|
||||||
|
|
||||||
if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_HEIGHT)
|
if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_HEIGHT)
|
||||||
{
|
{
|
||||||
/* automatically adjust window size when screen buffer decreases */
|
/* Automatically adjust window size when screen buffer decreases */
|
||||||
if (wwidth > swidth)
|
if (wwidth > swidth)
|
||||||
{
|
{
|
||||||
SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE);
|
SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE);
|
||||||
|
@ -317,7 +315,7 @@ LayoutProc(
|
||||||
swidth = max(swidth, 1);
|
swidth = max(swidth, 1);
|
||||||
sheight = max(sheight, 1);
|
sheight = max(sheight, 1);
|
||||||
|
|
||||||
/* automatically adjust window size when screen buffer decreases */
|
/* Automatically adjust window size when screen buffer decreases */
|
||||||
if (wwidth > swidth)
|
if (wwidth > swidth)
|
||||||
{
|
{
|
||||||
SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE);
|
SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE);
|
||||||
|
|
|
@ -61,7 +61,7 @@ OptionsProc(
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* options have already been applied */
|
/* Options have already been applied */
|
||||||
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
|
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
@ -174,10 +174,10 @@ UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo)
|
||||||
HWND hDlgCtrl;
|
HWND hDlgCtrl;
|
||||||
TCHAR szBuffer[MAX_PATH];
|
TCHAR szBuffer[MAX_PATH];
|
||||||
|
|
||||||
/* update cursor size */
|
/* Update cursor size */
|
||||||
if ( pConInfo->CursorSize == 0)
|
if ( pConInfo->CursorSize == 0)
|
||||||
{
|
{
|
||||||
/* small cursor */
|
/* Small cursor */
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR);
|
||||||
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
|
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
|
||||||
|
|
||||||
|
@ -207,14 +207,14 @@ UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo)
|
||||||
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
|
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update num buffers */
|
/* Update num buffers */
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_NUM_BUFFER);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_NUM_BUFFER);
|
||||||
SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1));
|
SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1));
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER);
|
||||||
_stprintf(szBuffer, _T("%d"), pConInfo->NumberOfHistoryBuffers);
|
_stprintf(szBuffer, _T("%d"), pConInfo->NumberOfHistoryBuffers);
|
||||||
SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer);
|
SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer);
|
||||||
|
|
||||||
/* update buffer size */
|
/* Update buffer size */
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_BUFFER_SIZE);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_BUFFER_SIZE);
|
||||||
SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1));
|
SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1));
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE);
|
||||||
|
@ -223,14 +223,14 @@ UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* update discard duplicates */
|
/* Update discard duplicates */
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_DISCARD_DUPLICATES);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_DISCARD_DUPLICATES);
|
||||||
if ( pConInfo->HistoryNoDup )
|
if ( pConInfo->HistoryNoDup )
|
||||||
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
|
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
|
||||||
else
|
else
|
||||||
SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0);
|
SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0);
|
||||||
|
|
||||||
/* update full/window screen */
|
/* Update full/window screen */
|
||||||
if ( pConInfo->FullScreen )
|
if ( pConInfo->FullScreen )
|
||||||
{
|
{
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL);
|
||||||
|
@ -248,19 +248,17 @@ UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo)
|
||||||
SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0);
|
SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update quick edit */
|
/* Update quick edit */
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_QUICK_EDIT);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_QUICK_EDIT);
|
||||||
if ( pConInfo->QuickEdit )
|
if ( pConInfo->QuickEdit )
|
||||||
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
|
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
|
||||||
else
|
else
|
||||||
SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0);
|
SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0);
|
||||||
|
|
||||||
/* update insert mode */
|
/* Update insert mode */
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_INSERT_MODE);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_INSERT_MODE);
|
||||||
if ( pConInfo->InsertMode )
|
if ( pConInfo->InsertMode )
|
||||||
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
|
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
|
||||||
else
|
else
|
||||||
SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0);
|
SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#define IDD_PROPPAGECOLORS 103
|
#define IDD_PROPPAGECOLORS 103
|
||||||
#define IDD_APPLYOPTIONS 104
|
#define IDD_APPLYOPTIONS 104
|
||||||
|
|
||||||
//options dialog
|
// Options dialog
|
||||||
#define IDC_CHECK_QUICK_EDIT 200
|
#define IDC_CHECK_QUICK_EDIT 200
|
||||||
#define IDC_CHECK_INSERT_MODE 201
|
#define IDC_CHECK_INSERT_MODE 201
|
||||||
#define IDC_CHECK_DISCARD_DUPLICATES 202
|
#define IDC_CHECK_DISCARD_DUPLICATES 202
|
||||||
|
@ -25,11 +25,11 @@
|
||||||
#define IDC_RADIO_DISPLAY_WINDOW 210
|
#define IDC_RADIO_DISPLAY_WINDOW 210
|
||||||
#define IDC_RADIO_DISPLAY_FULL 211
|
#define IDC_RADIO_DISPLAY_FULL 211
|
||||||
|
|
||||||
// apply dialog
|
// Apply dialog
|
||||||
#define IDC_RADIO_APPLY_ALL 300
|
#define IDC_RADIO_APPLY_ALL 300
|
||||||
#define IDC_RADIO_APPLY_CURRENT 301
|
#define IDC_RADIO_APPLY_CURRENT 301
|
||||||
|
|
||||||
//font dialog
|
// Font dialog
|
||||||
#define IDC_CHECK_BOLD_FONTS 400
|
#define IDC_CHECK_BOLD_FONTS 400
|
||||||
#define IDC_STATIC_SELECT_FONT_PREVIEW 401
|
#define IDC_STATIC_SELECT_FONT_PREVIEW 401
|
||||||
#define IDC_FONT_SIZE_X 402
|
#define IDC_FONT_SIZE_X 402
|
||||||
|
@ -39,8 +39,7 @@
|
||||||
#define IDC_LBOX_TYPE 406
|
#define IDC_LBOX_TYPE 406
|
||||||
#define IDC_GROUPBOX_FONT_NAME 407
|
#define IDC_GROUPBOX_FONT_NAME 407
|
||||||
|
|
||||||
//layout dialog
|
// Layout dialog
|
||||||
|
|
||||||
#define IDC_UPDOWN_SCREEN_BUFFER_WIDTH 500
|
#define IDC_UPDOWN_SCREEN_BUFFER_WIDTH 500
|
||||||
#define IDC_EDIT_SCREEN_BUFFER_WIDTH 501
|
#define IDC_EDIT_SCREEN_BUFFER_WIDTH 501
|
||||||
#define IDC_EDIT_SCREEN_BUFFER_HEIGHT 502
|
#define IDC_EDIT_SCREEN_BUFFER_HEIGHT 502
|
||||||
|
@ -56,8 +55,7 @@
|
||||||
#define IDC_CHECK_SYSTEM_POS_WINDOW 512
|
#define IDC_CHECK_SYSTEM_POS_WINDOW 512
|
||||||
#define IDC_STATIC_LAYOUT_WINDOW_PREVIEW 513
|
#define IDC_STATIC_LAYOUT_WINDOW_PREVIEW 513
|
||||||
|
|
||||||
//color dialog
|
// Color dialog
|
||||||
|
|
||||||
#define IDC_RADIO_SCREEN_TEXT 600
|
#define IDC_RADIO_SCREEN_TEXT 600
|
||||||
#define IDC_RADIO_SCREEN_BACKGROUND 601
|
#define IDC_RADIO_SCREEN_BACKGROUND 601
|
||||||
#define IDC_RADIO_POPUP_TEXT 602
|
#define IDC_RADIO_POPUP_TEXT 602
|
||||||
|
@ -87,7 +85,6 @@
|
||||||
#define IDC_STATIC_COLOR15 626
|
#define IDC_STATIC_COLOR15 626
|
||||||
#define IDC_STATIC_COLOR16 627
|
#define IDC_STATIC_COLOR16 627
|
||||||
|
|
||||||
|
// String IDs
|
||||||
//string ids
|
|
||||||
#define IDS_SCREEN_TEXT 700
|
#define IDS_SCREEN_TEXT 700
|
||||||
#define IDS_RASTERFONTS 701
|
#define IDS_RASTERFONTS 701
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS Display Control Panel
|
* PROJECT: ReactOS Display Control Panel
|
||||||
* FILE: lib/cpl/desk/appearance.c
|
* FILE: dll/cpl/desk/appearance.c
|
||||||
* PURPOSE: Appearance property page
|
* PURPOSE: Appearance property page
|
||||||
*
|
*
|
||||||
* PROGRAMMERS: Trevor McCort (lycan359@gmail.com)
|
* PROGRAMMERS: Trevor McCort (lycan359@gmail.com)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS Display Control Panel
|
* PROJECT: ReactOS Display Control Panel
|
||||||
* FILE: lib/cpl/desk/background.c
|
* FILE: dll/cpl/desk/background.c
|
||||||
* PURPOSE: Background property page
|
* PURPOSE: Background property page
|
||||||
*
|
*
|
||||||
* PROGRAMMERS: Trevor McCort (lycan359@gmail.com)
|
* PROGRAMMERS: Trevor McCort (lycan359@gmail.com)
|
||||||
|
@ -280,7 +280,7 @@ InitBackgroundDialog(HWND hwndDlg, PDATA pData)
|
||||||
DWORD dwDisposition = 0;
|
DWORD dwDisposition = 0;
|
||||||
result = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,
|
result = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,
|
||||||
®Key, &dwDisposition );
|
®Key, &dwDisposition );
|
||||||
/* now the key must be created & opened and regKey points to opened key */
|
/* Now the key must be created & opened and regKey points to opened key */
|
||||||
/* On error result will not contain ERROR_SUCCESS. I don't know how to handle */
|
/* On error result will not contain ERROR_SUCCESS. I don't know how to handle */
|
||||||
/* this case :( */
|
/* this case :( */
|
||||||
}
|
}
|
||||||
|
@ -401,10 +401,10 @@ CheckListViewFilenameExists(HWND hwndList, LPCTSTR tszFileName)
|
||||||
LVFINDINFO lvfi;
|
LVFINDINFO lvfi;
|
||||||
int retVal;
|
int retVal;
|
||||||
|
|
||||||
lvfi.flags = LVFI_STRING; /* search item by EXACT string */
|
lvfi.flags = LVFI_STRING; /* Search item by EXACT string */
|
||||||
lvfi.psz = tszFileName; /* string to search */
|
lvfi.psz = tszFileName; /* String to search */
|
||||||
|
|
||||||
/* other items of this structure are not valid, besacuse flags are not set. */
|
/* Other items of this structure are not valid, besacuse flags are not set. */
|
||||||
retVal = ListView_FindItem(hwndList, -1, &lvfi);
|
retVal = ListView_FindItem(hwndList, -1, &lvfi);
|
||||||
if (retVal != -1)
|
if (retVal != -1)
|
||||||
return TRUE; /* item found! */
|
return TRUE; /* item found! */
|
||||||
|
@ -552,7 +552,7 @@ DrawBackgroundPreview(LPDRAWITEMSTRUCT draw, PDATA pData)
|
||||||
|
|
||||||
if (pData->backgroundItems[pData->backgroundSelection].bWallpaper == FALSE)
|
if (pData->backgroundItems[pData->backgroundSelection].bWallpaper == FALSE)
|
||||||
{
|
{
|
||||||
/* update desktop background color image */
|
/* Update desktop background color image */
|
||||||
hBrush = CreateSolidBrush(g_GlobalData.desktop_color);
|
hBrush = CreateSolidBrush(g_GlobalData.desktop_color);
|
||||||
FillRect(hDC, &rcItem, hBrush);
|
FillRect(hDC, &rcItem, hBrush);
|
||||||
DeleteObject(hBrush);
|
DeleteObject(hBrush);
|
||||||
|
@ -732,7 +732,7 @@ SetDesktopBackColor(HWND hwndDlg, DATA *pData)
|
||||||
red = GetRValue(g_GlobalData.desktop_color);
|
red = GetRValue(g_GlobalData.desktop_color);
|
||||||
green = GetGValue(g_GlobalData.desktop_color);
|
green = GetGValue(g_GlobalData.desktop_color);
|
||||||
blue = GetBValue(g_GlobalData.desktop_color);
|
blue = GetBValue(g_GlobalData.desktop_color);
|
||||||
/* format string to be set to registry */
|
/* Format string to be set to registry */
|
||||||
wsprintf(clText, TEXT("%d %d %d"), red, green, blue);
|
wsprintf(clText, TEXT("%d %d %d"), red, green, blue);
|
||||||
RegSetValueEx(hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText,
|
RegSetValueEx(hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText,
|
||||||
(lstrlen(clText) + 1) * sizeof(TCHAR));
|
(lstrlen(clText) + 1) * sizeof(TCHAR));
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS Display Control Panel
|
* PROJECT: ReactOS Display Control Panel
|
||||||
* FILE: lib/cpl/desk/classinst.c
|
* FILE: dll/cpl/desk/classinst.c
|
||||||
* PURPOSE: Display class installer
|
* PURPOSE: Display class installer
|
||||||
*
|
*
|
||||||
* PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org)
|
* PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS Display Control Panel
|
* PROJECT: ReactOS Display Control Panel
|
||||||
* FILE: lib/cpl/desk/desk.c
|
* FILE: dll/cpl/desk/desk.c
|
||||||
* PURPOSE: ReactOS Display Control Panel
|
* PURPOSE: ReactOS Display Control Panel
|
||||||
*
|
*
|
||||||
* PROGRAMMERS: Trevor McCort (lycan359@gmail.com)
|
* PROGRAMMERS: Trevor McCort (lycan359@gmail.com)
|
||||||
|
|
|
@ -83,7 +83,7 @@ typedef struct _DISPLAY_DEVICE_ENTRY
|
||||||
LPTSTR DeviceKey;
|
LPTSTR DeviceKey;
|
||||||
LPTSTR DeviceID;
|
LPTSTR DeviceID;
|
||||||
DWORD DeviceStateFlags;
|
DWORD DeviceStateFlags;
|
||||||
PSETTINGS_ENTRY Settings; /* sorted by increasing dmPelsHeight, BPP */
|
PSETTINGS_ENTRY Settings; /* Sorted by increasing dmPelsHeight, BPP */
|
||||||
DWORD SettingsCount;
|
DWORD SettingsCount;
|
||||||
PRESOLUTION_INFO Resolutions;
|
PRESOLUTION_INFO Resolutions;
|
||||||
DWORD ResolutionsCount;
|
DWORD ResolutionsCount;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS Display Control Panel
|
* PROJECT: ReactOS Display Control Panel
|
||||||
* FILE: lib/cpl/desk/devsett.c
|
* FILE: dll/cpl/desk/devsett.c
|
||||||
* PURPOSE: ReactOS Display Control Panel Shell Extension Support
|
* PURPOSE: ReactOS Display Control Panel Shell Extension Support
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS Display Control Panel
|
* PROJECT: ReactOS Display Control Panel
|
||||||
* FILE: lib/cpl/desk/dibitmap.c
|
* FILE: dll/cpl/desk/dibitmap.c
|
||||||
* PURPOSE: DIB loading
|
* PURPOSE: DIB loading
|
||||||
*
|
*
|
||||||
* PROGRAMMERS: Trevor McCort (lycan359@gmail.com)
|
* PROGRAMMERS: Trevor McCort (lycan359@gmail.com)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS Display Control Panel
|
* PROJECT: ReactOS Display Control Panel
|
||||||
* FILE: lib/cpl/desk/draw.c
|
* FILE: dll/cpl/desk/draw.c
|
||||||
* PURPOSE: Providing drawing functions
|
* PURPOSE: Providing drawing functions
|
||||||
*
|
*
|
||||||
* PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
|
* PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
|
||||||
|
@ -257,22 +257,22 @@ MyDrawFrameCaption(HDC dc, LPRECT r, UINT uFlags, COLOR_SCHEME *scheme)
|
||||||
lf.lfCharSet = DEFAULT_CHARSET;
|
lf.lfCharSet = DEFAULT_CHARSET;
|
||||||
lstrcpy(lf.lfFaceName, TEXT("Marlett"));
|
lstrcpy(lf.lfFaceName, TEXT("Marlett"));
|
||||||
hFont = CreateFontIndirect(&lf);
|
hFont = CreateFontIndirect(&lf);
|
||||||
/* save font and text color */
|
/* Save font and text color */
|
||||||
hOldFont = SelectObject(dc, hFont);
|
hOldFont = SelectObject(dc, hFont);
|
||||||
clrsave = GetTextColor(dc);
|
clrsave = GetTextColor(dc);
|
||||||
bkmode = GetBkMode(dc);
|
bkmode = GetBkMode(dc);
|
||||||
/* set color and drawing mode */
|
/* Set color and drawing mode */
|
||||||
SetBkMode(dc, TRANSPARENT);
|
SetBkMode(dc, TRANSPARENT);
|
||||||
if(uFlags & DFCS_INACTIVE)
|
if(uFlags & DFCS_INACTIVE)
|
||||||
{
|
{
|
||||||
/* draw shadow */
|
/* Draw shadow */
|
||||||
SetTextColor(dc, scheme->crColor[COLOR_BTNHIGHLIGHT]);
|
SetTextColor(dc, scheme->crColor[COLOR_BTNHIGHLIGHT]);
|
||||||
TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1);
|
TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1);
|
||||||
}
|
}
|
||||||
SetTextColor(dc, scheme->crColor[(uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT]);
|
SetTextColor(dc, scheme->crColor[(uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT]);
|
||||||
/* draw selected symbol */
|
/* Draw selected symbol */
|
||||||
TextOut(dc, myr.left, myr.top, &Symbol, 1);
|
TextOut(dc, myr.left, myr.top, &Symbol, 1);
|
||||||
/* restore previous settings */
|
/* Restore previous settings */
|
||||||
SetTextColor(dc, clrsave);
|
SetTextColor(dc, clrsave);
|
||||||
SelectObject(dc, hOldFont);
|
SelectObject(dc, hOldFont);
|
||||||
SetBkMode(dc, bkmode);
|
SetBkMode(dc, bkmode);
|
||||||
|
@ -325,20 +325,20 @@ MyDrawFrameScroll(HDC dc, LPRECT r, UINT uFlags, COLOR_SCHEME *scheme)
|
||||||
lf.lfCharSet = DEFAULT_CHARSET;
|
lf.lfCharSet = DEFAULT_CHARSET;
|
||||||
lstrcpy(lf.lfFaceName, TEXT("Marlett"));
|
lstrcpy(lf.lfFaceName, TEXT("Marlett"));
|
||||||
hFont = CreateFontIndirect(&lf);
|
hFont = CreateFontIndirect(&lf);
|
||||||
/* save font and text color */
|
/* Save font and text color */
|
||||||
hOldFont = SelectObject(dc, hFont);
|
hOldFont = SelectObject(dc, hFont);
|
||||||
clrsave = GetTextColor(dc);
|
clrsave = GetTextColor(dc);
|
||||||
bkmode = GetBkMode(dc);
|
bkmode = GetBkMode(dc);
|
||||||
/* set color and drawing mode */
|
/* Set color and drawing mode */
|
||||||
SetBkMode(dc, TRANSPARENT);
|
SetBkMode(dc, TRANSPARENT);
|
||||||
if(uFlags & DFCS_INACTIVE)
|
if(uFlags & DFCS_INACTIVE)
|
||||||
{
|
{
|
||||||
/* draw shadow */
|
/* Draw shadow */
|
||||||
SetTextColor(dc, scheme->crColor[COLOR_BTNHIGHLIGHT]);
|
SetTextColor(dc, scheme->crColor[COLOR_BTNHIGHLIGHT]);
|
||||||
TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1);
|
TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1);
|
||||||
}
|
}
|
||||||
SetTextColor(dc, scheme->crColor[(uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT]);
|
SetTextColor(dc, scheme->crColor[(uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT]);
|
||||||
/* draw selected symbol */
|
/* Draw selected symbol */
|
||||||
TextOut(dc, myr.left, myr.top, &Symbol, 1);
|
TextOut(dc, myr.left, myr.top, &Symbol, 1);
|
||||||
/* restore previous settings */
|
/* restore previous settings */
|
||||||
SetTextColor(dc, clrsave);
|
SetTextColor(dc, clrsave);
|
||||||
|
|
|
@ -24,7 +24,7 @@ LengthOfStrResource(IN HINSTANCE hInst,
|
||||||
UINT x;
|
UINT x;
|
||||||
|
|
||||||
/* Find the string we're looking for */
|
/* Find the string we're looking for */
|
||||||
uID &= 0xF; /* position in the block, same as % 16 */
|
uID &= 0xF; /* Position in the block, same as % 16 */
|
||||||
for (x = 0; x < uID; x++)
|
for (x = 0; x < uID; x++)
|
||||||
{
|
{
|
||||||
lpStr += (*lpStr) + 1;
|
lpStr += (*lpStr) + 1;
|
||||||
|
|
|
@ -750,7 +750,7 @@ MonSelDrawDisabledRect(IN OUT PMONITORSELWND infoPtr,
|
||||||
|
|
||||||
if (infoPtr->hbrDisabled != NULL)
|
if (infoPtr->hbrDisabled != NULL)
|
||||||
{
|
{
|
||||||
/* FIXME - implement */
|
/* FIXME: Implement */
|
||||||
}
|
}
|
||||||
|
|
||||||
return Ret;
|
return Ret;
|
||||||
|
@ -1242,7 +1242,7 @@ MonitorSelWndProc(IN HWND hwnd,
|
||||||
if (!(infoPtr->ControlExStyle & MSLM_EX_SELECTONRIGHTCLICK))
|
if (!(infoPtr->ControlExStyle & MSLM_EX_SELECTONRIGHTCLICK))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* fall through */
|
/* Fall through */
|
||||||
}
|
}
|
||||||
|
|
||||||
case WM_LBUTTONDBLCLK:
|
case WM_LBUTTONDBLCLK:
|
||||||
|
@ -1274,7 +1274,7 @@ MonitorSelWndProc(IN HWND hwnd,
|
||||||
&pt);
|
&pt);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* fall through */
|
/* Fall through */
|
||||||
}
|
}
|
||||||
|
|
||||||
case WM_MBUTTONDOWN:
|
case WM_MBUTTONDOWN:
|
||||||
|
@ -1308,7 +1308,7 @@ MonitorSelWndProc(IN HWND hwnd,
|
||||||
{
|
{
|
||||||
case VK_TAB:
|
case VK_TAB:
|
||||||
{
|
{
|
||||||
/* change the UI status */
|
/* Change the UI status */
|
||||||
SendMessage(GetAncestor(hwnd,
|
SendMessage(GetAncestor(hwnd,
|
||||||
GA_PARENT),
|
GA_PARENT),
|
||||||
WM_CHANGEUISTATE,
|
WM_CHANGEUISTATE,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS Desktop Control Panel
|
* PROJECT: ReactOS Desktop Control Panel
|
||||||
* LICENSE: GPL - See COPYING in the top level directory
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
* FILE: lib/cpl/desk/preview.c
|
* FILE: dll/cpl/desk/preview.c
|
||||||
* PURPOSE: Draws the preview control
|
* PURPOSE: Draws the preview control
|
||||||
* COPYRIGHT: Copyright 2006, 2007 Eric Kohl
|
* COPYRIGHT: Copyright 2006, 2007 Eric Kohl
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS Desktop Control Panel
|
* PROJECT: ReactOS Desktop Control Panel
|
||||||
* LICENSE: GPL - See COPYING in the top level directory
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
* FILE: lib/cpl/desk/preview.h
|
* FILE: dll/cpl/desk/preview.h
|
||||||
* PURPOSE: Definitions used by the preview control
|
* PURPOSE: Definitions used by the preview control
|
||||||
* COPYRIGHT: Copyright 2006, 2007 Eric Kohl
|
* COPYRIGHT: Copyright 2006, 2007 Eric Kohl
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/* metrics */
|
/* Metrics */
|
||||||
#define PROPSHEETWIDTH 246
|
#define PROPSHEETWIDTH 246
|
||||||
#define PROPSHEETHEIGHT 228
|
#define PROPSHEETHEIGHT 228
|
||||||
#define PROPSHEETPADDING 6
|
#define PROPSHEETPADDING 6
|
||||||
|
|
|
@ -108,7 +108,7 @@ SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData)
|
||||||
STARTUPINFO si;
|
STARTUPINFO si;
|
||||||
TCHAR szCmdline[2048];
|
TCHAR szCmdline[2048];
|
||||||
|
|
||||||
/* kill off the previous preview process*/
|
/* Kill off the previous preview process */
|
||||||
if (pData->PrevWindowPi.hProcess)
|
if (pData->PrevWindowPi.hProcess)
|
||||||
{
|
{
|
||||||
TerminateProcess(pData->PrevWindowPi.hProcess, 0);
|
TerminateProcess(pData->PrevWindowPi.hProcess, 0);
|
||||||
|
@ -214,7 +214,7 @@ ScreensaverConfig(HWND hwndDlg, PDATA pData)
|
||||||
&si,
|
&si,
|
||||||
&pi))
|
&pi))
|
||||||
{
|
{
|
||||||
/* kill off the previous preview process */
|
/* Kill off the previous preview process */
|
||||||
if (pData->PrevWindowPi.hProcess)
|
if (pData->PrevWindowPi.hProcess)
|
||||||
{
|
{
|
||||||
TerminateProcess(pData->PrevWindowPi.hProcess, 0);
|
TerminateProcess(pData->PrevWindowPi.hProcess, 0);
|
||||||
|
@ -243,7 +243,7 @@ ScreensaverPreview(HWND hwndDlg, PDATA pData)
|
||||||
if (pData->Selection < 1)
|
if (pData->Selection < 1)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* kill off the previous preview process*/
|
/* Kill off the previous preview process */
|
||||||
if (pData->PrevWindowPi.hProcess)
|
if (pData->PrevWindowPi.hProcess)
|
||||||
{
|
{
|
||||||
TerminateProcess(pData->PrevWindowPi.hProcess, 0);
|
TerminateProcess(pData->PrevWindowPi.hProcess, 0);
|
||||||
|
@ -476,7 +476,7 @@ SetScreenSaver(HWND hwndDlg, PDATA pData)
|
||||||
TCHAR szTime[256], Sec;
|
TCHAR szTime[256], Sec;
|
||||||
UINT Ret;
|
UINT Ret;
|
||||||
|
|
||||||
/* set the screensaver */
|
/* Set the screensaver */
|
||||||
if (pData->ScreenSaverItems[pData->Selection].bIsScreenSaver)
|
if (pData->ScreenSaverItems[pData->Selection].bIsScreenSaver)
|
||||||
{
|
{
|
||||||
RegSetValueEx(regKey,
|
RegSetValueEx(regKey,
|
||||||
|
@ -515,7 +515,7 @@ SetScreenSaver(HWND hwndDlg, PDATA pData)
|
||||||
|
|
||||||
SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE);
|
SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE);
|
||||||
|
|
||||||
/* set the secure value */
|
/* Set the secure value */
|
||||||
Ret = SendDlgItemMessage(hwndDlg,
|
Ret = SendDlgItemMessage(hwndDlg,
|
||||||
IDC_SCREENS_USEPASSCHK,
|
IDC_SCREENS_USEPASSCHK,
|
||||||
BM_GETCHECK,
|
BM_GETCHECK,
|
||||||
|
@ -568,7 +568,7 @@ OnInitDialog(HWND hwndDlg, PDATA pData)
|
||||||
|
|
||||||
CheckRegScreenSaverIsSecure(hwndDlg);
|
CheckRegScreenSaverIsSecure(hwndDlg);
|
||||||
|
|
||||||
/* set the current screensaver in the combo box */
|
/* Set the current screensaver in the combo box */
|
||||||
lpCurSs = GetCurrentScreenSaverValue(_T("SCRNSAVE.EXE"));
|
lpCurSs = GetCurrentScreenSaverValue(_T("SCRNSAVE.EXE"));
|
||||||
if (lpCurSs)
|
if (lpCurSs)
|
||||||
{
|
{
|
||||||
|
@ -610,14 +610,14 @@ OnInitDialog(HWND hwndDlg, PDATA pData)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* set screensaver to (none) */
|
/* Set screensaver to (none) */
|
||||||
SendMessage(hwndSSCombo,
|
SendMessage(hwndSSCombo,
|
||||||
CB_SETCURSEL,
|
CB_SETCURSEL,
|
||||||
0,
|
0,
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set the current timeout */
|
/* Set the current timeout */
|
||||||
lpCurSs = GetCurrentScreenSaverValue(_T("ScreenSaveTimeOut"));
|
lpCurSs = GetCurrentScreenSaverValue(_T("ScreenSaveTimeOut"));
|
||||||
if (lpCurSs)
|
if (lpCurSs)
|
||||||
{
|
{
|
||||||
|
@ -758,7 +758,7 @@ ScreenSaverPageProc(HWND hwndDlg,
|
||||||
|
|
||||||
case PSN_SETACTIVE:
|
case PSN_SETACTIVE:
|
||||||
{
|
{
|
||||||
/* activate screen saver support */
|
/* Activate screen saver support */
|
||||||
SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, 0, SPIF_SENDCHANGE);
|
SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, 0, SPIF_SENDCHANGE);
|
||||||
SetScreenSaverPreviewBox(hwndDlg, pData);
|
SetScreenSaverPreviewBox(hwndDlg, pData);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -336,7 +336,7 @@ OnInitDialog(IN HWND hwndDlg)
|
||||||
1,
|
1,
|
||||||
(LPARAM)&monitors);
|
(LPARAM)&monitors);
|
||||||
}
|
}
|
||||||
else /* FIXME: incomplete! */
|
else /* FIXME: Incomplete! */
|
||||||
{
|
{
|
||||||
PMONSL_MONINFO pMonitors;
|
PMONSL_MONINFO pMonitors;
|
||||||
DWORD i;
|
DWORD i;
|
||||||
|
@ -424,7 +424,7 @@ ShowColorSpectrum(IN HDC hDC, IN LPRECT client, IN DWORD BitsPerPel, IN PDATA pD
|
||||||
static VOID
|
static VOID
|
||||||
OnBPPChanged(IN HWND hwndDlg, IN PDATA pData)
|
OnBPPChanged(IN HWND hwndDlg, IN PDATA pData)
|
||||||
{
|
{
|
||||||
/* if new BPP is not compatible with resolution:
|
/* If new BPP is not compatible with resolution:
|
||||||
* 1) try to find the nearest smaller matching resolution
|
* 1) try to find the nearest smaller matching resolution
|
||||||
* 2) otherwise, get the nearest bigger resolution
|
* 2) otherwise, get the nearest bigger resolution
|
||||||
*/
|
*/
|
||||||
|
@ -444,11 +444,11 @@ OnBPPChanged(IN HWND hwndDlg, IN PDATA pData)
|
||||||
GetClientRect(hSpectrumControl, &client);
|
GetClientRect(hSpectrumControl, &client);
|
||||||
ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pData);
|
ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pData);
|
||||||
|
|
||||||
/* find if new parameters are valid */
|
/* Find if new parameters are valid */
|
||||||
Current = pData->CurrentDisplayDevice->CurrentSettings;
|
Current = pData->CurrentDisplayDevice->CurrentSettings;
|
||||||
if (dmNewBitsPerPel == Current->dmBitsPerPel)
|
if (dmNewBitsPerPel == Current->dmBitsPerPel)
|
||||||
{
|
{
|
||||||
/* no change */
|
/* No change */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -487,7 +487,7 @@ OnBPPChanged(IN HWND hwndDlg, IN PDATA pData)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* search smaller resolution compatible with current color depth */
|
/* Search smaller resolution compatible with current color depth */
|
||||||
Current = pData->CurrentDisplayDevice->CurrentSettings->Blink;
|
Current = pData->CurrentDisplayDevice->CurrentSettings->Blink;
|
||||||
while (Current != NULL)
|
while (Current != NULL)
|
||||||
{
|
{
|
||||||
|
@ -500,7 +500,7 @@ OnBPPChanged(IN HWND hwndDlg, IN PDATA pData)
|
||||||
Current = Current->Blink;
|
Current = Current->Blink;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* search bigger resolution compatible with current color depth */
|
/* Search bigger resolution compatible with current color depth */
|
||||||
Current = pData->CurrentDisplayDevice->CurrentSettings->Flink;
|
Current = pData->CurrentDisplayDevice->CurrentSettings->Flink;
|
||||||
while (Current != NULL)
|
while (Current != NULL)
|
||||||
{
|
{
|
||||||
|
@ -513,14 +513,14 @@ OnBPPChanged(IN HWND hwndDlg, IN PDATA pData)
|
||||||
Current = Current->Flink;
|
Current = Current->Flink;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* we shouldn't go there */
|
/* We shouldn't go there */
|
||||||
}
|
}
|
||||||
|
|
||||||
static VOID
|
static VOID
|
||||||
OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition,
|
OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition,
|
||||||
IN BOOL bUpdateThumb)
|
IN BOOL bUpdateThumb)
|
||||||
{
|
{
|
||||||
/* if new resolution is not compatible with color depth:
|
/* If new resolution is not compatible with color depth:
|
||||||
* 1) try to find the nearest bigger matching color depth
|
* 1) try to find the nearest bigger matching color depth
|
||||||
* 2) otherwise, get the nearest smaller color depth
|
* 2) otherwise, get the nearest smaller color depth
|
||||||
*/
|
*/
|
||||||
|
@ -528,11 +528,11 @@ OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition,
|
||||||
DWORD dmNewPelsHeight = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight;
|
DWORD dmNewPelsHeight = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight;
|
||||||
DWORD dmNewPelsWidth = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth;
|
DWORD dmNewPelsWidth = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth;
|
||||||
|
|
||||||
/* find if new parameters are valid */
|
/* Find if new parameters are valid */
|
||||||
Current = pData->CurrentDisplayDevice->CurrentSettings;
|
Current = pData->CurrentDisplayDevice->CurrentSettings;
|
||||||
if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth)
|
if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth)
|
||||||
{
|
{
|
||||||
/* no change */
|
/* No change */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -571,7 +571,7 @@ OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* search bigger color depth compatible with current resolution */
|
/* Search bigger color depth compatible with current resolution */
|
||||||
Current = pData->CurrentDisplayDevice->CurrentSettings->Flink;
|
Current = pData->CurrentDisplayDevice->CurrentSettings->Flink;
|
||||||
while (Current != NULL)
|
while (Current != NULL)
|
||||||
{
|
{
|
||||||
|
@ -584,7 +584,7 @@ OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition,
|
||||||
Current = Current->Flink;
|
Current = Current->Flink;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* search smaller color depth compatible with current resolution */
|
/* Search smaller color depth compatible with current resolution */
|
||||||
Current = pData->CurrentDisplayDevice->CurrentSettings->Blink;
|
Current = pData->CurrentDisplayDevice->CurrentSettings->Blink;
|
||||||
while (Current != NULL)
|
while (Current != NULL)
|
||||||
{
|
{
|
||||||
|
@ -597,7 +597,7 @@ OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition,
|
||||||
Current = Current->Blink;
|
Current = Current->Blink;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* we shouldn't go there */
|
/* We shouldn't go there */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Property sheet page callback */
|
/* Property sheet page callback */
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS Display Control Panel
|
* PROJECT: ReactOS Display Control Panel
|
||||||
* FILE: lib/cpl/desk/theme.c
|
* FILE: dll/cpl/desk/theme.c
|
||||||
* PURPOSE: Handling themes
|
* PURPOSE: Handling themes
|
||||||
*
|
*
|
||||||
* PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
|
* PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
|
||||||
|
@ -122,7 +122,7 @@ VOID LoadCurrentScheme(COLOR_SCHEME* scheme)
|
||||||
scheme->Effects.bTooltipAnimation = scheme->Effects.bMenuAnimation;
|
scheme->Effects.bTooltipAnimation = scheme->Effects.bMenuAnimation;
|
||||||
scheme->Effects.bTooltipFade = scheme->Effects.bMenuFade;
|
scheme->Effects.bTooltipFade = scheme->Effects.bMenuFade;
|
||||||
|
|
||||||
/* show content of windows during dragging */
|
/* Show content of windows during dragging */
|
||||||
SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &scheme->Effects.bDragFullWindows, 0);
|
SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &scheme->Effects.bDragFullWindows, 0);
|
||||||
|
|
||||||
/* "Hide underlined letters for keyboard navigation until I press the Alt key" */
|
/* "Hide underlined letters for keyboard navigation until I press the Alt key" */
|
||||||
|
@ -306,7 +306,7 @@ VOID ApplyScheme(COLOR_SCHEME* scheme, INT SchemeId)
|
||||||
|
|
||||||
BOOL SaveScheme(COLOR_SCHEME* scheme, LPCTSTR strLegacyName)
|
BOOL SaveScheme(COLOR_SCHEME* scheme, LPCTSTR strLegacyName)
|
||||||
{
|
{
|
||||||
/* FIXME: implement */
|
/* FIXME: Implement */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -341,7 +341,7 @@ INT LoadSchemePresetEntries(LPTSTR pszSelectedStyle)
|
||||||
while((RegEnumKeyEx(hkNewSchemes, iStyle, g_ColorSchemes[iTemplateIndex].strKeyName, &dwLength,
|
while((RegEnumKeyEx(hkNewSchemes, iStyle, g_ColorSchemes[iTemplateIndex].strKeyName, &dwLength,
|
||||||
NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) && (iTemplateIndex < MAX_TEMPLATES))
|
NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) && (iTemplateIndex < MAX_TEMPLATES))
|
||||||
{
|
{
|
||||||
/* is it really a template or one of the other entries */
|
/* Is it really a template or one of the other entries */
|
||||||
if (dwLength <= 4)
|
if (dwLength <= 4)
|
||||||
{
|
{
|
||||||
if (RegOpenKeyEx(hkNewSchemes, g_ColorSchemes[iTemplateIndex].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS)
|
if (RegOpenKeyEx(hkNewSchemes, g_ColorSchemes[iTemplateIndex].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS)
|
||||||
|
|
|
@ -319,7 +319,7 @@ InitProbeListPage(HWND hwndDlg)
|
||||||
|
|
||||||
if (hDevInfo == INVALID_HANDLE_VALUE) return;
|
if (hDevInfo == INVALID_HANDLE_VALUE) return;
|
||||||
|
|
||||||
/* get the device image List */
|
/* Get the device image List */
|
||||||
ImageListData.cbSize = sizeof(ImageListData);
|
ImageListData.cbSize = sizeof(ImageListData);
|
||||||
SetupDiGetClassImageList(&ImageListData);
|
SetupDiGetClassImageList(&ImageListData);
|
||||||
|
|
||||||
|
@ -335,7 +335,7 @@ InitProbeListPage(HWND hwndDlg)
|
||||||
if (ulStatus & DN_NO_SHOW_IN_DM) continue;
|
if (ulStatus & DN_NO_SHOW_IN_DM) continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* get the device's friendly name */
|
/* Get the device's friendly name */
|
||||||
if (!SetupDiGetDeviceRegistryProperty(hDevInfo,
|
if (!SetupDiGetDeviceRegistryProperty(hDevInfo,
|
||||||
&DevInfoData,
|
&DevInfoData,
|
||||||
SPDRP_FRIENDLYNAME,
|
SPDRP_FRIENDLYNAME,
|
||||||
|
@ -344,7 +344,7 @@ InitProbeListPage(HWND hwndDlg)
|
||||||
MAX_STR_SIZE,
|
MAX_STR_SIZE,
|
||||||
NULL))
|
NULL))
|
||||||
{
|
{
|
||||||
/* if the friendly name fails, try the description instead */
|
/* If the friendly name fails, try the description instead */
|
||||||
SetupDiGetDeviceRegistryProperty(hDevInfo,
|
SetupDiGetDeviceRegistryProperty(hDevInfo,
|
||||||
&DevInfoData,
|
&DevInfoData,
|
||||||
SPDRP_DEVICEDESC,
|
SPDRP_DEVICEDESC,
|
||||||
|
@ -574,7 +574,7 @@ EnumDeviceClasses(INT ClassIndex,
|
||||||
0);
|
0);
|
||||||
if (Ret != CR_SUCCESS)
|
if (Ret != CR_SUCCESS)
|
||||||
{
|
{
|
||||||
/* all classes enumerated */
|
/* All classes enumerated */
|
||||||
if(Ret == CR_NO_SUCH_VALUE)
|
if(Ret == CR_NO_SUCH_VALUE)
|
||||||
{
|
{
|
||||||
hDevInfoTypes = NULL;
|
hDevInfoTypes = NULL;
|
||||||
|
@ -583,10 +583,10 @@ EnumDeviceClasses(INT ClassIndex,
|
||||||
|
|
||||||
if (Ret == CR_INVALID_DATA)
|
if (Ret == CR_INVALID_DATA)
|
||||||
{
|
{
|
||||||
; /*FIXME: what should we do here? */
|
; /* FIXME: What should we do here? */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* handle other errors... */
|
/* Handle other errors... */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SetupDiClassNameFromGuid(&ClassGuid,
|
if (SetupDiClassNameFromGuid(&ClassGuid,
|
||||||
|
@ -601,9 +601,9 @@ EnumDeviceClasses(INT ClassIndex,
|
||||||
&ClassGuid,
|
&ClassGuid,
|
||||||
ClassImage))
|
ClassImage))
|
||||||
{
|
{
|
||||||
/* FIXME: can we do this?
|
/* FIXME: Can we do this?
|
||||||
* Set the blank icon: IDI_SETUPAPI_BLANK = 41
|
* Set the blank icon: IDI_SETUPAPI_BLANK = 41
|
||||||
* it'll be image 24 in the imagelist */
|
* It'll be image 24 in the imagelist */
|
||||||
*ClassImage = 24;
|
*ClassImage = 24;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -696,7 +696,7 @@ InitHardWareTypesPage(HWND hwndDlg)
|
||||||
|
|
||||||
(VOID) ListView_InsertItem(hList, &Item);
|
(VOID) ListView_InsertItem(hList, &Item);
|
||||||
|
|
||||||
/* kill InfoList initialized in EnumDeviceClasses */
|
/* Kill InfoList initialized in EnumDeviceClasses */
|
||||||
if (hDevInfoTypes)
|
if (hDevInfoTypes)
|
||||||
{
|
{
|
||||||
SetupDiDestroyDeviceInfoList(hDevInfoTypes);
|
SetupDiDestroyDeviceInfoList(hDevInfoTypes);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: Add Hardware Control Panel Applet
|
* PROJECT: Add Hardware Control Panel Applet
|
||||||
* LICENSE: GPL - See COPYING in the top level directory
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
* FILE: dll/cpl/hdwwiz/Uk.rc
|
* FILE: dll/cpl/hdwwiz/lang/uk-UA.rc
|
||||||
* PURPOSE: Ukraianian Language File for Add Hardware Control Panel Applet
|
* PURPOSE: Ukraianian Language File for Add Hardware Control Panel Applet
|
||||||
* TRANSLATORS: Artem Reznikov, Igor Paliychuk
|
* TRANSLATORS: Artem Reznikov, Igor Paliychuk
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -26,7 +26,7 @@ CAPTION "Roz
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
GROUPBOX "Vypnutie funkcie Caps Lock", -1, 7, 7, 258, 26
|
GROUPBOX "Vypnutie funkcie Caps Lock", -1, 7, 7, 258, 26
|
||||||
AUTORADIOBUTTON "Stlaèením klávesu CAPS &LOCK", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP //ten kláves, nie tá klávesa
|
AUTORADIOBUTTON "Stlaèením klávesu CAPS &LOCK", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP // Ten kláves, nie tá klávesa
|
||||||
AUTORADIOBUTTON " Stlaèením klávesu SHI&FT", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP
|
AUTORADIOBUTTON " Stlaèením klávesu SHI&FT", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP
|
||||||
GROUPBOX "Klávesové skratky pre vstupné jazyky", -1, 7, 37, 258, 95
|
GROUPBOX "Klávesové skratky pre vstupné jazyky", -1, 7, 37, 258, 95
|
||||||
LTEXT "Akcia", -1, 14, 47, 60, 9
|
LTEXT "Akcia", -1, 14, 47, 60, 9
|
||||||
|
@ -114,7 +114,7 @@ BEGIN
|
||||||
IDS_ARMENIAN_WESTERN_LAYOUT, "Arménske Western"
|
IDS_ARMENIAN_WESTERN_LAYOUT, "Arménske Western"
|
||||||
IDS_ASSAMESE_LAYOUT, "Assamese"
|
IDS_ASSAMESE_LAYOUT, "Assamese"
|
||||||
IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic"
|
IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic"
|
||||||
IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" //latinka ?
|
IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" // Latinka?
|
||||||
IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)"
|
IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)"
|
||||||
IDS_BELGIAN_FRENCH_LAYOUT, "Belgické French"
|
IDS_BELGIAN_FRENCH_LAYOUT, "Belgické French"
|
||||||
IDS_BELGIAN_LAYOUT, "Belgické (Period)"
|
IDS_BELGIAN_LAYOUT, "Belgické (Period)"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/* metrics */
|
/* Metrics */
|
||||||
#define PROPSHEETWIDTH 252
|
#define PROPSHEETWIDTH 252
|
||||||
#define PROPSHEETHEIGHT 228
|
#define PROPSHEETHEIGHT 228
|
||||||
#define PROPSHEETPADDING 6
|
#define PROPSHEETPADDING 6
|
||||||
|
|
|
@ -545,7 +545,7 @@ SaveInputLang(HWND hDlg)
|
||||||
_ultot(OldLayoutNum, szLayoutNum, 10);
|
_ultot(OldLayoutNum, szLayoutNum, 10);
|
||||||
if (!GetLayoutID(szLayoutNum, szLayoutID)) return;
|
if (!GetLayoutID(szLayoutNum, szLayoutID)) return;
|
||||||
|
|
||||||
// if old layout = selected layout
|
// If old layout = selected layout
|
||||||
if (_tcscmp(szLayoutID, pts) == 0) return;
|
if (_tcscmp(szLayoutID, pts) == 0) return;
|
||||||
|
|
||||||
if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0,
|
if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0,
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
#include "intl.h"
|
#include "intl.h"
|
||||||
|
|
||||||
typedef struct CPStruct
|
typedef struct CPStruct
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
/* $Id$
|
/* $Id$
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS International Control Panel
|
* PROJECT: ReactOS International Control Panel
|
||||||
* FILE: lib/cpl/intl/currency.c
|
* FILE: dll/cpl/intl/currency.c
|
||||||
* PURPOSE: Currency property page
|
* PURPOSE: Currency property page
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
*/
|
*/
|
||||||
|
@ -36,14 +36,14 @@ UpdateExamples(HWND hwndDlg, PGLOBALDATA pGlobalData)
|
||||||
{
|
{
|
||||||
TCHAR szBuffer[MAX_FMT_SIZE];
|
TCHAR szBuffer[MAX_FMT_SIZE];
|
||||||
|
|
||||||
/* positive example */
|
/* Positive example */
|
||||||
GetCurrencyFormat(pGlobalData->lcid, 0,
|
GetCurrencyFormat(pGlobalData->lcid, 0,
|
||||||
POSITIVE_EXAMPLE,
|
POSITIVE_EXAMPLE,
|
||||||
NULL, szBuffer, MAX_FMT_SIZE);
|
NULL, szBuffer, MAX_FMT_SIZE);
|
||||||
|
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSSAMPLE), WM_SETTEXT, 0, (LPARAM)szBuffer);
|
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSSAMPLE), WM_SETTEXT, 0, (LPARAM)szBuffer);
|
||||||
|
|
||||||
/* negative example */
|
/* Negative example */
|
||||||
GetCurrencyFormat(pGlobalData->lcid, 0,
|
GetCurrencyFormat(pGlobalData->lcid, 0,
|
||||||
NEGATIVE_EXAMPLE,
|
NEGATIVE_EXAMPLE,
|
||||||
NULL, szBuffer, MAX_FMT_SIZE);
|
NULL, szBuffer, MAX_FMT_SIZE);
|
||||||
|
@ -75,7 +75,7 @@ InitCurrencySymbols(HWND hwndDlg, PGLOBALDATA pGlobalData)
|
||||||
|
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL),
|
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL),
|
||||||
CB_SETCURSEL,
|
CB_SETCURSEL,
|
||||||
0, /* index */
|
0, /* Index */
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -251,7 +251,7 @@ InitCurrencyDecimalSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData)
|
||||||
LOCALE_SMONDECIMALSEP,
|
LOCALE_SMONDECIMALSEP,
|
||||||
szBuffer, MAX_FMT_SIZE);
|
szBuffer, MAX_FMT_SIZE);
|
||||||
|
|
||||||
/* decimal separator */
|
/* Decimal separator */
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP),
|
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP),
|
||||||
CB_ADDSTRING,
|
CB_ADDSTRING,
|
||||||
0,
|
0,
|
||||||
|
@ -259,7 +259,7 @@ InitCurrencyDecimalSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData)
|
||||||
|
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP),
|
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP),
|
||||||
CB_SETCURSEL,
|
CB_SETCURSEL,
|
||||||
0, /* index */
|
0, /* Index */
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -321,7 +321,7 @@ InitCurrencyGroupSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData)
|
||||||
LOCALE_SMONTHOUSANDSEP,
|
LOCALE_SMONTHOUSANDSEP,
|
||||||
szBuffer, MAX_FMT_SIZE);
|
szBuffer, MAX_FMT_SIZE);
|
||||||
|
|
||||||
/* digit group separator */
|
/* Digit group separator */
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP),
|
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP),
|
||||||
CB_ADDSTRING,
|
CB_ADDSTRING,
|
||||||
0,
|
0,
|
||||||
|
@ -329,7 +329,7 @@ InitCurrencyGroupSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData)
|
||||||
|
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP),
|
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP),
|
||||||
CB_SETCURSEL,
|
CB_SETCURSEL,
|
||||||
0, /* index */
|
0, /* Index */
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -353,7 +353,7 @@ InitDigitGroupCB(HWND hwndDlg, PGLOBALDATA pGlobalData)
|
||||||
LOCALE_SMONGROUPING,
|
LOCALE_SMONGROUPING,
|
||||||
szGrouping, MAX_FMT_SIZE);
|
szGrouping, MAX_FMT_SIZE);
|
||||||
|
|
||||||
/* digit grouping */
|
/* Digit grouping */
|
||||||
cyFmt.NumDigits = 0;
|
cyFmt.NumDigits = 0;
|
||||||
cyFmt.LeadingZero = 0;
|
cyFmt.LeadingZero = 0;
|
||||||
cyFmt.lpDecimalSep = _T("");
|
cyFmt.lpDecimalSep = _T("");
|
||||||
|
@ -400,7 +400,7 @@ InitDigitGroupCB(HWND hwndDlg, PGLOBALDATA pGlobalData)
|
||||||
|
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM),
|
SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM),
|
||||||
CB_SETCURSEL,
|
CB_SETCURSEL,
|
||||||
i, /* index */
|
i, /* Index */
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -462,7 +462,7 @@ SetCurrencyFracSymNum(HWND hwndDlg, LCID lcid)
|
||||||
(WPARAM)0,
|
(WPARAM)0,
|
||||||
(LPARAM)0);
|
(LPARAM)0);
|
||||||
|
|
||||||
/* convert to wide char */
|
/* Convert to wide char */
|
||||||
_itot(nCurrSel, szCurrencyFracSymNum, DECIMAL_RADIX);
|
_itot(nCurrSel, szCurrencyFracSymNum, DECIMAL_RADIX);
|
||||||
|
|
||||||
/* Save number of fractional symbols */
|
/* Save number of fractional symbols */
|
||||||
|
@ -504,7 +504,7 @@ SetNegCurrencySumFmt(HWND hwndDlg, LCID lcid)
|
||||||
(WPARAM)0,
|
(WPARAM)0,
|
||||||
(LPARAM)0);
|
(LPARAM)0);
|
||||||
|
|
||||||
/* convert to wide char */
|
/* Convert to wide char */
|
||||||
_itot(nCurrSel, szNegCurrencySumFmt, DECIMAL_RADIX);
|
_itot(nCurrSel, szNegCurrencySumFmt, DECIMAL_RADIX);
|
||||||
|
|
||||||
/* Save currency sum format */
|
/* Save currency sum format */
|
||||||
|
@ -526,7 +526,7 @@ SetPosCurrencySumFmt(HWND hwndDlg, LCID lcid)
|
||||||
(WPARAM)0,
|
(WPARAM)0,
|
||||||
(LPARAM)0);
|
(LPARAM)0);
|
||||||
|
|
||||||
/* convert to wide char */
|
/* Convert to wide char */
|
||||||
_itot(nCurrSel, szPosCurrencySumFmt, DECIMAL_RADIX);
|
_itot(nCurrSel, szPosCurrencySumFmt, DECIMAL_RADIX);
|
||||||
|
|
||||||
/* Save currency sum format */
|
/* Save currency sum format */
|
||||||
|
@ -630,7 +630,6 @@ CurrencyPageProc(HWND hwndDlg,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
/* $Id$
|
/* $Id$
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS International Control Panel
|
* PROJECT: ReactOS International Control Panel
|
||||||
* FILE: lib/cpl/intl/date.c
|
* FILE: dll/cpl/intl/date.c
|
||||||
* PURPOSE: Date property page
|
* PURPOSE: Date property page
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
*/
|
*/
|
||||||
|
@ -38,7 +38,7 @@ static HWND hwndEnum = NULL;
|
||||||
|
|
||||||
/* FUNCTIONS ****************************************************************/
|
/* FUNCTIONS ****************************************************************/
|
||||||
|
|
||||||
/* if char is 'y' or 'M' or 'd' return TRUE, else FALSE */
|
/* If char is 'y' or 'M' or 'd' return TRUE, else FALSE */
|
||||||
BOOL
|
BOOL
|
||||||
isDateCompAl(TCHAR alpha)
|
isDateCompAl(TCHAR alpha)
|
||||||
{
|
{
|
||||||
|
@ -173,7 +173,7 @@ SetShortDateFormat(HWND hwndDlg, LCID lcid)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* substring replacement of separator */
|
/* Substring replacement of separator */
|
||||||
_tcscpy(szFindedDateSep, FindDateSep(szShortDateFmt));
|
_tcscpy(szFindedDateSep, FindDateSep(szShortDateFmt));
|
||||||
pszResultStr = ReplaceSubStr(szShortDateFmt, szShortDateSep, szFindedDateSep);
|
pszResultStr = ReplaceSubStr(szShortDateFmt, szShortDateSep, szFindedDateSep);
|
||||||
_tcscpy(szShortDateFmt, pszResultStr);
|
_tcscpy(szShortDateFmt, pszResultStr);
|
||||||
|
@ -278,7 +278,7 @@ InitShortDateSepSamples(HWND hwndDlg, LCID lcid)
|
||||||
-1,
|
-1,
|
||||||
(LPARAM)szShortDateSep);
|
(LPARAM)szShortDateSep);
|
||||||
|
|
||||||
/* if is not success, add new value to list and select them */
|
/* If it is not successful, add new value to list and select them */
|
||||||
if (nRetCode == CB_ERR)
|
if (nRetCode == CB_ERR)
|
||||||
{
|
{
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATESEP_COMBO),
|
SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATESEP_COMBO),
|
||||||
|
@ -342,7 +342,7 @@ InitShortDateCB(HWND hwndDlg, LCID lcid)
|
||||||
-1,
|
-1,
|
||||||
(LPARAM)szShortDateFmt);
|
(LPARAM)szShortDateFmt);
|
||||||
|
|
||||||
/* if is not success, add new value to list and select them */
|
/* If it is not successful, add new value to list and select them */
|
||||||
if (nRetCode == CB_ERR)
|
if (nRetCode == CB_ERR)
|
||||||
{
|
{
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO),
|
SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO),
|
||||||
|
@ -391,7 +391,7 @@ InitLongDateCB(HWND hwndDlg, LCID lcid)
|
||||||
-1,
|
-1,
|
||||||
(LPARAM)szLongDateFmt);
|
(LPARAM)szLongDateFmt);
|
||||||
|
|
||||||
/* if is not success, add new value to list and select them */
|
/* If it is not successful, add new value to list and select them */
|
||||||
if (nRetCode == CB_ERR)
|
if (nRetCode == CB_ERR)
|
||||||
{
|
{
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO),
|
SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO),
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
/* $Id$
|
/* $Id$
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS International Control Panel
|
* PROJECT: ReactOS International Control Panel
|
||||||
* FILE: lib/cpl/intl/generalp.c
|
* FILE: dll/cpl/intl/generalp.c
|
||||||
* PURPOSE: General property page
|
* PURPOSE: General property page
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
* Klemens Friedl
|
* Klemens Friedl
|
||||||
|
@ -176,7 +176,7 @@ SetNewLocale(LCID lcid)
|
||||||
ret = RegOpenKey(HKEY_CURRENT_USER, _T("Control Panel\\International"), &localeKey);
|
ret = RegOpenKey(HKEY_CURRENT_USER, _T("Control Panel\\International"), &localeKey);
|
||||||
if (ret != ERROR_SUCCESS)
|
if (ret != ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
// some serious error
|
// Some serious error
|
||||||
MessageBox(NULL, _T("Problem opening HKCU\\Control Panel\\International key"),
|
MessageBox(NULL, _T("Problem opening HKCU\\Control Panel\\International key"),
|
||||||
_T("Big Problem"), MB_OK);
|
_T("Big Problem"), MB_OK);
|
||||||
return;
|
return;
|
||||||
|
@ -191,7 +191,7 @@ SetNewLocale(LCID lcid)
|
||||||
ret = RegOpenKey(HKEY_USERS, _T(".DEFAULT\\Control Panel\\International"), &localeKey);
|
ret = RegOpenKey(HKEY_USERS, _T(".DEFAULT\\Control Panel\\International"), &localeKey);
|
||||||
if (ret != ERROR_SUCCESS)
|
if (ret != ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
// some serious error
|
// Some serious error
|
||||||
MessageBox(NULL, _T("Problem opening HKU\\.DEFAULT\\Control Panel\\International key"),
|
MessageBox(NULL, _T("Problem opening HKU\\.DEFAULT\\Control Panel\\International key"),
|
||||||
_T("Big Problem"), MB_OK);
|
_T("Big Problem"), MB_OK);
|
||||||
return;
|
return;
|
||||||
|
@ -451,5 +451,4 @@ GeneralPageProc(HWND hwndDlg,
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* EOF */
|
/* EOF */
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
/* $Id$
|
/* $Id$
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS International Control Panel
|
* PROJECT: ReactOS International Control Panel
|
||||||
* FILE: lib/cpl/intl/inplocale.c
|
* FILE: dll/cpl/intl/inplocale.c
|
||||||
* PURPOSE: Input Locale property page
|
* PURPOSE: Input Locale property page
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
/* $Id$
|
/* $Id$
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS International Control Panel
|
* PROJECT: ReactOS International Control Panel
|
||||||
* FILE: lib/cpl/intl/intl.c
|
* FILE: dll/cpl/intl/intl.c
|
||||||
* PURPOSE: Property sheet code
|
* PURPOSE: Property sheet code
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
*/
|
*/
|
||||||
|
@ -207,4 +207,3 @@ DllMain(HINSTANCE hinstDLL,
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
#define DECIMAL_RADIX 10
|
#define DECIMAL_RADIX 10
|
||||||
|
|
||||||
/* limits */
|
/* Limits */
|
||||||
#define MAX_FMT_SIZE 30
|
#define MAX_FMT_SIZE 30
|
||||||
#define MAX_STR_SIZE 128
|
#define MAX_STR_SIZE 128
|
||||||
#define MAX_SAMPLES_STR_SIZE 70
|
#define MAX_SAMPLES_STR_SIZE 70
|
||||||
|
|
|
@ -238,6 +238,5 @@ AddNewKbLayoutsByLcid(LCID Lcid)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SetupCloseInfFile(hIntlInf);
|
SetupCloseInfFile(hIntlInf);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
#include "intl.h"
|
#include "intl.h"
|
||||||
|
|
||||||
/* Property page dialog callback */
|
/* Property page dialog callback */
|
||||||
|
@ -40,7 +39,6 @@ LanguagesPageProc(HWND hwndDlg,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
#include "intl.h"
|
#include "intl.h"
|
||||||
|
|
||||||
#define NUM_SHEETS 4
|
#define NUM_SHEETS 4
|
||||||
|
@ -52,7 +51,7 @@ InsSpacesFmt(LPCTSTR szSourceStr, LPCTSTR szFmtStr)
|
||||||
|
|
||||||
_tcscpy(pszDestStr, szSourceStr);
|
_tcscpy(pszDestStr, szSourceStr);
|
||||||
|
|
||||||
/* if format is clean return source string */
|
/* If format is clean return source string */
|
||||||
if (!*szFmtStr)
|
if (!*szFmtStr)
|
||||||
return pszDestStr;
|
return pszDestStr;
|
||||||
|
|
||||||
|
@ -80,12 +79,12 @@ InsSpacesFmt(LPCTSTR szSourceStr, LPCTSTR szFmtStr)
|
||||||
szFmtVal[nValCount] = _T('\0');
|
szFmtVal[nValCount] = _T('\0');
|
||||||
nValCount=0;
|
nValCount=0;
|
||||||
|
|
||||||
/* insert space to finded position plus all pos before */
|
/* Insert space to finded position plus all pos before */
|
||||||
pszTempStr = InsSpacePos(pszDestStr, nSpaceOffset);
|
pszTempStr = InsSpacePos(pszDestStr, nSpaceOffset);
|
||||||
_tcscpy(pszDestStr,pszTempStr);
|
_tcscpy(pszDestStr,pszTempStr);
|
||||||
free(pszTempStr);
|
free(pszTempStr);
|
||||||
|
|
||||||
/* num of spaces total increment */
|
/* Num of spaces total increment */
|
||||||
if (!wasNul)
|
if (!wasNul)
|
||||||
{
|
{
|
||||||
nSpaceOffset++;
|
nSpaceOffset++;
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
/* $Id$
|
/* $Id$
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS International Control Panel
|
* PROJECT: ReactOS International Control Panel
|
||||||
* FILE: lib/cpl/intl/numbers.c
|
* FILE: dll/cpl/intl/numbers.c
|
||||||
* PURPOSE: Numbers property page
|
* PURPOSE: Numbers property page
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
*/
|
*/
|
||||||
|
@ -95,7 +95,7 @@ InitNumDecimalSepCB(HWND hwndDlg, LCID lcid)
|
||||||
-1,
|
-1,
|
||||||
(LPARAM)(LPCSTR)szNumSep);
|
(LPARAM)(LPCSTR)szNumSep);
|
||||||
|
|
||||||
/* if is not success, add new value to list and select them */
|
/* If it is not successful, add new values to list and select them */
|
||||||
if (nRetCode == CB_ERR)
|
if (nRetCode == CB_ERR)
|
||||||
{
|
{
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERDSYMBOL),
|
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERDSYMBOL),
|
||||||
|
@ -132,7 +132,7 @@ InitNumOfFracSymbCB(HWND hwndDlg, LCID lcid)
|
||||||
/* Create standard list of fractional symbols */
|
/* Create standard list of fractional symbols */
|
||||||
for (nCBIndex = 0; nCBIndex < MAX_FRAC_NUM_SAMPLES; nCBIndex++)
|
for (nCBIndex = 0; nCBIndex < MAX_FRAC_NUM_SAMPLES; nCBIndex++)
|
||||||
{
|
{
|
||||||
/* convert to wide char */
|
/* Convert to wide char */
|
||||||
_itot(nCBIndex, szFracCount, DECIMAL_RADIX);
|
_itot(nCBIndex, szFracCount, DECIMAL_RADIX);
|
||||||
|
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSNDIGDEC),
|
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSNDIGDEC),
|
||||||
|
@ -189,7 +189,7 @@ InitNumFieldSepCB(HWND hwndDlg, LCID lcid)
|
||||||
-1,
|
-1,
|
||||||
(LPARAM)szFieldSep);
|
(LPARAM)szFieldSep);
|
||||||
|
|
||||||
/* if is not success, add new value to list and select them */
|
/* If it is not success, add new values to list and select them */
|
||||||
if (nRetCode == CB_ERR)
|
if (nRetCode == CB_ERR)
|
||||||
{
|
{
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSDIGITGRSYM),
|
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSDIGITGRSYM),
|
||||||
|
@ -243,7 +243,7 @@ InitFieldDigNumCB(HWND hwndDlg, LCID lcid)
|
||||||
-1,
|
-1,
|
||||||
(LPARAM)pszFieldDigNumSmpl);
|
(LPARAM)pszFieldDigNumSmpl);
|
||||||
|
|
||||||
/* if is not success, add new value to list and select them */
|
/* If it is not successful, add new values to list and select them */
|
||||||
if (nRetCode == CB_ERR)
|
if (nRetCode == CB_ERR)
|
||||||
{
|
{
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSDGROUPING),
|
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSDGROUPING),
|
||||||
|
@ -300,7 +300,7 @@ InitNegSignCB(HWND hwndDlg, LCID lcid)
|
||||||
-1,
|
-1,
|
||||||
(LPARAM)szNegSign);
|
(LPARAM)szNegSign);
|
||||||
|
|
||||||
/* if is not success, add new value to list and select them */
|
/* If it is not successful, add new values to list and select them */
|
||||||
if (nRetCode == CB_ERR)
|
if (nRetCode == CB_ERR)
|
||||||
{
|
{
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSNSIGNSYM),
|
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSNSIGNSYM),
|
||||||
|
@ -464,7 +464,7 @@ InitListSepCB(HWND hwndDlg,
|
||||||
-1,
|
-1,
|
||||||
(LPARAM)szListSep);
|
(LPARAM)szListSep);
|
||||||
|
|
||||||
/* if is not success, add new value to list and select them */
|
/* If it is not successful, add new values to list and select them */
|
||||||
if (nRetCode == CB_ERR)
|
if (nRetCode == CB_ERR)
|
||||||
{
|
{
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSLSEP),
|
SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSLSEP),
|
||||||
|
@ -584,7 +584,7 @@ SetFracSymNum(HWND hwndDlg,
|
||||||
(WPARAM)0,
|
(WPARAM)0,
|
||||||
(LPARAM)0);
|
(LPARAM)0);
|
||||||
|
|
||||||
/* convert to wide char */
|
/* Convert to wide char */
|
||||||
_itot(nCurrSel, szFracSymNum, DECIMAL_RADIX);
|
_itot(nCurrSel, szFracSymNum, DECIMAL_RADIX);
|
||||||
|
|
||||||
/* Save number of fractional symbols */
|
/* Save number of fractional symbols */
|
||||||
|
@ -687,7 +687,7 @@ SetNumLeadZero(HWND hwndDlg,
|
||||||
(WPARAM)0,
|
(WPARAM)0,
|
||||||
(LPARAM)0);
|
(LPARAM)0);
|
||||||
|
|
||||||
/* convert to wide char */
|
/* Convert to wide char */
|
||||||
_itot(nCurrSel, szLeadZero, DECIMAL_RADIX);
|
_itot(nCurrSel, szLeadZero, DECIMAL_RADIX);
|
||||||
|
|
||||||
/* Save leading zero format */
|
/* Save leading zero format */
|
||||||
|
|
|
@ -65,7 +65,7 @@ InsSpacesFmt(const TCHAR *szSourceStr, const TCHAR *szFmtStr)
|
||||||
|
|
||||||
_tcscpy(pszDestStr, szSourceStr);
|
_tcscpy(pszDestStr, szSourceStr);
|
||||||
|
|
||||||
/* if format is clean return source string */
|
/* If format is clean return source string */
|
||||||
if (!*szFmtStr)
|
if (!*szFmtStr)
|
||||||
return pszDestStr;
|
return pszDestStr;
|
||||||
|
|
||||||
|
@ -93,12 +93,12 @@ InsSpacesFmt(const TCHAR *szSourceStr, const TCHAR *szFmtStr)
|
||||||
szFmtVal[nValCount] = _T('\0');
|
szFmtVal[nValCount] = _T('\0');
|
||||||
nValCount=0;
|
nValCount=0;
|
||||||
|
|
||||||
/* insert space to finded position plus all pos before */
|
/* Insert space to finded position plus all pos before */
|
||||||
pszTempStr = InsSpacePos(pszDestStr, nSpaceOffset);
|
pszTempStr = InsSpacePos(pszDestStr, nSpaceOffset);
|
||||||
_tcscpy(pszDestStr, pszTempStr);
|
_tcscpy(pszDestStr, pszTempStr);
|
||||||
free(pszTempStr);
|
free(pszTempStr);
|
||||||
|
|
||||||
/* num of spaces total increment */
|
/* Num of spaces total increment */
|
||||||
if (!wasNul)
|
if (!wasNul)
|
||||||
{
|
{
|
||||||
nSpaceOffset++;
|
nSpaceOffset++;
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS International Control Panel
|
* PROJECT: ReactOS International Control Panel
|
||||||
* FILE: lib/cpl/intl/time.c
|
* FILE: dll/cpl/intl/time.c
|
||||||
* PURPOSE: Time property page
|
* PURPOSE: Time property page
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
*/
|
*/
|
||||||
|
@ -54,26 +54,26 @@ GetSelectedComboEntry(HWND hwndDlg, DWORD dwIdc, TCHAR *Buffer, UINT uSize)
|
||||||
int nIndex;
|
int nIndex;
|
||||||
HWND hChildWnd;
|
HWND hChildWnd;
|
||||||
|
|
||||||
/* get handle to time format control */
|
/* Get handle to time format control */
|
||||||
hChildWnd = GetDlgItem(hwndDlg, dwIdc);
|
hChildWnd = GetDlgItem(hwndDlg, dwIdc);
|
||||||
/* Get index to selected time format */
|
/* Get index to selected time format */
|
||||||
nIndex = SendMessage(hChildWnd, CB_GETCURSEL, 0, 0);
|
nIndex = SendMessage(hChildWnd, CB_GETCURSEL, 0, 0);
|
||||||
if (nIndex == CB_ERR)
|
if (nIndex == CB_ERR)
|
||||||
/* no selection? get content of the edit control */
|
/* No selection? Get content of the edit control */
|
||||||
SendMessage(hChildWnd, WM_GETTEXT, uSize, (LPARAM)Buffer);
|
SendMessage(hChildWnd, WM_GETTEXT, uSize, (LPARAM)Buffer);
|
||||||
else {
|
else {
|
||||||
LPTSTR tmp;
|
LPTSTR tmp;
|
||||||
UINT uReqSize;
|
UINT uReqSize;
|
||||||
|
|
||||||
/* get requested size, including the null terminator;
|
/* Get requested size, including the null terminator;
|
||||||
* it shouldn't be required because the previous CB_LIMITTEXT,
|
* it shouldn't be required because the previous CB_LIMITTEXT,
|
||||||
* but it would be better to check it anyways */
|
* but it would be better to check it anyways */
|
||||||
uReqSize = SendMessage(hChildWnd, CB_GETLBTEXTLEN, (WPARAM)nIndex, 0) + 1;
|
uReqSize = SendMessage(hChildWnd, CB_GETLBTEXTLEN, (WPARAM)nIndex, 0) + 1;
|
||||||
/* allocate enough space to be more safe */
|
/* Allocate enough space to be more safe */
|
||||||
tmp = (LPTSTR)_alloca(uReqSize*sizeof(TCHAR));
|
tmp = (LPTSTR)_alloca(uReqSize*sizeof(TCHAR));
|
||||||
/* get selected time format text */
|
/* Get selected time format text */
|
||||||
SendMessage(hChildWnd, CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)tmp);
|
SendMessage(hChildWnd, CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)tmp);
|
||||||
/* finally, copy the result into the output */
|
/* Finally, copy the result into the output */
|
||||||
_tcsncpy(Buffer, tmp, uSize);
|
_tcsncpy(Buffer, tmp, uSize);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -126,7 +126,7 @@ TimePageProc(HWND hwndDlg,
|
||||||
(LPARAM)Buffer);
|
(LPARAM)Buffer);
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR),
|
SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR),
|
||||||
CB_SETCURSEL,
|
CB_SETCURSEL,
|
||||||
0, /* index */
|
0, /* Index */
|
||||||
0);
|
0);
|
||||||
|
|
||||||
/* Get the AM symbol */
|
/* Get the AM symbol */
|
||||||
|
@ -146,7 +146,7 @@ TimePageProc(HWND hwndDlg,
|
||||||
}
|
}
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL),
|
SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL),
|
||||||
CB_SETCURSEL,
|
CB_SETCURSEL,
|
||||||
0, /* index */
|
0, /* Index */
|
||||||
0);
|
0);
|
||||||
|
|
||||||
/* Get the PM symbol */
|
/* Get the PM symbol */
|
||||||
|
@ -166,7 +166,7 @@ TimePageProc(HWND hwndDlg,
|
||||||
}
|
}
|
||||||
SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL),
|
SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL),
|
||||||
CB_SETCURSEL,
|
CB_SETCURSEL,
|
||||||
0, /* index */
|
0, /* Index */
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -195,25 +195,25 @@ TimePageProc(HWND hwndDlg,
|
||||||
{
|
{
|
||||||
TCHAR Buffer[80];
|
TCHAR Buffer[80];
|
||||||
|
|
||||||
/* get selected/typed time format text */
|
/* Get selected/typed time format text */
|
||||||
GetSelectedComboEntry(hwndDlg, IDC_TIMEFORMAT, Buffer, sizeof(Buffer)/sizeof(TCHAR));
|
GetSelectedComboEntry(hwndDlg, IDC_TIMEFORMAT, Buffer, sizeof(Buffer)/sizeof(TCHAR));
|
||||||
|
|
||||||
/* Set time format */
|
/* Set time format */
|
||||||
SetLocaleInfo(pGlobalData->lcid, LOCALE_STIMEFORMAT, Buffer);
|
SetLocaleInfo(pGlobalData->lcid, LOCALE_STIMEFORMAT, Buffer);
|
||||||
|
|
||||||
/* get selected/typed time separator text */
|
/* Get selected/typed time separator text */
|
||||||
GetSelectedComboEntry(hwndDlg, IDC_TIMESEPARATOR, Buffer, sizeof(Buffer)/sizeof(TCHAR));
|
GetSelectedComboEntry(hwndDlg, IDC_TIMESEPARATOR, Buffer, sizeof(Buffer)/sizeof(TCHAR));
|
||||||
|
|
||||||
/* Set time separator */
|
/* Set time separator */
|
||||||
SetLocaleInfo(pGlobalData->lcid, LOCALE_STIME, Buffer);
|
SetLocaleInfo(pGlobalData->lcid, LOCALE_STIME, Buffer);
|
||||||
|
|
||||||
/* get selected/typed AM symbol text */
|
/* Get selected/typed AM symbol text */
|
||||||
GetSelectedComboEntry(hwndDlg, IDC_TIMEAMSYMBOL, Buffer, sizeof(Buffer)/sizeof(TCHAR));
|
GetSelectedComboEntry(hwndDlg, IDC_TIMEAMSYMBOL, Buffer, sizeof(Buffer)/sizeof(TCHAR));
|
||||||
|
|
||||||
/* Set the AM symbol */
|
/* Set the AM symbol */
|
||||||
SetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, Buffer);
|
SetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, Buffer);
|
||||||
|
|
||||||
/* get selected/typed PM symbol text */
|
/* Get selected/typed PM symbol text */
|
||||||
GetSelectedComboEntry(hwndDlg, IDC_TIMEPMSYMBOL, Buffer, sizeof(Buffer)/sizeof(TCHAR));
|
GetSelectedComboEntry(hwndDlg, IDC_TIMEPMSYMBOL, Buffer, sizeof(Buffer)/sizeof(TCHAR));
|
||||||
|
|
||||||
/* Set the PM symbol */
|
/* Set the PM symbol */
|
||||||
|
|
|
@ -103,7 +103,7 @@ AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
switch (LOWORD(wParam))
|
switch (LOWORD(wParam))
|
||||||
{
|
{
|
||||||
case SC_CONTEXTHELP:
|
case SC_CONTEXTHELP:
|
||||||
// not implemented
|
// Not implemented yet
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -141,7 +141,7 @@ CustomPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
switch (LOWORD(wParam))
|
switch (LOWORD(wParam))
|
||||||
{
|
{
|
||||||
case SC_CONTEXTHELP:
|
case SC_CONTEXTHELP:
|
||||||
// not implemented
|
// Not implemented yet
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -186,7 +186,7 @@ AddPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
switch (LOWORD(wParam))
|
switch (LOWORD(wParam))
|
||||||
{
|
{
|
||||||
case SC_CONTEXTHELP:
|
case SC_CONTEXTHELP:
|
||||||
// not implemented
|
// Not implemented yet
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -240,7 +240,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SC_CONTEXTHELP:
|
case SC_CONTEXTHELP:
|
||||||
// not implemented
|
// Not implemented yet
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1,21 +1,21 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/* icons */
|
/* Icons */
|
||||||
#define IDI_CPLSYSTEM 102
|
#define IDI_CPLSYSTEM 102
|
||||||
|
|
||||||
/* dialogs */
|
/* Dialogs */
|
||||||
#define IDD_PROPPAGEMAIN 101
|
#define IDD_PROPPAGEMAIN 101
|
||||||
#define IDD_ADD 119
|
#define IDD_ADD 119
|
||||||
#define IDD_CUSTOM 4099
|
#define IDD_CUSTOM 4099
|
||||||
#define IDD_ADVANCED 8188
|
#define IDD_ADVANCED 8188
|
||||||
|
|
||||||
/* strings */
|
/* Strings */
|
||||||
#define IDS_CPLSYSTEMNAME 1076
|
#define IDS_CPLSYSTEMNAME 1076
|
||||||
#define IDS_CPLSYSTEMDESCRIPTION 1099
|
#define IDS_CPLSYSTEMDESCRIPTION 1099
|
||||||
#define IDS_CONTROLLER 1151
|
#define IDS_CONTROLLER 1151
|
||||||
#define IDS_STATUS 1152
|
#define IDS_STATUS 1152
|
||||||
|
|
||||||
/* controls */
|
/* Controls */
|
||||||
#define IDC_CONTROLLER_LIST 1020
|
#define IDC_CONTROLLER_LIST 1020
|
||||||
#define IDC_ADD_BUTTON 1011
|
#define IDC_ADD_BUTTON 1011
|
||||||
#define IDC_REMOVE_BUTTON 1028
|
#define IDC_REMOVE_BUTTON 1028
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
/* $Id$
|
/* $Id$
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS Main Control Panel
|
* PROJECT: ReactOS Main Control Panel
|
||||||
* FILE: lib/cpl/main/keyboard.c
|
* FILE: dll/cpl/main/keyboard.c
|
||||||
* PURPOSE: Keyboard Control Panel
|
* PURPOSE: Keyboard Control Panel
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// Location: \dll\cpl\main\lang
|
// Location: dll/cpl/main/lang/bg-BG.rc
|
||||||
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
|
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
|
||||||
|
|
||||||
IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228
|
IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
/* $Id$
|
/* $Id$
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS Sample Control Panel
|
* PROJECT: ReactOS Sample Control Panel
|
||||||
* FILE: lib/cpl/main/main.c
|
* FILE: dll/cpl/main/main.c
|
||||||
* PURPOSE: ReactOS Main Control Panel
|
* PURPOSE: ReactOS Main Control Panel
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
* UPDATE HISTORY:
|
* UPDATE HISTORY:
|
||||||
|
@ -141,4 +141,3 @@ DllMain(HINSTANCE hinstDLL,
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,14 +19,14 @@
|
||||||
/* $Id$
|
/* $Id$
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS Main Control Panel
|
* PROJECT: ReactOS Main Control Panel
|
||||||
* FILE: lib/cpl/main/mouse.c
|
* FILE: dll/cpl/main/mouse.c
|
||||||
* PURPOSE: Mouse Control Panel
|
* PURPOSE: Mouse Control Panel
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
* Johannes Anderwald
|
* Johannes Anderwald
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// TODO:
|
// TODO:
|
||||||
// add missing icons
|
// Add missing icons
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
|
||||||
|
@ -1001,12 +1001,12 @@ LoadNewCursorScheme(HWND hwndDlg)
|
||||||
SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)buffer);
|
SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)buffer);
|
||||||
|
|
||||||
LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH);
|
LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH);
|
||||||
if (_tcsstr(buffer, szSystemScheme) || nSel == 0) //avoid the default scheme can be deleted
|
if (_tcsstr(buffer, szSystemScheme) || nSel == 0) // Avoid the default scheme - Can be deleted
|
||||||
bEnable = FALSE;
|
bEnable = FALSE;
|
||||||
else
|
else
|
||||||
bEnable = TRUE;
|
bEnable = TRUE;
|
||||||
|
|
||||||
/* delete button */
|
/* Delete button */
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME);
|
||||||
EnableWindow(hDlgCtrl, bEnable);
|
EnableWindow(hDlgCtrl, bEnable);
|
||||||
|
|
||||||
|
@ -1397,19 +1397,19 @@ OptionProc(IN HWND hwndDlg,
|
||||||
pOptionData->OrigMouseAccel.nThreshold1 = pOptionData->MouseAccel.nThreshold1;
|
pOptionData->OrigMouseAccel.nThreshold1 = pOptionData->MouseAccel.nThreshold1;
|
||||||
pOptionData->OrigMouseAccel.nThreshold2 = pOptionData->MouseAccel.nThreshold2;
|
pOptionData->OrigMouseAccel.nThreshold2 = pOptionData->MouseAccel.nThreshold2;
|
||||||
|
|
||||||
/* snap to default button */
|
/* Snap to default button */
|
||||||
SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->bSnapToDefaultButton, 0);
|
SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->bSnapToDefaultButton, 0);
|
||||||
pOptionData->bOrigSnapToDefaultButton = pOptionData->bSnapToDefaultButton;
|
pOptionData->bOrigSnapToDefaultButton = pOptionData->bSnapToDefaultButton;
|
||||||
|
|
||||||
/* mouse trails */
|
/* Mouse trails */
|
||||||
SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->uMouseTrails, 0);
|
SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->uMouseTrails, 0);
|
||||||
pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails;
|
pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails;
|
||||||
|
|
||||||
/* hide pointer while typing */
|
/* Hide pointer while typing */
|
||||||
SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->bMouseVanish, 0);
|
SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->bMouseVanish, 0);
|
||||||
pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish;
|
pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish;
|
||||||
|
|
||||||
/* show pointer with Ctrl-Key */
|
/* Show pointer with Ctrl-Key */
|
||||||
SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->bMouseSonar, 0);
|
SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->bMouseSonar, 0);
|
||||||
pOptionData->bOrigMouseSonar = pOptionData->bMouseSonar;
|
pOptionData->bOrigMouseSonar = pOptionData->bMouseSonar;
|
||||||
|
|
||||||
|
@ -1430,7 +1430,7 @@ OptionProc(IN HWND hwndDlg,
|
||||||
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
|
SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set mouse trail */
|
/* Set mouse trail */
|
||||||
hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL);
|
hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL);
|
||||||
SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 5));
|
SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 5));
|
||||||
if (pOptionData->uMouseTrails < 2)
|
if (pOptionData->uMouseTrails < 2)
|
||||||
|
@ -1572,7 +1572,7 @@ OptionProc(IN HWND hwndDlg,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* set snap to default button */
|
/* Set snap to default button */
|
||||||
if (pOptionData->bOrigSnapToDefaultButton != pOptionData->bSnapToDefaultButton)
|
if (pOptionData->bOrigSnapToDefaultButton != pOptionData->bSnapToDefaultButton)
|
||||||
{
|
{
|
||||||
SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, (UINT)pOptionData->bSnapToDefaultButton, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
|
SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, (UINT)pOptionData->bSnapToDefaultButton, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
|
||||||
|
@ -1586,14 +1586,14 @@ OptionProc(IN HWND hwndDlg,
|
||||||
pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails;
|
pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* hide pointer while typing */
|
/* Hide pointer while typing */
|
||||||
if (pOptionData->bOrigMouseVanish != pOptionData->bMouseVanish)
|
if (pOptionData->bOrigMouseVanish != pOptionData->bMouseVanish)
|
||||||
{
|
{
|
||||||
SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bMouseVanish), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
|
SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bMouseVanish), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
|
||||||
pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish;
|
pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* show pointer with Ctrl-Key */
|
/* Show pointer with Ctrl-Key */
|
||||||
if (pOptionData->bOrigMouseSonar != pOptionData->bMouseSonar)
|
if (pOptionData->bOrigMouseSonar != pOptionData->bMouseSonar)
|
||||||
{
|
{
|
||||||
SystemParametersInfo(SPI_SETMOUSESONAR, 0, IntToPtr(pOptionData->bMouseSonar), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
|
SystemParametersInfo(SPI_SETMOUSESONAR, 0, IntToPtr(pOptionData->bMouseSonar), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS Multimedia Control Panel
|
* PROJECT: ReactOS Multimedia Control Panel
|
||||||
* FILE: lib/cpl/mmsys/mmsys.c
|
* FILE: dll/cpl/mmsys/mmsys.c
|
||||||
* PURPOSE: ReactOS Multimedia Control Panel
|
* PURPOSE: ReactOS Multimedia Control Panel
|
||||||
* PROGRAMMER: Thomas Weidenmueller <w3seek@reactos.com>
|
* PROGRAMMER: Thomas Weidenmueller <w3seek@reactos.com>
|
||||||
* Johannes Anderwald <janderwald@reactos.com>
|
* Johannes Anderwald <janderwald@reactos.com>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
//update jansssens
|
// Update jansssens
|
||||||
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
|
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
|
||||||
|
|
||||||
IDD_VOLUME DIALOGEX 0, 0, 246, 228
|
IDD_VOLUME DIALOGEX 0, 0, 246, 228
|
||||||
|
|
|
@ -310,7 +310,8 @@ InstallSystemSoundScheme()
|
||||||
RegCloseKey(hNames);
|
RegCloseKey(hNames);
|
||||||
if (dwDisposition & REG_CREATED_NEW_KEY)
|
if (dwDisposition & REG_CREATED_NEW_KEY)
|
||||||
{
|
{
|
||||||
RegSetValueExW(hSubKey, NULL, 0, REG_SZ, (LPBYTE)L".Default", (wcslen(L".Default")+1) * sizeof(WCHAR)); //FIXME
|
// FIXME
|
||||||
|
RegSetValueExW(hSubKey, NULL, 0, REG_SZ, (LPBYTE)L".Default", (wcslen(L".Default")+1) * sizeof(WCHAR));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -404,7 +405,7 @@ MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData)
|
||||||
hService = OpenService(hSCManager, L"RosAudioSrv", SERVICE_ALL_ACCESS);
|
hService = OpenService(hSCManager, L"RosAudioSrv", SERVICE_ALL_ACCESS);
|
||||||
if (hService)
|
if (hService)
|
||||||
{
|
{
|
||||||
/* make RosAudioSrv start automatically */
|
/* Make RosAudioSrv start automatically */
|
||||||
ChangeServiceConfig(hService, SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
|
ChangeServiceConfig(hService, SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
|
||||||
|
|
||||||
StartService(hService, 0, NULL);
|
StartService(hService, 0, NULL);
|
||||||
|
@ -439,7 +440,7 @@ MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData)
|
||||||
|
|
||||||
if (!wcsicmp(Buffer, szBuffer))
|
if (!wcsicmp(Buffer, szBuffer))
|
||||||
{
|
{
|
||||||
/* an entry already exists */
|
/* An entry already exists */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -525,7 +526,7 @@ HardwareDlgProc(HWND hwndDlg,
|
||||||
Guids[0] = GUID_DEVCLASS_CDROM;
|
Guids[0] = GUID_DEVCLASS_CDROM;
|
||||||
Guids[1] = GUID_DEVCLASS_MEDIA;
|
Guids[1] = GUID_DEVCLASS_MEDIA;
|
||||||
|
|
||||||
/* create the hardware page */
|
/* Create the hardware page */
|
||||||
DeviceCreateHardwarePageEx(hwndDlg,
|
DeviceCreateHardwarePageEx(hwndDlg,
|
||||||
Guids,
|
Guids,
|
||||||
sizeof(Guids) / sizeof(Guids[0]),
|
sizeof(Guids) / sizeof(Guids[0]),
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $
|
/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS Multimedia Control Panel
|
* PROJECT: ReactOS Multimedia Control Panel
|
||||||
* FILE: lib/cpl/mmsys/mmsys.c
|
* FILE: dll/cpl/mmsys/mmsys.c
|
||||||
* PURPOSE: ReactOS Multimedia Control Panel
|
* PURPOSE: ReactOS Multimedia Control Panel
|
||||||
* PROGRAMMER: Thomas Weidenmueller <w3seek@reactos.com>
|
* PROGRAMMER: Thomas Weidenmueller <w3seek@reactos.com>
|
||||||
* Johannes Anderwald <janderwald@reactos.com>
|
* Johannes Anderwald <janderwald@reactos.com>
|
||||||
|
@ -64,7 +64,6 @@ PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName)
|
||||||
return pMap;
|
return pMap;
|
||||||
|
|
||||||
pMap = pMap->Next;
|
pMap = pMap->Next;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pMap = pAppMap->LabelMap;
|
pMap = pAppMap->LabelMap;
|
||||||
|
@ -77,7 +76,6 @@ PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName)
|
||||||
return pMap;
|
return pMap;
|
||||||
|
|
||||||
pMap = pMap->Next;
|
pMap = pMap->Next;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pMap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_MAP));
|
pMap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_MAP));
|
||||||
|
@ -90,6 +88,7 @@ PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName)
|
||||||
HeapFree(GetProcessHeap(), 0, pMap);
|
HeapFree(GetProcessHeap(), 0, pMap);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
pMap->AppMap = pAppMap;
|
pMap->AppMap = pAppMap;
|
||||||
pMap->Next = s_Map;
|
pMap->Next = s_Map;
|
||||||
s_Map = pMap;
|
s_Map = pMap;
|
||||||
|
@ -97,6 +96,7 @@ PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName)
|
||||||
return pMap;
|
return pMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
VOID RemoveLabel(PLABEL_MAP pMap)
|
VOID RemoveLabel(PLABEL_MAP pMap)
|
||||||
{
|
{
|
||||||
PLABEL_MAP pCurMap = s_Map;
|
PLABEL_MAP pCurMap = s_Map;
|
||||||
|
@ -107,7 +107,6 @@ VOID RemoveLabel(PLABEL_MAP pMap)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
while (pCurMap)
|
while (pCurMap)
|
||||||
{
|
{
|
||||||
if (pCurMap->Next == pMap)
|
if (pCurMap->Next == pMap)
|
||||||
|
@ -120,10 +119,6 @@ VOID RemoveLabel(PLABEL_MAP pMap)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
PAPP_MAP FindApp(TCHAR * szName)
|
PAPP_MAP FindApp(TCHAR * szName)
|
||||||
{
|
{
|
||||||
PAPP_MAP pMap = s_App;
|
PAPP_MAP pMap = s_App;
|
||||||
|
@ -139,6 +134,7 @@ PAPP_MAP FindApp(TCHAR * szName)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
PLABEL_CONTEXT FindLabelContext(PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppName, TCHAR * LabelName)
|
PLABEL_CONTEXT FindLabelContext(PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppName, TCHAR * LabelName)
|
||||||
{
|
{
|
||||||
PLABEL_CONTEXT pLabelContext;
|
PLABEL_CONTEXT pLabelContext;
|
||||||
|
@ -172,6 +168,7 @@ PLABEL_CONTEXT FindLabelContext(PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppN
|
||||||
return pLabelContext;
|
return pLabelContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BOOL
|
BOOL
|
||||||
LoadEventLabel(HKEY hKey, TCHAR * szSubKey)
|
LoadEventLabel(HKEY hKey, TCHAR * szSubKey)
|
||||||
{
|
{
|
||||||
|
@ -237,6 +234,7 @@ LoadEventLabel(HKEY hKey, TCHAR * szSubKey)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BOOL
|
BOOL
|
||||||
LoadEventLabels()
|
LoadEventLabels()
|
||||||
{
|
{
|
||||||
|
@ -284,6 +282,7 @@ LoadEventLabels()
|
||||||
return (dwCount != 0);
|
return (dwCount != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BOOL
|
BOOL
|
||||||
AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault)
|
AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault)
|
||||||
{
|
{
|
||||||
|
@ -331,6 +330,7 @@ AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
DWORD
|
DWORD
|
||||||
EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey)
|
EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey)
|
||||||
{
|
{
|
||||||
|
@ -389,6 +389,7 @@ EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey)
|
||||||
return dwNumSchemes;
|
return dwNumSchemes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, TCHAR * szName)
|
PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, TCHAR * szName)
|
||||||
{
|
{
|
||||||
LRESULT lCount, lIndex, lResult;
|
LRESULT lCount, lIndex, lResult;
|
||||||
|
@ -416,6 +417,8 @@ PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, TCHAR * szName)
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BOOL
|
BOOL
|
||||||
ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap)
|
ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap)
|
||||||
{
|
{
|
||||||
|
@ -427,13 +430,11 @@ ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName
|
||||||
PLABEL_CONTEXT pLabelContext;
|
PLABEL_CONTEXT pLabelContext;
|
||||||
BOOL bCurrentProfile, bActiveProfile;
|
BOOL bCurrentProfile, bActiveProfile;
|
||||||
|
|
||||||
|
|
||||||
//MessageBox(hwndDlg, szProfile, szLabelName, MB_OK);
|
//MessageBox(hwndDlg, szProfile, szLabelName, MB_OK);
|
||||||
|
|
||||||
bCurrentProfile = !_tcsicmp(szProfile, _T(".Current"));
|
bCurrentProfile = !_tcsicmp(szProfile, _T(".Current"));
|
||||||
bActiveProfile = !_tcsicmp(szProfile, szDefault);
|
bActiveProfile = !_tcsicmp(szProfile, szDefault);
|
||||||
|
|
||||||
|
|
||||||
if (RegOpenKeyEx(hKey,
|
if (RegOpenKeyEx(hKey,
|
||||||
szProfile,
|
szProfile,
|
||||||
0,
|
0,
|
||||||
|
@ -541,7 +542,6 @@ ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DWORD
|
DWORD
|
||||||
ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName)
|
ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName)
|
||||||
{
|
{
|
||||||
|
@ -627,10 +627,12 @@ ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName)
|
||||||
}
|
}
|
||||||
dwCurKey++;
|
dwCurKey++;
|
||||||
} while (dwResult == ERROR_SUCCESS);
|
} while (dwResult == ERROR_SUCCESS);
|
||||||
|
|
||||||
RegCloseKey(hSubKey);
|
RegCloseKey(hSubKey);
|
||||||
return dwNumEntry;
|
return dwNumEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BOOL
|
BOOL
|
||||||
ImportSoundProfiles(HWND hwndDlg, HKEY hKey)
|
ImportSoundProfiles(HWND hwndDlg, HKEY hKey)
|
||||||
{
|
{
|
||||||
|
@ -667,13 +669,13 @@ ImportSoundProfiles(HWND hwndDlg, HKEY hKey)
|
||||||
}
|
}
|
||||||
dwCurKey++;
|
dwCurKey++;
|
||||||
} while (dwResult == ERROR_SUCCESS);
|
} while (dwResult == ERROR_SUCCESS);
|
||||||
|
|
||||||
RegCloseKey(hSubKey);
|
RegCloseKey(hSubKey);
|
||||||
|
|
||||||
return (dwNumApps != 0);
|
return (dwNumApps != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
BOOL
|
BOOL
|
||||||
LoadSoundProfiles(HWND hwndDlg)
|
LoadSoundProfiles(HWND hwndDlg)
|
||||||
{
|
{
|
||||||
|
@ -697,9 +699,12 @@ LoadSoundProfiles(HWND hwndDlg)
|
||||||
//MessageBox(hwndDlg, _T("importing sound profiles..."), NULL, MB_OK);
|
//MessageBox(hwndDlg, _T("importing sound profiles..."), NULL, MB_OK);
|
||||||
ImportSoundProfiles(hwndDlg, hSubKey);
|
ImportSoundProfiles(hwndDlg, hSubKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
RegCloseKey(hSubKey);
|
RegCloseKey(hSubKey);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BOOL
|
BOOL
|
||||||
LoadSoundFiles(HWND hwndDlg)
|
LoadSoundFiles(HWND hwndDlg)
|
||||||
{
|
{
|
||||||
|
@ -764,7 +769,6 @@ LoadSoundFiles(HWND hwndDlg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
BOOL
|
BOOL
|
||||||
ShowSoundScheme(HWND hwndDlg)
|
ShowSoundScheme(HWND hwndDlg)
|
||||||
{
|
{
|
||||||
|
@ -825,6 +829,7 @@ ShowSoundScheme(HWND hwndDlg)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BOOL
|
BOOL
|
||||||
ApplyChanges(HWND hwndDlg)
|
ApplyChanges(HWND hwndDlg)
|
||||||
{
|
{
|
||||||
|
@ -1002,7 +1007,7 @@ SoundsDlgProc(HWND hwndDlg,
|
||||||
{
|
{
|
||||||
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
||||||
///
|
///
|
||||||
/// should store in current member
|
/// Should store in current member
|
||||||
///
|
///
|
||||||
_tcscpy(pLabelContext->szValue, (TCHAR*)lResult);
|
_tcscpy(pLabelContext->szValue, (TCHAR*)lResult);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS Multimedia Control Panel
|
* PROJECT: ReactOS Multimedia Control Panel
|
||||||
* FILE: lib/cpl/mmsys/mmsys.c
|
* FILE: dll/cpl/mmsys/mmsys.c
|
||||||
* PURPOSE: ReactOS Multimedia Control Panel
|
* PURPOSE: ReactOS Multimedia Control Panel
|
||||||
* PROGRAMMER: Thomas Weidenmueller <w3seek@reactos.com>
|
* PROGRAMMER: Thomas Weidenmueller <w3seek@reactos.com>
|
||||||
* Johannes Anderwald <janderwald@reactos.com>
|
* Johannes Anderwald <janderwald@reactos.com>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $
|
/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS Multimedia Control Panel
|
* PROJECT: ReactOS Multimedia Control Panel
|
||||||
* FILE: lib/cpl/mmsys/mmsys.c
|
* FILE: dll/cpl/mmsys/mmsys.c
|
||||||
* PURPOSE: ReactOS Multimedia Control Panel
|
* PURPOSE: ReactOS Multimedia Control Panel
|
||||||
* PROGRAMMER: Thomas Weidenmueller <w3seek@reactos.com>
|
* PROGRAMMER: Thomas Weidenmueller <w3seek@reactos.com>
|
||||||
* Johannes Anderwald <janderwald@reactos.com>
|
* Johannes Anderwald <janderwald@reactos.com>
|
||||||
|
@ -60,6 +60,7 @@ InitImageInfo(PIMGINFO ImgInfo)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
GetMuteControl(PGLOBAL_DATA pGlobalData)
|
GetMuteControl(PGLOBAL_DATA pGlobalData)
|
||||||
{
|
{
|
||||||
|
@ -89,6 +90,7 @@ GetMuteControl(PGLOBAL_DATA pGlobalData)
|
||||||
pGlobalData->muteControlID = mxc.dwControlID;
|
pGlobalData->muteControlID = mxc.dwControlID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
GetMuteState(PGLOBAL_DATA pGlobalData)
|
GetMuteState(PGLOBAL_DATA pGlobalData)
|
||||||
{
|
{
|
||||||
|
@ -112,6 +114,7 @@ GetMuteState(PGLOBAL_DATA pGlobalData)
|
||||||
pGlobalData->muteVal = mxcdMute.fValue;
|
pGlobalData->muteVal = mxcdMute.fValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
SwitchMuteState(PGLOBAL_DATA pGlobalData)
|
SwitchMuteState(PGLOBAL_DATA pGlobalData)
|
||||||
{
|
{
|
||||||
|
@ -133,6 +136,7 @@ SwitchMuteState(PGLOBAL_DATA pGlobalData)
|
||||||
pGlobalData->muteVal = mxcdMute.fValue;
|
pGlobalData->muteVal = mxcdMute.fValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
GetVolumeControl(PGLOBAL_DATA pGlobalData)
|
GetVolumeControl(PGLOBAL_DATA pGlobalData)
|
||||||
{
|
{
|
||||||
|
@ -164,6 +168,7 @@ GetVolumeControl(PGLOBAL_DATA pGlobalData)
|
||||||
pGlobalData->volumeControlID = mxc.dwControlID;
|
pGlobalData->volumeControlID = mxc.dwControlID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
GetVolumeValue(PGLOBAL_DATA pGlobalData)
|
GetVolumeValue(PGLOBAL_DATA pGlobalData)
|
||||||
{
|
{
|
||||||
|
@ -187,6 +192,7 @@ GetVolumeValue(PGLOBAL_DATA pGlobalData)
|
||||||
pGlobalData->volumeValue = mxcdVolume.dwValue;
|
pGlobalData->volumeValue = mxcdVolume.dwValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
SetVolumeValue(PGLOBAL_DATA pGlobalData){
|
SetVolumeValue(PGLOBAL_DATA pGlobalData){
|
||||||
MIXERCONTROLDETAILS_UNSIGNED mxcdVolume;
|
MIXERCONTROLDETAILS_UNSIGNED mxcdVolume;
|
||||||
|
@ -269,6 +275,7 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData)
|
||||||
SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pGlobalData->volumeValue/VOLUME_DIVIDER);
|
SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pGlobalData->volumeValue/VOLUME_DIVIDER);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
LaunchSoundControl(HWND hwndDlg)
|
LaunchSoundControl(HWND hwndDlg)
|
||||||
{
|
{
|
||||||
|
@ -340,7 +347,7 @@ VolumeDlgProc(HWND hwndDlg,
|
||||||
HDC hdcMem;
|
HDC hdcMem;
|
||||||
LONG left;
|
LONG left;
|
||||||
|
|
||||||
/* position image in centre of dialog */
|
/* Position image in centre of dialog */
|
||||||
left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2;
|
left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2;
|
||||||
|
|
||||||
hdcMem = CreateCompatibleDC(lpDrawItem->hDC);
|
hdcMem = CreateCompatibleDC(lpDrawItem->hDC);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS Network Control Panel
|
* PROJECT: ReactOS Network Control Panel
|
||||||
* FILE: lib/cpl/system/ncpa.c
|
* FILE: dll/cpl/ncpa/ncpa.c
|
||||||
* PURPOSE: ReactOS Network Control Panel
|
* PURPOSE: ReactOS Network Control Panel
|
||||||
* PROGRAMMER: Gero Kuehn (reactos.filter@gkware.com)
|
* PROGRAMMER: Gero Kuehn (reactos.filter@gkware.com)
|
||||||
* UPDATE HISTORY:
|
* UPDATE HISTORY:
|
||||||
|
@ -19,8 +19,7 @@ LONG CALLBACK
|
||||||
DisplayApplet(VOID)
|
DisplayApplet(VOID)
|
||||||
{
|
{
|
||||||
WCHAR szParameters[160];
|
WCHAR szParameters[160];
|
||||||
//FIXME
|
// FIXME: Use correct path
|
||||||
// use correct path
|
|
||||||
//::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}
|
//::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}
|
||||||
|
|
||||||
wcscpy(szParameters, L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}");
|
wcscpy(szParameters, L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}");
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* $Id$
|
/* $Id$
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS ODBC Control Panel Applet
|
* PROJECT: ReactOS ODBC Control Panel Applet
|
||||||
* FILE: lib/cpl/main/main.c
|
* FILE: dll/cpl/main/main.c
|
||||||
* PURPOSE: applet initialization
|
* PURPOSE: applet initialization
|
||||||
* PROGRAMMER: Johannes Anderwald
|
* PROGRAMMER: Johannes Anderwald
|
||||||
*/
|
*/
|
||||||
|
@ -77,4 +77,3 @@ DllMain(HINSTANCE hinstDLL,
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -180,8 +180,6 @@ SaveCurrentPowerActionPolicy(IN HWND hDlgCtrl,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------
|
//-------------------------------------------------------------------
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
@ -394,7 +392,6 @@ Adv_InitDialog(VOID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static VOID
|
static VOID
|
||||||
Adv_SaveData(HWND hwndDlg)
|
Adv_SaveData(HWND hwndDlg)
|
||||||
{
|
{
|
||||||
|
|
|
@ -177,8 +177,8 @@ AlarmsDlgProc(HWND hwndDlg,
|
||||||
case WM_INITDIALOG:
|
case WM_INITDIALOG:
|
||||||
if (!Ala_InitData(hwndDlg))
|
if (!Ala_InitData(hwndDlg))
|
||||||
{
|
{
|
||||||
//TODO
|
// TODO:
|
||||||
//handle initialization error
|
// Handle initialization error
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// English (en) resources by Lohegrim (Lohnegrim at gmx dot net)
|
// Bulgarian resources
|
||||||
|
|
||||||
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
|
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
*Spanish Language resource file
|
* Spanish language resource file
|
||||||
* Traducido por: Javier Remacha 2007-12-23
|
* Traducido por: Javier Remacha 2007-12-23
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -172,5 +172,3 @@ DllMain(HINSTANCE hinstDLL,
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -252,8 +252,8 @@ callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPTSTR sName, DWORD dwDesc,
|
||||||
{
|
{
|
||||||
if (guiIndex >= MAX_POWER_POLICY)
|
if (guiIndex >= MAX_POWER_POLICY)
|
||||||
{
|
{
|
||||||
//FIXME
|
// FIXME:
|
||||||
//implement store power policy dynamically
|
// Implement store power policy dynamically
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -521,8 +521,8 @@ CreateEnergyList(HWND hwnd)
|
||||||
|
|
||||||
if (CanUserWritePwrScheme())
|
if (CanUserWritePwrScheme())
|
||||||
{
|
{
|
||||||
//TODO
|
// TODO:
|
||||||
// enable write / delete powerscheme button
|
// Enable write / delete powerscheme button
|
||||||
}
|
}
|
||||||
|
|
||||||
Pos_InitPage(GetParent(hwnd));
|
Pos_InitPage(GetParent(hwnd));
|
||||||
|
@ -558,17 +558,17 @@ PowerSchemesDlgProc(
|
||||||
hwndDialog = hwndDlg;
|
hwndDialog = hwndDlg;
|
||||||
if (!Pos_InitData())
|
if (!Pos_InitData())
|
||||||
{
|
{
|
||||||
//TODO
|
// TODO:
|
||||||
// initialization failed
|
// Initialization failed
|
||||||
// handle error
|
// Handle error
|
||||||
MessageBox(hwndDlg,_T("Pos_InitData failed\n"), NULL, MB_OK);
|
MessageBox(hwndDlg,_T("Pos_InitData failed\n"), NULL, MB_OK);
|
||||||
|
|
||||||
}
|
}
|
||||||
if (!CreateEnergyList(GetDlgItem(hwndDlg, IDC_ENERGYLIST)))
|
if (!CreateEnergyList(GetDlgItem(hwndDlg, IDC_ENERGYLIST)))
|
||||||
{
|
{
|
||||||
//TODO
|
// TODO:
|
||||||
// initialization failed
|
// Initialization failed
|
||||||
// handle error
|
// Handle error
|
||||||
MessageBox(hwndDlg,_T("CreateEnergyList failed\n"), NULL, MB_OK);
|
MessageBox(hwndDlg,_T("CreateEnergyList failed\n"), NULL, MB_OK);
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/* metrics */
|
/* Metrics */
|
||||||
#define PROPSHEETWIDTH 246
|
#define PROPSHEETWIDTH 246
|
||||||
#define PROPSHEETHEIGHT 228
|
#define PROPSHEETHEIGHT 228
|
||||||
#define PROPSHEETPADDING 6
|
#define PROPSHEETPADDING 6
|
||||||
|
@ -8,7 +8,7 @@
|
||||||
#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2))
|
#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2))
|
||||||
#define ICONSIZE 16
|
#define ICONSIZE 16
|
||||||
|
|
||||||
/* ids */
|
/* IDs */
|
||||||
#define IDC_CPLICON_1 1
|
#define IDC_CPLICON_1 1
|
||||||
|
|
||||||
#define IDS_PROCENT 49
|
#define IDS_PROCENT 49
|
||||||
|
|
|
@ -536,9 +536,9 @@ SetAllVars(HWND hwndDlg,
|
||||||
|
|
||||||
/* Get the handle to the list box with all system vars in it */
|
/* Get the handle to the list box with all system vars in it */
|
||||||
hwndListView = GetDlgItem(hwndDlg, iDlgItem);
|
hwndListView = GetDlgItem(hwndDlg, iDlgItem);
|
||||||
/* first item is 0 */
|
/* First item is 0 */
|
||||||
iItem = 0;
|
iItem = 0;
|
||||||
/* set up struct to retreive item */
|
/* Set up struct to retreive item */
|
||||||
lvi.mask = LVIF_PARAM;
|
lvi.mask = LVIF_PARAM;
|
||||||
lvi.iItem = iItem;
|
lvi.iItem = iItem;
|
||||||
|
|
||||||
|
|
|
@ -91,9 +91,9 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
|
||||||
{
|
{
|
||||||
if (timerid == 0)
|
if (timerid == 0)
|
||||||
{
|
{
|
||||||
top = 0; // set top
|
top = 0; // Set top
|
||||||
|
|
||||||
// build new bitmap
|
// Build new bitmap
|
||||||
GetObject(pImgInfo->hBitmap, sizeof(BITMAP), &bitmap);
|
GetObject(pImgInfo->hBitmap, sizeof(BITMAP), &bitmap);
|
||||||
dc = CreateCompatibleDC(GetDC(NULL));
|
dc = CreateCompatibleDC(GetDC(NULL));
|
||||||
if (dc == NULL)
|
if (dc == NULL)
|
||||||
|
@ -170,13 +170,14 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
|
||||||
if (wParam != 0)
|
if (wParam != 0)
|
||||||
{
|
{
|
||||||
hdc = (HDC)wParam;
|
hdc = (HDC)wParam;
|
||||||
} else
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
hdc = BeginPaint(hwnd,&PS);
|
hdc = BeginPaint(hwnd,&PS);
|
||||||
}
|
}
|
||||||
GetClientRect(hwnd,&PS.rcPaint);
|
GetClientRect(hwnd,&PS.rcPaint);
|
||||||
|
|
||||||
/* position image in center of dialog */
|
/* Position image in center of dialog */
|
||||||
left = (PS.rcPaint.right - pImgInfo->cxSource) / 2;
|
left = (PS.rcPaint.right - pImgInfo->cxSource) / 2;
|
||||||
hdcMem = CreateCompatibleDC(hdc);
|
hdcMem = CreateCompatibleDC(hdc);
|
||||||
|
|
||||||
|
@ -194,6 +195,7 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
|
||||||
SRCCOPY);
|
SRCCOPY);
|
||||||
DeleteDC(hdcMem);
|
DeleteDC(hdcMem);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wParam == 0)
|
if (wParam == 0)
|
||||||
EndPaint(hwnd,&PS);
|
EndPaint(hwnd,&PS);
|
||||||
break;
|
break;
|
||||||
|
@ -547,7 +549,7 @@ GeneralPageProc(HWND hwndDlg,
|
||||||
HDC hdcMem;
|
HDC hdcMem;
|
||||||
LONG left;
|
LONG left;
|
||||||
|
|
||||||
/* position image in centre of dialog */
|
/* Position image in centre of dialog */
|
||||||
left = (lpDrawItem->rcItem.right - pImgInfo->cxSource) / 2;
|
left = (lpDrawItem->rcItem.right - pImgInfo->cxSource) / 2;
|
||||||
|
|
||||||
hdcMem = CreateCompatibleDC(lpDrawItem->hDC);
|
hdcMem = CreateCompatibleDC(lpDrawItem->hDC);
|
||||||
|
|
|
@ -15,7 +15,7 @@ typedef BOOL (WINAPI *PDEVMGREXEC)(HWND hWndParent, HINSTANCE hInst, PVOID Unkno
|
||||||
static BOOL
|
static BOOL
|
||||||
LaunchDeviceManager(HWND hWndParent)
|
LaunchDeviceManager(HWND hWndParent)
|
||||||
{
|
{
|
||||||
/* hack for ROS to start our devmgmt until we have mmc */
|
/* Hack for ROS to start our devmgmt until we have MMC */
|
||||||
#ifdef __REACTOS__
|
#ifdef __REACTOS__
|
||||||
return ((INT_PTR)ShellExecuteW(NULL, L"open", L"devmgmt.exe", NULL, NULL, SW_SHOWNORMAL) > 32);
|
return ((INT_PTR)ShellExecuteW(NULL, L"open", L"devmgmt.exe", NULL, NULL, SW_SHOWNORMAL) > 32);
|
||||||
#else
|
#else
|
||||||
|
@ -34,7 +34,7 @@ LaunchDeviceManager(HWND hWndParent)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* run the Device Manager */
|
/* Run the Device Manager */
|
||||||
Ret = DevMgrExec(hWndParent, hApplet, NULL /* ??? */, SW_SHOW);
|
Ret = DevMgrExec(hWndParent, hApplet, NULL /* ??? */, SW_SHOW);
|
||||||
FreeLibrary(hDll);
|
FreeLibrary(hDll);
|
||||||
return Ret;
|
return Ret;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// Location: \dll\cpl\sysdm\lang
|
// Location: dll/cpl/sysdm/lang/bg-BG.rc
|
||||||
// Íåäîâúğøåí
|
// Íåäîâúğøåí
|
||||||
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
|
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS System Configuration Applet
|
* PROJECT: ReactOS System Configuration Applet
|
||||||
* LICENSE: GPL - See COPYING in the top level directory
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
* FILE: dll/cpl/sysdm/de.rc
|
* FILE: dll/cpl/sysdm/lang/de-DE.rc
|
||||||
* PURPOSE: German language file for sysdm.cpl
|
* PURPOSE: German language file for sysdm.cpl
|
||||||
* PROGRAMMERS: Eric Kohl
|
* PROGRAMMERS: Eric Kohl
|
||||||
* TRANSLATOR: Colin Finck <mail@colinfinck.de>
|
* TRANSLATOR: Colin Finck <mail@colinfinck.de>
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie
|
// Vertaald door Lionel Lowie
|
||||||
|
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
|
||||||
|
|
||||||
RC_LICENSE RTDATA "resources/gpl.txt"
|
RC_LICENSE RTDATA "resources/gpl.txt"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* translated by xrogers
|
* translated by xrogers
|
||||||
* xxrogers@users.sourceforge.net
|
* xxrogers@users.sourceforge.net
|
||||||
* https://sourceforge.net/projects/reactospl
|
* https://sourceforge.net/projects/reactospl
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
|
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
|
||||||
|
|
||||||
IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218
|
IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218
|
||||||
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
|
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
|
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
|
||||||
|
|
||||||
IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218
|
IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218
|
||||||
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
|
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
// Swedish resources by Kris Engeman 2005-04-28
|
// Swedish resources by Kris Engeman 2005-04-28
|
||||||
// Updated 2008 by Andreas Bjerkeholt (Harteex)
|
// Updated 2008 by Andreas Bjerkeholt (Harteex)
|
||||||
|
|
||||||
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
|
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
|
||||||
|
|
||||||
IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218
|
IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: System Control Panel Applet
|
* PROJECT: System Control Panel Applet
|
||||||
* LICENSE: GPL - See COPYING in the top level directory
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
* FILE: dll/cpl/sysdm/lang/uk-UA.rc
|
* FILE: dll/cpl/sysdm/lang/uk-UA.rc
|
||||||
|
|
|
@ -34,7 +34,7 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo)
|
||||||
ICON_SMALL,
|
ICON_SMALL,
|
||||||
(LPARAM)pLicInfo->hIcon);
|
(LPARAM)pLicInfo->hIcon);
|
||||||
|
|
||||||
/* load license from resource */
|
/* Load license from resource */
|
||||||
if (!(hResInfo = FindResource(hApplet,
|
if (!(hResInfo = FindResource(hApplet,
|
||||||
MAKEINTRESOURCE(RC_LICENSE),
|
MAKEINTRESOURCE(RC_LICENSE),
|
||||||
MAKEINTRESOURCE(RTDATA))) ||
|
MAKEINTRESOURCE(RTDATA))) ||
|
||||||
|
@ -45,7 +45,7 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* insert the license into the edit control (unicode!) */
|
/* Insert the license into the edit control (unicode!) */
|
||||||
SetDlgItemText(hDlg,
|
SetDlgItemText(hDlg,
|
||||||
IDC_LICENCEEDIT,
|
IDC_LICENCEEDIT,
|
||||||
LicenseText);
|
LicenseText);
|
||||||
|
|
|
@ -34,12 +34,12 @@ extern HINSTANCE hApplet;
|
||||||
|
|
||||||
void ShowLastWin32Error(HWND hWndOwner);
|
void ShowLastWin32Error(HWND hWndOwner);
|
||||||
|
|
||||||
/* prop sheet pages */
|
/* Prop sheet pages */
|
||||||
INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
INT_PTR CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
|
|
||||||
/* dialogs */
|
/* Dialogs */
|
||||||
INT_PTR CALLBACK HardProfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK HardProfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||||
INT_PTR CALLBACK UserProfileDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK UserProfileDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
INT_PTR CALLBACK EnvironmentDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
INT_PTR CALLBACK EnvironmentDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
#define IDS_WARNINITIALRANGE 80
|
#define IDS_WARNINITIALRANGE 80
|
||||||
#define IDS_WARNMAXIMUMRANGE 81
|
#define IDS_WARNMAXIMUMRANGE 81
|
||||||
|
|
||||||
/* propsheet - general */
|
/* Propsheet - general */
|
||||||
#define IDD_PROPPAGEGENERAL 100
|
#define IDD_PROPPAGEGENERAL 100
|
||||||
#define IDC_MACHINELINE1 101
|
#define IDC_MACHINELINE1 101
|
||||||
#define IDC_MACHINELINE2 102
|
#define IDC_MACHINELINE2 102
|
||||||
|
@ -50,7 +50,7 @@
|
||||||
#define IDC_ROSHOMEPAGE_LINK 108
|
#define IDC_ROSHOMEPAGE_LINK 108
|
||||||
|
|
||||||
|
|
||||||
/* propsheet - hardware */
|
/* Propsheet - hardware */
|
||||||
#define IDD_PROPPAGEHARDWARE 300
|
#define IDD_PROPPAGEHARDWARE 300
|
||||||
#define IDC_HARDWARE_WIZARD 207
|
#define IDC_HARDWARE_WIZARD 207
|
||||||
#define IDC_HARDWARE_PROFILE 209
|
#define IDC_HARDWARE_PROFILE 209
|
||||||
|
@ -58,7 +58,7 @@
|
||||||
#define IDC_HARDWARE_DEVICE_MANAGER 211
|
#define IDC_HARDWARE_DEVICE_MANAGER 211
|
||||||
|
|
||||||
|
|
||||||
/* propsheet - advanced */
|
/* Propsheet - advanced */
|
||||||
#define IDD_PROPPAGEADVANCED 400
|
#define IDD_PROPPAGEADVANCED 400
|
||||||
#define IDC_SYSSETTINGS 401
|
#define IDC_SYSSETTINGS 401
|
||||||
#define IDC_ENVVAR 402
|
#define IDC_ENVVAR 402
|
||||||
|
@ -67,11 +67,11 @@
|
||||||
#define IDC_USERPROFILE 405
|
#define IDC_USERPROFILE 405
|
||||||
#define IDC_ERRORREPORT 406
|
#define IDC_ERRORREPORT 406
|
||||||
|
|
||||||
/* system settings */
|
/* System settings */
|
||||||
#define IDD_SYSSETTINGS 800
|
#define IDD_SYSSETTINGS 800
|
||||||
#define IDC_REPORTASWORKSTATION 801
|
#define IDC_REPORTASWORKSTATION 801
|
||||||
|
|
||||||
/* user profiles */
|
/* User profiles */
|
||||||
#define IDD_USERPROFILE 500
|
#define IDD_USERPROFILE 500
|
||||||
#define IDC_USERPROFILE_LIST 501
|
#define IDC_USERPROFILE_LIST 501
|
||||||
#define IDC_USERPROFILE_CHANGE 503
|
#define IDC_USERPROFILE_CHANGE 503
|
||||||
|
@ -80,7 +80,7 @@
|
||||||
#define IDC_USERACCOUNT_LINK 506
|
#define IDC_USERACCOUNT_LINK 506
|
||||||
|
|
||||||
|
|
||||||
/* environment variables */
|
/* Environment variables */
|
||||||
#define IDD_ENVIRONMENT_VARIABLES 600
|
#define IDD_ENVIRONMENT_VARIABLES 600
|
||||||
#define IDC_USER_VARIABLE_LIST 601
|
#define IDC_USER_VARIABLE_LIST 601
|
||||||
#define IDC_USER_VARIABLE_NEW 602
|
#define IDC_USER_VARIABLE_NEW 602
|
||||||
|
@ -92,7 +92,7 @@
|
||||||
#define IDC_SYSTEM_VARIABLE_DELETE 608
|
#define IDC_SYSTEM_VARIABLE_DELETE 608
|
||||||
|
|
||||||
|
|
||||||
/* edit environment variables */
|
/* Edit environment variables */
|
||||||
#define IDD_EDIT_VARIABLE 700
|
#define IDD_EDIT_VARIABLE 700
|
||||||
#define IDC_VARIABLE_NAME 701
|
#define IDC_VARIABLE_NAME 701
|
||||||
#define IDC_VARIABLE_VALUE 702
|
#define IDC_VARIABLE_VALUE 702
|
||||||
|
@ -116,7 +116,7 @@
|
||||||
#define IDC_CURRENT 914
|
#define IDC_CURRENT 914
|
||||||
|
|
||||||
|
|
||||||
/* startup and recovery */
|
/* Startup and recovery */
|
||||||
#define IDD_STARTUPRECOVERY 1000
|
#define IDD_STARTUPRECOVERY 1000
|
||||||
#define IDC_STRECOSCOMBO 1001
|
#define IDC_STRECOSCOMBO 1001
|
||||||
#define IDC_STRECLIST 1002
|
#define IDC_STRECLIST 1002
|
||||||
|
@ -134,7 +134,7 @@
|
||||||
#define IDC_STRRECOVERWRITE 1014
|
#define IDC_STRRECOVERWRITE 1014
|
||||||
|
|
||||||
|
|
||||||
/* hardware profiles */
|
/* Hardware profiles */
|
||||||
#define IDD_HARDWAREPROFILES 1100
|
#define IDD_HARDWAREPROFILES 1100
|
||||||
#define IDC_HRDPROFLSTBOX 1102
|
#define IDC_HRDPROFLSTBOX 1102
|
||||||
#define IDC_HRDPROFUP 1103
|
#define IDC_HRDPROFUP 1103
|
||||||
|
@ -149,19 +149,19 @@
|
||||||
#define IDC_HRDPROFUPDWN 1112
|
#define IDC_HRDPROFUPDWN 1112
|
||||||
|
|
||||||
|
|
||||||
/* copy profile */
|
/* Copy profile */
|
||||||
#define IDD_COPYPROFILE 1200
|
#define IDD_COPYPROFILE 1200
|
||||||
#define IDC_COPYPROFILEFROM 1201
|
#define IDC_COPYPROFILEFROM 1201
|
||||||
#define IDC_COPYPROFILETO 1202
|
#define IDC_COPYPROFILETO 1202
|
||||||
|
|
||||||
|
|
||||||
/* rename profile */
|
/* Rename profile */
|
||||||
#define IDD_RENAMEPROFILE 1300
|
#define IDD_RENAMEPROFILE 1300
|
||||||
#define IDC_RENPROFEDITFROM 1301
|
#define IDC_RENPROFEDITFROM 1301
|
||||||
#define IDC_RENPROFEDITTO 1302
|
#define IDC_RENPROFEDITTO 1302
|
||||||
|
|
||||||
|
|
||||||
/* licence */
|
/* Licence */
|
||||||
#define IDD_LICENCE 1500
|
#define IDD_LICENCE 1500
|
||||||
#define IDC_LICENCEEDIT 1501
|
#define IDC_LICENCEEDIT 1501
|
||||||
#define RC_LICENSE 1502
|
#define RC_LICENSE 1502
|
||||||
|
|
|
@ -60,7 +60,7 @@ GetSystemDrive(WCHAR **szSystemDrive)
|
||||||
{
|
{
|
||||||
DWORD dwBufSize;
|
DWORD dwBufSize;
|
||||||
|
|
||||||
/* get Path to freeldr.ini or boot.ini */
|
/* Get Path to freeldr.ini or boot.ini */
|
||||||
*szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR));
|
*szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR));
|
||||||
if (*szSystemDrive != NULL)
|
if (*szSystemDrive != NULL)
|
||||||
{
|
{
|
||||||
|
@ -108,7 +108,7 @@ ReadFreeldrSection(HINF hInf, WCHAR *szSectionName)
|
||||||
NULL,
|
NULL,
|
||||||
&InfContext))
|
&InfContext))
|
||||||
{
|
{
|
||||||
/* failed to find section */
|
/* Failed to find section */
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -144,7 +144,7 @@ ReadFreeldrSection(HINF hInf, WCHAR *szSectionName)
|
||||||
{
|
{
|
||||||
if (!_wcsnicmp(szValue, L"ReactOS", 7))
|
if (!_wcsnicmp(szValue, L"ReactOS", 7))
|
||||||
{
|
{
|
||||||
//FIXME store as enum
|
// FIXME: Store as enum
|
||||||
pRecord->BootType = 1;
|
pRecord->BootType = 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -158,7 +158,7 @@ ReadFreeldrSection(HINF hInf, WCHAR *szSectionName)
|
||||||
}
|
}
|
||||||
else if (!_wcsnicmp(szName, L"Options", 7))
|
else if (!_wcsnicmp(szName, L"Options", 7))
|
||||||
{
|
{
|
||||||
//FIXME store flags as values
|
// FIXME: Store flags as values
|
||||||
wcscpy(pRecord->szOptions, szValue);
|
wcscpy(pRecord->szOptions, szValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -186,7 +186,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg)
|
||||||
L"DefaultOS",
|
L"DefaultOS",
|
||||||
&InfContext))
|
&InfContext))
|
||||||
{
|
{
|
||||||
/* failed to find default os */
|
/* Failed to find default os */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -196,7 +196,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg)
|
||||||
sizeof(szDefaultOs) / sizeof(WCHAR),
|
sizeof(szDefaultOs) / sizeof(WCHAR),
|
||||||
&LineLength))
|
&LineLength))
|
||||||
{
|
{
|
||||||
/* no key */
|
/* No key */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,7 +205,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg)
|
||||||
L"TimeOut",
|
L"TimeOut",
|
||||||
&InfContext))
|
&InfContext))
|
||||||
{
|
{
|
||||||
/* expected to find timeout value */
|
/* Expected to find timeout value */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -214,7 +214,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg)
|
||||||
1,
|
1,
|
||||||
(PINT)&TimeOut))
|
(PINT)&TimeOut))
|
||||||
{
|
{
|
||||||
/* failed to retrieve timeout */
|
/* Failed to retrieve timeout */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -223,7 +223,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg)
|
||||||
NULL,
|
NULL,
|
||||||
&InfContext))
|
&InfContext))
|
||||||
{
|
{
|
||||||
/* expected list of operating systems */
|
/* Expected list of operating systems */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -235,7 +235,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg)
|
||||||
sizeof(szName) / sizeof(WCHAR),
|
sizeof(szName) / sizeof(WCHAR),
|
||||||
&LineLength))
|
&LineLength))
|
||||||
{
|
{
|
||||||
/* the ini file is messed up */
|
/* The ini file is messed up */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -245,7 +245,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg)
|
||||||
sizeof(szValue) / sizeof(WCHAR),
|
sizeof(szValue) / sizeof(WCHAR),
|
||||||
&LineLength))
|
&LineLength))
|
||||||
{
|
{
|
||||||
/* the ini file is messed up */
|
/* The ini file is messed up */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,7 +258,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg)
|
||||||
SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord);
|
SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord);
|
||||||
if (!wcscmp(szDefaultOs, szName))
|
if (!wcscmp(szDefaultOs, szName))
|
||||||
{
|
{
|
||||||
/* we store the friendly name as key */
|
/* We store the friendly name as key */
|
||||||
wcscpy(szDefaultOs, szValue);
|
wcscpy(szDefaultOs, szValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -270,11 +270,11 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg)
|
||||||
}
|
}
|
||||||
while (SetupFindNextLine(&InfContext, &InfContext));
|
while (SetupFindNextLine(&InfContext, &InfContext));
|
||||||
|
|
||||||
/* find default os in list */
|
/* Find default os in list */
|
||||||
lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)-1, (LPARAM)szDefaultOs);
|
lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)-1, (LPARAM)szDefaultOs);
|
||||||
if (lResult != CB_ERR)
|
if (lResult != CB_ERR)
|
||||||
{
|
{
|
||||||
/* set cur sel */
|
/* Set cur sel */
|
||||||
SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0);
|
SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -347,7 +347,7 @@ LoadBootSettings(HINF hInf, HWND hwndDlg)
|
||||||
NULL,
|
NULL,
|
||||||
&InfContext))
|
&InfContext))
|
||||||
{
|
{
|
||||||
/* failed to find operating systems section */
|
/* Failed to find operating systems section */
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -405,11 +405,11 @@ LoadBootSettings(HINF hInf, HWND hwndDlg)
|
||||||
}
|
}
|
||||||
while (SetupFindNextLine(&InfContext, &InfContext));
|
while (SetupFindNextLine(&InfContext, &InfContext));
|
||||||
|
|
||||||
/* find default os in list */
|
/* Find default os in list */
|
||||||
lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)0, (LPARAM)szDefaultOS);
|
lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)0, (LPARAM)szDefaultOS);
|
||||||
if (lResult != CB_ERR)
|
if (lResult != CB_ERR)
|
||||||
{
|
{
|
||||||
/* set cur sel */
|
/* Set cur sel */
|
||||||
SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0);
|
SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -462,7 +462,7 @@ LoadOSList(HWND hwndDlg, PSTARTINFO pStartInfo)
|
||||||
|
|
||||||
if (PathFileExistsW(pStartInfo->szFreeldrIni))
|
if (PathFileExistsW(pStartInfo->szFreeldrIni))
|
||||||
{
|
{
|
||||||
/* free resource previously allocated by GetSystemDrive() */
|
/* Free resource previously allocated by GetSystemDrive() */
|
||||||
HeapFree(GetProcessHeap(), 0, szSystemDrive);
|
HeapFree(GetProcessHeap(), 0, szSystemDrive);
|
||||||
/* freeldr.ini exists */
|
/* freeldr.ini exists */
|
||||||
hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni,
|
hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni,
|
||||||
|
@ -480,16 +480,16 @@ LoadOSList(HWND hwndDlg, PSTARTINFO pStartInfo)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* try load boot.ini settings */
|
/* Try loading boot.ini settings */
|
||||||
wcscpy(pStartInfo->szFreeldrIni, szSystemDrive);
|
wcscpy(pStartInfo->szFreeldrIni, szSystemDrive);
|
||||||
wcscat(pStartInfo->szFreeldrIni, L"\\boot.ini");
|
wcscat(pStartInfo->szFreeldrIni, L"\\boot.ini");
|
||||||
|
|
||||||
/* free resource previously allocated by GetSystemDrive() */
|
/* Free resource previously allocated by GetSystemDrive() */
|
||||||
HeapFree(GetProcessHeap(), 0, szSystemDrive);
|
HeapFree(GetProcessHeap(), 0, szSystemDrive);
|
||||||
|
|
||||||
if (PathFileExistsW(pStartInfo->szFreeldrIni))
|
if (PathFileExistsW(pStartInfo->szFreeldrIni))
|
||||||
{
|
{
|
||||||
/* load boot.ini settings */
|
/* Load boot.ini settings */
|
||||||
hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni,
|
hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni,
|
||||||
NULL,
|
NULL,
|
||||||
INF_STYLE_OLDNT,
|
INF_STYLE_OLDNT,
|
||||||
|
@ -514,20 +514,20 @@ SetCrashDlgItems(HWND hwnd, PSTARTINFO pStartInfo)
|
||||||
{
|
{
|
||||||
if (pStartInfo->dwCrashDumpEnabled == 0)
|
if (pStartInfo->dwCrashDumpEnabled == 0)
|
||||||
{
|
{
|
||||||
/* no crash information required */
|
/* No crash information required */
|
||||||
EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), FALSE);
|
EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), FALSE);
|
||||||
EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), FALSE);
|
EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), FALSE);
|
||||||
}
|
}
|
||||||
else if (pStartInfo->dwCrashDumpEnabled == 3)
|
else if (pStartInfo->dwCrashDumpEnabled == 3)
|
||||||
{
|
{
|
||||||
/* minidump type */
|
/* Minidump type */
|
||||||
EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE);
|
EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE);
|
||||||
EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), FALSE);
|
EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), FALSE);
|
||||||
SendMessageW(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szMinidumpDir);
|
SendMessageW(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szMinidumpDir);
|
||||||
}
|
}
|
||||||
else if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2)
|
else if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2)
|
||||||
{
|
{
|
||||||
/* kernel or complete dump */
|
/* Kernel or complete dump */
|
||||||
EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE);
|
EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE);
|
||||||
EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), TRUE);
|
EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), TRUE);
|
||||||
SendMessageW(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szDumpFile);
|
SendMessageW(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szDumpFile);
|
||||||
|
@ -547,7 +547,7 @@ WriteStartupRecoveryOptions(HWND hwndDlg, PSTARTINFO pStartInfo)
|
||||||
KEY_WRITE,
|
KEY_WRITE,
|
||||||
&hKey) != ERROR_SUCCESS)
|
&hKey) != ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
/* failed to open key */
|
/* Failed to open key */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -592,7 +592,7 @@ LoadRecoveryOptions(HWND hwndDlg, PSTARTINFO pStartInfo)
|
||||||
KEY_READ,
|
KEY_READ,
|
||||||
&hKey) != ERROR_SUCCESS)
|
&hKey) != ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
/* failed to open key */
|
/* Failed to open key */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -690,13 +690,13 @@ StartRecDlgProc(HWND hwndDlg,
|
||||||
{
|
{
|
||||||
case IDC_STRRECEDIT:
|
case IDC_STRRECEDIT:
|
||||||
ShellExecuteW(0, L"open", L"notepad", pStartInfo->szFreeldrIni, NULL, SW_SHOWNORMAL);
|
ShellExecuteW(0, L"open", L"notepad", pStartInfo->szFreeldrIni, NULL, SW_SHOWNORMAL);
|
||||||
// FIXME use CreateProcess and wait untill finished
|
// FIXME: Use CreateProcess and wait untill finished
|
||||||
// DeleteBootRecords(hwndDlg);
|
// DeleteBootRecords(hwndDlg);
|
||||||
// LoadOSList(hwndDlg);
|
// LoadOSList(hwndDlg);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDOK:
|
case IDOK:
|
||||||
/* save timeout */
|
/* Save timeout */
|
||||||
if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED)
|
if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED)
|
||||||
iTimeout = SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_GETPOS, (WPARAM)0, (LPARAM)0);
|
iTimeout = SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_GETPOS, (WPARAM)0, (LPARAM)0);
|
||||||
else
|
else
|
||||||
|
@ -717,12 +717,12 @@ StartRecDlgProc(HWND hwndDlg,
|
||||||
{
|
{
|
||||||
if (pStartInfo->iFreeLdrIni == 1) // FreeLdrIni style
|
if (pStartInfo->iFreeLdrIni == 1) // FreeLdrIni style
|
||||||
{
|
{
|
||||||
/* set default timeout */
|
/* Set default timeout */
|
||||||
WritePrivateProfileStringW(L"FREELOADER",
|
WritePrivateProfileStringW(L"FREELOADER",
|
||||||
L"TimeOut",
|
L"TimeOut",
|
||||||
szTimeout,
|
szTimeout,
|
||||||
pStartInfo->szFreeldrIni);
|
pStartInfo->szFreeldrIni);
|
||||||
/* set default os */
|
/* Set default OS */
|
||||||
WritePrivateProfileStringW(L"FREELOADER",
|
WritePrivateProfileStringW(L"FREELOADER",
|
||||||
L"DefaultOS",
|
L"DefaultOS",
|
||||||
pRecord->szSectionName,
|
pRecord->szSectionName,
|
||||||
|
@ -731,12 +731,12 @@ StartRecDlgProc(HWND hwndDlg,
|
||||||
}
|
}
|
||||||
else if (pStartInfo->iFreeLdrIni == 2) // BootIni style
|
else if (pStartInfo->iFreeLdrIni == 2) // BootIni style
|
||||||
{
|
{
|
||||||
/* set default timeout */
|
/* Set default timeout */
|
||||||
WritePrivateProfileStringW(L"boot loader",
|
WritePrivateProfileStringW(L"boot loader",
|
||||||
L"timeout",
|
L"timeout",
|
||||||
szTimeout,
|
szTimeout,
|
||||||
pStartInfo->szFreeldrIni);
|
pStartInfo->szFreeldrIni);
|
||||||
/* set default os */
|
/* Set default OS */
|
||||||
WritePrivateProfileStringW(L"boot loader",
|
WritePrivateProfileStringW(L"boot loader",
|
||||||
L"default",
|
L"default",
|
||||||
pRecord->szBootPath,
|
pRecord->szBootPath,
|
||||||
|
|
|
@ -104,9 +104,9 @@ GetPageFileSizes(LPTSTR lpPageFiles,
|
||||||
static VOID
|
static VOID
|
||||||
ParseMemSettings(PVIRTMEM pVirtMem)
|
ParseMemSettings(PVIRTMEM pVirtMem)
|
||||||
{
|
{
|
||||||
TCHAR szDrives[1024]; // all drives
|
TCHAR szDrives[1024]; // All drives
|
||||||
LPTSTR DrivePtr = szDrives;
|
LPTSTR DrivePtr = szDrives;
|
||||||
TCHAR szDrive[3]; // single drive
|
TCHAR szDrive[3]; // Single drive
|
||||||
TCHAR szVolume[MAX_PATH];
|
TCHAR szVolume[MAX_PATH];
|
||||||
TCHAR *szDisplayString;
|
TCHAR *szDisplayString;
|
||||||
INT InitialSize = 0;
|
INT InitialSize = 0;
|
||||||
|
@ -130,15 +130,15 @@ ParseMemSettings(PVIRTMEM pVirtMem)
|
||||||
|
|
||||||
DrivePtr = _tcsupr(DrivePtr);
|
DrivePtr = _tcsupr(DrivePtr);
|
||||||
|
|
||||||
/* copy the 'X:' portion */
|
/* Copy the 'X:' portion */
|
||||||
lstrcpyn(szDrive, DrivePtr, sizeof(szDrive) / sizeof(TCHAR));
|
lstrcpyn(szDrive, DrivePtr, sizeof(szDrive) / sizeof(TCHAR));
|
||||||
|
|
||||||
if (GetDriveType(DrivePtr) == DRIVE_FIXED)
|
if (GetDriveType(DrivePtr) == DRIVE_FIXED)
|
||||||
{
|
{
|
||||||
/* does drive match the one in the registry ? */
|
/* Does drive match the one in the registry ? */
|
||||||
if (!_tcsncmp(pVirtMem->szPagingFiles, szDrive, 2))
|
if (!_tcsncmp(pVirtMem->szPagingFiles, szDrive, 2))
|
||||||
{
|
{
|
||||||
/* FIXME: we only check the first available pagefile in the reg */
|
/* FIXME: We only check the first available pagefile in the reg */
|
||||||
GetPageFileSizes(pVirtMem->szPagingFiles,
|
GetPageFileSizes(pVirtMem->szPagingFiles,
|
||||||
&InitialSize,
|
&InitialSize,
|
||||||
&MaximumSize);
|
&MaximumSize);
|
||||||
|
@ -159,7 +159,7 @@ ParseMemSettings(PVIRTMEM pVirtMem)
|
||||||
_tcscpy(szDisplayString, szDrive);
|
_tcscpy(szDisplayString, szDrive);
|
||||||
_tcscat(szDisplayString, _T("\t"));
|
_tcscat(szDisplayString, _T("\t"));
|
||||||
|
|
||||||
/* set a volume label if there is one */
|
/* Set a volume label if there is one */
|
||||||
if (GetVolumeInformation(DrivePtr,
|
if (GetVolumeInformation(DrivePtr,
|
||||||
szVolume,
|
szVolume,
|
||||||
255,
|
255,
|
||||||
|
@ -224,7 +224,7 @@ WritePageFileSettings(PVIRTMEM pVirtMem)
|
||||||
/* Record the position where the next string will start */
|
/* Record the position where the next string will start */
|
||||||
nPos += (INT)lstrlen(szText) + 1;
|
nPos += (INT)lstrlen(szText) + 1;
|
||||||
|
|
||||||
/* add another NULL for REG_MULTI_SZ */
|
/* Add another NULL for REG_MULTI_SZ */
|
||||||
szPagingFiles[nPos] = _T('\0');
|
szPagingFiles[nPos] = _T('\0');
|
||||||
nPos++;
|
nPos++;
|
||||||
}
|
}
|
||||||
|
@ -313,7 +313,7 @@ OnSet(PVIRTMEM pVirtMem)
|
||||||
0);
|
0);
|
||||||
if (Index >= 0 && Index < pVirtMem->Count)
|
if (Index >= 0 && Index < pVirtMem->Count)
|
||||||
{
|
{
|
||||||
/* check if custom settings are checked */
|
/* Check if custom settings are checked */
|
||||||
if (IsDlgButtonChecked(pVirtMem->hSelf,
|
if (IsDlgButtonChecked(pVirtMem->hSelf,
|
||||||
IDC_CUSTOM) == BST_CHECKED)
|
IDC_CUSTOM) == BST_CHECKED)
|
||||||
{
|
{
|
||||||
|
@ -417,11 +417,11 @@ OnSet(PVIRTMEM pVirtMem)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* set sizes to 0 */
|
/* Set sizes to 0 */
|
||||||
pVirtMem->Pagefile[Index].InitialSize = 0;
|
pVirtMem->Pagefile[Index].InitialSize = 0;
|
||||||
pVirtMem->Pagefile[Index].MaximumSize = 0;
|
pVirtMem->Pagefile[Index].MaximumSize = 0;
|
||||||
|
|
||||||
// check to see if this drive is used for a paging file
|
// Check to see if this drive is used for a paging file
|
||||||
if (IsDlgButtonChecked(pVirtMem->hSelf,
|
if (IsDlgButtonChecked(pVirtMem->hSelf,
|
||||||
IDC_NOPAGEFILE) == BST_UNCHECKED)
|
IDC_NOPAGEFILE) == BST_UNCHECKED)
|
||||||
{
|
{
|
||||||
|
@ -468,7 +468,7 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem)
|
||||||
if (pVirtMem->Pagefile[Index].InitialSize != 0 &&
|
if (pVirtMem->Pagefile[Index].InitialSize != 0 &&
|
||||||
pVirtMem->Pagefile[Index].MaximumSize != 0)
|
pVirtMem->Pagefile[Index].MaximumSize != 0)
|
||||||
{
|
{
|
||||||
/* enable and fill the custom values */
|
/* Enable and fill the custom values */
|
||||||
EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE);
|
EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE);
|
||||||
EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE);
|
EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE);
|
||||||
|
|
||||||
|
@ -492,7 +492,7 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem)
|
||||||
EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE);
|
EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE);
|
||||||
EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE);
|
EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE);
|
||||||
|
|
||||||
/* is it system managed */
|
/* Is it system managed */
|
||||||
if (pVirtMem->Pagefile[Index].bUsed)
|
if (pVirtMem->Pagefile[Index].bUsed)
|
||||||
{
|
{
|
||||||
CheckDlgButton(pVirtMem->hSelf,
|
CheckDlgButton(pVirtMem->hSelf,
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/* icons */
|
/* Icons */
|
||||||
#define IDI_CPLSYSTEM 100
|
#define IDI_CPLSYSTEM 100
|
||||||
|
|
||||||
/* strings */
|
/* Strings */
|
||||||
#define IDS_CPLSYSTEMNAME 1001
|
#define IDS_CPLSYSTEMNAME 1001
|
||||||
#define IDS_CPLSYSTEMDESCRIPTION 2001
|
#define IDS_CPLSYSTEMDESCRIPTION 2001
|
||||||
|
|
||||||
|
|
|
@ -54,24 +54,24 @@ DrawClock(HDC hdc, PCLOCKDATA pClockData)
|
||||||
HBRUSH hBrushOld;
|
HBRUSH hBrushOld;
|
||||||
HPEN hPenOld = NULL;
|
HPEN hPenOld = NULL;
|
||||||
|
|
||||||
/* grey brush to fill the dots */
|
/* Grey brush to fill the dots */
|
||||||
hBrushOld = SelectObject(hdc, pClockData->hGreyBrush);
|
hBrushOld = SelectObject(hdc, pClockData->hGreyBrush);
|
||||||
|
|
||||||
hPenOld = GetCurrentObject(hdc, OBJ_PEN);
|
hPenOld = GetCurrentObject(hdc, OBJ_PEN);
|
||||||
|
|
||||||
// TODO: check if this conversion is correct resp. usable
|
// TODO: Check if this conversion is correct resp. usable
|
||||||
Radius = min(pClockData->cxClient,pClockData->cyClient) * 2;
|
Radius = min(pClockData->cxClient,pClockData->cyClient) * 2;
|
||||||
|
|
||||||
for (iAngle = 0; iAngle < 360; iAngle += 6)
|
for (iAngle = 0; iAngle < 360; iAngle += 6)
|
||||||
{
|
{
|
||||||
/* starting coords */
|
/* Starting coords */
|
||||||
pt[0].x = 0;
|
pt[0].x = 0;
|
||||||
pt[0].y = Radius;
|
pt[0].y = Radius;
|
||||||
|
|
||||||
/* rotate start coords */
|
/* Rotate start coords */
|
||||||
RotatePoint(pt, 1, iAngle);
|
RotatePoint(pt, 1, iAngle);
|
||||||
|
|
||||||
/* determine whether it's a big dot or a little dot
|
/* Determine whether it's a big dot or a little dot
|
||||||
* i.e. 1-4 or 5, 6-9 or 10, 11-14 or 15 */
|
* i.e. 1-4 or 5, 6-9 or 10, 11-14 or 15 */
|
||||||
if (iAngle % 5)
|
if (iAngle % 5)
|
||||||
{
|
{
|
||||||
|
|
|
@ -239,7 +239,7 @@ AutoUpdateMonthCal(HWND hwndDlg,
|
||||||
{
|
{
|
||||||
UNREFERENCED_PARAMETER(lpAutoUpdate);
|
UNREFERENCED_PARAMETER(lpAutoUpdate);
|
||||||
|
|
||||||
/* update the controls */
|
/* Update the controls */
|
||||||
FillMonthsComboBox(GetDlgItem(hwndDlg,
|
FillMonthsComboBox(GetDlgItem(hwndDlg,
|
||||||
IDC_MONTHCB));
|
IDC_MONTHCB));
|
||||||
}
|
}
|
||||||
|
@ -254,7 +254,7 @@ DTPProc(HWND hwnd,
|
||||||
switch (uMsg)
|
switch (uMsg)
|
||||||
{
|
{
|
||||||
case WM_KEYDOWN:
|
case WM_KEYDOWN:
|
||||||
/* stop the timer when the user is about to change the time */
|
/* Stop the timer when the user is about to change the time */
|
||||||
if ((wParam != VK_LEFT) & (wParam != VK_RIGHT))
|
if ((wParam != VK_LEFT) & (wParam != VK_RIGHT))
|
||||||
KillTimer(GetParent(hwnd), ID_TIMER);
|
KillTimer(GetParent(hwnd), ID_TIMER);
|
||||||
break;
|
break;
|
||||||
|
@ -281,7 +281,7 @@ DateTimePageProc(HWND hwndDlg,
|
||||||
|
|
||||||
SetTimer(hwndDlg, ID_TIMER, 1000, NULL);
|
SetTimer(hwndDlg, ID_TIMER, 1000, NULL);
|
||||||
|
|
||||||
/* set range and current year */
|
/* Set range and current year */
|
||||||
SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETRANGE, 0, MAKELONG ((short) 9999, (short) 1900));
|
SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETRANGE, 0, MAKELONG ((short) 9999, (short) 1900));
|
||||||
SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETPOS, 0, MAKELONG( (short) st.wYear, 0));
|
SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETPOS, 0, MAKELONG( (short) st.wYear, 0));
|
||||||
|
|
||||||
|
@ -393,7 +393,7 @@ DateTimePageProc(HWND hwndDlg,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_TIMECHANGE:
|
case WM_TIMECHANGE:
|
||||||
/* FIXME - we don't get this message as we're not a top-level window... */
|
/* FIXME: We don't get this message as we're not a top-level window... */
|
||||||
SendMessageW(GetDlgItem(hwndDlg,
|
SendMessageW(GetDlgItem(hwndDlg,
|
||||||
IDC_MONTHCALENDAR),
|
IDC_MONTHCALENDAR),
|
||||||
MCCM_RESET,
|
MCCM_RESET,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS Timedate Control Panel
|
* PROJECT: ReactOS Timedate Control Panel
|
||||||
* LICENSE: GPL - See COPYING in the top level directory
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
* FILE: lib/cpl/timedate/internettime.c
|
* FILE: dll/cpl/timedate/internettime.c
|
||||||
* PURPOSE: Internet Time property page
|
* PURPOSE: Internet Time property page
|
||||||
* COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
|
* COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
|
||||||
*
|
*
|
||||||
|
@ -47,7 +47,7 @@ CreateNTPServerList(HWND hwnd)
|
||||||
&dwNameSize);
|
&dwNameSize);
|
||||||
if (lRet == ERROR_SUCCESS)
|
if (lRet == ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
/* get date from default reg value */
|
/* Get date from default reg value */
|
||||||
if (wcscmp(szValName, L"") == 0) // if (Index == 0)
|
if (wcscmp(szValName, L"") == 0) // if (Index == 0)
|
||||||
{
|
{
|
||||||
dwDefault = _wtoi(szData);
|
dwDefault = _wtoi(szData);
|
||||||
|
@ -71,8 +71,8 @@ CreateNTPServerList(HWND hwnd)
|
||||||
if (dwDefault < 1 || dwDefault > dwIndex)
|
if (dwDefault < 1 || dwDefault > dwIndex)
|
||||||
dwDefault = 1;
|
dwDefault = 1;
|
||||||
|
|
||||||
/* server reg entries count from 1,
|
/* Server reg entries count from 1,
|
||||||
* combo boxes count from 0 */
|
* Combo boxes count from 0 */
|
||||||
dwDefault--;
|
dwDefault--;
|
||||||
|
|
||||||
SendMessageW(hList,
|
SendMessageW(hList,
|
||||||
|
@ -99,11 +99,11 @@ SetNTPServer(HWND hwnd)
|
||||||
|
|
||||||
uSel = (UINT)SendMessageW(hList, CB_GETCURSEL, 0, 0);
|
uSel = (UINT)SendMessageW(hList, CB_GETCURSEL, 0, 0);
|
||||||
|
|
||||||
/* server reg entries count from 1,
|
/* Server reg entries count from 1,
|
||||||
* combo boxes count from 0 */
|
* Combo boxes count from 0 */
|
||||||
uSel++;
|
uSel++;
|
||||||
|
|
||||||
/* convert to wide char */
|
/* Convert to wide char */
|
||||||
_itow(uSel, szSel, 10);
|
_itow(uSel, szSel, 10);
|
||||||
|
|
||||||
lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
|
lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
|
||||||
|
@ -130,7 +130,7 @@ SetNTPServer(HWND hwnd)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* get the domain name from the registry */
|
/* Get the domain name from the registry */
|
||||||
static BOOL
|
static BOOL
|
||||||
GetNTPServerAddress(LPWSTR *lpAddress)
|
GetNTPServerAddress(LPWSTR *lpAddress)
|
||||||
{
|
{
|
||||||
|
@ -199,7 +199,7 @@ fail:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* request the time from the current NTP server */
|
/* Request the time from the current NTP server */
|
||||||
static ULONG
|
static ULONG
|
||||||
GetTimeFromServer(VOID)
|
GetTimeFromServer(VOID)
|
||||||
{
|
{
|
||||||
|
@ -230,7 +230,7 @@ UpdateSystemTime(ULONG ulTime)
|
||||||
LARGE_INTEGER li;
|
LARGE_INTEGER li;
|
||||||
SYSTEMTIME stNew;
|
SYSTEMTIME stNew;
|
||||||
|
|
||||||
/* time at 1st Jan 1900 */
|
/* Time at 1st Jan 1900 */
|
||||||
stNew.wYear = 1900;
|
stNew.wYear = 1900;
|
||||||
stNew.wMonth = 1;
|
stNew.wMonth = 1;
|
||||||
stNew.wDay = 1;
|
stNew.wDay = 1;
|
||||||
|
@ -239,19 +239,19 @@ UpdateSystemTime(ULONG ulTime)
|
||||||
stNew.wSecond = 0;
|
stNew.wSecond = 0;
|
||||||
stNew.wMilliseconds = 0;
|
stNew.wMilliseconds = 0;
|
||||||
|
|
||||||
/* convert to a file time */
|
/* Convert to a file time */
|
||||||
if (!SystemTimeToFileTime(&stNew, &ftNew))
|
if (!SystemTimeToFileTime(&stNew, &ftNew))
|
||||||
{
|
{
|
||||||
DisplayWin32Error(GetLastError());
|
DisplayWin32Error(GetLastError());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* add on the time passed since 1st Jan 1900 */
|
/* Add on the time passed since 1st Jan 1900 */
|
||||||
li = *(LARGE_INTEGER *)&ftNew;
|
li = *(LARGE_INTEGER *)&ftNew;
|
||||||
li.QuadPart += (LONGLONG)10000000 * ulTime;
|
li.QuadPart += (LONGLONG)10000000 * ulTime;
|
||||||
ftNew = * (FILETIME *)&li;
|
ftNew = * (FILETIME *)&li;
|
||||||
|
|
||||||
/* convert back to a system time */
|
/* Convert back to a system time */
|
||||||
if (!FileTimeToSystemTime(&ftNew, &stNew))
|
if (!FileTimeToSystemTime(&ftNew, &stNew))
|
||||||
{
|
{
|
||||||
DisplayWin32Error(GetLastError());
|
DisplayWin32Error(GetLastError());
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
//update jansssens
|
// Vertaald door Lionel Lowie
|
||||||
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie
|
// Update jansssens
|
||||||
|
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
|
||||||
|
|
||||||
IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146
|
IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146
|
||||||
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
|
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS Timedate Control Panel
|
* PROJECT: ReactOS Timedate Control Panel
|
||||||
* LICENSE: GPL - See COPYING in the top level directory
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
* FILE: lib/cpl/timedate/monthcal.c
|
* FILE: dll/cpl/timedate/monthcal.c
|
||||||
* PURPOSE: Calander implementation
|
* PURPOSE: Calander implementation
|
||||||
* COPYRIGHT: Copyright 2006 Thomas Weidenmueller <w3seek@reactos.com>
|
* COPYRIGHT: Copyright 2006 Thomas Weidenmueller <w3seek@reactos.com>
|
||||||
*
|
*
|
||||||
|
@ -76,7 +76,7 @@ MonthCalNotifyControlParent(IN PMONTHCALWND infoPtr,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* for the year range 1..9999
|
* For the year range 1..9999
|
||||||
* return 1 if is leap year otherwise 0
|
* return 1 if is leap year otherwise 0
|
||||||
*/
|
*/
|
||||||
static WORD LeapYear(IN WORD Year)
|
static WORD LeapYear(IN WORD Year)
|
||||||
|
@ -100,7 +100,7 @@ MonthCalMonthLength(IN WORD Month,
|
||||||
{
|
{
|
||||||
#ifdef WITH_1752
|
#ifdef WITH_1752
|
||||||
if ((Year == 1752) && (Month == 9))
|
if ((Year == 1752) && (Month == 9))
|
||||||
return 19; // special case: September 1752 has no 3rd-13th
|
return 19; // Special case: September 1752 has no 3rd-13th
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
return MonthDays[Month - 1];
|
return MonthDays[Month - 1];
|
||||||
|
@ -180,7 +180,7 @@ MonthCalUpdate(IN PMONTHCALWND infoPtr)
|
||||||
RepaintHeader = TRUE;
|
RepaintHeader = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update the days layout of the current month */
|
/* Update the days layout of the current month */
|
||||||
ZeroMemory(infoPtr->Days,
|
ZeroMemory(infoPtr->Days,
|
||||||
sizeof(infoPtr->Days));
|
sizeof(infoPtr->Days));
|
||||||
|
|
||||||
|
@ -199,7 +199,7 @@ MonthCalUpdate(IN PMONTHCALWND infoPtr)
|
||||||
*(pDay++) = (BYTE)++d;
|
*(pDay++) = (BYTE)++d;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* repaint the control */
|
/* Repaint the control */
|
||||||
if (RepaintHeader)
|
if (RepaintHeader)
|
||||||
{
|
{
|
||||||
InvalidateRect(infoPtr->hSelf,
|
InvalidateRect(infoPtr->hSelf,
|
||||||
|
@ -227,10 +227,10 @@ MonthCalSetupDayTimer(IN PMONTHCALWND infoPtr)
|
||||||
SYSTEMTIME LocalTime = {0};
|
SYSTEMTIME LocalTime = {0};
|
||||||
UINT uElapse;
|
UINT uElapse;
|
||||||
|
|
||||||
/* update the current date */
|
/* Update the current date */
|
||||||
GetLocalTime(&LocalTime);
|
GetLocalTime(&LocalTime);
|
||||||
|
|
||||||
/* calculate the number of remaining milliseconds until midnight */
|
/* Calculate the number of remaining milliseconds until midnight */
|
||||||
uElapse = 1000 - (UINT)LocalTime.wMilliseconds;
|
uElapse = 1000 - (UINT)LocalTime.wMilliseconds;
|
||||||
uElapse += (59 - (UINT)LocalTime.wSecond) * 1000;
|
uElapse += (59 - (UINT)LocalTime.wSecond) * 1000;
|
||||||
uElapse += (59 - (UINT)LocalTime.wMinute) * 60 * 1000;
|
uElapse += (59 - (UINT)LocalTime.wMinute) * 60 * 1000;
|
||||||
|
@ -241,7 +241,7 @@ MonthCalSetupDayTimer(IN PMONTHCALWND infoPtr)
|
||||||
else
|
else
|
||||||
uElapse += 100; /* Add a delay of 0.1 seconds */
|
uElapse += 100; /* Add a delay of 0.1 seconds */
|
||||||
|
|
||||||
/* setup the new timer */
|
/* Setup the new timer */
|
||||||
if (SetTimer(infoPtr->hSelf,
|
if (SetTimer(infoPtr->hSelf,
|
||||||
ID_DAYTIMER,
|
ID_DAYTIMER,
|
||||||
uElapse,
|
uElapse,
|
||||||
|
@ -263,7 +263,7 @@ MonthCalReload(IN PMONTHCALWND infoPtr)
|
||||||
0,
|
0,
|
||||||
0);
|
0);
|
||||||
|
|
||||||
/* cache the configuration */
|
/* Cache the configuration */
|
||||||
infoPtr->FirstDayOfWeek = MonthCalFirstDayOfWeek();
|
infoPtr->FirstDayOfWeek = MonthCalFirstDayOfWeek();
|
||||||
|
|
||||||
infoPtr->hbHeader = GetSysColorBrush(infoPtr->Enabled ? MONTHCAL_HEADERBG : MONTHCAL_DISABLED_HEADERBG);
|
infoPtr->hbHeader = GetSysColorBrush(infoPtr->Enabled ? MONTHCAL_HEADERBG : MONTHCAL_DISABLED_HEADERBG);
|
||||||
|
@ -281,7 +281,7 @@ MonthCalReload(IN PMONTHCALWND infoPtr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update the control */
|
/* Update the control */
|
||||||
MonthCalUpdate(infoPtr);
|
MonthCalUpdate(infoPtr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -317,7 +317,7 @@ MonthCalChange(IN PMONTHCALWND infoPtr)
|
||||||
{
|
{
|
||||||
infoPtr->Changed = TRUE;
|
infoPtr->Changed = TRUE;
|
||||||
|
|
||||||
/* kill the day timer */
|
/* Kill the day timer */
|
||||||
if (infoPtr->DayTimerSet)
|
if (infoPtr->DayTimerSet)
|
||||||
{
|
{
|
||||||
KillTimer(infoPtr->hSelf,
|
KillTimer(infoPtr->hSelf,
|
||||||
|
@ -343,12 +343,12 @@ MonthCalSetDate(IN PMONTHCALWND infoPtr,
|
||||||
sc.NewMonth = Month;
|
sc.NewMonth = Month;
|
||||||
sc.NewYear = Year;
|
sc.NewYear = Year;
|
||||||
|
|
||||||
/* notify the parent */
|
/* Notify the parent */
|
||||||
if (!MonthCalNotifyControlParent(infoPtr,
|
if (!MonthCalNotifyControlParent(infoPtr,
|
||||||
MCCN_SELCHANGE,
|
MCCN_SELCHANGE,
|
||||||
&sc))
|
&sc))
|
||||||
{
|
{
|
||||||
/* check if we actually need to update */
|
/* Check if we actually need to update */
|
||||||
if (infoPtr->Month != sc.NewMonth ||
|
if (infoPtr->Month != sc.NewMonth ||
|
||||||
infoPtr->Year != sc.NewYear)
|
infoPtr->Year != sc.NewYear)
|
||||||
{
|
{
|
||||||
|
@ -358,7 +358,7 @@ MonthCalSetDate(IN PMONTHCALWND infoPtr,
|
||||||
|
|
||||||
MonthCalChange(infoPtr);
|
MonthCalChange(infoPtr);
|
||||||
|
|
||||||
/* repaint the entire control */
|
/* Repaint the entire control */
|
||||||
MonthCalUpdate(infoPtr);
|
MonthCalUpdate(infoPtr);
|
||||||
|
|
||||||
Ret = TRUE;
|
Ret = TRUE;
|
||||||
|
@ -375,7 +375,7 @@ MonthCalSetDate(IN PMONTHCALWND infoPtr,
|
||||||
sc.OldDay,
|
sc.OldDay,
|
||||||
&rcUpdate))
|
&rcUpdate))
|
||||||
{
|
{
|
||||||
/* repaint the day cells that need to be updated */
|
/* Repaint the day cells that need to be updated */
|
||||||
InvalidateRect(infoPtr->hSelf,
|
InvalidateRect(infoPtr->hSelf,
|
||||||
&rcUpdate,
|
&rcUpdate,
|
||||||
TRUE);
|
TRUE);
|
||||||
|
@ -419,7 +419,7 @@ MonthCalSetLocalTime(IN PMONTHCALWND infoPtr,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* kill the day timer */
|
/* Kill the day timer */
|
||||||
if (infoPtr->DayTimerSet)
|
if (infoPtr->DayTimerSet)
|
||||||
{
|
{
|
||||||
KillTimer(infoPtr->hSelf,
|
KillTimer(infoPtr->hSelf,
|
||||||
|
@ -427,7 +427,7 @@ MonthCalSetLocalTime(IN PMONTHCALWND infoPtr,
|
||||||
infoPtr->DayTimerSet = FALSE;
|
infoPtr->DayTimerSet = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* setup the new day timer */
|
/* Setup the new day timer */
|
||||||
MonthCalSetupDayTimer(infoPtr);
|
MonthCalSetupDayTimer(infoPtr);
|
||||||
|
|
||||||
if (Time != NULL)
|
if (Time != NULL)
|
||||||
|
@ -488,7 +488,7 @@ MonthCalPaint(IN PMONTHCALWND infoPtr,
|
||||||
{
|
{
|
||||||
RECT rcHeader;
|
RECT rcHeader;
|
||||||
|
|
||||||
/* paint the header */
|
/* Paint the header */
|
||||||
rcHeader.left = prcUpdate->left;
|
rcHeader.left = prcUpdate->left;
|
||||||
rcHeader.top = rcCell.top;
|
rcHeader.top = rcCell.top;
|
||||||
rcHeader.right = prcUpdate->right;
|
rcHeader.right = prcUpdate->right;
|
||||||
|
@ -508,7 +508,7 @@ MonthCalPaint(IN PMONTHCALWND infoPtr,
|
||||||
rcCell.left = x * infoPtr->CellSize.cx;
|
rcCell.left = x * infoPtr->CellSize.cx;
|
||||||
rcCell.right = rcCell.left + infoPtr->CellSize.cx;
|
rcCell.right = rcCell.left + infoPtr->CellSize.cx;
|
||||||
|
|
||||||
/* write the first letter of each weekday */
|
/* Write the first letter of each weekday */
|
||||||
DrawTextW(hDC,
|
DrawTextW(hDC,
|
||||||
&infoPtr->Week[x],
|
&infoPtr->Week[x],
|
||||||
1,
|
1,
|
||||||
|
@ -536,7 +536,7 @@ MonthCalPaint(IN PMONTHCALWND infoPtr,
|
||||||
rcCell.left = x * infoPtr->CellSize.cx;
|
rcCell.left = x * infoPtr->CellSize.cx;
|
||||||
rcCell.right = rcCell.left + infoPtr->CellSize.cx;
|
rcCell.right = rcCell.left + infoPtr->CellSize.cx;
|
||||||
|
|
||||||
/* write the day number */
|
/* Write the day number */
|
||||||
if (Day != 0 && Day < 100)
|
if (Day != 0 && Day < 100)
|
||||||
{
|
{
|
||||||
WCHAR szDay[3];
|
WCHAR szDay[3];
|
||||||
|
@ -588,14 +588,14 @@ MonthCalPaint(IN PMONTHCALWND infoPtr,
|
||||||
goto FailNoHighlight;
|
goto FailNoHighlight;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* highlight the selected day */
|
/* Highlight the selected day */
|
||||||
crOldText = SetTextColor(hDC,
|
crOldText = SetTextColor(hDC,
|
||||||
GetSysColor(infoPtr->Enabled ? MONTHCAL_SELFG : MONTHCAL_DISABLED_SELFG));
|
GetSysColor(infoPtr->Enabled ? MONTHCAL_SELFG : MONTHCAL_DISABLED_SELFG));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FailNoHighlight:
|
FailNoHighlight:
|
||||||
/* don't change the text color, we're not highlighting it... */
|
/* Don't change the text color, we're not highlighting it... */
|
||||||
crOldText = CLR_INVALID;
|
crOldText = CLR_INVALID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -764,7 +764,7 @@ MonthCalWndProc(IN HWND hwnd,
|
||||||
infoPtr->Year);
|
infoPtr->Year);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* fall through */
|
/* Fall through */
|
||||||
}
|
}
|
||||||
|
|
||||||
case WM_MBUTTONDOWN:
|
case WM_MBUTTONDOWN:
|
||||||
|
@ -822,7 +822,7 @@ MonthCalWndProc(IN HWND hwnd,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update the selection */
|
/* Update the selection */
|
||||||
if (NewDay != 0)
|
if (NewDay != 0)
|
||||||
{
|
{
|
||||||
MonthCalSetDate(infoPtr,
|
MonthCalSetDate(infoPtr,
|
||||||
|
@ -843,7 +843,7 @@ MonthCalWndProc(IN HWND hwnd,
|
||||||
{
|
{
|
||||||
case VK_TAB:
|
case VK_TAB:
|
||||||
{
|
{
|
||||||
/* change the UI status */
|
/* Change the UI status */
|
||||||
SendMessageW(GetAncestor(hwnd,
|
SendMessageW(GetAncestor(hwnd,
|
||||||
GA_PARENT),
|
GA_PARENT),
|
||||||
WM_CHANGEUISTATE,
|
WM_CHANGEUISTATE,
|
||||||
|
@ -972,18 +972,18 @@ MonthCalWndProc(IN HWND hwnd,
|
||||||
{
|
{
|
||||||
case ID_DAYTIMER:
|
case ID_DAYTIMER:
|
||||||
{
|
{
|
||||||
/* kill the timer */
|
/* Kill the timer */
|
||||||
KillTimer(hwnd,
|
KillTimer(hwnd,
|
||||||
ID_DAYTIMER);
|
ID_DAYTIMER);
|
||||||
infoPtr->DayTimerSet = FALSE;
|
infoPtr->DayTimerSet = FALSE;
|
||||||
|
|
||||||
if (!infoPtr->Changed)
|
if (!infoPtr->Changed)
|
||||||
{
|
{
|
||||||
/* update the system time and setup the new day timer */
|
/* Update the system time and setup the new day timer */
|
||||||
MonthCalSetLocalTime(infoPtr,
|
MonthCalSetLocalTime(infoPtr,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
/* update the control */
|
/* Update the control */
|
||||||
MonthCalUpdate(infoPtr);
|
MonthCalUpdate(infoPtr);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1007,7 +1007,7 @@ MonthCalWndProc(IN HWND hwnd,
|
||||||
infoPtr->CellSize.cx = infoPtr->ClientSize.cx / 7;
|
infoPtr->CellSize.cx = infoPtr->ClientSize.cx / 7;
|
||||||
infoPtr->CellSize.cy = infoPtr->ClientSize.cy / 7;
|
infoPtr->CellSize.cy = infoPtr->ClientSize.cy / 7;
|
||||||
|
|
||||||
/* repaint the control */
|
/* Repaint the control */
|
||||||
InvalidateRect(hwnd,
|
InvalidateRect(hwnd,
|
||||||
NULL,
|
NULL,
|
||||||
TRUE);
|
TRUE);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS Timedate Control Panel
|
* PROJECT: ReactOS Timedate Control Panel
|
||||||
* LICENSE: GPL - See COPYING in the top level directory
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
* FILE: lib/cpl/timedate/ntpclient.c
|
* FILE: dll/cpl/timedate/ntpclient.c
|
||||||
* PURPOSE: Queries the NTP server
|
* PURPOSE: Queries the NTP server
|
||||||
* COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
|
* COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
|
||||||
*
|
*
|
||||||
|
@ -40,11 +40,11 @@ InitConnection(PINFO pInfo,
|
||||||
if (pInfo->Sock == INVALID_SOCKET)
|
if (pInfo->Sock == INVALID_SOCKET)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
/* setup server info */
|
/* Setup server info */
|
||||||
he = gethostbyname(lpAddress);
|
he = gethostbyname(lpAddress);
|
||||||
if (he != NULL)
|
if (he != NULL)
|
||||||
{
|
{
|
||||||
/* setup server socket info */
|
/* Setup server socket info */
|
||||||
ZeroMemory(&pInfo->ntpAddr, sizeof(SOCKADDR_IN));
|
ZeroMemory(&pInfo->ntpAddr, sizeof(SOCKADDR_IN));
|
||||||
pInfo->ntpAddr.sin_family = AF_INET; // he->h_addrtype;
|
pInfo->ntpAddr.sin_family = AF_INET; // he->h_addrtype;
|
||||||
pInfo->ntpAddr.sin_port = htons(NTPPORT);
|
pInfo->ntpAddr.sin_port = htons(NTPPORT);
|
||||||
|
@ -71,7 +71,7 @@ GetTransmitTime(PTIMEPACKET ptp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* send some data to wake the server up */
|
/* Send some data to wake the server up */
|
||||||
static BOOL
|
static BOOL
|
||||||
SendData(PINFO pInfo)
|
SendData(PINFO pInfo)
|
||||||
{
|
{
|
||||||
|
@ -106,15 +106,15 @@ RecieveData(PINFO pInfo)
|
||||||
INT Ret;
|
INT Ret;
|
||||||
ULONG ulTime = 0;
|
ULONG ulTime = 0;
|
||||||
|
|
||||||
/* monitor socket for incomming connections */
|
/* Monitor socket for incomming connections */
|
||||||
FD_ZERO(&readFDS);
|
FD_ZERO(&readFDS);
|
||||||
FD_SET(pInfo->Sock, &readFDS);
|
FD_SET(pInfo->Sock, &readFDS);
|
||||||
|
|
||||||
/* set timeout values */
|
/* Set timeout values */
|
||||||
timeVal.tv_sec = TIMEOUT / 1000;
|
timeVal.tv_sec = TIMEOUT / 1000;
|
||||||
timeVal.tv_usec = TIMEOUT % 1000;
|
timeVal.tv_usec = TIMEOUT % 1000;
|
||||||
|
|
||||||
/* check for data on the socket for TIMEOUT millisecs*/
|
/* Check for data on the socket for TIMEOUT millisecs */
|
||||||
Ret = select(0, &readFDS, NULL, NULL, &timeVal);
|
Ret = select(0, &readFDS, NULL, NULL, &timeVal);
|
||||||
|
|
||||||
if ((Ret != SOCKET_ERROR) && (Ret != 0))
|
if ((Ret != SOCKET_ERROR) && (Ret != 0))
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS Timedate Control Panel
|
* PROJECT: ReactOS Timedate Control Panel
|
||||||
* LICENSE: GPL - See COPYING in the top level directory
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
* FILE: lib/cpl/timedate/timedate.c
|
* FILE: dll/cpl/timedate/timedate.c
|
||||||
* PURPOSE: ReactOS Timedate Control Panel
|
* PURPOSE: ReactOS Timedate Control Panel
|
||||||
* COPYRIGHT: Copyright 2004-2005 Eric Kohl
|
* COPYRIGHT: Copyright 2004-2005 Eric Kohl
|
||||||
* Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
|
* Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS Timedate Control Panel
|
* PROJECT: ReactOS Timedate Control Panel
|
||||||
* LICENSE: GPL - See COPYING in the top level directory
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
* FILE: lib/cpl/timedate/timezone.c
|
* FILE: dll/cpl/timedate/timezone.c
|
||||||
* PURPOSE: Time Zone property page
|
* PURPOSE: Time Zone property page
|
||||||
* COPYRIGHT: Copyright 2004-2005 Eric Kohl
|
* COPYRIGHT: Copyright 2004-2005 Eric Kohl
|
||||||
* Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
|
* Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
|
||||||
|
@ -331,7 +331,7 @@ GetAutoDaylightInfo(HWND hwnd)
|
||||||
&hKey))
|
&hKey))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* if the call fails (non zero), the reg value isn't available,
|
/* If the call fails (non zero), the reg value isn't available,
|
||||||
* which means it shouldn't be disabled, so we should check the button.
|
* which means it shouldn't be disabled, so we should check the button.
|
||||||
*/
|
*/
|
||||||
if (RegQueryValueExW(hKey,
|
if (RegQueryValueExW(hKey,
|
||||||
|
|
|
@ -275,7 +275,7 @@ GroupDelete(HWND hwndDlg)
|
||||||
szGroupName,
|
szGroupName,
|
||||||
UNLEN);
|
UNLEN);
|
||||||
|
|
||||||
/* Display a warning message because the delete operation cannot be reverted */
|
/* Display a warning message, because the delete operation cannot be reverted */
|
||||||
wsprintf(szText, TEXT("Dou you really want to delete the user group \"%s\"?"), szGroupName);
|
wsprintf(szText, TEXT("Dou you really want to delete the user group \"%s\"?"), szGroupName);
|
||||||
if (MessageBox(NULL, szText, TEXT("User Groups"), MB_ICONWARNING | MB_YESNO) == IDNO)
|
if (MessageBox(NULL, szText, TEXT("User Groups"), MB_ICONWARNING | MB_YESNO) == IDNO)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* PURPOSE: Native DirectDraw implementation
|
* PURPOSE: Native DirectDraw implementation
|
||||||
* FILE: subsys/win32k/ntddraw/d3d.c
|
* FILE: subsystems/win32/win32k/ntddraw/d3d.c
|
||||||
* PROGRAMER: Magnus olsen (magnus@greatlord.com)
|
* PROGRAMER: Magnus olsen (magnus@greatlord.com)
|
||||||
* REVISION HISTORY:
|
* REVISION HISTORY:
|
||||||
* 19/1-2006 Magnus Olsen
|
* 19/1-2006 Magnus Olsen
|
||||||
|
@ -271,7 +271,7 @@ NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw,
|
||||||
|
|
||||||
if (pfnDdCreateD3DBuffer == NULL)
|
if (pfnDdCreateD3DBuffer == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warning no pfnDdCreateD3DBuffer");
|
DPRINT1("Warning: no pfnDdCreateD3DBuffer");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -293,7 +293,7 @@ NtGdiDdDestroyD3DBuffer(HANDLE hSurface)
|
||||||
|
|
||||||
if (pfnDdDestroyD3DBuffer == NULL)
|
if (pfnDdDestroyD3DBuffer == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warning no pfnDdDestroyD3DBuffer");
|
DPRINT1("Warning: no pfnDdDestroyD3DBuffer");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* PURPOSE: Native DirectDraw implementation
|
* PURPOSE: Native DirectDraw implementation
|
||||||
* FILE: subsys/win32k/ntddraw/dd.c
|
* FILE: subsystems/win32/win32k/ntddraw/dd.c
|
||||||
* PROGRAMER: Magnus Olsen (greatlord@reactos.org)
|
* PROGRAMER: Magnus Olsen (greatlord@reactos.org)
|
||||||
* REVISION HISTORY:
|
* REVISION HISTORY:
|
||||||
* 19/1-2006 Magnus Olsen
|
* 19/1-2006 Magnus Olsen
|
||||||
|
@ -102,8 +102,8 @@ NtGdiDdGetScanLine(HANDLE hDirectDrawLocal,
|
||||||
|
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
/* This is not part of the ddsurface interface but it have */
|
/* This is not part of the ddsurface interface but it */
|
||||||
/* deal with the surface */
|
/* deals with the surface */
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* PURPOSE: Native DirectDraw implementation
|
* PURPOSE: Native DirectDraw implementation
|
||||||
* FILE: subsys/win32k/ntddraw/ddraw.c
|
* FILE: subsystems/win32/win32k/ntddraw/ddraw.c
|
||||||
* PROGRAMER: Magnus olsen (magnus@greatlord.com)
|
* PROGRAMER: Magnus olsen (magnus@greatlord.com)
|
||||||
* REVISION HISTORY:
|
* REVISION HISTORY:
|
||||||
* 19/1-2006 Magnus Olsen
|
* 19/1-2006 Magnus Olsen
|
||||||
|
@ -39,7 +39,7 @@ intEnableReactXDriver(HDC hdc)
|
||||||
PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = NULL;
|
PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = NULL;
|
||||||
BOOL success = FALSE;
|
BOOL success = FALSE;
|
||||||
|
|
||||||
/* FIXME get the process data */
|
/* FIXME: Get the process data */
|
||||||
|
|
||||||
/* Do not try load dxg.sys when it have already been load once */
|
/* Do not try load dxg.sys when it have already been load once */
|
||||||
if (gpfnStartupDxGraphics == NULL)
|
if (gpfnStartupDxGraphics == NULL)
|
||||||
|
@ -61,7 +61,7 @@ intEnableReactXDriver(HDC hdc)
|
||||||
|
|
||||||
pDev = pDC->ppdev;
|
pDev = pDC->ppdev;
|
||||||
|
|
||||||
/* test see if drv got a dx interface or not */
|
/* Test and see if drv got a DX interface or not */
|
||||||
if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) ||
|
if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) ||
|
||||||
( pDev->DriverFunctions.EnableDirectDraw == NULL))
|
( pDev->DriverFunctions.EnableDirectDraw == NULL))
|
||||||
{
|
{
|
||||||
|
@ -70,7 +70,7 @@ intEnableReactXDriver(HDC hdc)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
/* CHeck see if dx have been enable or not */
|
/* Check and see if DX has been enabled or not */
|
||||||
if ( pDev->pEDDgpl->pvmList == NULL)
|
if ( pDev->pEDDgpl->pvmList == NULL)
|
||||||
{
|
{
|
||||||
pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS);
|
pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS);
|
||||||
|
@ -85,7 +85,8 @@ intEnableReactXDriver(HDC hdc)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DPRINT1(" call to pfnDdEnableDirectDraw \n ");
|
DPRINT1(" call to pfnDdEnableDirectDraw \n ");
|
||||||
/* Note it is the hdev struct it want, not the drv hPDev aka pdc->PDev */
|
|
||||||
|
/* Note: it is the hdev struct it wants, not the drv hPDev aka pdc->PDev */
|
||||||
success = pfnDdEnableDirectDraw(pDC->ppdev, TRUE);
|
success = pfnDdEnableDirectDraw(pDC->ppdev, TRUE);
|
||||||
|
|
||||||
dump_edd_directdraw_global(pDev->pEDDgpl);
|
dump_edd_directdraw_global(pDev->pEDDgpl);
|
||||||
|
@ -111,7 +112,7 @@ intEnableReactXDriver(HDC hdc)
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
/* DirectX graphic/video driver loading and cleanup start here */
|
/* DirectX graphic/video driver loading and cleanup starts here */
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
APIENTRY
|
APIENTRY
|
||||||
|
@ -127,16 +128,16 @@ DxDdStartupDxGraphics( ULONG ulc1,
|
||||||
|
|
||||||
NTSTATUS Status = STATUS_PROCEDURE_NOT_FOUND;
|
NTSTATUS Status = STATUS_PROCEDURE_NOT_FOUND;
|
||||||
|
|
||||||
/* FIXME setup of gaEngFuncs driver export list
|
/* FIXME: Setup of gaEngFuncs driver export list
|
||||||
* but not in this api, we can add it here tempary until we figout where
|
* but not in this api, we can add it here tempary until we figout where
|
||||||
* no code have been writen for it yet
|
* no code have been writen for it yet
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/* FIXME ReactOS does not loading the dxapi.sys or import functions from it yet */
|
/* FIXME: ReactOS does not loading the dxapi.sys or import functions from it yet */
|
||||||
// DxApiGetVersion()
|
// DxApiGetVersion()
|
||||||
|
|
||||||
/* Loading the kernel interface of directx for win32k */
|
/* Loading the kernel interface of DirectX for win32k */
|
||||||
|
|
||||||
DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n");
|
DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n");
|
||||||
ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys");
|
ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys");
|
||||||
|
@ -147,7 +148,7 @@ DxDdStartupDxGraphics( ULONG ulc1,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* import DxDdStartupDxGraphics and DxDdCleanupDxGraphics */
|
/* Import DxDdStartupDxGraphics and DxDdCleanupDxGraphics */
|
||||||
gpfnStartupDxGraphics = EngFindImageProcAddress(ghDxGraphics,"DxDdStartupDxGraphics");
|
gpfnStartupDxGraphics = EngFindImageProcAddress(ghDxGraphics,"DxDdStartupDxGraphics");
|
||||||
gpfnCleanupDxGraphics = EngFindImageProcAddress(ghDxGraphics,"DxDdCleanupDxGraphics");
|
gpfnCleanupDxGraphics = EngFindImageProcAddress(ghDxGraphics,"DxDdCleanupDxGraphics");
|
||||||
|
|
||||||
|
@ -167,7 +168,7 @@ DxDdStartupDxGraphics( ULONG ulc1,
|
||||||
Proc );
|
Proc );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check if we manger loading the data and execute the dxStartupDxGraphics and it susscess */
|
/* Check if we manage loading the data and execute the dxStartupDxGraphics if it is successful */
|
||||||
if (!NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status))
|
||||||
{
|
{
|
||||||
gpfnStartupDxGraphics = NULL;
|
gpfnStartupDxGraphics = NULL;
|
||||||
|
@ -181,8 +182,8 @@ DxDdStartupDxGraphics( ULONG ulc1,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Sort the drv functions list in index order, this allown us doing, smaller optimze
|
/* Sort the drv functions list in index order, this allows us doing, smaller optimize
|
||||||
* in api that are redirect to dx.sys
|
* in API that are redirect to dx.sys
|
||||||
*/
|
*/
|
||||||
|
|
||||||
PDRVFN lstDrvFN = DxgDrv.pdrvfn;
|
PDRVFN lstDrvFN = DxgDrv.pdrvfn;
|
||||||
|
@ -196,7 +197,7 @@ DxDdStartupDxGraphics( ULONG ulc1,
|
||||||
DPRINT1("DirectX interface is activated\n");
|
DPRINT1("DirectX interface is activated\n");
|
||||||
|
|
||||||
}
|
}
|
||||||
/* return the status */
|
/* Return the status */
|
||||||
}
|
}
|
||||||
|
|
||||||
return Status;
|
return Status;
|
||||||
|
@ -221,14 +222,14 @@ NtGdiDdCreateDirectDrawObject(HDC hdc)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FIXME This should be alloc for each drv and use it from each drv, not global for whole win32k */
|
/* FIXME: This should be alloc for each drv and use it from each drv, not global for whole win32k */
|
||||||
if (intEnableReactXDriver(hdc) == FALSE)
|
if (intEnableReactXDriver(hdc) == FALSE)
|
||||||
{
|
{
|
||||||
DPRINT1("Warning : Failed to start the directx interface from the graphic driver\n");
|
DPRINT1("Warning: Failed to start the DirectX interface from the graphic driver\n");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* get the pfnDdCreateDirectDrawObject after we load the drv */
|
/* Get the pfnDdCreateDirectDrawObject after we load the drv */
|
||||||
pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn;
|
pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn;
|
||||||
|
|
||||||
if (pfnDdCreateDirectDrawObject == NULL)
|
if (pfnDdCreateDirectDrawObject == NULL)
|
||||||
|
@ -247,7 +248,7 @@ NtGdiDdCreateDirectDrawObject(HDC hdc)
|
||||||
* @implemented
|
* @implemented
|
||||||
*
|
*
|
||||||
* The function NtGdiDxgGenericThunk redirects DirectX calls to another function.
|
* The function NtGdiDxgGenericThunk redirects DirectX calls to another function.
|
||||||
* It redirects to dxg.sys in windows XP/2003, dxkrnl.sys in vista and is fully implemented in win32k.sys in windows 2000 and below
|
* It redirects to dxg.sys in Windows XP/2003, dxkrnl.sys in Vista and is fully implemented in win32k.sys in Windows 2000 and below
|
||||||
*
|
*
|
||||||
* @param ULONG_PTR ulIndex
|
* @param ULONG_PTR ulIndex
|
||||||
* The functions we want to redirect
|
* The functions we want to redirect
|
||||||
|
@ -401,7 +402,7 @@ NtGdiDdDeleteSurfaceObject(HANDLE hSurface)
|
||||||
DPRINT1("Warning: no pfnDdDeleteSurfaceObject\n");
|
DPRINT1("Warning: no pfnDdDeleteSurfaceObject\n");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
/* try see if the handle is vaidl */
|
/* Try and see if the handle is valid */
|
||||||
|
|
||||||
DPRINT1("Calling dxg.sys DdDeleteSurfaceObject\n");
|
DPRINT1("Calling dxg.sys DdDeleteSurfaceObject\n");
|
||||||
return pfnDdDeleteSurfaceObject(hSurface);
|
return pfnDdDeleteSurfaceObject(hSurface);
|
||||||
|
@ -664,7 +665,7 @@ NtGdiDdSetGammaRamp(HANDLE hDirectDraw,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* internal debug api */
|
/* Internal debug API */
|
||||||
void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl)
|
void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl)
|
||||||
{
|
{
|
||||||
DPRINT1("0x%08lx 0x000 PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dhpdev), pEddgbl->dhpdev);
|
DPRINT1("0x%08lx 0x000 PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dhpdev), pEddgbl->dhpdev);
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* PURPOSE: Native DirectDraw implementation
|
* PURPOSE: Native DirectDraw implementation
|
||||||
* FILE: subsys/win32k/ntddraw/dd.c
|
* FILE: subsystems/win32/win32k/ntddraw/ddsurf.c
|
||||||
* PROGRAMER: Magnus Olsen (greatlord@reactos.org)
|
* PROGRAMER: Magnus Olsen (greatlord@reactos.org)
|
||||||
* REVISION HISTORY:
|
* REVISION HISTORY:
|
||||||
* 19/7-2006 Magnus Olsen
|
* 19/7-2006 Magnus Olsen
|
||||||
|
@ -22,7 +22,7 @@ NtGdiDdDestroySurface(HANDLE hSurface, BOOL bRealDestroy)
|
||||||
|
|
||||||
if (pfnDdDestroySurface == NULL)
|
if (pfnDdDestroySurface == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdDestroySurface");
|
DPRINT1("Warning: no pfnDdDestroySurface");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ NtGdiDdFlip(HANDLE hSurfaceCurrent,
|
||||||
|
|
||||||
if (pfnDdDdFlip == NULL)
|
if (pfnDdDdFlip == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdDdFlip");
|
DPRINT1("Warning: no pfnDdDdFlip");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ NtGdiDdLock(HANDLE hSurface,
|
||||||
|
|
||||||
if (pfnDdLock == NULL)
|
if (pfnDdLock == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdLock");
|
DPRINT1("Warning: no pfnDdLock");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ NtGdiDdUnlock(HANDLE hSurface,
|
||||||
|
|
||||||
if (pfnDdUnlock == NULL)
|
if (pfnDdUnlock == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdUnlock");
|
DPRINT1("Warning: no pfnDdUnlock");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -107,7 +107,7 @@ NtGdiDdBlt(HANDLE hSurfaceDest,
|
||||||
|
|
||||||
if (pfnDdBlt == NULL)
|
if (pfnDdBlt == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdBlt");
|
DPRINT1("Warning: no pfnDdBlt");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,7 +127,7 @@ NtGdiDdSetColorKey(HANDLE hSurface,
|
||||||
|
|
||||||
if (pfnDdSetColorKey == NULL)
|
if (pfnDdSetColorKey == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdSetColorKey");
|
DPRINT1("Warning: no pfnDdSetColorKey");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -150,7 +150,7 @@ NtGdiDdAddAttachedSurface(HANDLE hSurface,
|
||||||
|
|
||||||
if (pfnDdAddAttachedSurface == NULL)
|
if (pfnDdAddAttachedSurface == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdAddAttachedSurface");
|
DPRINT1("Warning: no pfnDdAddAttachedSurface");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -170,7 +170,7 @@ NtGdiDdGetBltStatus(HANDLE hSurface,
|
||||||
|
|
||||||
if (pfnDdGetBltStatus == NULL)
|
if (pfnDdGetBltStatus == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdGetBltStatus");
|
DPRINT1("Warning: no pfnDdGetBltStatus");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -190,7 +190,7 @@ NtGdiDdGetFlipStatus(HANDLE hSurface,
|
||||||
|
|
||||||
if (pfnDdGetFlipStatus == NULL)
|
if (pfnDdGetFlipStatus == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdGetFlipStatus");
|
DPRINT1("Warning: no pfnDdGetFlipStatus");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -211,7 +211,7 @@ NtGdiDdUpdateOverlay(HANDLE hSurfaceDestination,
|
||||||
|
|
||||||
if (pfnDdUpdateOverlay == NULL)
|
if (pfnDdUpdateOverlay == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdUpdateOverlay");
|
DPRINT1("Warning: no pfnDdUpdateOverlay");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -233,7 +233,7 @@ NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource,
|
||||||
|
|
||||||
if (pfnDdSetOverlayPosition == NULL)
|
if (pfnDdSetOverlayPosition == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdSetOverlayPosition");
|
DPRINT1("Warning: no pfnDdSetOverlayPosition");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -242,8 +242,8 @@ NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource,
|
||||||
}
|
}
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
/* This is not part of the ddsurface interface but it have */
|
/* This is not part of the ddsurface interface but it */
|
||||||
/* deal with the surface */
|
/* deals with the surface */
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
@ -260,7 +260,7 @@ NtGdiDdAlphaBlt(HANDLE hSurfaceDest,
|
||||||
|
|
||||||
if (pfnDdAlphaBlt == NULL)
|
if (pfnDdAlphaBlt == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdAlphaBlt");
|
DPRINT1("Warning: no pfnDdAlphaBlt");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -281,7 +281,7 @@ NtGdiDdAttachSurface(HANDLE hSurfaceFrom,
|
||||||
|
|
||||||
if (pfnDdAttachSurface == NULL)
|
if (pfnDdAttachSurface == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdAttachSurface");
|
DPRINT1("Warning: no pfnDdAttachSurface");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -292,9 +292,9 @@ NtGdiDdAttachSurface(HANDLE hSurfaceFrom,
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
/* NtGdiDdUnattachSurface */
|
/* NtGdiDdUnattachSurface */
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
/* Note : msdn protypes is VOID APIENTRY NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached)
|
/* Note: MSDN protypes is VOID APIENTRY NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached)
|
||||||
But it say it return either DDHAL_DRIVER_NOTHANDLED or DDHAL_DRIVER_HANDLED
|
But it say it return either DDHAL_DRIVER_NOTHANDLED or DDHAL_DRIVER_HANDLED
|
||||||
so I guess it is a typo in MSDN for this protypes for the info talk against it self
|
so I guess it is a typo in MSDN for this prototype for the info contradicts itself.
|
||||||
*/
|
*/
|
||||||
DWORD
|
DWORD
|
||||||
APIENTRY
|
APIENTRY
|
||||||
|
@ -304,12 +304,10 @@ NtGdiDdUnattachSurface(HANDLE hSurface,
|
||||||
PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = (PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnattachSurface].pfn;
|
PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = (PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnattachSurface].pfn;
|
||||||
if (pfnDdUnattachSurface == NULL)
|
if (pfnDdUnattachSurface == NULL)
|
||||||
{
|
{
|
||||||
DPRINT1("Warring no pfnDdUnattachSurface");
|
DPRINT1("Warning: no pfnDdUnattachSurface");
|
||||||
return DDHAL_DRIVER_NOTHANDLED;
|
return DDHAL_DRIVER_NOTHANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
DPRINT1("Calling on dxg.sys pfnDdUnattachSurface");
|
DPRINT1("Calling on dxg.sys pfnDdUnattachSurface");
|
||||||
return pfnDdUnattachSurface(hSurface,hSurfaceAttached);
|
return pfnDdUnattachSurface(hSurface,hSurfaceAttached);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* PURPOSE: Native DirectDraw implementation
|
* PURPOSE: Native DirectDraw implementation
|
||||||
* FILE: subsys/win32k/ntddraw/dvd.c
|
* FILE: subsystems/win32/win32k/ntddraw/dvp.c
|
||||||
* PROGRAMER: Magnus olsen (magnus@greatlord.com)
|
* PROGRAMER: Magnus olsen (magnus@greatlord.com)
|
||||||
* REVISION HISTORY:
|
* REVISION HISTORY:
|
||||||
* 19/1-2006 Magnus Olsen
|
* 19/1-2006 Magnus Olsen
|
||||||
|
|
|
@ -473,8 +473,8 @@ DxEngGetDCState(HDC hDC,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
/* if a valid type is not found, zero is returned */
|
/* If a valid type is not found, zero is returned */
|
||||||
DPRINT1("Warning did not find type %d\n",type);
|
DPRINT1("Warning: did not find type %d\n",type);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
DC_UnlockDc(pDC);
|
DC_UnlockDc(pDC);
|
||||||
|
@ -593,12 +593,12 @@ DxEngReferenceHdev(HDEV hDev)
|
||||||
/* DxEngNUIsTermSrv */
|
/* DxEngNUIsTermSrv */
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
||||||
/* Notes : Check see if termal server got a connections or not */
|
/* Notes: Check if terminal server got connections or not */
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
APIENTRY
|
APIENTRY
|
||||||
DxEngNUIsTermSrv()
|
DxEngNUIsTermSrv()
|
||||||
{
|
{
|
||||||
/* FIXME ReactOS does not suport terminal server yet, we can not check if we got a connections or not */
|
/* FIXME: ReactOS does not suport terminal server yet, we can not check if we got connections or not */
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -641,7 +641,7 @@ HDEV *
|
||||||
APIENTRY
|
APIENTRY
|
||||||
DxEngEnumerateHdev(HDEV *hdev)
|
DxEngEnumerateHdev(HDEV *hdev)
|
||||||
{
|
{
|
||||||
/* FIXME Enumerate all drivers in win32k */
|
/* FIXME: Enumerate all drivers in win32k */
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -663,7 +663,7 @@ DWORD APIENTRY DxEngScreenAccessCheck()
|
||||||
{
|
{
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
|
|
||||||
/* we cheating here and tell dxg.sys it have always premitions to access the screen */
|
/* We're cheating here and telling dxg.sys it has always had permissions to access the screen */
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -673,7 +673,7 @@ DWORD APIENTRY DxEngScreenAccessCheck()
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
APIENTRY
|
APIENTRY
|
||||||
DxEngIsHdevLockedByCurrentThread(HDEV hDev)
|
DxEngIsHdevLockedByCurrentThread(HDEV hDev)
|
||||||
{ // base on EngIsSemaphoreOwnedByCurrentThread w/o the Ex call.
|
{ // Based on EngIsSemaphoreOwnedByCurrentThread w/o the Ex call.
|
||||||
PERESOURCE pSem = ((PPDEVOBJ)hDev)->hsemDevLock;
|
PERESOURCE pSem = ((PPDEVOBJ)hDev)->hsemDevLock;
|
||||||
return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread();
|
return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* PURPOSE: Native DirectDraw implementation
|
* PURPOSE: Native DirectDraw implementation
|
||||||
* FILE: subsys/win32k/ntddraw/dvd.c
|
* FILE: subsystems/win32/win32k/ntddraw/eng.c
|
||||||
* PROGRAMER: Magnus olsen (magnus@greatlord.com)
|
* PROGRAMER: Magnus olsen (magnus@greatlord.com)
|
||||||
* REVISION HISTORY:
|
* REVISION HISTORY:
|
||||||
* 19/1-2006 Magnus Olsen
|
* 19/1-2006 Magnus Olsen
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue