Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-30 06:28:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUP16/EXPLORER/LIBTIFF/DESK/ADVAPI32/MCIWAVE/SAMSRV/SHELL32/WINMM/LIBMPG123]

Browse source 
Fix / silence warnings

svn path=/trunk/; revision=63518
This commit is contained in:
Timo Kreuzer 2014-05-31 16:58:03 +00:00
parent 35767099ce
commit 9bda7700ff
12 changed files with 50 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
reactos/base/applications/setup16/main.c
View file

@ -13,6 +13,8 @@ static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Par
FILE_IN_CABINET_INFO_W *pInfo;
FILEPATHS_W *pFilePaths;
DBG_UNREFERENCED_LOCAL_VARIABLE(pFilePaths);
switch(Notification)
{
case SPFILENOTIFY_FILEINCABINET:
@ -31,7 +33,7 @@ BOOL DeleteDirectory(LPWSTR lpszDir)
{
SHFILEOPSTRUCT fileop;
DWORD len = wcslen(lpszDir);
WCHAR *pszFrom = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR));
WCHAR *pszFrom = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR));
int ret;
wcscpy(pszFrom, lpszDir);
@ -80,26 +82,26 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
STARTUPINFO startupInfo;
UNREFERENCED_PARAMETER(hPrevInstance);
UNREFERENCED_PARAMETER(nCmdShow);
GetCurrentDirectory(MAX_PATH, szSetupPath);
wcscat(szSetupPath, L"\\");
wcscpy(szFileName, szSetupPath);
wcscat(szFileName, L"setup.lst");
if (GetFileAttributes(szFileName) == INVALID_FILE_ATTRIBUTES)
{
MessageBoxW(0, L"Cannot find Setup.lst file", L"Error", MB_OK | MB_ICONERROR);
return 1;
}
/* read information from setup.lst */
GetPrivateProfileStringW(NT_PARAMS, L"CabinetFile", NULL, szCabFileName, MAX_PATH, szFileName);
GetPrivateProfileStringW(NT_PARAMS, L"TmpDirName", NULL, szTempDirName, 50, szFileName);
GetPrivateProfileStringW(NT_PARAMS, L"CmdLine", NULL, szCmdLine, MAX_PATH, szFileName);
wcscpy(szCabFilePath, szSetupPath);
wcscat(szCabFilePath, szCabFileName);
/* ceate temp directory */
GetSystemDrive(szDrive);
wcscpy(szTempPath, szDrive);
@ -107,16 +109,16 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
wcscpy(szFullTempPath, szTempPath);
wcscat(szFullTempPath, szTempDirName);
wcscat(szFullTempPath, L"\\");
if (SHCreateDirectoryEx(0, szFullTempPath, NULL) != ERROR_SUCCESS)
{
MessageBoxW(0, L"Could not create Temp Directory.", L"Error", MB_OK | MB_ICONERROR);
return 1;
}
}
dwAttrib = GetFileAttributes(szTempPath);
SetFileAttributes(szTempPath, dwAttrib | FILE_ATTRIBUTE_HIDDEN);
/* extract files */
if (!SetupIterateCabinetW(szCabFilePath, 0, ExtCabCallback, szFullTempPath))
{
@ -124,12 +126,12 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
DeleteDirectory(szTempPath);
return 1;
}
/* prepare command line */
wsprintf(szTempCmdLine, szCmdLine, szFullTempPath, lpCmdLine);
wcscpy(szCmdLine, szFullTempPath);
wcscat(szCmdLine, szTempCmdLine);
/* execute the 32-Bit installer */
ZeroMemory(&processInfo, sizeof(processInfo));
ZeroMemory(&startupInfo, sizeof(startupInfo));
@ -148,10 +150,10 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
DeleteDirectory(szTempPath);
return 1;
}
/* cleanup */
DeleteDirectory(szTempPath);
return 0;
}

2
reactos/base/shell/explorer/shell/shellfs.cpp
View file

