make DesktopWinProc static; DesktopMain -> __kernel_desktop_main

This commit is contained in:
Vincent Wei
2020-01-13 18:27:28 +08:00
parent 9c392a3229
commit aec634797b
5 changed files with 10 additions and 9 deletions

View File

@@ -492,8 +492,6 @@ extern PTRACKMENUINFO __mg_ptmi;
extern PMAINWIN __mg_dsk_win;
extern HWND __mg_hwnd_desktop;
extern LRESULT DesktopWinProc (HWND hWnd,
UINT message, WPARAM wParam, LPARAM lParam);
extern LRESULT SendSyncMessage (HWND hWnd,
UINT msg, WPARAM wParam, LPARAM lParam);

View File

@@ -66,6 +66,8 @@ int kernel_change_z_order_mask_rect (HWND pWin, const RECT4MASK* rc, int nr_rc)
get_znode_flags_from_style ((PMAINWIN)pWin), rc, nr_rc);
}
static LRESULT DesktopWinProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
static void init_desktop_win (void)
{
static MAINWIN sg_desktop_win;
@@ -2005,7 +2007,7 @@ void GUIAPI DesktopUpdateAllWindow(void)
# define HAS_NO_MAINWINDOW() ((__mg_zorder_info->nr_normals + __mg_zorder_info->nr_topmosts) == 1)
#endif
LRESULT DesktopWinProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
static LRESULT DesktopWinProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
static HDC hDesktopDC;
int flags, x, y;

View File

@@ -215,6 +215,7 @@ static void TerminateSharedSysRes (void)
return;
}
static LRESULT DesktopWinProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
static void init_desktop_win (void)
{
static MAINWIN desktop_win;
@@ -3534,7 +3535,7 @@ static int srvSesseionMessageHandler (int message, WPARAM wParam, LPARAM lParam)
return 0;
}
LRESULT DesktopWinProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
static LRESULT DesktopWinProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
int flags, x, y;

View File

@@ -138,7 +138,7 @@ BOOL mg_InitDesktop (void)
return TRUE;
}
void* DesktopMain (void* data)
void* __kernel_desktop_main (void* data)
{
MSG Msg;
@@ -191,7 +191,7 @@ void* DesktopMain (void* data)
#endif
}
/* printf("Quit from DesktopMain()\n"); */
/* printf("Quit from __kernel_desktop_main()\n"); */
__mg_quiting_stage = _MG_QUITING_STAGE_EVENT;

View File

@@ -87,7 +87,7 @@ int __mg_quiting_stage;
int __mg_enter_terminategui;
/******************************* extern data *********************************/
extern void* DesktopMain (void* data);
extern void* __kernel_desktop_main (void* data);
/************************* Entry of the thread of parsor *********************/
static void ParseEvent (PLWEVENT lwe)
@@ -341,11 +341,11 @@ static BOOL SystemThreads(void)
pthread_attr_t new_attr;
pthread_attr_init (&new_attr);
pthread_attr_setstacksize (&new_attr, 16 * 1024);
pthread_create (&__mg_desktop, &new_attr, DesktopMain, &wait);
pthread_create (&__mg_desktop, &new_attr, __kernel_desktop_main, &wait);
pthread_attr_destroy (&new_attr);
}
#else
pthread_create (&__mg_desktop, NULL, DesktopMain, &wait);
pthread_create (&__mg_desktop, NULL, __kernel_desktop_main, &wait);
#endif
sem_wait (&wait);