[FORMATTING] Remove trailing whitespace. Addendum to 34593d93.

Excluded: 3rd-party code (incl. wine) and most of the win32ss.
This commit is contained in:
Hermès Bélusca-Maïto 2021-09-13 03:33:14 +02:00
parent bbabe2489e
commit 9393fc320e
No known key found for this signature in database
GPG Key ID: 3B2539C65E7B93D0
701 changed files with 14685 additions and 14693 deletions

View File

@ -4,9 +4,9 @@
# [MODULE] A short but descriptive summary (#pr-num) # [MODULE] A short but descriptive summary (#pr-num)
# #
# A comprehensible description of WHY you did this work. Do not limit # A comprehensible description of WHY you did this work. Do not limit
# yourself here. # yourself here.
# The width of the description is arbitary, but it is a good idea to # The width of the description is arbitary, but it is a good idea to
# wrap the text by 72 chars. # wrap the text by 72 chars.
# #
# CORE-XXXX CIDXXXXX # CORE-XXXX CIDXXXXX
# ---------------------- # ----------------------
@ -17,6 +17,6 @@
# * Description of a commit should explain WHY a change was made. # * Description of a commit should explain WHY a change was made.
# * JIRA, Coverity ID references should be placed at the bottom row. # * JIRA, Coverity ID references should be placed at the bottom row.
# * There must be a newline between summary, description and bug IDs. # * There must be a newline between summary, description and bug IDs.
# * GitHub Pull Request ID should be referenced in the summary in # * GitHub Pull Request ID should be referenced in the summary in
# parens. If the resulting summary is longer than 70 chars it may # parens. If the resulting summary is longer than 70 chars it may
# be placed last in the ID row to prevent hard wrapping on GitHub. # be placed last in the ID row to prevent hard wrapping on GitHub.

2
.gitpod.Dockerfile vendored
View File

@ -1,5 +1,5 @@
FROM gitpod/workspace-full-vnc FROM gitpod/workspace-full-vnc
USER gitpod USER gitpod
# Install custom tools, runtime, etc. using apt-get # Install custom tools, runtime, etc. using apt-get

View File

@ -1,12 +1,12 @@
Copyright 2008 ReactOS Portable Systems Group. All rights reserved. Copyright 2008 ReactOS Portable Systems Group. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided Redistribution and use in source and binary forms, with or without modification, are permitted provided
that the following conditions are met: that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and 1. Redistributions of source code must retain the above copyright notice, this list of conditions and
the following disclaimer. the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions
and the following disclaimer in the documentation and/or other materials provided with the and the following disclaimer in the documentation and/or other materials provided with the
distribution. distribution.
THIS SOFTWARE IS PROVIDED BY THE REACTOS PORTABLE SYSTEMS GROUP ``AS IS'' AND ANY EXPRESS OR IMPLIED THIS SOFTWARE IS PROVIDED BY THE REACTOS PORTABLE SYSTEMS GROUP ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

View File