@ -40,7 +40,7 @@ bool ShellDirectory::fill_w32fdata_shell(LPCITEMIDLIST pidl, SFGAOF attribs, WIN
IDataObject* pDataObj;
STGMEDIUM medium = {0, {0}, 0};
FORMATETC fmt = {g_Globals._cfStrFName, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
FORMATETC fmt = {(USHORT)g_Globals._cfStrFName, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
HRESULT hr = _folder->GetUIObjectOf(0, 1, &pidl, IID_IDataObject, 0, (LPVOID*)&pDataObj);

4
reactos/base/shell/explorer/taskbar/quicklaunch.cpp
View file

@ -184,7 +184,7 @@ void QuickLaunchBar::AddButton(int id, HBITMAP hbmp, LPCTSTR name, Entry* entry,
_entries[id] = qle;
TBBUTTON btn = {0, 0, flags, BTNS_BUTTON|BTNS_NOPREFIX, {0, 0}, 0, 0};
TBBUTTON btn = {0, 0, (BYTE)flags, BTNS_BUTTON|BTNS_NOPREFIX, {0, 0}, 0, 0};
btn.idCommand = id;
btn.iBitmap = bmp_idx;
@ -195,7 +195,7 @@ void QuickLaunchBar::AddButton(int id, HBITMAP hbmp, LPCTSTR name, Entry* entry,
void QuickLaunchBar::UpdateDesktopButtons(int desktop_idx)
{
for(int i=0; i<DESKTOP_COUNT; ++i) {
TBBUTTONINFO tbi = {sizeof(TBBUTTONINFO), TBIF_STATE, 0, 0, desktop_idx==i? TBSTATE_ENABLED|TBSTATE_PRESSED: TBSTATE_ENABLED};
TBBUTTONINFO tbi = {sizeof(TBBUTTONINFO), TBIF_STATE, 0, 0, (BYTE)(desktop_idx==i? TBSTATE_ENABLED|TBSTATE_PRESSED: TBSTATE_ENABLED)};
SendMessage(_hwnd, TB_SETBUTTONINFO, ID_SWITCH_DESKTOP_1+i, (LPARAM)&tbi);
}

1
reactos/dll/3rdparty/libtiff/CMakeLists.txt vendored
View file

@ -61,4 +61,5 @@ add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all)
if(NOT MSVC)
allow_warnings(libtiff)
add_target_compile_flags(libtiff "-Wno-unused-but-set-variable")
endif()

2
reactos/dll/cpl/desk/screensaver.c
View file

@ -504,6 +504,8 @@ SetScreenSaver(HWND hwndDlg, PDATA pData)
HKEY regKey;
BOOL DeleteMode = FALSE;
DBG_UNREFERENCED_LOCAL_VARIABLE(DeleteMode);
if (RegOpenKeyEx(HKEY_CURRENT_USER,
_T("Control Panel\\Desktop"),
0,

6
reactos/dll/win32/advapi32/misc/shutdown.c
View file

@ -117,6 +117,8 @@ InitiateSystemShutdownExW(LPWSTR lpMachineName,
NTSTATUS Status;
ULONG Timeout_ms;
DBG_UNREFERENCED_LOCAL_VARIABLE(Timeout_ms);
/* Convert to milliseconds so we can use the value later on */
Timeout_ms = dwTimeout * 1000;
@ -217,7 +219,7 @@ InitiateSystemShutdownExA(LPSTR lpMachineName,
/******************************************************************************
* InitiateShutdownW [ADVAPI32.@]
*
*
* @unimplamented
*/
DWORD WINAPI
@ -233,7 +235,7 @@ InitiateShutdownW(LPWSTR lpMachineName,
/******************************************************************************
* InitiateShutdownA [ADVAPI32.@]
*
*
* see InitiateShutdownW
*/
DWORD WINAPI

6
reactos/dll/win32/mciwave/mciwave.c
View file

@ -535,7 +535,7 @@ static LRESULT WAVE_mciOpen(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_P
wmw->nUseCount++;
wmw->wInput = wmw->wOutput = WAVE_MAPPER;
wmw->wInput = wmw->wOutput = (WORD)WAVE_MAPPER;
wmw->fInput = FALSE;
wmw->hWave = 0;
wmw->dwStatus = MCI_MODE_NOT_READY;
@ -1371,13 +1371,13 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_SET_PARMS
TRACE("MCI_WAVE_SET_ANYINPUT\n");
if (wmw->wInput != (WORD)lpParms->wInput)
WAVE_mciStop(wDevID, MCI_WAIT, NULL);
wmw->wInput = WAVE_MAPPER;
wmw->wInput = (WORD)WAVE_MAPPER;
}
if (dwFlags & MCI_WAVE_SET_ANYOUTPUT) {
TRACE("MCI_WAVE_SET_ANYOUTPUT\n");
if (wmw->wOutput != (WORD)lpParms->wOutput)
WAVE_mciStop(wDevID, MCI_WAIT, NULL);
wmw->wOutput = WAVE_MAPPER;
wmw->wOutput = (WORD)WAVE_MAPPER;
}
/* Set wave format parameters is refused after Open or Record.*/
if (dwFlags & MCI_WAVE_SET_FORMATTAG) {

4
reactos/dll/win32/samsrv/samrpc.c
View file

@ -8062,6 +8062,10 @@ SamrChangePasswordUser(IN SAMPR_HANDLE UserHandle,
LARGE_INTEGER SystemTime;
NTSTATUS Status;
DBG_UNREFERENCED_LOCAL_VARIABLE(StoredLmPresent);
DBG_UNREFERENCED_LOCAL_VARIABLE(StoredNtPresent);
DBG_UNREFERENCED_LOCAL_VARIABLE(StoredLmEmpty);
TRACE("(%p %u %p %p %u %p %p %u %p %u %p)\n",
UserHandle, LmPresent, OldLmEncryptedWithNewLm, NewLmEncryptedWithOldLm,
NtPresent, OldNtEncryptedWithNewNt, NewNtEncryptedWithOldNt, NtCrossEncryptionPresent,

5
reactos/dll/win32/shell32/desktop.cpp
View file

@ -261,8 +261,8 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::TranslateAcceleratorSB(LPMSG lpmsg, W
HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags)
{
/*
* We should use IShellWindows interface here in order to attempt to
/*
* We should use IShellWindows interface here in order to attempt to
* find an open shell window that shows the requested pidl and activate it
*/
@ -422,6 +422,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN);
/* FIXME: Update work area */
DBG_UNREFERENCED_LOCAL_VARIABLE(rcDesktop);
}
break;

12
reactos/dll/win32/shell32/shlexec.cpp
View file

@ -460,7 +460,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
startup.wShowWindow = psei->nShow;
dwCreationFlags = CREATE_UNICODE_ENVIRONMENT;
if (!(psei->fMask & SEE_MASK_NO_CONSOLE))
dwCreationFlags |= CREATE_NEW_CONSOLE;
dwCreationFlags |= CREATE_NEW_CONSOLE;
startup.lpTitle = (LPWSTR)(psei->fMask & (SEE_MASK_HASLINKNAME | SEE_MASK_HASTITLE) ? psei->lpClass : NULL);
if (psei->fMask & SEE_MASK_HASLINKNAME)
@ -733,7 +733,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb,
lpFile = xlpFile;
/* The file was found in one of the directories in the system-wide search path */
}
attribs = GetFileAttributesW(lpFile);
if (attribs != INVALID_FILE_ATTRIBUTES && (attribs & FILE_ATTRIBUTE_DIRECTORY))
{
@ -994,7 +994,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
assert(ptr);
*ptr = 0;
}
static const WCHAR wTopic[] = L"\\topic";
if (strlenW(wTopic) + 1 > endkeyLen)
{
@ -1491,7 +1491,7 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN
DWORD resultLen;
BOOL done;
UINT_PTR rslt;
/* FIXME: remove following block when SHELL_quote_and_execute supports hkeyClass parameter */
if (cmask != SEE_MASK_CLASSNAME)
{
@ -1522,7 +1522,7 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN
ERR("Argify buffer not large enough... truncating\n");
return execfunc(wcmd, NULL, FALSE, psei, psei_out);
}
strcpyW(classname, psei->lpClass);
rslt = SHELL_FindExecutableByVerb(psei->lpVerb, NULL, classname, execCmd, sizeof(execCmd));
@ -1835,6 +1835,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc)
Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC;
//if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK)
DBG_UNREFERENCED_LOCAL_VARIABLE(Info);
do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName);
}
HeapFree(GetProcessHeap(), 0, wszApplicationName);
@ -2070,6 +2071,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc)
Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC;
//if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK)
DBG_UNREFERENCED_LOCAL_VARIABLE(Info);
do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName);
}

4
reactos/dll/win32/winmm/CMakeLists.txt
View file

@ -28,3 +28,7 @@ add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)
add_pch(winmm winemm.h SOURCE)
add_subdirectory(midimap)
add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all)
if(NOT MSVC)
add_target_compile_flags(winmm "-Wno-unused-but-set-variable")
endif()

4
reactos/lib/3rdparty/libmpg123/CMakeLists.txt vendored
View file

@ -44,3 +44,7 @@ list(APPEND SOURCE
add_library(libmpg123 ${SOURCE})
add_dependencies(libmpg123 psdk)
add_pch(libmpg123 precomp.h SOURCE)
if(NOT MSVC)
add_target_compile_flags(libmpg123 "-Wno-unused-but-set-variable")
endif()