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

[SHELL32][UNDOCSHELL]

Browse source 
- Whitespaces fixes (tabs -> spaces);
- Code formatting.

svn path=/trunk/; revision=71798
This commit is contained in:
Hermès Bélusca-Maïto 2016-07-03 18:05:27 +00:00
parent 61e26d8796
commit 6ed6175bfe
2 changed files with 193 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reactos/dll/win32/shell32/dialogs/dialogs.cpp
View file

@ -221,7 +221,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg,
} }
BOOL WINAPI PickIconDlg( BOOL WINAPI PickIconDlg(
HWND hwndOwner, HWND hWndOwner,
LPWSTR lpstrFile, LPWSTR lpstrFile,
UINT nMaxFile, UINT nMaxFile,
INT* lpdwIconIndex) INT* lpdwIconIndex)
@ -235,7 +235,7 @@ BOOL WINAPI PickIconDlg(
IconContext.Index = *lpdwIconIndex; IconContext.Index = *lpdwIconIndex;
StringCchCopyNW(IconContext.szName, _countof(IconContext.szName), lpstrFile, nMaxFile); StringCchCopyNW(IconContext.szName, _countof(IconContext.szName), lpstrFile, nMaxFile);
res = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_PICK_ICON), hwndOwner, PickIconProc, (LPARAM)&IconContext); res = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_PICK_ICON), hWndOwner, PickIconProc, (LPARAM)&IconContext);
if (res) if (res)
{ {
StringCchCopyNW(lpstrFile, nMaxFile, IconContext.szName, _countof(IconContext.szName)); StringCchCopyNW(lpstrFile, nMaxFile, IconContext.szName, _countof(IconContext.szName));
@ -252,7 +252,7 @@ BOOL WINAPI PickIconDlg(
* The Unicode function that is available as ordinal 61 on Windows NT/2000/XP/... * The Unicode function that is available as ordinal 61 on Windows NT/2000/XP/...
*/ */
void WINAPI RunFileDlg( void WINAPI RunFileDlg(
HWND hwndOwner, HWND hWndOwner,
HICON hIcon, HICON hIcon,
LPCWSTR lpstrDirectory, LPCWSTR lpstrDirectory,
LPCWSTR lpstrTitle, LPCWSTR lpstrTitle,
@ -262,14 +262,14 @@ void WINAPI RunFileDlg(
TRACE("\n"); TRACE("\n");
RUNFILEDLGPARAMS rfdp; RUNFILEDLGPARAMS rfdp;
rfdp.hwndOwner = hwndOwner; rfdp.hwndOwner = hWndOwner;
rfdp.hIcon = hIcon; rfdp.hIcon = hIcon;
rfdp.lpstrDirectory = lpstrDirectory; rfdp.lpstrDirectory = lpstrDirectory;
rfdp.lpstrTitle = lpstrTitle; rfdp.lpstrTitle = lpstrTitle;
rfdp.lpstrDescription = lpstrDescription; rfdp.lpstrDescription = lpstrDescription;
rfdp.uFlags = uFlags; rfdp.uFlags = uFlags;
DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_RUN), hwndOwner, RunDlgProc, (LPARAM)&rfdp); DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_RUN), hWndOwner, RunDlgProc, (LPARAM)&rfdp);
} }
@ -456,7 +456,6 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA
{ {
HMODULE hComdlg = NULL; HMODULE hComdlg = NULL;
LPFNOFN ofnProc = NULL; LPFNOFN ofnProc = NULL;
static const WCHAR comdlg32W[] = L"comdlg32";
WCHAR szFName[1024] = {0}; WCHAR szFName[1024] = {0};
WCHAR filter[MAX_PATH], szCaption[MAX_PATH]; WCHAR filter[MAX_PATH], szCaption[MAX_PATH];
OPENFILENAMEW ofn; OPENFILENAMEW ofn;
@ -474,7 +473,7 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA
ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
ofn.lpstrInitialDir = prfdp->lpstrDirectory; ofn.lpstrInitialDir = prfdp->lpstrDirectory;
if (NULL == (hComdlg = LoadLibraryExW(comdlg32W, NULL, 0)) || if (NULL == (hComdlg = LoadLibraryExW(L"comdlg32", NULL, 0)) ||
NULL == (ofnProc = (LPFNOFN)GetProcAddress(hComdlg, "GetOpenFileNameW"))) NULL == (ofnProc = (LPFNOFN)GetProcAddress(hComdlg, "GetOpenFileNameW")))
{ {
ERR("Couldn't get GetOpenFileName function entry (lib=%p, proc=%p)\n", hComdlg, ofnProc); ERR("Couldn't get GetOpenFileName function entry (lib=%p, proc=%p)\n", hComdlg, ofnProc);

21
reactos/sdk/include/reactos/undocshell.h
View file

@ -116,15 +116,15 @@ typedef struct
#define RF_RETRY 0x02 #define RF_RETRY 0x02
void WINAPI RunFileDlg( void WINAPI RunFileDlg(
HWND hwndOwner, HWND hWndOwner,
HICON hIcon, HICON hIcon,
LPCWSTR lpstrDirectory, LPCWSTR lpstrDirectory,
LPCWSTR lpstrTitle, LPCWSTR lpstrTitle,
LPCWSTR lpstrDescription, LPCWSTR lpstrDescription,
UINT uFlags); UINT uFlags);
int WINAPI LogoffWindowsDialog(HWND hwndOwner); int WINAPI LogoffWindowsDialog(HWND hWndOwner);
void WINAPI ExitWindowsDialog(HWND hwndOwner); void WINAPI ExitWindowsDialog(HWND hWndOwner);
BOOL WINAPI SHFindComputer( BOOL WINAPI SHFindComputer(
LPCITEMIDLIST pidlRoot, LPCITEMIDLIST pidlRoot,
@ -431,6 +431,21 @@ BOOL WINAPI PathIsSameRootAW(LPCVOID lpszPath1, LPCVOID lpszPath2);
BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs);
/****************************************************************************
* Shell File Operations error codes
*/
/* Error codes could be pre-Win32 */
#define DE_SAMEFILE 0x71
#define DE_MANYSRC1DEST 0x72
#define DE_DIFFDIR 0x73
#define DE_OPCANCELLED 0x75
#define DE_DESTSUBTREE 0x76
#define DE_INVALIDFILES 0x7C
#define DE_DESTSAMETREE 0x7D
#define DE_FLDDESTISFILE 0x7E
#define DE_FILEDESTISFLD 0x80
/**************************************************************************** /****************************************************************************
* Shell Namespace Routines * Shell Namespace Routines
*/ */