@ -512,7 +512,7 @@ static const conv_t conv_VOLUME[] = {
1 chang = 20 tamlung 1 chang = 20 tamlung
1 tamlung = 4 baht 1 tamlung = 4 baht
1 baht = 4 saloung 1 baht = 4 saloung
1 saloung = 1 saloung =
1 chang = 6/5 kg = 1200 g 1 chang = 6/5 kg = 1200 g
1 tamlung = 1/20 chang = 60 g 1 tamlung = 1/20 chang = 60 g

View File

@ -55,7 +55,7 @@ double acosh(double x)
{ {
// must be x>=1, if not return Nan (Not a Number) // must be x>=1, if not return Nan (Not a Number)
if(!(x>=1.0)) return sqrt(-1.0); if(!(x>=1.0)) return sqrt(-1.0);
// return only the positive result (as sqrt does). // return only the positive result (as sqrt does).
return log(x+sqrt(x*x-1.0)); return log(x+sqrt(x*x-1.0));
} }
@ -64,7 +64,7 @@ double atanh(double x)
{ {
// must be x>-1, x<1, if not return Nan (Not a Number) // must be x>-1, x<1, if not return Nan (Not a Number)
if(!(x>-1.0 && x<1.0)) return sqrt(-1.0); if(!(x>-1.0 && x<1.0)) return sqrt(-1.0);
return log((1.0+x)/(1.0-x))/2.0; return log((1.0+x)/(1.0-x))/2.0;
} }
@ -372,7 +372,7 @@ static __int64 cbrti(__int64 x) {
s = 60; s = 60;
y = 0; y = 0;
while(s >= 0) { while(s >= 0) {
y = 2*y; y = 2*y;
b = (3*y*(y + 1) + 1) << s; b = (3*y*(y + 1) + 1) << s;
s = s - 3; s = s - 3;

View File

@ -133,7 +133,7 @@
* "DOT" function can be used for starting a number (integer part will be zero). * "DOT" function can be used for starting a number (integer part will be zero).
* Added repeat function. * Added repeat function.
* If the number is greater than maximum resolution, it will be displayed with exponential notation. * If the number is greater than maximum resolution, it will be displayed with exponential notation.
* Removed mouse and keyboard focuses from displayed buttons. * Removed mouse and keyboard focuses from displayed buttons.
* Added normal and small icons. * Added normal and small icons.
1.00 (20070323) 1.00 (20070323)

View File

@ -852,7 +852,7 @@ static void update_memory_flag(HWND hWnd, BOOL mem_flag)
static void update_n_stats_items(HWND hWnd, TCHAR *buffer) static void update_n_stats_items(HWND hWnd, TCHAR *buffer)
{ {
unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0); unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0);
_stprintf(buffer, _T("n=%u"), n); _stprintf(buffer, _T("n=%u"), n);
SetDlgItemText(hWnd, IDC_TEXT_NITEMS, buffer); SetDlgItemText(hWnd, IDC_TEXT_NITEMS, buffer);
@ -1211,7 +1211,7 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
#else #else
(void)idm; (void)idm;
#endif #endif
} }
static void run_canc(calc_number_t *c) static void run_canc(calc_number_t *c)
{ {

View File

@ -47,7 +47,7 @@ FillCharacterSetComboList(HWND hwndCombo)
if (GetCPInfoExW(codePages[i], 0, &cpInfo)) if (GetCPInfoExW(codePages[i], 0, &cpInfo))
{ {
trimmedName = wcschr(cpInfo.CodePageName, L'('); trimmedName = wcschr(cpInfo.CodePageName, L'(');
if (!trimmedName) if (!trimmedName)
trimmedName = cpInfo.CodePageName; trimmedName = cpInfo.CodePageName;
SendMessageW(hwndCombo, SendMessageW(hwndCombo,
@ -678,7 +678,7 @@ wWinMain(HINSTANCE hInst,
MSG Msg; MSG Msg;
hInstance = hInst; hInstance = hInst;
/* Mirroring code for the titlebar */ /* Mirroring code for the titlebar */
switch (GetUserDefaultUILanguage()) switch (GetUserDefaultUILanguage())
{ {

View File

@ -276,7 +276,7 @@ SetFont(PMAP infoPtr,
NULL, NULL,
TRUE); TRUE);
if (infoPtr->pActiveCell) if (infoPtr->pActiveCell)
infoPtr->pActiveCell->bActive = FALSE; infoPtr->pActiveCell->bActive = FALSE;
infoPtr->pActiveCell = &infoPtr->Cells[0][0]; infoPtr->pActiveCell = &infoPtr->Cells[0][0];
infoPtr->pActiveCell->bActive = TRUE; infoPtr->pActiveCell->bActive = TRUE;
@ -357,7 +357,7 @@ OnClick(PMAP infoPtr,
* Find the cell the mouse pointer is over. * Find the cell the mouse pointer is over.
* Since each cell is the same size, this can be done quickly using CellSize. * Since each cell is the same size, this can be done quickly using CellSize.
* Clamp to XCELLS - 1 and YCELLS - 1 because the map can sometimes be slightly * Clamp to XCELLS - 1 and YCELLS - 1 because the map can sometimes be slightly
* larger than infoPtr.CellSize * XCELLS , due to the map size being a non integer * larger than infoPtr.CellSize * XCELLS , due to the map size being a non integer
* multiple of infoPtr.CellSize . * multiple of infoPtr.CellSize .
*/ */
x = min(XCELLS - 1, ptx / max(1, infoPtr->CellSize.cx)); x = min(XCELLS - 1, ptx / max(1, infoPtr->CellSize.cx));
@ -367,7 +367,7 @@ OnClick(PMAP infoPtr,
i = XCELLS * infoPtr->iYStart + y * XCELLS + x; i = XCELLS * infoPtr->iYStart + y * XCELLS + x;
if (i >= infoPtr->NumValidGlyphs) if (i >= infoPtr->NumValidGlyphs)
{ {
if (infoPtr->pActiveCell) if (infoPtr->pActiveCell)
infoPtr->pActiveCell->bActive = FALSE; infoPtr->pActiveCell->bActive = FALSE;
infoPtr->pActiveCell = NULL; infoPtr->pActiveCell = NULL;
return; return;
@ -507,11 +507,11 @@ OnVScroll(PMAP infoPtr,
/* Invalidate the rect around the active cell since a new cell will become active */ /* Invalidate the rect around the active cell since a new cell will become active */
if (infoPtr->pActiveCell && infoPtr->pActiveCell->bActive) if (infoPtr->pActiveCell && infoPtr->pActiveCell->bActive)
{ {
InvalidateRect(infoPtr->hMapWnd, InvalidateRect(infoPtr->hMapWnd,
&infoPtr->pActiveCell->CellExt, &infoPtr->pActiveCell->CellExt,
TRUE); TRUE);
} }
GetClientRect(infoPtr->hMapWnd, &rect); GetClientRect(infoPtr->hMapWnd, &rect);
rect.top += 2; rect.top += 2;
rect.bottom -= 2; rect.bottom -= 2;
@ -630,7 +630,7 @@ MapWndProc(HWND hwnd,
case WM_LBUTTONDBLCLK: case WM_LBUTTONDBLCLK:
{ {
if (!infoPtr->pActiveCell) if (!infoPtr->pActiveCell)
break; break;
NotifyParentOfSelection(infoPtr, NotifyParentOfSelection(infoPtr,

View File

@ -26,7 +26,7 @@
#define FM_SETCHARMAP (WM_USER + 5) #define FM_SETCHARMAP (WM_USER + 5)
// the code pages to display in the advanced 'character set' combobox // the code pages to display in the advanced 'character set' combobox
static const UINT codePages[] = { static const UINT codePages[] = {
864, 775, 863, 855, 737, 856, 862, 861, 852, 869, 850, 858, 865, 860, 866, 857, 437, // OEM code pages 864, 775, 863, 855, 737, 856, 862, 861, 852, 869, 850, 858, 865, 860, 866, 857, 437, // OEM code pages
1256, 1257, 1250, 1251, 1253, 1255, 932, 949, 1252, 936, 874, 950, 1254, 1258 // ANSI code pages 1256, 1257, 1250, 1251, 1253, 1255, 932, 949, 1252, 936, 874, 950, 1254, 1258 // ANSI code pages
}; };

View File

@ -155,7 +155,7 @@ CGridView::UpdateCellCoordinates(
) )
{ {
// Go through all the cells and calculate // Go through all the cells and calculate
// their coordinates within the grid // their coordinates within the grid
for (int y = 0; y < m_yNumCells; y++) for (int y = 0; y < m_yNumCells; y++)
for (int x = 0; x < m_xNumCells; x++) for (int x = 0; x < m_xNumCells; x++)
{ {
@ -262,7 +262,6 @@ VOID
CGridView::OnVScroll(_In_ INT Value, CGridView::OnVScroll(_In_ INT Value,
_In_ INT Pos) _In_ INT Pos)
{ {
INT PrevScrollPosition = m_ScrollPosition; INT PrevScrollPosition = m_ScrollPosition;
switch (Value) switch (Value)

View File

@ -99,7 +99,7 @@ CCharMapWindow::Run(void)
{ {
MSG Msg; MSG Msg;
// Pump the message queue // Pump the message queue
while (GetMessageW(&Msg, NULL, 0, 0) != 0) while (GetMessageW(&Msg, NULL, 0, 0) != 0)
{ {
TranslateMessage(&Msg); TranslateMessage(&Msg);
@ -195,7 +195,7 @@ CCharMapWindow::OnCreate(_In_ HWND hDlg)
} }
} }
// Add all the fonts to the // Add all the fonts to the list
if (!CreateFontComboBox()) if (!CreateFontComboBox())
return FALSE; return FALSE;

View File

@ -398,7 +398,7 @@ GetTimeAsJobTime(VOID)
GetLocalTime(&Time); GetLocalTime(&Time);
JobTime = (DWORD_PTR)Time.wHour * 3600000 + JobTime = (DWORD_PTR)Time.wHour * 3600000 +
(DWORD_PTR)Time.wMinute * 60000; (DWORD_PTR)Time.wMinute * 60000;
return JobTime; return JobTime;
@ -698,7 +698,7 @@ AddJob(
ULONG ulJobId = 0; ULONG ulJobId = 0;
NET_API_STATUS Status; NET_API_STATUS Status;
InfoBuffer.JobTime = (DWORD_PTR)ulJobHour * 3600000 + InfoBuffer.JobTime = (DWORD_PTR)ulJobHour * 3600000 +
(DWORD_PTR)ulJobMinute * 60000; (DWORD_PTR)ulJobMinute * 60000;
InfoBuffer.DaysOfMonth = ulDaysOfMonth; InfoBuffer.DaysOfMonth = ulDaysOfMonth;
InfoBuffer.DaysOfWeek = ucDaysOfWeek; InfoBuffer.DaysOfWeek = ucDaysOfWeek;

View File

@ -4,6 +4,7 @@
* PURPOSE: Comparing text files * PURPOSE: Comparing text files
* COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com) * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
*/ */
#include "fc.h" #include "fc.h"
#define IS_SPACE(ch) ((ch) == TEXT(' ') || (ch) == TEXT('\t')) #define IS_SPACE(ch) ((ch) == TEXT(' ') || (ch) == TEXT('\t'))
@ -510,7 +511,7 @@ Resync(FILECOMPARE *pFC, struct list **pptr0, struct list **pptr1)
return FCRET_DIFFERENT; return FCRET_DIFFERENT;
} }
static FCRET static FCRET
Finalize(FILECOMPARE* pFC, struct list *ptr0, struct list* ptr1, BOOL fDifferent) Finalize(FILECOMPARE* pFC, struct list *ptr0, struct list* ptr1, BOOL fDifferent)
{ {
if (!ptr0 && !ptr1) if (!ptr0 && !ptr1)

View File

@ -552,7 +552,7 @@ IsDataUnicode(
IS_TEXT_UNICODE_REVERSE_MASK | IS_TEXT_UNICODE_UNICODE_MASK) IS_TEXT_UNICODE_REVERSE_MASK | IS_TEXT_UNICODE_UNICODE_MASK)
& ~IS_TEXT_UNKNOWN_FLAGS_MASK; & ~IS_TEXT_UNKNOWN_FLAGS_MASK;
INT Results; INT Results;
IsTextUnicode(Buffer, BufferSize, &Tests); IsTextUnicode(Buffer, BufferSize, &Tests);
Results = Tests; Results = Tests;
@ -1083,7 +1083,7 @@ int wmain(int argc, WCHAR* argv[])
continue; continue;
GetFullPathNameW(argv[i], ARRAYSIZE(szFullPath), szFullPath, NULL); GetFullPathNameW(argv[i], ARRAYSIZE(szFullPath), szFullPath, NULL);
hFile = CreateFileW(szFullPath, hFile = CreateFileW(szFullPath,
GENERIC_READ, GENERIC_READ,
FILE_SHARE_READ, FILE_SHARE_READ,
NULL, NULL,

View File

@ -49,7 +49,7 @@ VOID PrintResString(HINSTANCE hInstance, UINT uID, UINT MaxWidth, BOOL bAlignLef
{ {
if (!hInstance) if (!hInstance)
return; return;
WCHAR StringBuffer[RES_STR_MAXLEN]; WCHAR StringBuffer[RES_STR_MAXLEN];
LoadStringW(hInstance, uID, StringBuffer, _countof(StringBuffer)); LoadStringW(hInstance, uID, StringBuffer, _countof(StringBuffer));
PrintString(StringBuffer, MaxWidth, bAlignLeft); PrintString(StringBuffer, MaxWidth, bAlignLeft);
@ -96,7 +96,7 @@ BOOL PrintMemory(SIZE_T MemorySizeByte, UINT MaxWidth, HINSTANCE hInstance)
*pNumberStr = L'0' + (MemorySize / Mod); *pNumberStr = L'0' + (MemorySize / Mod);
MemorySize %= Mod; MemorySize %= Mod;
pNumberStr++; pNumberStr++;
if (i != 1 && i % 3 == 1) if (i != 1 && i % 3 == 1)
{ {
*pNumberStr = L','; *pNumberStr = L',';

View File

@ -28,7 +28,7 @@ BOOL bUseAscii = FALSE;
/** /**
* @name: HasSubFolder * @name: HasSubFolder
* *
* @param strPath * @param strPath
* Must specify folder name * Must specify folder name
* *
* @return * @return
@ -207,7 +207,7 @@ static VOID DrawTree(PCWSTR strPath,
/** /**
* @name: GetDirectoryStructure * @name: GetDirectoryStructure
* *
* @param strPath * @param strPath
* Must specify folder name * Must specify folder name
* *
@ -240,7 +240,7 @@ GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine)
wcscat(tmp, strPath); wcscat(tmp, strPath);
wcscat(tmp, L"\\*.*"); wcscat(tmp, L"\\*.*");
hFind = FindFirstFileW(tmp, &FindFileData); hFind = FindFirstFileW(tmp, &FindFileData);
//err = GetLastError(); //err = GetLastError();
} }
if (hFind == INVALID_HANDLE_VALUE) if (hFind == INVALID_HANDLE_VALUE)

View File

@ -367,7 +367,7 @@ void WhoamiPrintTable(WhoamiTable *pTable)
WhoamiFree(pTable->Content[i * pTable->Cols + j]); WhoamiFree(pTable->Content[i * pTable->Cols + j]);
WhoamiFree(pTable); WhoamiFree(pTable);
if (PrintFormat != csv) if (PrintFormat != csv)
HeapFree(GetProcessHeap(), 0, ColLength); HeapFree(GetProcessHeap(), 0, ColLength);
} }

View File

@ -14,7 +14,7 @@ BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen);
VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface); VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface);
VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE lpDDBackBuffer, BOOL Fullscreen, INT *posX, INT *posY, INT *gainX, INT *gainY, RECT *rectDD); VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE lpDDBackBuffer, BOOL Fullscreen, INT *posX, INT *posY, INT *gainX, INT *gainY, RECT *rectDD);
#define TEST_DURATION 10000 #define TEST_DURATION 10000
#define DD_TEST_WIDTH 640 #define DD_TEST_WIDTH 640
#define DD_TEST_HEIGHT 480 #define DD_TEST_HEIGHT 480
#define DD_TEST_STEP 5 #define DD_TEST_STEP 5
@ -295,7 +295,7 @@ BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){
{ {
if (msg.message == WM_TIMER) if (msg.message == WM_TIMER)
{ {
if(msg.wParam == TimerID) if(msg.wParam == TimerID)
{ {
break; break;
} }

View File

@ -188,7 +188,7 @@ DisplayPageSetDeviceDetails(HWND * hDlgCtrls, LPCGUID classGUID, LPGUID * device
SendMessageW(hDlgCtrls[1], WM_SETTEXT, 0, (LPARAM)szText); SendMessageW(hDlgCtrls[1], WM_SETTEXT, 0, (LPARAM)szText);
/* FIXME /* FIXME
* we currently enumerate only the first adapter * we currently enumerate only the first adapter
*/ */
EnumerateDrivers(&hDlgCtrls[2], hInfo, &InfoData); EnumerateDrivers(&hDlgCtrls[2], hInfo, &InfoData);
break; break;
@ -367,7 +367,7 @@ DisplayPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
RECT rect; RECT rect;
PDXDIAG_CONTEXT pContext = (PDXDIAG_CONTEXT)GetWindowLongPtr(hDlg, DWLP_USER); PDXDIAG_CONTEXT pContext = (PDXDIAG_CONTEXT)GetWindowLongPtr(hDlg, DWLP_USER);
switch (message) switch (message)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {

View File

@ -18,7 +18,7 @@ HWND hTabCtrlWnd;
// http://www.catch22.net/software/winspy // http://www.catch22.net/software/winspy
// Copyright (c) 2002 by J Brown // Copyright (c) 2002 by J Brown
// //
// //
// Copied from uxtheme.h // Copied from uxtheme.h
// If you have this new header, then delete these and // If you have this new header, then delete these and
@ -29,7 +29,7 @@ HWND hTabCtrlWnd;
#define ETDT_USETABTEXTURE 0x00000004 #define ETDT_USETABTEXTURE 0x00000004
#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) #define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE)
// //
typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD); typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD);
// //
@ -44,7 +44,7 @@ BOOL EnableDialogTheme(HWND hwnd)
if(hUXTheme) if(hUXTheme)
{ {
fnEnableThemeDialogTexture = fnEnableThemeDialogTexture =
(ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture"); (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture");
if(fnEnableThemeDialogTexture) if(fnEnableThemeDialogTexture)
@ -249,9 +249,9 @@ DxDiagWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
CurSel++; CurSel++;
/* enable/disable next button */ /* enable/disable next button */
EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT),
(CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1)); (CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1));
/* switch to next tab */ /* switch to next tab */
SendMessageW(hTabCtrlWnd, TCM_SETCURSEL, CurSel, 0L); SendMessageW(hTabCtrlWnd, TCM_SETCURSEL, CurSel, 0L);
@ -280,7 +280,7 @@ DxDiagWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
INT CurSel = TabCtrl_GetCurSel(hTabCtrlWnd); INT CurSel = TabCtrl_GetCurSel(hTabCtrlWnd);
/* enable/disable next button */ /* enable/disable next button */
EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT),
(CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1)); (CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1));
TabCtrl_OnSelChange(pContext); TabCtrl_OnSelChange(pContext);
@ -310,8 +310,8 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
InitCommonControlsEx(&InitControls); InitCommonControlsEx(&InitControls);
hInst = hInstance; hInst = hInstance;
DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc);
return 0; return 0;
} }

View File

@ -43,7 +43,7 @@ static DIRECTPLAY_GUID DirectPlay8SP[] =
} }
}; };
static DIRECTPLAY_GUID DirectPlaySP[] = static DIRECTPLAY_GUID DirectPlaySP[] =
{ {
{ {
L"{36E95EE0-8577-11cf-960C-0080C7534E82}", L"{36E95EE0-8577-11cf-960C-0080C7534E82}",
@ -232,7 +232,7 @@ EnumerateServiceProviders(HKEY hKey, HWND hDlgCtrl, DIRECTPLAY_GUID * PreDefProv
Item.iItem = ListView_GetItemCount(hDlgCtrl); Item.iItem = ListView_GetItemCount(hDlgCtrl);
/* FIXME /* FIXME
* on Windows Vista we need to use RegLoadMUIString which is not available for older systems * on Windows Vista we need to use RegLoadMUIString which is not available for older systems
*/ */
if (!GetRegValue(hKey, szName, L"Friendly Name", REG_SZ, szResult, sizeof(szResult))) if (!GetRegValue(hKey, szName, L"Friendly Name", REG_SZ, szResult, sizeof(szResult)))
if (!GetRegValue(hKey, szName, L"DescriptionW", REG_SZ, szResult, sizeof(szResult))) if (!GetRegValue(hKey, szName, L"DescriptionW", REG_SZ, szResult, sizeof(szResult)))

View File

@ -167,7 +167,7 @@ SetDeviceDetails(HWND hwndDlg, LPCGUID classGUID, LPCWSTR lpcstrDescription)
SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_PROVIDER, WM_SETTEXT, 0, (LPARAM)szText); SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_PROVIDER, WM_SETTEXT, 0, (LPARAM)szText);
/* FIXME /* FIXME
* we currently enumerate only the first adapter * we currently enumerate only the first adapter
*/ */
hDlgCtrls[0] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_DRIVER); hDlgCtrls[0] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_DRIVER);
hDlgCtrls[1] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_VERSION); hDlgCtrls[1] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_VERSION);
@ -282,7 +282,7 @@ void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext)
INT_PTR CALLBACK INT_PTR CALLBACK
SoundPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) SoundPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (message) switch (message)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {

View File

@ -40,7 +40,7 @@ GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR R
} }
static static
BOOL BOOL
GetDirectXVersion(WCHAR * szBuffer) GetDirectXVersion(WCHAR * szBuffer)
{ {
@ -109,7 +109,7 @@ VOID GetSystemCPU(WCHAR *szBuffer)
the program is not running in WOW64. */ the program is not running in WOW64. */
fnIsWow64Process = (ISWOW64PROC)GetProcAddress( fnIsWow64Process = (ISWOW64PROC)GetProcAddress(
GetModuleHandleW(L"kernel32"), "IsWow64Process"); GetModuleHandleW(L"kernel32"), "IsWow64Process");
if (fnIsWow64Process != NULL) if (fnIsWow64Process != NULL)
fnIsWow64Process(GetCurrentProcess(), &isWow64); fnIsWow64Process(GetCurrentProcess(), &isWow64);

View File

@ -168,7 +168,7 @@ main (int argc, char **argv)
case 'B': /* Matches pattern if at the beginning of a line */ case 'B': /* Matches pattern if at the beginning of a line */
at_start = 1; at_start = 1;
break; break;
//case 'c': //case 'c':
//case 'C': /* Literal? */ //case 'C': /* Literal? */
// literal_search = 1; // literal_search = 1;
@ -178,7 +178,7 @@ main (int argc, char **argv)
case 'E': /* matches pattern if at end of line */ case 'E': /* matches pattern if at end of line */
at_end = 1; at_end = 1;
break; break;
case 'i': case 'i':
case 'I': /* Ignore */ case 'I': /* Ignore */
ignore_case = 1; ignore_case = 1;
@ -187,22 +187,22 @@ main (int argc, char **argv)
case 'm': case 'm':
case 'M': /* only filename */ case 'M': /* only filename */
only_fname = 1; only_fname = 1;
break; break;
case 'n': case 'n':
case 'N': /* Number */ case 'N': /* Number */
number_output = 1; number_output = 1;
break; break;
case 'r': case 'r':
case 'R': /* search strings as regular expressions */ case 'R': /* search strings as regular expressions */
reg_express = 1; reg_express = 1;
break; break;
case 's': case 's':
case 'S': /* search files in child directory too*/ case 'S': /* search files in child directory too*/
sub_dirs = 1; sub_dirs = 1;
break; break;
case 'v': case 'v':
case 'V': /* Not with */ case 'V': /* Not with */
@ -212,8 +212,8 @@ main (int argc, char **argv)
case 'x': case 'x':
case 'X': /* exact match */ case 'X': /* exact match */
exact_match = 1; exact_match = 1;
break; break;
default: default:
usage (); usage ();
exit (2); /* syntax error .. return error 2 */ exit (2); /* syntax error .. return error 2 */

View File

@ -1,7 +1,7 @@
Solitaire for ReactOS Solitaire for ReactOS
/***************************************** /*****************************************
A complete working example of the CardLib A complete working example of the CardLib
card-game library. card-game library.
Freeware Freeware

View File

@ -26,12 +26,12 @@ void NewGame(void)
lScore = lScore - 52; lScore = lScore - 52;
else else
lScore = -52; lScore = -52;
if (dwOptions & OPTION_THREE_CARDS) if (dwOptions & OPTION_THREE_CARDS)
dwWasteTreshold = 2; dwWasteTreshold = 2;
else else
dwWasteTreshold = 0; dwWasteTreshold = 0;
} }
else else
{ {
@ -262,7 +262,7 @@ bool CARDLIBPROC SuitStackDropProc(CardRegion &stackobj, CardStack &dragcards)
{ {
lScore = lScore + 10; lScore = lScore + 10;
} }
UpdateStatusBar(); UpdateStatusBar();
} }
} }

View File

@ -341,7 +341,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
else else
EnableWindow(hCtrl, FALSE); EnableWindow(hCtrl, FALSE);
return TRUE; return TRUE;
case IDOK: case IDOK:
dwOptions &= ~OPTION_THREE_CARDS; dwOptions &= ~OPTION_THREE_CARDS;
if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED) if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED)
@ -623,7 +623,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
// For now, the Help dialog item is disabled because of lacking of HTML Help support // For now, the Help dialog item is disabled because of lacking of HTML Help support
EnableMenuItem(GetMenu(hwnd), IDM_HELP_CONTENTS, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(GetMenu(hwnd), IDM_HELP_CONTENTS, MF_BYCOMMAND | MF_GRAYED);
hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, _T("Ready"), hwnd, 0); hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, _T("Ready"), hwnd, 0);
//SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0); //SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0);

View File

@ -29,7 +29,7 @@ CardStack CreatePlayDeck()
{ {
CardStack newStack; CardStack newStack;
int i, colors = 1, num = 0; int i, colors = 1, num = 0;
switch (dwDifficulty) switch (dwDifficulty)
{ {
case IDC_DIF_ONECOLOR: case IDC_DIF_ONECOLOR:
@ -55,7 +55,7 @@ void NewGame(void)
{ {
int i, j; int i, j;
/* First four stack with five, all other with 4 */ /* First four stack with five, all other with 4 */
int covCards = 5; int covCards = 5;
CardStack fakeDeck, temp; CardStack fakeDeck, temp;
SpiderWnd.EmptyStacks(); SpiderWnd.EmptyStacks();
@ -65,14 +65,14 @@ void NewGame(void)
deck.Shuffle(); deck.Shuffle();
fakeDeck.NewDeck(); fakeDeck.NewDeck();
fakeDeck.Shuffle(); fakeDeck.Shuffle();
/* Reset progress value */ /* Reset progress value */
cardsFinished = 0; cardsFinished = 0;
/* Deal to each stack */ /* Deal to each stack */
for (i = 0; i < NUM_STACKS; i++) for (i = 0; i < NUM_STACKS; i++)
{ {
temp.Clear(); temp.Clear();
if (i == NUM_SMALLER_STACKS) if (i == NUM_SMALLER_STACKS)
{ {
covCards--; covCards--;
@ -85,7 +85,7 @@ void NewGame(void)
pStack[i]->SetCardStack(temp); pStack[i]->SetCardStack(temp);
} }
/* Deal five fake cards to the deck */ /* Deal five fake cards to the deck */
pDeck->SetCardStack(fakeDeck.Pop(5)); pDeck->SetCardStack(fakeDeck.Pop(5));
SpiderWnd.Redraw(); SpiderWnd.Redraw();
fGameStarted = false; fGameStarted = false;
@ -103,7 +103,7 @@ bool stackLookingGood(const CardStack &mystack, int numChecks)
if (mystack[i].Suit() != mystack[i + 1].Suit()) if (mystack[i].Suit() != mystack[i + 1].Suit())
{ {
return false; return false;
} }
} }
return true; return true;
} }
@ -172,8 +172,8 @@ bool CARDLIBPROC StackDragProc(CardRegion &stackobj, int numDragCards)
stackobj.GetFaceDirection(&numfacedown); stackobj.GetFaceDirection(&numfacedown);
numcards = stackobj.NumCards(); numcards = stackobj.NumCards();
/* Only cards facing up */ /* Only cards facing up */
if (numDragCards <= numcards - numfacedown) if (numDragCards <= numcards - numfacedown)
{ {
const CardStack &mystack = stackobj.GetCardStack(); const CardStack &mystack = stackobj.GetCardStack();
@ -228,7 +228,7 @@ bool CARDLIBPROC StackDropProc(CardRegion &stackobj, CardStack &dragcards)
{ {
return false; return false;
} }
/* If stack is empty, everything can be dropped */ /* If stack is empty, everything can be dropped */
if (stackobj.NumCards() != 0) if (stackobj.NumCards() != 0)
{ {
@ -245,12 +245,12 @@ bool CARDLIBPROC StackDropProc(CardRegion &stackobj, CardStack &dragcards)
faceup = stackobj.NumCards() - facedown; faceup = stackobj.NumCards() - facedown;
if (faceup + dragcards.NumCards() >= NUM_ONECOLOR_CARDS) if (faceup + dragcards.NumCards() >= NUM_ONECOLOR_CARDS)
{ {
int i, max = NUM_ONECOLOR_CARDS - dragcards.NumCards() - 1; int i, max = NUM_ONECOLOR_CARDS - dragcards.NumCards() - 1;
/* Dragged cards have been checked to be in order, check stack cards */ /* Dragged cards have been checked to be in order, check stack cards */
if (mystack[0].Suit() == dragcard.Suit() && if (mystack[0].Suit() == dragcard.Suit() &&
stackLookingGood(mystack, max)) stackLookingGood(mystack, max))
{ {
CardStack s = stackobj.GetCardStack(); CardStack s = stackobj.GetCardStack();
CardStack f; CardStack f;

View File

@ -1472,7 +1472,7 @@ _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdShow)
HANDLE hAccel; HANDLE hAccel;
hInstance = hInst; hInstance = hInst;
switch (GetUserDefaultUILanguage()) switch (GetUserDefaultUILanguage())
{ {
case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT):

View File

@ -53,11 +53,11 @@ LoadBootIni(WCHAR *szDrive, HWND hDlg)
hr = StringCbCatW(szBuffer, sizeof(szBuffer), L"boot.ini"); hr = StringCbCatW(szBuffer, sizeof(szBuffer), L"boot.ini");
if (FAILED(hr)) if (FAILED(hr))
return FALSE; return FALSE;
file = _wfopen(szBuffer, L"rt"); file = _wfopen(szBuffer, L"rt");
if (!file) if (!file)
return FALSE; return FALSE;
} }
hDlgCtrl = GetDlgItem(hDlg, IDC_LIST_BOX); hDlgCtrl = GetDlgItem(hDlg, IDC_LIST_BOX);

View File

@ -31,7 +31,7 @@ void MsConfig_OnTabWndSelChange(void);
// http://www.catch22.net/software/winspy // http://www.catch22.net/software/winspy
// Copyright (c) 2002 by J Brown // Copyright (c) 2002 by J Brown
// //
// //
// Copied from uxtheme.h // Copied from uxtheme.h
// If you have this new header, then delete these and // If you have this new header, then delete these and
@ -42,7 +42,7 @@ void MsConfig_OnTabWndSelChange(void);
#define ETDT_USETABTEXTURE 0x00000004 #define ETDT_USETABTEXTURE 0x00000004
#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) #define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE)
// //
typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD); typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD);
// //
@ -57,7 +57,7 @@ BOOL EnableDialogTheme(HWND hwnd)
if(hUXTheme) if(hUXTheme)
{ {
fnEnableThemeDialogTexture = fnEnableThemeDialogTexture =
(ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture"); (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture");
if(fnEnableThemeDialogTexture) if(fnEnableThemeDialogTexture)
@ -259,7 +259,7 @@ MsConfigWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
case WM_COMMAND: case WM_COMMAND:
if (LOWORD(wParam) == IDOK) if (LOWORD(wParam) == IDOK)
{ {
//MsConfig_OnSaveChanges(); //MsConfig_OnSaveChanges();
} }
@ -327,9 +327,9 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
InitCommonControlsEx(&InitControls); InitCommonControlsEx(&InitControls);
hInst = hInstance; hInst = hInstance;
DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc);
return 0; return 0;
} }

View File

@ -105,7 +105,7 @@ ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE)) if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE))
Ptr = PathAddBackslash(szTemp); Ptr = PathAddBackslash(szTemp);
if (!Ptr) if (!Ptr)
Ptr = szTemp; Ptr = szTemp;
@ -157,7 +157,7 @@ ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE)) if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE))
Ptr = PathAddBackslash(szTemp); Ptr = PathAddBackslash(szTemp);
if (!Ptr) if (!Ptr)
Ptr = szTemp; Ptr = szTemp;

View File

@ -34,7 +34,7 @@ SortListView(LPARAM lItemParam1,
ListView_GetItemText(pSort->hList, iItem1, pSort->nClickedColumn, strItem1, MAX_VALUE_NAME); ListView_GetItemText(pSort->hList, iItem1, pSort->nClickedColumn, strItem1, MAX_VALUE_NAME);
ListView_GetItemText(pSort->hList, iItem2, pSort->nClickedColumn, strItem2, MAX_VALUE_NAME); ListView_GetItemText(pSort->hList, iItem2, pSort->nClickedColumn, strItem2, MAX_VALUE_NAME);
// StrCmpLogicalW helps in comparing numbers intelligently, 10 is greater that 2, other // StrCmpLogicalW helps in comparing numbers intelligently, 10 is greater that 2, other
// wise string comparison will always return 2 is greater that 10... // wise string comparison will always return 2 is greater that 10...
return ( pSort->bSortAsc ? StrCmpLogicalW(strItem1, strItem2) : StrCmpLogicalW(strItem2, strItem1) ); return ( pSort->bSortAsc ? StrCmpLogicalW(strItem1, strItem2) : StrCmpLogicalW(strItem2, strItem1) );
} }

View File

@ -170,7 +170,7 @@ HTREEITEM Tree_Item_Copy(HWND hTree, HTREEITEM hSourceItem, HTREEITEM hParent, H
tvis.itemex.pszText = label; tvis.itemex.pszText = label;
tvis.itemex.cchTextMax = MAX_VALUE_NAME; tvis.itemex.cchTextMax = MAX_VALUE_NAME;
TreeView_GetItem(hTree, &tvis.itemex); TreeView_GetItem(hTree, &tvis.itemex);
// 2- Now, copy to destination. // 2- Now, copy to destination.
tvis.hParent = hParent; tvis.hParent = hParent;
tvis.hInsertAfter = hInsertAfter; tvis.hInsertAfter = hInsertAfter;

View File

@ -262,7 +262,7 @@ LoadIniFile(HWND hTree, LPCWSTR lpszIniFile)
lpsz1 = szLine; lpsz1 = szLine;
while (*lpsz1 == L' ' || *lpsz1 == L'\r' || *lpsz1 == L'\n') while (*lpsz1 == L' ' || *lpsz1 == L'\r' || *lpsz1 == L'\n')
++lpsz1; ++lpsz1;
/* Skip empty lines */ /* Skip empty lines */
if (!*lpsz1) if (!*lpsz1)
continue; continue;
@ -808,7 +808,7 @@ CommonWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
MessageBox(hDlg, _T("Help not implemented yet!"), _T("Help"), MB_ICONINFORMATION | MB_OK); MessageBox(hDlg, _T("Help not implemented yet!"), _T("Help"), MB_ICONINFORMATION | MB_OK);
return TRUE; return TRUE;
} }
case PSN_KILLACTIVE: // Is going to lose activation. case PSN_KILLACTIVE: // Is going to lose activation.
{ {
// Changes are always valid of course. // Changes are always valid of course.
@ -868,7 +868,7 @@ INT_PTR CALLBACK
SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
static LPCWSTR lpszIniFile = NULL; static LPCWSTR lpszIniFile = NULL;
if (message == WM_INITDIALOG) if (message == WM_INITDIALOG)
lpszIniFile = (LPCWSTR)((LPPROPSHEETPAGE)lParam)->lParam; lpszIniFile = (LPCWSTR)((LPPROPSHEETPAGE)lParam)->lParam;

View File

@ -268,7 +268,7 @@ BOOL IsWindowsOS(VOID)
{ {
bIsWindowsOS = TRUE; bIsWindowsOS = TRUE;
} }
return bIsWindowsOS; return bIsWindowsOS;
} }

View File

@ -15,11 +15,11 @@ td { background-color:#f0f0f0; font-size:12px; padding:5px; border-width:1px; bo
<h1>Werkzeuge in Paint</h1> <h1>Werkzeuge in Paint</h1>
<p> <p>
<b>Paint für ReactOS</b> stellt ihnen zum Bearbeiten ihrer Bilder zahlreiche <i>Werkzeuge</i> zur Verfügung. Um eines der <b>Paint für ReactOS</b> stellt ihnen zum Bearbeiten ihrer Bilder zahlreiche <i>Werkzeuge</i> zur Verfügung. Um eines der
Werkzeuge auszuwählen, klicken Sie bitte auf das entsprechende Symbol im <i>Werkzeugkasten</i>, der sich üblicherweise Werkzeuge auszuwählen, klicken Sie bitte auf das entsprechende Symbol im <i>Werkzeugkasten</i>, der sich üblicherweise
auf der linken Seite des Fensters befindet. Es folgt eine Auflistung der Ihnen zur Verfügung stehenden auf der linken Seite des Fensters befindet. Es folgt eine Auflistung der Ihnen zur Verfügung stehenden
Werkzeuge mit jeweils einer kurzen Beschreibung. Werkzeuge mit jeweils einer kurzen Beschreibung.
</p> </p>
@ -29,27 +29,27 @@ Werkzeuge mit jeweils einer kurzen Beschreibung.
<th>Beschreibung</th></tr> <th>Beschreibung</th></tr>
<tr><td align="center"><img src="freesel.png" alt=""></td> <tr><td align="center"><img src="freesel.png" alt=""></td>
<td>Die <i>freie Auswahl</i> ermöglicht es Ihnen, einen beliebigen Bereich des Bildes auszuwählen. Drücken Sie <td>Die <i>freie Auswahl</i> ermöglicht es Ihnen, einen beliebigen Bereich des Bildes auszuwählen. Drücken Sie
dazu im Bild die linke Maustaste und umfahren Sie mit der gedrückten Maustaste den Bereich, den Sie auswählen dazu im Bild die linke Maustaste und umfahren Sie mit der gedrückten Maustaste den Bereich, den Sie auswählen
möchten. Wenn Sie die Maustaste nun loslassen wird der Bereich automatisch in eine geschlossene Auswahl möchten. Wenn Sie die Maustaste nun loslassen wird der Bereich automatisch in eine geschlossene Auswahl
umgewandelt.</td></tr> umgewandelt.</td></tr>
<tr><td align="center"><img src="rectsel.png" alt=""></td> <tr><td align="center"><img src="rectsel.png" alt=""></td>
<td>Die <i>rechteckige Auswahl</i> ermöglicht es Ihnen, im Bild einen beliebigen rechteckigen Bereich <td>Die <i>rechteckige Auswahl</i> ermöglicht es Ihnen, im Bild einen beliebigen rechteckigen Bereich
auszuwählen. Drücken Sie dazu im Bild die linke Maustaste und ziehen Sie die Maus zur diagonal auszuwählen. Drücken Sie dazu im Bild die linke Maustaste und ziehen Sie die Maus zur diagonal
gegenüberliegenden Seite des gewünschten Rechtecks. Wenn Sie die Maustaste loslassen, erscheint sie soeben gegenüberliegenden Seite des gewünschten Rechtecks. Wenn Sie die Maustaste loslassen, erscheint sie soeben
erstellte Auswahl.</td></tr> erstellte Auswahl.</td></tr>
<tr><td align="center"><img src="rubber.png" alt=""></td> <tr><td align="center"><img src="rubber.png" alt=""></td>
<td>Der <i>Radierer</i> erlaubt es Ihnen, mit der Hintergrundfarbe zu Malen, um Teile des Bildes zu löschen. <td>Der <i>Radierer</i> erlaubt es Ihnen, mit der Hintergrundfarbe zu Malen, um Teile des Bildes zu löschen.
Möchten Sie das gesamte Bild löschen, verwenden Sie bitte den Menüeintrag <i>Bild löschen</i> im Menü Möchten Sie das gesamte Bild löschen, verwenden Sie bitte den Menüeintrag <i>Bild löschen</i> im Menü
<i>Bild</i>.*</td></tr> <i>Bild</i>.*</td></tr>

View File

@ -62,7 +62,7 @@ void RegistrySettings::LoadPresets()
ThumbYPos = 200; ThumbYPos = 200;
UnitSetting = 0; UnitSetting = 0;
const WINDOWPLACEMENT DefaultWindowPlacement = { const WINDOWPLACEMENT DefaultWindowPlacement = {
sizeof(WINDOWPLACEMENT), sizeof(WINDOWPLACEMENT),
0, 0,
SW_SHOWNORMAL, SW_SHOWNORMAL,
{0, 0}, {0, 0},

View File

@ -104,8 +104,8 @@ void CMainWindow::saveImage(BOOL overwrite)
void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window)
{ {
int width = GetDIBWidth(bitmap); int width = GetDIBWidth(bitmap);
int height = GetDIBHeight(bitmap); int height = GetDIBHeight(bitmap);
int curWidth = imageModel.GetWidth(); int curWidth = imageModel.GetWidth();
int curHeight = imageModel.GetHeight(); int curHeight = imageModel.GetHeight();
@ -129,7 +129,7 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window)
shouldEnlarge = FALSE; shouldEnlarge = FALSE;
break; break;
case IDCANCEL: case IDCANCEL:
return; return;
} }
} }

View File

@ -133,7 +133,7 @@ int LoadStringAndOem(HINSTANCE hInst,
return 0; return 0;
} }
res = LoadString(hInst, uID, szTmp, byteSize); res = LoadString(hInst, uID, szTmp, byteSize);
CharToOem(szTmp, szNode); CharToOem(szTmp, szNode);
HeapFree(ProcessHeap, 0, szTmp); HeapFree(ProcessHeap, 0, szTmp);
return res; return res;
@ -300,7 +300,7 @@ LPTSTR GetConnectionType(LPTSTR lpClass)
if (ConTypeTmp == NULL) if (ConTypeTmp == NULL)
return NULL; return NULL;
ConType = (LPTSTR)HeapAlloc(ProcessHeap, ConType = (LPTSTR)HeapAlloc(ProcessHeap,
0, 0,
dwDataSize); dwDataSize);

View File

@ -1,6 +1,6 @@
/* /*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS net command * PROJECT: ReactOS net command
* PROGRAMMERS: Magnus Olsen (greatlord@reactos.org) * PROGRAMMERS: Magnus Olsen (greatlord@reactos.org)
*/ */

View File

@ -839,7 +839,7 @@ PCHAR ClassIDtoClassName( USHORT ClassID )
case CLASS_ANY: case CLASS_ANY:
return ClassAny; return ClassAny;
default: default:
return "Unknown"; return "Unknown";
} }

View File

@ -308,7 +308,7 @@ static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index)
} }
LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
switch (msg) switch (msg)
{ {
case WM_KEYDOWN: case WM_KEYDOWN:

View File

@ -220,14 +220,14 @@ HWND CComboBox::Create(HWND hwndParent)
NULL); NULL);
SendMessageW(WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0); SendMessageW(WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0);
for (int i = 0; i < (int)_countof(m_TypeStringID); i++) for (int i = 0; i < (int)_countof(m_TypeStringID); i++)
{ {
ATL::CStringW szBuf; ATL::CStringW szBuf;
szBuf.LoadStringW(m_TypeStringID[i]); szBuf.LoadStringW(m_TypeStringID[i]);
SendMessageW(CB_ADDSTRING, 0, (LPARAM)(LPCWSTR)szBuf); SendMessageW(CB_ADDSTRING, 0, (LPARAM)(LPCWSTR)szBuf);
} }
SendMessageW(CB_SETCURSEL, m_DefaultSelectType, 0); // select the first item SendMessageW(CB_SETCURSEL, m_DefaultSelectType, 0); // select the first item
return m_hWnd; return m_hWnd;
@ -1639,7 +1639,7 @@ BOOL CApplicationView::ProcessWindowMessage(HWND hwnd, UINT message, WPARAM wPar
return FALSE; return FALSE;
} }
BOOL CApplicationView::CreateToolbar() BOOL CApplicationView::CreateToolbar()
{ {
m_Toolbar = new CMainToolbar(); m_Toolbar = new CMainToolbar();
m_Toolbar->m_VerticalAlignment = UiAlign_LeftTop; m_Toolbar->m_VerticalAlignment = UiAlign_LeftTop;

View File

@ -140,7 +140,7 @@ BOOL AsyncInetCancel(pASYNCINET AsyncInet) // mark as cancelled (this will send
return TRUE; return TRUE;
} }
} }
return FALSE; return FALSE;
} }
@ -172,7 +172,7 @@ BOOL AsyncInetAcquire(pASYNCINET AsyncInet) // try to increase refcnt by 1. if r
bResult = TRUE; bResult = TRUE;
} }
// otherwise (AsyncInet->bCleanUp == TRUE) // otherwise (AsyncInet->bCleanUp == TRUE)
// AsyncInetAcquire will return FALSE. // AsyncInetAcquire will return FALSE.
// In this case, any thread should no longer use this AsyncInet // In this case, any thread should no longer use this AsyncInet
LeaveCriticalSection(&(AsyncInet->CriticalSection)); LeaveCriticalSection(&(AsyncInet->CriticalSection));
@ -194,7 +194,7 @@ VOID AsyncInetRelease(pASYNCINET AsyncInet) // try to decrease refcnt by 1
{ {
bCleanUp = TRUE; bCleanUp = TRUE;
} }
LeaveCriticalSection(&(AsyncInet->CriticalSection)); LeaveCriticalSection(&(AsyncInet->CriticalSection));
if (bCleanUp) if (bCleanUp)

