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

Dialog window should not be destroyed in DefDlgProc; this break 

modeless dialogs.
This commit is contained in:
Alexandre Julliard 1999-01-31 15:02:23 +00:00
parent 57f96abee0
commit cb8ef7d2bb
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dialog.h
View File

@ -38,7 +38,6 @@ typedef struct
#pragma pack(4) #pragma pack(4)
#define DF_END 0x0001 #define DF_END 0x0001
#define DF_ENDING 0x0002
extern BOOL32 DIALOG_Init(void); extern BOOL32 DIALOG_Init(void);
extern HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate, extern HWND32 DIALOG_CreateIndirect( HINSTANCE32 hInst, LPCSTR dlgTemplate,

18
windows/defdlg.c
View File

@ -266,12 +266,6 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
/* 16 bit dlg procs only return BOOL16 */ /* 16 bit dlg procs only return BOOL16 */
if( WINPROC_GetProcType( dlgInfo->dlgProc ) == WIN_PROC_16 ) if( WINPROC_GetProcType( dlgInfo->dlgProc ) == WIN_PROC_16 )
result = LOWORD(result); result = LOWORD(result);
/* Check if window was destroyed by dialog procedure */
if (dlgInfo->flags & DF_END && !(dlgInfo->flags & DF_ENDING)) {
dlgInfo->flags |= DF_ENDING;
DestroyWindow32( hwnd );
}
} }
if (!result && IsWindow32(hwnd)) if (!result && IsWindow32(hwnd))
@ -329,12 +323,6 @@ LRESULT WINAPI DefDlgProc32A( HWND32 hwnd, UINT32 msg,
/* 16 bit dlg procs only return BOOL16 */ /* 16 bit dlg procs only return BOOL16 */
if( WINPROC_GetProcType( dlgInfo->dlgProc ) == WIN_PROC_16 ) if( WINPROC_GetProcType( dlgInfo->dlgProc ) == WIN_PROC_16 )
result = LOWORD(result); result = LOWORD(result);
/* Check if window was destroyed by dialog procedure */
if (dlgInfo->flags & DF_END && !(dlgInfo->flags & DF_ENDING)) {
dlgInfo->flags |= DF_ENDING;
DestroyWindow32( hwnd );
}
} }
if (!result && IsWindow32(hwnd)) if (!result && IsWindow32(hwnd))
@ -392,12 +380,6 @@ LRESULT WINAPI DefDlgProc32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
/* 16 bit dlg procs only return BOOL16 */ /* 16 bit dlg procs only return BOOL16 */
if( WINPROC_GetProcType( dlgInfo->dlgProc ) == WIN_PROC_16 ) if( WINPROC_GetProcType( dlgInfo->dlgProc ) == WIN_PROC_16 )
result = LOWORD(result); result = LOWORD(result);
/* Check if window was destroyed by dialog procedure */
if (dlgInfo->flags & DF_END && !(dlgInfo->flags & DF_ENDING)) {
dlgInfo->flags |= DF_ENDING;
DestroyWindow32( hwnd );
}
} }
if (!result && IsWindow32(hwnd)) if (!result && IsWindow32(hwnd))

1
windows/dialog.c
View File

@ -869,7 +869,6 @@ INT32 DIALOG_DoDialogBox( HWND32 hwnd, HWND32 owner )
} }
retval = dlgInfo->idResult; retval = dlgInfo->idResult;
EnableWindow32( owner, TRUE ); EnableWindow32( owner, TRUE );
dlgInfo->flags |= DF_ENDING; /* try to stop it being destroyed twice */
DestroyWindow32( hwnd ); DestroyWindow32( hwnd );
return retval; return retval;
} }