diff --git a/cleanup-code.sh b/cleanup-code.sh index 514b3d10..9d5b6151 100755 --- a/cleanup-code.sh +++ b/cleanup-code.sh @@ -8,9 +8,12 @@ tab2space() { sed -i 's/\s\+$//g' `find . -name '*.h'` } +# tab2space + # templates # sed -i 's/\/__AAA/g' `grep AAA -rl include/ src/` # sed -i 's/\/__mgAAA/g' `grep AAA -rl include/ src/` +# sed -i 's/\/__gdiAAA/g' `grep AAA -rl include/ src/` # sed -i 's/\/__mg_AAA/g' `grep AAA -rl include/ src/` # sed -i 's/\/dbg_AAA/g' `grep AAA -rl include/ src/` @@ -49,6 +52,44 @@ tab2space() { # sed -i 's/\/__sysres_init_inner_resource/g' `grep sysres_init_inner_resource -rl include/ src/` # sed -i 's/\/__sysres_get_system_res_path/g' `grep sysres_get_system_res_path -rl include/ src/` -tab2space +# sed -i 's/\<_set_pixel_helper\>/_gdi_set_pixel_helper/g' `grep _set_pixel_helper -rl src/` + +# sed -i 's/\/__mg_err_dump/g' `grep err_dump -rl src/` +# sed -i 's/\/__mg_err_msg/g' `grep err_msg -rl src/` +# sed -i 's/\/__mg_err_quit/g' `grep err_quit -rl src/` +# sed -i 's/\/__mg_err_ret/g' `grep err_ret -rl src/` +# sed -i 's/\/__mg_err_sys/g' `grep err_sys -rl src/` +# sed -i 's/\/__mg_dispatch_timer_message/g' `grep mg_dispatch_timer_message -rl src/` +# sed -i 's/\/mg_DeleteObject/g' `grep mgDeleteObject -rl src/` + +# sed -i 's/\/__mg_init_arabic_kbd_layout/g' `grep init_arabic_kbd_layout -rl src/` +# sed -i 's/\/__mg_init_default_kbd_layout/g' `grep init_default_kbd_layout -rl src/` +# sed -i 's/\/__mg_init_de_kbd_layout/g' `grep init_de_kbd_layout -rl src/` +# sed -i 's/\/__mg_init_delatin1_kbd_layout/g' `grep init_delatin1_kbd_layout -rl src/` +# sed -i 's/\/__mg_init_escp850_kbd_layout/g' `grep init_escp850_kbd_layout -rl src/` +# sed -i 's/\/__mg_init_es_kbd_layout/g' `grep init_es_kbd_layout -rl src/` +# sed -i 's/\/__mg_init_fr_kbd_layout/g' `grep init_fr_kbd_layout -rl src/` +# sed -i 's/\/__mg_init_frpc_kbd_layout/g' `grep init_frpc_kbd_layout -rl src/` +# sed -i 's/\/__mg_init_it_kbd_layout/g' `grep init_it_kbd_layout -rl src/` +# sed -i 's/\/__mg_init_hebrew_kbd_layout/g' `grep init_hebrew_kbd_layout -rl src/` + +# sed -i 's/\/ial_InitAutoInput/g' `grep InitAutoInput -rl src/` +# sed -i 's/\/ial_InitDummyInput/g' `grep InitDummyInput -rl src/` +# sed -i 's/\/ial_InitLibInput/g' `grep InitLibInput -rl src/` +# sed -i 's/\/ial_InitNetInput/g' `grep InitNetInput -rl src/` +# sed -i 's/\/ial_InitPCXVFBInput/g' `grep InitPCXVFBInput -rl src/` +# sed -i 's/\/ial_InitRandomInput/g' `grep InitRandomInput -rl src/` + +# sed -i 's/\/mg_InitResManager/g' `grep InitializeResManager -rl src/` +# sed -i 's/\/gdi_InitTextBitmapBuffer/g' `grep InitTextBitmapBuffer -rl src/` + +# sed -i 's/\/__mg_clipboard_op/g' `grep clipboard_op -rl src/` + +# sed -i 's/\/miFreeArcCache/g' `grep mg_miFreeArcCache -rl src/` +# sed -i 's/\/mgNewObjectEx/g' `grep mgNewObject -rl src/` +# sed -i 's/\/mgNewObject/g' `grep mg_newObject -rl src/` +# sed -i 's/\/__mg_remove_timers_by_msg_queue/g' `grep mg_remove_timers_by_msg_queue -rl src/` + +sed -i 's/\/mgDeleteObject/g' `grep mg_DeleteObject -rl src/` exit 0 diff --git a/src/client/client.c b/src/client/client.c index 9a940de7..27e9134d 100644 --- a/src/client/client.c +++ b/src/client/client.c @@ -413,7 +413,7 @@ BOOL client_IdleHandler4Client (PMSGQUEUE msg_que) /* it is time to check message again. */ return FALSE; } - err_sys ("client: select error"); + __mg_err_sys ("client: select error"); } else if (n == 0) { check_live (); @@ -479,7 +479,7 @@ BOOL client_IdleHandler4Client (PMSGQUEUE msg_que) if ( (nread = sock_read (conn_fd, &Msg, sizeof (MSG))) < 0) { if (OnTrylockClientReq && OnUnlockClientReq) OnUnlockClientReq(); - err_sys ("client: read error on fd %d", conn_fd); + __mg_err_sys ("client: read error on fd %d", conn_fd); } #else /* use recvmsg */ struct iovec iov[1]; @@ -498,13 +498,13 @@ BOOL client_IdleHandler4Client (PMSGQUEUE msg_que) if ((nread = sock_recvmsg (conn_fd, &msg, 0)) < 0) { if (OnTrylockClientReq && OnUnlockClientReq) OnUnlockClientReq(); - err_sys ("client: read error on fd %d", conn_fd); + __mg_err_sys ("client: read error on fd %d", conn_fd); } #endif else if (nread == 0) { if (OnTrylockClientReq && OnUnlockClientReq) OnUnlockClientReq(); - err_sys ("client: server closed"); + __mg_err_sys ("client: server closed"); close (conn_fd); } else { /* process event from server */ diff --git a/src/control/bidiedit.c b/src/control/bidiedit.c index 13b88a73..8cfd773e 100644 --- a/src/control/bidiedit.c +++ b/src/control/bidiedit.c @@ -163,7 +163,7 @@ static int get_text_achar_index (PBIDISLEDITDATA sled, int text_index) return -1; } -int get_achar_char_len(PBIDISLEDITDATA sled, int achar_index) +static inline int get_achar_char_len(PBIDISLEDITDATA sled, int achar_index) { if (achar_index<0 || achar_index > ACHARSLEN) return -1; @@ -171,8 +171,6 @@ int get_achar_char_len(PBIDISLEDITDATA sled, int achar_index) return (*(ACHARSMAP + achar_index)).char_len; } - - /* Update achar sring and achar map info */ static void update_achar_info (HWND hWnd, PBIDISLEDITDATA sled) { diff --git a/src/control/listmodel.c b/src/control/listmodel.c index 0bcc5e76..017d968c 100644 --- a/src/control/listmodel.c +++ b/src/control/listmodel.c @@ -267,7 +267,7 @@ void mglist_freeze (HWND hWnd, MgList *mglst, BOOL lock) } } -int mglstSortItems (MgList *mglst, void* pfn, int fn_type) +static int mglstSortItems (MgList *mglst, void* pfn, int fn_type) { MgItem *pci, *pci2; list_t *me, *me2; diff --git a/src/control/scrollbar.c b/src/control/scrollbar.c index 9eb93201..d4677e02 100644 --- a/src/control/scrollbar.c +++ b/src/control/scrollbar.c @@ -287,7 +287,7 @@ static int get_mouse_pos(HWND hwnd, PSCROLLBARDATA data, int x, int y) return mouse_pos; } -int track_thumb (HWND hwnd, PSCROLLBARDATA data, int x, int y) +static int track_thumb (HWND hwnd, PSCROLLBARDATA data, int x, int y) { int barStart, curPos; int thumb_move_range; diff --git a/src/control/scrollwnd.c b/src/control/scrollwnd.c index f4e2a30b..b03a35ab 100644 --- a/src/control/scrollwnd.c +++ b/src/control/scrollwnd.c @@ -89,7 +89,7 @@ scrollwnd_set_container (HWND hWnd, PSCRDATA pscrdata, BOOL visChanged) pscrdata->nContHeight, TRUE); } -int scrollwnd_add_controls (HWND hWnd, PSWDATA pswdata, +static int scrollwnd_add_controls (HWND hWnd, PSWDATA pswdata, int ctrl_nr, PCTRLDATA pCtrlData) { int i; @@ -166,7 +166,7 @@ static int svInitData (HWND hWnd, PSWDATA pswdata) * shoulded be called before scrollwnd is used * hWnd: the scrolled window */ -int scrollwnd_init (HWND hWnd, PSWDATA pswdata) +static int scrollwnd_init (HWND hWnd, PSWDATA pswdata) { if (!pswdata) return -1; @@ -188,14 +188,12 @@ int scrollwnd_init (HWND hWnd, PSWDATA pswdata) /* * destroy a scrollwnd */ -void scrollwnd_destroy (PSWDATA pswdata) +static inline void scrollwnd_destroy (PSWDATA pswdata) { DestroyWindow (pswdata->hContainer); } -/* --------------------------------------------------------------------------------- */ - -void scrollwnd_reset_content (HWND hWnd, PSWDATA pswdata) +static void scrollwnd_reset_content (HWND hWnd, PSWDATA pswdata) { /* delete all container content */ container_reset_content (pswdata->hContainer, pswdata->pContdata); diff --git a/src/control/scrollwnd.h b/src/control/scrollwnd.h index ae172bc2..04fb9ce8 100644 --- a/src/control/scrollwnd.h +++ b/src/control/scrollwnd.h @@ -91,18 +91,6 @@ typedef struct _swdata } SWDATA; typedef SWDATA *PSWDATA; -int scrollwnd_init (HWND hWnd, PSWDATA psv); -void scrollwnd_destroy (PSWDATA pswdata); -void scrollwnd_hscroll (HWND hWnd, PSWDATA pswdata, WPARAM wParam, LPARAM lParam); -void scrollwnd_vscroll (HWND hWnd, PSWDATA pswdata, WPARAM wParam, LPARAM lParam); -void scrollwnd_reset_content (HWND hWnd, PSWDATA pswdata); -int scrollwnd_SetContWidth (HWND hWnd, PSWDATA pswdata, int cont_w); -void scrollwnd_set_cont_pos (HWND hWnd, PSWDATA pswdata, int cont_x, int cont_y); -void scrollwnd_make_pos_visible (HWND hWnd, PSWDATA pswdata, int pos_x, int pos_y); -void scrollwnd_refresh_container (HWND hWnd, PSWDATA pswdata); -void scrollwnd_set_scrollval (PSWDATA pswdata, int hval, int vval); -void scrollwnd_set_scrollpageval (PSWDATA pswdata, int hval, int vval); - static inline int scrollwnd_get_contwidth (PSWDATA pswdata) { diff --git a/src/ex_ctrl/gridview.c b/src/ex_ctrl/gridview.c index dc8982d8..263a7d43 100644 --- a/src/ex_ctrl/gridview.c +++ b/src/ex_ctrl/gridview.c @@ -69,6 +69,13 @@ #include "scrolled.h" #include "gridview_impl.h" +static gvGridDataModal* GridDataModalArray_new_modal(int row, int col); +static void GridDataModalArray_delete_modal(gvGridDataModal* modal); + +static int gvGridCellDep_add_dep(gvGridViewData* view, gvGridCellDepedence* dep); +static int gvGridCellDep_delete_dep(gvGridViewData* view, int id); +static int gvGridCellDep_update_dep(gvGridViewData* view, GRIDCELLS* cells); + static void update_viewport (gvGridViewData *view, int from, int to, int is_row) { RECT r; @@ -112,7 +119,7 @@ static BOOL gridview_make_rect_visible(gvGridViewData* view, RECT* rect) return TRUE; } -void gridview_set_content(HWND hWnd, PSCRDATA pscrdata, BOOL visChanged) +static void gridview_set_content(HWND hWnd, PSCRDATA pscrdata, BOOL visChanged) { gvGridViewData* view = NULL; int w, h; @@ -856,7 +863,7 @@ static int gvGridCellDep_add_dep_to_list(gvGridViewData* view, gvGridCellDepeden return new_dep->id; } -int gvGridCellDep_add_dep(gvGridViewData* view, gvGridCellDepedence* dep) +static int gvGridCellDep_add_dep(gvGridViewData* view, gvGridCellDepedence* dep) { int ret; gvGridCellDepedence* head = view->depend_list; @@ -873,7 +880,7 @@ int gvGridCellDep_add_dep(gvGridViewData* view, gvGridCellDepedence* dep) return ret; } -int gvGridCellDep_delete_dep(gvGridViewData* view, int id) +static int gvGridCellDep_delete_dep(gvGridViewData* view, int id) { int ret = -1; gvGridCellDepedence *prev_dep; @@ -903,7 +910,7 @@ int gvGridCellDep_delete_dep(gvGridViewData* view, int id) return ret; } -int gvGridCellDep_update_dep(gvGridViewData* view, GRIDCELLS* cells) +static int gvGridCellDep_update_dep(gvGridViewData* view, GRIDCELLS* cells) { gvGridCellDepedence* dep = view->depend_list; while (dep) @@ -1578,7 +1585,7 @@ static int GridDataModalArray_delete_col(gvGridViewData* view, int index) return 0; } -gvGridDataModal* GridDataModalArray_new_modal(int row, int col) +static gvGridDataModal* GridDataModalArray_new_modal(int row, int col) { gvGridDataModal* modal; GridDataModalArray* array; @@ -1601,7 +1608,7 @@ gvGridDataModal* GridDataModalArray_new_modal(int row, int col) return modal; } -void GridDataModalArray_delete_modal(gvGridDataModal* modal) +static void GridDataModalArray_delete_modal(gvGridDataModal* modal) { int i; GridDataModalArray* array = (GridDataModalArray*)modal->data; diff --git a/src/ex_ctrl/gridview_impl.h b/src/ex_ctrl/gridview_impl.h index 89d56550..a100b24a 100644 --- a/src/ex_ctrl/gridview_impl.h +++ b/src/ex_ctrl/gridview_impl.h @@ -274,9 +274,6 @@ struct _gvGridDataModal }; typedef struct _gvGridDataModal gvGridDataModal; -gvGridDataModal* GridDataModalArray_new_modal(int row, int col); -void GridDataModalArray_delete_modal(gvGridDataModal* modal); - typedef struct _gvGridCellDepedence gvGridCellDepedence; struct _gvGridCellDepedence { @@ -288,10 +285,6 @@ struct _gvGridCellDepedence gvGridCellDepedence* next; }; -int gvGridCellDep_add_dep(gvGridViewData* view, gvGridCellDepedence* dep); -int gvGridCellDep_delete_dep(gvGridViewData* view, int id); -int gvGridCellDep_update_dep(gvGridViewData* view, GRIDCELLS* cells); - struct _gvGridViewData { /* scrollview object */ diff --git a/src/ex_ctrl/iconview.c b/src/ex_ctrl/iconview.c index 91574145..f80ec9d0 100644 --- a/src/ex_ctrl/iconview.c +++ b/src/ex_ctrl/iconview.c @@ -164,18 +164,19 @@ static int isInItem (MgList *mglst, int mouseX, int mouseY, return index; } -int -iconview_is_in_item (IconviewData* pivdata, +#if 0 +int iconview_is_in_item (IconviewData* pivdata, int mousex, int mousey, HITEM *phivi) { return isInItem ((MgList *)&pivdata->ivlist, mousex, mousey, (MgItem**)phivi, NULL); } +#endif /* --------------------------------------------------------------------------------- */ -HITEM iconview_add_item (HWND hWnd, IconviewData* pivdata, HITEM prehivi, - PIVITEMINFO pii, int *idx) +static HITEM iconview_add_item (HWND hWnd, IconviewData* pivdata, + HITEM prehivi, PIVITEMINFO pii, int *idx) { IconviewList* pivlist = &pivdata->ivlist; IconviewItem* pci; @@ -203,9 +204,10 @@ HITEM iconview_add_item (HWND hWnd, IconviewData* pivdata, HITEM prehivi, return (HITEM)pci; } +#if 0 //FIXME -HITEM iconview_add_item_ex (HWND hWnd, IconviewData* pivdata, HITEM prehivi, - HITEM nexthivi, PIVITEMINFO pii, int *idx) +static HITEM iconview_add_item_ex (HWND hWnd, IconviewData* pivdata, + HITEM prehivi, HITEM nexthivi, PIVITEMINFO pii, int *idx) { IconviewList* pivlist = &pivdata->ivlist; IconviewItem* pci; @@ -229,6 +231,7 @@ HITEM iconview_add_item_ex (HWND hWnd, IconviewData* pivdata, HITEM prehivi, return (HITEM)pci; } +#endif /* not used code */ int iconview_move_item (IconviewData* pivdata, HITEM hivi, HITEM prehivi) { @@ -241,8 +244,8 @@ int iconview_move_item (IconviewData* pivdata, HITEM hivi, HITEM prehivi) return 0; } -int -iconview_del_item (HWND hWnd, IconviewData* pivdata, int nItem, HITEM hivi) +static int iconview_del_item (HWND hWnd, IconviewData* pivdata, + int nItem, HITEM hivi) { IconviewList* pivlist = &pivdata->ivlist; IconviewItem* pci; @@ -317,7 +320,8 @@ iconview_get_item_rect (HWND hWnd, HITEM hivi, RECT *rcItem, BOOL bConv) return 0; } -int iconview_get_item_pos (IconviewData* pivdata, HITEM hivi, int *x, int *y) +static int iconview_get_item_pos (IconviewData* pivdata, HITEM hivi, + int *x, int *y) { int index; IconviewList *pivlist = &pivdata->ivlist; @@ -344,7 +348,7 @@ DWORD iconview_get_item_adddata (HITEM hivi) return mglist_get_item_adddata (hivi); } -void iconview_reset_content (HWND hWnd, IconviewData* pivdata) +static void iconview_reset_content (HWND hWnd, IconviewData* pivdata) { /* delete all ivlist content */ ivlist_reset_content (hivwnd, &pivdata->ivlist); @@ -416,7 +420,7 @@ static void ivDrawItem (HWND hWnd, GHANDLE hivi, HDC hdc, RECT *rcDraw) } /* adjust the position and size of the ivlist window */ -void iconview_set_ivlist (HWND hWnd, PSCRDATA pscrdata, BOOL visChanged) +static void iconview_set_ivlist (HWND hWnd, PSCRDATA pscrdata, BOOL visChanged) { IconviewData* pivdata = (IconviewData*) GetWindowAdditionalData2 (hWnd); @@ -478,7 +482,7 @@ static int ivInitData (HWND hWnd, IconviewData* pivdata) * hWnd: the scrolled window */ //FIXME, to delete -int iconview_init (HWND hWnd, IconviewData* pivdata) +static int iconview_init (HWND hWnd, IconviewData* pivdata) { if (!pivdata) return -1; @@ -500,12 +504,13 @@ int iconview_init (HWND hWnd, IconviewData* pivdata) /* * destroy a iconview */ -void iconview_destroy (IconviewData* pivdata) +static void iconview_destroy (IconviewData* pivdata) { ivlist_reset_content (hivwnd, &pivdata->ivlist); } -static LRESULT IconViewCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +static LRESULT IconViewCtrlProc (HWND hWnd, UINT message, + WPARAM wParam, LPARAM lParam) { IconviewData* pivdata = NULL; IconviewList* pivlist = NULL; diff --git a/src/ex_ctrl/iconview_impl.h b/src/ex_ctrl/iconview_impl.h index a47f53ac..c0d5e0ec 100644 --- a/src/ex_ctrl/iconview_impl.h +++ b/src/ex_ctrl/iconview_impl.h @@ -131,21 +131,21 @@ typedef struct _IconviewData #define pivscr ((PSCRDATA)pivdata) #define hivwnd (pivscr->hSV) -/* ------------------------- external api -------------------------- */ +/* ------------------------- internal funcs -------------------------- */ -int iconview_init (HWND hWnd, IconviewData* psv); -void iconview_destroy (IconviewData* pivdata); +static int iconview_init (HWND hWnd, IconviewData* psv); +static void iconview_destroy (IconviewData* pivdata); -HITEM iconview_add_item (HWND hWnd, IconviewData* pivdata, HITEM hsvi, PIVITEMINFO pii, int *idx); -HITEM iconview_add_item_ex (HWND hWnd, IconviewData* pivdata, HITEM hsvi, - HITEM nexthsvi, PIVITEMINFO pii, int *idx); -int iconview_del_item (HWND hWnd, IconviewData* pivdata, int nItem, HITEM hsvi); +static HITEM iconview_add_item (HWND hWnd, + IconviewData* pivdata, HITEM hsvi, PIVITEMINFO pii, int *idx); +static int iconview_del_item (HWND hWnd, + IconviewData* pivdata, int nItem, HITEM hsvi); -void iconview_reset_content (HWND hWnd, IconviewData* pivdata); -int iconview_is_in_item (IconviewData* pivdata, int mousex, int mousey, HITEM *phsvi); -void iconview_set_ivlist (HWND hWnd, PSCRDATA pscrdata, BOOL visChanged); +static void iconview_reset_content (HWND hWnd, IconviewData* pivdata); +static void iconview_set_ivlist (HWND hWnd, PSCRDATA pscrdata, BOOL visChanged); -int iconview_get_item_pos (IconviewData* pivdata, HITEM hsvi, int *x, int *y); +static int iconview_get_item_pos (IconviewData* pivdata, + HITEM hsvi, int *x, int *y); static inline void iconview_set_autosort (IconviewData* pivdata) { @@ -207,6 +207,13 @@ static inline HITEM iconview_get_prev_item (IconviewData* pivdata, HITEM hivi) return (HITEM)mglist_get_prev_item((MgList *)&pivdata->ivlist, (MgItem *)hivi); } +#if 0 /* VW: not used code */ +static HITEM iconview_add_item_ex (HWND hWnd, + IconviewData* pivdata, HITEM hsvi, + HITEM nexthsvi, PIVITEMINFO pii, int *idx); +static int iconview_is_in_item (IconviewData* pivdata, + int mousex, int mousey, HITEM *phsvi); +#endif /* VW: not used code */ #ifdef __cplusplus } diff --git a/src/ex_ctrl/listview.c b/src/ex_ctrl/listview.c index 7f013e34..12a483a0 100644 --- a/src/ex_ctrl/listview.c +++ b/src/ex_ctrl/listview.c @@ -1081,7 +1081,7 @@ static int lvRemoveAllItem (HWND hWnd, PLVDATA plvdata) return 0; } -void lvDelItem (HWND hWnd, HSVITEM hsvi) +static void lvDelItem (HWND hWnd, HSVITEM hsvi) { PITEMDATA pi = LV_GET_ITEM(hsvi); PLVDATA plvdata = (PLVDATA)GetWindowAdditionalData2(hWnd); diff --git a/src/gui/arabickeymap.c b/src/gui/arabickeymap.c index 673c429e..b58ae31d 100644 --- a/src/gui/arabickeymap.c +++ b/src/gui/arabickeymap.c @@ -340,7 +340,7 @@ static struct kbdiacr accent_table[MAX_DIACR] = { static unsigned int accent_table_size = 68; -void init_arabic_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_arabic_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p) { *key_maps_p = key_maps; diff --git a/src/gui/de-kmap.c b/src/gui/de-kmap.c index 26bb135c..7d9d2744 100644 --- a/src/gui/de-kmap.c +++ b/src/gui/de-kmap.c @@ -381,7 +381,7 @@ static const unsigned int accent_table_size = 68; #endif -void init_de_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_de_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p) { *key_maps_p = (ushort**)key_maps; diff --git a/src/gui/de-latin1-kmap.c b/src/gui/de-latin1-kmap.c index ccac5aad..4a861e7c 100644 --- a/src/gui/de-latin1-kmap.c +++ b/src/gui/de-latin1-kmap.c @@ -396,7 +396,7 @@ static const unsigned int accent_table_size = 68; #endif -void init_delatin1_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_delatin1_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p) { *key_maps_p = (ushort**)key_maps; diff --git a/src/gui/defkeymap.c b/src/gui/defkeymap.c index 7fb4a852..e99132b6 100644 --- a/src/gui/defkeymap.c +++ b/src/gui/defkeymap.c @@ -313,7 +313,7 @@ static const struct kbdiacr accent_table[MAX_DIACR] = { static const unsigned int accent_table_size = 68; -void init_default_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_default_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p) { *key_maps_p = (ushort**)key_maps; diff --git a/src/gui/es-cp850-kmap.c b/src/gui/es-cp850-kmap.c index 0975a999..14cea5dd 100644 --- a/src/gui/es-cp850-kmap.c +++ b/src/gui/es-cp850-kmap.c @@ -328,7 +328,7 @@ static const struct kbdiacr accent_table[MAX_DIACR] = { static const unsigned int accent_table_size = 68; -void init_escp850_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_escp850_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p) { *key_maps_p = (ushort**)key_maps; diff --git a/src/gui/es-kmap.c b/src/gui/es-kmap.c index 8c2758be..e2916527 100644 --- a/src/gui/es-kmap.c +++ b/src/gui/es-kmap.c @@ -338,7 +338,7 @@ static const unsigned int accent_table_size = 68; #endif -void init_es_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_es_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p) { *key_maps_p = (ushort**)key_maps; diff --git a/src/gui/fr-kmap.c b/src/gui/fr-kmap.c index ab008fd2..52d1941b 100644 --- a/src/gui/fr-kmap.c +++ b/src/gui/fr-kmap.c @@ -320,7 +320,7 @@ static const unsigned int accent_table_size = 68; #endif -void init_fr_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_fr_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p) { *key_maps_p = (ushort**)key_maps; diff --git a/src/gui/fr-pc-kmap.c b/src/gui/fr-pc-kmap.c index 36d28329..5e5619cb 100644 --- a/src/gui/fr-pc-kmap.c +++ b/src/gui/fr-pc-kmap.c @@ -322,7 +322,7 @@ static const unsigned int accent_table_size = 68; #endif -void init_frpc_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_frpc_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p) { *key_maps_p = (ushort**)key_maps; diff --git a/src/gui/hebrewkeymap.c b/src/gui/hebrewkeymap.c index 711bd5bc..2326fb1c 100644 --- a/src/gui/hebrewkeymap.c +++ b/src/gui/hebrewkeymap.c @@ -322,7 +322,7 @@ static const struct kbdiacr accent_table[MAX_DIACR] = { static const unsigned int accent_table_size = 68; -void init_hebrew_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_hebrew_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p) { *key_maps_p = (ushort**)key_maps; diff --git a/src/gui/it-kmap.c b/src/gui/it-kmap.c index 198462d3..9d32bb37 100644 --- a/src/gui/it-kmap.c +++ b/src/gui/it-kmap.c @@ -339,7 +339,7 @@ static const unsigned int accent_table_size = 68; #endif -void init_it_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_it_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p) { *key_maps_p = (ushort**)key_maps; diff --git a/src/gui/keyboard.c b/src/gui/keyboard.c index 23ce5fb8..471fd624 100644 --- a/src/gui/keyboard.c +++ b/src/gui/keyboard.c @@ -505,33 +505,33 @@ static void handle_scancode_on_keyup (int scancode, key_info* kinfo) kbd_layout_info __mg_layouts [] = { - {KBD_LAYOUT_DEFAULT, init_default_kbd_layout}, + {KBD_LAYOUT_DEFAULT, __mg_init_default_kbd_layout}, #ifdef _MGKBDLAYOUT_HEBREWPC - {KBD_LAYOUT_HEBREW, init_hebrew_kbd_layout}, + {KBD_LAYOUT_HEBREW, __mg_init_hebrew_kbd_layout}, #endif #ifdef _MGKBDLAYOUT_ARABICPC - {KBD_LAYOUT_ARABIC, init_arabic_kbd_layout}, + {KBD_LAYOUT_ARABIC, __mg_init_arabic_kbd_layout}, #endif #ifdef _MGKBDLAYOUT_FRPC - {KBD_LAYOUT_FRPC, init_frpc_kbd_layout}, + {KBD_LAYOUT_FRPC, __mg_init_frpc_kbd_layout}, #endif #ifdef _MGKBDLAYOUT_FR - {KBD_LAYOUT_FR, init_fr_kbd_layout}, + {KBD_LAYOUT_FR, __mg_init_fr_kbd_layout}, #endif #ifdef _MGKBDLAYOUT_DE - {KBD_LAYOUT_DE, init_de_kbd_layout}, + {KBD_LAYOUT_DE, __mg_init_de_kbd_layout}, #endif #ifdef _MGKBDLAYOUT_DELATIN1 - {KBD_LAYOUT_DELATIN1, init_delatin1_kbd_layout}, + {KBD_LAYOUT_DELATIN1, __mg_init_delatin1_kbd_layout}, #endif #ifdef _MGKBDLAYOUT_IT - {KBD_LAYOUT_IT, init_it_kbd_layout}, + {KBD_LAYOUT_IT, __mg_init_it_kbd_layout}, #endif #ifdef _MGKBDLAYOUT_ES - {KBD_LAYOUT_ES, init_es_kbd_layout}, + {KBD_LAYOUT_ES, __mg_init_es_kbd_layout}, #endif #ifdef _MGKBDLAYOUT_ESCP850 - {KBD_LAYOUT_ESCP850, init_escp850_kbd_layout} + {KBD_LAYOUT_ESCP850, __mg_init_escp850_kbd_layout} #endif }; diff --git a/src/gui/keyboard.h b/src/gui/keyboard.h index 821b0680..f9e4ba97 100644 --- a/src/gui/keyboard.h +++ b/src/gui/keyboard.h @@ -89,51 +89,51 @@ typedef struct kbd_layout_info INIT_KBD_LAYOUT init; } kbd_layout_info; -void init_default_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_default_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p); #ifdef _MGKBDLAYOUT_HEBREWPC -void init_hebrew_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_hebrew_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p); #endif #ifdef _MGKBDLAYOUT_ARABICPC -void init_arabic_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_arabic_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p); #endif #ifdef _MGKBDLAYOUT_FRPC -void init_frpc_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_frpc_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p); #endif #ifdef _MGKBDLAYOUT_FR -void init_fr_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_fr_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p); #endif #ifdef _MGKBDLAYOUT_DE -void init_de_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_de_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p); #endif #ifdef _MGKBDLAYOUT_DELATIN1 -void init_delatin1_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_delatin1_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p); #endif #ifdef _MGKBDLAYOUT_IT -void init_it_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_it_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p); #endif #ifdef _MGKBDLAYOUT_ES -void init_es_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_es_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p); #endif #ifdef _MGKBDLAYOUT_ESCP850 -void init_escp850_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, +void __mg_init_escp850_kbd_layout (ushort*** key_maps_p, struct kbdiacr** accent_table_p, unsigned int* accent_table_size_p, char*** func_table_p); #endif diff --git a/src/ial/auto.c b/src/ial/auto.c index fa222f19..adedc5c0 100644 --- a/src/ial/auto.c +++ b/src/ial/auto.c @@ -279,7 +279,7 @@ static int wait_event (int which, int maxfd, fd_set *in, fd_set *out, fd_set *ex } } -BOOL InitAutoInput (INPUT* input, const char* mdev, const char* mtype) +BOOL ial_InitAutoInput (INPUT* input, const char* mdev, const char* mtype) { input->update_mouse = mouse_update; input->get_mouse_xy = mouse_getxy; diff --git a/src/ial/auto.h b/src/ial/auto.h index 661a306e..5eb8567b 100644 --- a/src/ial/auto.h +++ b/src/ial/auto.h @@ -56,7 +56,7 @@ extern "C" { #endif /* __cplusplus */ -BOOL InitAutoInput (INPUT* input, const char* mdev, const char* mtype); +BOOL ial_InitAutoInput (INPUT* input, const char* mdev, const char* mtype); void TermAutoInput (void); #ifdef __cplusplus diff --git a/src/ial/dummy.c b/src/ial/dummy.c index 3e89723f..697f4da9 100644 --- a/src/ial/dummy.c +++ b/src/ial/dummy.c @@ -126,7 +126,7 @@ static int wait_event (int which, int maxfd, fd_set *in, fd_set *out, fd_set *ex return 0; } -BOOL InitDummyInput (INPUT* input, const char* mdev, const char* mtype) +BOOL ial_InitDummyInput (INPUT* input, const char* mdev, const char* mtype) { input->update_mouse = mouse_update; input->get_mouse_xy = mouse_getxy; diff --git a/src/ial/dummy.h b/src/ial/dummy.h index 4915008f..89760bee 100644 --- a/src/ial/dummy.h +++ b/src/ial/dummy.h @@ -56,7 +56,7 @@ extern "C" { #endif /* __cplusplus */ -BOOL InitDummyInput (INPUT* input, const char* mdev, const char* mtype); +BOOL ial_InitDummyInput (INPUT* input, const char* mdev, const char* mtype); void TermDummyInput (void); #ifdef __cplusplus diff --git a/src/ial/ial.c b/src/ial/ial.c index 594566ab..e15d60bd 100644 --- a/src/ial/ial.c +++ b/src/ial/ial.c @@ -150,13 +150,13 @@ static INPUT inputs [] = {"wvfb", InitWVFBInput, TermWVFBInput}, #endif #ifdef _MGIAL_DUMMY - {"dummy", InitDummyInput, TermDummyInput}, + {"dummy", ial_InitDummyInput, TermDummyInput}, #endif #ifdef _MGIAL_AUTO - {"auto", InitAutoInput, TermAutoInput}, + {"auto", ial_InitAutoInput, TermAutoInput}, #endif #ifdef _MGIAL_RANDOM - {"random", InitRandomInput, TermRandomInput}, + {"random", ial_InitRandomInput, TermRandomInput}, #endif #ifdef _MGIAL_CUSTOM {"custom", InitCustomInput, TermCustomInput}, @@ -168,7 +168,7 @@ static INPUT inputs [] = {"comm", InitCOMMInput, TermCOMMInput}, #endif #ifdef _MGGAL_PCXVFB - {"pc_xvfb", InitPCXVFBInput, TermPCXVFBInput}, + {"pc_xvfb", ial_InitPCXVFBInput, TermPCXVFBInput}, #endif #ifdef _MGGAL_RTOSXVFB {"rtos_xvfb", InitRTOSXVFBInput, TermRTOSXVFBInput}, @@ -177,7 +177,7 @@ static INPUT inputs [] = {"console", InitNativeInput, TermNativeInput}, #endif #ifdef _MGIAL_NET - {"net", InitNetInput, TermNetInput}, + {"net", ial_InitNetInput, TermNetInput}, #endif #ifdef _MGIAL_IPAQ_H3600 {"ipaq3600", InitIPAQH3600Input, TermIPAQH3600Input}, @@ -210,7 +210,7 @@ static INPUT inputs [] = {"usvfb", InitUSVFBInput, TermUSVFBInput}, #endif #ifdef _MGIAL_LIBINPUT - {"libinput", InitLibInput, TermLibInput}, + {"libinput", ial_InitLibInput, TermLibInput}, #endif /* ... end of general IAL engines */ }; diff --git a/src/ial/linux-libinput.c b/src/ial/linux-libinput.c index 49590e7f..3e11604b 100644 --- a/src/ial/linux-libinput.c +++ b/src/ial/linux-libinput.c @@ -1381,7 +1381,7 @@ static void set_leds (unsigned int leds) } } -BOOL InitLibInput (INPUT* input, const char* mdev, const char* mtype) +BOOL ial_InitLibInput (INPUT* input, const char* mdev, const char* mtype) { if (__mg_linux_tty_enable_vt_switch() == 0) { _DBG_PRINTF("IAL>LIBINPUT: vt switch enabled\n"); diff --git a/src/ial/linux-libinput.h b/src/ial/linux-libinput.h index 0aff5fdb..c14c9a90 100644 --- a/src/ial/linux-libinput.h +++ b/src/ial/linux-libinput.h @@ -56,7 +56,7 @@ extern "C" { #endif /* __cplusplus */ -BOOL InitLibInput (INPUT* input, const char* mdev, const char* mtype); +BOOL ial_InitLibInput (INPUT* input, const char* mdev, const char* mtype); void TermLibInput (void); #ifdef __cplusplus diff --git a/src/ial/netial/netial.c b/src/ial/netial/netial.c index a4efc50c..de418e5c 100644 --- a/src/ial/netial/netial.c +++ b/src/ial/netial/netial.c @@ -203,7 +203,7 @@ static int wait_event (int which, int maxfd, fd_set *in, fd_set *out, fd_set *ex return 0; } -BOOL InitNetInput (INPUT* input, const char* mdev, const char* mtype) +BOOL ial_InitNetInput (INPUT* input, const char* mdev, const char* mtype) { sock_descriptor = socket (AF_INET, SOCK_STREAM, 0); if (sock_descriptor == -1) diff --git a/src/ial/netial/netial.h b/src/ial/netial/netial.h index e1e0e0de..1f8a084d 100644 --- a/src/ial/netial/netial.h +++ b/src/ial/netial/netial.h @@ -54,7 +54,7 @@ extern "C" { #endif /* __cplusplus */ #ifdef _MGIAL_NET -extern BOOL InitNetInput (INPUT* input, const char* mdev, const char* mtype); +extern BOOL ial_InitNetInput (INPUT* input, const char* mdev, const char* mtype); extern void TermNetInput (void); #endif diff --git a/src/ial/pcxvfb.h b/src/ial/pcxvfb.h index 330f9057..a315f93e 100644 --- a/src/ial/pcxvfb.h +++ b/src/ial/pcxvfb.h @@ -120,7 +120,7 @@ typedef struct _XVFBShowHideEventData{ extern int __mg_pcxvfb_server_sockfd; extern int __mg_pcxvfb_client_sockfd; -BOOL InitPCXVFBInput (INPUT* input, const char* mdev, const char* mtype); +BOOL ial_InitPCXVFBInput (INPUT* input, const char* mdev, const char* mtype); void TermPCXVFBInput (void); MG_EXPORT void GUIAPI VFBOpenIME(int bOpen); diff --git a/src/ial/pcxvfbial.c b/src/ial/pcxvfbial.c index 19b7034e..ea8a1e8d 100644 --- a/src/ial/pcxvfbial.c +++ b/src/ial/pcxvfbial.c @@ -666,7 +666,7 @@ static int wait_event (int which, int maxfd, fd_set *in, fd_set *out, return retvalue; } -BOOL InitPCXVFBInput (INPUT* input, const char* mdev, const char* mtype) +BOOL ial_InitPCXVFBInput (INPUT* input, const char* mdev, const char* mtype) { input->update_mouse = mouse_update; input->get_mouse_xy = mouse_getxy; diff --git a/src/ial/random.c b/src/ial/random.c index 8620e7c7..bec3828d 100644 --- a/src/ial/random.c +++ b/src/ial/random.c @@ -397,7 +397,7 @@ struct _keyboard_event_machine { int pressed_normal_key; }; -struct _keyboard_shift_key { +static struct _keyboard_shift_key { int keycode; uint32_t flag; } keyboard_shift_keys[] = { @@ -1529,7 +1529,7 @@ static int wait_event_ex (int maxfd, fd_set *in, fd_set *out, fd_set *except, #define LEN_EVENT_TYPES 127 -BOOL InitRandomInput (INPUT* input, const char* mdev, const char* mtype) +BOOL ial_InitRandomInput (INPUT* input, const char* mdev, const char* mtype) { char logfile[MAX_PATH + 1]; char eventtypes[LEN_EVENT_TYPES + 1]; diff --git a/src/ial/random.h b/src/ial/random.h index 422a6a7c..b7eae952 100644 --- a/src/ial/random.h +++ b/src/ial/random.h @@ -56,7 +56,7 @@ extern "C" { #endif /* __cplusplus */ -BOOL InitRandomInput (INPUT* input, const char* mdev, const char* mtype); +BOOL ial_InitRandomInput (INPUT* input, const char* mdev, const char* mtype); void TermRandomInput (void); #ifdef __cplusplus diff --git a/src/include/ourhdr.h b/src/include/ourhdr.h index 459ab1fc..53e51b8d 100644 --- a/src/include/ourhdr.h +++ b/src/include/ourhdr.h @@ -86,11 +86,11 @@ union semun { #define MAXLINE 4096 /* max line length */ #ifdef _MGRM_PROCESSES -void err_dump(const char *, ...); /* {App misc_source} */ -void err_msg(const char *, ...); -void err_quit(const char *, ...); -void err_ret(const char *, ...); -void err_sys(const char *, ...); +void __mg_err_dump(const char *, ...); /* {App misc_source} */ +void __mg_err_msg(const char *, ...); +void __mg_err_quit(const char *, ...); +void __mg_err_ret(const char *, ...); +void __mg_err_sys(const char *, ...); #endif #if 0 diff --git a/src/include/timer.h b/src/include/timer.h index 9d2d9fdf..3f449cfc 100644 --- a/src/include/timer.h +++ b/src/include/timer.h @@ -73,8 +73,8 @@ typedef TIMER* PTIMER; BOOL mg_InitTimer (void); void mg_TerminateTimer (void); -void mg_dispatch_timer_message (DWORD inter); -void mg_remove_timers_by_msg_queue (const MSGQUEUE* msg_que); +void __mg_dispatch_timer_message (DWORD inter); +void __mg_remove_timers_by_msg_queue (const MSGQUEUE* msg_que); TIMER* __mg_get_timer (int slot); void __mg_remove_timer (TIMER* timer, int slot); diff --git a/src/kernel/desktop-comm.c b/src/kernel/desktop-comm.c index 7ab8d0c4..2398b928 100644 --- a/src/kernel/desktop-comm.c +++ b/src/kernel/desktop-comm.c @@ -2432,7 +2432,7 @@ static LRESULT DesktopWinProc (HWND hWnd, UINT message, if (sg_old_counter == 0) sg_old_counter = __mg_timer_counter; - mg_dispatch_timer_message (__mg_timer_counter - sg_old_counter); + __mg_dispatch_timer_message (__mg_timer_counter - sg_old_counter); sg_old_counter = __mg_timer_counter; if (__mg_timer_counter < (blink_counter + 10)) @@ -2506,7 +2506,7 @@ static LRESULT DesktopWinProc (HWND hWnd, UINT message, if (MG_UNLIKELY(sg_old_counter == 0)) sg_old_counter = __mg_timer_counter; - mg_dispatch_timer_message (__mg_timer_counter - sg_old_counter); + __mg_dispatch_timer_message (__mg_timer_counter - sg_old_counter); sg_old_counter = __mg_timer_counter; if (__mg_timer_counter < (blink_counter + 10)) diff --git a/src/kernel/desktop-procs.c b/src/kernel/desktop-procs.c index 2a09d1c9..e76f5db3 100644 --- a/src/kernel/desktop-procs.c +++ b/src/kernel/desktop-procs.c @@ -3975,7 +3975,7 @@ static void dskOnTimer (void) if (sg_old_counter == 0) sg_old_counter = SHAREDRES_TIMER_COUNTER; - mg_dispatch_timer_message (SHAREDRES_TIMER_COUNTER - sg_old_counter); + __mg_dispatch_timer_message (SHAREDRES_TIMER_COUNTER - sg_old_counter); sg_old_counter = SHAREDRES_TIMER_COUNTER; if (SHAREDRES_TIMER_COUNTER < (blink_counter + 10)) diff --git a/src/kernel/desktop.c b/src/kernel/desktop.c index 2b62e788..3e3387de 100644 --- a/src/kernel/desktop.c +++ b/src/kernel/desktop.c @@ -1361,7 +1361,7 @@ static void dskAddNewHostedMainWindow (PMAINWIN pHosting, PMAINWIN pHosted) /* * Remove a hosted main window. */ -void dskRemoveHostedMainWindow (PMAINWIN pHosting, PMAINWIN pHosted) +static void dskRemoveHostedMainWindow (PMAINWIN pHosting, PMAINWIN pHosted) { PMAINWIN head, prev; @@ -4305,7 +4305,7 @@ int __kernel_get_window_region (HWND pWin, CLIPRGN* region) if (!AddClipRect (region, &rc)) { nr_mask_rects = -1; - goto err_ret; + goto __mg_err_ret; } idx = maskrect->next; @@ -4320,7 +4320,7 @@ int __kernel_get_window_region (HWND pWin, CLIPRGN* region) nr_mask_rects = -1; } -err_ret: +__mg_err_ret: /* unlock zi for read */ unlock_zi_for_read (zi); @@ -4453,13 +4453,13 @@ BOOL GUIAPI ServerGetWinZNodeRegion (MG_Layer* layer, int idx_znode, if ((rgn_ops & RGN_OP_MASK) == RGN_OP_EXCLUDE) { if (!SubtractClipRect (dst_rgn, &rc)) { nr_mask_rects = -1; - goto err_ret; + goto __mg_err_ret; } } else { if (!AddClipRect (dst_rgn, &rc)) { nr_mask_rects = -1; - goto err_ret; + goto __mg_err_ret; } } @@ -4493,7 +4493,7 @@ BOOL GUIAPI ServerGetWinZNodeRegion (MG_Layer* layer, int idx_znode, if (ctxt.status) { nr_mask_rects = -1; - goto err_ret; + goto __mg_err_ret; } if (nodes[idx_znode].flags & ZOF_TW_TROUNDCNS) { @@ -4509,18 +4509,18 @@ BOOL GUIAPI ServerGetWinZNodeRegion (MG_Layer* layer, int idx_znode, if ((rgn_ops & RGN_OP_MASK) == RGN_OP_EXCLUDE) { if (!SubtractClipRect (dst_rgn, &rc)) { nr_mask_rects = -1; - goto err_ret; + goto __mg_err_ret; } } else { if (!AddClipRect (dst_rgn, &rc)) { nr_mask_rects = -1; - goto err_ret; + goto __mg_err_ret; } } } -err_ret: +__mg_err_ret: /* unlock zi for read */ unlock_zi_for_read (zi); @@ -4576,7 +4576,7 @@ BOOL GUIAPI ServerGetPopupMenuZNodeRegion (int idx_znode, if (ctxt.status) { nr_mask_rects = -1; - goto err_ret; + goto __mg_err_ret; } rc.top += RADIUS_POPUPMENU_CORNERS; @@ -4588,17 +4588,17 @@ BOOL GUIAPI ServerGetPopupMenuZNodeRegion (int idx_znode, if ((rgn_ops & RGN_OP_MASK) == RGN_OP_EXCLUDE) { if (!SubtractClipRect (dst_rgn, &rc)) { nr_mask_rects = -1; - goto err_ret; + goto __mg_err_ret; } } else { if (!AddClipRect (dst_rgn, &rc)) { nr_mask_rects = -1; - goto err_ret; + goto __mg_err_ret; } } -err_ret: +__mg_err_ret: /* unlock zi for read */ unlock_zi_for_read (zi); diff --git a/src/kernel/init.c b/src/kernel/init.c index 320268b4..46752c24 100644 --- a/src/kernel/init.c +++ b/src/kernel/init.c @@ -654,8 +654,8 @@ void GUIAPI TerminateGUI (int not_used) mg_TerminateGAL (); #ifdef _MGHAVE_ADV_2DAPI - extern void mg_miFreeArcCache (void); - mg_miFreeArcCache (); + extern void miFreeArcCache (void); + miFreeArcCache (); #endif mg_TerminateSliceAllocator(); diff --git a/src/kernel/message.c b/src/kernel/message.c index 06e9f362..2cabd115 100644 --- a/src/kernel/message.c +++ b/src/kernel/message.c @@ -197,7 +197,7 @@ void mg_DestroyMsgQueue (PMSGQUEUE pMsgQueue) sem_destroy (&pMsgQueue->sync_msg); #endif - mg_remove_timers_by_msg_queue (pMsgQueue); + __mg_remove_timers_by_msg_queue (pMsgQueue); if (pMsgQueue->msg) free (pMsgQueue->msg); diff --git a/src/kernel/timer.c b/src/kernel/timer.c index 79811ceb..3f6a7739 100644 --- a/src/kernel/timer.c +++ b/src/kernel/timer.c @@ -72,7 +72,7 @@ #endif #if defined(_DEBUG) && defined(_MGRM_PROCESSES) -#define TIMER_ERR_SYS(text) err_sys (text) +#define TIMER_ERR_SYS(text) __mg_err_sys (text) #else #define TIMER_ERR_SYS(text) #endif @@ -269,7 +269,7 @@ void mg_TerminateTimer (void) } /************************* Functions run in desktop thread *******************/ -void mg_dispatch_timer_message (DWORD inter) +void __mg_dispatch_timer_message (DWORD inter) { int i; @@ -468,7 +468,7 @@ void __mg_remove_timer (TIMER* timer, int slot) return; } -void mg_remove_timers_by_msg_queue (const MSGQUEUE* msg_que) +void __mg_remove_timers_by_msg_queue (const MSGQUEUE* msg_que) { int i; diff --git a/src/misc/clipboard.c b/src/misc/clipboard.c index dcf7aba2..14f3f1e9 100644 --- a/src/misc/clipboard.c +++ b/src/misc/clipboard.c @@ -163,7 +163,7 @@ int GUIAPI CreateClipBoard (const char* cb_name, size_t size) #endif -int GUIAPI destroy_clip_board (const char* cb_name) +static int destroy_clip_board (const char* cb_name) { int i; @@ -541,7 +541,7 @@ int GUIAPI GetClipBoardByte (const char* cb_name, int index, unsigned char* byte #ifdef _MGRM_PROCESSES int ServerSendReply (int clifd, const void* reply, int len); -int clipboard_op (int cli, int clifd, void* buff, size_t len) +int __mg_clipboard_op (int cli, int clifd, void* buff, size_t len) { REQ_CLIPBOARD* request = (REQ_CLIPBOARD*) buff; int ret; diff --git a/src/misc/error.c b/src/misc/error.c index 7baff312..4e9d7131 100644 --- a/src/misc/error.c +++ b/src/misc/error.c @@ -68,7 +68,7 @@ static void err_doit(int, const char *, va_list); * Print a message and return. */ void -err_ret(const char *fmt, ...) +__mg_err_ret(const char *fmt, ...) { va_list ap; @@ -82,7 +82,7 @@ err_ret(const char *fmt, ...) * Print a message and terminate. */ void -err_sys(const char *fmt, ...) +__mg_err_sys(const char *fmt, ...) { va_list ap; @@ -96,7 +96,7 @@ err_sys(const char *fmt, ...) * Print a message, dump core, and terminate. */ void -err_dump(const char *fmt, ...) +__mg_err_dump(const char *fmt, ...) { va_list ap; @@ -111,7 +111,7 @@ err_dump(const char *fmt, ...) * Print a message and return. */ void -err_msg(const char *fmt, ...) +__mg_err_msg(const char *fmt, ...) { va_list ap; @@ -125,7 +125,7 @@ err_msg(const char *fmt, ...) * Print a message and terminate. */ void -err_quit(const char *fmt, ...) +__mg_err_quit(const char *fmt, ...) { va_list ap; diff --git a/src/newgal/stretch.c b/src/newgal/stretch.c index 410f93e1..ed4ea291 100644 --- a/src/newgal/stretch.c +++ b/src/newgal/stretch.c @@ -142,24 +142,25 @@ static int generate_rowbytes(int src_w, int dst_w, int bpp) #else -#define DEFINE_COPY_ROW(name, type) \ -void name(type *src, int src_w, type *dst, int dst_w) \ -{ \ - int i; \ - int pos, inc; \ - type pixel = 0; \ - \ - pos = 0x10000; \ - inc = (src_w << 16) / dst_w; \ - for ( i=dst_w; i>0; --i ) { \ - while ( pos >= 0x10000L ) { \ - pixel = *src++; \ - pos -= 0x10000L; \ - } \ - *dst++ = pixel; \ - pos += inc; \ - } \ +#define DEFINE_COPY_ROW(name, type) \ +static void name(type *src, int src_w, type *dst, int dst_w) \ +{ \ + int i; \ + int pos, inc; \ + type pixel = 0; \ + \ + pos = 0x10000; \ + inc = (src_w << 16) / dst_w; \ + for ( i=dst_w; i>0; --i ) { \ + while ( pos >= 0x10000L ) { \ + pixel = *src++; \ + pos -= 0x10000L; \ + } \ + *dst++ = pixel; \ + pos += inc; \ + } \ } + DEFINE_COPY_ROW(copy_row1, Uint8) DEFINE_COPY_ROW(copy_row2, Uint16) DEFINE_COPY_ROW(copy_row4, Uint32) diff --git a/src/newgdi/arc.c b/src/newgdi/arc.c index ef69391f..1262fe31 100644 --- a/src/newgdi/arc.c +++ b/src/newgdi/arc.c @@ -85,7 +85,7 @@ void GUIAPI CircleArc (HDC hdc, int sx, int sy, int r, int ang1, int ang2) pdc->cur_ban = NULL; if (r < 1) { - _set_pixel_helper (pdc, sx, sy); + _gdi_set_pixel_helper (pdc, sx, sy); goto ret; } @@ -119,7 +119,7 @@ void GUIAPI Ellipse (HDC hdc, int sx, int sy, int rx, int ry) pdc->cur_ban = NULL; if (rx < 1 || ry < 1) { - _set_pixel_helper (pdc, sx, sy); + _gdi_set_pixel_helper (pdc, sx, sy); goto ret; } @@ -150,7 +150,7 @@ void GUIAPI FillEllipse (HDC hdc, int sx, int sy, int rx, int ry) pdc->cur_ban = NULL; if (rx < 1 || ry < 1) { - _set_pixel_helper (pdc, sx, sy); + _gdi_set_pixel_helper (pdc, sx, sy); goto ret; } @@ -189,7 +189,7 @@ void GUIAPI Circle (HDC hdc, int sx, int sy, int r) pdc->cur_ban = NULL; if (r < 1) { - _set_pixel_helper (pdc, sx, sy); + _gdi_set_pixel_helper (pdc, sx, sy); goto ret; } @@ -221,7 +221,7 @@ void GUIAPI FillCircle (HDC hdc, int sx, int sy, int r) pdc->cur_ban = NULL; if (r < 1) { - _set_pixel_helper (pdc, sx, sy); + _gdi_set_pixel_helper (pdc, sx, sy); goto ret; } diff --git a/src/newgdi/drawtext.h b/src/newgdi/drawtext.h index 0f81ce1b..e1dfc64a 100644 --- a/src/newgdi/drawtext.h +++ b/src/newgdi/drawtext.h @@ -119,7 +119,7 @@ int _gdi_get_text_extent (PDC pdc, const unsigned char* text, int len, int _gdi_get_drawtext_extent (PDC pdc, const unsigned char* text, int len, void* content, SIZE* size); -BOOL InitTextBitmapBuffer (void); +BOOL gdi_InitTextBitmapBuffer (void); void TermTextBitmapBuffer (void); typedef struct _DRAWTEXTEX2_CTXT diff --git a/src/newgdi/gdi.c b/src/newgdi/gdi.c index 3835ee4b..270a9d2b 100644 --- a/src/newgdi/gdi.c +++ b/src/newgdi/gdi.c @@ -326,7 +326,7 @@ void mg_TerminateScreenDC (void) #ifndef _MG_MINIMALGDI BOOL mg_InitGDI (void) { - if (!InitTextBitmapBuffer ()) { + if (!gdi_InitTextBitmapBuffer ()) { _WRN_PRINTF ("Can not initialize text bitmap buffer!\n"); goto error; } diff --git a/src/newgdi/glyph-old.c b/src/newgdi/glyph-old.c index b963e73a..bda1c5ca 100644 --- a/src/newgdi/glyph-old.c +++ b/src/newgdi/glyph-old.c @@ -15,7 +15,7 @@ static BITMAP char_bmp; static void* char_bits; static size_t char_bits_size; -BOOL InitTextBitmapBuffer (void) +BOOL gdi_InitTextBitmapBuffer (void) { char_bits = NULL; char_bmp.bmBits = NULL; diff --git a/src/newgdi/glyph.c b/src/newgdi/glyph.c index 48aef579..05bd23b0 100644 --- a/src/newgdi/glyph.c +++ b/src/newgdi/glyph.c @@ -284,7 +284,7 @@ static int _line_bk_size = 0; static BYTE* _scaled_bits = NULL; static size_t _scaled_bits_size = 0; -BOOL InitTextBitmapBuffer (void) +BOOL gdi_InitTextBitmapBuffer (void) { return TRUE; } diff --git a/src/newgdi/layout.c b/src/newgdi/layout.c index 43914383..9b458b5c 100644 --- a/src/newgdi/layout.c +++ b/src/newgdi/layout.c @@ -911,7 +911,7 @@ static inline BOOL can_break_in (LAYOUT *layout, * or %BREAK_NONE_FIT returned. This is used when the end of the * run is not a break position. */ -BreakResult process_layout_run(LAYOUT *layout, +static BreakResult process_layout_run(LAYOUT *layout, LAYOUTLINE *line, LayoutState *state, BOOL force_fit, BOOL no_break_at_end) { diff --git a/src/newgdi/line.c b/src/newgdi/line.c index 04a39f53..83b57c16 100644 --- a/src/newgdi/line.c +++ b/src/newgdi/line.c @@ -110,7 +110,7 @@ void GUIAPI LineTo (HDC hdc, int x, int y) pdc->cur_ban = NULL; pdc->step = 1; if (startx == x && starty == y) { - _set_pixel_helper (pdc, x, y); + _gdi_set_pixel_helper (pdc, x, y); goto ret; } @@ -180,7 +180,7 @@ void GUIAPI Rectangle (HDC hdc, int x0, int y0, int x1, int y1) pdc->step = 1; if (x0 == x1 && y0 == y1) { - _set_pixel_helper (pdc, x0, y0); + _gdi_set_pixel_helper (pdc, x0, y0); goto ret; } @@ -223,7 +223,7 @@ void GUIAPI FocusRect (HDC hdc, int x0, int y0, int x1, int y1) oldrop = SetRasterOperation (hdc, ROP_XOR); if (x0 == x1 && y0 == y1) { - _set_pixel_helper (pdc, x0, y0); + _gdi_set_pixel_helper (pdc, x0, y0); goto ret; } @@ -258,7 +258,7 @@ void GUIAPI DrawHVDotLine (HDC hdc, int x, int y, int w_h, BOOL H_V) if (w_h == 1) { if ((H_V && !(x % 2)) || (!H_V && !(y % 2))) { - _set_pixel_helper (pdc, x, y); + _gdi_set_pixel_helper (pdc, x, y); } goto ret; } @@ -287,7 +287,7 @@ ret: UNLOCK_GCRINFO (pdc); } -void calc_spline (const POINT* points, int npts, POINT* out_pts) +static void calc_spline (const POINT* points, int npts, POINT* out_pts) { /* Derivatives of x(t) and y(t). */ double x, dx, ddx, dddx; diff --git a/src/newgdi/miarc.c b/src/newgdi/miarc.c index 737263cf..73305409 100644 --- a/src/newgdi/miarc.c +++ b/src/newgdi/miarc.c @@ -457,7 +457,7 @@ int miFreeArcCache (void* data, unsigned int id) } #endif -void mg_miFreeArcCache (void){ +void miFreeArcCache (void){ int k; arcCacheRec *cent; @@ -2834,11 +2834,13 @@ struct finalSpan { static struct finalSpan *freeFinalSpans, *tmpFinalSpan; -# define allocFinalSpan() (freeFinalSpans ?\ - ((tmpFinalSpan = freeFinalSpans), \ - (freeFinalSpans = freeFinalSpans->next), \ - (tmpFinalSpan->next = 0), \ - tmpFinalSpan) : \ +static struct finalSpan *realAllocSpan (void); + +# define allocFinalSpan() (freeFinalSpans ? \ + ((tmpFinalSpan = freeFinalSpans), \ + (freeFinalSpans = freeFinalSpans->next), \ + (tmpFinalSpan->next = 0), \ + tmpFinalSpan) : \ realAllocSpan ()) # define SPAN_CHUNK_SIZE 128 @@ -2850,7 +2852,7 @@ struct finalSpanChunk { static struct finalSpanChunk* chunks; -struct finalSpan * realAllocSpan (void) +static struct finalSpan * realAllocSpan (void) { register struct finalSpanChunk *newChunk; register struct finalSpan *span; diff --git a/src/newgdi/mifillarc.h b/src/newgdi/mifillarc.h index db936bff..d1040129 100644 --- a/src/newgdi/mifillarc.h +++ b/src/newgdi/mifillarc.h @@ -220,8 +220,7 @@ typedef struct _miArcSlice { ((slw > 1) || (ine != inxk))) /* extern int miFreeArcCache (void* data, unsigned int id); */ -extern void mg_miFreeArcCache (void); -extern struct finalSpan *realAllocSpan (void); +extern void miFreeArcCache (void); extern void miFillArcSetup (register miArc* arc, register miFillArcRec* info); extern void miFillArcDSetup (register miArc* arc, register miFillArcDRec* info); extern void miEllipseAngleToSlope (int angle, int width, int height, int* dxp, int* dyp, double* d_dxp, double* d_dyp); diff --git a/src/newgdi/pixel.c b/src/newgdi/pixel.c index 8dfa9a81..aa9ea820 100644 --- a/src/newgdi/pixel.c +++ b/src/newgdi/pixel.c @@ -68,7 +68,7 @@ #include "cursor.h" /*********************** Generl drawing support ******************************/ -void _set_pixel_helper (PDC pdc, int x, int y) +void _gdi_set_pixel_helper (PDC pdc, int x, int y) { SetRect (&pdc->rc_output, x - 1, y - 1, x + 1, y + 1); @@ -96,7 +96,7 @@ static void _my_set_pixel (PDC pdc, int x, int y, gal_pixel pixel) coor_LP2SP (pdc, &x, &y); pdc->cur_pixel = pixel; - _set_pixel_helper (pdc, x, y); + _gdi_set_pixel_helper (pdc, x, y); no_draw: UNLOCK_GCRINFO (pdc); diff --git a/src/newgdi/pixel_ops.h b/src/newgdi/pixel_ops.h index 68cf7889..830b2c76 100644 --- a/src/newgdi/pixel_ops.h +++ b/src/newgdi/pixel_ops.h @@ -58,7 +58,7 @@ BOOL _dc_cliphline (const RECT* cliprc, int* px, int* py, int* pw); BOOL _dc_clipvline (const RECT* cliprc, int* px, int* py, int* ph); void _dc_drawvline (PDC pdc, int h); -void _set_pixel_helper (PDC pdc, int x, int y); +void _gdi_set_pixel_helper (PDC pdc, int x, int y); gal_pixel _dc_get_pixel_cursor (PDC pdc, int x, int y); diff --git a/src/newgdi/polygon.c b/src/newgdi/polygon.c index fd30e9b3..d518c06c 100644 --- a/src/newgdi/polygon.c +++ b/src/newgdi/polygon.c @@ -455,7 +455,8 @@ BOOL IsSmall(POLYGON_Int64 *x, POLYGON_Int32 x_off, POLYGON_Int64 *y, POLYGON_In * Polygon helper function: initialises an edge structure for the 2d * rasteriser. */ -void _fill_edge_structure (POLYGON_EDGE *edge, const int *i1, const int *i2) +static void _fill_edge_structure (POLYGON_EDGE *edge, + const int *i1, const int *i2) { #ifdef POLYGON_64_SUPPORT POLYGON_Int64 dx64; @@ -497,7 +498,8 @@ void _fill_edge_structure (POLYGON_EDGE *edge, const int *i1, const int *i2) /* _add_edge: * Adds an edge structure to a linked list, returning the new head pointer. */ -POLYGON_EDGE *_add_edge (POLYGON_EDGE *list, POLYGON_EDGE *edge, int sort_by_x) +static POLYGON_EDGE *_add_edge (POLYGON_EDGE *list, + POLYGON_EDGE *edge, int sort_by_x) { POLYGON_EDGE *pos = list; POLYGON_EDGE *prev = NULL; @@ -540,7 +542,7 @@ POLYGON_EDGE *_add_edge (POLYGON_EDGE *list, POLYGON_EDGE *edge, int sort_by_x) * Removes an edge structure from a list, returning the new head pointer. */ -POLYGON_EDGE *_remove_edge(POLYGON_EDGE *list, POLYGON_EDGE *edge) +static POLYGON_EDGE *_remove_edge(POLYGON_EDGE *list, POLYGON_EDGE *edge) { if (edge->next) edge->next->prev = edge->prev; diff --git a/src/newgdi/polygon.h b/src/newgdi/polygon.h index c60c6610..bc03e138 100644 --- a/src/newgdi/polygon.h +++ b/src/newgdi/polygon.h @@ -89,9 +89,11 @@ extern "C" { #endif /* __cplusplus */ /* polygon helper functions */ -void _fill_edge_structure (POLYGON_EDGE *edge, const int *i1, const int *i2); -POLYGON_EDGE* _add_edge (POLYGON_EDGE *list, POLYGON_EDGE *edge, int sort_by_x); -POLYGON_EDGE* _remove_edge (POLYGON_EDGE *list, POLYGON_EDGE *edge); +static void _fill_edge_structure (POLYGON_EDGE *edge, + const int *i1, const int *i2); +static POLYGON_EDGE* _add_edge (POLYGON_EDGE *list, + POLYGON_EDGE *edge, int sort_by_x); +static POLYGON_EDGE* _remove_edge (POLYGON_EDGE *list, POLYGON_EDGE *edge); #ifdef __cplusplus } diff --git a/src/server/client.c b/src/server/client.c index aa0b9689..165f5c88 100644 --- a/src/server/client.c +++ b/src/server/client.c @@ -221,7 +221,7 @@ ret: void __mg_remove_client (int cli, int clifd) { #ifdef _DEBUG - err_msg ("client closed: uid %d, fd %d", mgClients [cli].uid, clifd); + __mg_err_msg ("client closed: uid %d, fd %d", mgClients [cli].uid, clifd); #endif if (OnChangeLayer) diff --git a/src/server/request.c b/src/server/request.c index 508cb740..92d903d5 100644 --- a/src/server/request.c +++ b/src/server/request.c @@ -762,7 +762,7 @@ static int req_hw_surface (int cli, int clifd, void* buff, size_t len) #endif /* IS_SHAREDFB_SCHEMA */ #ifdef _MGHAVE_CLIPBOARD -extern int clipboard_op (int cli, int clifd, void* buff, size_t len); +extern int __mg_clipboard_op (int cli, int clifd, void* buff, size_t len); #endif #if IS_COMPOSITING_SCHEMA @@ -816,7 +816,7 @@ static struct req_request { { NULL, 0 }, #endif #ifdef _MGHAVE_CLIPBOARD - { clipboard_op, 0 }, + { __mg_clipboard_op, 0 }, #else { NULL, 0 }, #endif diff --git a/src/server/server.c b/src/server/server.c index 552e1556..f95f3044 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -373,7 +373,7 @@ BOOL server_IdleHandler4Server (PMSGQUEUE msg_queue) return FALSE; } #ifdef _DEBUG - err_msg ("select error on server"); + __mg_err_msg ("select error on server"); #endif } @@ -381,7 +381,7 @@ BOOL server_IdleHandler4Server (PMSGQUEUE msg_queue) /* accept new client request */ if ( (clifd = serv_accept (listenfd, &pid, &uid)) < 0) { #ifdef _DEBUG - err_msg ("serv_accept error: %d", clifd); + __mg_err_msg ("serv_accept error: %d", clifd); #endif return TRUE; } @@ -399,7 +399,7 @@ BOOL server_IdleHandler4Server (PMSGQUEUE msg_queue) if (i > maxi) maxi = i; /* max index in client[] array */ #ifdef _DEBUG - err_msg ("new connection: uid %d, fd %d", uid, clifd); + __mg_err_msg ("new connection: uid %d, fd %d", uid, clifd); #endif return TRUE; } @@ -414,7 +414,7 @@ BOOL server_IdleHandler4Server (PMSGQUEUE msg_queue) if ((nread = sock_read (clifd, &req_id, sizeof (int))) == SOCKERR_IO) { #ifdef _DEBUG - err_msg ("server: read error on fd %d", clifd); + __mg_err_msg ("server: read error on fd %d", clifd); #endif if (OnNewDelClient) OnNewDelClient (LCO_DEL_CLIENT, i); __mg_remove_client (i, clifd); diff --git a/src/sysres/resmgr.c b/src/sysres/resmgr.c index b9f3616a..8cb298d8 100644 --- a/src/sysres/resmgr.c +++ b/src/sysres/resmgr.c @@ -375,7 +375,7 @@ static void delete_entry_data(RES_ENTRY* entry) 727 733 739 743 751 757 761 769 773 787 797 809 811 821 823 827 829 839 853 857 859 863 877 881 883 887 907 911 919 929 937 941 947 953 967 971 977 983 991 997 */ -BOOL InitializeResManager(int hash_table_size) +BOOL mg_InitResManager(int hash_table_size) { char szpath[MAX_PATH+1]; char* p = NULL; diff --git a/src/sysres/resmgr.h b/src/sysres/resmgr.h index dfe7afbe..799770fb 100644 --- a/src/sysres/resmgr.h +++ b/src/sysres/resmgr.h @@ -98,7 +98,7 @@ typedef struct _HASH_TABLE { extern "C" { #endif /* __cplusplus */ -BOOL InitializeResManager(int hash_table_size); +BOOL mg_InitResManager(int hash_table_size); void TerminateResManager(void); #ifdef __cplusplus diff --git a/src/sysres/resource.c b/src/sysres/resource.c index cc36581a..2cc72f2e 100644 --- a/src/sysres/resource.c +++ b/src/sysres/resource.c @@ -341,7 +341,7 @@ BOOL mg_InitSystemRes (void) # define _SIZE_RES_HASH_TABLE 71 #endif - InitializeResManager(_SIZE_RES_HASH_TABLE); + mg_InitResManager(_SIZE_RES_HASH_TABLE); #undef _SIZE_RES_HASH_TABLE diff --git a/src/textedit/object.c b/src/textedit/object.c index 7e10cce2..fa675597 100644 --- a/src/textedit/object.c +++ b/src/textedit/object.c @@ -107,7 +107,7 @@ mObjectClass Class(mObject) = { (PClassConstructor)mObjectClassConstructor }; -mObject * mg_newObject(mObjectClass *_class) +mObject * mgNewObject(mObjectClass *_class) { mObject * obj; @@ -123,7 +123,7 @@ mObject * mg_newObject(mObjectClass *_class) } -mObject * mgNewObject(mObjectClass *_class,DWORD addData){ +mObject * mgNewObjectEx(mObjectClass *_class,DWORD addData){ mObject * obj = newObject(_class); if(!obj) return NULL; diff --git a/src/textedit/object.h b/src/textedit/object.h index e83c8cb3..36dfcc39 100644 --- a/src/textedit/object.h +++ b/src/textedit/object.h @@ -52,10 +52,6 @@ #ifndef _MGUI_NCSCTRL_OBJECT_H #define _MGUI_NCSCTRL_OBJECT_H -#ifdef __cplusplus -extern "C"{ -#endif - #ifdef __MINIGUI_LIB__ # define ncsInstanceOf _minigui_ncsInstanceOf # define ncsParseConstructParams _minigui_ncsParseConstructParams @@ -208,8 +204,9 @@ struct _IInterface { (piobj)->_vtable->method(INTEFACE_ADJUST(piobj), ##__VA_ARGS__) #define _I(piobj) (piobj)->_vtable - - +#ifdef __cplusplus +extern "C"{ +#endif typedef struct _mObjectClass mObjectClass; typedef struct _mObject mObject; @@ -356,10 +353,10 @@ static inline int MGGET_ARG_COUNT(va_list va) * \return the new pointer of object * */ -MGNCS_EXPORT mObject * mg_newObject(mObjectClass *_class); -#define newObject mg_newObject -MGNCS_EXPORT mObject * mgNewObject(mObjectClass *_class,DWORD addData); -#define ncsNewObject mgNewObject +MGNCS_EXPORT mObject * mgNewObject(mObjectClass *_class); +#define newObject mgNewObject +MGNCS_EXPORT mObject * mgNewObjectEx(mObjectClass *_class, DWORD addData); +#define ncsNewObject mgNewObjectEx #define NEWEX(classType, addData) (classType*)ncsNewObject((mObjectClass*)(void *)(&Class(classType)), addData) @@ -488,6 +485,5 @@ int ncsParseConstructParams(va_list args, const char* signature, ...); } #endif - #endif