View File

@ -426,8 +426,8 @@ BOOL CAvailableApps::UpdateAppsDB()
DownloadApplicationsDB(SettingsInfo.bUseSource ? SettingsInfo.szSourceURL : APPLICATION_DATABASE_URL, DownloadApplicationsDB(SettingsInfo.bUseSource ? SettingsInfo.szSourceURL : APPLICATION_DATABASE_URL,
!SettingsInfo.bUseSource); !SettingsInfo.bUseSource);
if (!ExtractFilesFromCab(m_Strings.szCabName, if (!ExtractFilesFromCab(m_Strings.szCabName,
m_Strings.szCabDir, m_Strings.szCabDir,
m_Strings.szAppsPath)) m_Strings.szAppsPath))
{ {

View File

@ -2,7 +2,7 @@
* PROJECT: ReactOS Applications Manager * PROJECT: ReactOS Applications Manager
* LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
* PURPOSE: Cabinet extraction using FDI API * PURPOSE: Cabinet extraction using FDI API
* COPYRIGHT: Copyright 2018 Alexander Shaposhnikov (sanchaez@reactos.org) * COPYRIGHT: Copyright 2018 Alexander Shaposhnikov (sanchaez@reactos.org)
*/ */
#include "rapps.h" #include "rapps.h"
#include <debug.h> #include <debug.h>
@ -12,7 +12,7 @@
/* /*
* HACK: treat any input strings as Unicode (UTF-8) * HACK: treat any input strings as Unicode (UTF-8)
* cabinet.dll lacks any sort of a Unicode API, but FCI/FDI * cabinet.dll lacks any sort of a Unicode API, but FCI/FDI
* provide an ability to use user-defined callbacks for any file or memory * provide an ability to use user-defined callbacks for any file or memory
* operations. This flexibility and the magic power of C/C++ casting allows * operations. This flexibility and the magic power of C/C++ casting allows
* us to treat input as we please. * us to treat input as we please.
@ -66,7 +66,7 @@ inline BOOL MultiByteToWide(const CStringA& szSource,
NULL); NULL);
if (!sz) if (!sz)
return FALSE; return FALSE;
// do the actual conversion // do the actual conversion
sz = MultiByteToWideChar(CP_UTF8, sz = MultiByteToWideChar(CP_UTF8,
0, 0,
@ -215,7 +215,7 @@ FNFDINOTIFY(fnNotify)
WideToMultiByte(szNewFileName, szFilePathUTF8, CP_UTF8); WideToMultiByte(szNewFileName, szFilePathUTF8, CP_UTF8);
// Open the file // Open the file
iResult = fnFileOpen((LPSTR) szFilePathUTF8.GetString(), iResult = fnFileOpen((LPSTR) szFilePathUTF8.GetString(),
_O_WRONLY | _O_CREAT, _O_WRONLY | _O_CREAT,
0); 0);
} }
@ -254,14 +254,14 @@ FNFDINOTIFY(fnNotify)
/* cabinet.dll FDI function pointers */ /* cabinet.dll FDI function pointers */
typedef HFDI(*fnFDICreate)(PFNALLOC, typedef HFDI(*fnFDICreate)(PFNALLOC,
PFNFREE, PFNFREE,
PFNOPEN, PFNOPEN,
PFNREAD, PFNREAD,
PFNWRITE, PFNWRITE,
PFNCLOSE, PFNCLOSE,
PFNSEEK, PFNSEEK,
int, int,
PERF); PERF);
typedef BOOL(*fnFDICopy)(HFDI, typedef BOOL(*fnFDICopy)(HFDI,
@ -274,12 +274,12 @@ typedef BOOL(*fnFDICopy)(HFDI,
typedef BOOL(*fnFDIDestroy)(HFDI); typedef BOOL(*fnFDIDestroy)(HFDI);
/* /*
* Extraction function * Extraction function
* TODO: require only a full path to the cab as an argument * TODO: require only a full path to the cab as an argument
*/ */
BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName, BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName,
const ATL::CStringW& szCabDir, const ATL::CStringW& szCabDir,
const ATL::CStringW& szOutputDir) const ATL::CStringW& szOutputDir)
{ {
HINSTANCE hCabinetDll; HINSTANCE hCabinetDll;
@ -291,7 +291,7 @@ BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName,
fnFDIDestroy pfnFDIDestroy; fnFDIDestroy pfnFDIDestroy;
BOOL bResult; BOOL bResult;
// Load cabinet.dll and extract needed functions // Load cabinet.dll and extract needed functions
hCabinetDll = LoadLibraryW(L"cabinet.dll"); hCabinetDll = LoadLibraryW(L"cabinet.dll");
if (!hCabinetDll) if (!hCabinetDll)
@ -328,7 +328,7 @@ BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName,
// Create output dir // Create output dir
bResult = CreateDirectoryW(szOutputDir, NULL); bResult = CreateDirectoryW(szOutputDir, NULL);
if (bResult || GetLastError() == ERROR_ALREADY_EXISTS) if (bResult || GetLastError() == ERROR_ALREADY_EXISTS)
{ {
// Convert wide strings to UTF-8 // Convert wide strings to UTF-8

View File

@ -280,7 +280,7 @@ BOOL CMainWindow::RemoveSelectedAppFromRegistry()
CInstalledApplicationInfo *InstalledApp = (CInstalledApplicationInfo *)m_ApplicationView->GetFocusedItemData(); CInstalledApplicationInfo *InstalledApp = (CInstalledApplicationInfo *)m_ApplicationView->GetFocusedItemData();
if (!InstalledApp) if (!InstalledApp)
return FALSE; return FALSE;
LSTATUS Result = InstalledApp->RemoveFromRegistry(); LSTATUS Result = InstalledApp->RemoveFromRegistry();
if (Result != ERROR_SUCCESS) if (Result != ERROR_SUCCESS)
{ {
@ -488,7 +488,7 @@ BOOL CMainWindow::ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARA
if (wParam == SEARCH_TIMER_ID) if (wParam == SEARCH_TIMER_ID)
{ {
::KillTimer(hwnd, SEARCH_TIMER_ID); ::KillTimer(hwnd, SEARCH_TIMER_ID);
UpdateApplicationsList(-1); UpdateApplicationsList(-1);
} }
break; break;
@ -688,7 +688,7 @@ VOID CMainWindow::UpdateApplicationsList(INT EnumType)
// set the display type of application-view. this will remove all the item in application-view too. // set the display type of application-view. this will remove all the item in application-view too.
m_ApplicationView->SetDisplayAppType(AppViewTypeInstalledApps); m_ApplicationView->SetDisplayAppType(AppViewTypeInstalledApps);
// enum installed softwares // enum installed softwares
m_InstalledApps.Enum(EnumType, s_EnumInstalledAppProc, this); m_InstalledApps.Enum(EnumType, s_EnumInstalledAppProc, this);
} }
else if (IsAvailableEnum(EnumType)) else if (IsAvailableEnum(EnumType))
@ -696,7 +696,7 @@ VOID CMainWindow::UpdateApplicationsList(INT EnumType)
// set the display type of application-view. this will remove all the item in application-view too. // set the display type of application-view. this will remove all the item in application-view too.
m_ApplicationView->SetDisplayAppType(AppViewTypeAvailableApps); m_ApplicationView->SetDisplayAppType(AppViewTypeAvailableApps);
// enum available softwares // enum available softwares
m_AvailableApps.Enum(EnumType, s_EnumAvailableAppProc, this); m_AvailableApps.Enum(EnumType, s_EnumAvailableAppProc, this);
} }
m_ApplicationView->SetRedraw(TRUE); m_ApplicationView->SetRedraw(TRUE);
@ -832,7 +832,7 @@ void CMainWindow::HandleTabOrder(int direction)
m_TreeView->AppendTabOrderWindow(direction, TabOrderHwndList); m_TreeView->AppendTabOrderWindow(direction, TabOrderHwndList);
m_ApplicationView->AppendTabOrderWindow(direction, TabOrderHwndList); m_ApplicationView->AppendTabOrderWindow(direction, TabOrderHwndList);
if (TabOrderHwndList.GetSize() == 0) if (TabOrderHwndList.GetSize() == 0)
{ {
// in case the list is empty // in case the list is empty

View File

@ -12,7 +12,7 @@ enum ASYNC_EVENT
ASYNCINET_CANCELLED, // wParam and lParam are not used. ASYNCINET_CANCELLED, // wParam and lParam are not used.
// when receiving this, AsyncInet will be free soon and should not used anymore // when receiving this, AsyncInet will be free soon and should not used anymore
ASYNCINET_ERROR // wParam is not used. lParam specify the error code (if there is one). ASYNCINET_ERROR // wParam is not used. lParam specify the error code (if there is one).
// when receiving this, AsyncInet will be free soon and should not used anymore // when receiving this, AsyncInet will be free soon and should not used anymore
}; };

View File

@ -54,7 +54,7 @@ public:
ATL::CSimpleArray<LCID> m_LanguageLCIDs; ATL::CSimpleArray<LCID> m_LanguageLCIDs;
ATL::CSimpleArray<ATL::CStringW> m_szScrnshotLocation; ATL::CSimpleArray<ATL::CStringW> m_szScrnshotLocation;
ATL::CStringW m_szIconLocation; ATL::CStringW m_szIconLocation;
ATL::CStringW m_szPkgName; // software's package name. ATL::CStringW m_szPkgName; // software's package name.
ULONG m_SizeBytes; ULONG m_SizeBytes;

View File

@ -320,7 +320,6 @@ BOOL CInstalledApps::Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param)
szKeyName.ReleaseBuffer(); szKeyName.ReleaseBuffer();
RegCloseKey(hKey); RegCloseKey(hKey);
} }
return TRUE; return TRUE;
} }

