ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comdlg32: Use a helper to detect the need for win16 looks.

This commit is contained in:
Michael Stefaniuc 2012-07-27 14:13:15 +02:00 committed by Alexandre Julliard
parent 442b34415a
commit bdaf2e9881
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/comdlg32/filedlg.c
View File

@ -4207,6 +4207,12 @@ static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* address of structure with d
return bRet; return bRet;
} }
static inline BOOL is_win16_looks(DWORD flags)
{
return (flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE) &&
!(flags & OFN_EXPLORER));
}
/* ------------------ APIs ---------------------- */ /* ------------------ APIs ---------------------- */
/*********************************************************************** /***********************************************************************
@ -4222,18 +4228,13 @@ static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* address of structure with d
BOOL WINAPI GetOpenFileNameA( BOOL WINAPI GetOpenFileNameA(
LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
{ {
BOOL win16look = FALSE;
TRACE("flags %08x\n", ofn->Flags); TRACE("flags %08x\n", ofn->Flags);
/* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */
if (ofn->Flags & OFN_FILEMUSTEXIST) if (ofn->Flags & OFN_FILEMUSTEXIST)
ofn->Flags |= OFN_PATHMUSTEXIST; ofn->Flags |= OFN_PATHMUSTEXIST;
if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) if (is_win16_looks(ofn->Flags))
win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE;
if (win16look)
return GetFileName31A(ofn, OPEN_DIALOG); return GetFileName31A(ofn, OPEN_DIALOG);
else else
return GetFileDialog95A(ofn, OPEN_DIALOG); return GetFileDialog95A(ofn, OPEN_DIALOG);
@ -4252,18 +4253,13 @@ BOOL WINAPI GetOpenFileNameA(
BOOL WINAPI GetOpenFileNameW( BOOL WINAPI GetOpenFileNameW(
LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
{ {
BOOL win16look = FALSE;
TRACE("flags %08x\n", ofn->Flags); TRACE("flags %08x\n", ofn->Flags);
/* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */
if (ofn->Flags & OFN_FILEMUSTEXIST) if (ofn->Flags & OFN_FILEMUSTEXIST)
ofn->Flags |= OFN_PATHMUSTEXIST; ofn->Flags |= OFN_PATHMUSTEXIST;
if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) if (is_win16_looks(ofn->Flags))
win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE;
if (win16look)
return GetFileName31W(ofn, OPEN_DIALOG); return GetFileName31W(ofn, OPEN_DIALOG);
else else
return GetFileDialog95W(ofn, OPEN_DIALOG); return GetFileDialog95W(ofn, OPEN_DIALOG);
@ -4283,12 +4279,7 @@ BOOL WINAPI GetOpenFileNameW(
BOOL WINAPI GetSaveFileNameA( BOOL WINAPI GetSaveFileNameA(
LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
{ {
BOOL win16look = FALSE; if (is_win16_looks(ofn->Flags))
if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE;
if (win16look)
return GetFileName31A(ofn, SAVE_DIALOG); return GetFileName31A(ofn, SAVE_DIALOG);
else else
return GetFileDialog95A(ofn, SAVE_DIALOG); return GetFileDialog95A(ofn, SAVE_DIALOG);
@ -4307,12 +4298,7 @@ BOOL WINAPI GetSaveFileNameA(
BOOL WINAPI GetSaveFileNameW( BOOL WINAPI GetSaveFileNameW(
LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
{ {
BOOL win16look = FALSE; if (is_win16_looks(ofn->Flags))
if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE;
if (win16look)
return GetFileName31W(ofn, SAVE_DIALOG); return GetFileName31W(ofn, SAVE_DIALOG);
else else
return GetFileDialog95W(ofn, SAVE_DIALOG); return GetFileDialog95W(ofn, SAVE_DIALOG);