Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 11:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMDLG32] Sync with Wine Staging 1.9.11. CORE-11368

Browse source 
svn path=/trunk/; revision=71542
This commit is contained in:
Amine Khaldi 2016-06-05 18:59:07 +00:00
parent 1cb9628323
commit ca71fe522a
3 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
reactos/dll/win32/comdlg32/filedlg.c
View file

@ -434,6 +434,13 @@ static BOOL GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
ret = FALSE;
}
/* set the lpstrFileTitle */
if (ret && ofn->lpstrFile && ofn->lpstrFileTitle)
{
LPSTR lpstrFileTitle = PathFindFileNameA(ofn->lpstrFile);
lstrcpynA(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle);
}
if (lpstrSavDir)
{
SetCurrentDirectoryA(lpstrSavDir);
@ -526,6 +533,13 @@ static BOOL GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType)
ret = FALSE;
}
/* set the lpstrFileTitle */
if (ret && ofn->lpstrFile && ofn->lpstrFileTitle)
{
LPWSTR lpstrFileTitle = PathFindFileNameW(ofn->lpstrFile);
lstrcpynW(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle);
}
if (lpstrSavDir)
{
SetCurrentDirectoryW(lpstrSavDir);
@ -2706,23 +2720,6 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - tempFileA) + 1 : 0;
}
/* set the lpstrFileTitle */
if(fodInfos->ofnInfos->lpstrFileTitle)
{
LPWSTR lpstrFileTitle = PathFindFileNameW(lpstrPathAndFile);
if(fodInfos->unicode)
{
LPOPENFILENAMEW ofn = fodInfos->ofnInfos;
lstrcpynW(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle);
}
else
{
LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos;
WideCharToMultiByte(CP_ACP, 0, lpstrFileTitle, -1,
ofn->lpstrFileTitle, ofn->nMaxFileTitle, NULL, NULL);
}
}
/* copy currently selected filter to lpstrCustomFilter */
if (fodInfos->ofnInfos->lpstrCustomFilter)
{

4
reactos/dll/win32/comdlg32/fontdlg.c
View file

@ -1156,9 +1156,7 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE
MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2);
hdc = BeginPaint( hDlg, &ps );
TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n", ps.fErase,
ps.rcPaint.left, ps.rcPaint.top,
ps.rcPaint.right, ps.rcPaint.bottom);
TRACE("erase %d, rect=%s\n", ps.fErase, wine_dbgstr_rect(&ps.rcPaint));
/* Paint frame */
DrawEdge( hdc, &info.rcWindow, EDGE_SUNKEN, BF_RECT|BF_ADJUST );

2
reactos/media/doc/README.WINE
View file

@ -55,7 +55,7 @@ reactos/dll/win32/cabinet # Synced to WineStaging-1.9.4
reactos/dll/win32/clusapi # Synced to WineStaging-1.9.4
reactos/dll/win32/comcat # Synced to WineStaging-1.9.4
reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.11
reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.4
reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11
reactos/dll/win32/compstui # Synced to WineStaging-1.9.4
reactos/dll/win32/credui # Synced to WineStaging-1.9.4
reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.4