View File

@ -54,13 +54,13 @@ BOOL IsUrlValid(const WCHAR * Url)
URL_COMPONENTSW UrlComponmentInfo = { 0 }; URL_COMPONENTSW UrlComponmentInfo = { 0 };
UrlComponmentInfo.dwStructSize = sizeof(UrlComponmentInfo); UrlComponmentInfo.dwStructSize = sizeof(UrlComponmentInfo);
UrlComponmentInfo.dwSchemeLength = 1; UrlComponmentInfo.dwSchemeLength = 1;
BOOL bSuccess = InternetCrackUrlW(Url, wcslen(Url), 0, &UrlComponmentInfo); BOOL bSuccess = InternetCrackUrlW(Url, wcslen(Url), 0, &UrlComponmentInfo);
if(!bSuccess) if(!bSuccess)
{ {
return FALSE; return FALSE;
} }
switch(UrlComponmentInfo.nScheme) switch(UrlComponmentInfo.nScheme)
{ {
case INTERNET_SCHEME_HTTP: case INTERNET_SCHEME_HTTP:
@ -69,7 +69,7 @@ BOOL IsUrlValid(const WCHAR * Url)
case INTERNET_SCHEME_FILE: case INTERNET_SCHEME_FILE:
// supported // supported
return TRUE; return TRUE;
default: default:
return FALSE; return FALSE;
} }
@ -104,9 +104,9 @@ namespace
EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE);
EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), FALSE);
} }
CheckRadioButton(hDlg, IDC_SOURCE_DEFAULT, IDC_USE_SOURCE, Info->bUseSource ? IDC_USE_SOURCE : IDC_SOURCE_DEFAULT); CheckRadioButton(hDlg, IDC_SOURCE_DEFAULT, IDC_USE_SOURCE, Info->bUseSource ? IDC_USE_SOURCE : IDC_SOURCE_DEFAULT);
EnableWindow(GetDlgItem(hDlg, IDC_SOURCE_URL), Info->bUseSource); EnableWindow(GetDlgItem(hDlg, IDC_SOURCE_URL), Info->bUseSource);
SetWindowTextW(GetDlgItem(hDlg, IDC_SOURCE_URL), Info->szSourceURL); SetWindowTextW(GetDlgItem(hDlg, IDC_SOURCE_URL), Info->szSourceURL);
@ -153,12 +153,12 @@ namespace
NewSettingsInfo.bUseSource = FALSE; NewSettingsInfo.bUseSource = FALSE;
EnableWindow(GetDlgItem(hDlg, IDC_SOURCE_URL), NewSettingsInfo.bUseSource); EnableWindow(GetDlgItem(hDlg, IDC_SOURCE_URL), NewSettingsInfo.bUseSource);
break; break;
case IDC_USE_SOURCE: case IDC_USE_SOURCE:
NewSettingsInfo.bUseSource = TRUE; NewSettingsInfo.bUseSource = TRUE;
EnableWindow(GetDlgItem(hDlg, IDC_SOURCE_URL), NewSettingsInfo.bUseSource); EnableWindow(GetDlgItem(hDlg, IDC_SOURCE_URL), NewSettingsInfo.bUseSource);
break; break;
case IDC_PROXY_DEFAULT: case IDC_PROXY_DEFAULT:
NewSettingsInfo.Proxy = 0; NewSettingsInfo.Proxy = 0;
EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE);
@ -241,13 +241,13 @@ namespace
break; break;
} }
} }
if(NewSettingsInfo.bUseSource && !IsUrlValid(szSource.GetString())) if(NewSettingsInfo.bUseSource && !IsUrlValid(szSource.GetString()))
{ {
ATL::CStringW szMsgText; ATL::CStringW szMsgText;
szMsgText.LoadStringW(IDS_URL_INVALID); szMsgText.LoadStringW(IDS_URL_INVALID);
MessageBoxW(hDlg, szMsgText.GetString(), NULL, 0); MessageBoxW(hDlg, szMsgText.GetString(), NULL, 0);
SetFocus(GetDlgItem(hDlg, IDC_SOURCE_URL)); SetFocus(GetDlgItem(hDlg, IDC_SOURCE_URL));
break; break;

View File

@ -61,7 +61,7 @@ VOID InitializeGDIPlus(BOOL bInitialize)
INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nShowCmd) INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nShowCmd)
{ {
BOOL bIsFirstLaunch; BOOL bIsFirstLaunch;
InitializeAtlModule(hInstance, TRUE); InitializeAtlModule(hInstance, TRUE);
InitializeGDIPlus(TRUE); InitializeGDIPlus(TRUE);
@ -83,7 +83,7 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
// parse cmd-line and perform the corresponding operation // parse cmd-line and perform the corresponding operation
BOOL bSuccess = ParseCmdAndExecute(GetCommandLineW(), bIsFirstLaunch, SW_SHOWNORMAL); BOOL bSuccess = ParseCmdAndExecute(GetCommandLineW(), bIsFirstLaunch, SW_SHOWNORMAL);
InitializeGDIPlus(FALSE); InitializeGDIPlus(FALSE);
InitializeAtlModule(GetModuleHandle(NULL), FALSE); InitializeAtlModule(GetModuleHandle(NULL), FALSE);

View File

@ -262,7 +262,7 @@ UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath)
swprintf(fullPath, L"%s%s%s", rootName, keyPath[0]==L'\\'?L"":L"\\", keyPath); swprintf(fullPath, L"%s%s%s", rootName, keyPath[0]==L'\\'?L"":L"\\", keyPath);
else else
fullPath = wcscpy(fullPath, rootName); fullPath = wcscpy(fullPath, rootName);
SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath);
SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath);
HeapFree(GetProcessHeap(), 0, fullPath); HeapFree(GetProcessHeap(), 0, fullPath);
@ -477,14 +477,14 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
case WM_NOTIFY: case WM_NOTIFY:
if (g_pChildWnd == NULL) break; if (g_pChildWnd == NULL) break;
if (((LPNMHDR)lParam)->idFrom == TREE_WINDOW) if (((LPNMHDR)lParam)->idFrom == TREE_WINDOW)
{ {
if (!TreeWndNotifyProc(g_pChildWnd->hListWnd, wParam, lParam, &Result)) if (!TreeWndNotifyProc(g_pChildWnd->hListWnd, wParam, lParam, &Result))
{ {
goto def; goto def;
} }
return Result; return Result;
} }
else else
@ -502,7 +502,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
{ {
goto def; goto def;
} }
} }
break; break;
case WM_CONTEXTMENU: case WM_CONTEXTMENU:

