diff --git a/Doxyfile.procs b/Doxyfile.procs
index e9228ce1..7396bede 100644
--- a/Doxyfile.procs
+++ b/Doxyfile.procs
@@ -38,7 +38,7 @@ PROJECT_NAME = "MiniGUI API Reference (MiniGUI-Processes)"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = v4.0.1
+PROJECT_NUMBER = v4.0.4
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO =
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = doc-api-ref-minigui-procs-4.0.1
+OUTPUT_DIRECTORY = doc-api-ref-minigui-procs-4.0.4
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -2102,7 +2102,7 @@ PREDEFINED = _MGRM_PROCESSES \
_MGFONT_FT2 \
_MGFONT_UPF \
_MGFONT_BMPF \
- _MGGAL_DRI \
+ _MGGAL_DRM \
_MGGAL_COMMLCD \
_MGIAL_COMM
diff --git a/Doxyfile.sal b/Doxyfile.sal
index 41889588..71781947 100644
--- a/Doxyfile.sal
+++ b/Doxyfile.sal
@@ -38,7 +38,7 @@ PROJECT_NAME = "MiniGUI API Reference (MiniGUI-Standalone)"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = v4.0.1
+PROJECT_NUMBER = v4.0.4
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO =
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = doc-api-ref-minigui-sa-4.0.1
+OUTPUT_DIRECTORY = doc-api-ref-minigui-sa-4.0.4
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -2102,7 +2102,7 @@ PREDEFINED = _MGRM_STANDALONE \
_MGFONT_FT2 \
_MGFONT_UPF \
_MGFONT_BMPF \
- _MGGAL_DRI \
+ _MGGAL_DRM \
_MGGAL_COMMLCD \
_MGIAL_COMM
diff --git a/Doxyfile.ths b/Doxyfile.ths
index 2bbfdf05..d16b6a99 100644
--- a/Doxyfile.ths
+++ b/Doxyfile.ths
@@ -38,7 +38,7 @@ PROJECT_NAME = "MiniGUI API Reference (MiniGUI-Threads)"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = v4.0.1
+PROJECT_NUMBER = v4.0.4
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO =
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = doc-api-ref-minigui-ths-4.0.1
+OUTPUT_DIRECTORY = doc-api-ref-minigui-ths-4.0.4
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -2102,7 +2102,7 @@ PREDEFINED = _MGRM_THREADS \
_MGFONT_FT2 \
_MGFONT_UPF \
_MGFONT_BMPF \
- _MGGAL_DRI \
+ _MGGAL_DRM \
_MGGAL_COMMLCD \
_MGIAL_COMM
diff --git a/README.md b/README.md
index 7e2c8215..3bfcd71a 100644
--- a/README.md
+++ b/README.md
@@ -386,7 +386,7 @@ If you have got a commercial license of this program, please use it
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
-.
+.
### Special Statement
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index b98b1d54..c14caaea 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,5 +1,33 @@
# Release Notes
+## Version 4.0.4
+
+The MiniGUI development team announces the availability of MiniGUI 4.0.4.
+We strongly recommend that you use this version for any new MiniGUI
+apps, especially if the new features of MiniGUI 4.0 are must for your
+new apps.
+
+Please report any bugs and incompatibilities in
+
+
+
+### What's new in this version
+
+In this version, we mainly enhance the DRM engine of MiniGUI in order
+to integrate MiniGUI with Mesa and Cairo, for example, to implement EGL
+for MiniGUI platform.
+
+* MODIFICATIONS:
+ - Change the name of old `dri` NEWGAL engine to `drm`.
+ - Change the configuration option of DRM engine to `--enable-videodrm`.
+ - Change the macro for DRM engine to `_MGGAL_DRM`.
+ - Change the runtime configuration section for DRM engine to `drm`.
+* ENHANCEMENTS:
+ - New APIs for GPU integration, such as `IsMemDC`, `IsScreenDC`, `IsWindowDC`, `GetVideoHandle`, and `drmGetDeviceFD`.
+ - Add new operation for DRM engine: `create_buffer_from_prime_fd`.
+ - Use `dlopen` to load the external DRM driver.
+ - Add a new runtime configuration key for DRM engine `drm.exdriver` to define the external DRM driver.
+
## Version 4.0.2
The MiniGUI development team announces the availability of MiniGUI 4.0.2.
diff --git a/Version b/Version
deleted file mode 100644
index b3de1ee4..00000000
--- a/Version
+++ /dev/null
@@ -1,9 +0,0 @@
-Version 4.0.2 (2019/10/31)
-
-This release needs the following resource packages:
-
- * minigui-res-4.0.0.tar.gz
-
-The latest samples package is:
-
- * mg-samples-4.0.1.tar.gz
diff --git a/Version.md b/Version.md
new file mode 100644
index 00000000..6dc23095
--- /dev/null
+++ b/Version.md
@@ -0,0 +1,8 @@
+Version 4.0.4 (2019/12/24)
+
+This release needs the following packages:
+
+- The resource package: `minigui-res-4.0.0.tar.gz`
+- The sample package: `mg-samples-4.0.1.tar.gz`
+- The test package: `mg-test-4.0.4.tar.gz`
+
diff --git a/configure.ac b/configure.ac
index 820ac0af..442297fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.60)
-AC_INIT(libminigui, 4.0.2)
+AC_INIT(libminigui, 4.0.4)
AC_CONFIG_SRCDIR(src/main/main.c)
dnl Set various version strings - taken gratefully from the SDL sources
@@ -16,9 +16,9 @@ dnl Set various version strings - taken gratefully from the SDL sources
#
MINIGUI_MAJOR_VERSION=4
MINIGUI_MINOR_VERSION=0
-MINIGUI_MICRO_VERSION=2
-MINIGUI_INTERFACE_AGE=2
-MINIGUI_BINARY_AGE=2
+MINIGUI_MICRO_VERSION=4
+MINIGUI_INTERFACE_AGE=0
+MINIGUI_BINARY_AGE=0
MINIGUI_VERSION=$MINIGUI_MAJOR_VERSION.$MINIGUI_MINOR_VERSION.$MINIGUI_MICRO_VERSION
AC_SUBST(MINIGUI_MAJOR_VERSION)
@@ -264,8 +264,8 @@ enable_video_dfb="no"
enable_video_dfb_st7167="no"
enable_video_stgfb="no"
-enable_video_fbcon="yes"
-enable_video_dri="yes"
+enable_video_drm="yes"
+enable_video_fbcon="no"
enable_video_commlcd="no"
enable_video_shadow="no"
enable_video_mlshadow="no"
@@ -886,24 +886,24 @@ dnl Find the DRM includes
CheckDRM()
{
if test "x$runtime_mode" = "xprocs"; then
- enable_video_dri="no; DRI engine does not support MiniGUI-Processes runtime mode currently"
+ enable_video_drm="no; DRI engine does not support MiniGUI-Processes runtime mode currently"
else
- AC_ARG_ENABLE(videodri,
- [ --enable-videodri include Linux DRI NEWGAL engine ],
- enable_video_dri=$enableval)
- if test "x$enable_video_dri" = "xyes"; then
- PKG_CHECK_MODULES(DRM, [libdrm >= 2.4], video_dri="yes",
- video_dri="no; Linux DRI NEWGAL engine requires libdrm 2.4+")
- if test "x$video_dri" = "xyes"; then
- AC_DEFINE(_MGGAL_DRI, 1,
+ AC_ARG_ENABLE(videodrm,
+ [ --enable-videodrm include Linux DRI NEWGAL engine ],
+ enable_video_drm=$enableval)
+ if test "x$enable_video_drm" = "xyes"; then
+ PKG_CHECK_MODULES(DRM, [libdrm >= 2.4], video_drm="yes",
+ video_drm="no; Linux DRI NEWGAL engine requires libdrm 2.4+")
+ if test "x$video_drm" = "xyes"; then
+ AC_DEFINE(_MGGAL_DRM, 1,
[Define if include Linux DRI NEWGAL engine])
- VIDEO_SUBDIRS="$VIDEO_SUBDIRS dri"
- VIDEO_DRIVERS="$VIDEO_DRIVERS dri/libvideo_dri.la"
- DEP_LIBS="$DEP_LIBS -ldrm"
- DRM_INC_DIR="`$PKG_CONFIG --variable includedir libdrm`/drm"
+ VIDEO_SUBDIRS="$VIDEO_SUBDIRS drm"
+ VIDEO_DRIVERS="$VIDEO_DRIVERS drm/libvideo_drm.la"
+ DEP_LIBS="$DEP_LIBS -ldrm -ldl"
+ DRM_INC_DIR="`$PKG_CONFIG --variable includedir libdrm`/libdrm"
AC_SUBST(DRM_INC_DIR)
else
- AC_MSG_WARN([$video_dri])
+ AC_MSG_WARN([$video_drm])
fi
fi
fi
@@ -2636,7 +2636,7 @@ src/font/Makefile
src/font/in-core/Makefile
src/newgal/Makefile
src/newgal/fbcon/Makefile
-src/newgal/dri/Makefile
+src/newgal/drm/Makefile
src/newgal/qvfb/Makefile
src/newgal/pcxvfb/Makefile
src/newgal/wvfb/Makefile
@@ -2713,7 +2713,7 @@ AC_MSG_NOTICE([
* dummy: ${enable_video_dummy}
* pc_xvfb: ${enable_video_pc_xvfb}
* usvfb: ${enable_video_usvfb}
- * dri: ${enable_video_dri}
+ * drm: ${enable_video_drm}
* fbcon: ${enable_video_fbcon}
* commlcd: ${enable_video_commlcd}
diff --git a/etc/MiniGUI.cfg b/etc/MiniGUI.cfg
index a926c21d..36089e80 100644
--- a/etc/MiniGUI.cfg
+++ b/etc/MiniGUI.cfg
@@ -22,10 +22,13 @@
[system]
# GAL engine and default options
+# The equivalent environment variable: MG_GAL_ENGINE
gal_engine=pc_xvfb
+# The equivalent environment variable: MG_DEFAULTMODE
defaultmode=800x600-16bpp
# IAL engine
+# The equivalent environment variable: MG_IAL_ENGINE
ial_engine=pc_xvfb
mdev=/dev/input/mice
mtype=IMPS2
@@ -33,8 +36,8 @@ mtype=IMPS2
# Linux IAL engine based on libinput
# ial_engine=libinut
-#{{ifdef _MGGAL_DRI
-[dri]
+#{{ifdef _MGGAL_DRM
+[drm]
defaultmode=1024x768-32bpp
# We use DRM fourcc code to defined the pixel format of the video surface.
@@ -44,10 +47,15 @@ pixelformat=XR24
# The DRI device
device=/dev/dri/card0
+
# The resolution of the display
# It is defined in dots (physical pixels) per inch
# The default value is 96.
dpi=96
+
+# The filename of the shared library for the external driver.
+# The equivalent environment variable: MG_GAL_DRM_DRIVER
+exdriver=libhidrmdrivers.so.0
#}}
#{{ifdef _MGIAL_LIBINPUT
diff --git a/include/common.h b/include/common.h
index 339074c9..2b9401de 100644
--- a/include/common.h
+++ b/include/common.h
@@ -50,7 +50,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
@@ -2318,7 +2318,6 @@ int init_minigui_printf (int (*output_char) (int ch),
TCS_BROWN (stderr); \
fprintf (stderr, "%s: ", __FUNCTION__); \
fprintf (stderr, fmt, ##__VA_ARGS__); \
- fprintf (stderr, "\n"); \
TCS_NONE (stderr); \
} while (0)
@@ -2333,11 +2332,12 @@ int init_minigui_printf (int (*output_char) (int ch),
# define _DBG_PRINTF(fmt, ...) \
do { \
TCS_YELLOW (stderr); \
+ fprintf (stderr, "%s: ", __FUNCTION__); \
fprintf (stderr, fmt, ##__VA_ARGS__); \
TCS_NONE (stderr); \
} while (0)
# else
-# define _DBG_PRINTF(fmt, ...)
+# define _DBG_PRINTF(fmt, ...) do { } while (0)
#endif
#ifdef _MGRM_THREADS
diff --git a/include/control.h b/include/control.h
index aff39ee8..9da3e6ad 100644
--- a/include/control.h
+++ b/include/control.h
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/animation.h b/include/ctrl/animation.h
index 375c6b5b..0cd322f6 100644
--- a/include/ctrl/animation.h
+++ b/include/ctrl/animation.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/button.h b/include/ctrl/button.h
index 8d509b2a..b240d8c9 100644
--- a/include/ctrl/button.h
+++ b/include/ctrl/button.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/combobox.h b/include/ctrl/combobox.h
index 5d3c3412..b1fec22b 100644
--- a/include/ctrl/combobox.h
+++ b/include/ctrl/combobox.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/coolbar.h b/include/ctrl/coolbar.h
index b1d2bea2..63437598 100644
--- a/include/ctrl/coolbar.h
+++ b/include/ctrl/coolbar.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/ctrlhelper.h b/include/ctrl/ctrlhelper.h
index 112fde5f..9e284263 100644
--- a/include/ctrl/ctrlhelper.h
+++ b/include/ctrl/ctrlhelper.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/edit.h b/include/ctrl/edit.h
index 4cdfc6fc..d1c83aee 100644
--- a/include/ctrl/edit.h
+++ b/include/ctrl/edit.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/gridview.h b/include/ctrl/gridview.h
index 9e8af502..fba5be6c 100644
--- a/include/ctrl/gridview.h
+++ b/include/ctrl/gridview.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/iconview.h b/include/ctrl/iconview.h
index a9a2f7ba..8d02942e 100644
--- a/include/ctrl/iconview.h
+++ b/include/ctrl/iconview.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/listbox.h b/include/ctrl/listbox.h
index 67379c24..f2560684 100644
--- a/include/ctrl/listbox.h
+++ b/include/ctrl/listbox.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/listview.h b/include/ctrl/listview.h
index c5e41ff0..da8f0eb7 100644
--- a/include/ctrl/listview.h
+++ b/include/ctrl/listview.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/menubutton.h b/include/ctrl/menubutton.h
index 2cea6207..5e98a4a0 100644
--- a/include/ctrl/menubutton.h
+++ b/include/ctrl/menubutton.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/monthcal.h b/include/ctrl/monthcal.h
index a6c26e8c..38d38305 100644
--- a/include/ctrl/monthcal.h
+++ b/include/ctrl/monthcal.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/newtoolbar.h b/include/ctrl/newtoolbar.h
index 3bcfddde..32245d35 100644
--- a/include/ctrl/newtoolbar.h
+++ b/include/ctrl/newtoolbar.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/progressbar.h b/include/ctrl/progressbar.h
index 75958cc5..2ac07b7e 100644
--- a/include/ctrl/progressbar.h
+++ b/include/ctrl/progressbar.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/propsheet.h b/include/ctrl/propsheet.h
index 127b6310..1aed802c 100644
--- a/include/ctrl/propsheet.h
+++ b/include/ctrl/propsheet.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/scrollbar.h b/include/ctrl/scrollbar.h
index 2726f57f..4f942a52 100644
--- a/include/ctrl/scrollbar.h
+++ b/include/ctrl/scrollbar.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/scrollview.h b/include/ctrl/scrollview.h
index f337ba35..0ae04da9 100644
--- a/include/ctrl/scrollview.h
+++ b/include/ctrl/scrollview.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/spinbox.h b/include/ctrl/spinbox.h
index d063174b..06561453 100644
--- a/include/ctrl/spinbox.h
+++ b/include/ctrl/spinbox.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/static.h b/include/ctrl/static.h
index c33ace8b..d11bbe6d 100644
--- a/include/ctrl/static.h
+++ b/include/ctrl/static.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/textedit.h b/include/ctrl/textedit.h
index 5610f90d..9dbbf15e 100644
--- a/include/ctrl/textedit.h
+++ b/include/ctrl/textedit.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/trackbar.h b/include/ctrl/trackbar.h
index aa86c873..08ea6e43 100644
--- a/include/ctrl/trackbar.h
+++ b/include/ctrl/trackbar.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ctrl/treeview.h b/include/ctrl/treeview.h
index cc1121bd..5cc16641 100644
--- a/include/ctrl/treeview.h
+++ b/include/ctrl/treeview.h
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/customial.h b/include/customial.h
index 516e7bef..ea36bdba 100644
--- a/include/customial.h
+++ b/include/customial.h
@@ -48,7 +48,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/dti.c b/include/dti.c
index af423b6d..ddb7bbe9 100644
--- a/include/dti.c
+++ b/include/dti.c
@@ -47,7 +47,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/endianrw.h b/include/endianrw.h
index 55550b29..c5717a5c 100644
--- a/include/endianrw.h
+++ b/include/endianrw.h
@@ -52,7 +52,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/exstubs.h b/include/exstubs.h
index a1a857ff..d9924a7e 100644
--- a/include/exstubs.h
+++ b/include/exstubs.h
@@ -24,7 +24,7 @@
and Graphics User Interface (GUI) support system for embedded systems
and smart IoT devices.
- Copyright (C) 2007~2018, Beijing FMSoft Technologies Co., Ltd.
+ Copyright (C) 2007~2019, Beijing FMSoft Technologies Co., Ltd.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
@@ -62,6 +62,8 @@
#ifndef GUI_EXSTUBS_H
#define GUI_EXSTUBS_H
+#include
+
/**
* \defgroup external_stubs External Stubs
*
@@ -74,9 +76,7 @@
extern "C" {
#endif /* __cplusplus */
-#ifdef _MGGAL_DRI
-
-#include
+#ifdef _MGGAL_DRM
/**
* \defgroup external_stubs_dri External Stubs for DRI sub driver
@@ -88,30 +88,48 @@ extern "C" {
* The struct type represents the DRI sub driver.
* The concrete struct should be defined by the driver.
*/
-struct _DriDriver;
-typedef struct _DriDriver DriDriver;
+struct _DrmDriver;
+typedef struct _DrmDriver DrmDriver;
/**
* The struct type represents the bufffer can be used by
* MiniGUI NEWGAL engine for hardware surface.
*/
-typedef struct _DriSurfaceBuffer {
- uint32_t buff_id;
+typedef struct _DrmSurfaceBuffer {
+ /** The prime fd of the buffer */
+ int prime_fd;
+ /** The global name of the buffer */
+ uint32_t name;
+ /** The local handle of the buffer */
+ uint32_t handle;
+ /** The buffer identifier */
+ uint32_t id;
+ /** The widht of the buffer */
uint32_t width;
+ /** The height of the buffer */
uint32_t height;
+ /** The pitch (row stride in bytes) of the buffer */
uint32_t pitch;
-
+ /** The DRM format of the buffer */
uint32_t drm_format;
- uint16_t bpp:8;
- uint16_t cpp:8;
+ /** The bits per pixel */
+ uint32_t bpp:8;
+ /** The bytes per pixel */
+ uint32_t cpp:8;
+ /** Is foreign surface */
+ uint32_t foreign:1;
+
+ /** The whole size in bytes of the buffer */
+ unsigned long size;
+ /** The mapped address of the buffer; NULL when the buffer is not mapped yet. */
uint8_t* pixels;
-} DriSurfaceBuffer;
+} DrmSurfaceBuffer;
/**
* The color logic operations.
*/
-enum DriColorLogicOp {
+enum DrmColorLogicOp {
COLOR_LOGICOP_CLEAR = 0,
COLOR_LOGICOP_NOR = 1,
COLOR_LOGICOP_AND_INVERTED = 2,
@@ -133,45 +151,72 @@ enum DriColorLogicOp {
/**
* The struct type defines the operations for a DRI driver.
*/
-typedef struct _DriDriverOps {
+typedef struct _DrmDriverOps {
/**
- * This operation creates the DriDriver object.
+ * This operation creates the DrmDriver object.
*
* \note The driver must implement this operation.
*/
- DriDriver* (*create_driver) (int device_fd);
+ DrmDriver* (*create_driver) (int device_fd);
/**
- * This operation destroies the DriDriver object.
+ * This operation destroies the DrmDriver object.
*
* \note The driver must implement this operation.
*/
- void (*destroy_driver) (DriDriver *driver);
+ void (*destroy_driver) (DrmDriver *driver);
/**
* This operation flushs the batch buffer of the driver or the hardware cache.
*
* \note This operation can be NULL.
*/
- void (* flush_driver) (DriDriver *driver);
+ void (* flush_driver) (DrmDriver *driver);
/**
* This operation creates a buffer with the specified pixel format,
- * width, and height. If succeed, a valid (not zero) buffer identifier
- * and the picth (row stride in bytes) will be returned.
- * If failed, it returns 0.
+ * width, and height. If succeed, a valid DrmSurfaceBuffer object will
+ * be returned; NULL on error. Note that the field of `pixels` of the
+ * DrmSurfaceBuffer object is NULL until the \a map_buffer was called.
*
* \note The driver must implement this operation.
*/
- uint32_t (* create_buffer) (DriDriver *driver,
+ DrmSurfaceBuffer* (* create_buffer) (DrmDriver *driver,
uint32_t drm_format,
- unsigned int width, unsigned int height,
- unsigned int *pitch);
+ unsigned int width, unsigned int height);
- BOOL (* fetch_buffer) (DriDriver *driver,
- uint32_t buffer_id,
- unsigned int *width, unsigned int *height,
- unsigned int *pitch);
+ /**
+ * This operation creates a buffer for the given handle
+ * with the specified pixel format, width, and height. If succeed,
+ * a valid DrmSurfaceBuffer object will be returned; NULL on error.
+ *
+ * \note This operation can be NULL.
+ */
+ DrmSurfaceBuffer* (* create_buffer_from_handle) (DrmDriver *driver,
+ uint32_t handle, unsigned long size, uint32_t drm_format,
+ unsigned int width, unsigned int height, unsigned int pitch);
+
+ /**
+ * This operation creates a buffer for the given system global name
+ * with the specified pixel format, width, and height. If succeed,
+ * a valid DrmSurfaceBuffer object will be returned; NULL on error.
+ *
+ * \note This operation can be NULL.
+ */
+ DrmSurfaceBuffer* (* create_buffer_from_name) (DrmDriver *driver,
+ uint32_t name, uint32_t drm_format,
+ unsigned int width, unsigned int height, unsigned int pitch);
+
+ /**
+ * This operation creates a buffer for the given PRIME file descriptor
+ * with the specified pixel format, width, height, and pitch. If succeed,
+ * a valid DrmSurfaceBuffer object will be returned; NULL on error.
+ *
+ * \note This operation can be NULL.
+ */
+ DrmSurfaceBuffer* (* create_buffer_from_prime_fd) (DrmDriver *driver,
+ int prime_fd, unsigned long size, uint32_t drm_format,
+ unsigned int width, unsigned int height, unsigned int pitch);
/**
* This operation maps the buffer into the current process's virtual memory
@@ -179,22 +224,21 @@ typedef struct _DriDriverOps {
*
* \note The driver must implement this operation.
*/
- DriSurfaceBuffer* (* map_buffer) (DriDriver *driver,
- uint32_t buffer_id);
+ uint8_t* (* map_buffer) (DrmDriver *driver, DrmSurfaceBuffer* buffer);
/**
* This operation un-maps a buffer.
*
* \note The driver must implement this operation.
*/
- void (* unmap_buffer) (DriDriver *driver, DriSurfaceBuffer* buffer);
+ void (* unmap_buffer) (DrmDriver *driver, DrmSurfaceBuffer* buffer);
/**
* This operation destroies a buffer.
*
* \note The driver must implement this operation.
*/
- void (* destroy_buffer) (DriDriver *driver, uint32_t buffer_id);
+ void (* destroy_buffer) (DrmDriver *driver, DrmSurfaceBuffer* buffer);
/**
* This operation clears the specific rectangle area of a buffer
@@ -203,8 +247,8 @@ typedef struct _DriDriverOps {
* \note If this operation is set as NULL, the driver does not support
* hardware accelerated clear operation.
*/
- int (* clear_buffer) (DriDriver *driver,
- DriSurfaceBuffer* dst_buf, const GAL_Rect* rc, uint32_t pixel_value);
+ int (* clear_buffer) (DrmDriver *driver,
+ DrmSurfaceBuffer* dst_buf, const GAL_Rect* rc, uint32_t pixel_value);
/**
* This operation checks whether a hardware accelerated blit
@@ -214,8 +258,8 @@ typedef struct _DriDriverOps {
* \note If this operation is set as NULL, it will be supposed that
* the driver does not support any hardware accelerated blit operation.
*/
- int (* check_blit) (DriDriver *driver,
- DriSurfaceBuffer* src_buf, DriSurfaceBuffer* dst_buf);
+ int (* check_blit) (DrmDriver *driver,
+ DrmSurfaceBuffer* src_buf, DrmSurfaceBuffer* dst_buf);
/**
* This operation copies bits from a source buffer to a destination buffer.
@@ -223,10 +267,10 @@ typedef struct _DriDriverOps {
* \note If this operation is set as NULL, the driver does not support
* hardware accelerated copy blit.
*/
- int (* copy_blit) (DriDriver *driver,
- DriSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
- DriSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc,
- enum DriColorLogicOp logic_op);
+ int (* copy_blit) (DrmDriver *driver,
+ DrmSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
+ DrmSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc,
+ enum DrmColorLogicOp logic_op);
/**
* This operation blits pixles from a source buffer with the source alpha value
@@ -235,9 +279,9 @@ typedef struct _DriDriverOps {
* \note If this operation is set as NULL, the driver does not support
* hardware accelerated blit with alpha.
*/
- int (* alpha_blit) (DriDriver *driver,
- DriSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
- DriSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc, uint8_t alpha);
+ int (* alpha_blit) (DrmDriver *driver,
+ DrmSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
+ DrmSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc, uint8_t alpha);
/**
* This operation blits pixles from a source buffer to a destination buffer,
@@ -246,9 +290,9 @@ typedef struct _DriDriverOps {
* \note If this operation is set as NULL, the driver does not support
* hardware accelerated blit with color key.
*/
- int (* key_blit) (DriDriver *driver,
- DriSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
- DriSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc, uint32_t color_key);
+ int (* key_blit) (DrmDriver *driver,
+ DrmSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
+ DrmSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc, uint32_t color_key);
/**
* This operation blits pixles from a source buffer with the source alpha value
@@ -257,19 +301,19 @@ typedef struct _DriDriverOps {
* \note If this operation is set as NULL, the driver does not support
* hardware accelerated blit with alpha and color key.
*/
- int (* alpha_key_blit) (DriDriver *driver,
- DriSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
- DriSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc,
+ int (* alpha_key_blit) (DrmDriver *driver,
+ DrmSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
+ DrmSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc,
uint8_t alpha, uint32_t color_key);
-} DriDriverOps;
+} DrmDriverOps;
/** Implement this stub to return the DRI driver operations */
-DriDriverOps* __dri_ex_driver_get (const char* driver_name);
+DrmDriverOps* __drm_ex_driver_get (const char* driver_name, int device_fd);
/** @} end of external_stubs_dri */
-#endif /* _MGGAL_DRI */
+#endif /* _MGGAL_DRM */
#ifdef _MGGAL_COMMLCD
diff --git a/include/fixedmath.h b/include/fixedmath.h
index 9a2a5b24..4c1f3dcd 100644
--- a/include/fixedmath.h
+++ b/include/fixedmath.h
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/gdi.h b/include/gdi.h
index 1cc90548..99d9eb81 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -23,7 +23,7 @@
and Graphics User Interface (GUI) support system for embedded systems
and smart IoT devices.
- Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd.
+ Copyright (C) 2002~2019, Beijing FMSoft Technologies Co., Ltd.
Copyright (C) 1998~2002, WEI Yongming
This program is free software: you can redistribute it and/or modify
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
@@ -1389,6 +1389,48 @@ MG_EXPORT HDC GUIAPI CreateCompatibleDCEx (HDC hdc, int width, int height);
*/
MG_EXPORT BOOL GUIAPI IsCompatibleDC (HDC hdc1, HDC hdc2);
+/**
+ * \fn BOOL GUIAPI IsMemDC (HDC hdc)
+ * \brief Check whether a given DC is a memory DC.
+ *
+ * This function checks whether a give DC \a hdc is a memory DC.
+ *
+ * \param hdc The handle to the DC.
+ *
+ * \return TRUE for memory DC, otherwise FALSE.
+ *
+ * \sa CreateMemDCEx
+ */
+MG_EXPORT BOOL GUIAPI IsMemDC (HDC hdc);
+
+/**
+ * \fn BOOL GUIAPI IsScreenDC (HDC hdc)
+ * \brief Check whether a given DC is a screen DC.
+ *
+ * This function checks whether a give DC \a hdc is a screen DC.
+ *
+ * \param hdc The handle to the DC.
+ *
+ * \return TRUE for screen DC, otherwise FALSE.
+ *
+ * \sa CreateMemDCEx
+ */
+MG_EXPORT BOOL GUIAPI IsScreenDC (HDC hdc);
+
+/**
+ * \fn BOOL GUIAPI IsWindowDC (HDC hdc)
+ * \brief Check whether a given DC is a window DC.
+ *
+ * This function checks whether a give DC \a hdc is a window DC.
+ *
+ * \param hdc The handle to the DC.
+ *
+ * \return TRUE for window DC, otherwise FALSE.
+ *
+ * \sa CreateMemDCEx
+ */
+MG_EXPORT BOOL GUIAPI IsWindowDC (HDC hdc);
+
/**
* \fn HDC GUIAPI CreateMemDCEx (int width, int height, int depth, DWORD flags, \
Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask,
@@ -13646,6 +13688,140 @@ MG_EXPORT int GUIAPI SetUserCompositionOps (HDC hdc,
CB_COMP_PUTHLINE comp_puthline,
void* user_comp_ctxt);
+/**
+ * This function gets the video handle which corresponds to the given
+ * device context.
+ *
+ * \param hdc The device context.
+ *
+ * \return The handle to the video; NULL on error.
+ *
+ * Since 4.0.4
+ */
+MG_EXPORT GHANDLE GetVideoHandle (HDC hdc);
+
+#ifdef _MGGAL_DRM
+
+/**
+ * \defgroup gdi_drm_fns Functions for Linux DRM integration
+ *
+ * These functions can be used to get the DRM device file descriptor and the
+ * information of the hardware surface corresponding to the DC which is
+ * created by the Linux DRM engine. By using the information, we can
+ * integrate MiniGUI with other graphics libraries, such as Cairo
+ * (vector graphics) and Mesa (3D graphics).
+ *
+ * \note Only available when support for Linuxe DRM NEWGAL engine
+ * (`_MGGAL_DRM`) is enabled.
+ *
+ * Since 4.0.4
+ *
+ * @{
+ */
+
+/**
+ * This function gets the file descriptor opened by the Linux DRM engine.
+ *
+ * \param video The video handle returned by \a GetVideoHandle.
+ *
+ * \return The DRM device file descriptor opened by the Linux DRM engine;
+ * >= 0 for success and < 0 on error. If \a surface is not a hardware
+ * surface created by the DRM engine, this function returns -1.
+ */
+MG_EXPORT int drmGetDeviceFD (GHANDLE video);
+
+/**
+ * THe struct type defines the DRM surface information.
+ */
+typedef struct _DrmSurfaceInfo {
+ /** The prime fd of the buffer object. */
+ int prime_fd;
+ /** The global name of the buffer object. */
+ uint32_t name;
+ /** The local handle of the buffer object. */
+ uint32_t handle;
+ /** The buffer identifier. */
+ uint32_t id;
+ /** The width of the surface. */
+ uint32_t width;
+ /** The height of the surface. */
+ uint32_t height;
+ /** The row stride of the surface. */
+ uint32_t pitch;
+ /** The DRM pixel format. */
+ uint32_t drm_format;
+ /** Size in bytes of the buffer object. */
+ unsigned long size;
+} DrmSurfaceInfo;
+
+/**
+ * This function gets the DRM surface information from the handle of the surface.
+ *
+ * \param surface The handle to the surface.
+ * \param info The pointer to a DrmSurfaceInfo structure to hold
+ * the surface information.
+ *
+ * \return TRUE for success, FALSE for failure.
+ */
+MG_EXPORT BOOL drmGetSurfaceInfo (GHANDLE video, HDC hdc, DrmSurfaceInfo* info);
+
+/**
+ * This function creates a memory DC with a DRM surface which is created by
+ * a foreign process and identified by a global name handle.
+ *
+ * \param video The video handle.
+ * \param name The name handle of the DRM surface.
+ * \param drm_format The DRM pixel format.
+ * \param width The width of the DRM surface.
+ * \param height The height of the DRM surface.
+ * \param pitch The pitch (row stride) of the DRM surface.
+ *
+ * \return The handle to the memory DC for success, HDC_INVALID for failure.
+ */
+MG_EXPORT HDC drmCreateDCFromName (GHANDLE video,
+ uint32_t name, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch);
+
+/**
+ * This function creates a memory DC with a DRM surface which is created by
+ * a foreign process and identified by a PRIME file descriptor.
+ *
+ * \param video The video handle.
+ * \param prime_fd The PRIME file descriptor.
+ * \param size The size of the DRM surface in bytes.
+ * \param drm_format The DRM pixel format.
+ * \param width The width of the DRM surface.
+ * \param height The height of the DRM surface.
+ * \param pitch The pitch (row stride) of the DRM surface.
+ *
+ * \return The handle to the memory DC for success, HDC_INVALID for failure.
+ */
+MG_EXPORT HDC drmCreateDCFromPrimeFd (GHANDLE video,
+ int prime_fd, unsigned long size, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch);
+
+/**
+ * This function creates a memory DC with a DRM surface which is created by
+ * a foreign graphics component.
+ *
+ * \param video The video handle.
+ * \param handle The handle of the DRM surface.
+ * \param size The size of the DRM surface in bytes.
+ * \param drm_format The DRM pixel format.
+ * \param width The width of the DRM surface.
+ * \param height The height of the DRM surface.
+ * \param pitch The pitch (row stride) of the DRM surface.
+ *
+ * \return The handle to the memory DC for success, HDC_INVALID for failure.
+ */
+MG_EXPORT HDC drmCreateDCFromHandle (GHANDLE video,
+ uint32_t handle, unsigned long size, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch);
+
+/** @} end of gdi_drm_fns */
+
+#endif /* _MGGAL_DRM */
+
/** @} end of gdi_fns */
#ifdef _MGGAL_HI3560
diff --git a/include/minigui.h b/include/minigui.h
index a8125d53..c2a146ca 100644
--- a/include/minigui.h
+++ b/include/minigui.h
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
@@ -274,13 +274,13 @@ extern MG_EXPORT MG_Layer* mgLayers;
*/
/**
-* \fn int GUIAPI InitGUI (int, const char **)
+* \fn int GUIAPI InitGUI (int argc, const char *argv[])
* \brief Initialize MiniGUI.
*
* The meaning of two parameters is same with parameters of main function.
*
**/
-MG_EXPORT int GUIAPI InitGUI (int, const char **);
+MG_EXPORT int GUIAPI InitGUI (int argc, const char *argv[]);
/**
* \fn void GUIAPI TerminateGUI (int not_used)
diff --git a/include/nucleus_pthread.h b/include/nucleus_pthread.h
index 81c75d7b..ec0a66c7 100644
--- a/include/nucleus_pthread.h
+++ b/include/nucleus_pthread.h
@@ -54,7 +54,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/nucleus_semaphore.h b/include/nucleus_semaphore.h
index ef634e70..eced6583 100644
--- a/include/nucleus_semaphore.h
+++ b/include/nucleus_semaphore.h
@@ -57,7 +57,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ose_semaphore.h b/include/ose_semaphore.h
index e70600c7..12ef85c9 100644
--- a/include/ose_semaphore.h
+++ b/include/ose_semaphore.h
@@ -57,7 +57,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/own_stdio.h b/include/own_stdio.h
index 44d46b0a..66b8a1b9 100644
--- a/include/own_stdio.h
+++ b/include/own_stdio.h
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/psos.h b/include/psos.h
index 56123821..66504ea3 100644
--- a/include/psos.h
+++ b/include/psos.h
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/psos_pthread.h b/include/psos_pthread.h
index 046dd5b8..2d3631cc 100644
--- a/include/psos_pthread.h
+++ b/include/psos_pthread.h
@@ -57,7 +57,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/psos_semaphore.h b/include/psos_semaphore.h
index b00061d5..cb712f05 100644
--- a/include/psos_semaphore.h
+++ b/include/psos_semaphore.h
@@ -57,7 +57,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/threadx_pthread.h b/include/threadx_pthread.h
index 3a62416a..227610a4 100644
--- a/include/threadx_pthread.h
+++ b/include/threadx_pthread.h
@@ -56,7 +56,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/threadx_semaphore.h b/include/threadx_semaphore.h
index 666a5454..cef61a73 100644
--- a/include/threadx_semaphore.h
+++ b/include/threadx_semaphore.h
@@ -56,7 +56,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ucos2_pthread.h b/include/ucos2_pthread.h
index 5efe4847..88c52f13 100644
--- a/include/ucos2_pthread.h
+++ b/include/ucos2_pthread.h
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/ucos2_semaphore.h b/include/ucos2_semaphore.h
index 95aa07ef..32d07f9f 100644
--- a/include/ucos2_semaphore.h
+++ b/include/ucos2_semaphore.h
@@ -50,7 +50,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/vcongui.h b/include/vcongui.h
index a07963e7..3cc5dbaf 100644
--- a/include/vcongui.h
+++ b/include/vcongui.h
@@ -52,7 +52,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/vxworks_pthread.h b/include/vxworks_pthread.h
index 9b749007..707e9eea 100644
--- a/include/vxworks_pthread.h
+++ b/include/vxworks_pthread.h
@@ -56,7 +56,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/vxworks_semaphore.h b/include/vxworks_semaphore.h
index 41c48e71..448c87fe 100644
--- a/include/vxworks_semaphore.h
+++ b/include/vxworks_semaphore.h
@@ -61,7 +61,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/win32_dirent.h b/include/win32_dirent.h
index ec015cdb..4ea0989a 100644
--- a/include/win32_dirent.h
+++ b/include/win32_dirent.h
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/window.h b/include/window.h
index d0def0ea..9f00dbe6 100644
--- a/include/window.h
+++ b/include/window.h
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/include/xvfb.h b/include/xvfb.h
index 4f0f708c..27eab169 100644
--- a/include/xvfb.h
+++ b/include/xvfb.h
@@ -49,7 +49,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/rtos/nucleus_startup.c b/rtos/nucleus_startup.c
index 024d00e9..a93c108a 100644
--- a/rtos/nucleus_startup.c
+++ b/rtos/nucleus_startup.c
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
- .
+ .
\endverbatim
*/
diff --git a/rtos/psos_startup.c b/rtos/psos_startup.c
index 919de77d..cfb55f7e 100644
--- a/rtos/psos_startup.c
+++ b/rtos/psos_startup.c
@@ -29,7 +29,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/rtos/threadx_startup.c b/rtos/threadx_startup.c
index 2092ae96..2d68be51 100644
--- a/rtos/threadx_startup.c
+++ b/rtos/threadx_startup.c
@@ -29,7 +29,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/rtos/ucos2_startup.c b/rtos/ucos2_startup.c
index 3720922f..6ead6ee9 100644
--- a/rtos/ucos2_startup.c
+++ b/rtos/ucos2_startup.c
@@ -29,7 +29,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/rtos/vxworks_startup.c b/rtos/vxworks_startup.c
index b6d9a922..1562746d 100644
--- a/rtos/vxworks_startup.c
+++ b/rtos/vxworks_startup.c
@@ -29,7 +29,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/client/cliconn.c b/src/client/cliconn.c
index cefb6e38..5e645026 100644
--- a/src/client/cliconn.c
+++ b/src/client/cliconn.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** cliconn.c: Create a client endpoint and connect to a server.
diff --git a/src/client/client.c b/src/client/client.c
index d2cd1273..969a02c9 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** client.c: routines for client.
diff --git a/src/control/bidiedit.c b/src/control/bidiedit.c
index 2e20a050..09499d30 100644
--- a/src/control/bidiedit.c
+++ b/src/control/bidiedit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** bidiedit.c: the BIDI Single Line Edit Control module.
diff --git a/src/control/bidiedit_impl.h b/src/control/bidiedit_impl.h
index 46dd821a..5c934ddb 100644
--- a/src/control/bidiedit_impl.h
+++ b/src/control/bidiedit_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** bidiedit_impl.h: the head file of BidiEdit Control module.
diff --git a/src/control/button.c b/src/control/button.c
index c6d65fdd..4092c4e2 100644
--- a/src/control/button.c
+++ b/src/control/button.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** button.c: the Button Control module.
diff --git a/src/control/button_impl.h b/src/control/button_impl.h
index 94e19ee0..0b2f1730 100644
--- a/src/control/button_impl.h
+++ b/src/control/button_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** button.h: the head file of Button Control module.
diff --git a/src/control/combobox.c b/src/control/combobox.c
index 230a068b..5e93e9dc 100644
--- a/src/control/combobox.c
+++ b/src/control/combobox.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** cobmobox.c: the cobmobox control.
@@ -364,7 +364,7 @@ static LRESULT ComboBoxCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM
DWORD list_style, edit_style;
if (!(pData = calloc (1, sizeof (COMBOBOXDATA)))) {
- _WRN_PRINTF ("Create control failure!");
+ _ERR_PRINTF ("CONTROL>COMBOBOX: failed to allocate memory to create control instance!\n");
return -1;
}
diff --git a/src/control/combobox_impl.h b/src/control/combobox_impl.h
index 296175ec..10a33d2e 100644
--- a/src/control/combobox_impl.h
+++ b/src/control/combobox_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** combobox.h: the head file of ComboBox control.
diff --git a/src/control/ctrlmisc.c b/src/control/ctrlmisc.c
index 8b20a4f4..18b06caf 100644
--- a/src/control/ctrlmisc.c
+++ b/src/control/ctrlmisc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ctrlmisc.c: the help routines for MiniGUI control.
diff --git a/src/control/ctrlmisc.h b/src/control/ctrlmisc.h
index e1cf0d98..4d60f246 100644
--- a/src/control/ctrlmisc.h
+++ b/src/control/ctrlmisc.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ctrlmisc.c: the head file of Control Misc module.
diff --git a/src/control/edit.c b/src/control/edit.c
index c3553bb0..0b84eef1 100644
--- a/src/control/edit.c
+++ b/src/control/edit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** edit.c: the Single Line Edit Control module.
diff --git a/src/control/edit_impl.h b/src/control/edit_impl.h
index 782cac17..7476951a 100644
--- a/src/control/edit_impl.h
+++ b/src/control/edit_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** edit_impl.h: the head file of Edit Control module.
diff --git a/src/control/listbox.c b/src/control/listbox.c
index 91b88529..7e54510c 100644
--- a/src/control/listbox.c
+++ b/src/control/listbox.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** listbox.c: the List Box Control module.
@@ -573,11 +573,11 @@ static void lstOnDrawSListBoxItems (HWND hWnd, HDC hdc,
gal_pixel gp_bkcolor;
pWin = (PCONTROL) hWnd;
- if (NULL == pWin) return;
+ if (NULL == pWin)
+ return;
- if (!pWin->we_rdr)
- {
- _WRN_PRINTF ("NULL LFRDR.");
+ if (!pWin->we_rdr) {
+ _ERR_PRINTF ("CONTROL>LISTBOX: NULL LFRDR.\n");
return;
}
@@ -720,10 +720,8 @@ static int lstSelectItem (HWND hwnd, PLISTBOXDATA pData, int newSel)
if (newItem->dwFlags & LBIF_DISABLE)
return newSel;
-#ifdef _DEBUG
if (!newItem)
- _WRN_PRINTF ("return value of lstGetItem is NULL.");
-#endif
+ _DBG_PRINTF ("return value of lstGetItem is NULL.\n");
if (GetWindowStyle (hwnd) & LBS_MULTIPLESEL) {
newItem->dwFlags ^= LBIF_SELECTED;
diff --git a/src/control/listbox_impl.h b/src/control/listbox_impl.h
index dd9c2b74..e2727fc8 100644
--- a/src/control/listbox_impl.h
+++ b/src/control/listbox_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** listbox.h: the head file of ListBox control.
diff --git a/src/control/listmodel.c b/src/control/listmodel.c
index e1dde70a..f9ba1300 100644
--- a/src/control/listmodel.c
+++ b/src/control/listmodel.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** listmodel.c: List data model.
diff --git a/src/control/listmodel.h b/src/control/listmodel.h
index f91cc2fa..cc9fc422 100644
--- a/src/control/listmodel.h
+++ b/src/control/listmodel.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** listmodel.h: header file of item data model.
diff --git a/src/control/medit_impl.h b/src/control/medit_impl.h
index 5cb7603d..9b3123bb 100644
--- a/src/control/medit_impl.h
+++ b/src/control/medit_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** medit.h: the head file of Multi-Line Edit control.
diff --git a/src/control/menubutton.c b/src/control/menubutton.c
index 3b588205..474edb23 100644
--- a/src/control/menubutton.c
+++ b/src/control/menubutton.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** button.c: the Menu Button Control module.
diff --git a/src/control/menubutton_impl.h b/src/control/menubutton_impl.h
index 24beb54a..b9b380f6 100644
--- a/src/control/menubutton_impl.h
+++ b/src/control/menubutton_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** menubutton.h: the head file of menu button control.
diff --git a/src/control/newtoolbar.c b/src/control/newtoolbar.c
index 29e66278..8970fb64 100644
--- a/src/control/newtoolbar.c
+++ b/src/control/newtoolbar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** newtoolbar.c: the new-toolbar control module.
diff --git a/src/control/newtoolbar_impl.h b/src/control/newtoolbar_impl.h
index 8ab2c003..d8a530e4 100644
--- a/src/control/newtoolbar_impl.h
+++ b/src/control/newtoolbar_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** newtoolbar.h: the head file of NewToolBar control module.
diff --git a/src/control/progressbar.c b/src/control/progressbar.c
index 800b9c08..9fd555ad 100644
--- a/src/control/progressbar.c
+++ b/src/control/progressbar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** progressbar.c: the Progress Bar Control module.
@@ -116,7 +116,6 @@ ProgressBarCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
case MSG_CREATE:
if (!(pData = malloc (sizeof (PROGRESSDATA)))) {
- _WRN_PRINTF ("Create control failure!");
return -1;
}
diff --git a/src/control/progressbar_impl.h b/src/control/progressbar_impl.h
index 6a3d7806..ded8b643 100644
--- a/src/control/progressbar_impl.h
+++ b/src/control/progressbar_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** prograssbar.h: the head file of PrograssBar control.
diff --git a/src/control/propsheet.c b/src/control/propsheet.c
index 84d870a7..7a33d7c0 100644
--- a/src/control/propsheet.c
+++ b/src/control/propsheet.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** propsheet.c: the Property Sheet (Tab) control.
diff --git a/src/control/propsheet_impl.h b/src/control/propsheet_impl.h
index be661434..99038e82 100644
--- a/src/control/propsheet_impl.h
+++ b/src/control/propsheet_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** propsheet.h: the head file of PropSheet control.
diff --git a/src/control/scrollbar.c b/src/control/scrollbar.c
index 283d15db..84f99149 100644
--- a/src/control/scrollbar.c
+++ b/src/control/scrollbar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scrollbar.c: the scrollbar control.
@@ -185,15 +185,15 @@ static int init_sbdata (HWND hwnd, PSCROLLBARDATA pdata, RECT * scRect)
DWORD win_style = GetWindowStyle (hwnd);
if (!GetWindowRect (hwnd, scRect)) {
- _WRN_PRINTF ("ScrollBar Rect error!");
+ _ERR_PRINTF ("CONTROL>SCROLLBAR: internal error!\n");
return -1;
}
- if ((win_style & SBS_NOSHAFT) && (win_style & SBS_NOARROW))
- {
- _WRN_PRINTF ("ScrollBar styles error!");
+ if ((win_style & SBS_NOSHAFT) && (win_style & SBS_NOARROW)) {
+ _ERR_PRINTF ("CONTROL>SCROLLBAR: wrong styles of scrollbar!\n");
return -1;
}
+
if (!(win_style & SBS_HORZ))
win_style |= SBS_VERT;
@@ -294,14 +294,12 @@ int track_thumb (HWND hwnd, PSCROLLBARDATA data, int x, int y)
int mouse_pos;
const WINDOWINFO* winfo;
- if (!data)
- {
- _WRN_PRINTF ("addtional data2 is NULL");
+ if (!data) {
+ _ERR_PRINTF ("CONTROL>SCROLLBAR: addtional data2 is NULL\n");
return -1;
}
- if (data->status & SBS_PRESSED_THUMB)
- {
+ if (data->status & SBS_PRESSED_THUMB) {
winfo = GetWindowInfo(hwnd);
thumb_move_range = get_shaft_len (hwnd) - data->barLen;
@@ -375,16 +373,14 @@ static LRESULT ScrollBarCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM
/* create the main data construction for the control */
if (!(data = (PSCROLLBARDATA) malloc (sizeof (SCROLLBARDATA))))
{
- _WRN_PRINTF ("Create ScrollBar control failure!");
+ _ERR_PRINTF ("CONTROL>SCROLLBAR: failed to allocate memroy to create ScrollBar control!\n");
return -1;
}
memset (data, 0 , sizeof (SCROLLBARDATA));
/* initialization */
- if(0 != init_sbdata(hwnd, data, &rc))
- {
+ if(0 != init_sbdata(hwnd, data, &rc)) {
free(data);
- _WRN_PRINTF ("Create ScrollBar control failure!");
return -1;
}
@@ -413,9 +409,7 @@ static LRESULT ScrollBarCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM
data = (PSCROLLBARDATA) GetWindowAdditionalData2 (hwnd);
- if (!data)
- {
- _WRN_PRINTF ("addition data2 is NULL");
+ if (!data) {
return 1;
}
@@ -1088,11 +1082,8 @@ static LRESULT ScrollBarCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM
new_nMax = data->maxPos;
new_nPage = data->pageStep;
- if (info->fMask & SIF_RANGE)
- {
- if (info->nMax < info->nMin)
- {
- _WRN_PRINTF ( "Error range");
+ if (info->fMask & SIF_RANGE) {
+ if (info->nMax < info->nMin) {
return -1;
}
new_nMin = info->nMin;
@@ -1102,9 +1093,7 @@ static LRESULT ScrollBarCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM
if (info->fMask & SIF_PAGE)
{
if (info->nPage > new_nMax - new_nMin + 1
- || info->nPage <= 0)
- {
- _WRN_PRINTF ( "Error page step");
+ || info->nPage <= 0) {
return -1;
}
new_nPage = info->nPage;
@@ -1123,7 +1112,6 @@ static LRESULT ScrollBarCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM
if (info->nPos < new_nMin ||
info->nPos > new_nMax)
{
- _WRN_PRINTF ( "Error postion to set");
return -1;
}
new_nPos = info->nPos;
@@ -1180,9 +1168,7 @@ static LRESULT ScrollBarCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM
int max = (int) lParam;
data = (PSCROLLBARDATA) GetWindowAdditionalData2 (hwnd);
- if(max < data->curPos || min > data->curPos)
- {
- _WRN_PRINTF ( "Error range to set");
+ if(max < data->curPos || min > data->curPos) {
return -1;
}
data->minPos = min;
@@ -1209,9 +1195,7 @@ static LRESULT ScrollBarCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM
int max = (int) lParam;
data = (PSCROLLBARDATA) GetWindowAdditionalData2 (hwnd);
- if(max < data->curPos || min > data->curPos)
- {
- _WRN_PRINTF ( "Error range to set");
+ if(max < data->curPos || min > data->curPos) {
return -1;
}
data->minPos = min;
diff --git a/src/control/scrolled.c b/src/control/scrolled.c
index af558d16..dab48b17 100644
--- a/src/control/scrolled.c
+++ b/src/control/scrolled.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scrolled.c: basic scrolled window support
diff --git a/src/control/scrolled.h b/src/control/scrolled.h
index 94b19325..55ff3d35 100644
--- a/src/control/scrolled.h
+++ b/src/control/scrolled.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scrolled.h: header file of scrolled window support module.
diff --git a/src/control/scrollview.c b/src/control/scrollview.c
index e3e44857..3b6d55fe 100644
--- a/src/control/scrollview.c
+++ b/src/control/scrollview.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scrollview.c: a scrollview control
diff --git a/src/control/scrollview_impl.h b/src/control/scrollview_impl.h
index cab04cb1..7bfc29cb 100644
--- a/src/control/scrollview_impl.h
+++ b/src/control/scrollview_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scrollview.h: header file of ScrollView control.
diff --git a/src/control/scrollwnd.c b/src/control/scrollwnd.c
index 5ced01ae..96c4ba84 100644
--- a/src/control/scrollwnd.c
+++ b/src/control/scrollwnd.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scrollwnd.c: scrollwnd control, a scrollable container window
diff --git a/src/control/scrollwnd.h b/src/control/scrollwnd.h
index e1f8c427..a232b312 100644
--- a/src/control/scrollwnd.h
+++ b/src/control/scrollwnd.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scrollwnd.h: header file of ScrollView control.
diff --git a/src/control/simedit_impl.h b/src/control/simedit_impl.h
index b6f249b3..9bf18b96 100644
--- a/src/control/simedit_impl.h
+++ b/src/control/simedit_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** simedit.h: the head file of Simple Edit Control module.
diff --git a/src/control/static.c b/src/control/static.c
index 2b77a57b..a76d0bdd 100644
--- a/src/control/static.c
+++ b/src/control/static.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** static.c: the Static Control module.
diff --git a/src/control/static_impl.h b/src/control/static_impl.h
index f38c6877..9795437e 100644
--- a/src/control/static_impl.h
+++ b/src/control/static_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** static.h: the head file of Static Control module.
diff --git a/src/control/test/bidiedit_arabic.c b/src/control/test/bidiedit_arabic.c
index 57e71933..9ee3d544 100644
--- a/src/control/test/bidiedit_arabic.c
+++ b/src/control/test/bidiedit_arabic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/control/test/bidiedit_hebrew.c b/src/control/test/bidiedit_hebrew.c
index 84bdd1dc..f9c85d39 100644
--- a/src/control/test/bidiedit_hebrew.c
+++ b/src/control/test/bidiedit_hebrew.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/control/test/resource.h b/src/control/test/resource.h
index a521a8bd..990eb082 100644
--- a/src/control/test/resource.h
+++ b/src/control/test/resource.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define IDM_NEW 110
#define IDM_OPEN 120
diff --git a/src/control/test/scrollbar_test.c b/src/control/test/scrollbar_test.c
index 0eb5ed36..af6ce93c 100644
--- a/src/control/test/scrollbar_test.c
+++ b/src/control/test/scrollbar_test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scrollbar_test.c: The scrollbar control unit test program.
diff --git a/src/control/test/scrollbar_test_res.c b/src/control/test/scrollbar_test_res.c
index b509c29b..b88b3e77 100644
--- a/src/control/test/scrollbar_test_res.c
+++ b/src/control/test/scrollbar_test_res.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scrollbar_test_res.c: The scrollbar control test's dialog box templates.
diff --git a/src/control/text.h b/src/control/text.h
index af525315..9b5c04ff 100644
--- a/src/control/text.h
+++ b/src/control/text.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** text.h: header file of text operations.
diff --git a/src/control/textedit.c b/src/control/textedit.c
index e52f15cd..5831e845 100644
--- a/src/control/textedit.c
+++ b/src/control/textedit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** textedit.c: text edit control
@@ -928,7 +928,7 @@ textdoc_insert_text (TextDoc *txtdoc, const char* newtext, int len)
/* insert last strings */
/* FIXME */
if (!nextnode) {
- _WRN_PRINTF ("nextnode is NULL!");
+ _WRN_PRINTF ("nextnode is NULL!\n");
/* set_current_node (txtdoc, LASTNODE(txtdoc), FALSE, TRUE); */
}
else {
@@ -1458,7 +1458,7 @@ static int get_line_nr (HWND hWnd, PTEDATA ptedata, TextNode *node, int indent)
HDC hdc;
if (!node) {
- _WRN_PRINTF ("pass NULL text node to get_line_nr");
+ _WRN_PRINTF ("pass NULL text node to get_line_nr\n");
return 0;
}
@@ -1583,7 +1583,7 @@ set_line_width (HWND hWnd, PTEDATA ptedata, TextNode *node, int indent)
HDC hdc;
if (!node) {
- _WRN_PRINTF ("pass NULL text node to set_line_width");
+ _WRN_PRINTF ("pass NULL text node to set_line_width\n");
return -1;
}
diff --git a/src/control/textedit_impl.h b/src/control/textedit_impl.h
index 253829b5..a52058dc 100644
--- a/src/control/textedit_impl.h
+++ b/src/control/textedit_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** textedit.h: header file of TextEdit control.
diff --git a/src/control/trackbar.c b/src/control/trackbar.c
index 376bea28..e870a4dc 100644
--- a/src/control/trackbar.c
+++ b/src/control/trackbar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** trackbar.c: the TrackBar Control module.
@@ -76,7 +76,7 @@ static void TrackBarOnDraw (HWND hwnd, HDC hdc, TRACKBARDATA* pData, DWORD dwSty
win_rdr = GetWindowInfo(hwnd)->we_rdr;
if (!win_rdr) {
- _WRN_PRINTF ("window renderer is NULL");
+ _ERR_PRINTF ("CONTROL>TRACKBAR: window renderer is NULL\n");
return;
}
@@ -229,7 +229,6 @@ static LRESULT TrackBarCtrlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM
{
case MSG_CREATE:
if (!(pData = malloc (sizeof (TRACKBARDATA)))) {
- _WRN_PRINTF ("Create control failure!");
return -1;
}
pData->nMax = 10;
diff --git a/src/control/trackbar_impl.h b/src/control/trackbar_impl.h
index 348c59ee..2f9b990e 100644
--- a/src/control/trackbar_impl.h
+++ b/src/control/trackbar_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** trackbar.h: the head file of TrackBar(Slider) control.
diff --git a/src/ex_ctrl/animation.c b/src/ex_ctrl/animation.c
index 8f34fb6d..f7b26c00 100644
--- a/src/ex_ctrl/animation.c
+++ b/src/ex_ctrl/animation.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** animation.c: the Animation control
diff --git a/src/ex_ctrl/animation_impl.h b/src/ex_ctrl/animation_impl.h
index fc6e5c57..5b775920 100644
--- a/src/ex_ctrl/animation_impl.h
+++ b/src/ex_ctrl/animation_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Create date: 2004/7/14
diff --git a/src/ex_ctrl/coolbar.c b/src/ex_ctrl/coolbar.c
index 2ad359dc..dd32f486 100644
--- a/src/ex_ctrl/coolbar.c
+++ b/src/ex_ctrl/coolbar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** coolbar.c: the Coolbar Control module.
diff --git a/src/ex_ctrl/coolbar_impl.h b/src/ex_ctrl/coolbar_impl.h
index 26503271..318bd755 100644
--- a/src/ex_ctrl/coolbar_impl.h
+++ b/src/ex_ctrl/coolbar_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Create date: 2000/9/20
diff --git a/src/ex_ctrl/gif89a.c b/src/ex_ctrl/gif89a.c
index 1def7d1b..f4b513f8 100644
--- a/src/ex_ctrl/gif89a.c
+++ b/src/ex_ctrl/gif89a.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** gif89a.c: the animation GIF89a module.
diff --git a/src/ex_ctrl/gridview.c b/src/ex_ctrl/gridview.c
index 9b85b032..3b836526 100644
--- a/src/ex_ctrl/gridview.c
+++ b/src/ex_ctrl/gridview.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** gridview.c: an grid control
diff --git a/src/ex_ctrl/gridview_impl.h b/src/ex_ctrl/gridview_impl.h
index 2012f1af..342fa935 100644
--- a/src/ex_ctrl/gridview_impl.h
+++ b/src/ex_ctrl/gridview_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** gridview.c: an grid control
diff --git a/src/ex_ctrl/gridviewcelltype.c b/src/ex_ctrl/gridviewcelltype.c
index 02531cdc..bc4b753f 100644
--- a/src/ex_ctrl/gridviewcelltype.c
+++ b/src/ex_ctrl/gridviewcelltype.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** gridview.c: an grid control
diff --git a/src/ex_ctrl/iconview.c b/src/ex_ctrl/iconview.c
index 86c465b8..58955ae4 100644
--- a/src/ex_ctrl/iconview.c
+++ b/src/ex_ctrl/iconview.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** iconview.c: an iconview control
diff --git a/src/ex_ctrl/iconview_impl.h b/src/ex_ctrl/iconview_impl.h
index c821f987..591ed582 100644
--- a/src/ex_ctrl/iconview_impl.h
+++ b/src/ex_ctrl/iconview_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** iconview.h: header file of ScrollView control.
diff --git a/src/ex_ctrl/listview.c b/src/ex_ctrl/listview.c
index f68d2368..366c5d75 100644
--- a/src/ex_ctrl/listview.c
+++ b/src/ex_ctrl/listview.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** listview.c: the ListView control
diff --git a/src/ex_ctrl/listview_impl.h b/src/ex_ctrl/listview_impl.h
index fbf99702..7f1c02c6 100644
--- a/src/ex_ctrl/listview_impl.h
+++ b/src/ex_ctrl/listview_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** listview.h: header file of ListView control.
diff --git a/src/ex_ctrl/monthcalendar.c b/src/ex_ctrl/monthcalendar.c
index 06f1afc5..a239fddf 100644
--- a/src/ex_ctrl/monthcalendar.c
+++ b/src/ex_ctrl/monthcalendar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** monthcalendar.c: the month calendar Control module.
diff --git a/src/ex_ctrl/monthcalendar_impl.h b/src/ex_ctrl/monthcalendar_impl.h
index c1093170..a53bbf52 100644
--- a/src/ex_ctrl/monthcalendar_impl.h
+++ b/src/ex_ctrl/monthcalendar_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** monthcalendar.h: the header for MonthCalendar control.
diff --git a/src/ex_ctrl/spinbox.c b/src/ex_ctrl/spinbox.c
index a96d1ef7..6d7a10b9 100644
--- a/src/ex_ctrl/spinbox.c
+++ b/src/ex_ctrl/spinbox.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** spinbox.c: the SpinBox control
diff --git a/src/ex_ctrl/spinbox_impl.h b/src/ex_ctrl/spinbox_impl.h
index fa06f9ea..0a16d681 100644
--- a/src/ex_ctrl/spinbox_impl.h
+++ b/src/ex_ctrl/spinbox_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Create date: 2000/9/20
diff --git a/src/ex_ctrl/treeview.c b/src/ex_ctrl/treeview.c
index c13f22b8..c383ff99 100644
--- a/src/ex_ctrl/treeview.c
+++ b/src/ex_ctrl/treeview.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** treeview.c: TreeView Control.
diff --git a/src/ex_ctrl/treeview_impl.h b/src/ex_ctrl/treeview_impl.h
index 4aef44cd..6c5541bc 100644
--- a/src/ex_ctrl/treeview_impl.h
+++ b/src/ex_ctrl/treeview_impl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** treeview.h: the head file for TreeView Control.
diff --git a/src/ex_ctrl/treeview_rdr.c b/src/ex_ctrl/treeview_rdr.c
index 5c7c9314..380f96ba 100644
--- a/src/ex_ctrl/treeview_rdr.c
+++ b/src/ex_ctrl/treeview_rdr.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** treeview.c: TreeView Control.
diff --git a/src/font/big5unimap.c b/src/font/big5unimap.c
index 79a1ab10..eac9f255 100644
--- a/src/font/big5unimap.c
+++ b/src/font/big5unimap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** big5unimap.c: BIG5 to UNICODE map.
diff --git a/src/font/bitmapfont.c b/src/font/bitmapfont.c
index d96188b2..ea85bbf6 100644
--- a/src/font/bitmapfont.c
+++ b/src/font/bitmapfont.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** bitmapfont.c: The Bitmap Font operation set.
diff --git a/src/font/bitmapfont.h b/src/font/bitmapfont.h
index f84cbd92..13ecb5fc 100644
--- a/src/font/bitmapfont.h
+++ b/src/font/bitmapfont.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/charset-arabic.c b/src/font/charset-arabic.c
index d222e3cb..0544fdd5 100644
--- a/src/font/charset-arabic.c
+++ b/src/font/charset-arabic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** charset.c: The charset's arabic operation set.
diff --git a/src/font/charset-unicode.c b/src/font/charset-unicode.c
index 81979d71..d9591b34 100644
--- a/src/font/charset-unicode.c
+++ b/src/font/charset-unicode.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** charset.c: The charset operation set.
diff --git a/src/font/charset.c b/src/font/charset.c
index ca36a195..a118d1a1 100644
--- a/src/font/charset.c
+++ b/src/font/charset.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** charset.c: The charset operation set.
diff --git a/src/font/charset.h b/src/font/charset.h
index bb9ae3a7..3e88920d 100644
--- a/src/font/charset.h
+++ b/src/font/charset.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** charset.h: the head file of charset operation set.
diff --git a/src/font/convgbmap.c b/src/font/convgbmap.c
index 1f67b484..20f4daf0 100644
--- a/src/font/convgbmap.c
+++ b/src/font/convgbmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/font/devfont.c b/src/font/devfont.c
index 378c2e76..ebbe97f0 100644
--- a/src/font/devfont.c
+++ b/src/font/devfont.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** defont.c: Device fonts management.
@@ -550,24 +550,24 @@ static DEVFONT* make_devfont (const char* font_name, const void* data, BOOL is_f
}
if (fontops_info->type == NULL) {
- _WRN_PRINTF ("invalid font type: %s", font_name);
+ _WRN_PRINTF ("invalid font type: %s\n", font_name);
return NULL;
}
/*find the first charset*/
if (!fontGetCharsetFromName (font_name, charset)) {
- _WRN_PRINTF ("Invalid charset name: %s", font_name);
+ _WRN_PRINTF ("Invalid charset name: %s\n", font_name);
return NULL;
}
if ((charset_ops = GetCharsetOpsEx (charset)) == NULL) {
- _WRN_PRINTF ("Invalid charset name %s of font %s",
+ _WRN_PRINTF ("Invalid charset name %s of font %s\n",
charset, font_name);
return NULL;
}
if (find_devfont(font_name, (charset_ops->bytes_maxlen_char > 1))) {
- _WRN_PRINTF ("Duplicated devfont name (%s)",
+ _WRN_PRINTF ("Duplicated devfont name (%s)\n",
font_name);
return NULL;
}
@@ -583,7 +583,7 @@ static DEVFONT* make_devfont (const char* font_name, const void* data, BOOL is_f
font_name, data);
if (devfont->data == NULL) {
- _WRN_PRINTF ("error when loading font %s from %s file",
+ _WRN_PRINTF ("error when loading font %s from %s file\n",
font_name, (const char*) data);
free (devfont);
return NULL;
@@ -813,7 +813,7 @@ BOOL font_InitIncoreFonts (void)
for (i = 0; i < NR_NULL_FONTS; i++) {
if (!add_dev_font (_null_font_names[i], _null_font_names[i], FALSE)) {
- _WRN_PRINTF ("can not init incore font: %s", _null_font_names[i]);
+ _WRN_PRINTF ("can not init incore font: %s\n", _null_font_names[i]);
return FALSE;
}
}
@@ -821,7 +821,7 @@ BOOL font_InitIncoreFonts (void)
#ifdef _MGFONT_RBF
for (i = 0; i < NR_RBFONTS; i++) {
if (!add_dev_font (incore_rbfonts [i]->name, incore_rbfonts [i]->data, FALSE)) {
- _WRN_PRINTF ("can not init incore font: %s", incore_rbfonts [i]->name);
+ _WRN_PRINTF ("can not init incore font: %s\n", incore_rbfonts [i]->name);
return FALSE;
}
}
@@ -830,7 +830,7 @@ BOOL font_InitIncoreFonts (void)
#ifdef _MGFONT_VBF
for (i = 0; i < NR_VBFONTS && incore_vbfonts[i]; i++) {
if (!add_dev_font (incore_vbfonts [i]->name, incore_vbfonts [i], FALSE)) {
- _WRN_PRINTF ("can not init incore font: %s", incore_vbfonts [i]->name);
+ _WRN_PRINTF ("can not init incore font: %s\n", incore_vbfonts [i]->name);
return FALSE;
}
}
@@ -840,7 +840,7 @@ BOOL font_InitIncoreFonts (void)
for (i = 0; i < NR_UPFONTS && incore_upfonts[i]; i++) {
const char* name = ((UPFV1_FILE_HEADER*)(incore_upfonts [i]->root_dir))->font_name;
if (!add_dev_font (name, incore_upfonts [i], FALSE)) {
- _WRN_PRINTF ("can not init incore font: %s", name);
+ _WRN_PRINTF ("can not init incore font: %s\n", name);
return FALSE;
}
}
@@ -848,7 +848,7 @@ BOOL font_InitIncoreFonts (void)
#ifdef _MGFONT_SEF
if(!initialize_scripteasy()) {
- _WRN_PRINTF ("Can not initialize ScriptEasy fonts!");
+ _WRN_PRINTF ("Can not initialize ScriptEasy fonts!\n");
return FALSE;
}
#endif
@@ -1034,7 +1034,7 @@ static BOOL init_or_term_specifical_fonts (char* etc_section, BOOL is_unload)
/*get font number in minigui etc*/
if (GetMgEtcIntValue (etc_section, "font_number", &font_num) < 0 ) {
- _WRN_PRINTF ("can't find font_number in section %s",
+ _WRN_PRINTF ("can't find font_number in section %s\n",
etc_section);
return FALSE;
}
@@ -1043,14 +1043,14 @@ static BOOL init_or_term_specifical_fonts (char* etc_section, BOOL is_unload)
for (i=0; i.
+ * .
*/
/*
** euckrunimap.c: EUC-KR to UNICODE map.
diff --git a/src/font/font-engines.c b/src/font/font-engines.c
index ec3b9c76..0fab1e89 100644
--- a/src/font/font-engines.c
+++ b/src/font/font-engines.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/font/fontcache.c b/src/font/fontcache.c
index 478383a5..4c03753b 100644
--- a/src/font/fontcache.c
+++ b/src/font/fontcache.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fontcache.c: Font cache for TrueType fonts.
diff --git a/src/font/fontname.c b/src/font/fontname.c
index 7c5034ea..5e2b95a5 100644
--- a/src/font/fontname.c
+++ b/src/font/fontname.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fontname.c: Font name parser.
diff --git a/src/font/freetype1.c b/src/font/freetype1.c
index 00a49668..c83a88ed 100644
--- a/src/font/freetype1.c
+++ b/src/font/freetype1.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** freetype1.c: TrueType font support based on FreeType 1.3.1.
diff --git a/src/font/freetype1.h b/src/font/freetype1.h
index b2a9f438..d0e23812 100644
--- a/src/font/freetype1.h
+++ b/src/font/freetype1.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** freetype1.h: TrueType font support based on FreeType V1.3.x.
diff --git a/src/font/freetype2.c b/src/font/freetype2.c
index 43096321..1c1a0548 100644
--- a/src/font/freetype2.c
+++ b/src/font/freetype2.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** freetype2.c: TrueType font support based on FreeType 2.
@@ -282,12 +282,12 @@ load_or_search_glyph (FTINSTANCEINFO* ft_inst_info, FT_Face* face,
*face = ft_face_info->face;
ft_inst_info->cur_index = gv;
if (FT_Load_Glyph (*face, ft_inst_info->cur_index, ft_load_flags)) {
- _WRN_PRINTF ("FONT>FT2: FT_Load_Glyph error");
+ _ERR_PRINTF ("FONT>FT2: FT_Load_Glyph failed\n");
return -1;
}
if (FT_Get_Glyph ((*face)->glyph, &(ft_inst_info->glyph))) {
- _WRN_PRINTF ("FONT>FT2: FT_Get_Glyph error");
+ _ERR_PRINTF ("FONT>FT2: FT_Get_Glyph failed\n");
return -1;
}
@@ -302,13 +302,13 @@ load_or_search_glyph (FTINSTANCEINFO* ft_inst_info, FT_Face* face,
ft_inst_info->cur_index = gv;
if ((error = FTC_ImageCache_Lookup (ft_image_cache, &ft_inst_info->image_type,
ft_inst_info->cur_index, &ft_glyph_tmp, NULL))) {
- _WRN_PRINTF ("FONT>FT2: can't access image cache for index: 0x%X: %X",
+ _ERR_PRINTF ("FONT>FT2: can't access image cache for index: 0x%X: %X\n",
ft_inst_info->cur_index, error);
return -1;
}
if (FT_Glyph_Copy (ft_glyph_tmp, &ft_inst_info->glyph)) {
- _WRN_PRINTF ("FONT>FT2: can't copy glyph from cache.");
+ _ERR_PRINTF ("FONT>FT2: can't copy glyph from cache.\n");
return -1;
}
@@ -1213,7 +1213,7 @@ BOOL font_InitFreetypeLibrary (void)
#endif
if (__mg_ttc_sys_init (_MGMAX_TTF_CACHE, _MGTTF_CACHE_SIZE * 1024)) {
- _WRN_PRINTF ("init ttf cache sys failed");
+ _ERR_PRINTF ("FONT>FT2: failed to initialize TTF cache system\n");
goto error_library;
}
@@ -1236,7 +1236,7 @@ error_ftc_manager:
return TRUE;
error_library:
- _ERR_PRINTF ("%s: Could not initialise FreeType 2 library\n", __FUNCTION__);
+ _ERR_PRINTF ("FONT>FT2: Could not initialise FreeType 2 library\n");
FT_DESTROY_LOCK(&ft_lock);
FT_Done_FreeType (ft_library);
diff --git a/src/font/freetype2.h b/src/font/freetype2.h
index 865aaec2..471cb293 100644
--- a/src/font/freetype2.h
+++ b/src/font/freetype2.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** freetype2.h: TrueType font support based on FreeType 2.
diff --git a/src/font/gb18030unimap.c b/src/font/gb18030unimap.c
index 55c0a865..ba504a3f 100644
--- a/src/font/gb18030unimap.c
+++ b/src/font/gb18030unimap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** gb18030unimap.c: GB18030 to UCS2 mapping table.
diff --git a/src/font/gbkunimap.c b/src/font/gbkunimap.c
index 4e7dc23e..dd18df5f 100644
--- a/src/font/gbkunimap.c
+++ b/src/font/gbkunimap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** gbkunimap.c: GBK to UCS-2 map
diff --git a/src/font/gbunimap.c b/src/font/gbunimap.c
index f0b5d26e..250ab0c9 100644
--- a/src/font/gbunimap.c
+++ b/src/font/gbunimap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** gbunimap.c: GB2312 to UCS-2 map
diff --git a/src/font/harzbuff-minigui-funcs.c b/src/font/harzbuff-minigui-funcs.c
index 9a520b38..b5d77002 100644
--- a/src/font/harzbuff-minigui-funcs.c
+++ b/src/font/harzbuff-minigui-funcs.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/in-core/rbf_fixedsys_8x15.c b/src/font/in-core/rbf_fixedsys_8x15.c
index 9e6498f3..c546514c 100644
--- a/src/font/in-core/rbf_fixedsys_8x15.c
+++ b/src/font/in-core/rbf_fixedsys_8x15.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fixedsys_8x15.c: Fixed system 8x15 VBF font data.
diff --git a/src/font/in-core/rbf_terminal_8x12.c b/src/font/in-core/rbf_terminal_8x12.c
index 459cb9fb..300f8292 100644
--- a/src/font/in-core/rbf_terminal_8x12.c
+++ b/src/font/in-core/rbf_terminal_8x12.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** terminal_8x12.c: Terminal 8x12 VBF font data.
diff --git a/src/font/in-core/rbf_vgaoem_8x8.c b/src/font/in-core/rbf_vgaoem_8x8.c
index cb0ab214..39fe9f5f 100644
--- a/src/font/in-core/rbf_vgaoem_8x8.c
+++ b/src/font/in-core/rbf_vgaoem_8x8.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** rbf_vgarom_8x8.c: VGA ROM 8x8 small font data.
diff --git a/src/font/in-core/upf_smoothtimes_100_50.c b/src/font/in-core/upf_smoothtimes_100_50.c
index 4739cadb..96ac3d22 100644
--- a/src/font/in-core/upf_smoothtimes_100_50.c
+++ b/src/font/in-core/upf_smoothtimes_100_50.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** In-core UPF file for __mgif_upf_smoothtimes_100_50.
diff --git a/src/font/in-core/upf_times_12x10.c b/src/font/in-core/upf_times_12x10.c
index e4d7a6da..e051a1db 100644
--- a/src/font/in-core/upf_times_12x10.c
+++ b/src/font/in-core/upf_times_12x10.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** In-core UPF file for __mgif_upf_times_12x10.
diff --git a/src/font/in-core/upf_times_17x14.c b/src/font/in-core/upf_times_17x14.c
index eb7fc4e5..961f7c1c 100644
--- a/src/font/in-core/upf_times_17x14.c
+++ b/src/font/in-core/upf_times_17x14.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** In-core UPF file for __mgif_upf_times_17x14.
diff --git a/src/font/in-core/vbf_courier_8x13.c b/src/font/in-core/vbf_courier_8x13.c
index 4ab3f3ab..9a0b1864 100644
--- a/src/font/in-core/vbf_courier_8x13.c
+++ b/src/font/in-core/vbf_courier_8x13.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: courier_8x13.c 8944 2007-12-29 08:29:16Z xwyan $
diff --git a/src/font/in-core/vbf_sansserif_11x13.c b/src/font/in-core/vbf_sansserif_11x13.c
index c089325a..d43beca0 100644
--- a/src/font/in-core/vbf_sansserif_11x13.c
+++ b/src/font/in-core/vbf_sansserif_11x13.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: sansserif_11x13.c 8944 2007-12-29 08:29:16Z xwyan $
diff --git a/src/font/in-core/vbf_system_14x16.c b/src/font/in-core/vbf_system_14x16.c
index 104a62ec..0d101b79 100644
--- a/src/font/in-core/vbf_system_14x16.c
+++ b/src/font/in-core/vbf_system_14x16.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: system_14x16.c 8944 2007-12-29 08:29:16Z xwyan $
diff --git a/src/font/jisunimap.c b/src/font/jisunimap.c
index 774528b4..a0add7ec 100644
--- a/src/font/jisunimap.c
+++ b/src/font/jisunimap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** jisunimap.c: EUC-JIS to UNICODE map.
diff --git a/src/font/language-code.c b/src/font/language-code.c
index 4065226e..ee10d02e 100644
--- a/src/font/language-code.c
+++ b/src/font/language-code.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/font/legacy-bidi.c b/src/font/legacy-bidi.c
index 84151496..06787464 100644
--- a/src/font/legacy-bidi.c
+++ b/src/font/legacy-bidi.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** charset-bidi.c: The charset Bidirectional Algorithm.
diff --git a/src/font/logfont.c b/src/font/logfont.c
index 058f3cb3..6b645215 100644
--- a/src/font/logfont.c
+++ b/src/font/logfont.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** reflf.c: Log fonts management.
diff --git a/src/font/mapunitobig5.c b/src/font/mapunitobig5.c
index 7c5d7f31..039c7ab9 100644
--- a/src/font/mapunitobig5.c
+++ b/src/font/mapunitobig5.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mapunitobig5.c: Map UCS-2 to BIG5.
diff --git a/src/font/mapunitogb.c b/src/font/mapunitogb.c
index fa51e263..cb16cc99 100644
--- a/src/font/mapunitogb.c
+++ b/src/font/mapunitogb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mapunitogb.c: Map UCS-2 to GB2312.
diff --git a/src/font/mapunitogb18030.c b/src/font/mapunitogb18030.c
index f41badfe..f6bd40f0 100644
--- a/src/font/mapunitogb18030.c
+++ b/src/font/mapunitogb18030.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mapunitogb18030.c: Map UCS to GB18030.
diff --git a/src/font/mapunitogbk.c b/src/font/mapunitogbk.c
index 8b5bef44..880626a4 100644
--- a/src/font/mapunitogbk.c
+++ b/src/font/mapunitogbk.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mapunitogbk.c: Map UCS-2 to GBK.
diff --git a/src/font/my_debug.h b/src/font/my_debug.h
index a51ca679..683ef337 100644
--- a/src/font/my_debug.h
+++ b/src/font/my_debug.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef MY_DEBUG_H
#define MY_DEBUG_H
diff --git a/src/font/nullfont.c b/src/font/nullfont.c
index 5dfcb652..13a02e16 100644
--- a/src/font/nullfont.c
+++ b/src/font/nullfont.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** nullfont.c: The Null Font operation set.
@@ -166,7 +166,7 @@ static void* load_font_data (DEVFONT* devfont, const char* fontname,
static void unload_font_data (DEVFONT* devfont, void* data)
{
if (data != &null_bitmap) {
- _WRN_PRINTF("data is not null_bitmap");
+ _WRN_PRINTF("data is not null_bitmap\n");
}
}
diff --git a/src/font/palette.h b/src/font/palette.h
index 4aac7044..e3cd5c45 100644
--- a/src/font/palette.h
+++ b/src/font/palette.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
static const unsigned char PALETTE1A[256] =
diff --git a/src/font/qpf.c b/src/font/qpf.c
index 794046f4..f6545449 100644
--- a/src/font/qpf.c
+++ b/src/font/qpf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** qpf.c: The Qt Prerendered Font operation set.
diff --git a/src/font/qpf.h b/src/font/qpf.h
index 3ac4c407..d4bac377 100644
--- a/src/font/qpf.h
+++ b/src/font/qpf.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** qpf.h: the head file of Qt Prerendered Font operation set.
diff --git a/src/font/rawbitmap.c b/src/font/rawbitmap.c
index b1687a3d..96ec8a96 100644
--- a/src/font/rawbitmap.c
+++ b/src/font/rawbitmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** rawbitmap.c: The Raw Bitmap Font operation set.
diff --git a/src/font/rawbitmap.h b/src/font/rawbitmap.h
index 9cb1c5f5..a78105d8 100644
--- a/src/font/rawbitmap.h
+++ b/src/font/rawbitmap.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: rawbitmap.h 10974 2008-10-06 07:40:27Z houhuihua $
diff --git a/src/font/scripteasy.c b/src/font/scripteasy.c
index 65683c4d..0b7690a2 100644
--- a/src/font/scripteasy.c
+++ b/src/font/scripteasy.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/font/se_minigui.h b/src/font/se_minigui.h
index 85cc9862..a008f65b 100644
--- a/src/font/se_minigui.h
+++ b/src/font/se_minigui.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef SE_MINIGUI_H
diff --git a/src/font/sjisunimap.c b/src/font/sjisunimap.c
index 4e022e9a..5a673dd1 100644
--- a/src/font/sjisunimap.c
+++ b/src/font/sjisunimap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sjisunimap.c: Shift-JIS to UNICODE map.
diff --git a/src/font/sysfont.c b/src/font/sysfont.c
index ff810a60..dfbbe6fe 100644
--- a/src/font/sysfont.c
+++ b/src/font/sysfont.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sysfont.c: Load, create and handle system font and system charset.
diff --git a/src/font/sysfont.old.c b/src/font/sysfont.old.c
index c9824a0c..beff99e0 100644
--- a/src/font/sysfont.old.c
+++ b/src/font/sysfont.old.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sysfont.c: Load, create and handle system font and system charset.
diff --git a/src/font/test/arabic/arabic_test.c b/src/font/test/arabic/arabic_test.c
index 6acd6d47..e0d15511 100644
--- a/src/font/test/arabic/arabic_test.c
+++ b/src/font/test/arabic/arabic_test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/font/test/arabic/combin_test.c b/src/font/test/arabic/combin_test.c
index 9a72d645..8a3645cc 100644
--- a/src/font/test/arabic/combin_test.c
+++ b/src/font/test/arabic/combin_test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/font/test/arabic/shape_test.c b/src/font/test/arabic/shape_test.c
index 27d6c5c7..09cf500d 100644
--- a/src/font/test/arabic/shape_test.c
+++ b/src/font/test/arabic/shape_test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/font/test/avl/avl-test.c b/src/font/test/avl/avl-test.c
index 7440ebc7..f494fe13 100644
--- a/src/font/test/avl/avl-test.c
+++ b/src/font/test/avl/avl-test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/font/test/avl/bmpfonttest.c b/src/font/test/avl/bmpfonttest.c
index 5d1193e1..becf54df 100644
--- a/src/font/test/avl/bmpfonttest.c
+++ b/src/font/test/avl/bmpfonttest.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/font/test/avl/bmpfonttest.h b/src/font/test/avl/bmpfonttest.h
index be52277c..6852b0e6 100644
--- a/src/font/test/avl/bmpfonttest.h
+++ b/src/font/test/avl/bmpfonttest.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/font/test/bmpf/bmpf-test-italic.c b/src/font/test/bmpf/bmpf-test-italic.c
index 3705cb3c..dab5b13d 100644
--- a/src/font/test/bmpf/bmpf-test-italic.c
+++ b/src/font/test/bmpf/bmpf-test-italic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/font/test/bmpf/bmpf-test.c b/src/font/test/bmpf/bmpf-test.c
index c17621f0..9a7c620d 100644
--- a/src/font/test/bmpf/bmpf-test.c
+++ b/src/font/test/bmpf/bmpf-test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/font/test/compatible/cmtp-test.c b/src/font/test/compatible/cmtp-test.c
index f5137433..17f6c3ca 100644
--- a/src/font/test/compatible/cmtp-test.c
+++ b/src/font/test/compatible/cmtp-test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/font/test/hebrew/hebrew_test.c b/src/font/test/hebrew/hebrew_test.c
index 45726a84..a89fadb3 100644
--- a/src/font/test/hebrew/hebrew_test.c
+++ b/src/font/test/hebrew/hebrew_test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/font/test/hebrew/helloworld.c b/src/font/test/hebrew/helloworld.c
index 71059c0c..acf8d377 100644
--- a/src/font/test/hebrew/helloworld.c
+++ b/src/font/test/hebrew/helloworld.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/font/textops.c b/src/font/textops.c
index 24615dd6..444f0f66 100644
--- a/src/font/textops.c
+++ b/src/font/textops.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** textops.c: The text operations based on logical font.
diff --git a/src/font/type1.c b/src/font/type1.c
index e5bad9ed..8d7dc621 100644
--- a/src/font/type1.c
+++ b/src/font/type1.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** type1.c: Type1 font support based on t1lib.
diff --git a/src/font/type1.h b/src/font/type1.h
index 1e75213c..114a63b2 100644
--- a/src/font/type1.h
+++ b/src/font/type1.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** type1.h: Type1 font support based on t1lib.
diff --git a/src/font/ujisunimap.c b/src/font/ujisunimap.c
index ac79625a..77304799 100644
--- a/src/font/ujisunimap.c
+++ b/src/font/ujisunimap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ujisunimap.c: JIS0208-0 to UNICODE map.
diff --git a/src/font/unicode-bidi-types-list.inc b/src/font/unicode-bidi-types-list.inc
index 1edfcf8e..7887e98e 100644
--- a/src/font/unicode-bidi-types-list.inc
+++ b/src/font/unicode-bidi-types-list.inc
@@ -29,7 +29,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-bidi.c b/src/font/unicode-bidi.c
index 7e2acdaf..072f0cc4 100644
--- a/src/font/unicode-bidi.c
+++ b/src/font/unicode-bidi.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-bidi.h b/src/font/unicode-bidi.h
index 77003af6..856051ff 100644
--- a/src/font/unicode-bidi.h
+++ b/src/font/unicode-bidi.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-break-arabic.c b/src/font/unicode-break-arabic.c
index a0fc5b7e..87b87ca6 100644
--- a/src/font/unicode-break-arabic.c
+++ b/src/font/unicode-break-arabic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-break-indic.c b/src/font/unicode-break-indic.c
index 01607137..81f61691 100644
--- a/src/font/unicode-break-indic.c
+++ b/src/font/unicode-break-indic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-break-thai.c b/src/font/unicode-break-thai.c
index 13927ab4..01acceef 100644
--- a/src/font/unicode-break-thai.c
+++ b/src/font/unicode-break-thai.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
@@ -70,7 +70,7 @@
void __mg_unicode_break_thai(const Uchar32* ucs, int nr_ucs,
BreakOppo* break_oppos)
{
- _WRN_PRINTF("NOT IMPLEMENTED");
+ _WRN_PRINTF("NOT IMPLEMENTED\n");
}
#endif /* _MGCHARSET_UNICODE */
diff --git a/src/font/unicode-break.c b/src/font/unicode-break.c
index 3851b1a4..855c38fb 100644
--- a/src/font/unicode-break.c
+++ b/src/font/unicode-break.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-comp.c b/src/font/unicode-comp.c
index a1e9af15..94756de5 100644
--- a/src/font/unicode-comp.c
+++ b/src/font/unicode-comp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/font/unicode-emoji.c b/src/font/unicode-emoji.c
index 9f197931..2589ee77 100644
--- a/src/font/unicode-emoji.c
+++ b/src/font/unicode-emoji.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-iterators.c b/src/font/unicode-iterators.c
index 9f62bf46..4705e856 100644
--- a/src/font/unicode-iterators.c
+++ b/src/font/unicode-iterators.c
@@ -40,7 +40,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-joining-types-list.inc b/src/font/unicode-joining-types-list.inc
index 60a1ae2f..82eae117 100644
--- a/src/font/unicode-joining-types-list.inc
+++ b/src/font/unicode-joining-types-list.inc
@@ -29,7 +29,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-joining-types.c b/src/font/unicode-joining-types.c
index 397bd24d..2023079d 100644
--- a/src/font/unicode-joining-types.c
+++ b/src/font/unicode-joining-types.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-joining.c b/src/font/unicode-joining.c
index b7856b94..44dba01a 100644
--- a/src/font/unicode-joining.c
+++ b/src/font/unicode-joining.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-script.c b/src/font/unicode-script.c
index 6565a1c7..73733fec 100644
--- a/src/font/unicode-script.c
+++ b/src/font/unicode-script.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/font/unicode-shape-arabic.c b/src/font/unicode-shape-arabic.c
index 6b0f8c10..d83fb951 100644
--- a/src/font/unicode-shape-arabic.c
+++ b/src/font/unicode-shape-arabic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-shape.c b/src/font/unicode-shape.c
index b65ff4ab..cb238f63 100644
--- a/src/font/unicode-shape.c
+++ b/src/font/unicode-shape.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/unicode-vop.c b/src/font/unicode-vop.c
index ee3b5ad5..81e11c5b 100644
--- a/src/font/unicode-vop.c
+++ b/src/font/unicode-vop.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/upf.c b/src/font/upf.c
index 7f65c983..dfcd6f7b 100644
--- a/src/font/upf.c
+++ b/src/font/upf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** upf.c: The Unicode Prerendered Font operation set.
diff --git a/src/font/upf.h b/src/font/upf.h
index 5c6fe7ce..ca4bb1e0 100644
--- a/src/font/upf.h
+++ b/src/font/upf.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** upf.h: the head file of Unicode Prerendered Font operation set.
diff --git a/src/font/utils/bin2c.c b/src/font/utils/bin2c.c
index e4fa771a..6eff9b1c 100644
--- a/src/font/utils/bin2c.c
+++ b/src/font/utils/bin2c.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/font/utils/mkmap-ucs-gb18030.c b/src/font/utils/mkmap-ucs-gb18030.c
index 7fd614c5..e4a3d455 100644
--- a/src/font/utils/mkmap-ucs-gb18030.c
+++ b/src/font/utils/mkmap-ucs-gb18030.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/font/utils/mkmap-ucs-gb2312.c b/src/font/utils/mkmap-ucs-gb2312.c
index 89ca0ac5..fc2c939f 100644
--- a/src/font/utils/mkmap-ucs-gb2312.c
+++ b/src/font/utils/mkmap-ucs-gb2312.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/font/utils/my_debug.h b/src/font/utils/my_debug.h
index a269b1b4..fc5e95ef 100644
--- a/src/font/utils/my_debug.h
+++ b/src/font/utils/my_debug.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef MY_DEBUG_H
#define MY_DEBUG_H
diff --git a/src/font/utils/sjisunimap.c b/src/font/utils/sjisunimap.c
index 720ffd86..1664b5de 100644
--- a/src/font/utils/sjisunimap.c
+++ b/src/font/utils/sjisunimap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/font/varbitmap.c b/src/font/varbitmap.c
index 2725e7e0..be58014a 100644
--- a/src/font/varbitmap.c
+++ b/src/font/varbitmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** varbitmap.c: The Var Bitmap Font operation set.
diff --git a/src/font/varbitmap.h b/src/font/varbitmap.h
index 9bfe5ad9..60a1d1aa 100644
--- a/src/font/varbitmap.h
+++ b/src/font/varbitmap.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** varbitmap.h: the head file of raw bitmap font operation set.
diff --git a/src/gui/accelkey.c b/src/gui/accelkey.c
index 0c6de6fb..b0ec519c 100644
--- a/src/gui/accelkey.c
+++ b/src/gui/accelkey.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** accelkey.c: The Accelerator module.
diff --git a/src/gui/arabickeymap.c b/src/gui/arabickeymap.c
index 7bddf38f..fe58201a 100644
--- a/src/gui/arabickeymap.c
+++ b/src/gui/arabickeymap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
diff --git a/src/gui/caret.c b/src/gui/caret.c
index 8eb37f2f..8bddd97a 100644
--- a/src/gui/caret.c
+++ b/src/gui/caret.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** caret.c: The Caret module.
diff --git a/src/gui/ctrlclass.c b/src/gui/ctrlclass.c
index 0e92f235..60efe0b7 100644
--- a/src/gui/ctrlclass.c
+++ b/src/gui/ctrlclass.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ctrlclass.c: the Control Class module.
@@ -238,70 +238,60 @@ BOOL mg_InitControlClass ()
#ifdef _MGCTRL_TREEVIEW
if (!RegisterTreeViewControl ()) {
- _WRN_PRINTF ("Init MiniGUI control error: TreeView");
return FALSE;
}
#endif
#ifdef _MGCTRL_TREEVIEW_RDR
if (!RegisterTreeViewRdrControl ()) {
- _WRN_PRINTF ("Init MiniGUI control error: TreeView_rdr");
return FALSE;
}
#endif
#ifdef _MGCTRL_MONTHCAL
if (!RegisterMonthCalendarControl ()) {
- _WRN_PRINTF ("Init MiniGUI control error: MonthCalendar");
return FALSE;
}
#endif
#ifdef _MGCTRL_SPINBOX
if (!RegisterSpinControl ()) {
- _WRN_PRINTF ("Init MiniGUI control error: Spin");
return FALSE;
}
#endif
#ifdef _MGCTRL_COOLBAR
if (!RegisterCoolBarControl ()) {
- _WRN_PRINTF ("Init MiniGUI control error: CoolBar");
return FALSE;
}
#endif
#ifdef _MGCTRL_LISTVIEW
if (!RegisterListViewControl ()) {
- _WRN_PRINTF ("Init MiniGUI control error: ListView");
return FALSE;
}
#endif
#ifdef _MGCTRL_GRIDVIEW
if (!RegisterGridViewControl ()) {
- _WRN_PRINTF ("Init MiniGUI control error: GridView");
return FALSE;
}
#endif
#ifdef _MGCTRL_ICONVIEW
if (!RegisterIconViewControl ()) {
- _WRN_PRINTF ("Init MiniGUI control error: IconView");
return FALSE;
}
#endif
#ifdef _MGCTRL_ANIMATION
if (!RegisterAnimationControl ()) {
- _WRN_PRINTF ("Init MiniGUI control error: Animation");
return FALSE;
}
#endif
#ifdef _MGCTRL_SCROLLBAR
if (!RegisterScrollBarControl ()) {
- _WRN_PRINTF ("Init MiniGUI control error: ScrollBar");
return FALSE;
}
#endif
diff --git a/src/gui/de-kmap.c b/src/gui/de-kmap.c
index 68195e05..21d24eed 100644
--- a/src/gui/de-kmap.c
+++ b/src/gui/de-kmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
/* loadkeys --mktable defkeymap.map > defkeymap.c */
diff --git a/src/gui/de-latin1-kmap.c b/src/gui/de-latin1-kmap.c
index 363e95d6..e0c498fa 100644
--- a/src/gui/de-latin1-kmap.c
+++ b/src/gui/de-latin1-kmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
/* loadkeys --mktable defkeymap.map > defkeymap.c */
diff --git a/src/gui/de-latin1-nodeadkeys-kmap.c b/src/gui/de-latin1-nodeadkeys-kmap.c
index 8f287f75..0f7ecc58 100644
--- a/src/gui/de-latin1-nodeadkeys-kmap.c
+++ b/src/gui/de-latin1-nodeadkeys-kmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
/* loadkeys --mktable defkeymap.map > defkeymap.c */
diff --git a/src/gui/defkeymap.c b/src/gui/defkeymap.c
index 1df1db98..6a054fa8 100644
--- a/src/gui/defkeymap.c
+++ b/src/gui/defkeymap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
/* loadkeys --mktable defkeymap.map > defkeymap.c */
diff --git a/src/gui/dialog.c b/src/gui/dialog.c
index c6526804..66c9c689 100644
--- a/src/gui/dialog.c
+++ b/src/gui/dialog.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** dialog.c: The Dialog module.
diff --git a/src/gui/es-cp850-kmap.c b/src/gui/es-cp850-kmap.c
index 5bfc3fae..9a8c69bd 100644
--- a/src/gui/es-cp850-kmap.c
+++ b/src/gui/es-cp850-kmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
/* loadkeys --mktable defkeymap.map > defkeymap.c */
diff --git a/src/gui/es-kmap.c b/src/gui/es-kmap.c
index 422725b3..e385271b 100644
--- a/src/gui/es-kmap.c
+++ b/src/gui/es-kmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
/* loadkeys --mktable defkeymap.map > defkeymap.c */
diff --git a/src/gui/fr-kmap.c b/src/gui/fr-kmap.c
index 86709893..c20041fd 100644
--- a/src/gui/fr-kmap.c
+++ b/src/gui/fr-kmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
/* loadkeys --mktable defkeymap.map > defkeymap.c */
diff --git a/src/gui/fr-pc-kmap.c b/src/gui/fr-pc-kmap.c
index c7ec0e27..cd03f24c 100644
--- a/src/gui/fr-pc-kmap.c
+++ b/src/gui/fr-pc-kmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
/* loadkeys --mktable defkeymap.map > defkeymap.c */
diff --git a/src/gui/hebrewkeymap.c b/src/gui/hebrewkeymap.c
index 0e583a72..2b0a1abb 100644
--- a/src/gui/hebrewkeymap.c
+++ b/src/gui/hebrewkeymap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
diff --git a/src/gui/it-kmap.c b/src/gui/it-kmap.c
index b7be8136..be3820da 100644
--- a/src/gui/it-kmap.c
+++ b/src/gui/it-kmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Do not edit this file! It was automatically generated by */
/* loadkeys --mktable defkeymap.map > defkeymap.c */
diff --git a/src/gui/keyboard.c b/src/gui/keyboard.c
index a15be83c..16a6c8b7 100644
--- a/src/gui/keyboard.c
+++ b/src/gui/keyboard.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** keyboard.c: scancode to keycode, the new TranslateMessage implementation.
diff --git a/src/gui/keyboard.h b/src/gui/keyboard.h
index 3601d54f..009fd336 100644
--- a/src/gui/keyboard.h
+++ b/src/gui/keyboard.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* key.h: head file of Key handling module.
diff --git a/src/gui/lf_classic.c b/src/gui/lf_classic.c
index 779c0c3f..593ad097 100644
--- a/src/gui/lf_classic.c
+++ b/src/gui/lf_classic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** lf_classic.c: The classic LF implementation file.
diff --git a/src/gui/lf_common.c b/src/gui/lf_common.c
index 5cda295c..7048e614 100644
--- a/src/gui/lf_common.c
+++ b/src/gui/lf_common.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*! ============================================================================
* @file lf_common.c
@@ -76,7 +76,7 @@ char* gui_GetIconFile(const char* rdr_name, char* file, char* _szValue)
if (GetMgEtcValue (rdr_name, file,
iconname, sizeof(szValue)-(iconname-szValue)) < 0 ) {
- _WRN_PRINTF ("can't get %s's value from section %s in etc.",
+ _WRN_PRINTF ("can't get %s's value from section %s in etc.\n",
file, rdr_name);
return NULL;
}
@@ -93,7 +93,7 @@ BOOL gui_LoadIconRes(HDC hdc, const char* rdr_name, char* file)
if (LoadResource(szValue, RES_TYPE_ICON, (DWORD)hdc) != NULL)
return TRUE;
- _WRN_PRINTF ("can't get %s's value from section %s in etc.",
+ _WRN_PRINTF ("can't get %s's value from section %s in etc.\n",
file, rdr_name);
return FALSE;
diff --git a/src/gui/lf_common.h b/src/gui/lf_common.h
index d6f9d949..44529d49 100644
--- a/src/gui/lf_common.h
+++ b/src/gui/lf_common.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef LF_COMMON_H
diff --git a/src/gui/lf_fashion.c b/src/gui/lf_fashion.c
index 5fa07a7c..4abcd464 100644
--- a/src/gui/lf_fashion.c
+++ b/src/gui/lf_fashion.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** lf_fashion.c: The fashion LF implementation file.
diff --git a/src/gui/lf_flat.c b/src/gui/lf_flat.c
index 8d5ff21d..fc156535 100644
--- a/src/gui/lf_flat.c
+++ b/src/gui/lf_flat.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** lf_flat.c: The flat LF implementation file.
diff --git a/src/gui/lf_manager.c b/src/gui/lf_manager.c
index 9f3482a0..7e3f1745 100644
--- a/src/gui/lf_manager.c
+++ b/src/gui/lf_manager.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** lf_manager.c: The Look and Feel manager file.
@@ -735,7 +735,7 @@ GetWindowElementPixelEx (HWND hwnd, HDC hdc, int we_attr_id)
gal_pixel pixel;
if ((we_attr_id & WE_ATTR_TYPE_MASK) != WE_ATTR_TYPE_COLOR) {
- _WRN_PRINTF ("Can't get color; invalid attr id: %x.", we_attr_id);
+ _WRN_PRINTF ("Can't get color; invalid attr id: %x.\n", we_attr_id);
return -1;
}
@@ -834,7 +834,7 @@ BOOL GUIAPI InitWindowElementAttrs (PWERENDERER rdr)
if (GetMgEtcValue (rdr->name, szCKeyNames[i][j],
buff, 12) != ETC_OK) {
_WRN_PRINTF ("InitWindowElementAttrs error: \
- Can not Get %s color.", szCKeyNames[i][j]);
+ Can not Get %s color.\n", szCKeyNames[i][j]);
return FALSE;
}
@@ -863,7 +863,7 @@ BOOL mg_InitLFManager (void)
return FALSE;
if (rdr->init && 0 != rdr->init (rdr)) {
- _WRN_PRINTF ("failed to initialize default renderer's private info.");
+ _ERR_PRINTF ("GUI>LFRDR: failed to initialize default renderer's private info.\n");
return FALSE;
}
@@ -875,7 +875,7 @@ BOOL mg_InitLFManager (void)
if (rdr->init && 0 != rdr->init (rdr)) {
wnd_lf_info[i].wnd_rdr = NULL;
- _WRN_PRINTF ("failed to initialize renderer[%d]'s private info.", i);
+ _WRN_PRINTF ("failed to initialize renderer[%d]'s private info.\n", i);
continue;
}
}
diff --git a/src/gui/lf_skin.c b/src/gui/lf_skin.c
index dd3a8cc4..8d3a3491 100644
--- a/src/gui/lf_skin.c
+++ b/src/gui/lf_skin.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** lf_fashion.c: The fashion LF implementation file.
diff --git a/src/gui/lf_test/autogen.sh b/src/gui/lf_test/autogen.sh
index cffc73cc..b6e8a0de 100755
--- a/src/gui/lf_test/autogen.sh
+++ b/src/gui/lf_test/autogen.sh
@@ -30,7 +30,7 @@
## under the terms and conditions of the commercial license.
##
## For more information about the commercial license, please refer to
-## .
+## .
##
aclocal
diff --git a/src/gui/lf_test/src/button_my.c b/src/gui/lf_test/src/button_my.c
index bed58bf6..72fbb83b 100644
--- a/src/gui/lf_test/src/button_my.c
+++ b/src/gui/lf_test/src/button_my.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: button.c,v 1.17 2007-12-06 02:24:59 xwyan Exp $
diff --git a/src/gui/lf_test/src/combobox.c b/src/gui/lf_test/src/combobox.c
index c581f55a..e5be1a4e 100644
--- a/src/gui/lf_test/src/combobox.c
+++ b/src/gui/lf_test/src/combobox.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: combobox.c,v 1.14 2007-12-06 02:24:59 xwyan Exp $
diff --git a/src/gui/lf_test/src/coolbar.c b/src/gui/lf_test/src/coolbar.c
index 70360ad6..7690ae71 100644
--- a/src/gui/lf_test/src/coolbar.c
+++ b/src/gui/lf_test/src/coolbar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: coolbar.c,v 1.11 2007-12-06 02:24:59 xwyan Exp $
diff --git a/src/gui/lf_test/src/ctrldemo.c b/src/gui/lf_test/src/ctrldemo.c
index 1c7ef156..783957c9 100644
--- a/src/gui/lf_test/src/ctrldemo.c
+++ b/src/gui/lf_test/src/ctrldemo.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: main.c,v 1.22 2007-12-06 02:24:59 xwyan Exp $
diff --git a/src/gui/lf_test/src/ctrls.h b/src/gui/lf_test/src/ctrls.h
index 0ab2ad9b..1dbeb759 100644
--- a/src/gui/lf_test/src/ctrls.h
+++ b/src/gui/lf_test/src/ctrls.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
void static_demo (HWND hwnd);
diff --git a/src/gui/lf_test/src/draw_fold.c b/src/gui/lf_test/src/draw_fold.c
index cdffe92b..c8b0e08f 100644
--- a/src/gui/lf_test/src/draw_fold.c
+++ b/src/gui/lf_test/src/draw_fold.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* draw_fold.c
diff --git a/src/gui/lf_test/src/draw_radio.c b/src/gui/lf_test/src/draw_radio.c
index 8f42aefa..86b6860f 100644
--- a/src/gui/lf_test/src/draw_radio.c
+++ b/src/gui/lf_test/src/draw_radio.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/gui/lf_test/src/edit.c b/src/gui/lf_test/src/edit.c
index 1e4ee33f..894f6b1f 100644
--- a/src/gui/lf_test/src/edit.c
+++ b/src/gui/lf_test/src/edit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: edit.c,v 1.23 2007-12-06 02:24:59 xwyan Exp $
diff --git a/src/gui/lf_test/src/font_dialog.c b/src/gui/lf_test/src/font_dialog.c
index 5c3902a2..5fe26fe5 100644
--- a/src/gui/lf_test/src/font_dialog.c
+++ b/src/gui/lf_test/src/font_dialog.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/gui/lf_test/src/grid.c b/src/gui/lf_test/src/grid.c
index 6e132147..5e94bace 100644
--- a/src/gui/lf_test/src/grid.c
+++ b/src/gui/lf_test/src/grid.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/gui/lf_test/src/helloworld.c b/src/gui/lf_test/src/helloworld.c
index eaf6e608..19584568 100644
--- a/src/gui/lf_test/src/helloworld.c
+++ b/src/gui/lf_test/src/helloworld.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/gui/lf_test/src/listbox.c b/src/gui/lf_test/src/listbox.c
index b351973a..51af7835 100644
--- a/src/gui/lf_test/src/listbox.c
+++ b/src/gui/lf_test/src/listbox.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: listbox.c,v 1.17 2007-12-06 02:24:59 xwyan Exp $
diff --git a/src/gui/lf_test/src/listview.c b/src/gui/lf_test/src/listview.c
index 0fc432c3..75bf2e1b 100644
--- a/src/gui/lf_test/src/listview.c
+++ b/src/gui/lf_test/src/listview.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: listview.c,v 1.36 2007-12-06 02:24:59 xwyan Exp $
diff --git a/src/gui/lf_test/src/menubutton.c b/src/gui/lf_test/src/menubutton.c
index 25e60bca..082b0ecc 100644
--- a/src/gui/lf_test/src/menubutton.c
+++ b/src/gui/lf_test/src/menubutton.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: menubutton.c,v 1.13 2007-12-06 02:24:59 xwyan Exp $
diff --git a/src/gui/lf_test/src/monthcalendar.c b/src/gui/lf_test/src/monthcalendar.c
index 3f12b4c4..6d0cf3ef 100644
--- a/src/gui/lf_test/src/monthcalendar.c
+++ b/src/gui/lf_test/src/monthcalendar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: monthcalendar.c,v 1.11 2007-12-06 02:25:00 xwyan Exp $
diff --git a/src/gui/lf_test/src/my_debug.h b/src/gui/lf_test/src/my_debug.h
index 3c23d9cd..2ebc7b94 100644
--- a/src/gui/lf_test/src/my_debug.h
+++ b/src/gui/lf_test/src/my_debug.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef MY_DEBUG_H
#define MY_DEBUG_H
diff --git a/src/gui/lf_test/src/newtoolbar.c b/src/gui/lf_test/src/newtoolbar.c
index 6c5d8226..b37748c7 100644
--- a/src/gui/lf_test/src/newtoolbar.c
+++ b/src/gui/lf_test/src/newtoolbar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: newtoolbar.c,v 1.15 2007-12-03 03:39:57 xwyan Exp $
diff --git a/src/gui/lf_test/src/progbar.c b/src/gui/lf_test/src/progbar.c
index 51706b52..a130c126 100644
--- a/src/gui/lf_test/src/progbar.c
+++ b/src/gui/lf_test/src/progbar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: progbar.c,v 1.11 2007-12-06 02:25:00 xwyan Exp $
diff --git a/src/gui/lf_test/src/resource.h b/src/gui/lf_test/src/resource.h
index b9fde458..597a82d0 100644
--- a/src/gui/lf_test/src/resource.h
+++ b/src/gui/lf_test/src/resource.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define IDM_NEW 111
#define IDM_OPEN 112
diff --git a/src/gui/lf_test/src/spinbox.c b/src/gui/lf_test/src/spinbox.c
index c6808c18..090e5342 100644
--- a/src/gui/lf_test/src/spinbox.c
+++ b/src/gui/lf_test/src/spinbox.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: spinbox.c,v 1.6 2007-08-30 02:02:03 xwyan Exp $
diff --git a/src/gui/lf_test/src/static.c b/src/gui/lf_test/src/static.c
index 2a8a19a0..ff19dc34 100644
--- a/src/gui/lf_test/src/static.c
+++ b/src/gui/lf_test/src/static.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: static.c,v 1.13 2007-12-06 02:25:00 xwyan Exp $
diff --git a/src/gui/lf_test/src/subclass.c b/src/gui/lf_test/src/subclass.c
index 61ea6b84..6e5f2e2d 100644
--- a/src/gui/lf_test/src/subclass.c
+++ b/src/gui/lf_test/src/subclass.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: subclass.c,v 1.9 2007-12-06 02:25:00 xwyan Exp $
diff --git a/src/gui/lf_test/src/test_calccolor.c b/src/gui/lf_test/src/test_calccolor.c
index 1616c56f..365d2d69 100644
--- a/src/gui/lf_test/src/test_calccolor.c
+++ b/src/gui/lf_test/src/test_calccolor.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/gui/lf_test/src/test_draw.c b/src/gui/lf_test/src/test_draw.c
index 195028b4..8ad4d3e9 100644
--- a/src/gui/lf_test/src/test_draw.c
+++ b/src/gui/lf_test/src/test_draw.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/gui/lf_test/src/test_draw_menu.c b/src/gui/lf_test/src/test_draw_menu.c
index 0faca4b2..6544b341 100644
--- a/src/gui/lf_test/src/test_draw_menu.c
+++ b/src/gui/lf_test/src/test_draw_menu.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/gui/lf_test/src/test_window.c b/src/gui/lf_test/src/test_window.c
index 5eecdaec..c5e091d7 100644
--- a/src/gui/lf_test/src/test_window.c
+++ b/src/gui/lf_test/src/test_window.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/gui/lf_test/src/timeedit.c b/src/gui/lf_test/src/timeedit.c
index 05951fe5..742928d5 100644
--- a/src/gui/lf_test/src/timeedit.c
+++ b/src/gui/lf_test/src/timeedit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: timeedit.c,v 1.13 2007-12-06 02:25:00 xwyan Exp $
diff --git a/src/gui/lf_test/src/tmp.c b/src/gui/lf_test/src/tmp.c
index 502b83a7..a93dbe1f 100644
--- a/src/gui/lf_test/src/tmp.c
+++ b/src/gui/lf_test/src/tmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* \param other Other rendering features, can be one of the following values:
diff --git a/src/gui/lf_test/src/toolbar.c b/src/gui/lf_test/src/toolbar.c
index baaa6c6a..9527cdf1 100644
--- a/src/gui/lf_test/src/toolbar.c
+++ b/src/gui/lf_test/src/toolbar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: toolbar.c,v 1.4 2007-08-30 02:02:03 xwyan Exp $
diff --git a/src/gui/lf_test/src/trackbar.c b/src/gui/lf_test/src/trackbar.c
index e75b8dbe..df9059be 100644
--- a/src/gui/lf_test/src/trackbar.c
+++ b/src/gui/lf_test/src/trackbar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: trackbar.c,v 1.10 2007-12-06 02:25:00 xwyan Exp $
diff --git a/src/gui/lf_test/src/treeview.c b/src/gui/lf_test/src/treeview.c
index 7eb40250..fd7fd65b 100644
--- a/src/gui/lf_test/src/treeview.c
+++ b/src/gui/lf_test/src/treeview.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: treeview.c,v 1.11 2007-12-06 02:25:00 xwyan Exp $
diff --git a/src/gui/lf_tiny.c b/src/gui/lf_tiny.c
index 626d7329..d58f20d1 100644
--- a/src/gui/lf_tiny.c
+++ b/src/gui/lf_tiny.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** lf_tiny.c: The tiny LF implementation file.
diff --git a/src/gui/linux_kd.h b/src/gui/linux_kd.h
index c82e2a31..018adebd 100644
--- a/src/gui/linux_kd.h
+++ b/src/gui/linux_kd.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _LINUX_KD_H
#define _LINUX_KD_H
diff --git a/src/gui/linux_keyboard.h b/src/gui/linux_keyboard.h
index f78f4d0f..aa821d28 100644
--- a/src/gui/linux_keyboard.h
+++ b/src/gui/linux_keyboard.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef __LINUX_KEYBOARD_H
#define __LINUX_KEYBOARD_H
diff --git a/src/gui/linux_types.h b/src/gui/linux_types.h
index 4ab5867f..7949a556 100644
--- a/src/gui/linux_types.h
+++ b/src/gui/linux_types.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H
diff --git a/src/gui/menu.c b/src/gui/menu.c
index eca0dc6c..321f2aa1 100644
--- a/src/gui/menu.c
+++ b/src/gui/menu.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** menu.c: The Menu module.
@@ -1380,7 +1380,7 @@ static void mnuDrawMenuBarItem (HWND hwnd, HDC hdc, PMENUITEM pmi,
return;
if (!pWin->we_rdr) {
- _WRN_PRINTF ("LFRDR is NULL for window: %p", pWin);
+ _WRN_PRINTF ("LFRDR is NULL for window: %p\n", pWin);
return;
}
@@ -2021,7 +2021,7 @@ static int mnuDrawMenuPic (HWND hwnd, HDC hdc, RECT* rect,
if (NULL == pWin) return -1;
if (!pWin->we_rdr) {
- _WRN_PRINTF ("LFRDR is NULL for window: %p", pWin);
+ _WRN_PRINTF ("LFRDR is NULL for window: %p\n", pWin);
return -1;
}
@@ -2266,7 +2266,7 @@ static void draw_bottom_scroll_button(PTRACKMENUINFO ptmi)
if (NULL == pWin) return;
if (!pWin->we_rdr) {
- _WRN_PRINTF ("LFRDR is NULL for window: %p", pWin);
+ _WRN_PRINTF ("LFRDR is NULL for window: %p\n", pWin);
return;
}
@@ -2306,7 +2306,7 @@ static int mnuShowPopupMenu (PTRACKMENUINFO ptmi)
if (NULL == pWin) return -1;
if (!pWin->we_rdr) {
- _WRN_PRINTF ("LFRDR is NULL for window: %p", pWin);
+ _WRN_PRINTF ("LFRDR is NULL for window: %p\n", pWin);
return -1;
}
@@ -2626,7 +2626,7 @@ static void draw_top_scroll_button(PTRACKMENUINFO ptmi)
if (NULL == pWin) return;
if (!pWin->we_rdr) {
- _WRN_PRINTF ("LFRDR is NULL for window: %p", pWin);
+ _WRN_PRINTF ("LFRDR is NULL for window: %p\n", pWin);
return;
}
@@ -2669,7 +2669,7 @@ static int show_scroll_popup_menu (PTRACKMENUINFO ptmi)
if (NULL == pWin) return -1;
if (!pWin->we_rdr) {
- _WRN_PRINTF ("LFRDR is NULL for window: %p", pWin);
+ _WRN_PRINTF ("LFRDR is NULL for window: %p\n", pWin);
return -1;
}
@@ -3099,7 +3099,7 @@ static void mnuHiliteMenuItem (PTRACKMENUINFO ptmi, PMENUITEM pmi, BOOL bHilite)
if (NULL == pWin) return;
if (!pWin->we_rdr) {
- _WRN_PRINTF ("LFRDR is NULL for window: %p", pWin);
+ _WRN_PRINTF ("LFRDR is NULL for window: %p\n", pWin);
return;
}
diff --git a/src/gui/nrw_test/mem_test/mem_test.c b/src/gui/nrw_test/mem_test/mem_test.c
index 2a86fb89..1b91d0ff 100644
--- a/src/gui/nrw_test/mem_test/mem_test.c
+++ b/src/gui/nrw_test/mem_test/mem_test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* mem_test.c
diff --git a/src/gui/nrw_test/mem_test/mginit.c b/src/gui/nrw_test/mem_test/mginit.c
index a4130681..29bfc9e3 100644
--- a/src/gui/nrw_test/mem_test/mginit.c
+++ b/src/gui/nrw_test/mem_test/mginit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/gui/nrw_test/mem_test/mtrace.sh b/src/gui/nrw_test/mem_test/mtrace.sh
index 8cf68227..c146e5bb 100755
--- a/src/gui/nrw_test/mem_test/mtrace.sh
+++ b/src/gui/nrw_test/mem_test/mtrace.sh
@@ -30,6 +30,6 @@
## under the terms and conditions of the commercial license.
##
## For more information about the commercial license, please refer to
-## .
+## .
##
mtrace ./mtrace_test ./memtrace.log
diff --git a/src/gui/nrw_test/mem_test/mtrace_test.c b/src/gui/nrw_test/mem_test/mtrace_test.c
index e73f478e..49b83552 100644
--- a/src/gui/nrw_test/mem_test/mtrace_test.c
+++ b/src/gui/nrw_test/mem_test/mtrace_test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* mtrace_test.c
diff --git a/src/gui/nrw_test/mem_test/valgrind.sh b/src/gui/nrw_test/mem_test/valgrind.sh
index 799c3ceb..76e7942f 100755
--- a/src/gui/nrw_test/mem_test/valgrind.sh
+++ b/src/gui/nrw_test/mem_test/valgrind.sh
@@ -29,6 +29,6 @@
## under the terms and conditions of the commercial license.
##
## For more information about the commercial license, please refer to
-## .
+## .
##
valgrind --tool=memcheck --leak-check=full ./mem_test
diff --git a/src/gui/nrw_test/mybmp2region/mginit.c b/src/gui/nrw_test/mybmp2region/mginit.c
index a4130681..29bfc9e3 100644
--- a/src/gui/nrw_test/mybmp2region/mginit.c
+++ b/src/gui/nrw_test/mybmp2region/mginit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/gui/nrw_test/mybmp2region/mybmp2region.c b/src/gui/nrw_test/mybmp2region/mybmp2region.c
index da26158a..a5ca7715 100644
--- a/src/gui/nrw_test/mybmp2region/mybmp2region.c
+++ b/src/gui/nrw_test/mybmp2region/mybmp2region.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* mybmp2region_test.c
diff --git a/src/gui/nrw_test/performance_test/mginit.c b/src/gui/nrw_test/performance_test/mginit.c
index e8c9cd10..1de2580b 100644
--- a/src/gui/nrw_test/performance_test/mginit.c
+++ b/src/gui/nrw_test/performance_test/mginit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/gui/nrw_test/performance_test/normalwin.c b/src/gui/nrw_test/performance_test/normalwin.c
index 2be3fc68..d922892d 100644
--- a/src/gui/nrw_test/performance_test/normalwin.c
+++ b/src/gui/nrw_test/performance_test/normalwin.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* normalwin.c
diff --git a/src/gui/nrw_test/performance_test/nr_btn.c b/src/gui/nrw_test/performance_test/nr_btn.c
index 3bb33a07..0ac4a288 100644
--- a/src/gui/nrw_test/performance_test/nr_btn.c
+++ b/src/gui/nrw_test/performance_test/nr_btn.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* nr_btn.c
diff --git a/src/gui/nrw_test/performance_test/nr_ctrl.c b/src/gui/nrw_test/performance_test/nr_ctrl.c
index cf6c7ec6..6cb4baf0 100644
--- a/src/gui/nrw_test/performance_test/nr_ctrl.c
+++ b/src/gui/nrw_test/performance_test/nr_ctrl.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* nrctrldemo.c
diff --git a/src/gui/nrw_test/performance_test/nr_ctrl2.c b/src/gui/nrw_test/performance_test/nr_ctrl2.c
index b6d2c46b..51a36364 100644
--- a/src/gui/nrw_test/performance_test/nr_ctrl2.c
+++ b/src/gui/nrw_test/performance_test/nr_ctrl2.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* nr_btn.c
diff --git a/src/gui/nrw_test/performance_test/nr_edit.c b/src/gui/nrw_test/performance_test/nr_edit.c
index 6ee933a6..dc26c443 100644
--- a/src/gui/nrw_test/performance_test/nr_edit.c
+++ b/src/gui/nrw_test/performance_test/nr_edit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* nr_edit.c
diff --git a/src/gui/nrw_test/performance_test/nr_prog.c b/src/gui/nrw_test/performance_test/nr_prog.c
index 586a41f3..26c11981 100644
--- a/src/gui/nrw_test/performance_test/nr_prog.c
+++ b/src/gui/nrw_test/performance_test/nr_prog.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* nr_prog.c
diff --git a/src/gui/nrw_test/performance_test/nr_win.c b/src/gui/nrw_test/performance_test/nr_win.c
index cbe5d5c5..ec4c50aa 100644
--- a/src/gui/nrw_test/performance_test/nr_win.c
+++ b/src/gui/nrw_test/performance_test/nr_win.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* nr_win.c
diff --git a/src/gui/nrw_test/performance_test/roundcornerwin.c b/src/gui/nrw_test/performance_test/roundcornerwin.c
index 8541a1b0..be584920 100644
--- a/src/gui/nrw_test/performance_test/roundcornerwin.c
+++ b/src/gui/nrw_test/performance_test/roundcornerwin.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
$Id: roundcornerwin.c 9578 2008-02-29 07:32:26Z wangjian $
diff --git a/src/gui/nrw_test/performance_test/thread_test.c b/src/gui/nrw_test/performance_test/thread_test.c
index c916831e..ce15803f 100644
--- a/src/gui/nrw_test/performance_test/thread_test.c
+++ b/src/gui/nrw_test/performance_test/thread_test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* thread_test.c
diff --git a/src/gui/nrw_test/performance_test/trans_nr_win.c b/src/gui/nrw_test/performance_test/trans_nr_win.c
index 79986de9..5e5909d6 100644
--- a/src/gui/nrw_test/performance_test/trans_nr_win.c
+++ b/src/gui/nrw_test/performance_test/trans_nr_win.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* trans_nr_win.c
diff --git a/src/gui/transkey.c b/src/gui/transkey.c
index 797280ca..d6e7f336 100644
--- a/src/gui/transkey.c
+++ b/src/gui/transkey.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** transkey.c: The Key Messages Translator
diff --git a/src/gui/window.c b/src/gui/window.c
index 5c754fbf..d460de23 100644
--- a/src/gui/window.c
+++ b/src/gui/window.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** window.c: The Window module.
@@ -3532,19 +3532,18 @@ void GUIAPI MainWindowThreadCleanup (HWND hMainWnd)
{
PMAINWIN pWin = (PMAINWIN)hMainWnd;
- _WRN_PRINTF ("MainWindowThreadCleanup called: %p (%s)", pWin, pWin->spCaption);
+ _DBG_PRINTF ("window(%p), caption(%s)\n", pWin, pWin->spCaption);
if (!MG_IS_DESTROYED_WINDOW (hMainWnd)) {
- _WRN_PRINTF ("Unexpected calling of "
- "(MainWindowThreadCleanup); Window (%p) "
- "not destroyed yet!", hMainWnd);
+ _WRN_PRINTF ("Unexpected calling(%s); Window(%p) not destroyed yet!\n",
+ __FUNCTION__, hMainWnd);
return;
}
#ifdef _MGRM_THREADS
if (pWin->pHosting == NULL) {
mg_FreeMsgQueueThisThread ();
- _WRN_PRINTF ("Message queure is freed: %p (%s)", pWin, pWin->spCaption);
+ _DBG_PRINTF ("Message queure is freed: %p (%s)\n", pWin, pWin->spCaption);
}
#endif
@@ -5976,7 +5975,7 @@ static int gui_GenerateMaskRect(HWND hWnd, RECT4MASK* rect, int rect_size)
(MASKRECT *) calloc (rect_size, sizeof (MASKRECT));
if (!pCtrl->mask_rects) {
- _WRN_PRINTF ("No enough memory!");
+ _WRN_PRINTF ("No enough memory!\n");
free (rect);
return FALSE;
}
@@ -5991,7 +5990,7 @@ static int gui_GenerateMaskRect(HWND hWnd, RECT4MASK* rect, int rect_size)
new_maskrect =
(MASKRECT *) calloc (rect_size, sizeof (MASKRECT));
if (!new_maskrect) {
- _WRN_PRINTF ("No enough memory!");
+ _WRN_PRINTF ("No enough memory!\n");
free (rect);
return FALSE;
}
@@ -6106,7 +6105,7 @@ BOOL GUIAPI SetWindowRegion (HWND hWnd, const CLIPRGN * region)
(MASKRECT *) calloc (rect_size, sizeof (MASKRECT));
if (!pCtrl->mask_rects) {
- _WRN_PRINTF ("No enough memory!");
+ _WRN_PRINTF ("No enough memory!\n");
return FALSE;
}
}
@@ -6120,7 +6119,7 @@ BOOL GUIAPI SetWindowRegion (HWND hWnd, const CLIPRGN * region)
(MASKRECT *) calloc (rect_size, sizeof (MASKRECT));
if (!new_maskrect) {
- _WRN_PRINTF ("No enough memory!");
+ _WRN_PRINTF ("No enough memory!\n");
return FALSE;
}
free (pCtrl->mask_rects);
@@ -6156,7 +6155,7 @@ BOOL GUIAPI SetWindowRegion (HWND hWnd, const CLIPRGN * region)
rect = (RECT4MASK *) calloc(rect_size, sizeof(RECT4MASK));
if(rect == NULL) {
- _WRN_PRINTF ("No enough memory!");
+ _WRN_PRINTF ("No enough memory!\n");
return FALSE;
}
diff --git a/src/ial/2410.c b/src/ial/2410.c
index f2868db1..1246ee61 100644
--- a/src/ial/2410.c
+++ b/src/ial/2410.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** 2410.c: Low Level Input Engine for SMDK2410 Dev Board.
diff --git a/src/ial/2410.h b/src/ial/2410.h
index 759d979a..2041b317 100644
--- a/src/ial/2410.h
+++ b/src/ial/2410.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** 2410.h: 2410 the head file of Low Level Input Engine for S3C2410.
diff --git a/src/ial/2440.c b/src/ial/2440.c
index cb56d63d..52abdc5d 100644
--- a/src/ial/2440.c
+++ b/src/ial/2440.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** 2410.c: Low Level Input Engine for SMDK2410 Dev Board.
diff --git a/src/ial/2440.h b/src/ial/2440.h
index fb7daedd..899e0729 100644
--- a/src/ial/2440.h
+++ b/src/ial/2440.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** custom.h:. the head file for Custom IAL Engine.
diff --git a/src/ial/abs_signal_driver.c b/src/ial/abs_signal_driver.c
index d180b18a..3e53d4fa 100644
--- a/src/ial/abs_signal_driver.c
+++ b/src/ial/abs_signal_driver.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** abs_signal_driver.c: this is the process file of abs signal driver module
diff --git a/src/ial/abs_signal_driver.h b/src/ial/abs_signal_driver.h
index 7fff3032..16ada612 100644
--- a/src/ial/abs_signal_driver.h
+++ b/src/ial/abs_signal_driver.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/******************************************************************************
*
diff --git a/src/ial/abssig.c b/src/ial/abssig.c
index 31512e29..486b475e 100644
--- a/src/ial/abssig.c
+++ b/src/ial/abssig.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** abssig.c: Low Level Input Engine for frv-uclinux ABSSIG.
diff --git a/src/ial/abssig.h b/src/ial/abssig.h
index 884443d4..c58b87e0 100644
--- a/src/ial/abssig.h
+++ b/src/ial/abssig.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** abssig.h:. the head file of Low Level Input Engine for iPAQ
diff --git a/src/ial/ads.c b/src/ial/ads.c
index 4b5b9218..a6197b0f 100644
--- a/src/ial/ads.c
+++ b/src/ial/ads.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ads.c: Low Level Input Engine for ADS Graphics Client.
diff --git a/src/ial/ads.h b/src/ial/ads.h
index a4ab9756..c326e9a9 100644
--- a/src/ial/ads.h
+++ b/src/ial/ads.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ads.h:. the head file of Low Level Input Engine for ADS Graphics Client.
diff --git a/src/ial/ads7846.c b/src/ial/ads7846.c
index 9ff0da4a..41073e40 100644
--- a/src/ial/ads7846.c
+++ b/src/ial/ads7846.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ads7846.c: Low Level Input Engine for Arca Tpanel Ads7846.
diff --git a/src/ial/ads7846.h b/src/ial/ads7846.h
index 7541275f..788eb02d 100644
--- a/src/ial/ads7846.h
+++ b/src/ial/ads7846.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ads7846.h:. the head file of Low Level Input Engine for Arca Tpanel Ads7846.
diff --git a/src/ial/ads_internal.h b/src/ial/ads_internal.h
index 5b6aa110..23dd4948 100644
--- a/src/ial/ads_internal.h
+++ b/src/ial/ads_internal.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
typedef struct tagPOS
{
diff --git a/src/ial/arm3000.c b/src/ial/arm3000.c
index b0265ce2..c7d1b9d2 100644
--- a/src/ial/arm3000.c
+++ b/src/ial/arm3000.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** arm3000.c: Low Level Input Engine for UP-NETARM3000
diff --git a/src/ial/arm3000.h b/src/ial/arm3000.h
index c841ec60..0d6e07f2 100644
--- a/src/ial/arm3000.h
+++ b/src/ial/arm3000.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** arm3000.h:. the head file of Low Level Input Engine for NET-ARM3000
diff --git a/src/ial/auto-protocol.h b/src/ial/auto-protocol.h
index 9347d7a2..5271ec4f 100644
--- a/src/ial/auto-protocol.h
+++ b/src/ial/auto-protocol.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _AUTO_PROTOCOL_H
#define _AUTO_PROTOCOL_H
diff --git a/src/ial/auto.c b/src/ial/auto.c
index 9fad4db0..13eb224a 100644
--- a/src/ial/auto.c
+++ b/src/ial/auto.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** auto.c: Automatic Input Engine
diff --git a/src/ial/auto.h b/src/ial/auto.h
index 4c7603bb..0293cbda 100644
--- a/src/ial/auto.h
+++ b/src/ial/auto.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** auto.h: head file for automatic Input Engine
diff --git a/src/ial/c33l05.c b/src/ial/c33l05.c
index 258c219a..9c103a60 100644
--- a/src/ial/c33l05.c
+++ b/src/ial/c33l05.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** c33l05.c: Low Level Input Engine for c33l05, EPSONARM7-LCD-R4 Dev Boards.
diff --git a/src/ial/c33l05.h b/src/ial/c33l05.h
index f673b421..78150ca5 100644
--- a/src/ial/c33l05.h
+++ b/src/ial/c33l05.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** c33l05.h: the head file of Low Level Input Engine for C33L05.
diff --git a/src/ial/calib.c b/src/ial/calib.c
index 5b9ab19a..7f452c8f 100644
--- a/src/ial/calib.c
+++ b/src/ial/calib.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#if 0
#include
diff --git a/src/ial/cisco_touchpad.c b/src/ial/cisco_touchpad.c
index b8c196aa..cf08035f 100644
--- a/src/ial/cisco_touchpad.c
+++ b/src/ial/cisco_touchpad.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define dbg() printf("%s %d\n", __FUNCTION__, __LINE__)
diff --git a/src/ial/cisco_touchpad.h b/src/ial/cisco_touchpad.h
index 015f29ea..c394668d 100644
--- a/src/ial/cisco_touchpad.h
+++ b/src/ial/cisco_touchpad.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** cisco_touchpad.h: the head file of Low Level Input Engine for
diff --git a/src/ial/comminput.c b/src/ial/comminput.c
index 94c83753..f6119f8d 100644
--- a/src/ial/comminput.c
+++ b/src/ial/comminput.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** comminput.c: Common Input Engine for eCos, uC/OS-II, VxWorks, ...
diff --git a/src/ial/comminput.h b/src/ial/comminput.h
index e4b2f8fd..fcca446a 100644
--- a/src/ial/comminput.h
+++ b/src/ial/comminput.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** comminput.h: head file for comm Input Engine
diff --git a/src/ial/custom.h b/src/ial/custom.h
index a0e8d8be..16918382 100644
--- a/src/ial/custom.h
+++ b/src/ial/custom.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** custom.h:. the head file for Custom IAL Engine.
diff --git a/src/ial/davinci6446.c b/src/ial/davinci6446.c
index b24db63d..33965d9d 100644
--- a/src/ial/davinci6446.c
+++ b/src/ial/davinci6446.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hh2410r3.c: Low Level Input Engine for HH2410-R3, HHARM9-LCD-R4 Dev Boards.
diff --git a/src/ial/davinci6446.h b/src/ial/davinci6446.h
index 62bd0f15..2ab7686a 100644
--- a/src/ial/davinci6446.h
+++ b/src/ial/davinci6446.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef GUI_IAL_DAVINCI6446_H
#define GUI_IAL_DAVINCI6446_H
diff --git a/src/ial/dfb.c b/src/ial/dfb.c
index d03ea857..4eb462be 100644
--- a/src/ial/dfb.c
+++ b/src/ial/dfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** dfb.c: Low Level Input Engine for DirectFB.
diff --git a/src/ial/dfb.h b/src/ial/dfb.h
index da602ab8..19db0650 100644
--- a/src/ial/dfb.h
+++ b/src/ial/dfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** dfb.h: Low Level Input Engine for DirectFB.
diff --git a/src/ial/dlcustom/dlcustom.c b/src/ial/dlcustom/dlcustom.c
index 7166119a..98c52702 100644
--- a/src/ial/dlcustom/dlcustom.c
+++ b/src/ial/dlcustom/dlcustom.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/ial/dlcustom/dlcustom.h b/src/ial/dlcustom/dlcustom.h
index 4d288d13..095b05d2 100644
--- a/src/ial/dlcustom/dlcustom.h
+++ b/src/ial/dlcustom/dlcustom.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: dlcustom.h 6566 2006-05-10 01:44:57Z wanzheng $
diff --git a/src/ial/dlcustom/sample/iale_custom.c b/src/ial/dlcustom/sample/iale_custom.c
index 3d5df648..93b4fc22 100644
--- a/src/ial/dlcustom/sample/iale_custom.c
+++ b/src/ial/dlcustom/sample/iale_custom.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** iale_custom.c:. the C file of dlcustom engine sample.
diff --git a/src/ial/dlcustom/sample/iale_custom.h b/src/ial/dlcustom/sample/iale_custom.h
index f759d89b..9358b2af 100644
--- a/src/ial/dlcustom/sample/iale_custom.h
+++ b/src/ial/dlcustom/sample/iale_custom.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** iale_custom.h:. the head file of dlcustom engine sample.
diff --git a/src/ial/dm270.c b/src/ial/dm270.c
index 2f5b1cef..9aebbf25 100644
--- a/src/ial/dm270.c
+++ b/src/ial/dm270.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** dm270.c: Low Level Input Engine for DigiPro DM270.
diff --git a/src/ial/dm270.h b/src/ial/dm270.h
index f7e503b4..dd6cddf9 100644
--- a/src/ial/dm270.h
+++ b/src/ial/dm270.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** dm270.h:. the head file of Low Level Input Engine for dm270
diff --git a/src/ial/dmg-stb.c b/src/ial/dmg-stb.c
index d7f6cb55..d192454f 100644
--- a/src/ial/dmg-stb.c
+++ b/src/ial/dmg-stb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** dmg-stb.c: IAL Engine for Intel DMG GEN10 STB.
diff --git a/src/ial/dmg-stb.h b/src/ial/dmg-stb.h
index 8b26dd71..a318f280 100644
--- a/src/ial/dmg-stb.h
+++ b/src/ial/dmg-stb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** tf-stb.h:. the head file of Intel DMG GEN10 STB IAL engine.
diff --git a/src/ial/dummy.c b/src/ial/dummy.c
index 8d84ec22..3e89723f 100644
--- a/src/ial/dummy.c
+++ b/src/ial/dummy.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** dummy.c: The dummy IAL engine.
diff --git a/src/ial/dummy.h b/src/ial/dummy.h
index b0c7f89c..91aba5a2 100644
--- a/src/ial/dummy.h
+++ b/src/ial/dummy.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** dummy.h:. the head file of Dummy IAL Engine.
diff --git a/src/ial/em85.c b/src/ial/em85.c
index 66e7a0ef..e7ff49ae 100644
--- a/src/ial/em85.c
+++ b/src/ial/em85.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** em85.c: IAL Engine for EM85xx Front Panel and Remote Controller
diff --git a/src/ial/em85.h b/src/ial/em85.h
index 3c83f165..d266fb2c 100644
--- a/src/ial/em85.h
+++ b/src/ial/em85.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fip.h:. the head file for IAL Engine of EM85xx Front Panel and Remote Controller
diff --git a/src/ial/em86.c b/src/ial/em86.c
index e78befae..fa113e04 100644
--- a/src/ial/em86.c
+++ b/src/ial/em86.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** em86.c: IAL Engine for EM86xx Remote Controller.
diff --git a/src/ial/em86.h b/src/ial/em86.h
index f0f77061..8e51d458 100644
--- a/src/ial/em86.h
+++ b/src/ial/em86.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _EM86_H_
#define _EM86_H_
diff --git a/src/ial/em8620.c b/src/ial/em8620.c
index 8405e127..09e74c53 100644
--- a/src/ial/em8620.c
+++ b/src/ial/em8620.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** em8620.c: IAL Engine for EM8620L
diff --git a/src/ial/em8620.h b/src/ial/em8620.h
index 359109c7..3fca1886 100644
--- a/src/ial/em8620.h
+++ b/src/ial/em8620.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** em8620.h:. the head file for IAL Engine of EM8520L
diff --git a/src/ial/embest2410.c b/src/ial/embest2410.c
index d63f2f2c..3f295d19 100644
--- a/src/ial/embest2410.c
+++ b/src/ial/embest2410.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** embest2410.c: Low Level Input Engine for EMBEST ARM2410
diff --git a/src/ial/embest2410.h b/src/ial/embest2410.h
index c334e851..4177bb93 100644
--- a/src/ial/embest2410.h
+++ b/src/ial/embest2410.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** embest2410.h:. the head file of Low Level Input Engine for EMBEST ARM2410
diff --git a/src/ial/embest44b0.c b/src/ial/embest44b0.c
index f04f3782..a7a63aa8 100644
--- a/src/ial/embest44b0.c
+++ b/src/ial/embest44b0.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hh44b0.c: Low Level Input Engine for Embest ARM44B0
diff --git a/src/ial/embest44b0.h b/src/ial/embest44b0.h
index c2d140ee..3bfc0504 100644
--- a/src/ial/embest44b0.h
+++ b/src/ial/embest44b0.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef GUI_IAL_HH44B0_H
#define GUI_IAL_HH44B0_H
diff --git a/src/ial/ep7211.c b/src/ial/ep7211.c
index 1ab20d3e..6eece0c5 100644
--- a/src/ial/ep7211.c
+++ b/src/ial/ep7211.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ep7211.c: Low Level Input Engine for EP7211.
diff --git a/src/ial/ep7211.h b/src/ial/ep7211.h
index c47223a0..0a98ee70 100644
--- a/src/ial/ep7211.h
+++ b/src/ial/ep7211.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ep7211.h:. the head file of Low Level Input Engine for EP7211
diff --git a/src/ial/ep7211_internal.h b/src/ial/ep7211_internal.h
index 1c4b6f3a..03a0ef28 100644
--- a/src/ial/ep7211_internal.h
+++ b/src/ial/ep7211_internal.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
typedef struct tagPOS
{
diff --git a/src/ial/evmv10.c b/src/ial/evmv10.c
index dacda24d..9e3369e4 100644
--- a/src/ial/evmv10.c
+++ b/src/ial/evmv10.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** evmv10e.c: Low Level Input Engine for DigiPro xScale EVMV 1.0.
diff --git a/src/ial/evmv10.h b/src/ial/evmv10.h
index d2fdf9c7..caf84136 100644
--- a/src/ial/evmv10.h
+++ b/src/ial/evmv10.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** evmv10.h:. the head file of Low Level Input Engine for EVMV10
diff --git a/src/ial/fft7202.c b/src/ial/fft7202.c
index df751d0d..2afa3bca 100644
--- a/src/ial/fft7202.c
+++ b/src/ial/fft7202.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fft7202.c: Low Level Input Engine for FFT 7202
diff --git a/src/ial/fft7202.h b/src/ial/fft7202.h
index ba5e9658..4b4a8529 100644
--- a/src/ial/fft7202.h
+++ b/src/ial/fft7202.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fft7202.h:. the head file of Low Level Input Engine for iPAQ
diff --git a/src/ial/figueroa.c b/src/ial/figueroa.c
index be6cdd16..5b1e224b 100644
--- a/src/ial/figueroa.c
+++ b/src/ial/figueroa.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** figueroa.c: Low Level Input Engine for D2 FiguaOA
diff --git a/src/ial/figueroa.h b/src/ial/figueroa.h
index aad8328c..5b58931a 100644
--- a/src/ial/figueroa.h
+++ b/src/ial/figueroa.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** figueroa.h:. the head file of Low Level Input Engine for FiguerOA
diff --git a/src/ial/fip.c b/src/ial/fip.c
index fdb813b2..f8138f4a 100644
--- a/src/ial/fip.c
+++ b/src/ial/fip.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fip.c: IAL Engine for EM85xx Front Panel and Remote Controller
diff --git a/src/ial/fip.h b/src/ial/fip.h
index 7038d474..e42a414a 100644
--- a/src/ial/fip.h
+++ b/src/ial/fip.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fip.h:. the head file for IAL Engine of EM85xx Front Panel and Remote Controller
diff --git a/src/ial/fxrm9200.c b/src/ial/fxrm9200.c
index 65765265..19f879e0 100644
--- a/src/ial/fxrm9200.c
+++ b/src/ial/fxrm9200.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fxrm9200.c: Low Level Input Engine for fuxu rm9200.
diff --git a/src/ial/fxrm9200.h b/src/ial/fxrm9200.h
index 7c06c47c..0defb6f7 100644
--- a/src/ial/fxrm9200.h
+++ b/src/ial/fxrm9200.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fxrm9200.h:. the head file of Low Level Input Engine for fuxu rm9200.
diff --git a/src/ial/fz_custom.c b/src/ial/fz_custom.c
index 2239e711..a2eb9b66 100644
--- a/src/ial/fz_custom.c
+++ b/src/ial/fz_custom.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** 2410.c: Low Level Input Engine for SMDK2410 Dev Board.
diff --git a/src/ial/helio.c b/src/ial/helio.c
index 35568e59..c588dbd6 100644
--- a/src/ial/helio.c
+++ b/src/ial/helio.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** helio.c: Low Level Input Engine for Helio Touch Panel
diff --git a/src/ial/helio.h b/src/ial/helio.h
index ca9f51f1..be1a45e2 100644
--- a/src/ial/helio.h
+++ b/src/ial/helio.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** helio.h:. the head file of Low Level Input Engine for Helio Touche Panel.
diff --git a/src/ial/hh2410r3.c b/src/ial/hh2410r3.c
index f721f45d..b0cb1858 100644
--- a/src/ial/hh2410r3.c
+++ b/src/ial/hh2410r3.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hh2410r3.c: Low Level Input Engine for HH2410-R3, HHARM9-LCD-R4 Dev Boards.
diff --git a/src/ial/hh2410r3.h b/src/ial/hh2410r3.h
index 85a27413..b123bd7e 100644
--- a/src/ial/hh2410r3.h
+++ b/src/ial/hh2410r3.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hh2410r3.h: the head file of Low Level Input Engine for HHARM2410R3.
diff --git a/src/ial/hh2440.c b/src/ial/hh2440.c
index e0237f1b..63082ecd 100644
--- a/src/ial/hh2440.c
+++ b/src/ial/hh2440.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hh2440.c: Low Level Input Engine for Huaheng ARM S3C2440 Dev Board.
diff --git a/src/ial/hh2440.h b/src/ial/hh2440.h
index 2693f090..7434fd61 100644
--- a/src/ial/hh2440.h
+++ b/src/ial/hh2440.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hh2440.h: the head file of Low Level Input Engine for HHARM2440.
diff --git a/src/ial/hh5249kbdir.c b/src/ial/hh5249kbdir.c
index d420e2b9..368075f9 100644
--- a/src/ial/hh5249kbdir.c
+++ b/src/ial/hh5249kbdir.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hh5249kbdir.c: IAL Engine for HH5249 PS/2 keyboard and IrDA.
diff --git a/src/ial/hh5249kbdir.h b/src/ial/hh5249kbdir.h
index 419c51e8..4d847303 100644
--- a/src/ial/hh5249kbdir.h
+++ b/src/ial/hh5249kbdir.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hh5249kbdir.h:. the head file of HH5249 PS/2 keyboard and IrDA IAL engine.
diff --git a/src/ial/hi3510.c b/src/ial/hi3510.c
index 0ff754eb..86cecc22 100644
--- a/src/ial/hi3510.c
+++ b/src/ial/hi3510.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hi3510.c: Input Engine for hi3510
diff --git a/src/ial/hi3510.h b/src/ial/hi3510.h
index 4a3cfdbf..a51ab80e 100644
--- a/src/ial/hi3510.h
+++ b/src/ial/hi3510.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hi3510.h: head file of Input Engine for hi3510
diff --git a/src/ial/ial.c b/src/ial/ial.c
index f119d9a4..dc636996 100644
--- a/src/ial/ial.c
+++ b/src/ial/ial.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** The Input Abstract Layer of MiniGUI.
diff --git a/src/ial/init_ts.c b/src/ial/init_ts.c
index 4a0f042c..baf949ad 100644
--- a/src/ial/init_ts.c
+++ b/src/ial/init_ts.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** init_ts.c
diff --git a/src/ial/ipaq-h3600.c b/src/ial/ipaq-h3600.c
index 45193230..731551ba 100644
--- a/src/ial/ipaq-h3600.c
+++ b/src/ial/ipaq-h3600.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ipaq-h3600.c: Low Level Input Engine for iPAQ H3600/H3800
diff --git a/src/ial/ipaq-h3600.h b/src/ial/ipaq-h3600.h
index d74e4e67..bb829821 100644
--- a/src/ial/ipaq-h3600.h
+++ b/src/ial/ipaq-h3600.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ipaq_h3600.h:. the head file of Low Level Input Engine for iPAQ
diff --git a/src/ial/ipaq-h5400.c b/src/ial/ipaq-h5400.c
index 8372a6f5..456e6767 100644
--- a/src/ial/ipaq-h5400.c
+++ b/src/ial/ipaq-h5400.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ipaq-h5400.c: Low Level Input Engine for iPAQ H5400.
diff --git a/src/ial/ipaq-h5400.h b/src/ial/ipaq-h5400.h
index 23950f88..29760908 100644
--- a/src/ial/ipaq-h5400.h
+++ b/src/ial/ipaq-h5400.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ipaq_h5400.h:. the head file of Low Level Input Engine for iPAQ
diff --git a/src/ial/jz4740.c b/src/ial/jz4740.c
index 72d58bcb..4da07733 100644
--- a/src/ial/jz4740.c
+++ b/src/ial/jz4740.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: jz4740.c 7335 2008-12-24 03:38:27Z lvlei $
diff --git a/src/ial/jz4740.h b/src/ial/jz4740.h
index 42143557..c1500cb6 100644
--- a/src/ial/jz4740.h
+++ b/src/ial/jz4740.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef GUI_IAL_TSLIB_H
#define GUI_IAL_TSLIB_H
diff --git a/src/ial/l7200.c b/src/ial/l7200.c
index c272f679..d7630e3a 100644
--- a/src/ial/l7200.c
+++ b/src/ial/l7200.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** l7200.c: Low Level Input Engine for LinkUp System L7200 SDB
diff --git a/src/ial/l7200.h b/src/ial/l7200.h
index 1b0247e0..53edeb4d 100644
--- a/src/ial/l7200.h
+++ b/src/ial/l7200.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ipaq.h:. the head file of Low Level Input Engine for iPAQ
diff --git a/src/ial/libmc.h b/src/ial/libmc.h
index be52d27a..3f615a51 100644
--- a/src/ial/libmc.h
+++ b/src/ial/libmc.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef __LIBMC_H__
#define __LIBMC_H__
diff --git a/src/ial/lide.c b/src/ial/lide.c
index 6133e74e..63698784 100644
--- a/src/ial/lide.c
+++ b/src/ial/lide.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** jz4740.c: Low Level Input Engine for HH2410-R3, HHARM9-LCD-R4 Dev Boards.
diff --git a/src/ial/lide.h b/src/ial/lide.h
index a4276646..bf5653fa 100644
--- a/src/ial/lide.h
+++ b/src/ial/lide.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifdef __cplusplus
extern "C" {
diff --git a/src/ial/linux-libinput.c b/src/ial/linux-libinput.c
index 4b540b24..e6d27450 100644
--- a/src/ial/linux-libinput.c
+++ b/src/ial/linux-libinput.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** linux-libinput.c: The implementation of the IAL engine based on libinput.
@@ -1316,7 +1316,7 @@ static void update_default_device(void)
}
if (!default_seat_found) {
- _WRN_PRINTF("no default seat found for seat_id: %s", my_ctxt.seat_id);
+ _WRN_PRINTF("no default seat found for seat_id: %s\n", my_ctxt.seat_id);
}
my_ctxt.li_fd = libinput_get_fd(my_ctxt.li);
@@ -1400,7 +1400,7 @@ BOOL InitLibInput (INPUT* input, const char* mdev, const char* mtype)
if (GetMgEtcValue ("libinput", "seat",
my_ctxt.seat_id, LEN_SEAT_ID) < 0) {
strcpy(my_ctxt.seat_id, "seat0");
- _WRN_PRINTF("No libinput.seat defined, use the default 'seat0'");
+ _WRN_PRINTF("No libinput.seat defined, use the default 'seat0'\n");
}
if (libinput_udev_assign_seat(my_ctxt.li, my_ctxt.seat_id))
diff --git a/src/ial/linux-libinput.h b/src/ial/linux-libinput.h
index ad87e039..0aff5fdb 100644
--- a/src/ial/linux-libinput.h
+++ b/src/ial/linux-libinput.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** linux-libinput.h: the head file of the IAL engine based on libinput.
diff --git a/src/ial/linux-tty.c b/src/ial/linux-tty.c
index db078e7a..59633c11 100644
--- a/src/ial/linux-tty.c
+++ b/src/ial/linux-tty.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** linux-tty.c: handle linux tty device, e.g., VT switching.
@@ -157,8 +157,8 @@ int mg_linux_tty_init(BOOL graf_mode)
/* enter graphics mode */
if (ioctl (ttyfd, KDSETMODE, KD_GRAPHICS) == -1) {
- _WRN_PRINTF("Failed when setting the terminal to graphics mode: %m.");
- _WRN_PRINTF("It might is not a console.");
+ _WRN_PRINTF("Failed when setting the terminal to graphics mode: %m.\n");
+ _WRN_PRINTF("It might is not a console.\n");
}
}
diff --git a/src/ial/mc68x328.c b/src/ial/mc68x328.c
index a6ce456b..82bf3326 100644
--- a/src/ial/mc68x328.c
+++ b/src/ial/mc68x328.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mc68x328.c: Low Level Input Engine for uClinux touch screen palm/mc68ez328
diff --git a/src/ial/mc68x328.h b/src/ial/mc68x328.h
index 9850ca94..601a4cc1 100644
--- a/src/ial/mc68x328.h
+++ b/src/ial/mc68x328.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mc68x328.h: the head file of Low Level Input Engine for
diff --git a/src/ial/mgsock.c b/src/ial/mgsock.c
index 10abe758..7bdce01f 100644
--- a/src/ial/mgsock.c
+++ b/src/ial/mgsock.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "mgconfig.h"
diff --git a/src/ial/mpc823.c b/src/ial/mpc823.c
index ae885f2a..e0c1fe61 100644
--- a/src/ial/mpc823.c
+++ b/src/ial/mpc823.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mpc823.c: Low Level Input Engine for sinovee sc823 board
diff --git a/src/ial/mpc823.h b/src/ial/mpc823.h
index 1ab617c5..92e91099 100644
--- a/src/ial/mpc823.h
+++ b/src/ial/mpc823.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mpc823.h:. the head file of Low Level Input Engine for sinovee sc823 board.
diff --git a/src/ial/mstarial.c b/src/ial/mstarial.c
index a5171769..a482cf73 100644
--- a/src/ial/mstarial.c
+++ b/src/ial/mstarial.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define ENTER() printf(">>> entering %s %s\n", __FILE__, __FUNCTION__)
#define LEAVE() printf("<<< leaving %s %s\n", __FILE__, __FUNCTION__)
diff --git a/src/ial/mstarial.h b/src/ial/mstarial.h
index aa78e2c1..2474502a 100644
--- a/src/ial/mstarial.h
+++ b/src/ial/mstarial.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mstarial.h: the head file of Low Level Input Engine for
diff --git a/src/ial/native/kbd_event.c b/src/ial/native/kbd_event.c
index fd762aa8..2e57b832 100644
--- a/src/ial/native/kbd_event.c
+++ b/src/ial/native/kbd_event.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** kbd_event.c: /dev/input/eventX Keyboard Driver
diff --git a/src/ial/native/kbd_tty.c b/src/ial/native/kbd_tty.c
index 9c24f00e..47cedbf8 100644
--- a/src/ial/native/kbd_tty.c
+++ b/src/ial/native/kbd_tty.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** kbd_tty.c: /dev/tty TTY Keyboard Driver
diff --git a/src/ial/native/mou_gpm.c b/src/ial/native/mou_gpm.c
index 3d58d11a..2e123da8 100644
--- a/src/ial/native/mou_gpm.c
+++ b/src/ial/native/mou_gpm.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mou_gpm.c: GPM Mouse Driver
diff --git a/src/ial/native/mou_imps2.c b/src/ial/native/mou_imps2.c
index b1a2b53a..14d23b1e 100644
--- a/src/ial/native/mou_imps2.c
+++ b/src/ial/native/mou_imps2.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mou_imps2.c: Intelligent PS/2 Mouse Driver
diff --git a/src/ial/native/mou_ms.c b/src/ial/native/mou_ms.c
index 9bed2e84..e9b989fa 100644
--- a/src/ial/native/mou_ms.c
+++ b/src/ial/native/mou_ms.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mou_ms.c: MS Mouse Driver
diff --git a/src/ial/native/mou_ms3.c b/src/ial/native/mou_ms3.c
index a8be3cac..c96c6a17 100644
--- a/src/ial/native/mou_ms3.c
+++ b/src/ial/native/mou_ms3.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mou_ms3.c: MS3 Mouse Driver
diff --git a/src/ial/native/mou_ps2.c b/src/ial/native/mou_ps2.c
index 8b063b27..cebd326f 100644
--- a/src/ial/native/mou_ps2.c
+++ b/src/ial/native/mou_ps2.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mou_ps2.c: PS/2 mouse driver.
diff --git a/src/ial/native/native.c b/src/ial/native/native.c
index 00c5cbe5..ecfb4ec8 100644
--- a/src/ial/native/native.c
+++ b/src/ial/native/native.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** native.c: Native IAL engine
diff --git a/src/ial/native/native.h b/src/ial/native/native.h
index c16b8f94..042e1853 100644
--- a/src/ial/native/native.h
+++ b/src/ial/native/native.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** native.h: the head file of native Low Level Input Engine
diff --git a/src/ial/native/vtswitch-lite.c b/src/ial/native/vtswitch-lite.c
index 16d79917..98539119 100644
--- a/src/ial/native/vtswitch-lite.c
+++ b/src/ial/native/vtswitch-lite.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vtswitch-lite.c: VT switching.
diff --git a/src/ial/netial/netial.c b/src/ial/netial/netial.c
index e6f68637..a4efc50c 100644
--- a/src/ial/netial/netial.c
+++ b/src/ial/netial/netial.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/ial/netial/netial.h b/src/ial/netial/netial.h
index 6f1d3dc5..da27205b 100644
--- a/src/ial/netial/netial.h
+++ b/src/ial/netial/netial.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef GUI_IAL_NET_H
diff --git a/src/ial/nexusial/nexus.c b/src/ial/nexusial/nexus.c
index 88d4b7a9..8a43c8ea 100644
--- a/src/ial/nexusial/nexus.c
+++ b/src/ial/nexusial/nexus.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ipb5310remote.c: Low Level Input Engine for iPB5310 remote control.
diff --git a/src/ial/nexusial/nexus.h b/src/ial/nexusial/nexus.h
index 23cd4502..77b9d611 100644
--- a/src/ial/nexusial/nexus.h
+++ b/src/ial/nexusial/nexus.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Created by ChenLei, 2009/01/16
diff --git a/src/ial/palm2.c b/src/ial/palm2.c
index d2cacaa8..9957148e 100644
--- a/src/ial/palm2.c
+++ b/src/ial/palm2.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** palm2.c: Low Level Input Engine for OKWAP PalmII.
diff --git a/src/ial/palm2.h b/src/ial/palm2.h
index 877b91ca..56e44b63 100644
--- a/src/ial/palm2.h
+++ b/src/ial/palm2.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** palm2.h: the head file of Low Level Input Engine for OKWAP Palm2.
diff --git a/src/ial/pcxvfb.h b/src/ial/pcxvfb.h
index f9519827..cae6b560 100644
--- a/src/ial/pcxvfb.h
+++ b/src/ial/pcxvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pcxvfb.h: head file of Input Engine for PCX Virtual FrameBuffer
diff --git a/src/ial/pcxvfbial.c b/src/ial/pcxvfbial.c
index 810095ec..56994280 100644
--- a/src/ial/pcxvfbial.c
+++ b/src/ial/pcxvfbial.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pcxvfb.c: Input Engine for PCX Virtual FrameBuffer
diff --git a/src/ial/ps2-conv.c b/src/ial/ps2-conv.c
index 5535dae9..a436c28a 100644
--- a/src/ial/ps2-conv.c
+++ b/src/ial/ps2-conv.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ps2-conv.c: convert scancode from set2 to set1.
diff --git a/src/ial/ps2-keycode.h b/src/ial/ps2-keycode.h
index d66c53ea..75b32dce 100644
--- a/src/ial/ps2-keycode.h
+++ b/src/ial/ps2-keycode.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ps2-keycode.h: the head file for IAL Engine of EM85xx Front Panel and Remote Controller
diff --git a/src/ial/px255b.c b/src/ial/px255b.c
index b5c61a3b..eaba24e6 100644
--- a/src/ial/px255b.c
+++ b/src/ial/px255b.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** px255b.c: IAL engine for PX255B dev. board.
diff --git a/src/ial/px255b.h b/src/ial/px255b.h
index 91d72647..b78e010b 100644
--- a/src/ial/px255b.h
+++ b/src/ial/px255b.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef GUI_IAL_PX255B_H
#define GUI_IAL_PX255B_H
diff --git a/src/ial/qemu.c b/src/ial/qemu.c
index 7f76e057..4821512e 100644
--- a/src/ial/qemu.c
+++ b/src/ial/qemu.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** qemu.c: Low Level Input Engine for QEMU
diff --git a/src/ial/qemu.h b/src/ial/qemu.h
index 435f1276..19eebdab 100644
--- a/src/ial/qemu.h
+++ b/src/ial/qemu.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** qemu.h:. the head file of Low Level Input Engine for QEMU
diff --git a/src/ial/qvfb.c b/src/ial/qvfb.c
index aae3cda1..9bd811f2 100644
--- a/src/ial/qvfb.c
+++ b/src/ial/qvfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** qvfb.c: Input Engine for Qt Virtual FrameBuffer
diff --git a/src/ial/qvfb.h b/src/ial/qvfb.h
index 16194ec9..e8dda2ed 100644
--- a/src/ial/qvfb.h
+++ b/src/ial/qvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** qvfb.h: head file of Input Engine for Qt Virtual FrameBuffer
diff --git a/src/ial/random.c b/src/ial/random.c
index 1fd7c362..8620e7c7 100644
--- a/src/ial/random.c
+++ b/src/ial/random.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** random.c: the random IAL Engine.
@@ -1538,17 +1538,16 @@ BOOL InitRandomInput (INPUT* input, const char* mdev, const char* mtype)
if (GetMgEtcValue ("random", "logfile", logfile, MAX_PATH) == ETC_OK) {
my_ctxt.log_fp = fopen(logfile, "a");
if (my_ctxt.log_fp == NULL) {
- _WRN_PRINTF("Failed to open file %s for logging; log disabled",
+ _WRN_PRINTF("Failed to open file %s for logging; log disabled\n",
logfile);
}
}
else {
- _WRN_PRINTF("No log file defined; log disabled");
+ _WRN_PRINTF("No log file defined; log disabled\n");
}
if (GetMgEtcValue ("random", "eventtypes", eventtypes, LEN_EVENT_TYPES) < 0) {
- _WRN_PRINTF("Bad ETC key value: random.eventtypes; use default: %s",
- "mouse");
+ _WRN_PRINTF("Bad ETC key value: random.eventtypes; use default: mouse\n");
strcpy(eventtypes, "mouse");
}
@@ -1561,7 +1560,7 @@ BOOL InitRandomInput (INPUT* input, const char* mdev, const char* mtype)
if (GetMgEtcIntValue ("random", "minkeycode", &my_ctxt.min_keycode) < 0 ||
my_ctxt.min_keycode < MIN_SCANCODE ||
my_ctxt.min_keycode > MAX_SCANCODE) {
- _WRN_PRINTF("Bad ETC key value: random.minkeycode; use default: %d",
+ _WRN_PRINTF("Bad ETC key value: random.minkeycode; use default: %d\n",
MIN_SCANCODE);
my_ctxt.min_keycode = MIN_SCANCODE;
}
@@ -1569,7 +1568,7 @@ BOOL InitRandomInput (INPUT* input, const char* mdev, const char* mtype)
if (GetMgEtcIntValue ("random", "maxkeycode", &my_ctxt.max_keycode) < 0 ||
my_ctxt.max_keycode < MIN_SCANCODE ||
my_ctxt.max_keycode < my_ctxt.min_keycode) {
- _WRN_PRINTF("Bad ETC key value: random.maxkeycode; use default: %d",
+ _WRN_PRINTF("Bad ETC key value: random.maxkeycode; use default: %d\n",
MAX_SCANCODE);
my_ctxt.max_keycode = MAX_SCANCODE;
}
@@ -1585,7 +1584,7 @@ BOOL InitRandomInput (INPUT* input, const char* mdev, const char* mtype)
if (GetMgEtcIntValue ("random", "minbtncode", &my_ctxt.min_btncode) < 0 ||
my_ctxt.min_btncode < MIN_BTNCODE ||
my_ctxt.min_btncode > MAX_BTNCODE) {
- _WRN_PRINTF("Bad ETC key value: random.minbtncode; use default: %d",
+ _WRN_PRINTF("Bad ETC key value: random.minbtncode; use default: %d\n",
MIN_BTNCODE);
my_ctxt.min_btncode = MIN_BTNCODE;
}
@@ -1593,7 +1592,7 @@ BOOL InitRandomInput (INPUT* input, const char* mdev, const char* mtype)
if (GetMgEtcIntValue ("random", "maxbtncode", &my_ctxt.max_btncode) < 0 ||
my_ctxt.max_btncode < MIN_SCANCODE ||
my_ctxt.max_btncode < my_ctxt.min_btncode) {
- _WRN_PRINTF("Bad ETC key value: random.maxbtncode; use default: %d",
+ _WRN_PRINTF("Bad ETC key value: random.maxbtncode; use default: %d\n",
MAX_BTNCODE);
my_ctxt.max_btncode = MAX_BTNCODE;
}
diff --git a/src/ial/random.h b/src/ial/random.h
index 9d52279a..ba95af6a 100644
--- a/src/ial/random.h
+++ b/src/ial/random.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** random.h: head file for random IAL Engine
diff --git a/src/ial/remoteial/client/netial.c b/src/ial/remoteial/client/netial.c
index 2f26b51f..22d9642e 100644
--- a/src/ial/remoteial/client/netial.c
+++ b/src/ial/remoteial/client/netial.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/ial/remoteial/client/netial_ctrlwin.c b/src/ial/remoteial/client/netial_ctrlwin.c
index 170538ae..27c7cad9 100644
--- a/src/ial/remoteial/client/netial_ctrlwin.c
+++ b/src/ial/remoteial/client/netial_ctrlwin.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/ial/remoteial/client/netial_ctrlwin.h b/src/ial/remoteial/client/netial_ctrlwin.h
index d47d2411..ee49adcf 100644
--- a/src/ial/remoteial/client/netial_ctrlwin.h
+++ b/src/ial/remoteial/client/netial_ctrlwin.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/ial/remoteial/netial_server.c b/src/ial/remoteial/netial_server.c
index d49bd2e7..fbb77425 100644
--- a/src/ial/remoteial/netial_server.c
+++ b/src/ial/remoteial/netial_server.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/ial/rtos_xvfb.c b/src/ial/rtos_xvfb.c
index 0ab6edd6..ec9b830d 100644
--- a/src/ial/rtos_xvfb.c
+++ b/src/ial/rtos_xvfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** rtos_xvfb.c: Input Engine for RTOS X Virtual FrameBuffer
diff --git a/src/ial/rtos_xvfb.h b/src/ial/rtos_xvfb.h
index 8f17f31c..b1e4a3c4 100644
--- a/src/ial/rtos_xvfb.h
+++ b/src/ial/rtos_xvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** rtos_xvfb.h: head file of Input Engine for RTOS X Virtual FrameBuffer
diff --git a/src/ial/skyeye-ep7312.c b/src/ial/skyeye-ep7312.c
index 616d121a..1aea2bca 100644
--- a/src/ial/skyeye-ep7312.c
+++ b/src/ial/skyeye-ep7312.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** skyeye-ep7312.c: Low Level Input Engine for touch screen of
diff --git a/src/ial/skyeye-ep7312.h b/src/ial/skyeye-ep7312.h
index f112fabb..fb406ae1 100644
--- a/src/ial/skyeye-ep7312.h
+++ b/src/ial/skyeye-ep7312.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** skyeye-ep7312.h: the head file of Low Level Input Engine for
diff --git a/src/ial/svgalib.c b/src/ial/svgalib.c
index 732529d9..68f78778 100644
--- a/src/ial/svgalib.c
+++ b/src/ial/svgalib.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** svgalib.c: Low Level Input Engine based on SVGALib
diff --git a/src/ial/svgalib.h b/src/ial/svgalib.h
index 03e5b7a9..57cad6c8 100644
--- a/src/ial/svgalib.h
+++ b/src/ial/svgalib.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** svgalib.h: the head file of Low Level Input Engine based on SVGALib
diff --git a/src/ial/svpxx.c b/src/ial/svpxx.c
index fb0b3dff..a2ecb29e 100644
--- a/src/ial/svpxx.c
+++ b/src/ial/svpxx.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** svpxx.c: ial engine for svpxx.
diff --git a/src/ial/svpxx.h b/src/ial/svpxx.h
index 226a4e13..495ed5fe 100644
--- a/src/ial/svpxx.h
+++ b/src/ial/svpxx.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef GUI_IAL_SVPXX_H
#define GUI_IAL_SVPXX_H
diff --git a/src/ial/t800.c b/src/ial/t800.c
index f7e1f5dc..01b8cca8 100644
--- a/src/ial/t800.c
+++ b/src/ial/t800.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** t800.c: The input engine for MT T800 device.
diff --git a/src/ial/t800.h b/src/ial/t800.h
index b53c9599..9fabdf23 100644
--- a/src/ial/t800.h
+++ b/src/ial/t800.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: t800.h 2445 2003-09-04 03:40:35Z weiym $
diff --git a/src/ial/tf-code.h b/src/ial/tf-code.h
index f5a908b6..41d59190 100644
--- a/src/ial/tf-code.h
+++ b/src/ial/tf-code.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _TFCODE_H
#define _TFCODE_H
diff --git a/src/ial/tf-stb.c b/src/ial/tf-stb.c
index 521fa7aa..ba01681d 100644
--- a/src/ial/tf-stb.c
+++ b/src/ial/tf-stb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** tf-stb.c: Low Level Input Engine for Tongfang STB.
diff --git a/src/ial/tf-stb.h b/src/ial/tf-stb.h
index 3e5260c1..512d1aa9 100644
--- a/src/ial/tf-stb.h
+++ b/src/ial/tf-stb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** tf-stb.h:. the head file of Low Level Input Engine for Tongfang STB.
diff --git a/src/ial/thor.c b/src/ial/thor.c
index 8bc64c6e..1fb98508 100644
--- a/src/ial/thor.c
+++ b/src/ial/thor.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** thor.c: Low Level Input Engine for ptsc MX1
diff --git a/src/ial/thor.h b/src/ial/thor.h
index 361a042d..7901586b 100644
--- a/src/ial/thor.h
+++ b/src/ial/thor.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** thor.h:. the head file of Low Level Input Engine for ptsc MX1
diff --git a/src/ial/tslibial.c b/src/ial/tslibial.c
index f978462e..f403df4e 100644
--- a/src/ial/tslibial.c
+++ b/src/ial/tslibial.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** tslib.c: Low Level Input Engine for TSLIB.
diff --git a/src/ial/tslibial.h b/src/ial/tslibial.h
index 691b49e0..3775da7b 100644
--- a/src/ial/tslibial.h
+++ b/src/ial/tslibial.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** tslib.h:. the head file of Low Level Input Engine for TSLIB
diff --git a/src/ial/ucb1x00.c b/src/ial/ucb1x00.c
index 7addd132..5c37c84a 100644
--- a/src/ial/ucb1x00.c
+++ b/src/ial/ucb1x00.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ucb1x00.c: IAL Engine for UCB1x00 board.
diff --git a/src/ial/ucb1x00.h b/src/ial/ucb1x00.h
index bb57bd32..73fba9a5 100644
--- a/src/ial/ucb1x00.h
+++ b/src/ial/ucb1x00.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ucb1x00.h: Head file for IAL Engine for UCB1x00 board.
diff --git a/src/ial/usvfbinput.c b/src/ial/usvfbinput.c
index 1d015476..f1116727 100644
--- a/src/ial/usvfbinput.c
+++ b/src/ial/usvfbinput.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** usvfbinput.c: Input Engine for UnixSocket Virtual Frame Buffer
diff --git a/src/ial/usvfbinput.h b/src/ial/usvfbinput.h
index c8175507..013e5cda 100644
--- a/src/ial/usvfbinput.h
+++ b/src/ial/usvfbinput.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** usvfbinput.h: head file for USVFB IAL Engine
diff --git a/src/ial/utpmc.c b/src/ial/utpmc.c
index 6b329901..e1076875 100644
--- a/src/ial/utpmc.c
+++ b/src/ial/utpmc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** utpmc.c: IAL Engine for UTPMC board.
diff --git a/src/ial/utpmc.h b/src/ial/utpmc.h
index 98185ac7..0835b229 100644
--- a/src/ial/utpmc.h
+++ b/src/ial/utpmc.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef GUI_IAL_UTPMC_H
#define GUI_IAL_UTPMC_H
diff --git a/src/ial/vp2008.c b/src/ial/vp2008.c
index f6d01d4f..b6a299eb 100644
--- a/src/ial/vp2008.c
+++ b/src/ial/vp2008.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vp2008.c: The vp2008 IAL engine.
diff --git a/src/ial/vp2008.h b/src/ial/vp2008.h
index 61ef0625..e7d85c86 100644
--- a/src/ial/vp2008.h
+++ b/src/ial/vp2008.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vp2008.h:. the head file of VP2008 IAL Engine.
diff --git a/src/ial/vr4181.c b/src/ial/vr4181.c
index 3ac67b3a..80ac5a72 100644
--- a/src/ial/vr4181.c
+++ b/src/ial/vr4181.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vr4181.c: Low Level Input Engine for NEC VR4181 debug board.
diff --git a/src/ial/vr4181.h b/src/ial/vr4181.h
index c7bab894..131c5195 100644
--- a/src/ial/vr4181.h
+++ b/src/ial/vr4181.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vr4181.h:. the head file of Low Level Input Engine for NEC VR4181 debug board.
diff --git a/src/ial/vxi386_input.c b/src/ial/vxi386_input.c
index 9857e25e..3701bce8 100644
--- a/src/ial/vxi386_input.c
+++ b/src/ial/vxi386_input.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vxi386_input.c: IAL engine for VxWorks i386 PC target.
diff --git a/src/ial/vxppc_input.c b/src/ial/vxppc_input.c
index 337675b2..0400a90f 100644
--- a/src/ial/vxppc_input.c
+++ b/src/ial/vxppc_input.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vxi386_input.c: IAL engine for VxWorks i386 PC target.
diff --git a/src/ial/winial.c b/src/ial/winial.c
index 2e0ca14c..73c18941 100644
--- a/src/ial/winial.c
+++ b/src/ial/winial.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** winial.c: IAL engine for Windows Virtual FrameBuffer
diff --git a/src/ial/winial.h b/src/ial/winial.h
index 25524fa1..c341e272 100644
--- a/src/ial/winial.h
+++ b/src/ial/winial.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
//
// winial.h: head file of Windows IAL
diff --git a/src/ial/wvfb.h b/src/ial/wvfb.h
index 10602899..5136cc50 100644
--- a/src/ial/wvfb.h
+++ b/src/ial/wvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
//
// wvfb.h: head file of Input Engine for Windows Virtual FrameBuffer
diff --git a/src/ial/wvfbial.c b/src/ial/wvfbial.c
index 78b34f84..c6ba19b5 100644
--- a/src/ial/wvfbial.c
+++ b/src/ial/wvfbial.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** wvfb.c: Input Engine for Windows Virtual FrameBuffer
diff --git a/src/image/cdjpeg.h b/src/image/cdjpeg.h
index 65c2016a..3fd91ec5 100644
--- a/src/image/cdjpeg.h
+++ b/src/image/cdjpeg.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_CJPEG_DJPEG /* define proper options in jconfig.h */
diff --git a/src/image/gif.c b/src/image/gif.c
index c447f864..801578f5 100644
--- a/src/image/gif.c
+++ b/src/image/gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/image/imgapi.c b/src/image/imgapi.c
index 2a72f98e..3295cf8d 100644
--- a/src/image/imgapi.c
+++ b/src/image/imgapi.c
@@ -49,7 +49,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
// Create date: 1999.04.19
diff --git a/src/image/imgapi.h b/src/image/imgapi.h
index 9d812978..33577900 100644
--- a/src/image/imgapi.h
+++ b/src/image/imgapi.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _IMGAPI_H_
#define _IMGAPI_H_
diff --git a/src/image/jcomapi.c b/src/image/jcomapi.c
index 3a560791..8b8681b2 100644
--- a/src/image/jcomapi.c
+++ b/src/image/jcomapi.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdapimin.c b/src/image/jdapimin.c
index 6f980d74..cb13dada 100644
--- a/src/image/jdapimin.c
+++ b/src/image/jdapimin.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdapistd.c b/src/image/jdapistd.c
index 78c8cbfd..dec28acf 100644
--- a/src/image/jdapistd.c
+++ b/src/image/jdapistd.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdatasrc.c b/src/image/jdatasrc.c
index be41da84..a9e29d02 100644
--- a/src/image/jdatasrc.c
+++ b/src/image/jdatasrc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "jpeglib.h"
#include "jpg.h"
diff --git a/src/image/jdcoefct.c b/src/image/jdcoefct.c
index 1ac82daf..ede79d41 100644
--- a/src/image/jdcoefct.c
+++ b/src/image/jdcoefct.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdcolor.c b/src/image/jdcolor.c
index bfe9ba17..18758b26 100644
--- a/src/image/jdcolor.c
+++ b/src/image/jdcolor.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdct.h b/src/image/jdct.h
index b0d8699b..b62641a2 100644
--- a/src/image/jdct.h
+++ b/src/image/jdct.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* A forward DCT routine is given a pointer to a work area of type DCTELEM[];
diff --git a/src/image/jddctmgr.c b/src/image/jddctmgr.c
index 8497d8fd..b96add2a 100644
--- a/src/image/jddctmgr.c
+++ b/src/image/jddctmgr.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdhuff.c b/src/image/jdhuff.c
index 3a1a3101..d72a6795 100644
--- a/src/image/jdhuff.c
+++ b/src/image/jdhuff.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdhuff.h b/src/image/jdhuff.h
index 9b473625..e35001a8 100644
--- a/src/image/jdhuff.h
+++ b/src/image/jdhuff.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Derived data constructed for each Huffman table */
diff --git a/src/image/jdinput.c b/src/image/jdinput.c
index b7fd0f8a..7962b56c 100644
--- a/src/image/jdinput.c
+++ b/src/image/jdinput.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdmainct.c b/src/image/jdmainct.c
index dcf9ed37..0bb57114 100644
--- a/src/image/jdmainct.c
+++ b/src/image/jdmainct.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdmarker.c b/src/image/jdmarker.c
index d0dbfe27..8a3f9be9 100644
--- a/src/image/jdmarker.c
+++ b/src/image/jdmarker.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdmaster.c b/src/image/jdmaster.c
index 21110df0..4e2afb9c 100644
--- a/src/image/jdmaster.c
+++ b/src/image/jdmaster.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdmerge.c b/src/image/jdmerge.c
index 1dec8fb2..49a67849 100644
--- a/src/image/jdmerge.c
+++ b/src/image/jdmerge.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdphuff.c b/src/image/jdphuff.c
index f0bbf90f..16f51a81 100644
--- a/src/image/jdphuff.c
+++ b/src/image/jdphuff.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdpostct.c b/src/image/jdpostct.c
index ca5060ba..dda72349 100644
--- a/src/image/jdpostct.c
+++ b/src/image/jdpostct.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdsample.c b/src/image/jdsample.c
index 4e9830a9..6ba6c30a 100644
--- a/src/image/jdsample.c
+++ b/src/image/jdsample.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jdtrans.c b/src/image/jdtrans.c
index 32b7fec0..4b056cf1 100644
--- a/src/image/jdtrans.c
+++ b/src/image/jdtrans.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jidct.c b/src/image/jidct.c
index b6724c78..43784245 100644
--- a/src/image/jidct.c
+++ b/src/image/jidct.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/image/jmorecfg.h b/src/image/jmorecfg.h
index e4f2c0ac..9f0b1e31 100644
--- a/src/image/jmorecfg.h
+++ b/src/image/jmorecfg.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _JMORECFG_H_
#define _JMORECFG_H_
diff --git a/src/image/jpegint.h b/src/image/jpegint.h
index cdfb40b5..4cc40e4d 100644
--- a/src/image/jpegint.h
+++ b/src/image/jpegint.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Declarations for both compression & decompression */
diff --git a/src/image/jpeglib.h b/src/image/jpeglib.h
index 62675510..20672b68 100644
--- a/src/image/jpeglib.h
+++ b/src/image/jpeglib.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef JPEGLIB_H
#define JPEGLIB_H
diff --git a/src/image/jpg.c b/src/image/jpg.c
index 8c353475..e62e6880 100644
--- a/src/image/jpg.c
+++ b/src/image/jpg.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/image/jutils.c b/src/image/jutils.c
index 2ee121e5..fefff902 100644
--- a/src/image/jutils.c
+++ b/src/image/jutils.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define JPEG_INTERNALS
#include "jpeglib.h"
diff --git a/src/ime/hzinput.c b/src/ime/hzinput.c
index 83dd569d..c8532567 100644
--- a/src/ime/hzinput.c
+++ b/src/ime/hzinput.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: hzinput.c 8944 2007-12-29 08:29:16Z xwyan $
diff --git a/src/ime/hzinput.h b/src/ime/hzinput.h
index dd9412b6..6a0ac7bb 100644
--- a/src/ime/hzinput.h
+++ b/src/ime/hzinput.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: hzinput.h 7336 2007-08-16 03:40:38Z xgwang $
diff --git a/src/ime/pinyin.c b/src/ime/pinyin.c
index 3072479f..98f5ff7c 100644
--- a/src/ime/pinyin.c
+++ b/src/ime/pinyin.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: pinyin.c 7336 2007-08-16 03:40:38Z xgwang $
diff --git a/src/ime/pinyin.h b/src/ime/pinyin.h
index c4756975..a3bf29e3 100644
--- a/src/ime/pinyin.h
+++ b/src/ime/pinyin.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _INPUT_MODULE_H_
#define _INPUT_MODULE_H_
diff --git a/src/include/accelkey.h b/src/include/accelkey.h
index 15776aad..dd3ad7cd 100644
--- a/src/include/accelkey.h
+++ b/src/include/accelkey.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** acclekey.h: the head file of accelkey.c.
diff --git a/src/include/bidi.h b/src/include/bidi.h
index 62654f7e..58443bfd 100644
--- a/src/include/bidi.h
+++ b/src/include/bidi.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** charset-bidi.h: The charset Bidirectional Algorithm.
diff --git a/src/include/bitmap.h b/src/include/bitmap.h
index 95fc8163..22e3591b 100644
--- a/src/include/bitmap.h
+++ b/src/include/bitmap.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** readbmp.h: Low Level bitmap file read/save routines.
diff --git a/src/include/blockheap.h b/src/include/blockheap.h
index 30d217e6..75fae678 100644
--- a/src/include/blockheap.h
+++ b/src/include/blockheap.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** blockheap.h: the head file of heap for block data.
diff --git a/src/include/client.h b/src/include/client.h
index 6da1883a..92135993 100644
--- a/src/include/client.h
+++ b/src/include/client.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** client.h: routines for client.
diff --git a/src/include/clipboard.h b/src/include/clipboard.h
index 632425e1..9fe186df 100644
--- a/src/include/clipboard.h
+++ b/src/include/clipboard.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** clipboard.h: the internal clipboard APIs.
diff --git a/src/include/cliprect.h b/src/include/cliprect.h
index 26bd421a..67d98a62 100644
--- a/src/include/cliprect.h
+++ b/src/include/cliprect.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** cliprect.h: the head file of Clip Rect module.
diff --git a/src/include/ctrlclass.h b/src/include/ctrlclass.h
index cd200a5d..45762ea0 100644
--- a/src/include/ctrlclass.h
+++ b/src/include/ctrlclass.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ctrlclass.h: the head file of Control Class module.
diff --git a/src/include/cursor.h b/src/include/cursor.h
index 05589ef3..d074cc20 100644
--- a/src/include/cursor.h
+++ b/src/include/cursor.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** cursor.h: the head file of Cursor Support Lib.
diff --git a/src/include/dc.h b/src/include/dc.h
index 7c18ff93..7f6fb180 100644
--- a/src/include/dc.h
+++ b/src/include/dc.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** dc.h: this head file declares all internal types and data of GDI module.
@@ -298,7 +298,8 @@ static inline BOOL dc_IsVisible (PDC pdc)
if (dc_IsMemDC(pdc)){
if (!pdc->hwnd) return TRUE;
}
- else return TRUE;
+ else
+ return TRUE;
}
#endif
diff --git a/src/include/devfont.h b/src/include/devfont.h
index 3ba286ea..eb143805 100644
--- a/src/include/devfont.h
+++ b/src/include/devfont.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** devfont.h: the head file of Device Font Manager.
diff --git a/src/include/drawsemop.h b/src/include/drawsemop.h
index db3f2a69..2cb15d3a 100644
--- a/src/include/drawsemop.h
+++ b/src/include/drawsemop.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** drawsemop.h: operations for drawing semaphore.
diff --git a/src/include/element.h b/src/include/element.h
index 824ee030..60618eff 100644
--- a/src/include/element.h
+++ b/src/include/element.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** element.h: the head file of window element data.
diff --git a/src/include/event.h b/src/include/event.h
index 5b4bf01c..639297bd 100644
--- a/src/include/event.h
+++ b/src/include/event.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** event.h: the head file of low level event handle.
diff --git a/src/include/fontname.h b/src/include/fontname.h
index 1a254f43..2692c677 100644
--- a/src/include/fontname.h
+++ b/src/include/fontname.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** charset.h: the head file of charset operation set.
diff --git a/src/include/gal.h b/src/include/gal.h
index 2520eb67..ac06c6e0 100644
--- a/src/include/gal.h
+++ b/src/include/gal.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** gal.h: the head file of Graphics Abstract Layer
diff --git a/src/include/gif.h b/src/include/gif.h
index 080a9696..0d225beb 100644
--- a/src/include/gif.h
+++ b/src/include/gif.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
// $Id: gif.h 241 2000-01-08 09:10:27Z weiym $
//
diff --git a/src/include/glyph.h b/src/include/glyph.h
index 7e5dc33a..e7b36c43 100644
--- a/src/include/glyph.h
+++ b/src/include/glyph.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
**
diff --git a/src/include/hash.h b/src/include/hash.h
index 8e681e96..ad617143 100644
--- a/src/include/hash.h
+++ b/src/include/hash.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hash.h: header file of hash operations.
diff --git a/src/include/ial.h b/src/include/ial.h
index 9e6022c8..0594884d 100644
--- a/src/include/ial.h
+++ b/src/include/ial.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ial.h: the head file of Input Abstract Layer
diff --git a/src/include/icon.h b/src/include/icon.h
index ed1a3d5a..e22bd63c 100644
--- a/src/include/icon.h
+++ b/src/include/icon.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** icon.h: the head file of Icon Support Lib.
diff --git a/src/include/incoreres.h b/src/include/incoreres.h
index 0760e1b9..1524a847 100644
--- a/src/include/incoreres.h
+++ b/src/include/incoreres.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** incoreres.h: definitions for incore resource.
diff --git a/src/include/inline.h b/src/include/inline.h
index d86ace6f..e93d09ea 100644
--- a/src/include/inline.h
+++ b/src/include/inline.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** inline.h: Some inline functions.
diff --git a/src/include/internals.h b/src/include/internals.h
index be911e8f..8f9ed49f 100644
--- a/src/include/internals.h
+++ b/src/include/internals.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** internals.h: this head file declares all internal types and data.
diff --git a/src/include/jpg.h b/src/include/jpg.h
index 59c821d2..0fc062a8 100644
--- a/src/include/jpg.h
+++ b/src/include/jpg.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
// $Id: jpg.h 241 2000-01-08 09:10:27Z weiym $
//
diff --git a/src/include/license.h b/src/include/license.h
index 90443c5d..da390ec6 100644
--- a/src/include/license.h
+++ b/src/include/license.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _LICENSE_H
#define _LICENSE_H
diff --git a/src/include/linux-tty.h b/src/include/linux-tty.h
index fb799712..6b416a10 100644
--- a/src/include/linux-tty.h
+++ b/src/include/linux-tty.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** linux-tty.h: the head file of Linux TTY module.
diff --git a/src/include/list.h b/src/include/list.h
index cfbf845f..dc2a48b7 100644
--- a/src/include/list.h
+++ b/src/include/list.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* list.h
diff --git a/src/include/md5.h b/src/include/md5.h
index 319f0669..884f16b8 100644
--- a/src/include/md5.h
+++ b/src/include/md5.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/include/memops.h b/src/include/memops.h
index e5ee8389..97c88776 100644
--- a/src/include/memops.h
+++ b/src/include/memops.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: memops.h 7337 2007-08-16 03:44:29Z xgwang $
diff --git a/src/include/menu.h b/src/include/menu.h
index 786b76b6..b1a5dfaf 100644
--- a/src/include/menu.h
+++ b/src/include/menu.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** menu.h: the head file of menu module.
diff --git a/src/include/mgsock.h b/src/include/mgsock.h
index f7eb541a..62e55d3f 100644
--- a/src/include/mgsock.h
+++ b/src/include/mgsock.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _MGSOCK_H
#define _MGSOCK_H
diff --git a/src/include/misc.h b/src/include/misc.h
index 989ecb60..2eb85791 100644
--- a/src/include/misc.h
+++ b/src/include/misc.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** misc.h: the head file for Miscellous module.
diff --git a/src/include/msgstr.h b/src/include/msgstr.h
index d3cc8d20..158d434c 100644
--- a/src/include/msgstr.h
+++ b/src/include/msgstr.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** msgstr.h: the text name of all messages.
diff --git a/src/include/newgal.h b/src/include/newgal.h
index b969cdca..5e5688b2 100644
--- a/src/include/newgal.h
+++ b/src/include/newgal.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** newgal.h: the head file of New Graphics Abstraction Layer.
diff --git a/src/include/oldgal.h b/src/include/oldgal.h
index 486ba16a..c369640f 100644
--- a/src/include/oldgal.h
+++ b/src/include/oldgal.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** oldgal.h: the head file of old Graphics Abstract Layer
diff --git a/src/include/ourhdr.h b/src/include/ourhdr.h
index fa2753e1..f6499ea3 100644
--- a/src/include/ourhdr.h
+++ b/src/include/ourhdr.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ourhdr.h: the head file from APUE.
diff --git a/src/include/readbmp.h b/src/include/readbmp.h
index a5c4a256..3368f7b1 100644
--- a/src/include/readbmp.h
+++ b/src/include/readbmp.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** readbmp.h: Low Level bitmap file read/save routines.
diff --git a/src/include/server.h b/src/include/server.h
index f62bc328..6ae4861a 100644
--- a/src/include/server.h
+++ b/src/include/server.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** server.h: routines for server.
diff --git a/src/include/sharedres.h b/src/include/sharedres.h
index 61d25bd3..9c105178 100644
--- a/src/include/sharedres.h
+++ b/src/include/sharedres.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sharedres.h: structure of shared resource.
diff --git a/src/include/sockio.h b/src/include/sockio.h
index 0b9ea548..f2d1e180 100644
--- a/src/include/sockio.h
+++ b/src/include/sockio.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sockio.h: routines for socket i/o.
diff --git a/src/include/sysfont.h b/src/include/sysfont.h
index fc18cbf6..312043dc 100644
--- a/src/include/sysfont.h
+++ b/src/include/sysfont.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sysfont.h: the head file of System Font module.
diff --git a/src/include/sysres.h b/src/include/sysres.h
index 5653e7c3..058c92cb 100644
--- a/src/include/sysres.h
+++ b/src/include/sysres.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _SYSRES_H
#define _SYSRES_H
diff --git a/src/include/timer.h b/src/include/timer.h
index e619588b..73332505 100644
--- a/src/include/timer.h
+++ b/src/include/timer.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** tiemr.h: the head file of Timer module.
diff --git a/src/include/unicode-ops.h b/src/include/unicode-ops.h
index cb8dbf2d..c08ac1e7 100644
--- a/src/include/unicode-ops.h
+++ b/src/include/unicode-ops.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/include/zorder.h b/src/include/zorder.h
index e038ba80..17749875 100644
--- a/src/include/zorder.h
+++ b/src/include/zorder.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: zorder.h 13674 2010-12-06 06:45:01Z wanzheng $
diff --git a/src/kernel/blockheap.c b/src/kernel/blockheap.c
index a1c622a6..97b94b1c 100644
--- a/src/kernel/blockheap.c
+++ b/src/kernel/blockheap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** blockheap.c: The heap of block data.
diff --git a/src/kernel/cursor-comm.c b/src/kernel/cursor-comm.c
index 362a5b78..f4a9144d 100644
--- a/src/kernel/cursor-comm.c
+++ b/src/kernel/cursor-comm.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
static HCURSOR load_cursor_from_file (const char* filename)
diff --git a/src/kernel/cursor-procs.c b/src/kernel/cursor-procs.c
index 12e3b681..8db94cb0 100644
--- a/src/kernel/cursor-procs.c
+++ b/src/kernel/cursor-procs.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** cursor-lite.c: Cursor support module for MiniGUI-Processes.
diff --git a/src/kernel/cursor-sa.c b/src/kernel/cursor-sa.c
index 67acc9db..0a45e0aa 100644
--- a/src/kernel/cursor-sa.c
+++ b/src/kernel/cursor-sa.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** cursor-sa.c: Cursor support module for MiniGUI-Standalone.
diff --git a/src/kernel/cursor.c b/src/kernel/cursor.c
index fff85d30..da2e70d2 100644
--- a/src/kernel/cursor.c
+++ b/src/kernel/cursor.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** cursor.c: the Cursor Support module for MiniGUI-Threads.
diff --git a/src/kernel/desktop-comm.c b/src/kernel/desktop-comm.c
index 4c22dce3..524d2850 100644
--- a/src/kernel/desktop-comm.c
+++ b/src/kernel/desktop-comm.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** desktop-comm.c: The Desktop module.
diff --git a/src/kernel/desktop-procs.c b/src/kernel/desktop-procs.c
index 62e878c9..80eec127 100644
--- a/src/kernel/desktop-procs.c
+++ b/src/kernel/desktop-procs.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** desktop-procs.c: The desktop procedures for MiniGUI-Processes
diff --git a/src/kernel/desktop-sa.c b/src/kernel/desktop-sa.c
index 85ec420e..666fb7e4 100644
--- a/src/kernel/desktop-sa.c
+++ b/src/kernel/desktop-sa.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** desktop-sa.c: The desktop for MiniGUI-Standalone
diff --git a/src/kernel/desktop-ths.c b/src/kernel/desktop-ths.c
index 46f2c252..b41c2e15 100644
--- a/src/kernel/desktop-ths.c
+++ b/src/kernel/desktop-ths.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** desktop-ths.c: The desktop for MiniGUI-Threads.
diff --git a/src/kernel/desktop.c b/src/kernel/desktop.c
index f5c92450..aafd3fb7 100644
--- a/src/kernel/desktop.c
+++ b/src/kernel/desktop.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** desktop.c: The Desktop module.
diff --git a/src/kernel/event.c b/src/kernel/event.c
index e0ade8eb..7146f3ce 100644
--- a/src/kernel/event.c
+++ b/src/kernel/event.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** event.c: Low level event handling module.
diff --git a/src/kernel/fixstr.c b/src/kernel/fixstr.c
index 915060e8..da02de0c 100644
--- a/src/kernel/fixstr.c
+++ b/src/kernel/fixstr.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fixstr.c: the Fixed String module for MiniGUI.
diff --git a/src/kernel/hash.c b/src/kernel/hash.c
index 890a73b2..a2dca7e7 100644
--- a/src/kernel/hash.c
+++ b/src/kernel/hash.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** hash.c: the hash module for MiniGUI, from the idea of GLIB.
diff --git a/src/kernel/init-lite.c b/src/kernel/init-lite.c
index 143e48d6..cc69ebee 100644
--- a/src/kernel/init-lite.c
+++ b/src/kernel/init-lite.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** init-lite.c: The Initialization/Termination routines for
diff --git a/src/kernel/init.c b/src/kernel/init.c
index b030c720..921e7866 100644
--- a/src/kernel/init.c
+++ b/src/kernel/init.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** init.c: The Initialization/Termination routines for MiniGUI-Threads.
@@ -619,8 +619,6 @@ failure1:
void GUIAPI TerminateGUI (int not_used)
{
- /* printf("Quit from MiniGUIMain()\n"); */
-
__mg_enter_terminategui = 1;
pthread_join (__mg_desktop, NULL);
diff --git a/src/kernel/message.c b/src/kernel/message.c
index 01049525..06e9f362 100644
--- a/src/kernel/message.c
+++ b/src/kernel/message.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** message.c: The messaging module.
diff --git a/src/kernel/sharedres.c b/src/kernel/sharedres.c
index e57f2f70..bae94c30 100644
--- a/src/kernel/sharedres.c
+++ b/src/kernel/sharedres.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sharedres.c: Load and init shared resource.
diff --git a/src/kernel/slotset.c b/src/kernel/slotset.c
index 9542890b..fb26bb0d 100644
--- a/src/kernel/slotset.c
+++ b/src/kernel/slotset.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** slotset.c: maintain the slot set in a byte arrary.
diff --git a/src/kernel/timer.c b/src/kernel/timer.c
index 562cd55b..79811ceb 100644
--- a/src/kernel/timer.c
+++ b/src/kernel/timer.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** timer.c: The Timer module for MiniGUI-Threads.
diff --git a/src/kernel/timer_posix.c b/src/kernel/timer_posix.c
index bfe84db4..95f2843b 100644
--- a/src/kernel/timer_posix.c
+++ b/src/kernel/timer_posix.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* timer_posix.c */
diff --git a/src/kernel/zorder.c b/src/kernel/zorder.c
index c0696129..29307f2b 100644
--- a/src/kernel/zorder.c
+++ b/src/kernel/zorder.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** zorder.c: zorder operation set.
diff --git a/src/libc/defdev.c b/src/libc/defdev.c
index 1e11217e..5bd45682 100644
--- a/src/libc/defdev.c
+++ b/src/libc/defdev.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** defdev.c: implementation of default MG_RWops object.
diff --git a/src/libc/fnprintf.c b/src/libc/fnprintf.c
index 767239dc..19ba73f5 100644
--- a/src/libc/fnprintf.c
+++ b/src/libc/fnprintf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fnprintf.c: implementation of own_fnprintf function.
diff --git a/src/libc/fprintf.c b/src/libc/fprintf.c
index 35b1db9c..f6e23471 100644
--- a/src/libc/fprintf.c
+++ b/src/libc/fprintf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fprintf.c: implementation of own_fprintf function.
diff --git a/src/libc/fscanf.c b/src/libc/fscanf.c
index 55385cc9..a7efca22 100644
--- a/src/libc/fscanf.c
+++ b/src/libc/fscanf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** fscanf.c: implementation of own_fscanf function.
diff --git a/src/libc/ieeefp.h b/src/libc/ieeefp.h
index 2d188b93..7d79c419 100644
--- a/src/libc/ieeefp.h
+++ b/src/libc/ieeefp.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifdef linux
diff --git a/src/libc/malloc.c b/src/libc/malloc.c
index 45d95bf2..e2294731 100644
--- a/src/libc/malloc.c
+++ b/src/libc/malloc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/libc/mgslice.c b/src/libc/mgslice.c
index c81040d1..61e3c81a 100644
--- a/src/libc/mgslice.c
+++ b/src/libc/mgslice.c
@@ -40,7 +40,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/libc/nucleus_mutex.c b/src/libc/nucleus_mutex.c
index c891f132..ff7a7e21 100644
--- a/src/libc/nucleus_mutex.c
+++ b/src/libc/nucleus_mutex.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** nucleus_mutex.c: Implementation of the POSIX pthread mutex functions
diff --git a/src/libc/nucleus_pprivate.h b/src/libc/nucleus_pprivate.h
index 59d8b445..ded790b1 100644
--- a/src/libc/nucleus_pprivate.h
+++ b/src/libc/nucleus_pprivate.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** nucleus_pprivate.h: The private header for POSIX Thread implementation
diff --git a/src/libc/nucleus_pthread.c b/src/libc/nucleus_pthread.c
index 1ac14c66..b33a4492 100644
--- a/src/libc/nucleus_pthread.c
+++ b/src/libc/nucleus_pthread.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** nucleus_pthread.c: Implementation of the POSIX pthread functions
diff --git a/src/libc/nucleus_sem.c b/src/libc/nucleus_sem.c
index c47afd95..23c9dbf9 100644
--- a/src/libc/nucleus_sem.c
+++ b/src/libc/nucleus_sem.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** nucleus_sem.c: Implementation of the POSIX semaphore functions
diff --git a/src/libc/ose_sem.c b/src/libc/ose_sem.c
index 9373d8eb..775e1e40 100644
--- a/src/libc/ose_sem.c
+++ b/src/libc/ose_sem.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ose_sem.c: This file contains the implementation of the POSIX
diff --git a/src/libc/printf.c b/src/libc/printf.c
index 908bc40a..4138df28 100644
--- a/src/libc/printf.c
+++ b/src/libc/printf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** printf.c: implementation of own_printf function.
diff --git a/src/libc/psos_mutex.c b/src/libc/psos_mutex.c
index 2d4f2d81..248fdb21 100644
--- a/src/libc/psos_mutex.c
+++ b/src/libc/psos_mutex.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mutex.c: This file contains the implementation of the POSIX
diff --git a/src/libc/psos_pprivate.c b/src/libc/psos_pprivate.c
index 684d5fb6..adb03ed9 100644
--- a/src/libc/psos_pprivate.c
+++ b/src/libc/psos_pprivate.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** psos_pprivate.c: This file contains the implementation of the POSIX
diff --git a/src/libc/psos_pprivate.h b/src/libc/psos_pprivate.h
index 76705a51..70171fee 100644
--- a/src/libc/psos_pprivate.h
+++ b/src/libc/psos_pprivate.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** psos_pprivate.h: The private header for POSIX PThreads implementation
diff --git a/src/libc/psos_pthread.c b/src/libc/psos_pthread.c
index 89997486..0026ca04 100644
--- a/src/libc/psos_pthread.c
+++ b/src/libc/psos_pthread.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** psos_pthread.c: This file contains the implementation of the POSIX
diff --git a/src/libc/psos_sem.c b/src/libc/psos_sem.c
index 9bbc3ebd..56598ab4 100644
--- a/src/libc/psos_sem.c
+++ b/src/libc/psos_sem.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** psos_sem.c: This file contains the implementation of the POSIX
diff --git a/src/libc/scanf.c b/src/libc/scanf.c
index ccaf8c98..c74052ad 100644
--- a/src/libc/scanf.c
+++ b/src/libc/scanf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scanf.c: implementation of own_scanf function.
diff --git a/src/libc/snprintf.c b/src/libc/snprintf.c
index e6b84405..dd391f4b 100644
--- a/src/libc/snprintf.c
+++ b/src/libc/snprintf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** snprintf.c: implementation of own_snprintf function.
diff --git a/src/libc/sprintf.c b/src/libc/sprintf.c
index afc0626f..32a46fcc 100644
--- a/src/libc/sprintf.c
+++ b/src/libc/sprintf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sprintf.c: implementation of own_sprintf function.
diff --git a/src/libc/sscanf.c b/src/libc/sscanf.c
index 478b388a..a2098e75 100644
--- a/src/libc/sscanf.c
+++ b/src/libc/sscanf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scanf.c: implementation of own_scanf function.
diff --git a/src/libc/stdioinlines.c b/src/libc/stdioinlines.c
index 131015dc..312bef26 100644
--- a/src/libc/stdioinlines.c
+++ b/src/libc/stdioinlines.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vfnprintf.c: implementation of own_vfnprintf function.
diff --git a/src/libc/sysvipc_mutex.c b/src/libc/sysvipc_mutex.c
index 44719622..17c19b3a 100644
--- a/src/libc/sysvipc_mutex.c
+++ b/src/libc/sysvipc_mutex.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sysvipc_mutex.c: implementation of pthread mutex function on SysV IPC.
diff --git a/src/libc/sysvipc_private.c b/src/libc/sysvipc_private.c
index 1dd47c8b..8b0cf148 100644
--- a/src/libc/sysvipc_private.c
+++ b/src/libc/sysvipc_private.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pprivate.c: implementation of internal functions for uCPThreads
diff --git a/src/libc/sysvipc_private.h b/src/libc/sysvipc_private.h
index 5463c725..db248ba2 100644
--- a/src/libc/sysvipc_private.h
+++ b/src/libc/sysvipc_private.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sysvipc_private.h: types header for pthread mutex and semaphore on SysV IPC.
diff --git a/src/libc/sysvipc_sem.c b/src/libc/sysvipc_sem.c
index a36c452e..d70d390c 100644
--- a/src/libc/sysvipc_sem.c
+++ b/src/libc/sysvipc_sem.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sysvipc_sem.c: implementation of pthread semaphore function on SysV IPC.
diff --git a/src/libc/threadx_mutex.c b/src/libc/threadx_mutex.c
index 5843b7ae..63a0cb9f 100644
--- a/src/libc/threadx_mutex.c
+++ b/src/libc/threadx_mutex.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** threadx_mutex.c: This file contains the implementation of the POSIX
diff --git a/src/libc/threadx_pprivate.c b/src/libc/threadx_pprivate.c
index 4606e5bd..85a47083 100644
--- a/src/libc/threadx_pprivate.c
+++ b/src/libc/threadx_pprivate.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** threadx_pprivate.c: This file contains the implementation of the POSIX
diff --git a/src/libc/threadx_pprivate.h b/src/libc/threadx_pprivate.h
index f9b246fd..12f77c0e 100644
--- a/src/libc/threadx_pprivate.h
+++ b/src/libc/threadx_pprivate.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** threadx_pprivate.h: The private header for POSIX Thread implementation
diff --git a/src/libc/threadx_pthread.c b/src/libc/threadx_pthread.c
index b328a70e..09c8967e 100644
--- a/src/libc/threadx_pthread.c
+++ b/src/libc/threadx_pthread.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** threadx_pthread.c: This file contains the implementation of the POSIX
diff --git a/src/libc/threadx_sem.c b/src/libc/threadx_sem.c
index 9dbae3f9..f73f2ac9 100644
--- a/src/libc/threadx_sem.c
+++ b/src/libc/threadx_sem.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** threadx_sem.c: This file contains the implementation of the POSIX
diff --git a/src/libc/ucos2_mutex.c b/src/libc/ucos2_mutex.c
index c3b89eb1..d489e547 100644
--- a/src/libc/ucos2_mutex.c
+++ b/src/libc/ucos2_mutex.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ucos2_mutex.c: implementation of pthread mutex function under uC/OS-II.
diff --git a/src/libc/ucos2_pprivate.h b/src/libc/ucos2_pprivate.h
index 21a62b5b..0b2ff9a6 100644
--- a/src/libc/ucos2_pprivate.h
+++ b/src/libc/ucos2_pprivate.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ucos2_pprivate.h: types header for pthread implementation for uC/OS-II.
diff --git a/src/libc/ucos2_pthread.c b/src/libc/ucos2_pthread.c
index 0e6cfc26..d7383042 100644
--- a/src/libc/ucos2_pthread.c
+++ b/src/libc/ucos2_pthread.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ucos2_pthread.c: implementation of pthread function under uC/OS-II.
diff --git a/src/libc/ucos2_sem.c b/src/libc/ucos2_sem.c
index 2c5d86bf..06c63901 100644
--- a/src/libc/ucos2_sem.c
+++ b/src/libc/ucos2_sem.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ucos2_sem.c: implementation of pthread nonamed semaphore function
diff --git a/src/libc/vfnprintf.c b/src/libc/vfnprintf.c
index 4eb475bf..5078dd04 100644
--- a/src/libc/vfnprintf.c
+++ b/src/libc/vfnprintf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vfnprintf.c: implementation of own_vfnprintf function.
diff --git a/src/libc/vfscanf.c b/src/libc/vfscanf.c
index 2227b5b9..f37f8c60 100644
--- a/src/libc/vfscanf.c
+++ b/src/libc/vfscanf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vfscanf.c: implementation of own_vfscanf function.
diff --git a/src/libc/vsnprintf.c b/src/libc/vsnprintf.c
index 43e00b28..cd9cef5c 100644
--- a/src/libc/vsnprintf.c
+++ b/src/libc/vsnprintf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sprintf.c: implementation of own_sprintf function.
diff --git a/src/libc/vsscanf.c b/src/libc/vsscanf.c
index d133ed03..d593e8f2 100644
--- a/src/libc/vsscanf.c
+++ b/src/libc/vsscanf.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** scanf.c: implementation of own_scanf function.
diff --git a/src/libc/vxworks_mutex.c b/src/libc/vxworks_mutex.c
index a0d5b5c2..46491dbe 100644
--- a/src/libc/vxworks_mutex.c
+++ b/src/libc/vxworks_mutex.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vxworks_mutex.c: Implementation of the POSIX pthread mutex functions
diff --git a/src/libc/vxworks_pprivate.h b/src/libc/vxworks_pprivate.h
index e3abcdac..942ed7da 100644
--- a/src/libc/vxworks_pprivate.h
+++ b/src/libc/vxworks_pprivate.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vxworks_ pprivate.h: The private header for POSIX Thread implementation
diff --git a/src/libc/vxworks_pthread.c b/src/libc/vxworks_pthread.c
index c4147b9b..a9229407 100644
--- a/src/libc/vxworks_pthread.c
+++ b/src/libc/vxworks_pthread.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vxworks_pthread.c: Implementation of the POSIX pthread functions
diff --git a/src/libc/vxworks_sem.c b/src/libc/vxworks_sem.c
index 64fa6f3e..d375eaaf 100644
--- a/src/libc/vxworks_sem.c
+++ b/src/libc/vxworks_sem.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vxworks_sem.c: Implementation of the POSIX semaphore functions
diff --git a/src/main/main.c b/src/main/main.c
index 39619023..1d4a464c 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** main.c: The main function wrapper.
diff --git a/src/main/minigui-win32.c b/src/main/minigui-win32.c
index 1b81c99d..127104a9 100644
--- a/src/main/minigui-win32.c
+++ b/src/main/minigui-win32.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** minigui-win32.c: Defines the entry point for the DLL application.
diff --git a/src/misc/about.c b/src/misc/about.c
index 6df97e23..3d7cfee8 100644
--- a/src/misc/about.c
+++ b/src/misc/about.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** about.c: the About Dialog module.
diff --git a/src/misc/clipboard.c b/src/misc/clipboard.c
index eecfa240..5cf2ec5a 100644
--- a/src/misc/clipboard.c
+++ b/src/misc/clipboard.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** clipboard.c: The implementation of Clipboard.
diff --git a/src/misc/drawsemop.c b/src/misc/drawsemop.c
index 576b0122..93913c86 100644
--- a/src/misc/drawsemop.c
+++ b/src/misc/drawsemop.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** drawsemop.c: operations for drawing semaphore.
diff --git a/src/misc/endianrw.c b/src/misc/endianrw.c
index 04cf7949..28cd8278 100644
--- a/src/misc/endianrw.c
+++ b/src/misc/endianrw.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** endianrw.c:
diff --git a/src/misc/error.c b/src/misc/error.c
index 647ca38d..1f159c4c 100644
--- a/src/misc/error.c
+++ b/src/misc/error.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** error.c: error handling functions
diff --git a/src/misc/errorlog.c b/src/misc/errorlog.c
index 0659a715..b94c19f8 100644
--- a/src/misc/errorlog.c
+++ b/src/misc/errorlog.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** errorlog.c: Error routines for programs that can run as a daemon.
diff --git a/src/misc/license.c b/src/misc/license.c
index a31d2488..aecf58a6 100644
--- a/src/misc/license.c
+++ b/src/misc/license.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/misc/listenfd.c b/src/misc/listenfd.c
index 71b58023..f06b28b9 100644
--- a/src/misc/listenfd.c
+++ b/src/misc/listenfd.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** listen.c: routines for listen fd.
diff --git a/src/misc/math.c b/src/misc/math.c
index 0d64b301..45855314 100644
--- a/src/misc/math.c
+++ b/src/misc/math.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** math.c: the fixed point math routines.
diff --git a/src/misc/misc-dt.c b/src/misc/misc-dt.c
index 7b840eb4..194070bb 100644
--- a/src/misc/misc-dt.c
+++ b/src/misc/misc-dt.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** misc-dt.c: This file include some miscelleous functions.
diff --git a/src/misc/misc-win.c b/src/misc/misc-win.c
index 7cca72a8..3b723151 100644
--- a/src/misc/misc-win.c
+++ b/src/misc/misc-win.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifdef WIN32
diff --git a/src/misc/misc.c b/src/misc/misc.c
index 51c184f5..7e5f1dd6 100644
--- a/src/misc/misc.c
+++ b/src/misc/misc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** misc.c: This file include some miscelleous functions.
diff --git a/src/misc/nposix.c b/src/misc/nposix.c
index ea551c67..c67de974 100644
--- a/src/misc/nposix.c
+++ b/src/misc/nposix.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** nposix.c: This file includes some miscelleous functions should be
diff --git a/src/misc/rc4.c b/src/misc/rc4.c
index 8ceea15f..fbbe343f 100644
--- a/src/misc/rc4.c
+++ b/src/misc/rc4.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* http://en.wikipedia.org/wiki/RC4
diff --git a/src/misc/rc4.h b/src/misc/rc4.h
index 949e5a88..275f1364 100644
--- a/src/misc/rc4.h
+++ b/src/misc/rc4.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _RC4_H
#define _RC4_H
diff --git a/src/misc/rwops.c b/src/misc/rwops.c
index 0e66ae19..4c0c2742 100644
--- a/src/misc/rwops.c
+++ b/src/misc/rwops.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** rwops.c:
diff --git a/src/misc/sockio.c b/src/misc/sockio.c
index 7898b3fa..d8417f36 100644
--- a/src/misc/sockio.c
+++ b/src/misc/sockio.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** sockio.c: routines for socket i/o.
diff --git a/src/misc/systext.c b/src/misc/systext.c
index 856a066d..54fbf29a 100644
--- a/src/misc/systext.c
+++ b/src/misc/systext.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** systext.c: GetSysText function.
diff --git a/src/mybmp/gif.c b/src/mybmp/gif.c
index 27f6da59..bcbd38cb 100644
--- a/src/mybmp/gif.c
+++ b/src/mybmp/gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** gif.c: Low-level GIF file read/save routines.
@@ -177,7 +177,7 @@ void* __mg_init_gif (MG_RWops* fp, MYBITMAP *gif, RGB *pal)
}
if (';' == c) {/* GIF terminator */
- _WRN_PRINTF ("MYBMP>Gif: no image \n" );
+ _WRN_PRINTF ("MYBMP>Gif: no image\n" );
goto fini;
}
@@ -442,7 +442,7 @@ LWZReadByte(MG_RWops *src, int flag, int input_code_size , void * info_data)
while ((count = GetDataBlock(src, buf , info)) > 0);
if (count != 0) {
- _WRN_PRINTF ("MYBMP>Gif: missing EOD in data stream (common occurence)");
+ _WRN_PRINTF ("MYBMP>Gif: missing EOD in data stream (common occurence)\n");
}
return -2;
}
diff --git a/src/mybmp/jpeg.c b/src/mybmp/jpeg.c
index bfe2044e..8285d737 100644
--- a/src/mybmp/jpeg.c
+++ b/src/mybmp/jpeg.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** jpg.c: Low-level JPEG file read/save routines.
diff --git a/src/mybmp/lbm.c b/src/mybmp/lbm.c
index 18c70cfd..fa78184c 100644
--- a/src/mybmp/lbm.c
+++ b/src/mybmp/lbm.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pcx.c: Low-level LBM/PBM bitmap file read/save routines.
diff --git a/src/mybmp/mybmp.c b/src/mybmp/mybmp.c
index 50ab7d05..a4e45774 100644
--- a/src/mybmp/mybmp.c
+++ b/src/mybmp/mybmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Top-level bitmap file read/save function.
diff --git a/src/mybmp/pcx.c b/src/mybmp/pcx.c
index 9fa49916..6fce6c5d 100644
--- a/src/mybmp/pcx.c
+++ b/src/mybmp/pcx.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pcx.c: Low-level PCX bitmap file read/save routines.
diff --git a/src/mybmp/png12.c b/src/mybmp/png12.c
index d77530d0..7ceb4bfa 100644
--- a/src/mybmp/png12.c
+++ b/src/mybmp/png12.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** png12.c: Low-level PNG file read routines (based on LibPNG 1.2)
diff --git a/src/mybmp/png16.c b/src/mybmp/png16.c
index e5127873..0f5dd855 100644
--- a/src/mybmp/png16.c
+++ b/src/mybmp/png16.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** png16.c: Low-level PNG file read routines (based on LibPNG 1.6)
diff --git a/src/mybmp/tga.c b/src/mybmp/tga.c
index f605a0c0..255b858b 100644
--- a/src/mybmp/tga.c
+++ b/src/mybmp/tga.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Low-level TGA bitmap file read/save function.
diff --git a/src/mybmp/winbmp.c b/src/mybmp/winbmp.c
index 2bf82334..7ffc7b95 100644
--- a/src/mybmp/winbmp.c
+++ b/src/mybmp/winbmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Low-level Windows bitmap read/save function.
diff --git a/src/newgal/Makefile.am b/src/newgal/Makefile.am
index 55e178d5..f63f4bd2 100644
--- a/src/newgal/Makefile.am
+++ b/src/newgal/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libnewgal.la
SUBDIRS = @VIDEO_SUBDIRS@
DIST_SUBDIRS = dummy fbcon qvfb wvfb em85xxyuv em85xxosd svpxxosd bf533 utpmc \
mb93493 commlcd shadow mlshadow dfb em86gfx hisi rtos_xvfb pcxvfb \
- nexus s3c6410 sigma8654 mstar gdl stgfb usvfb dri
+ nexus s3c6410 sigma8654 mstar gdl stgfb usvfb drm
# x11 dga vgl svga ggi aalib
EXTRA_DIST=makefile.ng makefile.msvc
diff --git a/src/newgal/RLEaccel.c b/src/newgal/RLEaccel.c
index d9467426..d98eab5d 100644
--- a/src/newgal/RLEaccel.c
+++ b/src/newgal/RLEaccel.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgal/RLEaccel_c.h b/src/newgal/RLEaccel_c.h
index 44a026f9..01a17245 100644
--- a/src/newgal/RLEaccel_c.h
+++ b/src/newgal/RLEaccel_c.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Useful functions and variables from RLEaccel.c */
diff --git a/src/newgal/bf533/bf533video.c b/src/newgal/bf533/bf533video.c
index 9fae10da..a10bceae 100644
--- a/src/newgal/bf533/bf533video.c
+++ b/src/newgal/bf533/bf533video.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: bf533video.c 8944 2007-12-29 08:29:16Z xwyan $
@@ -469,7 +469,7 @@ int bf533_suspend_spi (void)
spi_ok = FALSE;
BLOCK_ALARM
- return current_video->hidden->fd_spi;
+ return __mg_current_video->hidden->fd_spi;
}
void bf533_resume_spi (void)
@@ -479,6 +479,6 @@ void bf533_resume_spi (void)
spi_ok = TRUE;
UNBLOCK_ALARM
- BF533_UpdateRects (current_video, 1, &standard_mode);
+ BF533_UpdateRects (__mg_current_video, 1, &standard_mode);
}
diff --git a/src/newgal/bf533/bf533video.h b/src/newgal/bf533/bf533video.h
index 79851aee..2c4d2b1c 100644
--- a/src/newgal/bf533/bf533video.h
+++ b/src/newgal/bf533/bf533video.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: bf533video.h 7345 2007-08-16 03:57:17Z xgwang $
diff --git a/src/newgal/blit.c b/src/newgal/blit.c
index 3b9f006a..13f54f6b 100644
--- a/src/newgal/blit.c
+++ b/src/newgal/blit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/blit.h b/src/newgal/blit.h
index ea664f93..5a0700a3 100644
--- a/src/newgal/blit.h
+++ b/src/newgal/blit.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_blit_h
diff --git a/src/newgal/blit_0.c b/src/newgal/blit_0.c
index a0af5f74..164c75e9 100644
--- a/src/newgal/blit_0.c
+++ b/src/newgal/blit_0.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/blit_1.c b/src/newgal/blit_1.c
index 71eb2ef1..726944a1 100644
--- a/src/newgal/blit_1.c
+++ b/src/newgal/blit_1.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/blit_A.c b/src/newgal/blit_A.c
index fd08b235..bc323124 100644
--- a/src/newgal/blit_A.c
+++ b/src/newgal/blit_A.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/blit_A.h b/src/newgal/blit_A.h
index cd25ef90..8519c8fb 100644
--- a/src/newgal/blit_A.h
+++ b/src/newgal/blit_A.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Functions from blitalpha.c */
diff --git a/src/newgal/blit_N.c b/src/newgal/blit_N.c
index ab520987..9acc7cb5 100644
--- a/src/newgal/blit_N.c
+++ b/src/newgal/blit_N.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/commlcd/axlinux_c33l05.c b/src/newgal/commlcd/axlinux_c33l05.c
index 4202930a..bd32fc9a 100644
--- a/src/newgal/commlcd/axlinux_c33l05.c
+++ b/src/newgal/commlcd/axlinux_c33l05.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** unknown.c: A subdriver of CommonLCD NEWGAL engine for EPSON C33L05 running axLinux.
diff --git a/src/newgal/commlcd/axlinux_c33l05.h b/src/newgal/commlcd/axlinux_c33l05.h
index a6b7723e..8c7c96f5 100644
--- a/src/newgal/commlcd/axlinux_c33l05.h
+++ b/src/newgal/commlcd/axlinux_c33l05.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* test c33l05dmt */
diff --git a/src/newgal/commlcd/commlcd.c b/src/newgal/commlcd/commlcd.c
index 1b79cb8b..5bf7855e 100644
--- a/src/newgal/commlcd/commlcd.c
+++ b/src/newgal/commlcd/commlcd.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** commlcd.c: CommonLCD NEWGAL video driver.
diff --git a/src/newgal/commlcd/commlcd.h b/src/newgal/commlcd/commlcd.h
index 7baf8f79..d7229896 100644
--- a/src/newgal/commlcd/commlcd.h
+++ b/src/newgal/commlcd/commlcd.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_COMMLCD_H
diff --git a/src/newgal/commlcd/ecos_generic.c b/src/newgal/commlcd/ecos_generic.c
index 0d7a5c5e..9060932a 100644
--- a/src/newgal/commlcd/ecos_generic.c
+++ b/src/newgal/commlcd/ecos_generic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ecos_generic.c: A subdriver of CommonLCD NEWGAL engine for eCos.
diff --git a/src/newgal/commlcd/ecos_mv6600.c b/src/newgal/commlcd/ecos_mv6600.c
index 6ad75fdb..cfe9c83a 100644
--- a/src/newgal/commlcd/ecos_mv6600.c
+++ b/src/newgal/commlcd/ecos_mv6600.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ecos_mv6600.c: A subdriver of CommonLCD NEWGAL engine for eCos.
diff --git a/src/newgal/commlcd/extern.c b/src/newgal/commlcd/extern.c
index 1734ebe0..26612b20 100644
--- a/src/newgal/commlcd/extern.c
+++ b/src/newgal/commlcd/extern.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** extern.c: A subdriver of CommonLCD NEWGAL engine for some targets
diff --git a/src/newgal/commlcd/ose_mx21.c b/src/newgal/commlcd/ose_mx21.c
index 6f4a9e23..3626981b 100644
--- a/src/newgal/commlcd/ose_mx21.c
+++ b/src/newgal/commlcd/ose_mx21.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vxworks_i386.c: A subdriver of CommonLCD NEWGAL engine for VxWorks on i386.
diff --git a/src/newgal/commlcd/vxworks_i386.c b/src/newgal/commlcd/vxworks_i386.c
index f0de85ba..9a014794 100644
--- a/src/newgal/commlcd/vxworks_i386.c
+++ b/src/newgal/commlcd/vxworks_i386.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vxworks_i386.c: A subdriver of CommonLCD NEWGAL engine for VxWorks on i386.
diff --git a/src/newgal/commlcd/vxworks_ppc.c b/src/newgal/commlcd/vxworks_ppc.c
index 8dd719c1..10c25ef3 100644
--- a/src/newgal/commlcd/vxworks_ppc.c
+++ b/src/newgal/commlcd/vxworks_ppc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** vxworks_ppc.c: A subdriver of CommonLCD NEWGAL engine for VxWorks on i386.
diff --git a/src/newgal/commlcd/win_generic.c b/src/newgal/commlcd/win_generic.c
index fddfba85..612bf5dc 100644
--- a/src/newgal/commlcd/win_generic.c
+++ b/src/newgal/commlcd/win_generic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** wvfb_generic.c: A subdriver of CommonLCD NEWGAL engine for Windows.
diff --git a/src/newgal/dfb/dfbvideo.c b/src/newgal/dfb/dfbvideo.c
index 747af4e5..b1897978 100644
--- a/src/newgal/dfb/dfbvideo.c
+++ b/src/newgal/dfb/dfbvideo.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** This is the NEWGAL common DirectFB engine, base on DirectFB 1.0.
@@ -315,7 +315,7 @@ static GAL_Surface *DFB_SetVideoMode (_THIS, GAL_Surface *current,
int width, int height, int bpp, Uint32 flags)
{
if (!ISSERVER) {
- current = current_video->screen;
+ current = __mg_current_video->screen;
return (current);
}
diff --git a/src/newgal/dfb/dfbvideo.h b/src/newgal/dfb/dfbvideo.h
index 3c997d8f..0e859c15 100644
--- a/src/newgal/dfb/dfbvideo.h
+++ b/src/newgal/dfb/dfbvideo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** This is the NEWGAL common DirectFB engine, base on DirectFB 1.0.
diff --git a/src/newgal/dfb/st7167_video.c b/src/newgal/dfb/st7167_video.c
index 01b9ae48..d008f5df 100644
--- a/src/newgal/dfb/st7167_video.c
+++ b/src/newgal/dfb/st7167_video.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** This is the ST7167 platform DirectFB NEWGAL engine.
diff --git a/src/newgal/dfb/st7167_video.h b/src/newgal/dfb/st7167_video.h
index f30982ed..bbe150ad 100644
--- a/src/newgal/dfb/st7167_video.h
+++ b/src/newgal/dfb/st7167_video.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** This is the ST7167 platform DirectFB NEWGAL engine.
diff --git a/src/newgal/dri/Makefile.am b/src/newgal/dri/Makefile.am
deleted file mode 100644
index 7848ff9c..00000000
--- a/src/newgal/dri/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-
-## Makefile.am for the dri video driver
-AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/newgal/ -I$(DRM_INC_DIR)
-
-noinst_LTLIBRARIES = libvideo_dri.la
-
-# The dri video driver sources
-SRC_FILES = \
- drivideo.c
-
-HDR_FILES= \
- drivideo.h
-
-libvideo_dri_la_SOURCES = $(SRC_FILES) $(HDR_FILES)
-
-EXTRA_DIST=makefile.ng
-
-LIB_NAME=libvideo_dri
diff --git a/src/newgal/drm/Makefile.am b/src/newgal/drm/Makefile.am
new file mode 100644
index 00000000..d4d5c44c
--- /dev/null
+++ b/src/newgal/drm/Makefile.am
@@ -0,0 +1,18 @@
+
+## Makefile.am for the drm video driver
+AM_CPPFLAGS = -I$(abs_top_srcdir)/src/include -I$(abs_top_srcdir)/include -I$(abs_top_srcdir)/src/newgal/ -I$(DRM_INC_DIR)
+
+noinst_LTLIBRARIES = libvideo_drm.la
+
+# The drm video driver sources
+SRC_FILES = \
+ drmvideo.c
+
+HDR_FILES= \
+ drmvideo.h
+
+libvideo_drm_la_SOURCES = $(SRC_FILES) $(HDR_FILES)
+
+EXTRA_DIST=makefile.ng
+
+LIB_NAME=libvideo_drm
diff --git a/src/newgal/dri/drivideo.c b/src/newgal/drm/drmvideo.c
similarity index 69%
rename from src/newgal/dri/drivideo.c
rename to src/newgal/drm/drmvideo.c
index a843c267..99942edf 100644
--- a/src/newgal/dri/drivideo.c
+++ b/src/newgal/drm/drmvideo.c
@@ -40,7 +40,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
@@ -50,8 +50,9 @@
#define _DEBUG
#include "common.h"
-#ifdef _MGGAL_DRI
+#ifdef _MGGAL_DRM
+#include
#include
#include
#include
@@ -67,38 +68,38 @@
#include "exstubs.h"
#include "pixels_c.h"
-#include "drivideo.h"
+#include "drmvideo.h"
-#define DRI_DRIVER_NAME "dri"
+#define DRM_DRIVER_NAME "drm"
/* DRM engine methods for both dumb buffer and acclerated buffers */
-static int DRI_VideoInit(_THIS, GAL_PixelFormat *vformat);
-static GAL_Rect **DRI_ListModes(_THIS, GAL_PixelFormat *format, Uint32 flags);
-static int DRI_SetColors(_THIS, int firstcolor, int ncolors, GAL_Color *colors);
-static void DRI_VideoQuit(_THIS);
-static int DRI_Suspend(_THIS);
-static int DRI_Resume(_THIS);
+static int DRM_VideoInit(_THIS, GAL_PixelFormat *vformat);
+static GAL_Rect **DRM_ListModes(_THIS, GAL_PixelFormat *format, Uint32 flags);
+static int DRM_SetColors(_THIS, int firstcolor, int ncolors, GAL_Color *colors);
+static void DRM_VideoQuit(_THIS);
+static int DRM_Suspend(_THIS);
+static int DRM_Resume(_THIS);
/* DRM engine operators for dumb buffer */
-static GAL_Surface *DRI_SetVideoMode_Dumb(_THIS, GAL_Surface *current,
+static GAL_Surface *DRM_SetVideoMode_Dumb(_THIS, GAL_Surface *current,
int width, int height, int bpp, Uint32 flags);
-static int DRI_AllocHWSurface_Dumb(_THIS, GAL_Surface *surface);
-static void DRI_FreeHWSurface_Dumb(_THIS, GAL_Surface *surface);
+static int DRM_AllocHWSurface_Dumb(_THIS, GAL_Surface *surface);
+static void DRM_FreeHWSurface_Dumb(_THIS, GAL_Surface *surface);
/* DRM engine operators accelerated */
-static GAL_Surface *DRI_SetVideoMode_Accl(_THIS, GAL_Surface *current,
+static GAL_Surface *DRM_SetVideoMode_Accl(_THIS, GAL_Surface *current,
int width, int height, int bpp, Uint32 flags);
-static int DRI_AllocHWSurface_Accl(_THIS, GAL_Surface *surface);
-static void DRI_FreeHWSurface_Accl(_THIS, GAL_Surface *surface);
-static int DRI_CheckHWBlit_Accl(_THIS, GAL_Surface *src, GAL_Surface *dst);
-static int DRI_FillHWRect_Accl(_THIS, GAL_Surface *dst, GAL_Rect *rect,
+static int DRM_AllocHWSurface_Accl(_THIS, GAL_Surface *surface);
+static void DRM_FreeHWSurface_Accl(_THIS, GAL_Surface *surface);
+static int DRM_CheckHWBlit_Accl(_THIS, GAL_Surface *src, GAL_Surface *dst);
+static int DRM_FillHWRect_Accl(_THIS, GAL_Surface *dst, GAL_Rect *rect,
Uint32 color);
-static void DRI_UpdateRects_Accl (_THIS, int numrects, GAL_Rect *rects);
-static int DRI_SetHWColorKey_Accl(_THIS, GAL_Surface *surface, Uint32 key);
-static int DRI_SetHWAlpha_Accl(_THIS, GAL_Surface *surface, Uint8 value);
+static void DRM_UpdateRects_Accl (_THIS, int numrects, GAL_Rect *rects);
+static int DRM_SetHWColorKey_Accl(_THIS, GAL_Surface *surface, Uint32 key);
+static int DRM_SetHWAlpha_Accl(_THIS, GAL_Surface *surface, Uint8 value);
/* DRM driver bootstrap functions */
-static int DRI_Available(void)
+static int DRM_Available(void)
{
return drmAvailable();
}
@@ -135,7 +136,7 @@ struct drm_mode_info {
* drm_prepare(). It resets the CRTCs to their saved states and deallocates
* all memory.
*/
-static void drm_cleanup(DriVideoData* vdata)
+static void drm_cleanup(DrmVideoData* vdata)
{
if (vdata->saved_crtc) {
/* restore saved CRTC configuration */
@@ -157,8 +158,6 @@ static void drm_cleanup(DriVideoData* vdata)
if (vdata->scanout_fb) {
if (vdata->driver_ops) {
// do nothing for hardware surface.
- // vdata->driver_ops->unmap_buffer(vdata->driver, vdata->scanout_buff_id);
- // vdata->driver_ops->destroy_buffer(vdata->driver, vdata->scanout_buff_id);
}
else {
/* dumb buffer */
@@ -197,9 +196,11 @@ static void drm_cleanup(DriVideoData* vdata)
/* free allocated memory */
free(iter);
}
+
+ close (vdata->dev_fd);
}
-static void DRI_DeleteDevice(GAL_VideoDevice *device)
+static void DRM_DeleteDevice(GAL_VideoDevice *device)
{
drm_cleanup(device->hidden);
@@ -207,6 +208,9 @@ static void DRI_DeleteDevice(GAL_VideoDevice *device)
device->hidden->driver_ops->destroy_driver(device->hidden->driver);
}
+ if (device->hidden->exdrv_handle)
+ dlclose(device->hidden->exdrv_handle);
+
free(device->hidden);
free(device);
}
@@ -246,7 +250,7 @@ static char* find_driver_for_device (const char *dev_name)
return NULL;
}
- _DBG_PRINTF("NEWGAL>DRM: device link path: %s\n", device_link_path);
+ _DBG_PRINTF("device link path: %s\n", device_link_path);
free (device_path);
driver = strrchr (device_link_path, '/');
@@ -256,6 +260,45 @@ static char* find_driver_for_device (const char *dev_name)
return strdup (driver + strlen ("/"));
}
+#define LEN_DRIVER_FILENAME 255
+
+static DrmDriverOps* load_external_driver (DrmVideoData* vdata,
+ const char* driver_name, int device_fd)
+{
+ const char* filename = NULL;
+ char buff[LEN_DRIVER_FILENAME + 1];
+ DrmDriverOps* (*get_exdrv) (const char* driver_name, int device_fd);
+ char* error;
+
+ filename = getenv ("MG_GAL_DRM_DRIVER");
+ if (filename == NULL) {
+ memset (buff, 0, sizeof (buff));
+ if (GetMgEtcValue ("drm", "exdriver", buff, LEN_DRIVER_FILENAME) < 0)
+ return NULL;
+
+ filename = buff;
+ }
+
+ vdata->exdrv_handle = dlopen (filename, RTLD_LAZY);
+ if (!vdata->exdrv_handle) {
+ _WRN_PRINTF("Failed to open specified external DRM driver: %s (%s)\n",
+ filename, dlerror());
+ return NULL;
+ }
+
+ dlerror(); /* Clear any existing error */
+ get_exdrv = dlsym (vdata->exdrv_handle, "__drm_ex_driver_get");
+ error = dlerror();
+ if (error) {
+ _WRN_PRINTF("Failed to get symbol: %s\n", error);
+ dlclose (vdata->exdrv_handle);
+ vdata->exdrv_handle = NULL;
+ return NULL;
+ }
+
+ return get_exdrv (driver_name, device_fd);
+}
+
static int open_drm_device(GAL_VideoDevice *device)
{
char *driver_name;
@@ -263,7 +306,7 @@ static int open_drm_device(GAL_VideoDevice *device)
driver_name = find_driver_for_device(device->hidden->dev_name);
- _DBG_PRINTF("NEWGAL>DRM: Try to load DRM driver: %s\n", driver_name);
+ _DBG_PRINTF("Try to load DRM driver: %s\n", driver_name);
device_fd = drmOpen(driver_name, NULL);
if (device_fd < 0) {
@@ -272,9 +315,9 @@ static int open_drm_device(GAL_VideoDevice *device)
return -errno;
}
-#ifdef __TARGET_EXTERNAL__
- device->hidden->driver_ops = __dri_ex_driver_get(driver_name);
-#endif
+ device->hidden->driver_ops = load_external_driver (device->hidden,
+ driver_name, device_fd);
+
free (driver_name);
if (device->hidden->driver_ops == NULL) {
@@ -297,14 +340,14 @@ static int open_drm_device(GAL_VideoDevice *device)
device->hidden->dev_fd = device_fd;
device->hidden->driver = device->hidden->driver_ops->create_driver(device_fd);
if (device->hidden->driver == NULL) {
- _WRN_PRINTF("NEWGAL>DRM: failed to create DRM driver");
+ _WRN_PRINTF("NEWGAL>DRM: failed to create DRM driver\n");
device->hidden->driver_ops = NULL;
}
return 0;
}
-static GAL_VideoDevice *DRI_CreateDevice(int devindex)
+static GAL_VideoDevice *DRM_CreateDevice(int devindex)
{
GAL_VideoDevice *device;
@@ -324,10 +367,10 @@ static GAL_VideoDevice *DRI_CreateDevice(int devindex)
}
memset(device->hidden, 0, (sizeof (*device->hidden)));
- if (GetMgEtcValue ("dri", "device",
+ if (GetMgEtcValue ("drm", "device",
device->hidden->dev_name, LEN_DEVICE_NAME) < 0) {
strcpy(device->hidden->dev_name, "/dev/dri/card0");
- _WRN_PRINTF("NEWGAL>DRM: No dri.device defined, use the default '/dev/dri/card0'");
+ _WRN_PRINTF("NEWGAL>DRM: No dri.device defined, use the default '/dev/dri/card0'\n");
}
device->hidden->dev_fd = -1;
@@ -336,53 +379,53 @@ static GAL_VideoDevice *DRI_CreateDevice(int devindex)
return NULL;
}
- device->VideoInit = DRI_VideoInit;
- device->ListModes = DRI_ListModes;
- device->SetColors = DRI_SetColors;
- device->VideoQuit = DRI_VideoQuit;
+ device->VideoInit = DRM_VideoInit;
+ device->ListModes = DRM_ListModes;
+ device->SetColors = DRM_SetColors;
+ device->VideoQuit = DRM_VideoQuit;
if (device->hidden->driver) {
/* Use accelerated driver */
- device->SetVideoMode = DRI_SetVideoMode_Accl;
+ device->SetVideoMode = DRM_SetVideoMode_Accl;
#ifndef _MGRM_THREADS
device->RequestHWSurface = NULL;
#endif
- device->AllocHWSurface = DRI_AllocHWSurface_Accl;
- device->FreeHWSurface = DRI_FreeHWSurface_Accl;
- device->UpdateRects = DRI_UpdateRects_Accl;
+ device->AllocHWSurface = DRM_AllocHWSurface_Accl;
+ device->FreeHWSurface = DRM_FreeHWSurface_Accl;
+ device->UpdateRects = DRM_UpdateRects_Accl;
}
else {
/* Use DUMB buffer */
- device->SetVideoMode = DRI_SetVideoMode_Dumb;
+ device->SetVideoMode = DRM_SetVideoMode_Dumb;
#ifndef _MGRM_THREADS
device->RequestHWSurface = NULL;
#endif
- device->AllocHWSurface = DRI_AllocHWSurface_Dumb;
- device->FreeHWSurface = DRI_FreeHWSurface_Dumb;
+ device->AllocHWSurface = DRM_AllocHWSurface_Dumb;
+ device->FreeHWSurface = DRM_FreeHWSurface_Dumb;
device->UpdateRects = NULL;
}
- /* set accelerated methods in DRI_VideoInit */
+ /* set accelerated methods in DRM_VideoInit */
device->CheckHWBlit = NULL;
device->FillHWRect = NULL;
device->SetHWColorKey = NULL;
device->SetHWAlpha = NULL;
- device->Suspend = DRI_Suspend;
- device->Resume = DRI_Resume;
- device->free = DRI_DeleteDevice;
+ device->Suspend = DRM_Suspend;
+ device->Resume = DRM_Resume;
+ device->free = DRM_DeleteDevice;
return device;
}
-VideoBootStrap DRI_bootstrap = {
- DRI_DRIVER_NAME, "Linux DRI video driver",
- DRI_Available, DRI_CreateDevice
+VideoBootStrap DRM_bootstrap = {
+ DRM_DRIVER_NAME, "Linux DRI video driver",
+ DRM_Available, DRM_CreateDevice
};
/*
* drm_find_crtc(vdata, res, conn, info):
* This small helper tries to find a suitable CRTC for the given connector.
*/
-static int drm_find_crtc(DriVideoData* vdata,
+static int drm_find_crtc(DrmVideoData* vdata,
drmModeRes *res, drmModeConnector *conn, struct drm_mode_info *info)
{
drmModeEncoder *enc;
@@ -463,21 +506,21 @@ static int drm_find_crtc(DriVideoData* vdata,
* drm_setup_connector:
* Set up a single connector.
*/
-static int drm_setup_connector(DriVideoData* vdata,
+static int drm_setup_connector(DrmVideoData* vdata,
drmModeRes *res, drmModeConnector *conn, struct drm_mode_info *info)
{
int ret;
/* check if a monitor is connected */
if (conn->connection != DRM_MODE_CONNECTED) {
- _DBG_PRINTF("NEWGAL>DRM: ignoring unused connector %u\n",
+ _ERR_PRINTF("NEWGAL>DRM: ignoring unused connector %u\n",
conn->connector_id);
return -ENOENT;
}
/* check if there is at least one valid mode */
if (conn->count_modes == 0) {
- _DBG_PRINTF("NEWGAL>DRM: no valid mode for connector %u\n",
+ _ERR_PRINTF("NEWGAL>DRM: no valid mode for connector %u\n",
conn->connector_id);
return -EFAULT;
}
@@ -492,7 +535,7 @@ static int drm_setup_connector(DriVideoData* vdata,
/* find a crtc for this connector */
ret = drm_find_crtc(vdata, res, conn, info);
if (ret) {
- _DBG_PRINTF("NEWGAL>DRM: no valid crtc for connector %u\n",
+ _ERR_PRINTF("NEWGAL>DRM: no valid crtc for connector %u\n",
conn->connector_id);
return ret;
}
@@ -504,7 +547,7 @@ static int drm_setup_connector(DriVideoData* vdata,
* drm_prepare:
* Collect the connnectors and mode information.
*/
-static int drm_prepare(DriVideoData* vdata)
+static int drm_prepare(DrmVideoData* vdata)
{
drmModeRes *res;
drmModeConnector *conn;
@@ -561,7 +604,7 @@ static int drm_prepare(DriVideoData* vdata)
}
/* DRM engine methods for both dumb buffer and acclerated buffers */
-static int DRI_VideoInit(_THIS, GAL_PixelFormat *vformat)
+static int DRM_VideoInit(_THIS, GAL_PixelFormat *vformat)
{
int n = 0;
struct drm_mode_info *iter;
@@ -569,7 +612,7 @@ static int DRI_VideoInit(_THIS, GAL_PixelFormat *vformat)
drm_prepare(this->hidden);
for (iter = this->hidden->mode_list; iter; iter = iter->next) {
- _DBG_PRINTF("NEWGAL>DRM: mode #%d: %ux%u, conn: %u, crtc: %u\n", n,
+ _DBG_PRINTF("mode #%d: %ux%u, conn: %u, crtc: %u\n", n,
iter->width, iter->height, iter->conn, iter->crtc);
n++;
}
@@ -601,15 +644,15 @@ static int DRI_VideoInit(_THIS, GAL_PixelFormat *vformat)
if (this->hidden->driver) {
if (this->hidden->driver_ops->clear_buffer) {
this->info.blit_fill = 1;
- this->FillHWRect = DRI_FillHWRect_Accl;
+ this->FillHWRect = DRM_FillHWRect_Accl;
}
else
this->FillHWRect = NULL;
if (this->hidden->driver_ops->check_blit) {
- this->CheckHWBlit = DRI_CheckHWBlit_Accl;
- this->SetHWColorKey = DRI_SetHWColorKey_Accl;
- this->SetHWAlpha = DRI_SetHWAlpha_Accl;
+ this->CheckHWBlit = DRM_CheckHWBlit_Accl;
+ this->SetHWColorKey = DRM_SetHWColorKey_Accl;
+ this->SetHWAlpha = DRM_SetHWAlpha_Accl;
this->info.blit_hw = 1;
if (this->hidden->driver_ops->alpha_blit)
@@ -628,7 +671,7 @@ static int DRI_VideoInit(_THIS, GAL_PixelFormat *vformat)
return(0);
}
-static GAL_Rect **DRI_ListModes(_THIS, GAL_PixelFormat *format, Uint32 flags)
+static GAL_Rect **DRM_ListModes(_THIS, GAL_PixelFormat *format, Uint32 flags)
{
if (format->BitsPerPixel != 32) {
return NULL;
@@ -637,25 +680,25 @@ static GAL_Rect **DRI_ListModes(_THIS, GAL_PixelFormat *format, Uint32 flags)
return this->hidden->modes;
}
-static int DRI_SetColors(_THIS, int firstcolor, int ncolors, GAL_Color *colors)
+static int DRM_SetColors(_THIS, int firstcolor, int ncolors, GAL_Color *colors)
{
/* do nothing of note. */
return(1);
}
-static void DRI_VideoQuit(_THIS)
+static void DRM_VideoQuit(_THIS)
{
if (this->screen->pixels != NULL) {
this->screen->pixels = NULL;
}
}
-static int DRI_Resume(_THIS)
+static int DRM_Resume(_THIS)
{
- DriVideoData* vdata = this->hidden;
+ DrmVideoData* vdata = this->hidden;
int ret = -1;
- _DBG_PRINTF ("NEWGAL>DRM: %s called\n", __FUNCTION__);
+ _DBG_PRINTF ("%s called\n", __FUNCTION__);
if (vdata->saved_info) {
vdata->saved_crtc = drmModeGetCrtc(vdata->dev_fd,
@@ -675,12 +718,12 @@ static int DRI_Resume(_THIS)
return ret;
}
-static int DRI_Suspend(_THIS)
+static int DRM_Suspend(_THIS)
{
- DriVideoData* vdata = this->hidden;
+ DrmVideoData* vdata = this->hidden;
int ret = -1;
- _DBG_PRINTF ("NEWGAL>DRM: %s called\n", __FUNCTION__);
+ _DBG_PRINTF ("%s called\n", __FUNCTION__);
if (vdata->saved_crtc) {
/* restore saved CRTC configuration */
@@ -708,7 +751,7 @@ static int DRI_Suspend(_THIS)
* Call this function to create a so called "dumb buffer".
* We can use it for unaccelerated software rendering on the CPU.
*/
-static int drm_create_dumb_fb(DriVideoData* vdata, const DrmModeInfo* info,
+static int drm_create_dumb_fb(DrmVideoData* vdata, const DrmModeInfo* info,
uint32_t format, int bpp)
{
struct drm_mode_create_dumb creq;
@@ -781,7 +824,7 @@ err_destroy:
return ret;
}
-static DrmModeInfo* find_mode(DriVideoData* vdata, int width, int height)
+static DrmModeInfo* find_mode(DrmVideoData* vdata, int width, int height)
{
DrmModeInfo *iter;
@@ -816,7 +859,7 @@ static uint32_t get_drm_format_from_etc(int* bpp)
uint32_t format;
char fourcc[8] = {};
- if (GetMgEtcValue ("dri", "pixelformat",
+ if (GetMgEtcValue ("drm", "pixelformat",
fourcc, 4) < 0) {
return get_def_drm_format(*bpp);
}
@@ -1284,11 +1327,11 @@ static int translate_drm_format(uint32_t drm_format, Uint32* RGBAmasks)
}
/* DRM engine methods for dumb buffers */
-static GAL_Surface *DRI_SetVideoMode_Dumb(_THIS, GAL_Surface *current,
+static GAL_Surface *DRM_SetVideoMode_Dumb(_THIS, GAL_Surface *current,
int width, int height, int bpp, Uint32 flags)
{
uint32_t drm_format;
- DriVideoData* vdata = this->hidden;
+ DrmVideoData* vdata = this->hidden;
DrmModeInfo* info;
Uint32 RGBAmasks[4];
int ret;
@@ -1306,7 +1349,7 @@ static GAL_Surface *DRI_SetVideoMode_Dumb(_THIS, GAL_Surface *current,
return NULL;
}
- _DBG_PRINTF("NEWGAL>DRM: going setting video mode: %dx%d-%dbpp\n",
+ _DBG_PRINTF("going setting video mode: %dx%d-%dbpp\n",
info->width, info->height, bpp);
/* create a dumb framebuffer for current CRTC */
@@ -1346,7 +1389,7 @@ static GAL_Surface *DRI_SetVideoMode_Dumb(_THIS, GAL_Surface *current,
return NULL;
}
- _DBG_PRINTF("NEWGAL>DRM: real screen mode: %dx%d-%dbpp\n",
+ _DBG_PRINTF("real screen mode: %dx%d-%dbpp\n",
width, height, bpp);
current->flags = flags & GAL_FULLSCREEN;
@@ -1359,26 +1402,25 @@ static GAL_Surface *DRI_SetVideoMode_Dumb(_THIS, GAL_Surface *current,
return(current);
}
-static int DRI_AllocHWSurface_Dumb(_THIS, GAL_Surface *surface)
+static int DRM_AllocHWSurface_Dumb(_THIS, GAL_Surface *surface)
{
return(-1);
}
-static void DRI_FreeHWSurface_Dumb(_THIS, GAL_Surface *surface)
+static void DRM_FreeHWSurface_Dumb(_THIS, GAL_Surface *surface)
{
surface->pixels = NULL;
}
/* DRM engine methods for accelerated buffers */
-static GAL_Surface *DRI_SetVideoMode_Accl(_THIS, GAL_Surface *current,
+static GAL_Surface *DRM_SetVideoMode_Accl(_THIS, GAL_Surface *current,
int width, int height, int bpp, Uint32 flags)
{
- DriVideoData* vdata = this->hidden;
+ DrmVideoData* vdata = this->hidden;
DrmModeInfo* info;
uint32_t drm_format;
Uint32 RGBAmasks[4];
- DriSurfaceBuffer* scanout_buff = NULL;
- unsigned int pitch;
+ DrmSurfaceBuffer* scanout_buff = NULL;
drm_format = get_drm_format_from_etc(&bpp);
if (drm_format == 0) {
@@ -1393,7 +1435,7 @@ static GAL_Surface *DRI_SetVideoMode_Accl(_THIS, GAL_Surface *current,
return NULL;
}
- _DBG_PRINTF("NEWGAL>DRM: going setting video mode: %dx%d-%dbpp\n",
+ _DBG_PRINTF("going setting video mode: %dx%d-%dbpp\n",
info->width, info->height, bpp);
#if 0
@@ -1403,16 +1445,33 @@ static GAL_Surface *DRI_SetVideoMode_Accl(_THIS, GAL_Surface *current,
}
#endif
- /* create the scanout buffer and set up it as frame buffer */
- vdata->scanout_buff_id =
- vdata->driver_ops->create_buffer(vdata->driver, drm_format,
- info->width, info->height, &pitch);
- if (vdata->scanout_buff_id == 0) {
+ /* create the scanout buffer */
+ scanout_buff = vdata->driver_ops->create_buffer(vdata->driver, drm_format,
+ info->width, info->height);
+ if (scanout_buff == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: cannot create scanout buffer: %m\n");
goto error;
}
- scanout_buff = vdata->driver_ops->map_buffer(vdata->driver, vdata->scanout_buff_id);
- if (scanout_buff == NULL) {
+ /* set up it as frame buffer */
+ {
+ uint32_t handles[4], pitches[4], offsets[4];
+ handles[0] = scanout_buff->handle;
+ pitches[0] = scanout_buff->pitch;
+ offsets[0] = 0;
+
+ if (drmModeAddFB2(vdata->dev_fd,
+ info->width, info->height, drm_format,
+ handles, pitches, offsets, &scanout_buff->id, 0) != 0) {
+ _ERR_PRINTF ("NEWGAL>DRM: cannot set up scanout frame buffer: %m\n");
+ goto error;
+ }
+ }
+
+ /* not a foreign surface */
+ scanout_buff->foreign = 0;
+
+ if (NULL == vdata->driver_ops->map_buffer(vdata->driver, scanout_buff)) {
_ERR_PRINTF ("NEWGAL>DRM: cannot map scanout frame buffer: %m\n");
goto error;
}
@@ -1420,12 +1479,13 @@ static GAL_Surface *DRI_SetVideoMode_Accl(_THIS, GAL_Surface *current,
vdata->width = info->width;
vdata->height = info->height;
vdata->bpp = bpp;
- vdata->pitch = pitch;
- vdata->size = pitch * info->height;
+ vdata->pitch = scanout_buff->pitch;
+ vdata->size = scanout_buff->pitch * info->height;
vdata->handle = 0;
+ vdata->scanout_buff_id = scanout_buff->id;
vdata->scanout_fb = scanout_buff->pixels;
- _DBG_PRINTF("NEWGAL>DRM: scanout frame buffer: size (%dx%d), pitch(%d)\n",
+ _DBG_PRINTF("scanout frame buffer: size (%dx%d), pitch(%d)\n",
vdata->width, vdata->height, vdata->pitch);
/* get console buffer id */
@@ -1457,7 +1517,7 @@ static GAL_Surface *DRI_SetVideoMode_Accl(_THIS, GAL_Surface *current,
return NULL;
}
- _DBG_PRINTF("NEWGAL>DRM: real screen mode: %dx%d-%dbpp\n",
+ _DBG_PRINTF("real screen mode: %dx%d-%dbpp\n",
width, height, bpp);
current->flags |= (GAL_FULLSCREEN | GAL_HWSURFACE);
@@ -1483,20 +1543,18 @@ error:
}
if (vdata->scanout_buff_id) {
- vdata->driver_ops->destroy_buffer(vdata->driver, vdata->scanout_buff_id);
+ vdata->driver_ops->destroy_buffer(vdata->driver, scanout_buff);
vdata->scanout_buff_id = 0;
}
return NULL;
}
-static int DRI_AllocHWSurface_Accl(_THIS, GAL_Surface *surface)
+static int DRM_AllocHWSurface_Accl(_THIS, GAL_Surface *surface)
{
- DriVideoData* vdata = this->hidden;
+ DrmVideoData* vdata = this->hidden;
uint32_t drm_format;
- unsigned int pitch;
- uint32_t buff_id = 0;
- DriSurfaceBuffer* surface_buffer;
+ DrmSurfaceBuffer* surface_buffer;
drm_format = translate_gal_format(surface->format);
if (drm_format == 0) {
@@ -1506,55 +1564,57 @@ static int DRI_AllocHWSurface_Accl(_THIS, GAL_Surface *surface)
return -1;
}
- buff_id = vdata->driver_ops->create_buffer(vdata->driver, drm_format,
- surface->w, surface->h, &pitch);
- if (buff_id == 0) {
+ surface_buffer = vdata->driver_ops->create_buffer(vdata->driver, drm_format,
+ surface->w, surface->h);
+ if (surface_buffer == NULL) {
return -1;
}
+ /* not a foreign surface */
+ surface_buffer->foreign = 0;
- surface_buffer = vdata->driver_ops->map_buffer(vdata->driver, buff_id);
- if (surface_buffer == NULL) {
+ if (vdata->driver_ops->map_buffer(vdata->driver, surface_buffer) == NULL) {
_ERR_PRINTF ("NEWGAL>DRM: cannot map hardware buffer: %m\n");
goto error;
}
surface->pixels = surface_buffer->pixels;
surface->flags |= GAL_HWSURFACE;
- surface->pitch = pitch;
+ surface->pitch = surface_buffer->pitch;
surface->hwdata = (struct private_hwdata *)surface_buffer;
return 0;
error:
- if (buff_id)
- vdata->driver_ops->destroy_buffer(vdata->driver, buff_id);
+ if (surface_buffer)
+ vdata->driver_ops->destroy_buffer(vdata->driver, surface_buffer);
return -1;
}
-static void DRI_FreeHWSurface_Accl(_THIS, GAL_Surface *surface)
+static void DRM_FreeHWSurface_Accl(_THIS, GAL_Surface *surface)
{
- DriVideoData* vdata = this->hidden;
- DriSurfaceBuffer* surface_buffer;
+ DrmVideoData* vdata = this->hidden;
+ DrmSurfaceBuffer* surface_buffer;
- surface_buffer = (DriSurfaceBuffer*)surface->hwdata;
+ surface_buffer = (DrmSurfaceBuffer*)surface->hwdata;
if (surface_buffer) {
- vdata->driver_ops->unmap_buffer(vdata->driver, surface_buffer);
- vdata->driver_ops->destroy_buffer(vdata->driver, surface_buffer->buff_id);
+ if (surface_buffer->pixels)
+ vdata->driver_ops->unmap_buffer(vdata->driver, surface_buffer);
+ vdata->driver_ops->destroy_buffer(vdata->driver, surface_buffer);
}
surface->pixels = NULL;
surface->hwdata = NULL;
}
-static int DRI_HWBlit(GAL_Surface *src, GAL_Rect *src_rc,
+static int DRM_HWBlit(GAL_Surface *src, GAL_Rect *src_rc,
GAL_Surface *dst, GAL_Rect *dst_rc)
{
- GAL_VideoDevice *this = current_video;
- DriVideoData* vdata = this->hidden;
- DriSurfaceBuffer *src_buf, *dst_buf;
+ GAL_VideoDevice *this = __mg_current_video;
+ DrmVideoData* vdata = this->hidden;
+ DrmSurfaceBuffer *src_buf, *dst_buf;
- src_buf = (DriSurfaceBuffer*)src->hwdata;
- dst_buf = (DriSurfaceBuffer*)dst->hwdata;
+ src_buf = (DrmSurfaceBuffer*)src->hwdata;
+ dst_buf = (DrmSurfaceBuffer*)dst->hwdata;
if ((src->flags & GAL_SRCALPHA) == GAL_SRCALPHA &&
(src->flags & GAL_SRCCOLORKEY) == GAL_SRCCOLORKEY) {
@@ -1580,14 +1640,14 @@ static int DRI_HWBlit(GAL_Surface *src, GAL_Rect *src_rc,
return 0;
}
-static int DRI_CheckHWBlit_Accl(_THIS, GAL_Surface *src, GAL_Surface *dst)
+static int DRM_CheckHWBlit_Accl(_THIS, GAL_Surface *src, GAL_Surface *dst)
{
- DriVideoData* vdata = this->hidden;
- DriSurfaceBuffer *src_buf, *dst_buf;
+ DrmVideoData* vdata = this->hidden;
+ DrmSurfaceBuffer *src_buf, *dst_buf;
int accelerated;
- src_buf = (DriSurfaceBuffer*)src->hwdata;
- dst_buf = (DriSurfaceBuffer*)dst->hwdata;
+ src_buf = (DrmSurfaceBuffer*)src->hwdata;
+ dst_buf = (DrmSurfaceBuffer*)dst->hwdata;
/* Set initial acceleration on */
src->flags |= GAL_HWACCEL;
@@ -1614,7 +1674,7 @@ static int DRI_CheckHWBlit_Accl(_THIS, GAL_Surface *src, GAL_Surface *dst)
accelerated = !!(src->flags & GAL_HWACCEL);
if (accelerated &&
vdata->driver_ops->check_blit(vdata->driver, src_buf, dst_buf) == 0) {
- src->map->hw_blit = DRI_HWBlit;
+ src->map->hw_blit = DRM_HWBlit;
}
else {
src->map->hw_blit = NULL;
@@ -1625,33 +1685,367 @@ static int DRI_CheckHWBlit_Accl(_THIS, GAL_Surface *src, GAL_Surface *dst)
return accelerated;
}
-static int DRI_FillHWRect_Accl(_THIS, GAL_Surface *dst, GAL_Rect *rect,
+static int DRM_FillHWRect_Accl(_THIS, GAL_Surface *dst, GAL_Rect *rect,
Uint32 color)
{
- DriVideoData* vdata = this->hidden;
- DriSurfaceBuffer *dst_buf;
+ DrmVideoData* vdata = this->hidden;
+ DrmSurfaceBuffer *dst_buf;
- dst_buf = (DriSurfaceBuffer*)dst->hwdata;
+ dst_buf = (DrmSurfaceBuffer*)dst->hwdata;
return vdata->driver_ops->clear_buffer(vdata->driver, dst_buf, rect, color);
}
-static void DRI_UpdateRects_Accl (_THIS, int numrects, GAL_Rect *rects)
+static void DRM_UpdateRects_Accl (_THIS, int numrects, GAL_Rect *rects)
{
- DriVideoData* vdata = this->hidden;
+ DrmVideoData* vdata = this->hidden;
if (vdata->driver_ops->flush_driver)
vdata->driver_ops->flush_driver(vdata->driver);
}
-static int DRI_SetHWColorKey_Accl(_THIS, GAL_Surface *surface, Uint32 key)
+static int DRM_SetHWColorKey_Accl(_THIS, GAL_Surface *surface, Uint32 key)
{
return 0;
}
-static int DRI_SetHWAlpha_Accl(_THIS, GAL_Surface *surface, Uint8 value)
+static int DRM_SetHWAlpha_Accl(_THIS, GAL_Surface *surface, Uint8 value)
{
return 0;
}
-#endif /* _MGGAL_DRI */
+MG_EXPORT int drmGetDeviceFD (GHANDLE video)
+{
+ GAL_VideoDevice *this = (GAL_VideoDevice *)video;
+ if (this && this->VideoInit == DRM_VideoInit) {
+ DrmVideoData* vdata = this->hidden;
+ return vdata->dev_fd;
+ }
+
+ return -1;
+}
+
+/* called by drmGetSurfaceInfo */
+BOOL __drm_get_surface_info (GAL_Surface *surface, DrmSurfaceInfo* info)
+{
+ GAL_VideoDevice *this = (GAL_VideoDevice *)surface->video;
+
+ if (this && this->VideoInit == DRM_VideoInit &&
+ (surface->flags & GAL_HWSURFACE)) {
+ DrmSurfaceBuffer* surface_buffer = (DrmSurfaceBuffer*)surface->hwdata;
+
+ if (surface_buffer) {
+ info->prime_fd = surface_buffer->prime_fd;
+ info->name = surface_buffer->name;
+ info->handle = surface_buffer->handle;
+ info->id = surface_buffer->id;
+ info->width = surface_buffer->width;
+ info->height = surface_buffer->height;
+ info->pitch = surface_buffer->pitch;
+ info->drm_format = surface_buffer->drm_format;
+ info->size = surface_buffer->size;
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+/* called by drmCreateDCFromName */
+GAL_Surface* __drm_create_surface_from_name (GHANDLE video,
+ uint32_t name, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch)
+{
+ GAL_VideoDevice *this = (GAL_VideoDevice *)video;
+ DrmVideoData* vdata = this->hidden;
+ DrmSurfaceBuffer* surface_buffer;
+ GAL_Surface* surface = NULL;
+ Uint32 RGBAmasks[4];
+ int depth;
+
+ if (this && this->VideoInit != DRM_VideoInit) {
+ return NULL;
+ }
+
+ if (vdata->driver_ops == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: not hardware accelerated!\n");
+ return NULL;
+ }
+
+ if (vdata->driver_ops->create_buffer_from_name == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: not implemented method: create_buffer_from_name!\n");
+ return NULL;
+ }
+
+ depth = translate_drm_format(drm_format, RGBAmasks);
+ if (depth == 0) {
+ _ERR_PRINTF("NEWGAL>DRM: not supported drm format: %u\n",
+ drm_format);
+ return NULL;
+ }
+
+ surface_buffer = vdata->driver_ops->create_buffer_from_name(vdata->driver,
+ name, drm_format, width, height, pitch);
+ if (surface_buffer == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: create_buffer_from_name failed!\n");
+ return NULL;
+ }
+ /* not a foreign surface */
+ surface_buffer->foreign = 0;
+
+ if (vdata->driver_ops->map_buffer(vdata->driver, surface_buffer) == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: cannot map hardware buffer: %m\n");
+ goto error;
+ }
+
+ /* Allocate the surface */
+ surface = (GAL_Surface *)malloc (sizeof(*surface));
+ if (surface == NULL) {
+ goto error;
+ }
+
+ /* Allocate the format */
+ surface->format = GAL_AllocFormat(depth, RGBAmasks[0], RGBAmasks[1],
+ RGBAmasks[2], RGBAmasks[3]);
+ if (surface->format == NULL) {
+ goto error;
+ }
+
+ /* Allocate an empty mapping */
+ surface->map = GAL_AllocBlitMap();
+ if (surface->map == NULL) {
+ goto error;
+ }
+
+ surface->format_version = 0;
+ surface->video = this;
+ surface->flags = GAL_HWSURFACE;
+ surface->dpi = GDCAP_DPI_DEFAULT;
+ surface->w = width;
+ surface->h = height;
+ surface->pitch = pitch;
+ surface->offset = 0;
+ surface->pixels = surface_buffer->pixels;
+ surface->hwdata = (struct private_hwdata *)surface_buffer;
+
+ /* The surface is ready to go */
+ surface->refcount = 1;
+
+ GAL_SetClipRect(surface, NULL);
+
+#ifdef _MGUSE_SYNC_UPDATE
+ /* Initialize update region */
+ InitClipRgn (&surface->update_region, &__mg_free_update_region_list);
+#endif
+
+ return(surface);
+
+error:
+ if (surface)
+ GAL_FreeSurface(surface);
+
+ if (surface_buffer)
+ vdata->driver_ops->destroy_buffer(vdata->driver, surface_buffer);
+
+ return NULL;
+}
+
+/* called by drmCreateDCFromHandle */
+GAL_Surface* __drm_create_surface_from_handle (GHANDLE video,
+ uint32_t handle, unsigned long size, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch)
+{
+ GAL_VideoDevice *this = (GAL_VideoDevice *)video;
+ DrmVideoData* vdata = this->hidden;
+ DrmSurfaceBuffer* surface_buffer;
+ GAL_Surface* surface = NULL;
+ Uint32 RGBAmasks[4];
+ int depth;
+
+ if (this && this->VideoInit != DRM_VideoInit) {
+ return NULL;
+ }
+
+ if (vdata->driver_ops == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: not hardware accelerated!\n");
+ return NULL;
+ }
+
+ if (vdata->driver_ops->create_buffer_from_handle == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: not implemented method: create_buffer_from_handle!\n");
+ return NULL;
+ }
+
+ depth = translate_drm_format (drm_format, RGBAmasks);
+ if (depth == 0) {
+ _ERR_PRINTF ("NEWGAL>DRM: not supported drm format: %u\n",
+ drm_format);
+ return NULL;
+ }
+
+ surface_buffer = vdata->driver_ops->create_buffer_from_handle (vdata->driver,
+ handle, size, drm_format, width, height, pitch);
+ if (surface_buffer == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: create_buffer_from_handle failed!\n");
+ return NULL;
+ }
+ /* this is a foreign surface */
+ surface_buffer->foreign = 1;
+
+ if (vdata->driver_ops->map_buffer (vdata->driver, surface_buffer) == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: cannot map hardware buffer: %m\n");
+ goto error;
+ }
+
+ /* Allocate the surface */
+ surface = (GAL_Surface *)malloc (sizeof(*surface));
+ if (surface == NULL) {
+ goto error;
+ }
+
+ /* Allocate the format */
+ surface->format = GAL_AllocFormat (depth, RGBAmasks[0], RGBAmasks[1],
+ RGBAmasks[2], RGBAmasks[3]);
+ if (surface->format == NULL) {
+ goto error;
+ }
+
+ /* Allocate an empty mapping */
+ surface->map = GAL_AllocBlitMap ();
+ if (surface->map == NULL) {
+ goto error;
+ }
+
+ surface->format_version = 0;
+ surface->video = this;
+ surface->flags = GAL_HWSURFACE;
+ surface->dpi = GDCAP_DPI_DEFAULT;
+ surface->w = width;
+ surface->h = height;
+ surface->pitch = pitch;
+ surface->offset = 0;
+ surface->pixels = surface_buffer->pixels;
+ surface->hwdata = (struct private_hwdata *)surface_buffer;
+
+ /* The surface is ready to go */
+ surface->refcount = 1;
+
+ GAL_SetClipRect(surface, NULL);
+
+#ifdef _MGUSE_SYNC_UPDATE
+ /* Initialize update region */
+ InitClipRgn (&surface->update_region, &__mg_free_update_region_list);
+#endif
+
+ return(surface);
+
+error:
+ if (surface)
+ GAL_FreeSurface(surface);
+
+ if (surface_buffer)
+ vdata->driver_ops->destroy_buffer(vdata->driver, surface_buffer);
+
+ return NULL;
+}
+
+/* called by drmCreateDCFromPrimeFd */
+GAL_Surface* __drm_create_surface_from_prime_fd (GHANDLE video,
+ int prime_fd, unsigned long size, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch)
+{
+ GAL_VideoDevice *this = (GAL_VideoDevice *)video;
+ DrmVideoData* vdata = this->hidden;
+ DrmSurfaceBuffer* surface_buffer;
+ GAL_Surface* surface = NULL;
+ Uint32 RGBAmasks[4];
+ int depth;
+
+ if (this && this->VideoInit != DRM_VideoInit) {
+ return NULL;
+ }
+
+ if (vdata->driver_ops == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: not hardware accelerated!\n");
+ return NULL;
+ }
+
+ if (vdata->driver_ops->create_buffer_from_prime_fd == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: not implemented method: create_buffer_from_prime_fd.\n");
+ return NULL;
+ }
+
+ depth = translate_drm_format(drm_format, RGBAmasks);
+ if (depth == 0) {
+ _ERR_PRINTF("NEWGAL>DRM: not supported drm format: %u\n",
+ drm_format);
+ return NULL;
+ }
+
+ surface_buffer = vdata->driver_ops->create_buffer_from_prime_fd (vdata->driver,
+ prime_fd, size, drm_format, width, height, pitch);
+ if (surface_buffer == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: create_buffer_from_prime_fd failed!\n");
+ return NULL;
+ }
+ /* not a foreign surface */
+ surface_buffer->foreign = 1;
+
+ if (vdata->driver_ops->map_buffer (vdata->driver, surface_buffer) == NULL) {
+ _ERR_PRINTF ("NEWGAL>DRM: cannot map hardware buffer: %m\n");
+ goto error;
+ }
+
+ /* Allocate the surface */
+ surface = (GAL_Surface *)malloc (sizeof(*surface));
+ if (surface == NULL) {
+ goto error;
+ }
+
+ /* Allocate the format */
+ surface->format = GAL_AllocFormat(depth, RGBAmasks[0], RGBAmasks[1],
+ RGBAmasks[2], RGBAmasks[3]);
+ if (surface->format == NULL) {
+ goto error;
+ }
+
+ /* Allocate an empty mapping */
+ surface->map = GAL_AllocBlitMap();
+ if (surface->map == NULL) {
+ goto error;
+ }
+
+ surface->format_version = 0;
+ surface->video = this;
+ surface->flags = GAL_HWSURFACE;
+ surface->dpi = GDCAP_DPI_DEFAULT;
+ surface->w = width;
+ surface->h = height;
+ surface->pitch = pitch;
+ surface->offset = 0;
+ surface->pixels = surface_buffer->pixels;
+ surface->hwdata = (struct private_hwdata *)surface_buffer;
+
+ /* The surface is ready to go */
+ surface->refcount = 1;
+
+ GAL_SetClipRect(surface, NULL);
+
+#ifdef _MGUSE_SYNC_UPDATE
+ /* Initialize update region */
+ InitClipRgn (&surface->update_region, &__mg_free_update_region_list);
+#endif
+
+ return(surface);
+
+error:
+ if (surface)
+ GAL_FreeSurface(surface);
+
+ if (surface_buffer)
+ vdata->driver_ops->destroy_buffer(vdata->driver, surface_buffer);
+
+ return NULL;
+}
+
+#endif /* _MGGAL_DRM */
diff --git a/src/newgal/dri/drivideo.h b/src/newgal/drm/drmvideo.h
similarity index 93%
rename from src/newgal/dri/drivideo.h
rename to src/newgal/drm/drmvideo.h
index 390d0667..ff867876 100644
--- a/src/newgal/dri/drivideo.h
+++ b/src/newgal/drm/drmvideo.h
@@ -40,7 +40,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _NEWGAL_DRIVIDEO_H
@@ -63,8 +63,9 @@ typedef struct GAL_PrivateVideoData {
char dev_name[LEN_DEVICE_NAME + 1];
int dev_fd;
- DriDriverOps* driver_ops;
- DriDriver* driver;
+ void* exdrv_handle;
+ DrmDriverOps* driver_ops;
+ DrmDriver* driver;
DrmModeInfo* mode_list;
GAL_Rect** modes;
@@ -86,7 +87,7 @@ typedef struct GAL_PrivateVideoData {
/* only valid when using DRM driver */
uint32_t console_buff_id;
-} DriVideoData;
+} DrmVideoData;
#endif /* _NEWGAL_DRIVIDEO_H */
diff --git a/src/newgal/dri/makefile.ng b/src/newgal/drm/makefile.ng
similarity index 100%
rename from src/newgal/dri/makefile.ng
rename to src/newgal/drm/makefile.ng
diff --git a/src/newgal/dummy/nullvideo.c b/src/newgal/dummy/nullvideo.c
index 358b6efd..ab3d5f01 100644
--- a/src/newgal/dummy/nullvideo.c
+++ b/src/newgal/dummy/nullvideo.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Dummy GAL video driver implementation; this is just enough to make an
diff --git a/src/newgal/dummy/nullvideo.h b/src/newgal/dummy/nullvideo.h
index 9a04f965..cdaf55c6 100644
--- a/src/newgal/dummy/nullvideo.h
+++ b/src/newgal/dummy/nullvideo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_nullvideo_h
diff --git a/src/newgal/em85xxosd/em85xxosd.c b/src/newgal/em85xxosd/em85xxosd.c
index f67f7f1f..70154e51 100644
--- a/src/newgal/em85xxosd/em85xxosd.c
+++ b/src/newgal/em85xxosd/em85xxosd.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: em85xxosd.c 8944 2007-12-29 08:29:16Z xwyan $
diff --git a/src/newgal/em85xxosd/em85xxosd.h b/src/newgal/em85xxosd/em85xxosd.h
index 8c4ed6d3..8a9bed0d 100644
--- a/src/newgal/em85xxosd/em85xxosd.h
+++ b/src/newgal/em85xxosd/em85xxosd.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: em85xxosd.h 7349 2007-08-16 04:54:21Z xgwang $
diff --git a/src/newgal/em85xxosd/realmagichwl_userland_api.c b/src/newgal/em85xxosd/realmagichwl_userland_api.c
index 7c3956a7..f37661e0 100644
--- a/src/newgal/em85xxosd/realmagichwl_userland_api.c
+++ b/src/newgal/em85xxosd/realmagichwl_userland_api.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/newgal/em85xxyuv/em85xxyuv.c b/src/newgal/em85xxyuv/em85xxyuv.c
index 45e1b9f6..60941b6c 100644
--- a/src/newgal/em85xxyuv/em85xxyuv.c
+++ b/src/newgal/em85xxyuv/em85xxyuv.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: em85xxyuv.c 8944 2007-12-29 08:29:16Z xwyan $
diff --git a/src/newgal/em85xxyuv/em85xxyuv.h b/src/newgal/em85xxyuv/em85xxyuv.h
index 243a4881..6a4cc128 100644
--- a/src/newgal/em85xxyuv/em85xxyuv.h
+++ b/src/newgal/em85xxyuv/em85xxyuv.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: em85xxyuv.h 7350 2007-08-16 04:55:17Z xgwang $
diff --git a/src/newgal/em85xxyuv/realmagichwl_userland_api.c b/src/newgal/em85xxyuv/realmagichwl_userland_api.c
index 8efe537a..670fa651 100644
--- a/src/newgal/em85xxyuv/realmagichwl_userland_api.c
+++ b/src/newgal/em85xxyuv/realmagichwl_userland_api.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/newgal/em86gfx/em86gfx.c b/src/newgal/em86gfx/em86gfx.c
index dd1d44ae..7fa43451 100644
--- a/src/newgal/em86gfx/em86gfx.c
+++ b/src/newgal/em86gfx/em86gfx.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: em86gfx.c 8944 2007-12-29 08:29:16Z xwyan $
@@ -444,7 +444,7 @@ static int GFX_CheckHWBlit (_THIS, GAL_Surface* src, GAL_Surface* dst)
static int GFX_HWAccelBlit (GAL_Surface* src, GAL_Rect* srec,
GAL_Surface* dst, GAL_Rect* drec)
{
- GAL_VideoDevice * this = current_video;
+ GAL_VideoDevice * this = __mg_current_video;
struct GFXEngine_BlendAndScaleRectangles_type blend_param;
struct GFXEngine_Surface_type surface_param;
diff --git a/src/newgal/em86gfx/em86gfx.h b/src/newgal/em86gfx/em86gfx.h
index a153c1ae..84c63c03 100644
--- a/src/newgal/em86gfx/em86gfx.h
+++ b/src/newgal/em86gfx/em86gfx.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: em86gfx.h 7351 2007-08-16 04:55:58Z xgwang $
diff --git a/src/newgal/fbcon/3dfx_mmio.h b/src/newgal/fbcon/3dfx_mmio.h
index 961d958f..14a3e51a 100644
--- a/src/newgal/fbcon/3dfx_mmio.h
+++ b/src/newgal/fbcon/3dfx_mmio.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* 3Dfx register definitions */
diff --git a/src/newgal/fbcon/3dfx_regs.h b/src/newgal/fbcon/3dfx_regs.h
index e9f1e9ee..8c1ea1b8 100644
--- a/src/newgal/fbcon/3dfx_regs.h
+++ b/src/newgal/fbcon/3dfx_regs.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _3DFX_REGS_H
diff --git a/src/newgal/fbcon/compiler.h b/src/newgal/fbcon/compiler.h
index 4ad148c2..05e8d842 100644
--- a/src/newgal/fbcon/compiler.h
+++ b/src/newgal/fbcon/compiler.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/src/newgal/fbcon/fb3dfx.c b/src/newgal/fbcon/fb3dfx.c
index 02949df9..c9bee4b1 100644
--- a/src/newgal/fbcon/fb3dfx.c
+++ b/src/newgal/fbcon/fb3dfx.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
@@ -109,7 +109,7 @@ static int FillHWRect(_THIS, GAL_Surface *dst, GAL_Rect *rect, Uint32 color)
static int HWAccelBlit(GAL_Surface *src, GAL_Rect *srcrect,
GAL_Surface *dst, GAL_Rect *dstrect)
{
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *this = __mg_current_video;
int bpp;
Uint32 src_format;
/* Uint32 dst_format; */
diff --git a/src/newgal/fbcon/fb3dfx.h b/src/newgal/fbcon/fb3dfx.h
index ac460c17..39d55eb7 100644
--- a/src/newgal/fbcon/fb3dfx.h
+++ b/src/newgal/fbcon/fb3dfx.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** 3Dfx hardware acceleration for the GAL framebuffer console driver
diff --git a/src/newgal/fbcon/fbmatrox.c b/src/newgal/fbcon/fbmatrox.c
index f38753af..83bbd60b 100644
--- a/src/newgal/fbcon/fbmatrox.c
+++ b/src/newgal/fbcon/fbmatrox.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
@@ -135,7 +135,7 @@ static int FillHWRect(_THIS, GAL_Surface *dst, GAL_Rect *rect, Uint32 color)
static int HWAccelBlit(GAL_Surface *src, GAL_Rect *srcrect,
GAL_Surface *dst, GAL_Rect *dstrect)
{
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *this = __mg_current_video;
int pitch, w, h;
int srcX, srcY;
int dstX, dstY;
diff --git a/src/newgal/fbcon/fbmatrox.h b/src/newgal/fbcon/fbmatrox.h
index 7a251916..64c43b97 100644
--- a/src/newgal/fbcon/fbmatrox.h
+++ b/src/newgal/fbcon/fbmatrox.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Matrox hardware acceleration for the GAL framebuffer console driver
diff --git a/src/newgal/fbcon/fbneomagic.c b/src/newgal/fbcon/fbneomagic.c
index 5447972b..3bc2d705 100644
--- a/src/newgal/fbcon/fbneomagic.c
+++ b/src/newgal/fbcon/fbneomagic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
@@ -152,7 +152,7 @@ static int FillHWRect(_THIS, GAL_Surface *dst, GAL_Rect *rect, Uint32 color)
static void HWAccelBlit_helper (GAL_Surface *src, GAL_Rect *srcrect,
GAL_Surface *dst, GAL_Rect *dstrect)
{
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *this = __mg_current_video;
Uint32 src_base;
Uint32 dst_base;
diff --git a/src/newgal/fbcon/fbneomagic.h b/src/newgal/fbcon/fbneomagic.h
index 29af2bab..7cdc7f7d 100644
--- a/src/newgal/fbcon/fbneomagic.h
+++ b/src/newgal/fbcon/fbneomagic.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Port from DirectFB by Wei Yongming.
diff --git a/src/newgal/fbcon/fbvideo.c b/src/newgal/fbcon/fbvideo.c
index da777a31..a05fa60b 100644
--- a/src/newgal/fbcon/fbvideo.c
+++ b/src/newgal/fbcon/fbvideo.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgal/fbcon/fbvideo.h b/src/newgal/fbcon/fbvideo.h
index 1605478f..d0c4140e 100644
--- a/src/newgal/fbcon/fbvideo.h
+++ b/src/newgal/fbcon/fbvideo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_fbvideo_h
diff --git a/src/newgal/fbcon/hi3560aInit/hi3560a_init.c b/src/newgal/fbcon/hi3560aInit/hi3560a_init.c
index 19872a96..fa03664b 100644
--- a/src/newgal/fbcon/hi3560aInit/hi3560a_init.c
+++ b/src/newgal/fbcon/hi3560aInit/hi3560a_init.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/newgal/fbcon/matrox_mmio.h b/src/newgal/fbcon/matrox_mmio.h
index 8447d287..4665e20a 100644
--- a/src/newgal/fbcon/matrox_mmio.h
+++ b/src/newgal/fbcon/matrox_mmio.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* MGA register definitions */
diff --git a/src/newgal/fbcon/matrox_regs.h b/src/newgal/fbcon/matrox_regs.h
index fb030501..fe1b6869 100644
--- a/src/newgal/fbcon/matrox_regs.h
+++ b/src/newgal/fbcon/matrox_regs.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* MGA Millennium (MGA2064W) functions
diff --git a/src/newgal/fbcon/neomagic_mmio.h b/src/newgal/fbcon/neomagic_mmio.h
index 45c580ad..3e1fc04f 100644
--- a/src/newgal/fbcon/neomagic_mmio.h
+++ b/src/newgal/fbcon/neomagic_mmio.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef __NEOMAGIC_MMIO_H__
diff --git a/src/newgal/fbcon/pci_smi.c b/src/newgal/fbcon/pci_smi.c
index 48bcab48..cfcb4126 100644
--- a/src/newgal/fbcon/pci_smi.c
+++ b/src/newgal/fbcon/pci_smi.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pci_smi.c: accelerated NEWGAL>FBCON driver for Silicon Motion graphics
diff --git a/src/newgal/fbcon/pci_smi.h b/src/newgal/fbcon/pci_smi.h
index 8dd5a98b..f7fbf7e4 100644
--- a/src/newgal/fbcon/pci_smi.h
+++ b/src/newgal/fbcon/pci_smi.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pci_smi.c: accelerated NEWGAL>FBCON driver for Silicon Motion graphics
diff --git a/src/newgal/fbcon/pciinfo.h b/src/newgal/fbcon/pciinfo.h
index 22fb263c..7799920d 100644
--- a/src/newgal/fbcon/pciinfo.h
+++ b/src/newgal/fbcon/pciinfo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgal/fbcon/pcivideo.c b/src/newgal/fbcon/pcivideo.c
index 020a0f35..002798a8 100644
--- a/src/newgal/fbcon/pcivideo.c
+++ b/src/newgal/fbcon/pcivideo.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pcivideo.c: PCIAccess based accelerated video driver implementation.
diff --git a/src/newgal/fbcon/pcivideo.h b/src/newgal/fbcon/pcivideo.h
index 1497c045..4f8e845e 100644
--- a/src/newgal/fbcon/pcivideo.h
+++ b/src/newgal/fbcon/pcivideo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_pcivideo_h
diff --git a/src/newgal/gamma.c b/src/newgal/gamma.c
index e4065f88..71073f86 100644
--- a/src/newgal/gamma.c
+++ b/src/newgal/gamma.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Gamma correction support */
@@ -115,8 +115,8 @@ static void CalculateGammaFromRamp(float *gamma, Uint16 *ramp)
int GAL_SetGamma(float red, float green, float blue)
{
int succeeded;
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
succeeded = -1;
#ifdef HAVE_MATH_H
@@ -145,8 +145,8 @@ int GAL_SetGamma(float red, float green, float blue)
int GAL_GetGamma(float *red, float *green, float *blue)
{
int succeeded;
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
succeeded = -1;
#ifdef HAVE_MATH_H
@@ -174,8 +174,8 @@ int GAL_GetGamma(float *red, float *green, float *blue)
int GAL_SetGammaRamp(Uint16 *red, Uint16 *green, Uint16 *blue)
{
int succeeded;
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
GAL_Surface *screen = GAL_PublicSurface;
/* Verify the screen parameter */
@@ -225,8 +225,8 @@ int GAL_SetGammaRamp(Uint16 *red, Uint16 *green, Uint16 *blue)
int GAL_GetGammaRamp(Uint16 *red, Uint16 *green, Uint16 *blue)
{
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
/* Lazily allocate the gamma table */
if ( ! video->gamma ) {
diff --git a/src/newgal/gdl/gdl_video.c b/src/newgal/gdl/gdl_video.c
index 3bb3d0f3..0b6df4f4 100644
--- a/src/newgal/gdl/gdl_video.c
+++ b/src/newgal/gdl/gdl_video.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** gdl_video.c: Intel GDL based video driver implementation.
diff --git a/src/newgal/gdl/gdl_video.h b/src/newgal/gdl/gdl_video.h
index 16fe7dd0..88de8417 100644
--- a/src/newgal/gdl/gdl_video.h
+++ b/src/newgal/gdl/gdl_video.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_GDL_h
diff --git a/src/newgal/hisi/gal_hi3560a.c b/src/newgal/hisi/gal_hi3560a.c
index 3e65133c..f1414bd6 100644
--- a/src/newgal/hisi/gal_hi3560a.c
+++ b/src/newgal/hisi/gal_hi3560a.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#define dbg() printf("%s %d\n", __FUNCTION__, __LINE__)
diff --git a/src/newgal/hisi/gal_hi3560a.h b/src/newgal/hisi/gal_hi3560a.h
index 44d88c36..fbae79d9 100644
--- a/src/newgal/hisi/gal_hi3560a.h
+++ b/src/newgal/hisi/gal_hi3560a.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: nullvideo.h 12768 2010-04-22 05:28:30Z wanzheng $
diff --git a/src/newgal/hisi/hi3510_fb.h b/src/newgal/hisi/hi3510_fb.h
index 6f1f4cf6..35c24927 100644
--- a/src/newgal/hisi/hi3510_fb.h
+++ b/src/newgal/hisi/hi3510_fb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: hi3510_fb.h 7268 2007-07-03 08:08:43Z xwyan $
diff --git a/src/newgal/hisi/hi3510_fbvideo.c b/src/newgal/hisi/hi3510_fbvideo.c
index fdf21841..5b5f843a 100644
--- a/src/newgal/hisi/hi3510_fbvideo.c
+++ b/src/newgal/hisi/hi3510_fbvideo.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: hi3510_fbvideo.c 10629 2008-08-07 03:45:43Z tangjianbin $
@@ -104,7 +104,7 @@ typedef struct tagfb_colorkey
#endif
extern BOOL mgIsServer;
-//extern GAL_VideoDevice* current_video;
+//extern GAL_VideoDevice* __mg_current_video;
#ifndef _MGRM_THREADS
struct private_hwdata
@@ -368,7 +368,7 @@ static int HI3510_HWAccelBlit(GAL_Surface *src, GAL_Rect *srcrect,
/*if dst is current video surface, should do antiflicker*/
#ifdef _MGRM_THREADS
if ((src == __gal_screen) && (src->flags & GAL_HWSURFACE)
- && (dst == current_video->screen))
+ && (dst == __mg_current_video->screen))
#else
if (mgIsServer && (src->flags & GAL_DOUBLEBUF)
&& (src->flags & GAL_HWSURFACE) && (dst == this->screen))
@@ -377,7 +377,7 @@ static int HI3510_HWAccelBlit(GAL_Surface *src, GAL_Rect *srcrect,
if ((TAP_MIN_VALUE <= tap_level) && (TAP_MAX_VALUE >= tap_level))
{
#ifdef _MGRM_THREADS
- if (0 == HI3510_AntiFlicker(current_video, src, srcrect, dst,
+ if (0 == HI3510_AntiFlicker(__mg_current_video, src, srcrect, dst,
dstrect, &uiOffsetX, &uiOffsetY))
#else
if (0 == HI3510_AntiFlicker(this, src, srcrect, dst, dstrect,
@@ -1705,7 +1705,7 @@ void* HI3510_MallocFromVram(int size)
size += sizeof(struct private_hwdata *);
request.h = (size+pitch-1)/pitch;
- HI3510_RequestHWSurface (current_video, &request, &reply);
+ HI3510_RequestHWSurface (__mg_current_video, &request, &reply);
if (reply.bucket == NULL)
{
@@ -1727,7 +1727,7 @@ void HI3510_FreeToVram(void* p)
request.bucket = *(char**)((char*)p - sizeof(struct private_hwdata *));
request.h = request.offset;
- HI3510_RequestHWSurface (current_video, &request, &reply);
+ HI3510_RequestHWSurface (__mg_current_video, &request, &reply);
}
#endif
@@ -1753,7 +1753,7 @@ static struct private_hwdata* HI3510_CreateHwData(_THIS, const vidmem_bucket* pB
int HI3510_ServerSetScreenAttr(Uint8 siAttr, void* pValue)
{
- return HI3510_SetScreenAttr(current_video, siAttr, pValue);
+ return HI3510_SetScreenAttr(__mg_current_video, siAttr, pValue);
}
@@ -1882,13 +1882,13 @@ VideoBootStrap HI3510_bootstrap = {
//Added by l56244 on 27,July 2006
int HI3510_GetVideoFD(void)
{
- GAL_VideoDevice* this = current_video;
+ GAL_VideoDevice* this = __mg_current_video;
return console_fd;
}
void* HI3510_GetMM_0(void)
{
- GAL_VideoDevice* this = current_video;
+ GAL_VideoDevice* this = __mg_current_video;
return mapped_mem;
}
diff --git a/src/newgal/hisi/hi3510_fbvideo.h b/src/newgal/hisi/hi3510_fbvideo.h
index f5b97c0e..e4c7ac9d 100644
--- a/src/newgal/hisi/hi3510_fbvideo.h
+++ b/src/newgal/hisi/hi3510_fbvideo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: hi3510_fbvideo.h 10629 2008-08-07 03:45:43Z tangjianbin $
diff --git a/src/newgal/hisi/hi3560_fb.h b/src/newgal/hisi/hi3560_fb.h
index 1faaee59..d212dde3 100644
--- a/src/newgal/hisi/hi3560_fb.h
+++ b/src/newgal/hisi/hi3560_fb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: hi3560_fb.h 11368 2009-03-05 09:50:30Z tangjianbin $
diff --git a/src/newgal/hisi/hi3560_fbvideo.c b/src/newgal/hisi/hi3560_fbvideo.c
index b531c144..f4bff1a8 100644
--- a/src/newgal/hisi/hi3560_fbvideo.c
+++ b/src/newgal/hisi/hi3560_fbvideo.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: hi3560_fbvideo.c 12360 2009-12-16 09:56:03Z dongkai $
@@ -138,7 +138,7 @@ typedef enum {
//extern BOOL mgIsServer;
-extern GAL_VideoDevice* current_video;
+extern GAL_VideoDevice* __mg_current_video;
#ifndef _MGRM_THREADS
struct private_hwdata
@@ -523,7 +523,7 @@ HI_U8* Hi3560_GetPhyAddr(HI_VOID* pvirtaddr)
{
HI_U32 offset;
- GAL_VideoDevice *this =current_video;
+ GAL_VideoDevice *this =__mg_current_video;
offset =(HI_U32)pvirtaddr - (HI_U32)mapped_mem;
return (HI_U8 *)saved_finfo.smem_start + offset;
@@ -561,7 +561,7 @@ static int HI3560_HWAccelBlit(GAL_Surface *gal_src, GAL_Rect *psrcrect,
HI_S32 ret;
GAL_Rect srcrect,dstrect;
- GAL_VideoDevice* this = current_video;
+ GAL_VideoDevice* this = __mg_current_video;
TDE_HANDLE tdehandle;
psrcsurface =&srcsurface;
@@ -1660,7 +1660,7 @@ void* HI3560_MallocFromVram(int size)
size += sizeof(struct private_hwdata *);
request.h = (size+pitch-1)/pitch;
- HI3560_RequestHWSurface (current_video, &request, &reply);
+ HI3560_RequestHWSurface (__mg_current_video, &request, &reply);
if (reply.bucket == NULL)
{
@@ -1681,7 +1681,7 @@ void HI3560_FreeToVram(void* p)
request.bucket = *(char**)((char*)p - sizeof(struct private_hwdata *));
request.h = request.offset;
- HI3560_RequestHWSurface (current_video, &request, &reply);
+ HI3560_RequestHWSurface (__mg_current_video, &request, &reply);
}
#endif
@@ -1872,19 +1872,19 @@ VideoBootStrap HI3560_bootstrap = {
/* some APIs specific to this engine */
int hi3560GetVideoFD (void)
{
- GAL_VideoDevice* this = current_video;
+ GAL_VideoDevice* this = __mg_current_video;
return console_fd;
}
void* hi3560GetFBAddress (void)
{
- GAL_VideoDevice* this = current_video;
+ GAL_VideoDevice* this = __mg_current_video;
return mapped_mem;
}
int hi3560SetScreenAttr (Uint8 siAttr, void* pValue)
{
- return HI3560_SetLayerAttr (current_video, siAttr, pValue);
+ return HI3560_SetLayerAttr (__mg_current_video, siAttr, pValue);
}
#endif /* _MGGAL_HI3560 */
diff --git a/src/newgal/hisi/hi3560_fbvideo.c1124 b/src/newgal/hisi/hi3560_fbvideo.c1124
index 74939689..a476c0f8 100644
--- a/src/newgal/hisi/hi3560_fbvideo.c1124
+++ b/src/newgal/hisi/hi3560_fbvideo.c1124
@@ -85,7 +85,7 @@ typedef enum {
}HI_GC_PIXEL_FMT;
extern BOOL mgIsServer;
-extern GAL_VideoDevice* current_video;
+extern GAL_VideoDevice* __mg_current_video;
#ifndef _MGRM_THREADS
struct private_hwdata
@@ -423,7 +423,7 @@ static int HI3560_HWAccelBlit(GAL_Surface *src, GAL_Rect *srcrect,
/*if dst is current video surface, should do antiflicker*/
#ifdef _MGRM_THREADS
if ((src == __gal_screen) && (src->flags & GAL_HWSURFACE)
- && (dst == current_video->screen))
+ && (dst == __mg_current_video->screen))
#else
if (mgIsServer && (src->flags & GAL_DOUBLEBUF)
&& (src->flags & GAL_HWSURFACE) && (dst == this->screen))
@@ -433,7 +433,7 @@ static int HI3560_HWAccelBlit(GAL_Surface *src, GAL_Rect *srcrect,
if ((TAP_MIN_VALUE <= tap_level) && (TAP_MAX_VALUE >= tap_level))
{
#ifdef _MGRM_THREADS
- if (0 == HI3560_AntiFlicker(current_video, src, srcrect, dst,
+ if (0 == HI3560_AntiFlicker(__mg_current_video, src, srcrect, dst,
dstrect, &uiOffsetX, &uiOffsetY))
#else
if (0 == HI3560_AntiFlicker(this, src, srcrect, dst, dstrect,
@@ -1869,7 +1869,7 @@ void* HI3560_MallocFromVram(int size)
size += sizeof(struct private_hwdata *);
request.h = (size+pitch-1)/pitch;
- HI3560_RequestHWSurface (current_video, &request, &reply);
+ HI3560_RequestHWSurface (__mg_current_video, &request, &reply);
if (reply.bucket == NULL)
{
@@ -1891,7 +1891,7 @@ void HI3560_FreeToVram(void* p)
request.bucket = *(char**)((char*)p - sizeof(struct private_hwdata *));
request.h = request.offset;
- HI3560_RequestHWSurface (current_video, &request, &reply);
+ HI3560_RequestHWSurface (__mg_current_video, &request, &reply);
}
#endif
@@ -2112,13 +2112,13 @@ VideoBootStrap HI3560_bootstrap = {
//Added by l56244 on 27,July 2006
int HI3560_GetVideoFD(void)
{
- GAL_VideoDevice* this = current_video;
+ GAL_VideoDevice* this = __mg_current_video;
return console_fd;
}
void* HI3560_GetMM_0(void)
{
- GAL_VideoDevice* this = current_video;
+ GAL_VideoDevice* this = __mg_current_video;
return mapped_mem;
}
diff --git a/src/newgal/hisi/hi3560_fbvideo.h b/src/newgal/hisi/hi3560_fbvideo.h
index d2ef21c3..922305a3 100644
--- a/src/newgal/hisi/hi3560_fbvideo.h
+++ b/src/newgal/hisi/hi3560_fbvideo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: hi3560_fbvideo.h 12360 2009-12-16 09:56:03Z dongkai $
diff --git a/src/newgal/hisi/hi_tde.h b/src/newgal/hisi/hi_tde.h
index 96019333..e593f4c6 100644
--- a/src/newgal/hisi/hi_tde.h
+++ b/src/newgal/hisi/hi_tde.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: hi_tde.h 7268 2007-07-03 08:08:43Z xwyan $
diff --git a/src/newgal/hisi/pix_array.c b/src/newgal/hisi/pix_array.c
index f11227a7..db634aed 100644
--- a/src/newgal/hisi/pix_array.c
+++ b/src/newgal/hisi/pix_array.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
static unsigned short pix_array[] = {0xffff,0xfffe,0xfffb,0xfff6,0xffef,0xffe6,0xffdb,0xffce,0xffbf,0xffae,0xff9b,0xff86,0xff6f,0xff56,0xff3b,0xff1e,0xf6ff,0xfede,0xfebb,0xfe96,0xfe6f,0xfe46,0xfe1b,0xfdee,0xfdbf,0xfd8e,0xfd5b,0xfd26,0xfcef,0xfcb6,0xfc7b,0xfc3e,0xfbff,0xfbbe,0xfb7b,0xf336,0xfaef,0xfaa6,0xfa5b,0xfa0e,0xf9bf,0xf96e,0xf91b,0xf8c6,0xf86f,0xf816,0xf7bb,0xf75e,0xf6ff,0xf69e,0xf63b,0xf5d6,0xf56f,0xf506,0xf49b,0xf42e,0xf3bf,0xf34e,0xf2db,0xf266,0xf1ef,0xf176,0xf0fb,0xf07e,0xefff,0xef7e,0xeefb,0xee76,0xedef,0xed66,0xecdb,0xec4e,0xebbf,0xeb2e,0xea9b,0xea06,0xe96f,0xe8d6,0xe83b,0xe79e,0xe6ff,0xe65e,0xe5bb,0xe516,0xe46f,0xe3c6,0xe31b,0xe26e,0xe1bf,0xe10e,0xe05b,0xdfa6,0xdeef,0xde36,0xdd7b,0xdcbe,0xdbff,0xdb3e,0xda7b,0xd9b6,0xd8ef,0xd826,0xd75b,0xd68e,0xd5bf,0xd4ee,0xd41b,0xd346,0xd26f,0xd196,0xd0bb,0xcfde,0xceff,0xce1e,0xcd3b,0xcc56,0xcb6f,0xca86,0xc99b,0xc8ae,0xc7bf,0xc6ce,0xc5db,0xc4e6,0xc3ef,0xc2f6,0xc1fb,0xc0fe,0xbfff,0xbefe,0xbdfb,0xbcf6,0xbbef,0xbae6,0xb9db,0xb8ce,0xb7bf,0xb6ae,0xb59b,0xb486,0xb36f,0xb256,0xb13b,0xb01e,0xaeff,0xadde,0xacbb,0xab96,0xaa6f,0xa946,0xa81b,0xa6ee,0xa5bf,0xa48e,0xa35b,0xa226,0xa0ef,0x9fb6,0x9e7b,0x9d3e,0x9bff,0x9abe,0x997b,0x9836,0x96ef,0x95a6,0x945b,0x930e,0x91bf,0x906e,0x8f1b,0x8dc6,0x8c6f,0x8b16,0x89bb,0x885e,0x86ff,0x859e,0x843b,0x82d6,0x816f,0x8006,0x7e9b,0x7d2e,0x7bbf,0x7a4e,0x78db,0x7766,0x75ef,0x7476,0x72fb,0x717e,0x6fff,0x6e7e,0x6cfb,0x6b76,0x69ef,0x6866,0xfffe,0xfffd,0xfffa,0xfff5,0xffee,0xffe5,0xffda,0xffcd,0xffbe,0xffad,0xff9a,0xff85,0xff6e,0xff55,0xff3a,0xff1d,0xfefe,0xfedd,0xfeba,0xfe95,0xfe6e,0xfe45,0xfe1a,0xfded,0xfdbe,0xfd8d,0xfd5a,0xfd25,0xfcee,0xfcb5,0xfc7a,0xfc3d,0xfbfe,0xfbbd,0xfb7a,0xfb35,0xfaee,0xfaa5,0xfa5a,0xfa0d,0xf9be,0xf96d,0xf91a,0xf8c5,0xf86e,0xf815,0xf7ba,0xf75d,0xf6fe,0xf69d,0xf63a,0xf5d5,0xf56e,0xf505,0xf49a,0xf42d,0xf3be,0xf34d,0xf2da,0xf265,0xf1ee,0xf175,0xf0fa,0xf07d,0xeffe,0xef7d,0xeefa,0xee75,0xedee,0xed65,0xecda,0xec4d,0xebbe,0xeb2d,0xea9a,0xea05,0xe96e,0xe8d5,0xe83a,0xe79d,0xe6fe,0xe65d,0xe5ba,0xe515,0xe46e,0xe3c5,0xe31a,0xe26d,0xe1be,0xe10d,0xe05a,0xdfa5,0xdeee,0xde35,0xdd7a,0xdcbd,0xdbfe,0xdb3d,0xda7a,0xd9b5,0xd8ee,0xd825,0xd75a,0xd68d,0xd5be,0xd4ed,0xd41a,0xd345,0xd26e,0xd195,0xd0ba,0xcfdd,0xcefe,0xce1d,0xcd3a,0xcc55,0xcb6e,0xca85,0xc99a,0xc8ad,0xc7be,0xc6cd,0xc5da,0xc4e5,0xc3ee,0xc2f5,0xc1fa,0xc0fd,0xbffe,0xbefd,0xbdfa,0xbcf5,0xbbee,0xbae5,0xb9da,0xb8cd,0xb7be,0xb6ad,0xb59a,0xb485,0xb36e,0xb255,0xb13a,0xb01d,0xaefe,0xaddd,0xacba,0xab95,0xaa6e,0xa945,0xa81a,0xa6ed,0xa5be,0xa48d,0xa35a,0xa225,0xa0ee,0x9fb5,0x9e7a,0x9d3d,0x9bfe,0x9abd,0x997a,0x9835,0x96ee,0x95a5,0x945a,0x930d,0x91be,0x906d,0x8f1a,0x8dc5,0x8c6e,0x8b15,0x89ba,0x885d,0x86fe,0x859d,0x843a,0x82d5,0x816e,0x8005,0x7e9a,0x7d2d,0x7bbe,0x7a4d,0x78da,0x7765,0x75ee,0x7475,0x72fa,0x717d,0x6ffe,0x6e7d,0x6cfa,0x6b75,0x69ee,0x6865,0xfffd,0xfffc,0xfff9,0xfff4,0xffed,0xffe4,0xffd9,0xffcc,0xffbd,0xffac,0xff99,0xff84,0xff6d,0xff54,0xff39,0xff1c,0xfefd,0xfedc,0xfeb9,0xfe94,0xfe6d,0xfe44,0xfe19,0xfdec,0xfdbd,0xfd8c,0xfd59,0xfd24,0xfced,0xfcb4,0xfc79,0xfc3c,0xfbfd,0xfbbc,0xfb79,0xfb34,0xfaed,0xfaa4,0xfa59,0xfa0c,0xf9bd,0xf96c,0xf919,0xf8c4,0xf86d,0xf814,0xf7b9,0xf75c,0xf6fd,0xf69c,0xf639,0xf5d4,0xf56d,0xf504,0xf499,0xf42c,0xf3bd,0xf34c,0xf2d9,0xf264,0xf1ed,0xf174,0xf0f9,0xf07c,0xeffd,0xef7c,0xeef9,0xee74,0xeded,0xed64,0xecd9,0xec4c,0xebbd,0xeb2c,0xea99,0xea04,0xe96d,0xe8d4,0xe839,0xe79c,0xe6fd,0xe65c,0xe5b9,0xe514,0xe46d,0xe3c4,0xe319,0xe26c,0xe1bd,0xe10c,0xe059,0xdfa4,0xdeed,0xde34,0xdd79,0xdcbc,0xdbfd,0xdb3c,0xda79,0xd9b4,0xd8ed,0xd824,0xd759,0xd68c,0xd5bd,0xd4ec,0xd419,0xd344,0xd26d,0xd194,0xd0b9,0xcfdc,0xcefd,0xce1c,0xcd39,0xcc54,0xcb6d,0xca84,0xc999,0xc8ac,0xc7bd,0xc6cc,0xc5d9,0xc4e4,0xc3ed,0xc2f4,0xc1f9,0xc0fc,0xbffd,0xbefc,0xbdf9,0xbcf4,0xbbed,0xbae4,0xb9d9,0xb8cc,0xb7bd,0xb6ac,0xb599,0xb484,0xb36d,0xb254,0xb139,0xb01c,0xaefd,0xaddc,0xacb9,0xab94,0xaa6d,0xa944,0xa819,0xa6ec,0xa5bd,0xa48c,0xa359,0xa224,0xa0ed,0x9fb4,0x9e79,0x9d3c,0x9bfd,0x9abc,0x9979,0x9834,0x96ed,0x95a4,0x9459,0x930c,0x91bd,0x906c,0x8f19,0x8dc4,0x8c6d,0x8b14,0x89b9,0x885c,0x86fd,0x859c,0x8439,0x82d4,0x816d,0x8004,0x7e99,0x7d2c,
0x7bbd,0x7a4c,0x78d9,0x7764,0x75ed,0x7474,0x72f9,0x717c,0x6ffd,0x6e7c,0x6cf9,0x6b74,0x69ed,0x6864,0xfffc,0xfffb,0xfff8,0xfff3,0xffec,0xffe3,0xffd8,0xffcb,0xffbc,0xffab,0xff98,0xff83,0xff6c,0xff53,0xff38,0xff1b,0xfefc,0xfedb,0xfeb8,0xfe93,0xfe6c,0xfe43,0xf618,0xfdeb,0xfdbc,0xfd8b,0xfd58,0xfd23,0xfcec,0xfcb3,0xfc78,0xfc3b,0xfbfc,0xfbbb,0xfb78,0xfb33,0xf2ec,0xfaa3,0xfa58,0xfa0b,0xf9bc,0xf96b,0xf918,0xf8c3,0xf86c,0xf813,0xf7b8,0xf75b,0xf6fc,0xf69b,0xf638,0xf5d3,0xf56c,0xf503,0xf498,0xf42b,0xf3bc,0xf34b,0xf2d8,0xf263,0xf1ec,0xf173,0xf0f8,0xf07b,0xeffc,0xef7b,0xeef8,0xee73,0xedec,0xed63,0xecd8,0xec4b,0xebbc,0xeb2b,0xea98,0xea03,0xe96c,0xe8d3,0xe838,0xe79b,0xe6fc,0xe65b,0xe5b8,0xe513,0xe46c,0xe3c3,0xe318,0xe26b,0xe1bc,0xe10b,0xe058,0xdfa3,0xdeec,0xde33,0xdd78,0xdcbb,0xdbfc,0xdb3b,0xda78,0xd9b3,0xd8ec,0xd823,0xd758,0xd68b,0xd5bc,0xd4eb,0xd418,0xd343,0xd26c,0xd193,0xd0b8,0xcfdb,0xcefc,0xce1b,0xcd38,0xcc53,0xcb6c,0xca83,0xc998,0xc8ab,0xc7bc,0xc6cb,0xc5d8,0xc4e3,0xc3ec,0xc2f3,0xc1f8,0xc0fb,0xbffc,0xbefb,0xbdf8,0xbcf3,0xbbec,0xbae3,0xb9d8,0xb8cb,0xb7bc,0xb6ab,0xb598,0xb483,0xb36c,0xb253,0xb138,0xb01b,0xaefc,0xaddb,0xacb8,0xab93,0xaa6c,0xa943,0xa818,0xa6eb,0xa5bc,0xa48b,0xa358,0xa223,0xa0ec,0x9fb3,0x9e78,0x9d3b,0x9bfc,0x9abb,0x9978,0x9833,0x96ec,0x95a3,0x9458,0x930b,0x91bc,0x906b,0x8f18,0x8dc3,0x8c6c,0x8b13,0x89b8,0x885b,0x86fc,0x859b,0x8438,0x82d3,0x816c,0x8003,0x7e98,0x7d2b,0x7bbc,0x7a4b,0x78d8,0x7763,0x75ec,0x7473,0x72f8,0x717b,0x6ffc,0x6e7b,0x6cf8,0x6b73,0x69ec,0x6863,0xfffb,0xfffa,0xfff7,0xfff2,0xffeb,0xffe2,0xffd7,0xffca,0xffbb,0xffaa,0xff97,0xff82,0xff6b,0xff52,0xff37,0xff1a,0xfefb,0xfeda,0xfeb7,0xfe92,0xfe6b,0xfe42,0xfe17,0xfdea,0xfdbb,0xfd8a,0xfd57,0xfd22,0xfceb,0xfcb2,0xfc77,0xfc3a,0xfbfb,0xf3ba,0xfb77,0xfb32,0xfaeb,0xfaa2,0xfa55,0xfa08,0xf9bb,0xf96a,0xf917,0xf8c2,0xf86b,0xf812,0xf7b7,0xf75a,0xf6fb,0xf69a,0xf637,0xf5d2,0xf56b,0xf502,0xf497,0xf42a,0xf3bb,0xf34a,0xf2d7,0xf262,0xf1eb,0xf172,0xf0f7,0xf07a,0xeffb,0xef7a,0xeef7,0xee72,0xedeb,0xed62,0xecd7,0xec4a,0xebbb,0xeb2a,0xea97,0xea02,0xe96b,0xe8d2,0xe837,0xe79a,0xe6fb,0xe65a,0xe5b7,0xe512,0xe46b,0xe3c2,0xe317,0xe26a,0xe1bb,0xe10a,0xe057,0xdfa2,0xdeeb,0xde32,0xdd77,0xdcba,0xdbfb,0xdb3a,0xda77,0xd9b2,0xd8eb,0xd822,0xd757,0xd68a,0xd5bb,0xd4ea,0xd417,0xd342,0xd26b,0xd192,0xd0b7,0xcfda,0xcefb,0xce1a,0xcd37,0xcc52,0xcb6b,0xca82,0xc997,0xc8aa,0xc7bb,0xc6ca,0xc5d7,0xc4e2,0xc3eb,0xc2f2,0xc1f7,0xc0fa,0xbffb,0xbefa,0xbdf7,0xbcf2,0xbbeb,0xbae2,0xb9d7,0xb8ca,0xb7bb,0xb6aa,0xb597,0xb482,0xb36b,0xb252,0xb137,0xb01a,0xaefb,0xadda,0xacb7,0xab92,0xaa6b,0xa942,0xa817,0xa6ea,0xa5bb,0xa48a,0xa357,0xa222,0xa0eb,0x9fb2,0x9e77,0x9d3a,0x9bfb,0x9aba,0x9977,0x9832,0x96eb,0x95a2,0x9457,0x930a,0x91bb,0x906a,0x8f17,0x8dc2,0x8c6b,0x8b12,0x89b7,0x885a,0x86fb,0x859a,0x8437,0x82d2,0x816b,0x8002,0x7e97,0x7d2a,0x7bbb,0x7a4a,0x78d7,0x7762,0x75eb,0x7472,0x72f7,0x717a,0x6ffb,0x6e7a,0x6cf7,0x6b72,0x69eb,0x6862,0xfffa,0xfff9,0xfff6,0xfff1,0xffea,0xffe1,0xffd6,0xffc9,0xffba,0xffa9,0xff96,0xff81,0xff6a,0xff51,0xff36,0xff19,0xeefa,0xfed9,0xfeb4,0xf691,0xfe6a,0xfec1,0xfe54,0xf5eb,0xf5ba,0xf58b,0xfd56,0xfd21,0xfcea,0xfcb1,0xf434,0xfc39,0xf3fa,0xebb9,0xf376,0xfb71,0xf2ea,0xf2a1,0xfa16,0xf209,0xf9ba,0xf969,0xf916,0xf8c1,0xf86a,0xf811,0xf7b6,0xf759,0xf6fa,0xf699,0xf636,0xf5d1,0xf56a,0xf501,0xf496,0xf429,0xf3ba,0xf349,0xf2d6,0xf261,0xf1ea,0xf171,0xf0f6,0xf079,0xeffa,0xef79,0xeef6,0xee71,0xedea,0xed61,0xecd6,0xec49,0xebba,0xeb29,0xea96,0xea01,0xe96a,0xe8d1,0xe836,0xe799,0xe6fa,0xe659,0xe5b6,0xe511,0xe46a,0xe3c1,0xe316,0xe269,0xe1ba,0xe109,0xe056,0xdfa1,0xdeea,0xde31,0xdd76,0xdcb9,0xdbfa,0xdb39,0xda76,0xd9b1,0xd8ea,0xd821,0xd756,0xd689,0xd5ba,0xd4e9,0xd416,0xd341,0xd26a,0xd191,0xd0b6,0xcfd9,0xcefa,0xce19,0xcd36,0xcc51,0xcb6a,0xca81,0xc996,0xc8a9,0xc7ba,0xc6c9,0xc5d6,0xc4e1,0xc3ea,0xc2f1,0xc1f6,0xc0f9,0xbffa,0xbef9,0xbdf6,0xbcf1,0xbbea,0xbae1,0xb9d6,0xb8c9,0xb7ba,0xb6a9,0xb596,0xb481,0xb36a,0xb251,0xb136,0xb019,0xaefa,0xadd9,0xacb6,0xab91,0xaa6a,0xa941,0xa816,0xa6e9,0xa5ba,0xa489,0xa356,0xa221,0xa0ea,0x9fb1,0x9e76,0x9d39,0x9bfa,0x9ab9,0x9976,0x9831,0x96ea,0x95a1,0x9456,0x9309,0x91ba,0x9069,0x8f16,0x8dc1,0x8c6a,0x8b11,
diff --git a/src/newgal/hisi/tde.c b/src/newgal/hisi/tde.c
index 498837a0..d355b8df 100644
--- a/src/newgal/hisi/tde.c
+++ b/src/newgal/hisi/tde.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: tde.c 7268 2007-07-03 08:08:43Z xwyan $
diff --git a/src/newgal/hisi/tde_reg.h b/src/newgal/hisi/tde_reg.h
index ebe27d8a..c2c88f5f 100644
--- a/src/newgal/hisi/tde_reg.h
+++ b/src/newgal/hisi/tde_reg.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: tde_reg.h 7268 2007-07-03 08:08:43Z xwyan $
diff --git a/src/newgal/leaks.h b/src/newgal/leaks.h
index 6632905a..c5d6d875 100644
--- a/src/newgal/leaks.h
+++ b/src/newgal/leaks.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Define this if you want surface leak detection code enabled */
diff --git a/src/newgal/mb93493/mb93493video.c b/src/newgal/mb93493/mb93493video.c
index 762e82a8..bb94c630 100644
--- a/src/newgal/mb93493/mb93493video.c
+++ b/src/newgal/mb93493/mb93493video.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: mb93493video.c 8944 2007-12-29 08:29:16Z xwyan $
@@ -528,6 +528,6 @@ void mb93493_resume_spi (void)
return;
is_suspend = FALSE;
UNBLOCK_ALARM
- MB93493_UpdateRects (current_video, 1, &standard_mode);
+ MB93493_UpdateRects (__mg_current_video, 1, &standard_mode);
}
diff --git a/src/newgal/mb93493/mb93493video.h b/src/newgal/mb93493/mb93493video.h
index 2a77640a..58d22766 100644
--- a/src/newgal/mb93493/mb93493video.h
+++ b/src/newgal/mb93493/mb93493video.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: mb93493video.h 7353 2007-08-16 04:58:32Z xgwang $
diff --git a/src/newgal/mb93493/vdc_init.c b/src/newgal/mb93493/vdc_init.c
index ca097c09..0e3a86be 100644
--- a/src/newgal/mb93493/vdc_init.c
+++ b/src/newgal/mb93493/vdc_init.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: vdc_init.c 7353 2007-08-16 04:58:32Z xgwang $
diff --git a/src/newgal/mb93493/vdc_init.h b/src/newgal/mb93493/vdc_init.h
index af3fc16d..c9a09c08 100644
--- a/src/newgal/mb93493/vdc_init.h
+++ b/src/newgal/mb93493/vdc_init.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef __VDC_INIT_H__
#define __VDC_INIT_H__
diff --git a/src/newgal/mlshadow/mlshadow-proc.c b/src/newgal/mlshadow/mlshadow-proc.c
index 7c6c5f11..677fd41c 100644
--- a/src/newgal/mlshadow/mlshadow-proc.c
+++ b/src/newgal/mlshadow/mlshadow-proc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mlshadow.c: Multi-Layer MLShadow NEWGAL video driver.
diff --git a/src/newgal/mlshadow/mlshadow-proc.h b/src/newgal/mlshadow/mlshadow-proc.h
index f2f6d70d..c832eb99 100644
--- a/src/newgal/mlshadow/mlshadow-proc.h
+++ b/src/newgal/mlshadow/mlshadow-proc.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_MLSHADOW_H
diff --git a/src/newgal/mlshadow/mlshadow-ths.c b/src/newgal/mlshadow/mlshadow-ths.c
index 8098bf7a..c0784617 100644
--- a/src/newgal/mlshadow/mlshadow-ths.c
+++ b/src/newgal/mlshadow/mlshadow-ths.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mlshadow.c: Multi-Layer Shadow NEWGAL video driver.
diff --git a/src/newgal/mlshadow/mlshadow-ths.h b/src/newgal/mlshadow/mlshadow-ths.h
index e59eed9c..fa7153de 100644
--- a/src/newgal/mlshadow/mlshadow-ths.h
+++ b/src/newgal/mlshadow/mlshadow-ths.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_MLSHADOW_H
diff --git a/src/newgal/mlshadow/test/mlshadowtest_left.c b/src/newgal/mlshadow/test/mlshadowtest_left.c
index 5370fb3d..e7065e95 100644
--- a/src/newgal/mlshadow/test/mlshadowtest_left.c
+++ b/src/newgal/mlshadow/test/mlshadowtest_left.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/mlshadow/test/mlshadowtest_right.c b/src/newgal/mlshadow/test/mlshadowtest_right.c
index 1643489f..fbc46ee2 100644
--- a/src/newgal/mlshadow/test/mlshadowtest_right.c
+++ b/src/newgal/mlshadow/test/mlshadowtest_right.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/mlshadow/test/window_mini_max.c b/src/newgal/mlshadow/test/window_mini_max.c
index fd7830f6..766d6e4e 100644
--- a/src/newgal/mlshadow/test/window_mini_max.c
+++ b/src/newgal/mlshadow/test/window_mini_max.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/mstar/mstar_video.c b/src/newgal/mstar/mstar_video.c
index b8e162e1..d86dd368 100644
--- a/src/newgal/mstar/mstar_video.c
+++ b/src/newgal/mstar/mstar_video.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/newgal/mstar/mstar_video.h b/src/newgal/mstar/mstar_video.h
index 2332aae3..1869f1f3 100644
--- a/src/newgal/mstar/mstar_video.h
+++ b/src/newgal/mstar/mstar_video.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_MStar_video_h
#define _GAL_MStar_video_h
diff --git a/src/newgal/newgal.c b/src/newgal/newgal.c
index fb283680..307a4ed1 100644
--- a/src/newgal/newgal.c
+++ b/src/newgal/newgal.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** The New Graphics Abstract Layer of MiniGUI.
diff --git a/src/newgal/nexus/nexusvideo.c b/src/newgal/nexus/nexusvideo.c
index bb3738f7..26fedf25 100644
--- a/src/newgal/nexus/nexusvideo.c
+++ b/src/newgal/nexus/nexusvideo.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/newgal/nexus/nexusvideo.h b/src/newgal/nexus/nexusvideo.h
index 508c42aa..333f766e 100644
--- a/src/newgal/nexus/nexusvideo.h
+++ b/src/newgal/nexus/nexusvideo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgal/nexus/nexusvideo_pri.c b/src/newgal/nexus/nexusvideo_pri.c
index 4d859e83..ba655c53 100644
--- a/src/newgal/nexus/nexusvideo_pri.c
+++ b/src/newgal/nexus/nexusvideo_pri.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
#include "minigui.h"
diff --git a/src/newgal/nexus/nexusvideo_pri.h b/src/newgal/nexus/nexusvideo_pri.h
index d7bc7879..e72e8ee2 100644
--- a/src/newgal/nexus/nexusvideo_pri.h
+++ b/src/newgal/nexus/nexusvideo_pri.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgal/pcxvfb/pcxvfb-winfb.c b/src/newgal/pcxvfb/pcxvfb-winfb.c
index 5dc15c95..12580bae 100644
--- a/src/newgal/pcxvfb/pcxvfb-winfb.c
+++ b/src/newgal/pcxvfb/pcxvfb-winfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/**
** pcxvfb-winfb.c: win32 virtual fb implementation and ipc operations
diff --git a/src/newgal/pcxvfb/pcxvfb-winfb.h b/src/newgal/pcxvfb/pcxvfb-winfb.h
index 2db32e8c..46b9b685 100644
--- a/src/newgal/pcxvfb/pcxvfb-winfb.h
+++ b/src/newgal/pcxvfb/pcxvfb-winfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/**
** pcxvfb-winfb.h: win32 virtual fb implementation and ipc operations
diff --git a/src/newgal/pcxvfb/pcxvfb.c b/src/newgal/pcxvfb/pcxvfb.c
index ba34ad39..e4208f8c 100644
--- a/src/newgal/pcxvfb/pcxvfb.c
+++ b/src/newgal/pcxvfb/pcxvfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/**
** pcxvfb.c: PC X virtual FrameBuffer based video driver implementation.
diff --git a/src/newgal/pcxvfb/pcxvfb.h b/src/newgal/pcxvfb/pcxvfb.h
index fb092423..fe15e0ce 100644
--- a/src/newgal/pcxvfb/pcxvfb.h
+++ b/src/newgal/pcxvfb/pcxvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_pcxvfb_h
diff --git a/src/newgal/pixels.c b/src/newgal/pixels.c
index 409b8ea4..42d89f7c 100644
--- a/src/newgal/pixels.c
+++ b/src/newgal/pixels.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* General (mostly internal) pixel/color manipulation routines for GAL */
diff --git a/src/newgal/pixels_c.h b/src/newgal/pixels_c.h
index 2e19a8c5..12ff2a3e 100644
--- a/src/newgal/pixels_c.h
+++ b/src/newgal/pixels_c.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Useful functions and variables from pixel.c */
diff --git a/src/newgal/qvfb/qvfb.c b/src/newgal/qvfb/qvfb.c
index 95e0c06c..61822e73 100644
--- a/src/newgal/qvfb/qvfb.c
+++ b/src/newgal/qvfb/qvfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** qvfb.c: Qt virtual FrameBuffer based video driver implementation.
diff --git a/src/newgal/qvfb/qvfb.h b/src/newgal/qvfb/qvfb.h
index 9419e7eb..30ae08e8 100644
--- a/src/newgal/qvfb/qvfb.h
+++ b/src/newgal/qvfb/qvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_qvfb_h
diff --git a/src/newgal/rtos_xvfb/rtos_xvfb.c b/src/newgal/rtos_xvfb/rtos_xvfb.c
index 10a125b2..807d4212 100644
--- a/src/newgal/rtos_xvfb/rtos_xvfb.c
+++ b/src/newgal/rtos_xvfb/rtos_xvfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** rtos_xvfb.c: RTOS X virtual FrameBuffer based video driver implementation.
diff --git a/src/newgal/rtos_xvfb/rtos_xvfb.h b/src/newgal/rtos_xvfb/rtos_xvfb.h
index e1a6b1e6..9c5aed2b 100644
--- a/src/newgal/rtos_xvfb/rtos_xvfb.h
+++ b/src/newgal/rtos_xvfb/rtos_xvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** rtos_xvfb.h: RTOS X virtual FrameBuffer head file.
diff --git a/src/newgal/rtos_xvfb/test/hello.c b/src/newgal/rtos_xvfb/test/hello.c
index cf6d46b2..02b71fcd 100644
--- a/src/newgal/rtos_xvfb/test/hello.c
+++ b/src/newgal/rtos_xvfb/test/hello.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/rtos_xvfb/test/xvfb.c b/src/newgal/rtos_xvfb/test/xvfb.c
index ba867e3b..e2c5210d 100644
--- a/src/newgal/rtos_xvfb/test/xvfb.c
+++ b/src/newgal/rtos_xvfb/test/xvfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* Todo:
diff --git a/src/newgal/rtos_xvfb/test/xvfb.h b/src/newgal/rtos_xvfb/test/xvfb.h
index 9e2f4431..516e9847 100644
--- a/src/newgal/rtos_xvfb/test/xvfb.h
+++ b/src/newgal/rtos_xvfb/test/xvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef XVFB_H
diff --git a/src/newgal/s3c6410/gal-s3c6410.c b/src/newgal/s3c6410/gal-s3c6410.c
index 6486fb15..6cbb08ea 100644
--- a/src/newgal/s3c6410/gal-s3c6410.c
+++ b/src/newgal/s3c6410/gal-s3c6410.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/s3c6410/gal-s3c6410.h b/src/newgal/s3c6410/gal-s3c6410.h
index 0f1f4b8e..0f525be2 100644
--- a/src/newgal/s3c6410/gal-s3c6410.h
+++ b/src/newgal/s3c6410/gal-s3c6410.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_s3c6410video_h
diff --git a/src/newgal/shadow/ecos_generic.c b/src/newgal/shadow/ecos_generic.c
index b196dff2..9e46ea3b 100644
--- a/src/newgal/shadow/ecos_generic.c
+++ b/src/newgal/shadow/ecos_generic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** ecos_generic.c: A subdriver of Shadow NEWGAL engine for eCos.
diff --git a/src/newgal/shadow/nucleus_monaco.c b/src/newgal/shadow/nucleus_monaco.c
index 46cb0fcc..10d5b774 100644
--- a/src/newgal/shadow/nucleus_monaco.c
+++ b/src/newgal/shadow/nucleus_monaco.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** nucleus_monaco.c: A subdriver of shadow NEWGAL engine for Nucleus on Monaco.
diff --git a/src/newgal/shadow/shadow.c b/src/newgal/shadow/shadow.c
index 5b640f04..e40dc487 100644
--- a/src/newgal/shadow/shadow.c
+++ b/src/newgal/shadow/shadow.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** shadow.c: Shadow NEWGAL video driver.
diff --git a/src/newgal/shadow/shadow.h b/src/newgal/shadow/shadow.h
index f4f90ac0..c246014b 100644
--- a/src/newgal/shadow/shadow.h
+++ b/src/newgal/shadow/shadow.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_SHADOW_H
diff --git a/src/newgal/shadow/shadow_refresh_msb_left.c b/src/newgal/shadow/shadow_refresh_msb_left.c
index a52c21bf..7f3be215 100644
--- a/src/newgal/shadow/shadow_refresh_msb_left.c
+++ b/src/newgal/shadow/shadow_refresh_msb_left.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/shadow/shadow_refresh_msb_right.c b/src/newgal/shadow/shadow_refresh_msb_right.c
index 18eec478..451edec7 100644
--- a/src/newgal/shadow/shadow_refresh_msb_right.c
+++ b/src/newgal/shadow/shadow_refresh_msb_right.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/shadow/threadx_anvil.c b/src/newgal/shadow/threadx_anvil.c
index 34e6a857..a3bfe0a0 100644
--- a/src/newgal/shadow/threadx_anvil.c
+++ b/src/newgal/shadow/threadx_anvil.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** threadx_anvil.c: A subdriver of shadow NEWGAL engine for ThreadX on VisualFone Anvil.
diff --git a/src/newgal/shadow/unknown.c b/src/newgal/shadow/unknown.c
index ab065e97..bfa9c9aa 100644
--- a/src/newgal/shadow/unknown.c
+++ b/src/newgal/shadow/unknown.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** unknown.c: A subdriver of shadow NEWGAL engine for unknown target.
diff --git a/src/newgal/sigma8654/sigma8654.c b/src/newgal/sigma8654/sigma8654.c
index af628213..aac96c18 100644
--- a/src/newgal/sigma8654/sigma8654.c
+++ b/src/newgal/sigma8654/sigma8654.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: em86gfx.c 8944 2007-12-29 08:29:16Z xwyan $
@@ -1099,7 +1099,7 @@ static int GFX_CheckHWBlit (_THIS, GAL_Surface* src, GAL_Surface* dst)
static int GFX_HWAccelBlit (GAL_Surface* src, GAL_Rect* srec, GAL_Surface* dst, GAL_Rect* drec)
{
FUNC_ENTER();
- GAL_VideoDevice * this = current_video;
+ GAL_VideoDevice * this = __mg_current_video;
struct GFXEngine_BlendAndScaleRectangles_type blend_param;
struct GFXEngine_Surface_type surface_param;
struct GFXEngine_ColorFormat_type format_param;
diff --git a/src/newgal/sigma8654/sigma8654.h b/src/newgal/sigma8654/sigma8654.h
index b081fa91..7ff4b80b 100644
--- a/src/newgal/sigma8654/sigma8654.h
+++ b/src/newgal/sigma8654/sigma8654.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: em86gfx.h 7351 2007-08-16 04:55:58Z xgwang $
diff --git a/src/newgal/sigma8654/sigma8654_pri.h b/src/newgal/sigma8654/sigma8654_pri.h
index 422d6c86..2c968cd5 100644
--- a/src/newgal/sigma8654/sigma8654_pri.h
+++ b/src/newgal/sigma8654/sigma8654_pri.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: em86gfx.h 7351 2007-08-16 04:55:58Z xgwang $
diff --git a/src/newgal/stgfb/st_include/layer_rev.h b/src/newgal/stgfb/st_include/layer_rev.h
index f2d6ff94..ade003c2 100644
--- a/src/newgal/stgfb/st_include/layer_rev.h
+++ b/src/newgal/stgfb/st_include/layer_rev.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/linuxcommon.h b/src/newgal/stgfb/st_include/linuxcommon.h
index 6f75894e..d5d37f78 100644
--- a/src/newgal/stgfb/st_include/linuxcommon.h
+++ b/src/newgal/stgfb/st_include/linuxcommon.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/linuxwrapper.h b/src/newgal/stgfb/st_include/linuxwrapper.h
index 226bdd1a..995a5f0c 100644
--- a/src/newgal/stgfb/st_include/linuxwrapper.h
+++ b/src/newgal/stgfb/st_include/linuxwrapper.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stavmem.h b/src/newgal/stgfb/st_include/stavmem.h
index c54e1238..0ce8ce04 100644
--- a/src/newgal/stgfb/st_include/stavmem.h
+++ b/src/newgal/stgfb/st_include/stavmem.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stblit.h b/src/newgal/stgfb/st_include/stblit.h
index c38c9986..582f49e7 100644
--- a/src/newgal/stgfb/st_include/stblit.h
+++ b/src/newgal/stgfb/st_include/stblit.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stblit_ioctl.h b/src/newgal/stgfb/st_include/stblit_ioctl.h
index 7b06f5cb..6737569d 100644
--- a/src/newgal/stgfb/st_include/stblit_ioctl.h
+++ b/src/newgal/stgfb/st_include/stblit_ioctl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stcommon.h b/src/newgal/stgfb/st_include/stcommon.h
index db03900a..f7749cc2 100644
--- a/src/newgal/stgfb/st_include/stcommon.h
+++ b/src/newgal/stgfb/st_include/stcommon.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stddefs.h b/src/newgal/stgfb/st_include/stddefs.h
index a145006e..fecdb329 100644
--- a/src/newgal/stgfb/st_include/stddefs.h
+++ b/src/newgal/stgfb/st_include/stddefs.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stdevice.h b/src/newgal/stgfb/st_include/stdevice.h
index 88dcf9eb..a59fa06f 100644
--- a/src/newgal/stgfb/st_include/stdevice.h
+++ b/src/newgal/stgfb/st_include/stdevice.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stevt.h b/src/newgal/stgfb/st_include/stevt.h
index 29625b12..b2ba1a15 100644
--- a/src/newgal/stgfb/st_include/stevt.h
+++ b/src/newgal/stgfb/st_include/stevt.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stevt_ioctl.h b/src/newgal/stgfb/st_include/stevt_ioctl.h
index 900fcd65..791823dd 100644
--- a/src/newgal/stgfb/st_include/stevt_ioctl.h
+++ b/src/newgal/stgfb/st_include/stevt_ioctl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stgfb.h b/src/newgal/stgfb/st_include/stgfb.h
index 40983d34..1641ab43 100644
--- a/src/newgal/stgfb/st_include/stgfb.h
+++ b/src/newgal/stgfb/st_include/stgfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stgxobj.h b/src/newgal/stgfb/st_include/stgxobj.h
index 556403fe..a1418507 100644
--- a/src/newgal/stgfb/st_include/stgxobj.h
+++ b/src/newgal/stgfb/st_include/stgxobj.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stlayer.h b/src/newgal/stgfb/st_include/stlayer.h
index e758a9b7..5a8d8fcb 100644
--- a/src/newgal/stgfb/st_include/stlayer.h
+++ b/src/newgal/stgfb/st_include/stlayer.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stlayer_ioctl.h b/src/newgal/stgfb/st_include/stlayer_ioctl.h
index 9340793c..ba499c97 100644
--- a/src/newgal/stgfb/st_include/stlayer_ioctl.h
+++ b/src/newgal/stgfb/st_include/stlayer_ioctl.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stlite.h b/src/newgal/stgfb/st_include/stlite.h
index 25d3e2bb..5d408d59 100644
--- a/src/newgal/stgfb/st_include/stlite.h
+++ b/src/newgal/stgfb/st_include/stlite.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stos.h b/src/newgal/stgfb/st_include/stos.h
index d332a5c8..ba0b0d8d 100644
--- a/src/newgal/stgfb/st_include/stos.h
+++ b/src/newgal/stgfb/st_include/stos.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/st_include/stsys.h b/src/newgal/stgfb/st_include/stsys.h
index 2e56534b..fa21b106 100644
--- a/src/newgal/stgfb/st_include/stsys.h
+++ b/src/newgal/stgfb/st_include/stsys.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*****************************************************************************/
/* COPYRIGHT (C) 2009 STMicroelectronics - All Rights Reserved */
diff --git a/src/newgal/stgfb/stgfb_video.c b/src/newgal/stgfb/stgfb_video.c
index ffee70b4..3f673953 100644
--- a/src/newgal/stgfb/stgfb_video.c
+++ b/src/newgal/stgfb/stgfb_video.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: stgfb_video.c 13621 2010-11-10 08:14:16Z humingming $
@@ -1326,9 +1326,9 @@ static int STGFB_HWAccelBlit (GAL_Surface *src, GAL_Rect *srcrect, GAL_Surface *
dstrect->h = src_st_bitmap->Height - srcrect->y;
#if 1
- return STAPI_Blit(current_video, framebuffer_fd, src, srcrect, dst, dstrect, TRUE);
+ return STAPI_Blit(__mg_current_video, framebuffer_fd, src, srcrect, dst, dstrect, TRUE);
#else
- return STAPI_BlitWrapper(current_video, framebuffer_fd, src, srcrect, dst, dstrect, TRUE);
+ return STAPI_BlitWrapper(__mg_current_video, framebuffer_fd, src, srcrect, dst, dstrect, TRUE);
#endif
}
diff --git a/src/newgal/stgfb/stgfb_video.h b/src/newgal/stgfb/stgfb_video.h
index 8d987a08..c1bda91b 100644
--- a/src/newgal/stgfb/stgfb_video.h
+++ b/src/newgal/stgfb/stgfb_video.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: stgfb_video.h 13621 2010-11-10 08:14:16Z humingming $
diff --git a/src/newgal/stretch.c b/src/newgal/stretch.c
index 2c88f0fd..40297439 100644
--- a/src/newgal/stretch.c
+++ b/src/newgal/stretch.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/stretch_c.h b/src/newgal/stretch_c.h
index 8ff3bd5a..2de6c182 100644
--- a/src/newgal/stretch_c.h
+++ b/src/newgal/stretch_c.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* Perform a stretch blit between two surfaces of the same format.
diff --git a/src/newgal/surface.c b/src/newgal/surface.c
index 65ebc743..8cde9f52 100644
--- a/src/newgal/surface.c
+++ b/src/newgal/surface.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
@@ -65,8 +65,8 @@ GAL_Surface * GAL_CreateRGBSurface (Uint32 flags,
int width, int height, int depth,
Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask)
{
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
GAL_Surface *screen;
GAL_Surface *surface;
@@ -81,12 +81,12 @@ GAL_Surface * GAL_CreateRGBSurface (Uint32 flags,
flags |= GAL_HWSURFACE;
}
if ( (flags & GAL_SRCCOLORKEY) == GAL_SRCCOLORKEY ) {
- if ( ! current_video->info.blit_hw_CC ) {
+ if ( ! __mg_current_video->info.blit_hw_CC ) {
flags &= ~GAL_HWSURFACE;
}
}
if ( (flags & GAL_SRCALPHA) == GAL_SRCALPHA ) {
- if ( ! current_video->info.blit_hw_A ) {
+ if ( ! __mg_current_video->info.blit_hw_A ) {
flags &= ~GAL_HWSURFACE;
}
}
@@ -101,7 +101,7 @@ GAL_Surface * GAL_CreateRGBSurface (Uint32 flags,
return(NULL);
}
if ((flags & GAL_HWSURFACE) == GAL_HWSURFACE)
- surface->video = current_video;
+ surface->video = __mg_current_video;
else
surface->video = NULL;
@@ -224,8 +224,8 @@ int GAL_SetColorKey (GAL_Surface *surface, Uint32 flag, Uint32 key)
}
if ( flag ) {
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
surface->flags |= GAL_SRCCOLORKEY;
surface->format->colorkey = key;
@@ -279,8 +279,8 @@ int GAL_SetAlpha (GAL_Surface *surface, Uint32 flag, Uint8 value)
GAL_UnRLESurface(surface, 1);
if ( flag ) {
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
if ( flag & GAL_SRCALPHA ) {
surface->flags |= GAL_SRCALPHA;
@@ -693,8 +693,8 @@ int GAL_FillRect(GAL_Surface *dst, const GAL_Rect *dstrect, Uint32 color)
if (!video)
{
- video = current_video;
- this = current_video;
+ video = __mg_current_video;
+ this = __mg_current_video;
}
/* If 'dstrect' == NULL, then fill the whole surface */
@@ -1729,7 +1729,7 @@ void GAL_FreeSurface (GAL_Surface *surface)
{
/* Free anything that's not NULL, and not the screen surface */
if ((surface == NULL) ||
- (current_video && (surface == GAL_VideoSurface))) {
+ (__mg_current_video && (surface == GAL_VideoSurface))) {
return;
}
@@ -1753,8 +1753,8 @@ void GAL_FreeSurface (GAL_Surface *surface)
surface->map = NULL;
}
if ( (surface->flags & GAL_HWSURFACE) == GAL_HWSURFACE ) {
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
video->FreeHWSurface(this, surface);
}
if ( surface->pixels &&
@@ -1770,8 +1770,8 @@ void GAL_FreeSurface (GAL_Surface *surface)
#ifdef _MGRM_PROCESSES
void GAL_RequestHWSurface (const REQ_HWSURFACE* request, REP_HWSURFACE* reply)
{
- if (current_video->RequestHWSurface) {
- current_video->RequestHWSurface (current_video, request, reply);
+ if (__mg_current_video->RequestHWSurface) {
+ __mg_current_video->RequestHWSurface (__mg_current_video, request, reply);
} else if (request->offset == 0) {
reply->offset = 0;
} else {
diff --git a/src/newgal/svpxxosd/svphead.h b/src/newgal/svpxxosd/svphead.h
index 592d704f..562905e7 100644
--- a/src/newgal/svpxxosd/svphead.h
+++ b/src/newgal/svpxxosd/svphead.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _SVPHEAD_H
diff --git a/src/newgal/svpxxosd/svpxxosd.c b/src/newgal/svpxxosd/svpxxosd.c
index 7708f349..e82bcd9c 100644
--- a/src/newgal/svpxxosd/svpxxosd.c
+++ b/src/newgal/svpxxosd/svpxxosd.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgal/svpxxosd/svpxxosd.h b/src/newgal/svpxxosd/svpxxosd.h
index ec89b51a..bde8af12 100644
--- a/src/newgal/svpxxosd/svpxxosd.h
+++ b/src/newgal/svpxxosd/svpxxosd.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_svpxxosd_h
diff --git a/src/newgal/sysvideo.h b/src/newgal/sysvideo.h
index 8279a206..17453233 100644
--- a/src/newgal/sysvideo.h
+++ b/src/newgal/sysvideo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_sysvideo_h
@@ -328,15 +328,15 @@ extern VideoBootStrap STGFB_bootstrap;
#ifdef _MGGAL_USVFB
extern VideoBootStrap USVFB_bootstrap;
#endif
-#ifdef _MGGAL_DRI
-extern VideoBootStrap DRI_bootstrap;
+#ifdef _MGGAL_DRM
+extern VideoBootStrap DRM_bootstrap;
#endif
/* This is the current video device */
-extern GAL_VideoDevice *current_video;
+extern GAL_VideoDevice *__mg_current_video;
-#define GAL_VideoSurface (current_video->screen)
-#define GAL_PublicSurface (current_video->screen)
+#define GAL_VideoSurface (__mg_current_video->screen)
+#define GAL_PublicSurface (__mg_current_video->screen)
GAL_VideoDevice *GAL_GetVideo(const char* driver_name);
void Slave_FreeSurface (GAL_Surface *surface);
diff --git a/src/newgal/usvfb/usvfb.c b/src/newgal/usvfb/usvfb.c
index 791e29f4..6cb08dc7 100644
--- a/src/newgal/usvfb/usvfb.c
+++ b/src/newgal/usvfb/usvfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
*usvfb.c: UnixSocket Virtual Frame Buffer NEWGAL video driver.
diff --git a/src/newgal/usvfb/usvfb.h b/src/newgal/usvfb/usvfb.h
index 978a339a..4cce8991 100644
--- a/src/newgal/usvfb/usvfb.h
+++ b/src/newgal/usvfb/usvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_USVFB_H
diff --git a/src/newgal/utpmc/utpmcvideo-lite.c b/src/newgal/utpmc/utpmcvideo-lite.c
index d11c44c2..f849ed3d 100644
--- a/src/newgal/utpmc/utpmcvideo-lite.c
+++ b/src/newgal/utpmc/utpmcvideo-lite.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: utpmcvideo-lite.c 8944 2007-12-29 08:29:16Z xwyan $
diff --git a/src/newgal/utpmc/utpmcvideo-lite.h b/src/newgal/utpmc/utpmcvideo-lite.h
index 542c7c2d..4cd7ddf1 100644
--- a/src/newgal/utpmc/utpmcvideo-lite.h
+++ b/src/newgal/utpmc/utpmcvideo-lite.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: utpmcvideo-lite.h 7357 2007-08-16 05:04:38Z xgwang $
diff --git a/src/newgal/utpmc/utpmcvideo.c b/src/newgal/utpmc/utpmcvideo.c
index 9c9118cd..58c03b7a 100644
--- a/src/newgal/utpmc/utpmcvideo.c
+++ b/src/newgal/utpmc/utpmcvideo.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: utpmcvideo.c 8944 2007-12-29 08:29:16Z xwyan $
diff --git a/src/newgal/utpmc/utpmcvideo.h b/src/newgal/utpmc/utpmcvideo.h
index 29259f19..954a089f 100644
--- a/src/newgal/utpmc/utpmcvideo.h
+++ b/src/newgal/utpmc/utpmcvideo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id: utpmcvideo.h 7357 2007-08-16 05:04:38Z xgwang $
diff --git a/src/newgal/video.c b/src/newgal/video.c
index fe1f82e8..676bad49 100644
--- a/src/newgal/video.c
+++ b/src/newgal/video.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* The high-level video driver subsystem */
@@ -156,13 +156,13 @@ static VideoBootStrap *bootstrap[] = {
#ifdef _MGGAL_USVFB
&USVFB_bootstrap,
#endif
-#ifdef _MGGAL_DRI
- &DRI_bootstrap,
+#ifdef _MGGAL_DRM
+ &DRM_bootstrap,
#endif
NULL
};
-GAL_VideoDevice *current_video = NULL;
+GAL_VideoDevice *__mg_current_video = NULL;
#ifdef _MGUSE_SYNC_UPDATE
BLOCKHEAP __mg_free_update_region_list;
@@ -205,7 +205,7 @@ GAL_VideoDevice *GAL_GetVideo(const char* driver_name)
video->name = bootstrap[i]->name;
/* Do some basic variable initialization */
- if (current_video == NULL)
+ if (__mg_current_video == NULL)
video->screen = NULL;
video->physpal = NULL;
@@ -229,8 +229,8 @@ int GAL_VideoInit (const char *driver_name, Uint32 flags)
InitFreeClipRectList (&__mg_free_update_region_list, SIZE_UPDATERECTHEAP);
#endif
- /* Check to make sure we don't overwrite 'current_video' */
- if ( current_video != NULL ) {
+ /* Check to make sure we don't overwrite '__mg_current_video' */
+ if ( __mg_current_video != NULL ) {
GAL_VideoQuit();
}
@@ -240,7 +240,7 @@ int GAL_VideoInit (const char *driver_name, Uint32 flags)
return (-1);
}
video->screen = NULL;
- current_video = video;
+ __mg_current_video = video;
/* Initialize the video subsystem */
memset(&vformat, 0, sizeof(vformat));
@@ -281,7 +281,7 @@ int GAL_VideoInit (const char *driver_name, Uint32 flags)
return(-1);
}
- GAL_VideoSurface->video = current_video;
+ GAL_VideoSurface->video = __mg_current_video;
video->info.vfmt = GAL_VideoSurface->format;
@@ -290,8 +290,8 @@ int GAL_VideoInit (const char *driver_name, Uint32 flags)
char *GAL_VideoDriverName(char *namebuf, int maxlen)
{
- if ( current_video != NULL ) {
- strncpy(namebuf, current_video->name, maxlen-1);
+ if ( __mg_current_video != NULL ) {
+ strncpy(namebuf, __mg_current_video->name, maxlen-1);
namebuf[maxlen-1] = '\0';
return(namebuf);
}
@@ -306,8 +306,8 @@ GAL_Surface *GAL_GetVideoSurface(void)
GAL_Surface *visible;
visible = NULL;
- if ( current_video ) {
- visible = current_video->screen;
+ if ( __mg_current_video ) {
+ visible = __mg_current_video->screen;
}
return(visible);
}
@@ -320,8 +320,8 @@ const GAL_VideoInfo *GAL_GetVideoInfo(void)
const GAL_VideoInfo *info;
info = NULL;
- if ( current_video ) {
- info = ¤t_video->info;
+ if ( __mg_current_video ) {
+ info = &__mg_current_video->info;
}
return(info);
}
@@ -335,8 +335,8 @@ const GAL_VideoInfo *GAL_GetVideoInfo(void)
*/
GAL_Rect ** GAL_ListModes (GAL_PixelFormat *format, Uint32 flags)
{
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
GAL_Rect **modes;
modes = NULL;
@@ -398,7 +398,7 @@ int GAL_VideoModeOK (int width, int height, int bpp, Uint32 flags)
}
else {
if ( (sizes == (GAL_Rect **)-1) ||
- current_video->handles_any_size ) {
+ __mg_current_video->handles_any_size ) {
/* Any size supported at this bit-depth */
supported = 1;
continue;
@@ -512,7 +512,7 @@ GAL_Surface * GAL_SetVideoMode (int width, int height, int bpp, Uint32 flags)
int video_h;
int video_bpp;
- this = video = current_video;
+ this = video = __mg_current_video;
/* Default to the current video bpp */
if ( bpp == 0 ) {
@@ -614,7 +614,7 @@ GAL_Surface * GAL_SetVideoMode (int width, int height, int bpp, Uint32 flags)
#endif
video->info.vfmt = GAL_VideoSurface->format;
- GAL_VideoSurface->video = current_video;
+ GAL_VideoSurface->video = __mg_current_video;
return(GAL_PublicSurface);
}
@@ -852,7 +852,7 @@ static void SetPalette_logical(GAL_Surface *screen, GAL_Color *colors,
static int SetPalette_physical(GAL_Surface *screen,
GAL_Color *colors, int firstcolor, int ncolors)
{
- /* GAL_VideoDevice *video = current_video; */
+ /* GAL_VideoDevice *video = __mg_current_video; */
GAL_VideoDevice *video;
int gotall = 1;
if ( screen->video == NULL ) {
@@ -903,7 +903,7 @@ int GAL_SetPalette(GAL_Surface *screen, int which,
GAL_Palette *pal;
int gotall;
int palsize;
- if ( ! current_video ) {
+ if ( ! __mg_current_video ) {
return 0;
}
if ( screen->video == NULL ) {
@@ -936,7 +936,7 @@ int GAL_SetPalette(GAL_Surface *screen, int which,
SetPalette_logical(screen, colors, firstcolor, ncolors);
}
if (which & GAL_PHYSPAL) {
- /* GAL_VideoDevice *video = current_video; */
+ /* GAL_VideoDevice *video = __mg_current_video; */
GAL_VideoDevice *video = (GAL_VideoDevice *)(screen->video);
/*
* Physical palette change: This doesn't affect the
@@ -950,7 +950,7 @@ int GAL_SetPalette(GAL_Surface *screen, int which,
/* Lazy physical palette allocation */
int size;
GAL_Palette *pp = malloc(sizeof(*pp));
- /* current_video->physpal = pp; */
+ /* __mg_current_video->physpal = pp; */
video->physpal = pp;
pp->ncolors = pal->ncolors;
size = pp->ncolors * sizeof(GAL_Color);
@@ -981,9 +981,9 @@ void GAL_VideoQuit (void)
{
GAL_Surface *ready_to_go;
- if ( current_video ) {
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ if ( __mg_current_video ) {
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
/* Clean up the system video */
video->VideoQuit (this);
@@ -1002,7 +1002,7 @@ void GAL_VideoQuit (void)
/* Finish cleaning up video subsystem */
video->free(this);
- current_video = NULL;
+ __mg_current_video = NULL;
#ifdef _MGUSE_SYNC_UPDATE
DestroyFreeClipRectList (&__mg_free_update_region_list);
@@ -1363,8 +1363,8 @@ int GAL_ResumeVideo(void)
#ifdef _MGRM_PROCESSES
if (mgIsServer) {
#endif
- if (current_video && current_video->Resume) {
- current_video->Resume(current_video);
+ if (__mg_current_video && __mg_current_video->Resume) {
+ __mg_current_video->Resume(__mg_current_video);
}
#ifdef _MGRM_PROCESSES
}
@@ -1396,8 +1396,8 @@ int GAL_SuspendVideo(void)
#ifdef _MGRM_PROCESSES
if (mgIsServer) {
#endif
- if (current_video && current_video->Suspend) {
- current_video->Suspend(current_video);
+ if (__mg_current_video && __mg_current_video->Suspend) {
+ __mg_current_video->Suspend(__mg_current_video);
}
#ifdef _MGRM_PROCESSES
}
diff --git a/src/newgal/videomem-bucket.c b/src/newgal/videomem-bucket.c
index c7225f4e..c008d821 100644
--- a/src/newgal/videomem-bucket.c
+++ b/src/newgal/videomem-bucket.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/videomem-bucket.h b/src/newgal/videomem-bucket.h
index 9f082711..06f31561 100644
--- a/src/newgal/videomem-bucket.h
+++ b/src/newgal/videomem-bucket.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _VIDEOMEM_BUCKET_H
diff --git a/src/newgal/wvfb/winfb.c b/src/newgal/wvfb/winfb.c
index c12d60e1..71718cb4 100644
--- a/src/newgal/wvfb/winfb.c
+++ b/src/newgal/wvfb/winfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** winfb.c: win32 virtual fb implementation and ipc operations
diff --git a/src/newgal/wvfb/winfb.h b/src/newgal/wvfb/winfb.h
index f2d9c4d6..1a01f136 100644
--- a/src/newgal/wvfb/winfb.h
+++ b/src/newgal/wvfb/winfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
int win_FbAvailable (void);
diff --git a/src/newgal/wvfb/wvfb.c b/src/newgal/wvfb/wvfb.c
index e5e65ecf..e70d3251 100644
--- a/src/newgal/wvfb/wvfb.c
+++ b/src/newgal/wvfb/wvfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** wvfb.c: Windows virtual FrameBuffer based video driver implementation.
diff --git a/src/newgal/wvfb/wvfb.h b/src/newgal/wvfb/wvfb.h
index 892faf8f..b23a8b25 100644
--- a/src/newgal/wvfb/wvfb.h
+++ b/src/newgal/wvfb/wvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_wvfb_h
diff --git a/src/newgal/xlib/xlibvideo.c b/src/newgal/xlib/xlibvideo.c
index ec91f7c1..2d5c59e5 100644
--- a/src/newgal/xlib/xlibvideo.c
+++ b/src/newgal/xlib/xlibvideo.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/xlib/xlibvideo.h b/src/newgal/xlib/xlibvideo.h
index 8f5b296a..2956cbdf 100644
--- a/src/newgal/xlib/xlibvideo.h
+++ b/src/newgal/xlib/xlibvideo.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _GAL_pcxvfb_h
diff --git a/src/newgal/xlib/xxvfb/define.h b/src/newgal/xlib/xxvfb/define.h
index 46672d40..a5d02942 100644
--- a/src/newgal/xlib/xxvfb/define.h
+++ b/src/newgal/xlib/xxvfb/define.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _DEFINE_H_
#define _DEFINE_H_
diff --git a/src/newgal/xlib/xxvfb/main.c b/src/newgal/xlib/xxvfb/main.c
index c037eff5..47bb9f20 100644
--- a/src/newgal/xlib/xxvfb/main.c
+++ b/src/newgal/xlib/xxvfb/main.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include "xxvfb.h"
diff --git a/src/newgal/xlib/xxvfb/xxvfb.c b/src/newgal/xlib/xxvfb/xxvfb.c
index 7ab2d256..acd7b864 100644
--- a/src/newgal/xlib/xxvfb/xxvfb.c
+++ b/src/newgal/xlib/xxvfb/xxvfb.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/xlib/xxvfb/xxvfb.h b/src/newgal/xlib/xxvfb/xxvfb.h
index 52482b71..ca95ef03 100644
--- a/src/newgal/xlib/xxvfb/xxvfb.h
+++ b/src/newgal/xlib/xxvfb/xxvfb.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _XXVFB_H_
#define _XXVFB_H_
diff --git a/src/newgal/xlib/xxvfb/xxvfb_common.c b/src/newgal/xlib/xxvfb/xxvfb_common.c
index 036093dd..cff70cbe 100644
--- a/src/newgal/xlib/xxvfb/xxvfb_common.c
+++ b/src/newgal/xlib/xxvfb/xxvfb_common.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/newgal/xlib/xxvfb/xxvfb_common.h b/src/newgal/xlib/xxvfb/xxvfb_common.h
index b8416a78..cb6795f5 100644
--- a/src/newgal/xlib/xxvfb/xxvfb_common.h
+++ b/src/newgal/xlib/xxvfb/xxvfb_common.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _XXVFB_COMMON_H
#define _XXVFB_COMMON_H
diff --git a/src/newgal/xlib/xxvfb/xxvfb_input.c b/src/newgal/xlib/xxvfb/xxvfb_input.c
index d181d939..8d84b915 100644
--- a/src/newgal/xlib/xxvfb/xxvfb_input.c
+++ b/src/newgal/xlib/xxvfb/xxvfb_input.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgal/xlib/xxvfb/xxvfb_input.h b/src/newgal/xlib/xxvfb/xxvfb_input.h
index 4432b9b5..ecb6566b 100644
--- a/src/newgal/xlib/xxvfb/xxvfb_input.h
+++ b/src/newgal/xlib/xxvfb/xxvfb_input.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _XXVFB_INPUT_H
#define _XXVFB_INPUT_H
diff --git a/src/newgal/xlib/xxvfb/xxvfbhdr.h b/src/newgal/xlib/xxvfb/xxvfbhdr.h
index eb0634a6..2b4886b4 100644
--- a/src/newgal/xlib/xxvfb/xxvfbhdr.h
+++ b/src/newgal/xlib/xxvfb/xxvfbhdr.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#ifndef _XXVFBHDR_H
#define _XXVFBHDR_H
diff --git a/src/newgal/yuv.c b/src/newgal/yuv.c
index dd21df49..bd902ace 100644
--- a/src/newgal/yuv.c
+++ b/src/newgal/yuv.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* This is the implementation of the YUV video surface support */
@@ -60,8 +60,8 @@
GAL_Overlay *GAL_CreateYUVOverlay(int w, int h, Uint32 format,
GAL_Surface *display)
{
- GAL_VideoDevice *video = current_video;
- GAL_VideoDevice *this = current_video;
+ GAL_VideoDevice *video = __mg_current_video;
+ GAL_VideoDevice *this = __mg_current_video;
const char *yuv_hwaccel;
GAL_Overlay *overlay;
@@ -89,24 +89,24 @@ GAL_Overlay *GAL_CreateYUVOverlay(int w, int h, Uint32 format,
int GAL_LockYUVOverlay(GAL_Overlay *overlay)
{
- return overlay->hwfuncs->Lock(current_video, overlay);
+ return overlay->hwfuncs->Lock(__mg_current_video, overlay);
}
void GAL_UnlockYUVOverlay(GAL_Overlay *overlay)
{
- overlay->hwfuncs->Unlock(current_video, overlay);
+ overlay->hwfuncs->Unlock(__mg_current_video, overlay);
}
int GAL_DisplayYUVOverlay(GAL_Overlay *overlay, GAL_Rect *dstrect)
{
- return overlay->hwfuncs->Display(current_video, overlay, dstrect);
+ return overlay->hwfuncs->Display(__mg_current_video, overlay, dstrect);
}
void GAL_FreeYUVOverlay(GAL_Overlay *overlay)
{
if ( overlay ) {
if ( overlay->hwfuncs ) {
- overlay->hwfuncs->FreeHW(current_video, overlay);
+ overlay->hwfuncs->FreeHW(__mg_current_video, overlay);
}
free(overlay);
}
diff --git a/src/newgal/yuv_mmx.c b/src/newgal/yuv_mmx.c
index 694ac973..0fc73c88 100644
--- a/src/newgal/yuv_mmx.c
+++ b/src/newgal/yuv_mmx.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
diff --git a/src/newgal/yuv_sw.c b/src/newgal/yuv_sw.c
index 65f4c925..09df005c 100644
--- a/src/newgal/yuv_sw.c
+++ b/src/newgal/yuv_sw.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* This is the software implementation of the YUV video overlay support */
diff --git a/src/newgal/yuv_sw_c.h b/src/newgal/yuv_sw_c.h
index f88ef717..1a5e113e 100644
--- a/src/newgal/yuv_sw_c.h
+++ b/src/newgal/yuv_sw_c.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "newgal.h"
diff --git a/src/newgal/yuvfuncs.h b/src/newgal/yuvfuncs.h
index d5dd2e91..a8e4b240 100644
--- a/src/newgal/yuvfuncs.h
+++ b/src/newgal/yuvfuncs.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/* This is the definition of the YUV video surface function structure */
diff --git a/src/newgdi/achar-uchar.c b/src/newgdi/achar-uchar.c
index 6918e4c2..b64236a7 100644
--- a/src/newgdi/achar-uchar.c
+++ b/src/newgdi/achar-uchar.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgdi/advapi.c b/src/newgdi/advapi.c
index 16acf965..e9d4ce38 100644
--- a/src/newgdi/advapi.c
+++ b/src/newgdi/advapi.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** advapi.c: advanced 2D APIs.
diff --git a/src/newgdi/arc.c b/src/newgdi/arc.c
index c15325a7..4a6ab997 100644
--- a/src/newgdi/arc.c
+++ b/src/newgdi/arc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** arc.c: drawing and filling arc, circle, and ellipse.
diff --git a/src/newgdi/attr.c b/src/newgdi/attr.c
index a9dd40d1..9fabfd44 100644
--- a/src/newgdi/attr.c
+++ b/src/newgdi/attr.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Drawing attributes of GDI
diff --git a/src/newgdi/bitmap.c b/src/newgdi/bitmap.c
index 018b67bd..432d51e2 100644
--- a/src/newgdi/bitmap.c
+++ b/src/newgdi/bitmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Bitmap operations of GDI.
diff --git a/src/newgdi/clip.c b/src/newgdi/clip.c
index 6d04b4dd..bd6346f5 100644
--- a/src/newgdi/clip.c
+++ b/src/newgdi/clip.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** clip.c: Clipping operations of GDI.
diff --git a/src/newgdi/coor.c b/src/newgdi/coor.c
index bf63b6ef..1915c672 100644
--- a/src/newgdi/coor.c
+++ b/src/newgdi/coor.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Coordinates operations of GDI.
diff --git a/src/newgdi/drawtext.c b/src/newgdi/drawtext.c
index ac07a624..25712680 100644
--- a/src/newgdi/drawtext.c
+++ b/src/newgdi/drawtext.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** drawtext.c: Implementation of DrawTextEx2
@@ -249,7 +249,7 @@ int DrawTextEx2 (HDC hdc, const char* pText, int nCount,
/* If output rect is zero, we shouldn't output any text.*/
if (RECTW(rcDraw) < pdc->pLogFont->size
&& RECTH(rcDraw) < pdc->pLogFont->size) {
- _WRN_PRINTF ("Output rect is too small, we won't output any text.");
+ _WRN_PRINTF ("Output rect is too small, we won't output any text.\n");
return -1;
}
#endif
diff --git a/src/newgdi/drawtext.h b/src/newgdi/drawtext.h
index 49a74af0..0f81ce1b 100644
--- a/src/newgdi/drawtext.h
+++ b/src/newgdi/drawtext.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** drawtext.h: The common text drawing routines.
diff --git a/src/newgdi/flood.c b/src/newgdi/flood.c
index d209b7ef..4ca7fb8e 100644
--- a/src/newgdi/flood.c
+++ b/src/newgdi/flood.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgdi/gdi.c b/src/newgdi/gdi.c
index e88da4fb..0adcfdf0 100644
--- a/src/newgdi/gdi.c
+++ b/src/newgdi/gdi.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** The graphics display interface module of MiniGUI.
@@ -233,7 +233,7 @@ void mg_TerminateScreenDC (void)
#define INIT_SPECIFICAL_FONTS(etc_section) \
{ \
if (!font_InitSpecificalFonts (etc_section)) { \
- _WRN_PRINTF ("Can not initialize fonts defined in section %s!", etc_section); \
+ _WRN_PRINTF ("Can not initialize fonts defined in section %s!\n", etc_section); \
goto error; \
} \
}
@@ -242,7 +242,7 @@ void mg_TerminateScreenDC (void)
BOOL mg_InitGDI (void)
{
if (!InitTextBitmapBuffer ()) {
- _WRN_PRINTF ("Can not initialize text bitmap buffer!");
+ _WRN_PRINTF ("Can not initialize text bitmap buffer!\n");
goto error;
}
@@ -264,7 +264,7 @@ BOOL mg_InitGDI (void)
#if (defined (_MGFONT_TTF) || defined (_MGFONT_FT2)) && defined(_MGRM_THREADS)
if (!font_InitFreetypeLibrary ()) {
- _WRN_PRINTF ("Can not initialize freetype fonts!");
+ _WRN_PRINTF ("Can not initialize freetype fonts!\n");
goto error;
}
INIT_SPECIFICAL_FONTS (FONT_ETC_SECTION_NAME_TTF);
@@ -273,13 +273,13 @@ BOOL mg_InitGDI (void)
/* TODO: add other font support here */
#if defined (_MGFONT_SEF) && !defined(_LITE_VERSION)
if(!initialize_scripteasy()) {
- _WRN_PRINTF ("Can not initialize ScriptEasy fonts!");
+ _WRN_PRINTF ("Can not initialize ScriptEasy fonts!\n");
goto error;
}
#endif
if (!font_InitIncoreFonts ()) {
- _WRN_PRINTF ("Can not initialize incore fonts!");
+ _WRN_PRINTF ("Can not initialize incore fonts!\n");
goto error;
}
@@ -288,7 +288,7 @@ BOOL mg_InitGDI (void)
#endif
if (!mg_InitSysFont ()) {
- _WRN_PRINTF ("Can not create system fonts!");
+ _WRN_PRINTF ("Can not create system fonts!\n");
goto error;
}
@@ -2660,7 +2660,7 @@ HDC GetSecondarySubDC (HDC secondary_dc, HWND hwnd_child, BOOL client)
UNLOCK(&dcslot);
if (i >= DCSLOTNUMBER) {
- _WRN_PRINTF ("NEWGDI>GetSecondarySubDC: no DC slot.");
+ _WRN_PRINTF ("No DC slot.\n");
return HDC_SCREEN;
}
@@ -3405,7 +3405,7 @@ HDC GUIAPI InitSlaveScreenEx (const char* name, const char* mode, int dpi)
}
else {
free (pmem_dc);
- _WRN_PRINTF ("Can not init the slave screen: %s (%s)",
+ _WRN_PRINTF ("Can not init the slave screen: %s (%s)\n",
name, mode);
return HDC_INVALID;
}
@@ -3725,3 +3725,204 @@ MG_EXPORT BOOL GUIAPI SyncUpdateDC (HDC hdc)
#endif
}
+MG_EXPORT BOOL GUIAPI IsMemDC (HDC hdc)
+{
+ PDC pdc = dc_HDC2PDC(hdc);
+ return dc_IsMemDC (pdc);
+}
+
+MG_EXPORT BOOL GUIAPI IsScreenDC (HDC hdc)
+{
+ PDC pdc = dc_HDC2PDC(hdc);
+ return dc_IsScreenDC (pdc);
+}
+
+MG_EXPORT BOOL GUIAPI IsWindowDC (HDC hdc)
+{
+ PDC pdc = dc_HDC2PDC(hdc);
+ return dc_IsGeneralDC (pdc);
+}
+
+MG_EXPORT GHANDLE GetVideoHandle (HDC hdc)
+{
+ PDC pdc = dc_HDC2PDC (hdc);
+ if (pdc->surface)
+ return (GHANDLE)pdc->surface->video;
+
+ return NULL;
+}
+
+#ifdef _MGGAL_DRM
+
+/* implemented in DRI engine. */
+BOOL __drm_get_surface_info (GAL_Surface *surface, DrmSurfaceInfo* info);
+
+MG_EXPORT BOOL drmGetSurfaceInfo (GHANDLE video, HDC hdc, DrmSurfaceInfo* info)
+{
+ PDC pdc = dc_HDC2PDC (hdc);
+ if (pdc->surface->video != (GHANDLE)video)
+ return FALSE;
+
+ return __drm_get_surface_info(pdc->surface, info);
+}
+
+/* implemented in DRI engine. */
+GAL_Surface* __drm_create_surface_from_name (GHANDLE video,
+ uint32_t name, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch);
+
+MG_EXPORT HDC drmCreateDCFromName (GHANDLE video,
+ uint32_t name, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch)
+{
+ PDC pmem_dc = NULL;
+ GAL_Surface* surface;
+
+ if (!(pmem_dc = malloc (sizeof(DC))))
+ return HDC_INVALID;
+
+ LOCK (&__mg_gdilock);
+ surface = __drm_create_surface_from_name (video, name,
+ drm_format, width, height, pitch);
+ UNLOCK (&__mg_gdilock);
+
+ if (!surface) {
+ free (pmem_dc);
+ return HDC_INVALID;
+ }
+
+ if (surface->format->Amask) {
+ surface->flags |= GAL_SRCPIXELALPHA;
+ }
+
+ pmem_dc->DataType = TYPE_HDC;
+ pmem_dc->DCType = TYPE_MEMDC;
+ pmem_dc->inuse = TRUE;
+ pmem_dc->surface = surface;
+
+ dc_InitDC (pmem_dc, HWND_DESKTOP, FALSE);
+
+ InitClipRgn (&pmem_dc->lcrgn, &__mg_FreeClipRectList);
+ MAKE_REGION_INFINITE(&pmem_dc->lcrgn);
+ InitClipRgn (&pmem_dc->ecrgn, &__mg_FreeClipRectList);
+ pmem_dc->pGCRInfo = NULL;
+ pmem_dc->oldage = 0;
+
+ pmem_dc->DevRC.left = 0;
+ pmem_dc->DevRC.top = 0;
+ pmem_dc->DevRC.right = width;
+ pmem_dc->DevRC.bottom = height;
+
+ SetClipRgn (&pmem_dc->ecrgn, &pmem_dc->DevRC);
+ IntersectClipRect(&pmem_dc->lcrgn, &pmem_dc->DevRC);
+
+ return (HDC)pmem_dc;
+}
+
+/* implemented in DRI engine. */
+GAL_Surface* __drm_create_surface_from_handle (GHANDLE video,
+ uint32_t handle, unsigned long size, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch);
+
+MG_EXPORT HDC drmCreateDCFromHandle (GHANDLE video,
+ uint32_t handle, unsigned long size, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch)
+{
+ PDC pmem_dc = NULL;
+ GAL_Surface* surface;
+
+ if (!(pmem_dc = malloc (sizeof(DC))))
+ return HDC_INVALID;
+
+ LOCK (&__mg_gdilock);
+ surface = __drm_create_surface_from_handle (video, handle, size,
+ drm_format, width, height, pitch);
+ UNLOCK (&__mg_gdilock);
+
+ if (!surface) {
+ free (pmem_dc);
+ return HDC_INVALID;
+ }
+
+ if (surface->format->Amask) {
+ surface->flags |= GAL_SRCPIXELALPHA;
+ }
+
+ pmem_dc->DataType = TYPE_HDC;
+ pmem_dc->DCType = TYPE_MEMDC;
+ pmem_dc->inuse = TRUE;
+ pmem_dc->surface = surface;
+
+ dc_InitDC (pmem_dc, HWND_DESKTOP, FALSE);
+
+ InitClipRgn (&pmem_dc->lcrgn, &__mg_FreeClipRectList);
+ MAKE_REGION_INFINITE(&pmem_dc->lcrgn);
+ InitClipRgn (&pmem_dc->ecrgn, &__mg_FreeClipRectList);
+ pmem_dc->pGCRInfo = NULL;
+ pmem_dc->oldage = 0;
+
+ pmem_dc->DevRC.left = 0;
+ pmem_dc->DevRC.top = 0;
+ pmem_dc->DevRC.right = width;
+ pmem_dc->DevRC.bottom = height;
+
+ SetClipRgn (&pmem_dc->ecrgn, &pmem_dc->DevRC);
+ IntersectClipRect(&pmem_dc->lcrgn, &pmem_dc->DevRC);
+
+ return (HDC)pmem_dc;
+}
+
+/* implemented in DRI engine. */
+GAL_Surface* __drm_create_surface_from_prime_fd (GHANDLE video,
+ int prime_fd, unsigned long size, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch);
+
+MG_EXPORT HDC drmCreateDCFromPrimeFd (GHANDLE video,
+ int prime_fd, unsigned long size, uint32_t drm_format,
+ unsigned int width, unsigned int height, uint32_t pitch)
+{
+ PDC pmem_dc = NULL;
+ GAL_Surface* surface;
+
+ if (!(pmem_dc = malloc (sizeof(DC))))
+ return HDC_INVALID;
+
+ LOCK (&__mg_gdilock);
+ surface =__drm_create_surface_from_prime_fd (video, prime_fd, size,
+ drm_format, width, height, pitch);
+ UNLOCK (&__mg_gdilock);
+
+ if (!surface) {
+ free (pmem_dc);
+ return HDC_INVALID;
+ }
+
+ if (surface->format->Amask) {
+ surface->flags |= GAL_SRCPIXELALPHA;
+ }
+
+ pmem_dc->DataType = TYPE_HDC;
+ pmem_dc->DCType = TYPE_MEMDC;
+ pmem_dc->inuse = TRUE;
+ pmem_dc->surface = surface;
+
+ dc_InitDC (pmem_dc, HWND_DESKTOP, FALSE);
+
+ InitClipRgn (&pmem_dc->lcrgn, &__mg_FreeClipRectList);
+ MAKE_REGION_INFINITE(&pmem_dc->lcrgn);
+ InitClipRgn (&pmem_dc->ecrgn, &__mg_FreeClipRectList);
+ pmem_dc->pGCRInfo = NULL;
+ pmem_dc->oldage = 0;
+
+ pmem_dc->DevRC.left = 0;
+ pmem_dc->DevRC.top = 0;
+ pmem_dc->DevRC.right = width;
+ pmem_dc->DevRC.bottom = height;
+
+ SetClipRgn (&pmem_dc->ecrgn, &pmem_dc->DevRC);
+ IntersectClipRect(&pmem_dc->lcrgn, &pmem_dc->DevRC);
+
+ return (HDC)pmem_dc;
+}
+
+#endif
diff --git a/src/newgdi/generators.c b/src/newgdi/generators.c
index 95be73ea..8fdbe21a 100644
--- a/src/newgdi/generators.c
+++ b/src/newgdi/generators.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/newgdi/glyph-shaped.c b/src/newgdi/glyph-shaped.c
index 82c37c24..62fc14fc 100644
--- a/src/newgdi/glyph-shaped.c
+++ b/src/newgdi/glyph-shaped.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** glyph-shaped.c:
diff --git a/src/newgdi/glyph.c b/src/newgdi/glyph.c
index 5b654234..c78b083c 100644
--- a/src/newgdi/glyph.c
+++ b/src/newgdi/glyph.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** glyph.c: Low level glyph routines.
@@ -2574,7 +2574,7 @@ static void draw_back_area (PDC pdc, POINT* area, GAL_Rect* gal_rc,
break;
default:
- _WRN_PRINTF ("No way to draw background");
+ _WRN_PRINTF ("No way to draw background\n");
break;
}
}
diff --git a/src/newgdi/glyph.h b/src/newgdi/glyph.h
index 3f7baed4..7cfffa38 100644
--- a/src/newgdi/glyph.h
+++ b/src/newgdi/glyph.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** glyph.h: The common glyph related routines.
diff --git a/src/newgdi/icon.c b/src/newgdi/icon.c
index c68fb73a..bf58e7ed 100644
--- a/src/newgdi/icon.c
+++ b/src/newgdi/icon.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** icon.c: Icon operations of GDI.
diff --git a/src/newgdi/layout-ellipsize.c b/src/newgdi/layout-ellipsize.c
index 02a27891..e3e47bf9 100644
--- a/src/newgdi/layout-ellipsize.c
+++ b/src/newgdi/layout-ellipsize.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more layoutrmation about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgdi/layout-utils.c b/src/newgdi/layout-utils.c
index 115daf66..1b1037b4 100644
--- a/src/newgdi/layout-utils.c
+++ b/src/newgdi/layout-utils.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
@@ -88,7 +88,7 @@ static BOOL fontname_get_from_orient(char* fontname, GlyphOrient ort)
fontname[orient_pos] = FONT_ORIENT_SIDEWAYS_LEFT;
break;
default:
- _WRN_PRINTF("bad orientation param: %d", ort);
+ _WRN_PRINTF("bad orientation param: %d\n", ort);
return FALSE;
}
@@ -267,7 +267,7 @@ LayoutRun* __mg_layout_run_new_from_offset(const LAYOUT* layout,
LayoutRun* lrun;
if (offset >= trun->len) {
- _WRN_PRINTF("offset(%d) >= trun->len(%p, %d)",
+ _WRN_PRINTF("offset(%d) >= trun->len(%p, %d)\n",
offset, trun, trun->len);
return NULL;
}
@@ -381,7 +381,7 @@ void __mg_glyph_string_set_size (GlyphString* string, int new_len)
more_space = max_space;
if ((unsigned int)new_len > max_space) {
- _WRN_PRINTF("Too large glyph string of length %d", new_len);
+ _WRN_PRINTF("Too large glyph string of length %d\n", new_len);
}
}
diff --git a/src/newgdi/layout.c b/src/newgdi/layout.c
index 39a86702..43914383 100644
--- a/src/newgdi/layout.c
+++ b/src/newgdi/layout.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more layoutrmation about the commercial license, please refer to
- * .
+ * .
*/
/*
@@ -836,7 +836,7 @@ static inline void print_uc (LAYOUT* layout, int index, const char* desc)
memset(utf8_char, 0, 10);
uc32_to_utf8(uc, utf8_char);
- _WRN_PRINTF("%s: character: %s (0x%x) at index: %d",
+ _WRN_PRINTF("%s: character: %s (0x%x) at index: %d\n",
desc, utf8_char, uc, index);
assert(uc != 0xa);
}
@@ -872,7 +872,7 @@ static inline BOOL can_break_at (LAYOUT *layout,
(layout->bos[offset - 1] & BOV_GB_CHAR_BREAK));
}
else {
- _WRN_PRINTF ("broken Layout");
+ _WRN_PRINTF ("broken layout\n");
}
return TRUE;
diff --git a/src/newgdi/layout.h b/src/newgdi/layout.h
index 75b7ad6f..153f893e 100644
--- a/src/newgdi/layout.h
+++ b/src/newgdi/layout.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgdi/legacy-bidi.c b/src/newgdi/legacy-bidi.c
index 49e1e639..20999010 100644
--- a/src/newgdi/legacy-bidi.c
+++ b/src/newgdi/legacy-bidi.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** bidi.c
diff --git a/src/newgdi/line.c b/src/newgdi/line.c
index 39ddb334..61c01fcd 100644
--- a/src/newgdi/line.c
+++ b/src/newgdi/line.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** line.c: drawing of line, rectangle, and spline.
diff --git a/src/newgdi/map.c b/src/newgdi/map.c
index 411c147e..fbaa8e21 100644
--- a/src/newgdi/map.c
+++ b/src/newgdi/map.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** map.c: Mapping operations of GDI.
diff --git a/src/newgdi/mi.h b/src/newgdi/mi.h
index b72e5ab1..25848792 100644
--- a/src/newgdi/mi.h
+++ b/src/newgdi/mi.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mi.h: low level advanced two dimensions graphics interfaces.
diff --git a/src/newgdi/miarc.c b/src/newgdi/miarc.c
index 1a88bb1e..eecfcdaa 100644
--- a/src/newgdi/miarc.c
+++ b/src/newgdi/miarc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/***********************************************************
diff --git a/src/newgdi/midash.c b/src/newgdi/midash.c
index 1f001649..efe7b139 100644
--- a/src/newgdi/midash.c
+++ b/src/newgdi/midash.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/***********************************************************
diff --git a/src/newgdi/midc.h b/src/newgdi/midc.h
index 1599d393..d00cf91a 100644
--- a/src/newgdi/midc.h
+++ b/src/newgdi/midc.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** midc.h: dc operations for advanced 2D graphics APIs.
diff --git a/src/newgdi/mifillarc.c b/src/newgdi/mifillarc.c
index 0000bad6..949cc8b1 100644
--- a/src/newgdi/mifillarc.c
+++ b/src/newgdi/mifillarc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/************************************************************
diff --git a/src/newgdi/mifillarc.h b/src/newgdi/mifillarc.h
index 926498e8..67622a04 100644
--- a/src/newgdi/mifillarc.h
+++ b/src/newgdi/mifillarc.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/************************************************************
diff --git a/src/newgdi/mifpoly.h b/src/newgdi/mifpoly.h
index c6ebffd5..aa0bcd71 100644
--- a/src/newgdi/mifpoly.h
+++ b/src/newgdi/mifpoly.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/***********************************************************
diff --git a/src/newgdi/mifpolycon.c b/src/newgdi/mifpolycon.c
index b9a812b1..878a81a5 100644
--- a/src/newgdi/mifpolycon.c
+++ b/src/newgdi/mifpolycon.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/***********************************************************
diff --git a/src/newgdi/mispans.c b/src/newgdi/mispans.c
index 6716f96a..441bfe10 100644
--- a/src/newgdi/mispans.c
+++ b/src/newgdi/mispans.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/***********************************************************
diff --git a/src/newgdi/mispans.h b/src/newgdi/mispans.h
index bc4bc343..793cdb3b 100644
--- a/src/newgdi/mispans.h
+++ b/src/newgdi/mispans.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/***********************************************************
diff --git a/src/newgdi/mistruct.h b/src/newgdi/mistruct.h
index 03cd3321..e2c9ddbd 100644
--- a/src/newgdi/mistruct.h
+++ b/src/newgdi/mistruct.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/***********************************************************
diff --git a/src/newgdi/miwideline.c b/src/newgdi/miwideline.c
index 947843b5..50d69982 100644
--- a/src/newgdi/miwideline.c
+++ b/src/newgdi/miwideline.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgdi/miwideline.h b/src/newgdi/miwideline.h
index 9b926c30..85e862e2 100644
--- a/src/newgdi/miwideline.h
+++ b/src/newgdi/miwideline.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgdi/obsolote/logfont.c b/src/newgdi/obsolote/logfont.c
index ef07b662..1b19f47a 100644
--- a/src/newgdi/obsolote/logfont.c
+++ b/src/newgdi/obsolote/logfont.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** NOTE: DEPRECATED.
diff --git a/src/newgdi/palette.c b/src/newgdi/palette.c
index 538db86a..1acf9773 100644
--- a/src/newgdi/palette.c
+++ b/src/newgdi/palette.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** palette.c: Palette operations of GDI.
diff --git a/src/newgdi/pixel.c b/src/newgdi/pixel.c
index 7c5ccdba..df333a7a 100644
--- a/src/newgdi/pixel.c
+++ b/src/newgdi/pixel.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pixel.c: drawing of pixel.
diff --git a/src/newgdi/pixel_ops.c b/src/newgdi/pixel_ops.c
index 02f200ac..77cd5c2a 100644
--- a/src/newgdi/pixel_ops.c
+++ b/src/newgdi/pixel_ops.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pixel_ops.c: pixel, horizontal, and vertical line operations
diff --git a/src/newgdi/pixel_ops.h b/src/newgdi/pixel_ops.h
index e4cb91cf..526c0ffb 100644
--- a/src/newgdi/pixel_ops.h
+++ b/src/newgdi/pixel_ops.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** pixel_ops.h: inline pixel operations.
diff --git a/src/newgdi/polygon.c b/src/newgdi/polygon.c
index 6b8fced9..62601b7e 100644
--- a/src/newgdi/polygon.c
+++ b/src/newgdi/polygon.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** polygon.c: monoton vertical polygon and general polygon generators.
diff --git a/src/newgdi/polygon.h b/src/newgdi/polygon.h
index 0bf428c4..59054582 100644
--- a/src/newgdi/polygon.h
+++ b/src/newgdi/polygon.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** polygon.h: internals for polygon generator.
diff --git a/src/newgdi/readbmp.c b/src/newgdi/readbmp.c
index 51928b63..ac5b8a00 100644
--- a/src/newgdi/readbmp.c
+++ b/src/newgdi/readbmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Top-level bitmap file read/save function.
diff --git a/src/newgdi/rect.c b/src/newgdi/rect.c
index b71fc369..0fcf8ea8 100644
--- a/src/newgdi/rect.c
+++ b/src/newgdi/rect.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** rect.c: Rectangle operations of GDI.
diff --git a/src/newgdi/region.c b/src/newgdi/region.c
index 22e410b5..18752ea5 100644
--- a/src/newgdi/region.c
+++ b/src/newgdi/region.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** region.c: Device-independent multi-rectangle clipping routines.
diff --git a/src/newgdi/rotatebmp.c b/src/newgdi/rotatebmp.c
index b153a6c2..52164f26 100644
--- a/src/newgdi/rotatebmp.c
+++ b/src/newgdi/rotatebmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** Top-level bitmap file rotate/scale function.
diff --git a/src/newgdi/screen.c b/src/newgdi/screen.c
index fe6f5336..7a0e660e 100644
--- a/src/newgdi/screen.c
+++ b/src/newgdi/screen.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** screen.c: Screen operations of GDI
diff --git a/src/newgdi/shape-glyphs-basic.c b/src/newgdi/shape-glyphs-basic.c
index edbe188d..8be80a5b 100644
--- a/src/newgdi/shape-glyphs-basic.c
+++ b/src/newgdi/shape-glyphs-basic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
@@ -193,7 +193,7 @@ static BOOL shape_layout_run(SEInstance* inst,
gs->glyphs[j-1].is_cluster_start = 1;
}
else {
- _WRN_PRINTF("ligatured at the first glyph?");
+ _WRN_PRINTF("ligatured at the first glyph?\n");
}
}
else {
@@ -304,7 +304,7 @@ static BOOL destroy_instance(SEInstance* instance)
return TRUE;
}
- _WRN_PRINTF("You are destroying a non-basic shaping engine instance");
+ _WRN_PRINTF("You are destroying a non-basic shaping engine instance\n");
return FALSE;
}
diff --git a/src/newgdi/shape-glyphs-complex.c b/src/newgdi/shape-glyphs-complex.c
index c5026b98..84d9ca9e 100644
--- a/src/newgdi/shape-glyphs-complex.c
+++ b/src/newgdi/shape-glyphs-complex.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
@@ -168,7 +168,7 @@ static BOOL destroy_instance(SEInstance* inst)
__FUNCTION__, inst);
if (inst->signature != 0x77520388) {
- _WRN_PRINTF("you passed a non-complex shaping engine instance.");
+ _WRN_PRINTF("you passed a non-complex shaping engine instance.\n");
return FALSE;
}
@@ -286,7 +286,7 @@ static BOOL shape_layout_run(SEInstance* inst,
gv = GetGlyphValueAlt(run->lf,
UCHAR2ACHAR(run->ucs[glyph_info[i].cluster]));
if (REAL_GLYPH(gv) == 0) {
- _WRN_PRINTF("Got an invalid glyph for uchar: 0x%04x",
+ _WRN_PRINTF("Got an invalid glyph for uchar: 0x%04x\n",
run->ucs[glyph_info[i].cluster]);
}
}
diff --git a/src/newgdi/simple-glyph-renderer.c b/src/newgdi/simple-glyph-renderer.c
index 8f761bf1..c8aa5ba8 100644
--- a/src/newgdi/simple-glyph-renderer.c
+++ b/src/newgdi/simple-glyph-renderer.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgdi/tabbedtextout.c b/src/newgdi/tabbedtextout.c
index 9cce7930..99a4afe5 100644
--- a/src/newgdi/tabbedtextout.c
+++ b/src/newgdi/tabbedtextout.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** tabbedtextout.c: Implementaion of TabbedTextOut and related functions.
diff --git a/src/newgdi/test/glyph/glyph-bitmap.c b/src/newgdi/test/glyph/glyph-bitmap.c
index ce48e2e7..a6334a8a 100644
--- a/src/newgdi/test/glyph/glyph-bitmap.c
+++ b/src/newgdi/test/glyph/glyph-bitmap.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/newgdi/test/glyph/glyph-draw.c b/src/newgdi/test/glyph/glyph-draw.c
index 0eaec92c..5ff37eee 100644
--- a/src/newgdi/test/glyph/glyph-draw.c
+++ b/src/newgdi/test/glyph/glyph-draw.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/newgdi/test/glyph/glyph-test.c b/src/newgdi/test/glyph/glyph-test.c
index ea4141b3..19fc5ed2 100644
--- a/src/newgdi/test/glyph/glyph-test.c
+++ b/src/newgdi/test/glyph/glyph-test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** $Id$
diff --git a/src/newgdi/text.c b/src/newgdi/text.c
index 0b490216..15a9ebbc 100644
--- a/src/newgdi/text.c
+++ b/src/newgdi/text.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** text.c: Implementation of general text API.
diff --git a/src/newgdi/textout.c b/src/newgdi/textout.c
index fe5f0fcc..b8eabcd7 100644
--- a/src/newgdi/textout.c
+++ b/src/newgdi/textout.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** textout.c: Implementation of TextOut and related functions.
diff --git a/src/newgdi/textruns.c b/src/newgdi/textruns.c
index d273b8b7..b7732f1b 100644
--- a/src/newgdi/textruns.c
+++ b/src/newgdi/textruns.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
@@ -466,7 +466,7 @@ TEXTRUNS* GUIAPI CreateTextRuns(const Uchar32* ucs, int nr_ucs,
}
if (!is_fontname_conformed(logfont_name)) {
- _WRN_PRINTF("Please check your fontname; it must in Unicode charset.");
+ _WRN_PRINTF("Please check your fontname; it must be in Unicode charset.\n");
return NULL;
}
diff --git a/src/newgdi/textruns.h b/src/newgdi/textruns.h
index cd8d0256..e57970ac 100644
--- a/src/newgdi/textruns.h
+++ b/src/newgdi/textruns.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/newgdi/yuv.c b/src/newgdi/yuv.c
index f8c810a8..037053c6 100644
--- a/src/newgdi/yuv.c
+++ b/src/newgdi/yuv.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** yuv.c: YUV overlay support.
diff --git a/src/server/client.c b/src/server/client.c
index 755b5f9f..6c46031b 100644
--- a/src/server/client.c
+++ b/src/server/client.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** client.c: maintain the clients in server.
diff --git a/src/server/layer.c b/src/server/layer.c
index f92641bb..e3d181dc 100644
--- a/src/server/layer.c
+++ b/src/server/layer.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** layer.c: maintain the layers in server.
diff --git a/src/server/request.c b/src/server/request.c
index 704d0a2e..dd1a58c1 100644
--- a/src/server/request.c
+++ b/src/server/request.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** request.c: handle request of clients.
diff --git a/src/server/servaccept.c b/src/server/servaccept.c
index 778d6a9f..c7335476 100644
--- a/src/server/servaccept.c
+++ b/src/server/servaccept.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** servaccept.c: accept connection from clients.
diff --git a/src/server/server.c b/src/server/server.c
index 159628f4..6b5fc509 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** server.c: routines for server.
diff --git a/src/server/servlisten.c b/src/server/servlisten.c
index 84906838..f3a67764 100644
--- a/src/server/servlisten.c
+++ b/src/server/servlisten.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** servlisten.c: Create listen socket for server.
diff --git a/src/standalone/standalone.c b/src/standalone/standalone.c
index 3bcd1b24..acdd6699 100644
--- a/src/standalone/standalone.c
+++ b/src/standalone/standalone.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** standalone.c: low-level routines for MiniGUI-Lite standalone version.
diff --git a/src/sysres/bmp/_bmp_inner_res.c b/src/sysres/bmp/_bmp_inner_res.c
index ebece5fb..28ea62e2 100644
--- a/src/sysres/bmp/_bmp_inner_res.c
+++ b/src/sysres/bmp/_bmp_inner_res.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
//inner list file
//create by inner-trans
diff --git a/src/sysres/bmp/classic_check_button.bmp.c b/src/sysres/bmp/classic_check_button.bmp.c
index 114172af..8c7bc9cf 100644
--- a/src/sysres/bmp/classic_check_button.bmp.c
+++ b/src/sysres/bmp/classic_check_button.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/classic_radio_button.bmp.c b/src/sysres/bmp/classic_radio_button.bmp.c
index 8a20cd66..19f9fa32 100644
--- a/src/sysres/bmp/classic_radio_button.bmp.c
+++ b/src/sysres/bmp/classic_radio_button.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/flat_check_button.bmp.c b/src/sysres/bmp/flat_check_button.bmp.c
index c8e53ac6..b5777faa 100644
--- a/src/sysres/bmp/flat_check_button.bmp.c
+++ b/src/sysres/bmp/flat_check_button.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/flat_radio_button.bmp.c b/src/sysres/bmp/flat_radio_button.bmp.c
index c39f6406..4a33a21f 100644
--- a/src/sysres/bmp/flat_radio_button.bmp.c
+++ b/src/sysres/bmp/flat_radio_button.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_arrows.gif.c b/src/sysres/bmp/skin_arrows.gif.c
index 6810b136..9dcc99ba 100644
--- a/src/sysres/bmp/skin_arrows.gif.c
+++ b/src/sysres/bmp/skin_arrows.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_arrows_shell.bmp.c b/src/sysres/bmp/skin_arrows_shell.bmp.c
index 632815cd..00f54f32 100644
--- a/src/sysres/bmp/skin_arrows_shell.bmp.c
+++ b/src/sysres/bmp/skin_arrows_shell.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_bborder.bmp.c b/src/sysres/bmp/skin_bborder.bmp.c
index 872cc27d..f2843f45 100644
--- a/src/sysres/bmp/skin_bborder.bmp.c
+++ b/src/sysres/bmp/skin_bborder.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_bkgnd.bmp.c b/src/sysres/bmp/skin_bkgnd.bmp.c
index 6af6b82d..507e296c 100644
--- a/src/sysres/bmp/skin_bkgnd.bmp.c
+++ b/src/sysres/bmp/skin_bkgnd.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_caption.gif.c b/src/sysres/bmp/skin_caption.gif.c
index d1aac060..0c709f33 100644
--- a/src/sysres/bmp/skin_caption.gif.c
+++ b/src/sysres/bmp/skin_caption.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_checkbtn.bmp.c b/src/sysres/bmp/skin_checkbtn.bmp.c
index 7d504921..83917a4b 100644
--- a/src/sysres/bmp/skin_checkbtn.bmp.c
+++ b/src/sysres/bmp/skin_checkbtn.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_cpn_btn.gif.c b/src/sysres/bmp/skin_cpn_btn.gif.c
index 0c413c67..339b4294 100644
--- a/src/sysres/bmp/skin_cpn_btn.gif.c
+++ b/src/sysres/bmp/skin_cpn_btn.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_header.bmp.c b/src/sysres/bmp/skin_header.bmp.c
index 0f5bc50a..6c5f9983 100644
--- a/src/sysres/bmp/skin_header.bmp.c
+++ b/src/sysres/bmp/skin_header.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_lborder.bmp.c b/src/sysres/bmp/skin_lborder.bmp.c
index 849e625d..56079b6b 100644
--- a/src/sysres/bmp/skin_lborder.bmp.c
+++ b/src/sysres/bmp/skin_lborder.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_pb_htrack.gif.c b/src/sysres/bmp/skin_pb_htrack.gif.c
index f5331b79..d0196acb 100644
--- a/src/sysres/bmp/skin_pb_htrack.gif.c
+++ b/src/sysres/bmp/skin_pb_htrack.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_pb_htruck.bmp.c b/src/sysres/bmp/skin_pb_htruck.bmp.c
index 77ffa335..d249a3f9 100644
--- a/src/sysres/bmp/skin_pb_htruck.bmp.c
+++ b/src/sysres/bmp/skin_pb_htruck.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_pb_vtrack.gif.c b/src/sysres/bmp/skin_pb_vtrack.gif.c
index bce6c92e..1ac190e3 100644
--- a/src/sysres/bmp/skin_pb_vtrack.gif.c
+++ b/src/sysres/bmp/skin_pb_vtrack.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_pb_vtruck.bmp.c b/src/sysres/bmp/skin_pb_vtruck.bmp.c
index a7fe5929..9afce23a 100644
--- a/src/sysres/bmp/skin_pb_vtruck.bmp.c
+++ b/src/sysres/bmp/skin_pb_vtruck.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_pushbtn.gif.c b/src/sysres/bmp/skin_pushbtn.gif.c
index fab1095c..a46a7dc9 100644
--- a/src/sysres/bmp/skin_pushbtn.gif.c
+++ b/src/sysres/bmp/skin_pushbtn.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_radiobtn.gif.c b/src/sysres/bmp/skin_radiobtn.gif.c
index 2d1a04b8..c3d08b4d 100644
--- a/src/sysres/bmp/skin_radiobtn.gif.c
+++ b/src/sysres/bmp/skin_radiobtn.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_rborder.bmp.c b/src/sysres/bmp/skin_rborder.bmp.c
index 1967cde2..ca8e9b55 100644
--- a/src/sysres/bmp/skin_rborder.bmp.c
+++ b/src/sysres/bmp/skin_rborder.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_sb_arrows.bmp.c b/src/sysres/bmp/skin_sb_arrows.bmp.c
index ca4d51e6..e1499b28 100644
--- a/src/sysres/bmp/skin_sb_arrows.bmp.c
+++ b/src/sysres/bmp/skin_sb_arrows.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_sb_hshaft.bmp.c b/src/sysres/bmp/skin_sb_hshaft.bmp.c
index 18fbb07e..cd6cb729 100644
--- a/src/sysres/bmp/skin_sb_hshaft.bmp.c
+++ b/src/sysres/bmp/skin_sb_hshaft.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_sb_hthumb.bmp.c b/src/sysres/bmp/skin_sb_hthumb.bmp.c
index ae80cf88..b91d4ef4 100644
--- a/src/sysres/bmp/skin_sb_hthumb.bmp.c
+++ b/src/sysres/bmp/skin_sb_hthumb.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_sb_vshaft.bmp.c b/src/sysres/bmp/skin_sb_vshaft.bmp.c
index 52c84ebe..f62f52d0 100644
--- a/src/sysres/bmp/skin_sb_vshaft.bmp.c
+++ b/src/sysres/bmp/skin_sb_vshaft.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_sb_vthumb.bmp.c b/src/sysres/bmp/skin_sb_vthumb.bmp.c
index 23c34a95..4a27ea8c 100644
--- a/src/sysres/bmp/skin_sb_vthumb.bmp.c
+++ b/src/sysres/bmp/skin_sb_vthumb.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_tab.gif.c b/src/sysres/bmp/skin_tab.gif.c
index a32bb756..8f72a451 100644
--- a/src/sysres/bmp/skin_tab.gif.c
+++ b/src/sysres/bmp/skin_tab.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_tb_horz.gif.c b/src/sysres/bmp/skin_tb_horz.gif.c
index 65c042b7..d5d6dd40 100644
--- a/src/sysres/bmp/skin_tb_horz.gif.c
+++ b/src/sysres/bmp/skin_tb_horz.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_tb_vert.gif.c b/src/sysres/bmp/skin_tb_vert.gif.c
index 087fe2c3..a22498c2 100644
--- a/src/sysres/bmp/skin_tb_vert.gif.c
+++ b/src/sysres/bmp/skin_tb_vert.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_tborder.bmp.c b/src/sysres/bmp/skin_tborder.bmp.c
index e38efd55..add84506 100644
--- a/src/sysres/bmp/skin_tborder.bmp.c
+++ b/src/sysres/bmp/skin_tborder.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_tbslider_h.gif.c b/src/sysres/bmp/skin_tbslider_h.gif.c
index 52602685..2a5af7c7 100644
--- a/src/sysres/bmp/skin_tbslider_h.gif.c
+++ b/src/sysres/bmp/skin_tbslider_h.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_tbslider_v.gif.c b/src/sysres/bmp/skin_tbslider_v.gif.c
index 0eae0110..281e7926 100644
--- a/src/sysres/bmp/skin_tbslider_v.gif.c
+++ b/src/sysres/bmp/skin_tbslider_v.gif.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/bmp/skin_tree.bmp.c b/src/sysres/bmp/skin_tree.bmp.c
index b190d603..f4d4d46b 100644
--- a/src/sysres/bmp/skin_tree.bmp.c
+++ b/src/sysres/bmp/skin_tree.bmp.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/cursor/cursors.c b/src/sysres/cursor/cursors.c
index 13f036c7..be406086 100644
--- a/src/sysres/cursor/cursors.c
+++ b/src/sysres/cursor/cursors.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/font/_font_inner_res.c b/src/sysres/font/_font_inner_res.c
index 811e65a1..e8ea27e7 100644
--- a/src/sysres/font/_font_inner_res.c
+++ b/src/sysres/font/_font_inner_res.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
//the empty inner list file
diff --git a/src/sysres/font/incore-font00.c b/src/sysres/font/incore-font00.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font00.c
+++ b/src/sysres/font/incore-font00.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font01.c b/src/sysres/font/incore-font01.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font01.c
+++ b/src/sysres/font/incore-font01.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font02.c b/src/sysres/font/incore-font02.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font02.c
+++ b/src/sysres/font/incore-font02.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font03.c b/src/sysres/font/incore-font03.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font03.c
+++ b/src/sysres/font/incore-font03.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font04.c b/src/sysres/font/incore-font04.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font04.c
+++ b/src/sysres/font/incore-font04.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font05.c b/src/sysres/font/incore-font05.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font05.c
+++ b/src/sysres/font/incore-font05.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font06.c b/src/sysres/font/incore-font06.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font06.c
+++ b/src/sysres/font/incore-font06.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font07.c b/src/sysres/font/incore-font07.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font07.c
+++ b/src/sysres/font/incore-font07.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font08.c b/src/sysres/font/incore-font08.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font08.c
+++ b/src/sysres/font/incore-font08.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font09.c b/src/sysres/font/incore-font09.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font09.c
+++ b/src/sysres/font/incore-font09.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font10.c b/src/sysres/font/incore-font10.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font10.c
+++ b/src/sysres/font/incore-font10.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font11.c b/src/sysres/font/incore-font11.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font11.c
+++ b/src/sysres/font/incore-font11.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font12.c b/src/sysres/font/incore-font12.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font12.c
+++ b/src/sysres/font/incore-font12.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font13.c b/src/sysres/font/incore-font13.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font13.c
+++ b/src/sysres/font/incore-font13.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font14.c b/src/sysres/font/incore-font14.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font14.c
+++ b/src/sysres/font/incore-font14.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font15.c b/src/sysres/font/incore-font15.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font15.c
+++ b/src/sysres/font/incore-font15.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font16.c b/src/sysres/font/incore-font16.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font16.c
+++ b/src/sysres/font/incore-font16.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font17.c b/src/sysres/font/incore-font17.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font17.c
+++ b/src/sysres/font/incore-font17.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font18.c b/src/sysres/font/incore-font18.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font18.c
+++ b/src/sysres/font/incore-font18.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font19.c b/src/sysres/font/incore-font19.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font19.c
+++ b/src/sysres/font/incore-font19.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font20.c b/src/sysres/font/incore-font20.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font20.c
+++ b/src/sysres/font/incore-font20.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font21.c b/src/sysres/font/incore-font21.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font21.c
+++ b/src/sysres/font/incore-font21.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font22.c b/src/sysres/font/incore-font22.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font22.c
+++ b/src/sysres/font/incore-font22.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font23.c b/src/sysres/font/incore-font23.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font23.c
+++ b/src/sysres/font/incore-font23.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font24.c b/src/sysres/font/incore-font24.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font24.c
+++ b/src/sysres/font/incore-font24.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font25.c b/src/sysres/font/incore-font25.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font25.c
+++ b/src/sysres/font/incore-font25.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font26.c b/src/sysres/font/incore-font26.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font26.c
+++ b/src/sysres/font/incore-font26.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font27.c b/src/sysres/font/incore-font27.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font27.c
+++ b/src/sysres/font/incore-font27.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font28.c b/src/sysres/font/incore-font28.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font28.c
+++ b/src/sysres/font/incore-font28.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font29.c b/src/sysres/font/incore-font29.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font29.c
+++ b/src/sysres/font/incore-font29.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font30.c b/src/sysres/font/incore-font30.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font30.c
+++ b/src/sysres/font/incore-font30.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/font/incore-font31.c b/src/sysres/font/incore-font31.c
index 9c5e183a..045d2262 100644
--- a/src/sysres/font/incore-font31.c
+++ b/src/sysres/font/incore-font31.c
@@ -41,5 +41,5 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
diff --git a/src/sysres/icon/_icon_inner_res.c b/src/sysres/icon/_icon_inner_res.c
index c87d58c2..95ede742 100644
--- a/src/sysres/icon/_icon_inner_res.c
+++ b/src/sysres/icon/_icon_inner_res.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
//inner list file
//create by inner-trans
diff --git a/src/sysres/icon/excalmatory-flat.ico.c b/src/sysres/icon/excalmatory-flat.ico.c
index 3e4140e2..2ebf49b2 100644
--- a/src/sysres/icon/excalmatory-flat.ico.c
+++ b/src/sysres/icon/excalmatory-flat.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/excalmatory.ico.c b/src/sysres/icon/excalmatory.ico.c
index b0bb0272..6fa1b312 100644
--- a/src/sysres/icon/excalmatory.ico.c
+++ b/src/sysres/icon/excalmatory.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/failed-flat.ico.c b/src/sysres/icon/failed-flat.ico.c
index 1dc7e75a..7a3d0f0a 100644
--- a/src/sysres/icon/failed-flat.ico.c
+++ b/src/sysres/icon/failed-flat.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/failed.ico.c b/src/sysres/icon/failed.ico.c
index f9ef08ad..337e0116 100644
--- a/src/sysres/icon/failed.ico.c
+++ b/src/sysres/icon/failed.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/fold-flat.ico.c b/src/sysres/icon/fold-flat.ico.c
index 0d0dc46d..84d08cda 100644
--- a/src/sysres/icon/fold-flat.ico.c
+++ b/src/sysres/icon/fold-flat.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/fold.ico.c b/src/sysres/icon/fold.ico.c
index 7af54379..9ec0124d 100644
--- a/src/sysres/icon/fold.ico.c
+++ b/src/sysres/icon/fold.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/folder-flat.ico.c b/src/sysres/icon/folder-flat.ico.c
index 3172d959..ca91252b 100644
--- a/src/sysres/icon/folder-flat.ico.c
+++ b/src/sysres/icon/folder-flat.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/folder.ico.c b/src/sysres/icon/folder.ico.c
index 971b6b56..df044523 100644
--- a/src/sysres/icon/folder.ico.c
+++ b/src/sysres/icon/folder.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/form-flat.ico.c b/src/sysres/icon/form-flat.ico.c
index 45eff86e..0e1283ca 100644
--- a/src/sysres/icon/form-flat.ico.c
+++ b/src/sysres/icon/form-flat.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/form.ico.c b/src/sysres/icon/form.ico.c
index 960016d6..6a3a9af0 100644
--- a/src/sysres/icon/form.ico.c
+++ b/src/sysres/icon/form.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/help-flat.ico.c b/src/sysres/icon/help-flat.ico.c
index 243720d3..46d0d89a 100644
--- a/src/sysres/icon/help-flat.ico.c
+++ b/src/sysres/icon/help-flat.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/help.ico.c b/src/sysres/icon/help.ico.c
index 7d9b14a8..7ab653ec 100644
--- a/src/sysres/icon/help.ico.c
+++ b/src/sysres/icon/help.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/textfile-flat.ico.c b/src/sysres/icon/textfile-flat.ico.c
index e773ce86..6c5811b2 100644
--- a/src/sysres/icon/textfile-flat.ico.c
+++ b/src/sysres/icon/textfile-flat.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/textfile.ico.c b/src/sysres/icon/textfile.ico.c
index 5fc34061..ba5981c2 100644
--- a/src/sysres/icon/textfile.ico.c
+++ b/src/sysres/icon/textfile.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/unfold-flat.ico.c b/src/sysres/icon/unfold-flat.ico.c
index fdb93b80..b1849fbe 100644
--- a/src/sysres/icon/unfold-flat.ico.c
+++ b/src/sysres/icon/unfold-flat.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/unfold.ico.c b/src/sysres/icon/unfold.ico.c
index 470c5cbf..f748cffa 100644
--- a/src/sysres/icon/unfold.ico.c
+++ b/src/sysres/icon/unfold.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/warning-flat.ico.c b/src/sysres/icon/warning-flat.ico.c
index 7623e985..64c09531 100644
--- a/src/sysres/icon/warning-flat.ico.c
+++ b/src/sysres/icon/warning-flat.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/icon/warning.ico.c b/src/sysres/icon/warning.ico.c
index f02b4f06..fce5e89d 100644
--- a/src/sysres/icon/warning.ico.c
+++ b/src/sysres/icon/warning.ico.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include "common.h"
diff --git a/src/sysres/incoreres.c b/src/sysres/incoreres.c
index 19009d3d..f6b592b3 100644
--- a/src/sysres/incoreres.c
+++ b/src/sysres/incoreres.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** resource.c: This file include some functions for system resource loading.
diff --git a/src/sysres/license/genkey.sh b/src/sysres/license/genkey.sh
index 255941e4..7899cd78 100755
--- a/src/sysres/license/genkey.sh
+++ b/src/sysres/license/genkey.sh
@@ -30,7 +30,7 @@
## under the terms and conditions of the commercial license.
##
## For more information about the commercial license, please refer to
-## .
+## .
##
TMP_FILE=_tmp_list
diff --git a/src/sysres/license/runme.sh b/src/sysres/license/runme.sh
index c9a2f2a7..3f54cd39 100755
--- a/src/sysres/license/runme.sh
+++ b/src/sysres/license/runme.sh
@@ -30,7 +30,7 @@
## under the terms and conditions of the commercial license.
##
## For more information about the commercial license, please refer to
-## .
+## .
##
if [ $# -ne 1 ]; then
diff --git a/src/sysres/mgetc.c b/src/sysres/mgetc.c
index 42065178..8428b09a 100644
--- a/src/sysres/mgetc.c
+++ b/src/sysres/mgetc.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*************************************************
* This is inside mode of system res configuation *
diff --git a/src/sysres/mgetc_win32.c b/src/sysres/mgetc_win32.c
index 6017e0e4..02f32cb3 100644
--- a/src/sysres/mgetc_win32.c
+++ b/src/sysres/mgetc_win32.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*************************************************
* This is inside mode of system res configuation *
diff --git a/src/sysres/mkinnerres.sh b/src/sysres/mkinnerres.sh
index d8807912..b781214e 100755
--- a/src/sysres/mkinnerres.sh
+++ b/src/sysres/mkinnerres.sh
@@ -30,7 +30,7 @@
## under the terms and conditions of the commercial license.
##
## For more information about the commercial license, please refer to
-## .
+## .
##
MGCFG_TRANS=mgcfg-trans #get it from svn+ssh://devsrv/home/projects/svn/mg-tools/trunk/mgcfg-trans/bin/windowsxp or bin/ubuntu10.04
diff --git a/src/sysres/resmgr.c b/src/sysres/resmgr.c
index fbb4226b..0938fd4e 100644
--- a/src/sysres/resmgr.c
+++ b/src/sysres/resmgr.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** resmgr.c: This file include some functions for resource manager.
diff --git a/src/sysres/resmgr.h b/src/sysres/resmgr.h
index 168394b8..aec13074 100644
--- a/src/sysres/resmgr.h
+++ b/src/sysres/resmgr.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** resmgr.h: This head file include some functions for resource manager.
diff --git a/src/sysres/resource.c b/src/sysres/resource.c
index 354257c9..1f005afd 100644
--- a/src/sysres/resource.c
+++ b/src/sysres/resource.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** resource.c: This file include some functions for system resource loading.
diff --git a/src/sysres/test/drawcursor.c b/src/sysres/test/drawcursor.c
index 1b9fd2b1..aec475ea 100644
--- a/src/sysres/test/drawcursor.c
+++ b/src/sysres/test/drawcursor.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/sysres/test/drawicon.c b/src/sysres/test/drawicon.c
index 822ac97e..9f60315b 100644
--- a/src/sysres/test/drawicon.c
+++ b/src/sysres/test/drawicon.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/sysres/test/drawimage.c b/src/sysres/test/drawimage.c
index 89e63849..4639b1c7 100644
--- a/src/sysres/test/drawimage.c
+++ b/src/sysres/test/drawimage.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/sysres/test/incore_pic.c b/src/sysres/test/incore_pic.c
index ba301021..dc1a0621 100644
--- a/src/sysres/test/incore_pic.c
+++ b/src/sysres/test/incore_pic.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/sysres/test/skin_test.c b/src/sysres/test/skin_test.c
index 4dbc865a..90b5b7ff 100644
--- a/src/sysres/test/skin_test.c
+++ b/src/sysres/test/skin_test.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
diff --git a/src/sysres/test/tools/qsort.c b/src/sysres/test/tools/qsort.c
index a6713ea6..074cb6ed 100644
--- a/src/sysres/test/tools/qsort.c
+++ b/src/sysres/test/tools/qsort.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
#include
#include
diff --git a/src/template.c b/src/template.c
index 35d4b414..28ae75d5 100644
--- a/src/template.c
+++ b/src/template.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** template.c: a template for source code of MiniGUI
diff --git a/src/template.h b/src/template.h
index 74369e77..5643467f 100644
--- a/src/template.h
+++ b/src/template.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** template.h: the template header file.
diff --git a/src/textedit/mbtree.c b/src/textedit/mbtree.c
index c80c6e1c..ff68be79 100644
--- a/src/textedit/mbtree.c
+++ b/src/textedit/mbtree.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
* btree.c: btree implementation.
diff --git a/src/textedit/mbtree.h b/src/textedit/mbtree.h
index fe9b93c8..a4253de4 100644
--- a/src/textedit/mbtree.h
+++ b/src/textedit/mbtree.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** btree.h: this head file declares btree structure.
diff --git a/src/textedit/mtextedit.c b/src/textedit/mtextedit.c
index 11995902..5d3d6e38 100644
--- a/src/textedit/mtextedit.c
+++ b/src/textedit/mtextedit.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** textedit.c: the new textedit module.
diff --git a/src/textedit/mtextedit.h b/src/textedit/mtextedit.h
index 3ebc3311..67d3f759 100644
--- a/src/textedit/mtextedit.h
+++ b/src/textedit/mtextedit.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
diff --git a/src/textedit/mtexteditbase.h b/src/textedit/mtexteditbase.h
index 3ca8652a..fe311c0d 100644
--- a/src/textedit/mtexteditbase.h
+++ b/src/textedit/mtexteditbase.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** texteditbase.h: base header for the new text edit module.
diff --git a/src/textedit/mwidget.c b/src/textedit/mwidget.c
index c6df6249..1030b2fe 100644
--- a/src/textedit/mwidget.c
+++ b/src/textedit/mwidget.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mwidget.c:
diff --git a/src/textedit/mwidget.h b/src/textedit/mwidget.h
index a4331d16..bfa66d86 100644
--- a/src/textedit/mwidget.h
+++ b/src/textedit/mwidget.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** mwidget.h: this file is to make same as mgncs
diff --git a/src/textedit/object.c b/src/textedit/object.c
index 238fbd46..7e10cce2 100644
--- a/src/textedit/object.c
+++ b/src/textedit/object.c
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** object.c: The implemenation of mObject class for the new textedit module.
diff --git a/src/textedit/object.h b/src/textedit/object.h
index f64c30f5..e43f1aa8 100644
--- a/src/textedit/object.h
+++ b/src/textedit/object.h
@@ -41,7 +41,7 @@
* under the terms and conditions of the commercial license.
*
* For more information about the commercial license, please refer to
- * .
+ * .
*/
/*
** object.h: This file include the basic object defines.