View File

@ -626,16 +626,16 @@ done:
} }
BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
{ {
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam);
*Result = TRUE; *Result = TRUE;
switch (((LPNMHDR)lParam)->code) switch (((LPNMHDR)lParam)->code)
{ {
case TVN_ITEMEXPANDING: case TVN_ITEMEXPANDING:
*Result = !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam); *Result = !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam);
return TRUE; return TRUE;
case TVN_SELCHANGED: case TVN_SELCHANGED:
{ {
NMTREEVIEW* pnmtv = (NMTREEVIEW*)lParam; NMTREEVIEW* pnmtv = (NMTREEVIEW*)lParam;
/* Get the parent of the current item */ /* Get the parent of the current item */
@ -655,7 +655,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
EnableMenuItem(hMenuFrame , ID_EDIT_DELETE, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hMenuFrame , ID_EDIT_DELETE, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(hMenuFrame , ID_EDIT_RENAME, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hMenuFrame , ID_EDIT_RENAME, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(hPopupMenus, ID_TREE_DELETE, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hPopupMenus, ID_TREE_DELETE, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(hPopupMenus, ID_TREE_RENAME, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hPopupMenus, ID_TREE_RENAME, MF_BYCOMMAND | MF_GRAYED);
} }
else else
{ {
@ -686,7 +686,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
return TRUE; return TRUE;
} }
case TVN_ENDLABELEDIT: case TVN_ENDLABELEDIT:
{ {
LPCWSTR keyPath; LPCWSTR keyPath;
HKEY hRootKey; HKEY hRootKey;
HKEY hKey = NULL; HKEY hKey = NULL;
@ -747,7 +747,7 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, HMENU id)
0, 0, rcClient.right, rcClient.bottom, 0, 0, rcClient.right, rcClient.bottom,
hwndParent, id, hInst, NULL); hwndParent, id, hInst, NULL);
if (!hwndTV) return NULL; if (!hwndTV) return NULL;
/* Initialize the image list, and add items to the control. */ /* Initialize the image list, and add items to the control. */
if (!InitTreeViewImageLists(hwndTV) || !InitTreeViewItems(hwndTV, pHostName)) if (!InitTreeViewImageLists(hwndTV) || !InitTreeViewItems(hwndTV, pHostName))
{ {

View File

@ -2,7 +2,7 @@
* PROJECT: ReactOS Services * PROJECT: ReactOS Services
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/sc/depend.c * FILE: base/applications/sc/depend.c
* PURPOSE: * PURPOSE:
* COPYRIGHT: Copyright 2016 Eric Kohl * COPYRIGHT: Copyright 2016 Eric Kohl
* *
*/ */

View File

@ -2,7 +2,7 @@
* PROJECT: ReactOS Services * PROJECT: ReactOS Services
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/sc/name.c * FILE: base/applications/sc/name.c
* PURPOSE: * PURPOSE:
* COPYRIGHT: Copyright 2016 Eric Kohl * COPYRIGHT: Copyright 2016 Eric Kohl
* *
*/ */

View File

@ -181,7 +181,7 @@ GLvoid InitGL(GLsizei Width, GLsizei Height)
} }
// Handles Window Resizing // Handles Window Resizing
GLvoid ReSizeGLScene(GLsizei Width, GLsizei Height) GLvoid ReSizeGLScene(GLsizei Width, GLsizei Height)
{ {
// Is Window Too Small (Divide By Zero Error) // Is Window Too Small (Divide By Zero Error)
if (Height == 0) if (Height == 0)

View File

@ -84,8 +84,8 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
} }
case WM_PAINT: case WM_PAINT:
{ {
BITMAP bm; /* Bitmap structure as seen in bmWidth & bmHeight */ BITMAP bm; /* Bitmap structure as seen in bmWidth & bmHeight */
PAINTSTRUCT ps; PAINTSTRUCT ps;
HDC hdc; HDC hdc;
HDC hdcMem; HDC hdcMem;
HBITMAP hbmOld; HBITMAP hbmOld;
@ -93,9 +93,9 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
// Obtain window coordinates. // Obtain window coordinates.
GetClientRect (hWnd, &rect); GetClientRect (hWnd, &rect);
hdc = BeginPaint(hWnd, &ps); hdc = BeginPaint(hWnd, &ps);
hdcMem = CreateCompatibleDC(hdc); hdcMem = CreateCompatibleDC(hdc);
hbmOld = SelectObject(hdcMem, bitmap); hbmOld = SelectObject(hdcMem, bitmap);
GetObject(bitmap, sizeof(bm), &bm); GetObject(bitmap, sizeof(bm), &bm);
@ -118,19 +118,19 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
else else
{ {
BitBlt( BitBlt(
hdc, hdc,
RANDOM (0, rect.right - bm.bmWidth), RANDOM (0, rect.right - bm.bmWidth),
RANDOM (0, rect.bottom - bm.bmHeight), RANDOM (0, rect.bottom - bm.bmHeight),
bm.bmWidth, bm.bmWidth,
bm.bmHeight, bm.bmHeight,
hdcMem, hdcMem,
0, 0,
0, 0,
SRCCOPY); SRCCOPY);
} }
SelectObject(hdcMem, hbmOld); SelectObject(hdcMem, hbmOld);
DeleteDC(hdcMem); DeleteDC(hdcMem);
EndPaint(hWnd, &ps); EndPaint(hWnd, &ps);
break; break;

View File

@ -122,7 +122,7 @@ AddUninstallKey(
goto end; goto end;
} }
} }
// Full path to sdbinst.exe // Full path to sdbinst.exe
hres = StringCchCatW(sdbinstPath, MAX_PATH, L"System32\\sdbinst.exe"); hres = StringCchCatW(sdbinstPath, MAX_PATH, L"System32\\sdbinst.exe");
if (FAILED(hres)) if (FAILED(hres))
@ -172,7 +172,7 @@ AddUninstallKey(
goto end; goto end;
} }
// Uninstall full string // Uninstall full string
hres = StringCchPrintfW(uninstString, MAX_PATH, L"%ls -u \"%ls\"", sdbinstPath, sdbInstalledPath); hres = StringCchPrintfW(uninstString, MAX_PATH, L"%ls -u \"%ls\"", sdbinstPath, sdbInstalledPath);
if (FAILED(hres)) if (FAILED(hres))
{ {
@ -244,7 +244,7 @@ ProcessLayers(
TAGID prevTagLayer = 0; TAGID prevTagLayer = 0;
TAGID tagLayer = SdbFindFirstTag(pdb, tagDb, TAG_LAYER); TAGID tagLayer = SdbFindFirstTag(pdb, tagDb, TAG_LAYER);
// Add all layers to registry (AppCompatFlags) // Add all layers to registry (AppCompatFlags)
while (tagLayer && (tagLayer != prevTagLayer)) while (tagLayer && (tagLayer != prevTagLayer))
{ {
@ -430,7 +430,7 @@ SdbInstall(
} }
// Get database GUID // Get database GUID
if (!GetSdbGuid(pdb, tagDb, &dbGuid)) if (!GetSdbGuid(pdb, tagDb, &dbGuid))
{ {
wprintf(L"GetSdbGuid error\n"); wprintf(L"GetSdbGuid error\n");
goto end; goto end;
@ -452,7 +452,7 @@ SdbInstall(
wprintf(L"Can't get tag name\n"); wprintf(L"Can't get tag name\n");
goto end; goto end;
} }
LPWSTR dbName = SdbGetStringTagPtr(pdb, tagDbName); LPWSTR dbName = SdbGetStringTagPtr(pdb, tagDbName);
wprintf(L"Database name %ls\n", dbName); wprintf(L"Database name %ls\n", dbName);
@ -709,7 +709,7 @@ SdbUninstallByGuid(
} }
res = SdbUninstall(dbPath); res = SdbUninstall(dbPath);
end: end:
if (hKey) if (hKey)
{ {
@ -732,7 +732,7 @@ SdbUninstallByName(
LSTATUS status; LSTATUS status;
HKEY hKey = NULL; HKEY hKey = NULL;
HKEY subKey = NULL; HKEY subKey = NULL;
DWORD index = 0; DWORD index = 0;
WCHAR keyName[MAX_PATH]; WCHAR keyName[MAX_PATH];
DWORD keyNameLen = ARRAYSIZE(keyName); DWORD keyNameLen = ARRAYSIZE(keyName);
DWORD keyValSize; DWORD keyValSize;
@ -790,7 +790,7 @@ SdbUninstallByName(
++index; ++index;
keyNameLen = ARRAYSIZE(keyName); keyNameLen = ARRAYSIZE(keyName);
status = RegEnumKeyExW(hKey, index, keyName, &keyNameLen, NULL, NULL, NULL, NULL); status = RegEnumKeyExW(hKey, index, keyName, &keyNameLen, NULL, NULL, NULL, NULL);
} }
RegCloseKey(hKey); RegCloseKey(hKey);
@ -831,7 +831,7 @@ int _tmain(int argc, LPWSTR argv[])
ShowHelp(); ShowHelp();
} }
for (int i = 1; i < argc; ++i) for (int i = 1; i < argc; ++i)
{ {
if (argv[i][0] != L'-') if (argv[i][0] != L'-')
{ {

View File

@ -34,7 +34,7 @@ INT_PTR CALLBACK ShutdownGuiProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar
default: default:
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }

View File

@ -122,7 +122,7 @@ ParseArguments(struct CommandLineOptions* pOpts, int argc, WCHAR *argv[])
if (index+1 >= argc) if (index+1 >= argc)
return ERROR_INVALID_DATA; return ERROR_INVALID_DATA;
pOpts->shutdown_delay = _wtoi(argv[index+1]); pOpts->shutdown_delay = _wtoi(argv[index+1]);
if (pOpts->shutdown_delay > 0) if (pOpts->shutdown_delay > 0)
pOpts->force = TRUE; pOpts->force = TRUE;
index++; index++;
break; break;
@ -232,7 +232,7 @@ int wmain(int argc, WCHAR *argv[])
/* /*
* If the user wants to hibernate the computer. Assume * If the user wants to hibernate the computer. Assume
* that the user wants to wake the computer up from * that the user wants to wake the computer up from
* hibernation and it should not force it on the system. * hibernation and it should not force it on the system.
*/ */
if (opts.hibernate) if (opts.hibernate)
@ -240,13 +240,13 @@ int wmain(int argc, WCHAR *argv[])
if (IsPwrHibernateAllowed()) if (IsPwrHibernateAllowed())
{ {
EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); EnablePrivilege(SE_SHUTDOWN_NAME, TRUE);
/* The shutdown utility cannot hibernate remote systems */ /* The shutdown utility cannot hibernate remote systems */
if (opts.remote_system != NULL) if (opts.remote_system != NULL)
{ {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (!SetSuspendState(TRUE, FALSE, FALSE)) if (!SetSuspendState(TRUE, FALSE, FALSE))
{ {
ConResPuts(StdErr, IDS_ERROR_HIBERNATE); ConResPuts(StdErr, IDS_ERROR_HIBERNATE);
@ -350,7 +350,7 @@ int wmain(int argc, WCHAR *argv[])
ConResPuts(StdErr, IDS_ERROR_RESTART); ConResPuts(StdErr, IDS_ERROR_RESTART);
else else
ConResPuts(StdErr, IDS_ERROR_SHUTDOWN); ConResPuts(StdErr, IDS_ERROR_SHUTDOWN);
DisplayError(GetLastError()); DisplayError(GetLastError());
return EXIT_FAILURE; return EXIT_FAILURE;
} }

View File

@ -12,7 +12,7 @@ _AUDIO_NAMESPACE_START_
/* Protected Functions */ /* Protected Functions */
void void
audio_membuffer::alloc_mem_(unsigned int bytes) audio_membuffer::alloc_mem_(unsigned int bytes)
{ {
/* Some checking */ /* Some checking */
@ -79,7 +79,7 @@ audio_membuffer::resize_mem_(unsigned int new_size)
buffer_resized(new_size); buffer_resized(new_size);
} }
void void
audio_membuffer::truncate_(void) audio_membuffer::truncate_(void)
{ {
/* If `buf_size' is already = to the `bytes_received' of audio data, /* If `buf_size' is already = to the `bytes_received' of audio data,
@ -113,7 +113,7 @@ audio_membuffer::clear(void)
bytes_received = 0; bytes_received = 0;
} }
void void
audio_membuffer::reset(void) audio_membuffer::reset(void)
{ {
/* Frees memory and reset to initial state */ /* Frees memory and reset to initial state */
@ -122,37 +122,37 @@ audio_membuffer::reset(void)
alloc_mem_(init_size); alloc_mem_(init_size);
} }
void void
audio_membuffer::alloc_bytes(unsigned int bytes) audio_membuffer::alloc_bytes(unsigned int bytes)
{ {
alloc_mem_(bytes); alloc_mem_(bytes);
} }
void void
audio_membuffer::alloc_seconds(unsigned int secs) audio_membuffer::alloc_seconds(unsigned int secs)
{ {
alloc_mem_(aud_info.byte_rate() * secs); alloc_mem_(aud_info.byte_rate() * secs);
} }
void void
audio_membuffer::alloc_seconds(float secs) audio_membuffer::alloc_seconds(float secs)
{ {
alloc_mem_((unsigned int)((float)aud_info.byte_rate() * secs)); alloc_mem_((unsigned int)((float)aud_info.byte_rate() * secs));
} }
void void
audio_membuffer::resize_bytes(unsigned int bytes) audio_membuffer::resize_bytes(unsigned int bytes)
{ {
resize_mem_(bytes); resize_mem_(bytes);
} }
void void
audio_membuffer::resize_seconds(unsigned int secs) audio_membuffer::resize_seconds(unsigned int secs)
{ {
resize_mem_(aud_info.byte_rate() * secs); resize_mem_(aud_info.byte_rate() * secs);
} }
void void
audio_membuffer::resize_seconds(float secs) audio_membuffer::resize_seconds(float secs)
{ {
resize_mem_((unsigned int)((float)aud_info.byte_rate() * secs)); resize_mem_((unsigned int)((float)aud_info.byte_rate() * secs));
@ -160,7 +160,7 @@ audio_membuffer::resize_seconds(float secs)
/* Inherited Functions */ /* Inherited Functions */
void void
audio_membuffer::audio_receive(unsigned char *data, unsigned int size) audio_membuffer::audio_receive(unsigned char *data, unsigned int size)
{ {
/* If there isn't a buffer, allocs memory for it of size*2, and copies audio data arrival */ /* If there isn't a buffer, allocs memory for it of size*2, and copies audio data arrival */
@ -196,7 +196,7 @@ audio_membuffer::audio_receive(unsigned char *data, unsigned int size)
audio_arrival(aud_info.samples_in_bytes(size)); audio_arrival(aud_info.samples_in_bytes(size));
} }
unsigned int unsigned int
audio_membuffer::read(BYTE *out_buf, unsigned int bytes) audio_membuffer::read(BYTE *out_buf, unsigned int bytes)
{ {
/* Some checking */ /* Some checking */

View File

@ -25,7 +25,7 @@ audio_resampler_acm::init_(void)
wformat_src.cbSize = sizeof(WAVEFORMATEX); wformat_src.cbSize = sizeof(WAVEFORMATEX);
wformat_dst.cbSize = sizeof(WAVEFORMATEX); wformat_dst.cbSize = sizeof(WAVEFORMATEX);
/* Setting WAVEFORMATEX structure parameters /* Setting WAVEFORMATEX structure parameters
according to `audio_format' in/out classes */ according to `audio_format' in/out classes */
wformat_src.wFormatTag = WAVE_FORMAT_PCM; wformat_src.wFormatTag = WAVE_FORMAT_PCM;
@ -189,7 +189,7 @@ audio_resampler_acm::close(void)
/* ACM sream successfully closed */ /* ACM sream successfully closed */
} }
void void
audio_resampler_acm::audio_receive(unsigned char *data, unsigned int size) audio_resampler_acm::audio_receive(unsigned char *data, unsigned int size)
{ {
MMRESULT err; MMRESULT err;

View File

@ -50,7 +50,7 @@ audio_wavein::alloc_buffers_mem_(unsigned int buffs, float secs)
mb_size = tot_size; mb_size = tot_size;
} }
void void
audio_wavein::free_buffers_mem_(void) audio_wavein::free_buffers_mem_(void)
{ {
/* Frees memory */ /* Frees memory */
@ -65,7 +65,7 @@ audio_wavein::free_buffers_mem_(void)
wave_headers = 0; wave_headers = 0;
} }
void void
audio_wavein::init_headers_(void) audio_wavein::init_headers_(void)
{ {
/* If there is no memory for memory or headers, simply return */ /* If there is no memory for memory or headers, simply return */
@ -85,7 +85,7 @@ audio_wavein::init_headers_(void)
} }
} }
void void
audio_wavein::prep_headers_(void) audio_wavein::prep_headers_(void)
{ {
MMRESULT err; MMRESULT err;
@ -108,7 +108,7 @@ audio_wavein::prep_headers_(void)
MessageBox(0, TEXT("waveInPrepareHeader Error."), 0, 0); MessageBox(0, TEXT("waveInPrepareHeader Error."), 0, 0);
} }
void void
audio_wavein::unprep_headers_(void) audio_wavein::unprep_headers_(void)
{ {
MMRESULT err; MMRESULT err;
@ -131,7 +131,7 @@ audio_wavein::unprep_headers_(void)
MessageBox(0, TEXT("waveInUnPrepareHeader Error."), 0, 0); MessageBox(0, TEXT("waveInUnPrepareHeader Error."), 0, 0);
} }
void void
audio_wavein::add_buffers_to_driver_(void) audio_wavein::add_buffers_to_driver_(void)
{ {
MMRESULT err; MMRESULT err;
@ -155,7 +155,7 @@ audio_wavein::add_buffers_to_driver_(void)
} }
void void
audio_wavein::close(void) audio_wavein::close(void)
{ {
/* If wavein object is already in the status NOTREADY, nothing to do */ /* If wavein object is already in the status NOTREADY, nothing to do */
if (status == WAVEIN_NOTREADY) if (status == WAVEIN_NOTREADY)
@ -340,7 +340,7 @@ audio_wavein::stop_recording(void)
status = WAVEIN_STOP; status = WAVEIN_STOP;
} }
DWORD WINAPI DWORD WINAPI
audio_wavein::recording_procedure(LPVOID arg) audio_wavein::recording_procedure(LPVOID arg)
{ {
MSG msg; MSG msg;

View File

@ -123,7 +123,7 @@ class audio_wavein
return; return;
/* Set seconds length for each buffer */ /* Set seconds length for each buffer */
buf_secs = bsecs; buf_secs = bsecs;
} }
unsigned int total_buffers(void) const unsigned int total_buffers(void) const
@ -181,7 +181,7 @@ class audio_wavein
svalue = (unsigned int)abs(*((short *)(main_buffer + aud_info.bytes_in_samples(nsamp)))); svalue = (unsigned int)abs(*((short *)(main_buffer + aud_info.bytes_in_samples(nsamp))));
else if (aud_info.bits() == 8) else if (aud_info.bits() == 8)
svalue = (unsigned int)((ptrdiff_t) *(main_buffer + aud_info.bytes_in_samples(nsamp))); svalue = (unsigned int)((ptrdiff_t) *(main_buffer + aud_info.bytes_in_samples(nsamp)));
else else
svalue = 0; svalue = 0;
return svalue; return svalue;

View File

@ -22,7 +22,7 @@ audio_waveout::init_(void)
status = WAVEOUT_NOTREADY; status = WAVEOUT_NOTREADY;
} }
void void
audio_waveout::alloc_buffers_mem_(unsigned int buffs, float secs) audio_waveout::alloc_buffers_mem_(unsigned int buffs, float secs)
{ {
unsigned int onebuf_size = 0, tot_size = 0; unsigned int onebuf_size = 0, tot_size = 0;
@ -35,7 +35,7 @@ audio_waveout::alloc_buffers_mem_(unsigned int buffs, float secs)
delete[] wave_headers; delete[] wave_headers;
/* Calcs size of the buffers */ /* Calcs size of the buffers */
onebuf_size = (unsigned int)((float)aud_info.byte_rate() * secs); onebuf_size = (unsigned int)((float)aud_info.byte_rate() * secs);
tot_size = onebuf_size * buffs; tot_size = onebuf_size * buffs;
/* Allocs memory for the audio buffers */ /* Allocs memory for the audio buffers */
main_buffer = new BYTE[tot_size]; main_buffer = new BYTE[tot_size];
@ -48,7 +48,7 @@ audio_waveout::alloc_buffers_mem_(unsigned int buffs, float secs)
mb_size = tot_size; mb_size = tot_size;
} }
void void
audio_waveout::init_headers_(void) audio_waveout::init_headers_(void)
{ {
/* If there is no memory for memory or headers, simply return */ /* If there is no memory for memory or headers, simply return */
@ -80,7 +80,7 @@ audio_waveout::init_headers_(void)
} }
} }
void void
audio_waveout::prep_headers_(void) audio_waveout::prep_headers_(void)
{ {
MMRESULT err; MMRESULT err;
@ -105,7 +105,7 @@ audio_waveout::prep_headers_(void)
} }
} }
void void
audio_waveout::unprep_headers_(void) audio_waveout::unprep_headers_(void)
{ {
MMRESULT err; MMRESULT err;
@ -130,7 +130,7 @@ audio_waveout::unprep_headers_(void)
} }
} }
void void
audio_waveout::free_buffers_mem_(void) audio_waveout::free_buffers_mem_(void)
{ {
/* Frees memory */ /* Frees memory */
@ -144,7 +144,7 @@ audio_waveout::free_buffers_mem_(void)
wave_headers = 0; wave_headers = 0;
} }
void void
audio_waveout::open(void) audio_waveout::open(void)
{ {
MMRESULT err; MMRESULT err;
@ -214,7 +214,7 @@ audio_waveout::open(void)
status = WAVEOUT_READY; status = WAVEOUT_READY;
} }
void void
audio_waveout::play(void) audio_waveout::play(void)
{ {
MMRESULT err; MMRESULT err;
@ -268,7 +268,7 @@ audio_waveout::play(void)
} }
} }
void void
audio_waveout::pause(void) audio_waveout::pause(void)
{ {
MMRESULT err; MMRESULT err;
@ -288,7 +288,7 @@ audio_waveout::pause(void)
} }
} }
void void
audio_waveout::stop(void) audio_waveout::stop(void)
{ {
MMRESULT err; MMRESULT err;
@ -344,7 +344,7 @@ audio_waveout::close(void)
free_buffers_mem_(); free_buffers_mem_();
} }
DWORD WINAPI DWORD WINAPI
audio_waveout::playing_procedure(LPVOID arg) audio_waveout::playing_procedure(LPVOID arg)
{ {
MSG msg; MSG msg;

View File

@ -117,7 +117,7 @@ class audio_waveout
return (unsigned int)65535; return (unsigned int)65535;
else if (aud_info.bits() == 8) else if (aud_info.bits() == 8)
return (unsigned int)255; return (unsigned int)255;
else else
return 0; return 0;
} }
@ -134,7 +134,7 @@ class audio_waveout
svalue = (unsigned int)abs(*((short *)(main_buffer + aud_info.bytes_in_samples(nsamp)))); svalue = (unsigned int)abs(*((short *)(main_buffer + aud_info.bytes_in_samples(nsamp))));
else if (aud_info.bits() == 8) else if (aud_info.bits() == 8)
svalue = (unsigned int)((ptrdiff_t) *(main_buffer + aud_info.bytes_in_samples(nsamp))); svalue = (unsigned int)((ptrdiff_t) *(main_buffer + aud_info.bytes_in_samples(nsamp)));
else else
svalue = 0; svalue = 0;
return svalue; return svalue;

View File

@ -209,7 +209,7 @@ LoadXYCoordWnd(IN PPREFERENCES_CONTEXT PrefContext)
/* Cache the Y coordinate point */ /* Cache the Y coordinate point */
PrefContext->MixerWindow->WndPosY = dwData; PrefContext->MixerWindow->WndPosY = dwData;
RegCloseKey(hKey); RegCloseKey(hKey);
return TRUE; return TRUE;
} }
@ -222,7 +222,7 @@ SaveXYCoordWnd(IN HWND hWnd,
LONG lResult; LONG lResult;
TCHAR DeviceMixerSettings[256]; TCHAR DeviceMixerSettings[256];
WINDOWPLACEMENT wp; WINDOWPLACEMENT wp;
/* Get the placement coordinate data from the window */ /* Get the placement coordinate data from the window */
wp.length = sizeof(WINDOWPLACEMENT); wp.length = sizeof(WINDOWPLACEMENT);
GetWindowPlacement(hWnd, &wp); GetWindowPlacement(hWnd, &wp);

View File

@ -340,7 +340,7 @@ UpdatePrefDlgControls(PPREFERENCES_CONTEXT Context,
} }
} }
static static
VOID VOID
WriteLineSettings(PPREFERENCES_CONTEXT Context, HWND hwndDlg) WriteLineSettings(PPREFERENCES_CONTEXT Context, HWND hwndDlg)
{ {
@ -576,11 +576,11 @@ DlgPreferencesProc(HWND hwndDlg,
IDCANCEL); IDCANCEL);
break; break;
} }
case WM_SYSCOLORCHANGE: case WM_SYSCOLORCHANGE:
{ {
HWND hwndControls; HWND hwndControls;
/* Forward WM_SYSCOLORCHANGE */ /* Forward WM_SYSCOLORCHANGE */
hwndControls = GetDlgItem(hwndDlg, IDC_CONTROLS); hwndControls = GetDlgItem(hwndDlg, IDC_CONTROLS);
SendMessage(hwndControls, WM_SYSCOLORCHANGE, 0, 0); SendMessage(hwndControls, WM_SYSCOLORCHANGE, 0, 0);
@ -1342,7 +1342,7 @@ CreateApplicationWindow(
hWnd = CreateWindowEx(WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT, hWnd = CreateWindowEx(WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT,
SZ_APP_CLASS, SZ_APP_CLASS,
lpAppTitle, lpAppTitle,
WS_DLGFRAME | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE, WS_DLGFRAME | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE,
0, 0, 300, 315, 0, 0, 300, 315,
NULL, NULL,
LoadMenu(hAppInstance, LoadMenu(hAppInstance,

View File

@ -486,7 +486,7 @@ void AddOrUpdateHwnd(HWND hWnd, WCHAR *szTitle, HICON hIcon, BOOL bHung)
} }
/* Select first item if any */ /* Select first item if any */
if ((ListView_GetNextItem(hApplicationPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) && if ((ListView_GetNextItem(hApplicationPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) &&
(ListView_GetItemCount(hApplicationPageListCtrl) > 0) && !bApplicationPageSelectionMade) (ListView_GetItemCount(hApplicationPageListCtrl) > 0) && !bApplicationPageSelectionMade)
{ {
ListView_SetItemState(hApplicationPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); ListView_SetItemState(hApplicationPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED);

View File

@ -478,7 +478,7 @@ void UpdateProcesses()
SendMessage(hProcessPageListCtrl, WM_SETREDRAW, TRUE, 0); SendMessage(hProcessPageListCtrl, WM_SETREDRAW, TRUE, 0);
/* Select first item if any */ /* Select first item if any */
if ((ListView_GetNextItem(hProcessPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) && if ((ListView_GetNextItem(hProcessPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) &&
(ListView_GetItemCount(hProcessPageListCtrl) > 0) && !bProcessPageSelectionMade) (ListView_GetItemCount(hProcessPageListCtrl) > 0) && !bProcessPageSelectionMade)
{ {
ListView_SetItemState(hProcessPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); ListView_SetItemState(hProcessPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED);
@ -492,7 +492,7 @@ void UpdateProcesses()
*/ */
} }
BOOL ProcessRunning(ULONG ProcessId) BOOL ProcessRunning(ULONG ProcessId)
{ {
HANDLE hProcess; HANDLE hProcess;
DWORD exitCode; DWORD exitCode;

View File

@ -56,7 +56,7 @@ TASKMANAGER_SETTINGS TaskManagerSettings;
// http://www.catch22.net/software/winspy // http://www.catch22.net/software/winspy
// Copyright (c) 2002 by J Brown // Copyright (c) 2002 by J Brown
// //
// //
// Copied from uxtheme.h // Copied from uxtheme.h
// If you have this new header, then delete these and // If you have this new header, then delete these and
@ -67,7 +67,7 @@ TASKMANAGER_SETTINGS TaskManagerSettings;
#define ETDT_USETABTEXTURE 0x00000004 #define ETDT_USETABTEXTURE 0x00000004
#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) #define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE)
// //
typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD); typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD);
// //
@ -82,7 +82,7 @@ BOOL EnableDialogTheme(HWND hwnd)
if(hUXTheme) if(hUXTheme)
{ {
fnEnableThemeDialogTexture = fnEnableThemeDialogTexture =
(ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture"); (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture");
if(fnEnableThemeDialogTexture) if(fnEnableThemeDialogTexture)

View File

@ -145,7 +145,7 @@ BOOL DlgInitHandler(IN HWND hDlg)
/* Refresh the list */ /* Refresh the list */
ListBoxRefreshContents(); ListBoxRefreshContents();
/* Create a timer, we'll use it to control the state of our items in the listbox */ /* Create a timer, we'll use it to control the state of our items in the listbox */
Globals.iTimer = SetTimer(hDlg, 0, 400, NULL); Globals.iTimer = SetTimer(hDlg, 0, 400, NULL);

View File

@ -2662,7 +2662,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar
'T','A','B','L','E','\0'}; 'T','A','B','L','E','\0'};
InitCommonControlsEx(&classes); InitCommonControlsEx(&classes);
switch (GetUserDefaultUILanguage()) switch (GetUserDefaultUILanguage())
{ {
case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT):

View File

@ -16,23 +16,23 @@ Global\AudioDeviceList
This file appears to contain a list of devices that WinMM accesses and This file appears to contain a list of devices that WinMM accesses and
subsequently passes to wdmaud.drv subsequently passes to wdmaud.drv
It is not necessary to duplicate the exact structure of this mapped It is not necessary to duplicate the exact structure of this mapped
file, since it appears to only be used internally by Windows components. file, since it appears to only be used internally by Windows components.
The ROS Audio Service (AudioSrv) is intended to be able to run The ROS Audio Service (AudioSrv) is intended to be able to run
alongside the Windows Audio Service on XP/Vista, so it should be alongside the Windows Audio Service on XP/Vista, so it should be
possible to test in a "known working environment" ;) possible to test in a "known working environment" ;)
It will create a mutex, to: It will create a mutex, to:
1) Allow synchronization when accessing the device list 1) Allow synchronization when accessing the device list
2) Provide a simple method of identifying if AudioSrv is running 2) Provide a simple method of identifying if AudioSrv is running
(It might be worth using an event to notify WinMM when things are (It might be worth using an event to notify WinMM when things are
happening?) happening?)
The intention is to make AudioSrv receive PnP notifications for The intention is to make AudioSrv receive PnP notifications for
relevant audio devices, and also let AudioSrv in Windows do this. Then relevant audio devices, and also let AudioSrv in Windows do this. Then
it should be possible to create a small application that imitates it should be possible to create a small application that imitates
WinMM's actions :) WinMM's actions :)

View File

@ -73,9 +73,9 @@ AppendAudioDeviceToList(PnP_AudioDevice* device)
if (audio_device_list->size + device_info_size > audio_device_list->max_size) if (audio_device_list->size + device_info_size > audio_device_list->max_size)
{ {
/*printf("max_size would be exceeded! Failing...\n");*/ /*printf("max_size would be exceeded! Failing...\n");*/
UnlockAudioDeviceList(); UnlockAudioDeviceList();
return FALSE; return FALSE;
} }

View File

@ -3,7 +3,7 @@ add_definitions(-Dtzset=_tzset)
include_directories(include) include_directories(include)
spec2def(dhcpcsvc.dll dhcpcsvc.spec ADD_IMPORTLIB) spec2def(dhcpcsvc.dll dhcpcsvc.spec ADD_IMPORTLIB)
list(APPEND SOURCE list(APPEND SOURCE
dhcp/adapter.c dhcp/adapter.c
dhcp/alloc.c dhcp/alloc.c
dhcp/api.c dhcp/api.c

View File

@ -172,7 +172,7 @@ BOOL PrepareAdapterForService( PDHCP_ADAPTER Adapter ) {
{ {
/* DHCP enabled by default */ /* DHCP enabled by default */
DhcpEnabled = 1; DhcpEnabled = 1;
} }
if( !DhcpEnabled ) { if( !DhcpEnabled ) {
/* Non-automatic case */ /* Non-automatic case */
@ -222,7 +222,7 @@ IsReconnectHackNeeded(PDHCP_ADAPTER Adapter, const MIB_IFROW* IfEntry)
if (Adapter->DhclientInfo.client->state != S_BOUND && if (Adapter->DhclientInfo.client->state != S_BOUND &&
Adapter->DhclientInfo.client->state != S_STATIC) Adapter->DhclientInfo.client->state != S_STATIC)
return FALSE; return FALSE;
ApiUnlock(); ApiUnlock();
Orig = AdapterInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(IP_ADAPTER_INFO)); Orig = AdapterInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(IP_ADAPTER_INFO));
@ -397,7 +397,7 @@ DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) {
socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
if (DhcpSocket != INVALID_SOCKET) { if (DhcpSocket != INVALID_SOCKET) {
/* Allow broadcast on this socket */ /* Allow broadcast on this socket */
Broadcast = 1; Broadcast = 1;
setsockopt(DhcpSocket, setsockopt(DhcpSocket,
@ -405,7 +405,7 @@ DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) {
SO_BROADCAST, SO_BROADCAST,
(const char *)&Broadcast, (const char *)&Broadcast,
sizeof(Broadcast)); sizeof(Broadcast));
Adapter->ListenAddr.sin_family = AF_INET; Adapter->ListenAddr.sin_family = AF_INET;
Adapter->ListenAddr.sin_port = htons(LOCAL_PORT); Adapter->ListenAddr.sin_port = htons(LOCAL_PORT);
Adapter->BindStatus = Adapter->BindStatus =

View File

@ -185,7 +185,7 @@ DWORD DSStaticRefreshParams( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *
DeleteIpForwardEntry( &Adapter->RouterMib ); DeleteIpForwardEntry( &Adapter->RouterMib );
Adapter->RouterMib.dwForwardNextHop = 0; Adapter->RouterMib.dwForwardNextHop = 0;
} }
Adapter->DhclientState.state = S_STATIC; Adapter->DhclientState.state = S_STATIC;
proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); proto = find_protocol_by_adapter( &Adapter->DhclientInfo );
if (proto) if (proto)

View File

@ -51,7 +51,7 @@ DhcpCApiInitialize(LPDWORD Version)
} }
/* Change the pipe into message mode */ /* Change the pipe into message mode */
PipeMode = PIPE_READMODE_MESSAGE; PipeMode = PIPE_READMODE_MESSAGE;
if (!SetNamedPipeHandleState(PipeHandle, &PipeMode, NULL, NULL)) if (!SetNamedPipeHandleState(PipeHandle, &PipeMode, NULL, NULL))
{ {
/* Mode change failed */ /* Mode change failed */

View File

@ -49,7 +49,7 @@ DnsIntCacheFree(VOID)
DeleteCriticalSection(&DnsCache.Lock); DeleteCriticalSection(&DnsCache.Lock);
DnsCacheInitialized = FALSE; DnsCacheInitialized = FALSE;
} }
VOID VOID
DnsIntCacheRemoveEntryItem(PRESOLVER_CACHE_ENTRY CacheEntry) DnsIntCacheRemoveEntryItem(PRESOLVER_CACHE_ENTRY CacheEntry)
{ {
@ -57,7 +57,7 @@ DnsIntCacheRemoveEntryItem(PRESOLVER_CACHE_ENTRY CacheEntry)
/* Remove the entry from the list */ /* Remove the entry from the list */
RemoveEntryList(&CacheEntry->CacheLink); RemoveEntryList(&CacheEntry->CacheLink);
/* Free record */ /* Free record */
DnsRecordListFree(CacheEntry->Record, DnsFreeRecordList); DnsRecordListFree(CacheEntry->Record, DnsFreeRecordList);

View File

@ -2,7 +2,7 @@
add_rpc_files(server add_rpc_files(server
${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/epm.idl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/epm.idl
${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/irot.idl) ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/irot.idl)
list(APPEND SOURCE list(APPEND SOURCE
epmp.c epmp.c

View File

@ -6,9 +6,9 @@
* PROGRAMMER: Giannis Adamopoulos * PROGRAMMER: Giannis Adamopoulos
*/ */
/* /*
* NOTE: * NOTE:
* ThemeWaitForServiceReady and ThemeWatchForStart are called from msgina * ThemeWaitForServiceReady and ThemeWatchForStart are called from msgina
* so all the functions in this file run in the context of winlogon * so all the functions in this file run in the context of winlogon
*/ */
@ -32,7 +32,7 @@ BOOL WINAPI ThemeWatchForStart(VOID);
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
static static
HANDLE HANDLE
GetThemeServiceProcessHandle(VOID) GetThemeServiceProcessHandle(VOID)
{ {
@ -162,7 +162,7 @@ ThemeWaitForServiceReady(DWORD dwTimeout)
break; break;
} }
if (GetTickCount() - start_time > dwTimeout) if (GetTickCount() - start_time > dwTimeout)
{ {
break; break;
} }

View File

@ -69,7 +69,7 @@ DwInitializeSdFromThreadToken (
/* Allocate an SD large enough to hold the SIDs for the above */ /* Allocate an SD large enough to hold the SIDs for the above */
dwAlignLength = ALIGN_UP(dwUserLength, ULONG); dwAlignLength = ALIGN_UP(dwUserLength, ULONG);
pSd = (PISECURITY_DESCRIPTOR)MemAlloc(0, pSd = (PISECURITY_DESCRIPTOR)MemAlloc(0,
dwAlignLength + dwAlignLength +
dwGroupLength + dwGroupLength +
sizeof(*pSd)); sizeof(*pSd));
if (pSd == NULL) return ERROR_OUTOFMEMORY; if (pSd == NULL) return ERROR_OUTOFMEMORY;

View File

@ -20,7 +20,7 @@ EchoIncomingPackets(SOCKET sock)
INT readBytes; INT readBytes;
INT retVal; INT retVal;
do do
{ {
readBytes = recv(sock, readBuffer, RECV_BUF, 0); readBytes = recv(sock, readBuffer, RECV_BUF, 0);
if (readBytes > 0) if (readBytes > 0)

View File

@ -59,7 +59,7 @@ RetrieveQuote(SOCKET sock)
{ {
DWORD dwSize = GetFileSize(hFile, NULL); DWORD dwSize = GetFileSize(hFile, NULL);
lpQuotes = (LPSTR)HeapAlloc(GetProcessHeap(), 0, dwSize + 1); lpQuotes = (LPSTR)HeapAlloc(GetProcessHeap(), 0, dwSize + 1);
if (!lpQuotes) if (!lpQuotes)
{ {
CloseHandle(hFile); CloseHandle(hFile);
return FALSE; return FALSE;

View File

@ -3229,7 +3229,7 @@ PNP_GetDeviceStatus(
0); 0);
if (ret != CR_SUCCESS) if (ret != CR_SUCCESS)
ulCapabilities = 0; ulCapabilities = 0;
if (ulCapabilities & CM_DEVCAP_REMOVABLE) if (ulCapabilities & CM_DEVCAP_REMOVABLE)
*pulStatus |= DN_REMOVABLE; *pulStatus |= DN_REMOVABLE;

View File

@ -19,7 +19,7 @@ DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter)
RPC_STATUS Status; RPC_STATUS Status;
InitializeListHead(&WlanSvcHandleListHead); InitializeListHead(&WlanSvcHandleListHead);
Status = RpcServerUseProtseqEpW(L"ncalrpc", 20, L"wlansvc", NULL); Status = RpcServerUseProtseqEpW(L"ncalrpc", 20, L"wlansvc", NULL);
if (Status != RPC_S_OK) if (Status != RPC_S_OK)
{ {
@ -81,13 +81,13 @@ DWORD _RpcOpenHandle(
if (dwClientVersion > 2) if (dwClientVersion > 2)
dwClientVersion = 2; dwClientVersion = 2;
if (dwClientVersion < 1) if (dwClientVersion < 1)
dwClientVersion = 1; dwClientVersion = 1;
lpWlanSvcHandle->dwClientVersion = dwClientVersion; lpWlanSvcHandle->dwClientVersion = dwClientVersion;
*pdwNegotiatedVersion = dwClientVersion; *pdwNegotiatedVersion = dwClientVersion;
InsertTailList(&WlanSvcHandleListHead, &lpWlanSvcHandle->WlanSvcHandleListEntry); InsertTailList(&WlanSvcHandleListHead, &lpWlanSvcHandle->WlanSvcHandleListEntry);
*phClientHandle = lpWlanSvcHandle; *phClientHandle = lpWlanSvcHandle;
@ -264,7 +264,7 @@ DWORD _RpcScan(
{ {
return ERROR_INVALID_HANDLE; return ERROR_INVALID_HANDLE;
} }
/* /*
DWORD dwBytesReturned; DWORD dwBytesReturned;
HANDLE hDevice; HANDLE hDevice;

View File

@ -94,7 +94,7 @@ ServiceMain(DWORD argc, LPTSTR *argv)
UNREFERENCED_PARAMETER(argv); UNREFERENCED_PARAMETER(argv);
DPRINT("WU ServiceMain() called\n"); DPRINT("WU ServiceMain() called\n");
ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName,
ServiceControlHandler, ServiceControlHandler,
NULL); NULL);

View File

@ -535,7 +535,7 @@ static MUI_ENTRY euESRepairPageEntries[] =
{ {
6, 6,
12, 12,
"Zuzentzaile funtzioak ez daude artean ezarrita.", "Zuzentzaile funtzioak ez daude artean ezarrita.",
TEXT_STYLE_NORMAL, TEXT_STYLE_NORMAL,
TEXT_ID_STATIC TEXT_ID_STATIC
}, },

View File

@ -3970,7 +3970,7 @@ BootLoaderPage(PINPUT_RECORD Ir)
CONSOLE_NormalTextXY(8, Line, 60, 1); CONSOLE_NormalTextXY(8, Line, 60, 1);
Line = 15; Line = 15;
CONSOLE_InvertTextXY(8, Line, 60, 1); CONSOLE_InvertTextXY(8, Line, 60, 1);
} }
else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
@ -4099,7 +4099,7 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir)
* Calls InstallVBRToPartition() if VBR installation is chosen. * Calls InstallVBRToPartition() if VBR installation is chosen.
* Otherwise both InstallVBRToPartition() and InstallMbrBootCodeToDisk() * Otherwise both InstallVBRToPartition() and InstallMbrBootCodeToDisk()
* are called if both MBR and VBR installation is chosen. * are called if both MBR and VBR installation is chosen.
* *
* RETURNS * RETURNS
* Number of the next page. * Number of the next page.
*/ */

View File

@ -29,7 +29,7 @@ typedef struct _BATCH_CONTEXT
char *mem; /* batchfile content in memory */ char *mem; /* batchfile content in memory */
DWORD memsize; /* size of batchfile */ DWORD memsize; /* size of batchfile */
DWORD mempos; /* current position to read from */ DWORD mempos; /* current position to read from */
BOOL memfree; /* true if it need to be freed when exitbatch is called */ BOOL memfree; /* true if it need to be freed when exitbatch is called */
TCHAR BatchFilePath[MAX_PATH]; TCHAR BatchFilePath[MAX_PATH];
LPTSTR params; LPTSTR params;
LPTSTR raw_params; /* Holds the raw params given by the input */ LPTSTR raw_params; /* Holds the raw params given by the input */

View File

@ -74,7 +74,7 @@ CheckTerminalDeviceType(IN LPCTSTR pszName)
} }
else else
if ( _wcsnicmp(DeviceName, DosLPTDevice, 3) == 0 || if ( _wcsnicmp(DeviceName, DosLPTDevice, 3) == 0 ||
_wcsnicmp(DeviceName, DosCOMDevice, 3) == 0 || _wcsnicmp(DeviceName, DosCOMDevice, 3) == 0 ||
_wcsnicmp(DeviceName, DosPRNDevice, 3) == 0 || _wcsnicmp(DeviceName, DosPRNDevice, 3) == 0 ||
_wcsnicmp(DeviceName, DosAUXDevice, 3) == 0 || _wcsnicmp(DeviceName, DosAUXDevice, 3) == 0 ||
_wcsnicmp(DeviceName, DosNULDevice, 3) == 0 ) _wcsnicmp(DeviceName, DosNULDevice, 3) == 0 )

View File

@ -1,32 +1,32 @@
General Overview of How Things Work General Overview of How Things Work
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
First it comes into _main in cmd.c(1811). The command line params are taking in and if it is unicode it uses CommandLineToArgvW. First it comes into _main in cmd.c(1811). The command line params are taking in and if it is unicode it uses CommandLineToArgvW.
This can cause a problem on older machines and that is why we have our own custom _CommandLineToArgvW to help this along. This can cause a problem on older machines and that is why we have our own custom _CommandLineToArgvW to help this along.
We pull in the launch directory as the initial dir and set that in _tchdir. We make a handle to the default console out using CreateFile. We pull in the launch directory as the initial dir and set that in _tchdir. We make a handle to the default console out using CreateFile.
Then we call Initialize(). Here we need to load ntdll.dll if it isn't loaded (windows 9x machines). Then we call Initialize(). Here we need to load ntdll.dll if it isn't loaded (windows 9x machines).
We also setup some global vars like default io handles and nErrorLevel and set %prompt% to $P$G. We also setup some global vars like default io handles and nErrorLevel and set %prompt% to $P$G.
This is where all command lines switches given to cmd on startup are done. This is where all command lines switches given to cmd on startup are done.
From here main calls ProcessInput(). This is where cmd loops for getting input and doing the commands. From here main calls ProcessInput(). This is where cmd loops for getting input and doing the commands.
First it checks to see if there is a batch file(note: there is a global struct "bc" which is NULL when not processing a batch file) First it checks to see if there is a batch file(note: there is a global struct "bc" which is NULL when not processing a batch file)
and if there is it will pull a new line from that file. If not, then it will wait for input. and if there is it will pull a new line from that file. If not, then it will wait for input.
Currently there is some stuff for set /a in there, which might stay there or see if we can find a better spot. Currently there is some stuff for set /a in there, which might stay there or see if we can find a better spot.
Once there is input taken in from the command line it is sent into ParseCommandLine(). Once there is input taken in from the command line it is sent into ParseCommandLine().
In here we fist check for aliases and convert if need be. In here we fist check for aliases and convert if need be.
Then we look for redirections using GetRedirection() which will remove any redirection symbols. Then we look for redirections using GetRedirection() which will remove any redirection symbols.
and pass back info about where to redirect. and pass back info about where to redirect.
from this info it will do some switching around with the handles for where things go and send them as need be. from this info it will do some switching around with the handles for where things go and send them as need be.
personally i dont like this code and i tried to change it before but failed. personally i dont like this code and i tried to change it before but failed.
it is confusing to me and i dont understand why a lot of it is there but apparently it is needed. it is confusing to me and i dont understand why a lot of it is there but apparently it is needed.
It sends the new string without any redirection info into DoCommand(). In this function we just look to see what should be done. It sends the new string without any redirection info into DoCommand(). In this function we just look to see what should be done.
There is one of 2 things that could happen. There is one of 2 things that could happen.
1) we fnd the matching command and send it off to that commands little section. 1) we fnd the matching command and send it off to that commands little section.
2) we dont find it so we send it to Execute() and see if it is a file that we can do something. 2) we dont find it so we send it to Execute() and see if it is a file that we can do something.
Execute will try to launch the file using createprocess and falls back on shellexecute. Execute will try to launch the file using createprocess and falls back on shellexecute.
It calls a function called SearchForExecutable() to find the full path name and looks in all the correct locations like PATH, It calls a function called SearchForExecutable() to find the full path name and looks in all the correct locations like PATH,
current folder, windows folder. If it cant find it, just fails and prints out a message. current folder, windows folder. If it cant find it, just fails and prints out a message.

View File

@ -1,6 +1,6 @@
Made by Vicmarcal 23/11/08 Made by Vicmarcal 23/11/08
THIS FILE HELPS TO EXPLAIN HOW REN IS NOW IMPLEMENTED. THIS FILE HELPS TO EXPLAIN HOW REN IS NOW IMPLEMENTED.
**************************************************************** ****************************************************************
(Please change or add latest modifications) (Please change or add latest modifications)
**************************************************************** ****************************************************************
@ -14,7 +14,7 @@ ren c:\ie\hello.txt c:\ie\hi.txt
rename command will change the name of hello.txt->hi.txt. We have to be sure that both paths(c:\ie\ ) be the same.Since rename cant move files within Directories (MSDN). rename command will change the name of hello.txt->hi.txt. We have to be sure that both paths(c:\ie\ ) be the same.Since rename cant move files within Directories (MSDN).
WAY #2:Semi Path Way: WAY #2:Semi Path Way:
ren c:\ie\hello.txt hi.txt ren c:\ie\hello.txt hi.txt
This is a special feature,since this does the same as Way #1 but without telling the Destiny path.So this feature must be implemented also. This is a special feature,since this does the same as Way #1 but without telling the Destiny path.So this feature must be implemented also.
@ -35,7 +35,7 @@ So it changes the name of hello.txt in the current directory.
Explaining code: Explaining code:
srcPattern: here is stored Source Argument (C:\ie\hello.txt) srcPattern: here is stored Source Argument (C:\ie\hello.txt)
srcPath: here is stored Source Path(C:\ie) srcPath: here is stored Source Path(C:\ie)
srcFILE: here is stored FILE name(hello.txt) srcFILE: here is stored FILE name(hello.txt)
@ -43,7 +43,7 @@ dstPattern: here is stored Destiny Argument (C:\ie\hi.txt)
dstPath: here is stored Destiny Path(C:\i) dstPath: here is stored Destiny Path(C:\i)
dstFILE: here is stored FILE re-name(hi.txt) dstFILE: here is stored FILE re-name(hi.txt)
1)We begin retrieving arguments from command line and fulfilling dstPattern and srcPattern 1)We begin retrieving arguments from command line and fulfilling dstPattern and srcPattern
2)If srcPattern contains "\" then: 2)If srcPattern contains "\" then:

View File

@ -25,7 +25,7 @@ INT_PTR CALLBACK CustomizeNotifyIconsProc(HWND hwnd, UINT Message, WPARAM wParam
switch(Message) switch(Message)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
return TRUE; return TRUE;
case WM_COMMAND: case WM_COMMAND:
switch(LOWORD(wParam)) switch(LOWORD(wParam))

View File

@ -68,7 +68,7 @@ extern BOOL bExplorerIsShell;
* explorer.c * explorer.c
*/ */
static inline static inline
LONG LONG
SetWindowStyle(IN HWND hWnd, SetWindowStyle(IN HWND hWnd,
IN LONG dwStyleMask, IN LONG dwStyleMask,
@ -312,14 +312,14 @@ CreateStartMenu(IN ITrayWindow *Tray,
/* /*
* startmnucust.cpp * startmnucust.cpp
*/ */
VOID VOID
ShowCustomizeClassic(HINSTANCE, HWND); ShowCustomizeClassic(HINSTANCE, HWND);
/* /*
* startmnusite.cpp * startmnusite.cpp
*/ */
HRESULT HRESULT
CStartMenuSite_CreateInstance(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv); CStartMenuSite_CreateInstance(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv);
/* /*

View File

@ -134,7 +134,7 @@
/* Customize Notifications Dialog */ /* Customize Notifications Dialog */
#define IDC_TASKBARPROP_NOTIREST 1402 #define IDC_TASKBARPROP_NOTIREST 1402
#define IDC_NOTIFICATION_LIST 1005 #define IDC_NOTIFICATION_LIST 1005
#define IDC_NOTIFICATION_BEHAVIOUR 1006 #define IDC_NOTIFICATION_BEHAVIOUR 1006
/* Customize classic start menu dialog */ /* Customize classic start menu dialog */

Some files were not shown because too many files have changed in this diff Show More