Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 234824 | Differences between
and this patch

Collapse All | Expand All

(-)a/CMakeLists.txt (+7 lines)
Lines 26-30 else() Link Here
26
    set(LIBDIR "lib")
26
    set(LIBDIR "lib")
27
endif()
27
endif()
28
28
29
# Hide non exported functions/variables
30
include(CheckCCompilerFlag)
31
check_c_compiler_flag("-fvisibility=hidden -DHAVE_GCCVISIBILITY" HAVE_GCCVISIBILITY)
32
if (HAVE_GCCVISIBILITY)
33
	add_definitions("-fvisibility=hidden -DHAVE_GCCVISIBILITY")
34
endif (HAVE_GCCVISIBILITY)
35
29
add_subdirectory(datafiles)
36
add_subdirectory(datafiles)
30
add_subdirectory(cuneiform_src)
37
add_subdirectory(cuneiform_src)
(-)a/cuneiform_src/Kern/CMakeLists.txt (+2 lines)
Lines 1-3 Link Here
1
add_definitions("-D__DPUMA__")
1
include_directories(include
2
include_directories(include
2
h
3
h
3
hh
4
hh
Lines 107-112 cimage loc rdib cfio) Link Here
107
#target_link_libraries(rpstrtest ${RPSTR_LIBS})
108
#target_link_libraries(rpstrtest ${RPSTR_LIBS})
108
109
109
add_library(windummy ${LIBTYPE} windummy.c)
110
add_library(windummy ${LIBTYPE} windummy.c)
111
set_property(TARGET windummy PROPERTY COMPILE_DEFINITIONS __WINDUMMY__)
110
target_link_libraries(windummy ${DL_LIB})
112
target_link_libraries(windummy ${DL_LIB})
111
113
112
add_executable(cuneiform cuneiform-cli.cpp)
114
add_executable(cuneiform cuneiform-cli.cpp)
(-)a/cuneiform_src/Kern/ccom/CMakeLists.txt (+1 lines)
Lines 3-8 include_directories(src) Link Here
3
add_library(ccom ${LIBTYPE}
3
add_library(ccom ${LIBTYPE}
4
src/ccom.c
4
src/ccom.c
5
src/ccom_loc.c)
5
src/ccom_loc.c)
6
set_property(TARGET ccom PROPERTY COMPILE_DEFINITIONS __CCOM__)
6
7
7
if(WIN32)
8
if(WIN32)
8
  install(TARGETS ccom ARCHIVE DESTINATION ${LIBDIR})
9
  install(TARGETS ccom ARCHIVE DESTINATION ${LIBDIR})
(-)a/cuneiform_src/Kern/ced/CMakeLists.txt (+1 lines)
Lines 10-15 sources/main/dll.cpp Link Here
10
sources/main/stdafx.cpp
10
sources/main/stdafx.cpp
11
sources/main/wrapper.cpp
11
sources/main/wrapper.cpp
12
)
12
)
13
set_property(TARGET ced PROPERTY COMPILE_DEFINITIONS __CED__)
13
14
14
target_link_libraries(ced cfio windummy)
15
target_link_libraries(ced cfio windummy)
15
16
(-)a/cuneiform_src/Kern/cfio/CMakeLists.txt (+1 lines)
Lines 8-13 sources/cpp/ctcmemory.cpp Link Here
8
sources/cpp/ctcstorage.cpp
8
sources/cpp/ctcstorage.cpp
9
sources/cpp/dll_main.cpp
9
sources/cpp/dll_main.cpp
10
)
10
)
11
set_property(TARGET cfio PROPERTY COMPILE_DEFINITIONS __CFIO__)
11
12
12
target_link_libraries(cfio windummy)
13
target_link_libraries(cfio windummy)
13
14
(-)a/cuneiform_src/Kern/cfio/sources/cpp/dll_main.cpp (-1 lines)
Lines 67-73 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
67
//                    started at 25 may 1998                                    //
67
//                    started at 25 may 1998                                    //
68
//                                                                              //
68
//                                                                              //
69
//////////////////////////////////////////////////////////////////////////////////
69
//////////////////////////////////////////////////////////////////////////////////
70
#define __CFIO__
71
//#define CFIO_USE_WIN32_API
70
//#define CFIO_USE_WIN32_API
72
#include "ctccontrol.h"
71
#include "ctccontrol.h"
73
//#undef CFIO_USE_WIN32_API
72
//#undef CFIO_USE_WIN32_API
(-)a/cuneiform_src/Kern/cimage/CMakeLists.txt (+1 lines)
Lines 12-17 sources/main/ctimasklinesegment.cpp Link Here
12
sources/main/ctimemory.cpp
12
sources/main/ctimemory.cpp
13
sources/main/dll.cpp
13
sources/main/dll.cpp
14
)
14
)
15
set_property(TARGET cimage PROPERTY COMPILE_DEFINITIONS __CIMAGE__)
15
16
16
target_link_libraries(cimage cfio rdib)
17
target_link_libraries(cimage cfio rdib)
17
18
(-)a/cuneiform_src/Kern/cimage/sources/main/ctiimage.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __CIMAGE__
58
59
#include "resource.h"
57
#include "resource.h"
60
#include "ctidefines.h"
58
#include "ctidefines.h"
61
#include "ctiimage.h"
59
#include "ctiimage.h"
(-)a/cuneiform_src/Kern/cimage/sources/main/dll.cpp (-2 lines)
Lines 61-68 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
61
//
61
//
62
// dll_cpage.cpp :
62
// dll_cpage.cpp :
63
// ============================================================================
63
// ============================================================================
64
#define __CIMAGE__
65
66
/*#include <windows.h>*/
64
/*#include <windows.h>*/
67
65
68
#include "resource.h"
66
#include "resource.h"
(-)a/cuneiform_src/Kern/cline/CMakeLists.txt (+1 lines)
Lines 8-13 sources/src/main/clinemain.cpp Link Here
8
sources/src/cpp/debug.cpp
8
sources/src/cpp/debug.cpp
9
sources/src/cpp/lcline.cpp
9
sources/src/cpp/lcline.cpp
10
)
10
)
11
set_property(TARGET cline PROPERTY COMPILE_DEFINITIONS __CLINE__)
11
12
12
target_link_libraries(cline windummy)
13
target_link_libraries(cline windummy)
13
14
(-)a/cuneiform_src/Kern/cline/sources/src/main/clinebase.cpp (-1 lines)
Lines 54-60 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __CLINE__
58
/*#include <crtdbg.h>*/
57
/*#include <crtdbg.h>*/
59
#include <assert.h>
58
#include <assert.h>
60
#include <stdlib.h>
59
#include <stdlib.h>
(-)a/cuneiform_src/Kern/cline/sources/src/main/clinemain.cpp (-1 lines)
Lines 55-61 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
55
*/
55
*/
56
56
57
/*#include<windows.h>*/
57
/*#include<windows.h>*/
58
#define __CLINE__
59
58
60
#include<stdio.h>
59
#include<stdio.h>
61
#include "clinefunc.h"
60
#include "clinefunc.h"
(-)a/cuneiform_src/Kern/cpage/CMakeLists.txt (+1 lines)
Lines 18-23 sources/cpp/picture.cpp Link Here
18
sources/cpp/table.cpp
18
sources/cpp/table.cpp
19
sources/cpp/tableclass.cpp
19
sources/cpp/tableclass.cpp
20
)
20
)
21
set_property(TARGET cpage PROPERTY COMPILE_DEFINITIONS __CPAGE__)
21
22
22
target_link_libraries(cpage windummy)
23
target_link_libraries(cpage windummy)
23
24
(-)a/cuneiform_src/Kern/cpage/sources/cpp/backup.h (-1 lines)
Lines 57-63 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
57
#ifndef __BACKUP_H__
57
#ifndef __BACKUP_H__
58
#define __BACKUP_H__
58
#define __BACKUP_H__
59
59
60
#define __CPAGE__
61
//#define DPUMA_ON 1
60
//#define DPUMA_ON 1
62
61
63
#include "page.h"
62
#include "page.h"
(-)a/cuneiform_src/Kern/cpage/sources/cpp/compress.cpp (-2 lines)
Lines 56-63 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
56
56
57
/*#include <windows.h>*/
57
/*#include <windows.h>*/
58
58
59
#define __CPAGE__
60
61
#include "globus.h"
59
#include "globus.h"
62
#include "cpage.h"
60
#include "cpage.h"
63
#include "backup.h"
61
#include "backup.h"
(-)a/cuneiform_src/Kern/cpage/sources/cpp/cpicture.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __CPAGE__
58
59
/*#include <windows.h>*/
57
/*#include <windows.h>*/
60
#include <stdlib.h>
58
#include <stdlib.h>
61
59
(-)a/cuneiform_src/Kern/cpage/sources/cpp/data.cpp (-2 lines)
Lines 58-65 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
58
#include <memory.h>
58
#include <memory.h>
59
#include <string.h>
59
#include <string.h>
60
60
61
#define __CPAGE__
62
63
#include "cpage.h"
61
#include "cpage.h"
64
#include "data.h"
62
#include "data.h"
65
#include "mymem.h"
63
#include "mymem.h"
(-)a/cuneiform_src/Kern/cpage/sources/cpp/defconvert.cpp (-2 lines)
Lines 56-63 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
56
56
57
/*#include <windows.h>*/
57
/*#include <windows.h>*/
58
58
59
#define __CPAGE__
60
61
#include "globus.h"
59
#include "globus.h"
62
#include "cpage.h"
60
#include "cpage.h"
63
#include "backup.h"
61
#include "backup.h"
(-)a/cuneiform_src/Kern/cpage/sources/cpp/page.cpp (-2 lines)
Lines 56-63 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
56
56
57
#include <memory.h>
57
#include <memory.h>
58
58
59
#define __CPAGE__
60
61
#include "backup.h"
59
#include "backup.h"
62
#include "page.h"
60
#include "page.h"
63
61
(-)a/cuneiform_src/Kern/cpage/sources/cpp/picture.cpp (-2 lines)
Lines 56-63 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
56
56
57
/*#include <windows.h>*/
57
/*#include <windows.h>*/
58
58
59
#define __CPAGE__
60
61
#include "globus.h"
59
#include "globus.h"
62
#include "cpage.h"
60
#include "cpage.h"
63
#include "backup.h"
61
#include "backup.h"
(-)a/cuneiform_src/Kern/cpage/sources/cpp/table.cpp (-2 lines)
Lines 56-63 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
56
56
57
/*#include <windows.h>*/
57
/*#include <windows.h>*/
58
58
59
#define __CPAGE__
60
61
#include "globus.h"
59
#include "globus.h"
62
#include "cpage.h"
60
#include "cpage.h"
63
#include "backup.h"
61
#include "backup.h"
(-)a/cuneiform_src/Kern/cpage/sources/cpp/tableclass.cpp (-2 lines)
Lines 57-64 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
57
// TableClass.cpp: implementation of the TableClass class.
57
// TableClass.cpp: implementation of the TableClass class.
58
//
58
//
59
//////////////////////////////////////////////////////////////////////
59
//////////////////////////////////////////////////////////////////////
60
#define __CPAGE__
61
62
#include "mymem.h"
60
#include "mymem.h"
63
#include "tableclass.h"
61
#include "tableclass.h"
64
//////////////////////////////////////////////////////////////////////
62
//////////////////////////////////////////////////////////////////////
(-)a/cuneiform_src/Kern/cpage/sources/main/cpage.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __CPAGE__
58
59
#include "resource.h"
57
#include "resource.h"
60
#include "cpage.h"
58
#include "cpage.h"
61
#include "backup.h"
59
#include "backup.h"
(-)a/cuneiform_src/Kern/cpage/sources/main/ctablex.cpp (-2 lines)
Lines 56-63 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
56
56
57
/*#include <windows.h>*/
57
/*#include <windows.h>*/
58
58
59
#define __CPAGE__
60
61
#include "resource.h"
59
#include "resource.h"
62
#include "mymem.h"
60
#include "mymem.h"
63
#include "cpage.h"
61
#include "cpage.h"
(-)a/cuneiform_src/Kern/cpage/sources/main/dll_cpage.cpp (-2 lines)
Lines 64-71 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
64
64
65
/*#include <windows.h>*/
65
/*#include <windows.h>*/
66
66
67
#define __CPAGE__
68
69
#include "resource.h"
67
#include "resource.h"
70
#include "cpage.h"
68
#include "cpage.h"
71
#include "backup.h"
69
#include "backup.h"
(-)a/cuneiform_src/Kern/cpu/CMakeLists.txt (+1 lines)
Lines 2-7 add_library(cpu ${LIBTYPE} Link Here
2
src/cpu.c
2
src/cpu.c
3
src/cpu32.c
3
src/cpu32.c
4
)
4
)
5
set_property(TARGET cpu PROPERTY COMPILE_DEFINITIONS __CPU__)
5
6
6
if(WIN32)
7
if(WIN32)
7
  install(TARGETS cpu ARCHIVE DESTINATION ${LIBDIR})
8
  install(TARGETS cpu ARCHIVE DESTINATION ${LIBDIR})
(-)a/cuneiform_src/Kern/cpu/src/cpu32.c (-4 / +4 lines)
Lines 54-64 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
//#include "cpu.h"
57
#include "cpu.h"
58
#include "decl.h"
58
#include "decl.h"
59
#define PC_TYPE
59
#define PC_TYPE
60
60
61
__declspec( dllexport ) int GetCPUName(void)
61
CPU_FUNC(int) GetCPUName(void)
62
{
62
{
63
#ifdef PC_TYPE
63
#ifdef PC_TYPE
64
64
Lines 69-75 __declspec( dllexport ) int GetCPUName(void) Link Here
69
#endif
69
#endif
70
}
70
}
71
71
72
__declspec( dllexport ) int Get_MMX(void)
72
CPU_FUNC(int) Get_MMX(void)
73
{
73
{
74
#ifdef PC_TYPE
74
#ifdef PC_TYPE
75
75
Lines 80-86 __declspec( dllexport ) int Get_MMX(void) Link Here
80
#endif
80
#endif
81
}
81
}
82
82
83
__declspec( dllexport ) int Get_XMM(void)
83
CPU_FUNC(int) Get_XMM(void)
84
{
84
{
85
#ifdef PC_TYPE
85
#ifdef PC_TYPE
86
86
(-)a/cuneiform_src/Kern/cstr/CMakeLists.txt (+1 lines)
Lines 3-8 include_directories(src) Link Here
3
add_library(cstr ${LIBTYPE}
3
add_library(cstr ${LIBTYPE}
4
src/cgraph.cpp
4
src/cgraph.cpp
5
src/cstr.c)
5
src/cstr.c)
6
set_property(TARGET cstr PROPERTY COMPILE_DEFINITIONS __CSTR__)
6
7
7
target_link_libraries(cstr ccom)
8
target_link_libraries(cstr ccom)
8
9
(-)a/cuneiform_src/Kern/ctb/CMakeLists.txt (+1 lines)
Lines 8-13 src/ctb_prot.c Link Here
8
src/ctb_recr.c
8
src/ctb_recr.c
9
src/ctb_tool.c
9
src/ctb_tool.c
10
)
10
)
11
set_property(TARGET ctb32 PROPERTY COMPILE_DEFINITIONS __CTB__)
11
12
12
target_link_libraries(ctb32 windummy)
13
target_link_libraries(ctb32 windummy)
13
14
(-)a/cuneiform_src/Kern/ctb/src/ctb_tool.c (-2 / +2 lines)
Lines 116-123 Bool32 CTB_files_init(char *file_name,Word8 *data,Int16 maxX,Int16 maxY, Link Here
116
//********************************************************************
116
//********************************************************************
117
Int32   ctb_err_code = CTB_ERR_NONE;   // error code
117
Int32   ctb_err_code = CTB_ERR_NONE;   // error code
118
char * ctb_tmp_dir=NULL;
118
char * ctb_tmp_dir=NULL;
119
char local_grey_ctb[256] = "page6666";
119
CTB_FUNC(char) local_grey_ctb[256] = "page6666";
120
char local_ctb_name[256] = "ct666666";
120
CTB_FUNC(char) local_ctb_name[256] = "ct666666";
121
//********************************************************************
121
//********************************************************************
122
//***********  EXPORT functions from CTB_pack ************************
122
//***********  EXPORT functions from CTB_pack ************************
123
//********************************************************************
123
//********************************************************************
(-)a/cuneiform_src/Kern/dif/CMakeLists.txt (+1 lines)
Lines 8-13 src/sticchar.c Link Here
8
src/sticdif.c
8
src/sticdif.c
9
src/stictool.c
9
src/stictool.c
10
)
10
)
11
set_property(TARGET dif PROPERTY COMPILE_DEFINITIONS __DIF__)
11
12
12
if(WIN32)
13
if(WIN32)
13
  install(TARGETS dif ARCHIVE DESTINATION ${LIBDIR})
14
  install(TARGETS dif ARCHIVE DESTINATION ${LIBDIR})
(-)a/cuneiform_src/Kern/evn32/CMakeLists.txt (+1 lines)
Lines 12-17 src/v0compev.c Link Here
12
src/v0compgl.c
12
src/v0compgl.c
13
src/v0comprq.c
13
src/v0comprq.c
14
)
14
)
15
set_property(TARGET evn32 PROPERTY COMPILE_DEFINITIONS __EVN__)
15
16
16
target_link_libraries(evn32 dif windummy)
17
target_link_libraries(evn32 dif windummy)
17
18
(-)a/cuneiform_src/Kern/exc/CMakeLists.txt (+1 lines)
Lines 10-15 src/v0compan.c Link Here
10
src/v0compgl.c
10
src/v0compgl.c
11
src/v0compmn.c
11
src/v0compmn.c
12
)
12
)
13
set_property(TARGET exc PROPERTY COMPILE_DEFINITIONS __EXC__)
13
14
14
target_link_libraries(exc loc ccom evn32)
15
target_link_libraries(exc loc ccom evn32)
15
16
(-)a/cuneiform_src/Kern/fon/CMakeLists.txt (+1 lines)
Lines 15-20 src/p2_mem.c Link Here
15
src/p2_thick.c
15
src/p2_thick.c
16
src/utilctb.c
16
src/utilctb.c
17
)
17
)
18
set_property(TARGET fon PROPERTY COMPILE_DEFINITIONS __FON__)
18
19
19
target_link_libraries(fon cstr ctb32)
20
target_link_libraries(fon cstr ctb32)
20
21
(-)a/cuneiform_src/Kern/h/globus.h (+13 lines)
Lines 152-157 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
152
            #define CDECL      __cdecl
152
            #define CDECL      __cdecl
153
         #endif
153
         #endif
154
      #endif
154
      #endif
155
   #elif    defined( __GNUC_MINOR__ ) && defined(HAVE_GCCVISIBILITY) /* GNU Compiler Suite ******/
156
         #define CLA_IMPO
157
         #define CLA_EXPO __attribute__ ((visibility("default")))
158
         #define FUN_IMPO__
159
         #define __FUN_IMPO
160
         #define FUN_EXPO__ __attribute__ ((visibility("default")))
161
         #define __FUN_EXPO
162
         #ifndef PASCAL
163
            #define PASCAL __attribute__ ((stdcall))
164
         #endif
165
         #ifndef CDECL
166
            #define CDECL __attribute__ ((cdecl))
167
         #endif
155
   #else /* unknown compiler ******************************************/
168
   #else /* unknown compiler ******************************************/
156
	     #define CLA_IMPO
169
	     #define CLA_IMPO
157
         #define CLA_EXPO
170
         #define CLA_EXPO
(-)a/cuneiform_src/Kern/hdebug/__snp.c (-35 / +35 lines)
Lines 179-185 static int __DPUMA__AllocHook__( int allocType, void *userData, size_t size, int Link Here
179
}
179
}
180
180
181
//////////////////////////////////////////////
181
//////////////////////////////////////////////
182
Bool32   LDPUMA_Init(Word16 wHightCode, Handle hStorage)
182
DPUMA_FUNC(Bool32)   LDPUMA_Init(Word16 wHightCode, Handle hStorage)
183
{
183
{
184
Bool32 rc = FALSE;
184
Bool32 rc = FALSE;
185
#ifdef _DEBUG
185
#ifdef _DEBUG
Lines 290-296 Bool32 rc = FALSE; Link Here
290
	return rc;
290
	return rc;
291
}
291
}
292
//////////////////////////////////////////////
292
//////////////////////////////////////////////
293
Bool32 LDPUMA_Done()
293
DPUMA_FUNC(Bool32) LDPUMA_Done()
294
{
294
{
295
	Bool32 rc = FALSE;
295
	Bool32 rc = FALSE;
296
#ifdef _DEBUG
296
#ifdef _DEBUG
Lines 346-370 Word32 LDPUMA_CreateSnap() Link Here
346
	return rc;
346
	return rc;
347
}
347
}
348
//////////////////////////////////////////////
348
//////////////////////////////////////////////
349
void LDPUMA_Stop()
349
DPUMA_FUNC(void) LDPUMA_Stop()
350
{
350
{
351
	if(Stop)
351
	if(Stop)
352
		 Stop();
352
		 Stop();
353
}
353
}
354
//////////////////////////////////////////////
354
//////////////////////////////////////////////
355
Handle LDPUMA_CreateWindow(const char * lpName, void * lpDIB)
355
DPUMA_FUNC(Handle) LDPUMA_CreateWindow(const char * lpName, void * lpDIB)
356
{
356
{
357
	if(fCreateWindow)
357
	if(fCreateWindow)
358
		return fCreateWindow(lpName,lpDIB);
358
		return fCreateWindow(lpName,lpDIB);
359
	return NULL;
359
	return NULL;
360
}
360
}
361
//////////////////////////////////////////////
361
//////////////////////////////////////////////
362
Bool32 LDPUMA_IsActive(void)
362
DPUMA_FUNC(Bool32) LDPUMA_IsActive(void)
363
{
363
{
364
	return IsActive ? IsActive():FALSE;
364
	return IsActive ? IsActive():FALSE;
365
};
365
};
366
//////////////////////////////////////////////
366
//////////////////////////////////////////////
367
void   LDPUMA_DrawRect(Handle wnd,Rect16* rc, Int32 skew, Word32 rgb_color,
367
DPUMA_FUNC(void)   LDPUMA_DrawRect(Handle wnd,Rect16* rc, Int32 skew, Word32 rgb_color,
368
      Int16 pen_width,Word32 key)
368
      Int16 pen_width,Word32 key)
369
{
369
{
370
	if(DrawRect)
370
	if(DrawRect)
Lines 378-390 void LDPUMA_DrawRectTip(Handle wnd,Rect16* rc, Int32 skew, Word32 rgb_color, Link Here
378
		DrawRectTip(wnd,rc,skew,rgb_color,(Int16)pen_width,key,pTip);
378
		DrawRectTip(wnd,rc,skew,rgb_color,(Int16)pen_width,key,pTip);
379
}
379
}
380
//////////////////////////////////////////////
380
//////////////////////////////////////////////
381
void   LDPUMA_DeleteRects(Handle wnd, Word32 key)
381
DPUMA_FUNC(void)   LDPUMA_DeleteRects(Handle wnd, Word32 key)
382
{
382
{
383
	if(DeleteRects)
383
	if(DeleteRects)
384
		DeleteRects(wnd,key);
384
		DeleteRects(wnd,key);
385
};
385
};
386
//////////////////////////////////////////////
386
//////////////////////////////////////////////
387
void  LDPUMA_DrawLine(Handle wnd,Point16* start, Point16* end, Int32 skew,
387
DPUMA_FUNC(void)  LDPUMA_DrawLine(Handle wnd,Point16* start, Point16* end, Int32 skew,
388
      Word32 rgb_color,Int16 pen_width,Word32 key )
388
      Word32 rgb_color,Int16 pen_width,Word32 key )
389
{
389
{
390
	if(DrawLine)
390
	if(DrawLine)
Lines 398-404 void LDPUMA_DrawLineTip(Handle wnd,Point16* start, Point16* end, Int32 skew, Link Here
398
		DrawLineTip(wnd,start,end,skew,rgb_color,pen_width,key,pTip);
398
		DrawLineTip(wnd,start,end,skew,rgb_color,pen_width,key,pTip);
399
};
399
};
400
//////////////////////////////////////////////
400
//////////////////////////////////////////////
401
void   LDPUMA_DeleteLines(Handle wnd,Word32 key)
401
DPUMA_FUNC(void)   LDPUMA_DeleteLines(Handle wnd,Word32 key)
402
{
402
{
403
	if(DeleteLines)
403
	if(DeleteLines)
404
		DeleteLines(wnd,key);
404
		DeleteLines(wnd,key);
Lines 410-416 void LDPUMA_UpdateView(Handle wnd) Link Here
410
		UpdateView(wnd);
410
		UpdateView(wnd);
411
}
411
}
412
//////////////////////////////////////////////
412
//////////////////////////////////////////////
413
Int32 LDPUMA_Console(const char * message,...)
413
DPUMA_FUNC(Int32) LDPUMA_Console(const char * message,...)
414
{
414
{
415
    va_list marker;
415
    va_list marker;
416
    va_start(marker, message);
416
    va_start(marker, message);
Lines 430-436 Int32 LDPUMA_Console(const char * message,...) Link Here
430
	*/
430
	*/
431
431
432
}
432
}
433
Int32 LDPUMA_ConsoleN(const char * message,...)
433
DPUMA_FUNC(Int32) LDPUMA_ConsoleN(const char * message,...)
434
{
434
{
435
	Int32 rc = 0;
435
	Int32 rc = 0;
436
	if(Console)
436
	if(Console)
Lines 495-501 Bool16 LDPUMA_GetUserPoint(Handle wnd,Point16* pnt) Link Here
495
	return rc;
495
	return rc;
496
};
496
};
497
//////////////////////////////////////////////
497
//////////////////////////////////////////////
498
Word32 LDPUMA_WaitUserInput(Handle cur_node,Handle wnd)
498
DPUMA_FUNC(Word32) LDPUMA_WaitUserInput(Handle cur_node,Handle wnd)
499
{
499
{
500
	Word32 rc = 0;
500
	Word32 rc = 0;
501
	if(WaitUserInput)
501
	if(WaitUserInput)
Lines 503-527 Word32 LDPUMA_WaitUserInput(Handle cur_node,Handle wnd) Link Here
503
	return rc;
503
	return rc;
504
};
504
};
505
//////////////////////////////////////////////
505
//////////////////////////////////////////////
506
void LDPUMA_Registry( Handle node, const char * name,Handle parent )
506
DPUMA_FUNC(void) LDPUMA_Registry( Handle node, const char * name,Handle parent )
507
{
507
{
508
	if(Registry)
508
	if(Registry)
509
		Registry(node,name,parent);
509
		Registry(node,name,parent);
510
};
510
};
511
//////////////////////////////////////////////
511
//////////////////////////////////////////////
512
void LDPUMA_StartLoop( Handle node, Word32 iter_total )
512
DPUMA_FUNC(void) LDPUMA_StartLoop( Handle node, Word32 iter_total )
513
{
513
{
514
	if(StartLoop)
514
	if(StartLoop)
515
		StartLoop(node,iter_total);
515
		StartLoop(node,iter_total);
516
};
516
};
517
//////////////////////////////////////////////
517
//////////////////////////////////////////////
518
void LDPUMA_LoopNext( Handle node )
518
DPUMA_FUNC(void) LDPUMA_LoopNext( Handle node )
519
{
519
{
520
	if(LoopNext)
520
	if(LoopNext)
521
		LoopNext(node);
521
		LoopNext(node);
522
};
522
};
523
//////////////////////////////////////////////
523
//////////////////////////////////////////////
524
Bool16  LDPUMA_Skip( Handle node )
524
DPUMA_FUNC(Bool16)  LDPUMA_Skip( Handle node )
525
{
525
{
526
	return Skip ? Skip(node):TRUE;
526
	return Skip ? Skip(node):TRUE;
527
};
527
};
Lines 532-538 void LDPUMA_DrawRaster(DPUMA_RecRaster * raster) Link Here
532
		DrawRaster((DPUMA_RecRaster *)raster);
532
		DrawRaster((DPUMA_RecRaster *)raster);
533
};
533
};
534
//////////////////////////////////////////////
534
//////////////////////////////////////////////
535
void LDPUMA_RasterText(char * lpText)
535
DPUMA_FUNC(void) LDPUMA_RasterText(char * lpText)
536
{
536
{
537
	if(RasterText)
537
	if(RasterText)
538
		RasterText(lpText);
538
		RasterText(lpText);
Lines 556-562 void LDPUMA_DrawFocusRect(Handle wnd,Rect16* rc) Link Here
556
		fnDrawFocusRect(wnd,rc);
556
		fnDrawFocusRect(wnd,rc);
557
};
557
};
558
//////////////////////////////////////////////
558
//////////////////////////////////////////////
559
Bool32 LDPUMA_RegVariable(Handle owner, const char * lpText,void * lpData, const char * lpType)
559
DPUMA_FUNC(Bool32) LDPUMA_RegVariable(Handle owner, const char * lpText,void * lpData, const char * lpType)
560
{
560
{
561
	BOOL rc = FALSE;
561
	BOOL rc = FALSE;
562
	if(RegVariable)
562
	if(RegVariable)
Lines 564-570 Bool32 LDPUMA_RegVariable(Handle owner, const char * lpText,void * lpData, const Link Here
564
	return rc;
564
	return rc;
565
};
565
};
566
566
567
void LDPUMA_UnregVariable(void * lpData)
567
DPUMA_FUNC(void) LDPUMA_UnregVariable(void * lpData)
568
{
568
{
569
	if(UnregVariable)
569
	if(UnregVariable)
570
		UnregVariable(lpData);
570
		UnregVariable(lpData);
Lines 616-622 DPUMA_Callback_WindowProc LDPUMA_SetCallbackMainFrameWindowProc(DPUMA_Callback Link Here
616
	return NULL;
616
	return NULL;
617
};
617
};
618
//////////////////////////////////////////////
618
//////////////////////////////////////////////
619
void  LDPUMA_DestroyWindow(Handle wnd)
619
DPUMA_FUNC(void)  LDPUMA_DestroyWindow(Handle wnd)
620
{
620
{
621
	if(fDestroyWindow)
621
	if(fDestroyWindow)
622
		fDestroyWindow( wnd );
622
		fDestroyWindow( wnd );
Lines 638-644 Word32 LDPUMA_SendMainWnd(Word32 message, Word32 wParam, Word32 lParam) Link Here
638
	return rc;
638
	return rc;
639
};
639
};
640
//////////////////////////////////////////////
640
//////////////////////////////////////////////
641
Word32 LDPUMA_CSTR_Monitor(Handle owner, Word32 cstr_line, Word32 pos,
641
DPUMA_FUNC(Word32) LDPUMA_CSTR_Monitor(Handle owner, Word32 cstr_line, Word32 pos,
642
									  DPUMA_Callback_WindowProc lpproc)
642
									  DPUMA_Callback_WindowProc lpproc)
643
{
643
{
644
	Word32 rc = 0;
644
	Word32 rc = 0;
Lines 647-653 Word32 LDPUMA_CSTR_Monitor(Handle owner, Word32 cstr_line, Word32 pos, Link Here
647
return rc;
647
return rc;
648
}
648
}
649
//////////////////////////////////////////////
649
//////////////////////////////////////////////
650
Word32 LDPUMA_CSTR_GetPosition(Word32 * cstr_raster)
650
DPUMA_FUNC(Word32) LDPUMA_CSTR_GetPosition(Word32 * cstr_raster)
651
{
651
{
652
	Word32 rc = 0;
652
	Word32 rc = 0;
653
	if(cstr_GetPosition)
653
	if(cstr_GetPosition)
Lines 662-668 void LDPUMA_CSTR_SetPosition(Word32 pos) Link Here
662
		cstr_SetPosition(pos);
662
		cstr_SetPosition(pos);
663
}
663
}
664
//////////////////////////////////////////////
664
//////////////////////////////////////////////
665
void LDPUMA_DestroyRasterWnd()
665
DPUMA_FUNC(void) LDPUMA_DestroyRasterWnd()
666
{
666
{
667
	if(DestroyRasterWnd)
667
	if(DestroyRasterWnd)
668
		DestroyRasterWnd();
668
		DestroyRasterWnd();
Lines 697-703 void LDPUMA_CSTR_Update( ) Link Here
697
}
697
}
698
698
699
//////////////////////////////////////////////
699
//////////////////////////////////////////////
700
Bool32 LDPUMA_SkipEx(Handle owner, Bool32 bIter, Bool32 bParent, Int32 nSign )
700
DPUMA_FUNC(Bool32) LDPUMA_SkipEx(Handle owner, Bool32 bIter, Bool32 bParent, Int32 nSign )
701
{
701
{
702
	Bool32 rc = TRUE;
702
	Bool32 rc = TRUE;
703
	if(SkipEx)
703
	if(SkipEx)
Lines 713-719 Bool32 LDPUMA_OpenFile(Handle wnd, char * name ) Link Here
713
	return rc;
713
	return rc;
714
}
714
}
715
//////////////////////////////////////////////
715
//////////////////////////////////////////////
716
char * LDPUMA_GetFileName(Handle wnd)
716
DPUMA_FUNC(char *) LDPUMA_GetFileName(Handle wnd)
717
{
717
{
718
	char * rc = "";
718
	char * rc = "";
719
	if(fGetFileName)
719
	if(fGetFileName)
Lines 721-727 char * LDPUMA_GetFileName(Handle wnd) Link Here
721
	return rc;
721
	return rc;
722
}
722
}
723
//////////////////////////////////////////////
723
//////////////////////////////////////////////
724
void *  LDPUMA_HandLayout( void * lpDIB, Word32 flags ,Point32 * p)
724
DPUMA_FUNC(void *)  LDPUMA_HandLayout( void * lpDIB, Word32 flags ,Point32 * p)
725
{
725
{
726
	void * rc = NULL;
726
	void * rc = NULL;
727
	if(fHandLayout)
727
	if(fHandLayout)
Lines 739-745 Bool32 LDPUMA_LockImage( Handle wnd, Bool32 bLock ) Link Here
739
return rc;
739
return rc;
740
}
740
}
741
//////////////////////////////////////////////
741
//////////////////////////////////////////////
742
void LDPUMA_RegistryHelp( Handle owner, const char * lpstrHelp,Bool32 bAppend )
742
DPUMA_FUNC(void) LDPUMA_RegistryHelp( Handle owner, const char * lpstrHelp,Bool32 bAppend )
743
{
743
{
744
	if(RegistryHelp)
744
	if(RegistryHelp)
745
		RegistryHelp(owner,lpstrHelp,bAppend);
745
		RegistryHelp(owner,lpstrHelp,bAppend);
Lines 753-771 Bool32 LDPUMA_SaveFile( void * lpDIB,char * lpFileName,Word32 nFormat ) Link Here
753
	return rc;
753
	return rc;
754
}
754
}
755
//////////////////////////////////////////////
755
//////////////////////////////////////////////
756
void LDPUMA_ProgressStart( void )
756
DPUMA_FUNC(void) LDPUMA_ProgressStart( void )
757
{
757
{
758
	if(fProgressStart)
758
	if(fProgressStart)
759
		fProgressStart();
759
		fProgressStart();
760
}
760
}
761
//////////////////////////////////////////////
761
//////////////////////////////////////////////
762
void LDPUMA_ProgressFinish( void )
762
DPUMA_FUNC(void) LDPUMA_ProgressFinish( void )
763
{
763
{
764
	if(fProgressFinish)
764
	if(fProgressFinish)
765
		fProgressFinish();
765
		fProgressFinish();
766
}
766
}
767
//////////////////////////////////////////////
767
//////////////////////////////////////////////
768
Bool32 LDPUMA_ProgressStep(Word32 step, const char * name, Word32 percent)
768
DPUMA_FUNC(Bool32) LDPUMA_ProgressStep(Word32 step, const char * name, Word32 percent)
769
{
769
{
770
	Bool32 rc = TRUE;
770
	Bool32 rc = TRUE;
771
	if(fProgressStep)
771
	if(fProgressStep)
Lines 773-779 Bool32 LDPUMA_ProgressStep(Word32 step, const char * name, Word32 percent) Link Here
773
	return rc;
773
	return rc;
774
}
774
}
775
//////////////////////////////////////////////
775
//////////////////////////////////////////////
776
Bool32 LDPUMA_SetConsoleProperty(Bool32 bold,Bool32 italic,
776
DPUMA_FUNC(Bool32) LDPUMA_SetConsoleProperty(Bool32 bold,Bool32 italic,
777
	Bool32 strikeout,Bool32 underline,Int32 height,	Int32 offset,	Word32 textcolor,
777
	Bool32 strikeout,Bool32 underline,Int32 height,	Int32 offset,	Word32 textcolor,
778
	Int32 charset,	const char * name )
778
	Int32 charset,	const char * name )
779
{
779
{
Lines 836-842 Handle LDPUMA_TimeStamp(const char * name,Handle hTimer) Link Here
836
return (Handle) clock1;
836
return (Handle) clock1;
837
}
837
}
838
//////////////////////////////////////////////
838
//////////////////////////////////////////////
839
Handle LDPUMA_GetWindowHandle(const char * name)
839
DPUMA_FUNC(Handle) LDPUMA_GetWindowHandle(const char * name)
840
{
840
{
841
	Handle rc = NULL;
841
	Handle rc = NULL;
842
	if(fGetWindowHandle)
842
	if(fGetWindowHandle)
Lines 852-864 Handle LDPUMA_GetPrevSkipOwner() Link Here
852
	return rc;
852
	return rc;
853
}
853
}
854
//////////////////////////////////////////////
854
//////////////////////////////////////////////
855
void LDPUMA_ConsoleClear(Int32 beforeline)
855
DPUMA_FUNC(void) LDPUMA_ConsoleClear(Int32 beforeline)
856
{
856
{
857
	if(fConsoleClear)
857
	if(fConsoleClear)
858
		fConsoleClear(beforeline);
858
		fConsoleClear(beforeline);
859
}
859
}
860
//////////////////////////////////////////////
860
//////////////////////////////////////////////
861
Int32 LDPUMA_ConsoleGetCurLine()
861
DPUMA_FUNC(Int32) LDPUMA_ConsoleGetCurLine()
862
{
862
{
863
	Int32 rc = -1;
863
	Int32 rc = -1;
864
	if(fConsoleGetCurLine)
864
	if(fConsoleGetCurLine)
Lines 866-872 Int32 LDPUMA_ConsoleGetCurLine() Link Here
866
return rc;
866
return rc;
867
}
867
}
868
//////////////////////////////////////////////
868
//////////////////////////////////////////////
869
Bool32 LDPUMA_SetFileName(Handle wnd,char * lpName)
869
DPUMA_FUNC(Bool32) LDPUMA_SetFileName(Handle wnd,char * lpName)
870
{
870
{
871
	Bool32 rc = FALSE;
871
	Bool32 rc = FALSE;
872
	if(fSetFileName)
872
	if(fSetFileName)
(-)a/cuneiform_src/Kern/hhh/rshelllines.h (-3 / +9 lines)
Lines 66-75 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
66
//
66
//
67
//
67
//
68
68
69
#ifdef RSHELLLINES_EXPORTS
69
#ifndef __GLOBUS_H
70
#define RSHELLLINES_API __declspec(dllexport)
70
#include "globus.h"
71
#endif
72
73
#ifdef __RSHELLLINES_EXPORTS__
74
  #define RSHELLLINES_FUNC  FUN_EXPO
75
  #define RSHELLLINES_CLASS CLASS_EXPO
71
#else
76
#else
72
#define RSHELLLINES_API __declspec(dllimport)
77
  #define RSHELLLINES_FUNC  FUN_IMPO
78
  #define RSHELLLINES_CLASS CLASS_IMPO
73
#endif
79
#endif
74
80
75
#define step             8
81
#define step             8
(-)a/cuneiform_src/Kern/hhh/rshelllinescom.h (-36 / +42 lines)
Lines 65-74 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
65
//	Implemented: by B.M. Shahverdiev
65
//	Implemented: by B.M. Shahverdiev
66
//
66
//
67
//
67
//
68
#ifdef RSHELLLINES_EXPORTS
68
#ifndef __GLOBUS_H
69
#define RSHELLLINES_API __declspec(dllexport)
69
#include "globus.h"
70
#endif
71
72
#ifdef __RSHELLLINES_EXPORTS__
73
  #define RSHELLLINES_FUNC  FUN_EXPO
74
  #define RSHELLLINES_CLASS CLASS_EXPO
70
#else
75
#else
71
#define RSHELLLINES_API __declspec(dllimport)
76
  #define RSHELLLINES_FUNC  FUN_IMPO
77
  #define RSHELLLINES_CLASS CLASS_IMPO
72
#endif
78
#endif
73
79
74
80
Lines 149-155 typedef struct group_lines_mass Link Here
149
155
150
/////////////////////////////////////////////////////////////////////////////
156
/////////////////////////////////////////////////////////////////////////////
151
// Interval's class
157
// Interval's class
152
/*class RSHELLLINES_API CInterval:public CObject
158
/*class RSHELLLINES_CLASS CInterval:public CObject
153
{
159
{
154
public:
160
public:
155
  CInterval(){}
161
  CInterval(){}
Lines 161-167 public: Link Here
161
*/
167
*/
162
/////////////////////////////////////////////////////////////////////////////
168
/////////////////////////////////////////////////////////////////////////////
163
// Rect32's class
169
// Rect32's class
164
/*class RSHELLLINES_API CPRect32:public CObject
170
/*class RSHELLLINES_CLASS CPRect32:public CObject
165
{
171
{
166
public:
172
public:
167
  CPRect32(){m_flag=TRUE;};
173
  CPRect32(){m_flag=TRUE;};
Lines 174-180 public: Link Here
174
180
175
/////////////////////////////////////////////////////////////////////////////
181
/////////////////////////////////////////////////////////////////////////////
176
// Event's class
182
// Event's class
177
/*class RSHELLLINES_API CEvent:public CObject
183
/*class RSHELLLINES_CLASS CEvent:public CObject
178
{
184
{
179
public:
185
public:
180
  CEvent();
186
  CEvent();
Lines 197-203 public: Link Here
197
*/
203
*/
198
/////////////////////////////////////////////////////////////////////////////
204
/////////////////////////////////////////////////////////////////////////////
199
// Stripe's class
205
// Stripe's class
200
/*class RSHELLLINES_API CStripe:public CObject
206
/*class RSHELLLINES_CLASS CStripe:public CObject
201
{
207
{
202
public:
208
public:
203
  CStripe();
209
  CStripe();
Lines 219-225 public: Link Here
219
//#define DirecteDownwards      1
225
//#define DirecteDownwards      1
220
//#define DirectedForBothSides  2
226
//#define DirectedForBothSides  2
221
/*
227
/*
222
class RSHELLLINES_API CCutPoint:public CObject
228
class RSHELLLINES_CLASS CCutPoint:public CObject
223
{
229
{
224
public:
230
public:
225
  CCutPoint();
231
  CCutPoint();
Lines 242-248 public: Link Here
242
#define  MiddleHasCrossPoint        2
248
#define  MiddleHasCrossPoint        2
243
#define  EndPointHasCrossPoint      4
249
#define  EndPointHasCrossPoint      4
244
/*
250
/*
245
class RSHELLLINES_API CComponent:public CObject
251
class RSHELLLINES_CLASS CComponent:public CObject
246
{
252
{
247
public:
253
public:
248
  CComponent();
254
  CComponent();
Lines 255-261 public: Link Here
255
*/
261
*/
256
/////////////////////////////////////////////////////////////////////////////
262
/////////////////////////////////////////////////////////////////////////////
257
// ÑDotLines's class
263
// ÑDotLines's class
258
/*class RSHELLLINES_API CDotLine:public CObject
264
/*class RSHELLLINES_CLASS CDotLine:public CObject
259
{
265
{
260
public:
266
public:
261
  CDotLine();
267
  CDotLine();
Lines 293-305 public: Link Here
293
// Line's class
299
// Line's class
294
//class CPageLines;
300
//class CPageLines;
295
/*
301
/*
296
class RSHELLLINES_API CLine:public CObject
302
class RSHELLLINES_CLASS CLine:public CObject
297
{
303
{
298
public:
304
public:
299
  CLine();
305
  CLine();
300
 ~CLine();
306
 ~CLine();
301
*/
307
*/
302
RSHELLLINES_API void            InitLine(DLine* linedata);  //
308
RSHELLLINES_FUNC(void)            InitLine(DLine* linedata);  //
303
/*  Word32          Flags;                   // common use info
309
/*  Word32          Flags;                   // common use info
304
  Word32          Tail;                    // îñòàòîê ëèíèè çà òàáëèöîé
310
  Word32          Tail;                    // îñòàòîê ëèíèè çà òàáëèöîé
305
  Point32         BeginPoint;
311
  Point32         BeginPoint;
Lines 368-374 RSHELLLINES_API void InitLine(DLine* linedata); // Link Here
368
  void            SetWidth(CLINE_handle line, DLine* pCLine); //
374
  void            SetWidth(CLINE_handle line, DLine* pCLine); //
369
  void            SetLength(CLINE_handle line, DLine* pCLine); //
375
  void            SetLength(CLINE_handle line, DLine* pCLine); //
370
  void            SetComponentsCrossPointFlag(CLINE_handle line, DLine* pCLine); //
376
  void            SetComponentsCrossPointFlag(CLINE_handle line, DLine* pCLine); //
371
RSHELLLINES_API Bool32          CheckSeparationPoints(CLINE_handle hLine, CLINE_handle hComp = NULL); //
377
RSHELLLINES_FUNC(Bool32)          CheckSeparationPoints(CLINE_handle hLine, CLINE_handle hComp = NULL); //
372
378
373
  void            SetSeparationPoints(CLINE_handle hContainer, CLINE_handle hLine, DLine* pCLine, Bool32 PLines); //
379
  void            SetSeparationPoints(CLINE_handle hContainer, CLINE_handle hLine, DLine* pCLine, Bool32 PLines); //
374
  void            SetCutPoints(CLINE_handle line, DLine* pCLine); //
380
  void            SetCutPoints(CLINE_handle line, DLine* pCLine); //
Lines 386-392 RSHELLLINES_API Bool32 CheckSeparationPoints(CLINE_handle hLine, CLINE_ Link Here
386
*/
392
*/
387
/////////////////////////////////////////////////////////////////////////////
393
/////////////////////////////////////////////////////////////////////////////
388
// CGroupOfFriendLines class
394
// CGroupOfFriendLines class
389
/*class RSHELLLINES_API CGroupOfFriendLines:public CObject
395
/*class RSHELLLINES_CLASS CGroupOfFriendLines:public CObject
390
{
396
{
391
public:
397
public:
392
  CGroupOfFriendLines();
398
  CGroupOfFriendLines();
Lines 408-414 public: Link Here
408
*/
414
*/
409
/////////////////////////////////////////////////////////////////////////////
415
/////////////////////////////////////////////////////////////////////////////
410
// CGroupOfExtensibleLines class
416
// CGroupOfExtensibleLines class
411
/*class RSHELLLINES_API CGroupOfExtensibleLines:public CObject
417
/*class RSHELLLINES_CLASS CGroupOfExtensibleLines:public CObject
412
{
418
{
413
public:
419
public:
414
  CGroupOfExtensibleLines();
420
  CGroupOfExtensibleLines();
Lines 423-429 public: Link Here
423
*/
429
*/
424
/////////////////////////////////////////////////////////////////////////////
430
/////////////////////////////////////////////////////////////////////////////
425
// PageLine's class
431
// PageLine's class
426
/*class RSHELLLINES_API CPageLines:public CObject
432
/*class RSHELLLINES_CLASS CPageLines:public CObject
427
{
433
{
428
public:
434
public:
429
  CPageLines();
435
  CPageLines();
Lines 471-512 public: Link Here
471
  BOOL                     CheckLinesDegreeForExtensible(CLINE_handle hLine, GLM* hGroupEx); //
477
  BOOL                     CheckLinesDegreeForExtensible(CLINE_handle hLine, GLM* hGroupEx); //
472
//  BOOL                     CheckGroupsForExtensible(void);
478
//  BOOL                     CheckGroupsForExtensible(void);
473
479
474
RSHELLLINES_API void       FindFriendLines(CLINE_handle hContainer, GLM* friendlinesmass); //
480
RSHELLLINES_FUNC(void)       FindFriendLines(CLINE_handle hContainer, GLM* friendlinesmass); //
475
RSHELLLINES_API void       DrawFriendLines(CLINE_handle hContainer, GLM* friendlinesmass); //
481
RSHELLLINES_FUNC(void)       DrawFriendLines(CLINE_handle hContainer, GLM* friendlinesmass); //
476
482
477
RSHELLLINES_API void       FindGroupOfExtensibleLines(CLINE_handle hContainer, GLM* friendlinesmass, Bool32 IfDrawResult); //
483
RSHELLLINES_FUNC(void)       FindGroupOfExtensibleLines(CLINE_handle hContainer, GLM* friendlinesmass, Bool32 IfDrawResult); //
478
  void                     DrawGroupOfExtensibleLines(CLINE_handle hContainer, GLM* hGroup, int CountLines); //
484
  void                     DrawGroupOfExtensibleLines(CLINE_handle hContainer, GLM* hGroup, int CountLines); //
479
485
480
RSHELLLINES_API void       FindLosedVerticalLines(CLINE_handle hContainer, GLM* friendlinesmass, CLINE_handle hFictContainer, int CountLines, Bool32 IfDrawResult); //
486
RSHELLLINES_FUNC(void)       FindLosedVerticalLines(CLINE_handle hContainer, GLM* friendlinesmass, CLINE_handle hFictContainer, int CountLines, Bool32 IfDrawResult); //
481
RSHELLLINES_API void       DrawLosedVerticalLines(GLM* friendlinesmass, int CountLines); //
487
RSHELLLINES_FUNC(void)       DrawLosedVerticalLines(GLM* friendlinesmass, int CountLines); //
482
488
483
//  void                     GetBigComps(Handle hCComp);
489
//  void                     GetBigComps(Handle hCComp);
484
RSHELLLINES_API void       DrawBigComps(CLINE_handle hContainer); //
490
RSHELLLINES_FUNC(void)       DrawBigComps(CLINE_handle hContainer); //
485
491
486
RSHELLLINES_API void       FindDotLines(Handle hCCOM,Handle hCPAGE, CLINE_handle hContainer); //
492
RSHELLLINES_FUNC(void)       FindDotLines(Handle hCCOM,Handle hCPAGE, CLINE_handle hContainer); //
487
  BOOL                     GetDotComps(Handle hCCOM,Handle hCPAGE, HANDLE &hbuf,LPSTR &pDotBuffer, Int32 *CountDotComps); //
493
  BOOL                     GetDotComps(Handle hCCOM,Handle hCPAGE, HANDLE &hbuf,LPSTR &pDotBuffer, Int32 *CountDotComps); //
488
  void                     FindChains(Handle hCCOM, LPSTR &pDotBuffer, Int32 CountDotComps, CLINE_handle hContainer); //
494
  void                     FindChains(Handle hCCOM, LPSTR &pDotBuffer, Int32 CountDotComps, CLINE_handle hContainer); //
489
  void                     CheckChains(Handle hCCOM, LPSTR &pDotBuffer, Int32 BegIndex,Int32 CountDots, CLINE_handle hContainer); //
495
  void                     CheckChains(Handle hCCOM, LPSTR &pDotBuffer, Int32 BegIndex,Int32 CountDots, CLINE_handle hContainer); //
490
  void                     AddNewDotLines(Handle hCCOM, LPSTR &pDotBuffer, Int32 CountDots, CLINE_handle hContainer); //
496
  void                     AddNewDotLines(Handle hCCOM, LPSTR &pDotBuffer, Int32 CountDots, CLINE_handle hContainer); //
491
  void                     UnionBreakup(CLINE_handle hContainer); //
497
  void                     UnionBreakup(CLINE_handle hContainer); //
492
498
493
RSHELLLINES_API void       SetLinesAndCompsRelationship(CLINE_handle hContainer, CLINE_handle hFictContainer); //
499
RSHELLLINES_FUNC(void)       SetLinesAndCompsRelationship(CLINE_handle hContainer, CLINE_handle hFictContainer); //
494
500
495
RSHELLLINES_API void       DrowAllLines(CLINE_handle hContainer, Handle hDrowAllLines); //
501
RSHELLLINES_FUNC(void)       DrowAllLines(CLINE_handle hContainer, Handle hDrowAllLines); //
496
/*  int                      SetImage(Handle hCPage);
502
/*  int                      SetImage(Handle hCPage);
497
};
503
};
498
*/
504
*/
499
RSHELLLINES_API Bool32 FindLineFrag(CLINE_handle processedline, Bool32 OnlyPosyAndStat, Bool32 Is2ndPath, CLINE_handle hContainer, Bool32 IfNeedFragment = TRUE, Bool32 IfStraightFrag = FALSE); //
505
RSHELLLINES_FUNC(Bool32) FindLineFrag(CLINE_handle processedline, Bool32 OnlyPosyAndStat, Bool32 Is2ndPath, CLINE_handle hContainer, Bool32 IfNeedFragment = TRUE, Bool32 IfStraightFrag = FALSE); //
500
RSHELLLINES_API Bool32 FindLineAttr(CLINE_handle line, DLine* pCLine, Bool32 AbleSeeOldAttr); //
506
RSHELLLINES_FUNC(Bool32) FindLineAttr(CLINE_handle line, DLine* pCLine, Bool32 AbleSeeOldAttr); //
501
RSHELLLINES_API Bool32 GetNextPartOfLine(CLINE_handle hContainer, CLINE_handle hLine/*, CPDLine oldlinedata*/); //
507
RSHELLLINES_FUNC(Bool32) GetNextPartOfLine(CLINE_handle hContainer, CLINE_handle hLine/*, CPDLine oldlinedata*/); //
502
508
503
void                       AddLine2Group(GLM* hGroup, CLINE_handle hLine);
509
void                       AddLine2Group(GLM* hGroup, CLINE_handle hLine);
504
RSHELLLINES_API void       DeleteGroup(GLM* hGroup, int CountLines);
510
RSHELLLINES_FUNC(void)       DeleteGroup(GLM* hGroup, int CountLines);
505
RSHELLLINES_API void       DrawFragsForAllLines(CLINE_handle hContainer, Handle hDebugDrawAllLineFragments);
511
RSHELLLINES_FUNC(void)       DrawFragsForAllLines(CLINE_handle hContainer, Handle hDebugDrawAllLineFragments);
506
RSHELLLINES_API Int32	   CountBlackRaster(CPDLine pLine, CPDLine pLineExt, Bool32 IsHor, Int32 delta, Handle hDrawRaster);
512
RSHELLLINES_FUNC(Int32)	   CountBlackRaster(CPDLine pLine, CPDLine pLineExt, Bool32 IsHor, Int32 delta, Handle hDrawRaster);
507
RSHELLLINES_API Bool32     SetExtLines(CLINE_handle hExtContainer, CLINE_handle hContainer, CLINE_handle* hLinesMass, Int32 CountLines);
513
RSHELLLINES_FUNC(Bool32)     SetExtLines(CLINE_handle hExtContainer, CLINE_handle hContainer, CLINE_handle* hLinesMass, Int32 CountLines);
508
RSHELLLINES_API Bool32     RSL_CorrectDoubleLines(CLINE_handle hLine1, CLINE_handle hLine2);
514
RSHELLLINES_FUNC(Bool32)     RSL_CorrectDoubleLines(CLINE_handle hLine1, CLINE_handle hLine2);
509
RSHELLLINES_API Bool32     RSL_SplitLine(CLINE_handle hLine, CLINE_handle hContainer);
515
RSHELLLINES_FUNC(Bool32)     RSL_SplitLine(CLINE_handle hLine, CLINE_handle hContainer);
510
516
511
//possible return values for RSL_VerifyShortLine
517
//possible return values for RSL_VerifyShortLine
512
#define RSL_IS_LINE 0
518
#define RSL_IS_LINE 0
Lines 517-524 RSHELLLINES_API Bool32 RSL_SplitLine(CLINE_handle hLine, CLINE_handle hConta Link Here
517
523
518
#define MAX_CROSS_POINTS 4
524
#define MAX_CROSS_POINTS 4
519
525
520
RSHELLLINES_API Int32     RSL_VerifyShortLine(CPDLine pLine, Handle hCCOM, PAGEINFO* page_info, Word8 lang, Word8 debug_flags, Int32 *cross_point = NULL);
526
RSHELLLINES_FUNC(Int32)     RSL_VerifyShortLine(CPDLine pLine, Handle hCCOM, PAGEINFO* page_info, Word8 lang, Word8 debug_flags, Int32 *cross_point = NULL);
521
RSHELLLINES_API Bool   SL_GetRaster(Rect32* rect, Word8** ppData, PAGEINFO* page_info/*, CIMAGEBITMAPINFOHEADER* image_info*/); //
527
RSHELLLINES_FUNC(Bool)   SL_GetRaster(Rect32* rect, Word8** ppData, PAGEINFO* page_info/*, CIMAGEBITMAPINFOHEADER* image_info*/); //
522
528
523
529
524
//}
530
//}
(-)a/cuneiform_src/Kern/hrkint/cpu.h (-3 / +13 lines)
Lines 59-71 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
59
59
60
#include "decl.h"
60
#include "decl.h"
61
61
62
#ifndef __GLOBUS_H
63
#include "globus.h"
64
#endif
65
66
#ifdef __CPU__
67
  #define CPU_FUNC  FUN_EXPO
68
#else
69
  #define CPU_FUNC  FUN_IMPO
70
#endif
71
62
#ifdef __cplusplus
72
#ifdef __cplusplus
63
    extern "C" {
73
    extern "C" {
64
#endif
74
#endif
65
75
66
__declspec( dllimport ) int GetCPUName(void);
76
CPU_FUNC(int) GetCPUName(void);
67
__declspec( dllimport ) int Get_MMX(void);
77
CPU_FUNC(int) Get_MMX(void);
68
__declspec( dllimport ) int Get_XMM(void);
78
CPU_FUNC(int) Get_XMM(void);
69
#ifdef __cplusplus
79
#ifdef __cplusplus
70
    }
80
    }
71
#endif
81
#endif
(-)a/cuneiform_src/Kern/include/winfuncs.h (-85 / +95 lines)
Lines 34-101 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
34
34
35
#else
35
#else
36
36
37
#ifndef __GLOBUS_H
38
#include "globus.h"
39
#endif
40
41
#ifdef __WINDUMMY__
42
  #define WINDUMMY_FUNC  FUN_EXPO
43
#else
44
  #define WINDUMMY_FUNC  FUN_IMPO
45
#endif
46
37
#include<wchar.h>
47
#include<wchar.h>
38
48
39
int LoadString(HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax);
49
WINDUMMY_FUNC(int) LoadString(HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax);
40
50
41
int CreateDirectory(const char *dir, void *dummy);
51
WINDUMMY_FUNC(int) CreateDirectory(const char *dir, void *dummy);
42
DWORD GetTempPath(DWORD nBufferLength, LPTSTR lpBuffer);
52
WINDUMMY_FUNC(DWORD) GetTempPath(DWORD nBufferLength, LPTSTR lpBuffer);
43
int RemoveDirectory(const char *d);
53
WINDUMMY_FUNC(int) RemoveDirectory(const char *d);
44
void* GlobalAlloc(UINT uFlags, int dwBytes);
54
WINDUMMY_FUNC(void*) GlobalAlloc(UINT uFlags, int dwBytes);
45
HGLOBAL GlobalFree(void *f);
55
WINDUMMY_FUNC(HGLOBAL) GlobalFree(void *f);
46
void* GlobalReAlloc(void* hMem, int dwBytes, UINT uFlags);
56
WINDUMMY_FUNC(void*) GlobalReAlloc(void* hMem, int dwBytes, UINT uFlags);
47
int GetTempFileName(LPCTSTR lpPathName, LPCTSTR lpPrefixString,
57
WINDUMMY_FUNC(int) GetTempFileName(LPCTSTR lpPathName, LPCTSTR lpPrefixString,
48
                    UINT uUnique, LPTSTR lpTempFileName);
58
                    UINT uUnique, LPTSTR lpTempFileName);
49
int GetLastError();
59
WINDUMMY_FUNC(int) GetLastError();
50
60
51
DWORD GetModuleFileName(HMODULE hModule, LPTSTR lpFilename, DWORD nSize);
61
WINDUMMY_FUNC(DWORD) GetModuleFileName(HMODULE hModule, LPTSTR lpFilename, DWORD nSize);
52
BOOL CloseHandle(HANDLE hObject);
62
WINDUMMY_FUNC(BOOL) CloseHandle(HANDLE hObject);
53
HANDLE CreateFile(LPCTSTR lpFileName, DWORD dwDesiredAccess,
63
WINDUMMY_FUNC(HANDLE) CreateFile(LPCTSTR lpFileName, DWORD dwDesiredAccess,
54
DWORD dwShareMode, void* lpSecurityAttributes,
64
DWORD dwShareMode, void* lpSecurityAttributes,
55
DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
65
DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
56
66
57
HWND FindWindow(LPCTSTR lpClassName, LPCTSTR lpWindowName);
67
WINDUMMY_FUNC(HWND) FindWindow(LPCTSTR lpClassName, LPCTSTR lpWindowName);
58
UINT RegisterWindowMessage(LPCTSTR lpString);
68
WINDUMMY_FUNC(UINT) RegisterWindowMessage(LPCTSTR lpString);
59
69
60
int _findclose(long handle);
70
WINDUMMY_FUNC(int) _findclose(long handle);
61
long _findfirst(const char *filespec, struct _finddata_t *fileinfo);
71
WINDUMMY_FUNC(long) _findfirst(const char *filespec, struct _finddata_t *fileinfo);
62
int _findnext(long handle, struct _finddata_t *fileinfo);
72
WINDUMMY_FUNC(int) _findnext(long handle, struct _finddata_t *fileinfo);
63
long _tell(int handle);
73
WINDUMMY_FUNC(long) _tell(int handle);
64
74
65
BOOL GetComputerName(LPTSTR lpBuffer, long unsigned int *lpnSize);
75
WINDUMMY_FUNC(BOOL) GetComputerName(LPTSTR lpBuffer, long unsigned int *lpnSize);
66
76
67
LONG RegOpenKeyEx(HKEY hKey, LPCTSTR lpSubKey, DWORD ulOptions,
77
WINDUMMY_FUNC(LONG) RegOpenKeyEx(HKEY hKey, LPCTSTR lpSubKey, DWORD ulOptions,
68
  REGSAM samDesired, PHKEY phkResult);
78
  REGSAM samDesired, PHKEY phkResult);
69
LONG RegQueryValueEx(HKEY hKey, LPCTSTR lpValueName,
79
WINDUMMY_FUNC(LONG) RegQueryValueEx(HKEY hKey, LPCTSTR lpValueName,
70
LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData,
80
LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData,
71
LPDWORD lpcbData);
81
LPDWORD lpcbData);
72
82
73
BOOL GetClientRect(HWND hWnd, LPRECT lpRect);
83
WINDUMMY_FUNC(BOOL) GetClientRect(HWND hWnd, LPRECT lpRect);
74
BOOL WritePrivateProfileString(LPCTSTR lpAppName,
84
WINDUMMY_FUNC(BOOL) WritePrivateProfileString(LPCTSTR lpAppName,
75
        LPCTSTR lpKeyName, LPCTSTR lpString, LPCTSTR lpFileName);
85
        LPCTSTR lpKeyName, LPCTSTR lpString, LPCTSTR lpFileName);
76
DWORD GetPrivateProfileString(LPCTSTR lpAppName, LPCTSTR lpKeyName,
86
WINDUMMY_FUNC(DWORD) GetPrivateProfileString(LPCTSTR lpAppName, LPCTSTR lpKeyName,
77
LPCTSTR lpDefault, LPTSTR lpReturnedString, DWORD nSize, LPCTSTR lpFileName);
87
LPCTSTR lpDefault, LPTSTR lpReturnedString, DWORD nSize, LPCTSTR lpFileName);
78
UINT GetPrivateProfileInt(LPCTSTR lpAppName,
88
WINDUMMY_FUNC(UINT) GetPrivateProfileInt(LPCTSTR lpAppName,
79
  LPCTSTR lpKeyName, INT nDefault, LPCTSTR lpFileName);
89
  LPCTSTR lpKeyName, INT nDefault, LPCTSTR lpFileName);
80
90
81
int WideCharToMultiByte(UINT CodePage, DWORD dwFlags, const wchar_t *lpWideCharStr,
91
WINDUMMY_FUNC(int) WideCharToMultiByte(UINT CodePage, DWORD dwFlags, const wchar_t *lpWideCharStr,
82
  int cchWideChar, LPSTR lpMultiByteStr, int cbMultiByte,
92
  int cchWideChar, LPSTR lpMultiByteStr, int cbMultiByte,
83
  LPCSTR lpDefaultChar, LPBOOL lpUsedDefaultChar);
93
  LPCSTR lpDefaultChar, LPBOOL lpUsedDefaultChar);
84
94
85
BOOL ShowWindow(HWND hWnd, int nCmdShow);
95
WINDUMMY_FUNC(BOOL) ShowWindow(HWND hWnd, int nCmdShow);
86
96
87
long _filelength(int fd);
97
WINDUMMY_FUNC(long) _filelength(int fd);
88
long _msize(void *memblock);
98
WINDUMMY_FUNC(long) _msize(void *memblock);
89
int _access(const char *filename, int mode);
99
WINDUMMY_FUNC(int) _access(const char *filename, int mode);
90
BOOL SetWindowText(HWND hWnd,LPCTSTR lpString);
100
WINDUMMY_FUNC(BOOL) SetWindowText(HWND hWnd,LPCTSTR lpString);
91
int ReleaseDC(HWND hWnd, HDC hDC);
101
WINDUMMY_FUNC(int) ReleaseDC(HWND hWnd, HDC hDC);
92
BOOL IsIconic(HWND hWnd);
102
WINDUMMY_FUNC(BOOL) IsIconic(HWND hWnd);
93
HDC GetDC(HWND hWnd);
103
WINDUMMY_FUNC(HDC) GetDC(HWND hWnd);
94
BOOL EndPaint(HWND hWnd, ...);
104
WINDUMMY_FUNC(BOOL) EndPaint(HWND hWnd, ...);
95
HDC BeginPaint(HWND hwnd,...);
105
WINDUMMY_FUNC(HDC) BeginPaint(HWND hwnd,...);
96
LRESULT SendMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
106
WINDUMMY_FUNC(LRESULT) SendMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
97
void strlwr(char *foo);
107
WINDUMMY_FUNC(void) strlwr(char *foo);
98
HWND CreateWindow(
108
WINDUMMY_FUNC(HWND) CreateWindow(
99
    LPCTSTR lpClassName,
109
    LPCTSTR lpClassName,
100
    LPCTSTR lpWindowName,
110
    LPCTSTR lpWindowName,
101
    DWORD dwStyle,
111
    DWORD dwStyle,
Lines 109-170 HWND CreateWindow( Link Here
109
    LPVOID lpParam
119
    LPVOID lpParam
110
);
120
);
111
121
112
HGDIOBJ SelectObject(HDC hdc, HGDIOBJ hgdiobj);
122
WINDUMMY_FUNC(HGDIOBJ) SelectObject(HDC hdc, HGDIOBJ hgdiobj);
113
LPTSTR lstrcat(LPTSTR lpString1, LPTSTR lpString2);
123
WINDUMMY_FUNC(LPTSTR) lstrcat(LPTSTR lpString1, LPTSTR lpString2);
114
int lstrlen(LPCTSTR lpString);
124
WINDUMMY_FUNC(int) lstrlen(LPCTSTR lpString);
115
int lstrcmp(LPCTSTR lpString1, LPCTSTR lpString2);
125
WINDUMMY_FUNC(int) lstrcmp(LPCTSTR lpString1, LPCTSTR lpString2);
116
LPTSTR lstrcpy(LPTSTR lpString1, LPCTSTR lpString2);
126
WINDUMMY_FUNC(LPTSTR) lstrcpy(LPTSTR lpString1, LPCTSTR lpString2);
117
int wsprintf(LPTSTR lpOut, LPCTSTR lpFmt, ...);
127
WINDUMMY_FUNC(int) wsprintf(LPTSTR lpOut, LPCTSTR lpFmt, ...);
118
int lstrcmpi(LPCTSTR lpString1, LPCTSTR lpString2);
128
WINDUMMY_FUNC(int) lstrcmpi(LPCTSTR lpString1, LPCTSTR lpString2);
119
129
120
BOOL DeleteObject(HGDIOBJ hObject);
130
WINDUMMY_FUNC(BOOL) DeleteObject(HGDIOBJ hObject);
121
131
122
#define GetGValue(rgb) ((BYTE) (((WORD) (rgb)) >> 8))
132
#define GetGValue(rgb) ((BYTE) (((WORD) (rgb)) >> 8))
123
#define GetBValue(rgb) ((BYTE) ((rgb) >> 16))
133
#define GetBValue(rgb) ((BYTE) ((rgb) >> 16))
124
#define GetRValue(rgb) ((BYTE) (rgb))
134
#define GetRValue(rgb) ((BYTE) (rgb))
125
135
126
HWND GetFocus();
136
WINDUMMY_FUNC(HWND) GetFocus();
127
int MessageBox(HWND hWnd, LPCTSTR lpText, LPCTSTR lpCaption, UINT uType);
137
WINDUMMY_FUNC(int) MessageBox(HWND hWnd, LPCTSTR lpText, LPCTSTR lpCaption, UINT uType);
128
138
129
int WINAPI GlobalSize(HGLOBAL hMem);
139
WINDUMMY_FUNC(int) WINAPI GlobalSize(HGLOBAL hMem);
130
LPVOID GlobalLock(HGLOBAL hMem);
140
WINDUMMY_FUNC(LPVOID) GlobalLock(HGLOBAL hMem);
131
BOOL GlobalUnlock(HGLOBAL hMem);
141
WINDUMMY_FUNC(BOOL) GlobalUnlock(HGLOBAL hMem);
132
BOOL IsBadWritePtr(LPVOID lp, int ucb);
142
WINDUMMY_FUNC(BOOL) IsBadWritePtr(LPVOID lp, int ucb);
133
void OutputDebugString(LPCTSTR lpOutputString);
143
WINDUMMY_FUNC(void) OutputDebugString(LPCTSTR lpOutputString);
134
BOOL SetRect(LPRECT lprc, int xLeft, int yTop,
144
WINDUMMY_FUNC(BOOL) SetRect(LPRECT lprc, int xLeft, int yTop,
135
int xRight, int yBottom);
145
int xRight, int yBottom);
136
BOOL PtInRect(const RECT *lprc, POINT pt);
146
WINDUMMY_FUNC(BOOL) PtInRect(const RECT *lprc, POINT pt);
137
BOOL IntersectRect(LPRECT lprcDst, const RECT *lprcSrc1, const RECT *lprcSrc2);
147
WINDUMMY_FUNC(BOOL) IntersectRect(LPRECT lprcDst, const RECT *lprcSrc1, const RECT *lprcSrc2);
138
BOOL UnionRect(LPRECT lprcDst, const RECT *lprcSrc1,const RECT *lprcSrc2);
148
WINDUMMY_FUNC(BOOL) UnionRect(LPRECT lprcDst, const RECT *lprcSrc1,const RECT *lprcSrc2);
139
149
140
HWND GetActiveWindow();
150
WINDUMMY_FUNC(HWND) GetActiveWindow();
141
HFONT CreateFont(int nHeight, int nWidth, int nEscapement,
151
WINDUMMY_FUNC(HFONT) CreateFont(int nHeight, int nWidth, int nEscapement,
142
int nOrientation, int fnWeight, DWORD fdwItalic, DWORD fdwUnderline,
152
int nOrientation, int fnWeight, DWORD fdwItalic, DWORD fdwUnderline,
143
DWORD fdwStrikeOut, DWORD fdwCharSet, DWORD fdwOutputPrecision,
153
DWORD fdwStrikeOut, DWORD fdwCharSet, DWORD fdwOutputPrecision,
144
DWORD fdwClipPrecision, DWORD fdwQuality, DWORD fdwPitchAndFamily,
154
DWORD fdwClipPrecision, DWORD fdwQuality, DWORD fdwPitchAndFamily,
145
LPCTSTR lpszFace);
155
LPCTSTR lpszFace);
146
BOOL GetTextExtentPoint32(HDC hdc, LPCTSTR lpString, int c, LPSIZE lpSize);
156
WINDUMMY_FUNC(BOOL) GetTextExtentPoint32(HDC hdc, LPCTSTR lpString, int c, LPSIZE lpSize);
147
BOOL EnumWindows(WNDENUMPROC lpEnumFunc, LPARAM lParam);
157
WINDUMMY_FUNC(BOOL) EnumWindows(WNDENUMPROC lpEnumFunc, LPARAM lParam);
148
int GetWindowText(HWND hWnd, LPTSTR lpString, int nMaxCount);
158
WINDUMMY_FUNC(int) GetWindowText(HWND hWnd, LPTSTR lpString, int nMaxCount);
149
159
150
HMODULE LoadLibrary(LPCTSTR lpFileName);
160
WINDUMMY_FUNC(HMODULE) LoadLibrary(LPCTSTR lpFileName);
151
BOOL FreeLibrary(HMODULE hModule);
161
WINDUMMY_FUNC(BOOL) FreeLibrary(HMODULE hModule);
152
void* GetProcAddress(HMODULE hModule, LPCSTR lpProcName);
162
WINDUMMY_FUNC(void*) GetProcAddress(HMODULE hModule, LPCSTR lpProcName);
153
163
154
HGDIOBJ GetStockObject(int fnObject);
164
WINDUMMY_FUNC(HGDIOBJ) GetStockObject(int fnObject);
155
BOOL IsWindowVisible(HWND hWnd);
165
WINDUMMY_FUNC(BOOL) IsWindowVisible(HWND hWnd);
156
LRESULT DefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam,
166
WINDUMMY_FUNC(LRESULT) DefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam,
157
    LPARAM lParam);
167
    LPARAM lParam);
158
LONG GetWindowLong(HWND hWnd, int nIndex);
168
WINDUMMY_FUNC(LONG) GetWindowLong(HWND hWnd, int nIndex);
159
BOOL RegisterClass(const WNDCLASS *lpWndClass);
169
WINDUMMY_FUNC(BOOL) RegisterClass(const WNDCLASS *lpWndClass);
160
HMODULE GetModuleHandle(LPCTSTR lpModuleName);
170
WINDUMMY_FUNC(HMODULE) GetModuleHandle(LPCTSTR lpModuleName);
161
HICON LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName);
171
WINDUMMY_FUNC(HICON) LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName);
162
172
163
long filelength(int fd);
173
WINDUMMY_FUNC(long) filelength(int fd);
164
int LoadCursor(HINSTANCE hInstance, LPCTSTR lpCursorName);
174
WINDUMMY_FUNC(int) LoadCursor(HINSTANCE hInstance, LPCTSTR lpCursorName);
165
BOOL Rectangle(HDC hdc,
175
WINDUMMY_FUNC(BOOL) Rectangle(HDC hdc,
166
  int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
176
  int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
167
char* _strupr(char*s);
177
WINDUMMY_FUNC(char*) _strupr(char*s);
168
178
169
#endif /* not WIN32 */
179
#endif /* not WIN32 */
170
180
Lines 176-197 char* _strupr(char*s); Link Here
176
extern "C" {
186
extern "C" {
177
#endif
187
#endif
178
188
179
int open_data_file(const char *basename, int mode);
189
WINDUMMY_FUNC(int) open_data_file(const char *basename, int mode);
180
int data_file_exists(const char *basename);
190
WINDUMMY_FUNC(int) data_file_exists(const char *basename);
181
191
182
void split_path(const char *fname,
192
WINDUMMY_FUNC(void) split_path(const char *fname,
183
        char *file_path,
193
        char *file_path,
184
        char *basename,
194
        char *basename,
185
        char *ext);
195
        char *ext);
186
196
187
void make_path(char *opath,
197
WINDUMMY_FUNC(void) make_path(char *opath,
188
        const char *dir,
198
        const char *dir,
189
        const char *basename,
199
        const char *basename,
190
        const char *ext);
200
        const char *ext);
191
201
192
void winpath_to_internal(char *p);
202
WINDUMMY_FUNC(void) winpath_to_internal(char *p);
193
203
194
unsigned int curr_dir(unsigned int bsize, char* buf);
204
WINDUMMY_FUNC(unsigned int) curr_dir(unsigned int bsize, char* buf);
195
205
196
#ifdef __cplusplus
206
#ifdef __cplusplus
197
}
207
}
(-)a/cuneiform_src/Kern/itigerole/sources/tiger/h/globus.h (+13 lines)
Lines 138-143 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
138
            #define CDECL      __cdecl
138
            #define CDECL      __cdecl
139
         #endif
139
         #endif
140
      #endif
140
      #endif
141
   #elif    defined( __GNUC_MINOR__ ) && defined(HAVE_GCCVISIBILITY) /* GNU Compiler Suite ******/
142
         #define CLA_IMPO
143
         #define CLA_EXPO __attribute__ ((visibility("default")))
144
         #define FUN_IMPO__
145
         #define __FUN_IMPO
146
         #define FUN_EXPO__ __attribute__ ((visibility("default")))
147
         #define __FUN_EXPO
148
         #ifndef PASCAL
149
            #define PASCAL __attribute__ ((stdcall))
150
         #endif
151
         #ifndef CDECL
152
            #define CDECL __attribute__ ((cdecl))
153
         #endif
141
   #else /* unknown compiler ******************************************/
154
   #else /* unknown compiler ******************************************/
142
         #define CLA_IMPO
155
         #define CLA_IMPO
143
         #define CLA_EXPO
156
         #define CLA_EXPO
(-)a/cuneiform_src/Kern/leo/CMakeLists.txt (+1 lines)
Lines 12-17 src/leo_prn.c Link Here
12
src/leo_size.c
12
src/leo_size.c
13
src/leo_stic.c
13
src/leo_stic.c
14
)
14
)
15
set_property(TARGET leo PROPERTY COMPILE_DEFINITIONS __LEO__)
15
16
16
target_link_libraries(leo
17
target_link_libraries(leo
17
cpu
18
cpu
(-)a/cuneiform_src/Kern/lns32/CMakeLists.txt (+1 lines)
Lines 24-29 src/smooth.cpp Link Here
24
src/sweeper.cpp
24
src/sweeper.cpp
25
src/tgreader.cpp
25
src/tgreader.cpp
26
)
26
)
27
set_property(TARGET lns32 PROPERTY COMPILE_DEFINITIONS __LNS__)
27
28
28
target_link_libraries(lns32 cline std32 windummy)
29
target_link_libraries(lns32 cline std32 windummy)
29
30
(-)a/cuneiform_src/Kern/loc/CMakeLists.txt (+1 lines)
Lines 7-12 src/loc.c Link Here
7
src/locompmn.c
7
src/locompmn.c
8
src/v0compgl.c
8
src/v0compgl.c
9
)
9
)
10
set_property(TARGET loc PROPERTY COMPILE_DEFINITIONS __LOC__)
10
11
11
target_link_libraries(loc windummy)
12
target_link_libraries(loc windummy)
12
13
(-)a/cuneiform_src/Kern/loc/src/locompmn.c (-1 / +2 lines)
Lines 59-64 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
59
#include <stdlib.h>
59
#include <stdlib.h>
60
#include "struct.h"
60
#include "struct.h"
61
#include "v1comp.h"
61
#include "v1comp.h"
62
#include "loc.h"
62
63
63
BWSS *locomp_seglist(Word8* raster, BWSS *bwsp, BWSS *bwe, Int32 height, Int32 width);
64
BWSS *locomp_seglist(Word8* raster, BWSS *bwsp, BWSS *bwe, Int32 height, Int32 width);
64
MN * c_locomp (Word8* raster, Int32 bw, Int32 h, Int16 upper, Int16 left);
65
MN * c_locomp (Word8* raster, Int32 bw, Int32 h, Int16 upper, Int16 left);
Lines 101-107 static void new_line_cont(); Link Here
101
static void merge_line();
102
static void merge_line();
102
static void dead_line();
103
static void dead_line();
103
104
104
MN * c_locomp (Word8* raster, Int32 bw, Int32 h, Int16 upper, Int16 left)
105
LOC_FUNC(MN *) c_locomp (Word8* raster, Int32 bw, Int32 h, Int16 upper, Int16 left)
105
{
106
{
106
 lineno = upper-1; rast_lc = left;
107
 lineno = upper-1; rast_lc = left;
107
 if (setjmp(locomp_err)) return NULL;
108
 if (setjmp(locomp_err)) return NULL;
(-)a/cuneiform_src/Kern/mmx/CMakeLists.txt (+1 lines)
Lines 7-12 src/mmx_net.c Link Here
7
src/mmx_r35.c
7
src/mmx_r35.c
8
src/mmxmain.c
8
src/mmxmain.c
9
)
9
)
10
set_property(TARGET mmx PROPERTY COMPILE_DEFINITIONS __MMX__)
10
11
11
if(WIN32)
12
if(WIN32)
12
  install(TARGETS mmx ARCHIVE DESTINATION ${LIBDIR})
13
  install(TARGETS mmx ARCHIVE DESTINATION ${LIBDIR})
(-)a/cuneiform_src/Kern/msk/CMakeLists.txt (+1 lines)
Lines 1-6 Link Here
1
include_directories(src)
1
include_directories(src)
2
2
3
add_library(msk ${LIBTYPE} src/msk.c)
3
add_library(msk ${LIBTYPE} src/msk.c)
4
set_property(TARGET msk PROPERTY COMPILE_DEFINITIONS __MSK__)
4
5
5
target_link_libraries(msk mmx windummy)
6
target_link_libraries(msk mmx windummy)
6
7
(-)a/cuneiform_src/Kern/pass2/CMakeLists.txt (+1 lines)
Lines 7-12 src/p2_rstr.c Link Here
7
src/p2_test.c
7
src/p2_test.c
8
src/p2_tools.c
8
src/p2_tools.c
9
)
9
)
10
set_property(TARGET pass2 PROPERTY COMPILE_DEFINITIONS __P2__)
10
11
11
target_link_libraries(pass2 cstr fon std32)
12
target_link_libraries(pass2 cstr fon std32)
12
13
(-)a/cuneiform_src/Kern/puma/CMakeLists.txt (+1 lines)
Lines 13-18 main/mymem.cpp Link Here
13
main/puma.cpp 
13
main/puma.cpp 
14
main/dll.cpp 
14
main/dll.cpp 
15
)
15
)
16
set_property(TARGET puma PROPERTY COMPILE_DEFINITIONS __PUMA__)
16
17
17
target_link_libraries(puma
18
target_link_libraries(puma
18
ced
19
ced
(-)a/cuneiform_src/Kern/puma/c/partlayout.cpp (-2 lines)
Lines 58-65 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
58
	#include <windows.h>
58
	#include <windows.h>
59
#endif
59
#endif
60
60
61
#define __PUMA__
62
63
#include <stdio.h>
61
#include <stdio.h>
64
#include <string.h>
62
#include <string.h>
65
63
(-)a/cuneiform_src/Kern/puma/main/dll.cpp (-2 lines)
Lines 61-68 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
61
//
61
//
62
// dll_cpage.cpp :
62
// dll_cpage.cpp :
63
// ============================================================================
63
// ============================================================================
64
#define __PUMA__
65
66
/*#include <windows.h>*/
64
/*#include <windows.h>*/
67
#include <string.h>
65
#include <string.h>
68
#include <stdio.h>
66
#include <stdio.h>
(-)a/cuneiform_src/Kern/puma/main/puma.cpp (-1 lines)
Lines 55-61 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
55
*/
55
*/
56
56
57
#define __PUMA_CPP__
57
#define __PUMA_CPP__
58
#define __PUMA__
59
//#include <windows.h>
58
//#include <windows.h>
60
//#include <stdio.h>
59
//#include <stdio.h>
61
#include <string>
60
#include <string>
(-)a/cuneiform_src/Kern/r35/CMakeLists.txt (+1 lines)
Lines 1-5 Link Here
1
add_library(r35 ${LIBTYPE}
1
add_library(r35 ${LIBTYPE}
2
src/r35.c)
2
src/r35.c)
3
set_property(TARGET r35 PROPERTY COMPILE_DEFINITIONS __R35__)
3
4
4
target_link_libraries(r35 mmx std32 windummy)
5
target_link_libraries(r35 mmx std32 windummy)
5
6
(-)a/cuneiform_src/Kern/rbal/CMakeLists.txt (+1 lines)
Lines 10-15 src/linpon.c Link Here
10
src/linutil.c
10
src/linutil.c
11
src/statsearchbl.cpp
11
src/statsearchbl.cpp
12
)
12
)
13
set_property(TARGET rbal PROPERTY COMPILE_DEFINITIONS __RBAL__)
13
14
14
target_link_libraries(rbal cstr evn32)
15
target_link_libraries(rbal cstr evn32)
15
16
(-)a/cuneiform_src/Kern/rblock/CMakeLists.txt (+1 lines)
Lines 49-54 sources/c/semain.c Link Here
49
sources/c/sestring.c
49
sources/c/sestring.c
50
sources/c/sevbreak.c
50
sources/c/sevbreak.c
51
)
51
)
52
set_property(TARGET rblock PROPERTY COMPILE_DEFINITIONS __RBLOCK__)
52
53
53
target_link_libraries(rblock cpage loc exc cstr cline rstr)
54
target_link_libraries(rblock cpage loc exc cstr cline rstr)
54
55
(-)a/cuneiform_src/Kern/rblock/sources/main/_dll.cpp (-2 lines)
Lines 60-67 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
60
//
60
//
61
// dll_cpage.cpp :
61
// dll_cpage.cpp :
62
// ============================================================================
62
// ============================================================================
63
#define __RBLOCK__
64
65
/*#include <windows.h>*/
63
/*#include <windows.h>*/
66
#include <setjmp.h>
64
#include <setjmp.h>
67
65
(-)a/cuneiform_src/Kern/rblock/sources/main/_rblock.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RBLOCK__
58
59
/*#include <windows.h>*/
57
/*#include <windows.h>*/
60
#include <setjmp.h>
58
#include <setjmp.h>
61
#include <assert.h>
59
#include <assert.h>
(-)a/cuneiform_src/Kern/rcorrkegl/CMakeLists.txt (+1 lines)
Lines 6-11 src/cpp/cor_kegl.cpp Link Here
6
src/cpp/rcorrkegl.cpp
6
src/cpp/rcorrkegl.cpp
7
src/cpp/stdafx.cpp
7
src/cpp/stdafx.cpp
8
)
8
)
9
set_property(TARGET rcorrkegl PROPERTY COMPILE_DEFINITIONS __RCORRKEGL__)
9
10
10
target_link_libraries(rcorrkegl cstr cpage)
11
target_link_libraries(rcorrkegl cstr cpage)
11
12
(-)a/cuneiform_src/Kern/rcutp/CMakeLists.txt (+1 lines)
Lines 9-14 sources/main/rcutp_func.cpp Link Here
9
sources/main/rcutp_main.cpp
9
sources/main/rcutp_main.cpp
10
sources/main/rcutp_mainfunc.cpp
10
sources/main/rcutp_mainfunc.cpp
11
)
11
)
12
set_property(TARGET rcutp PROPERTY COMPILE_DEFINITIONS __RCUTP__)
12
13
13
target_link_libraries(rcutp ccom windummy)
14
target_link_libraries(rcutp ccom windummy)
14
15
(-)a/cuneiform_src/Kern/rdib/CMakeLists.txt (+1 lines)
Lines 1-6 Link Here
1
include_directories(BEFORE sources)
1
include_directories(BEFORE sources)
2
2
3
add_library(rdib ${LIBTYPE} sources/cpp/CTDIB.cpp)
3
add_library(rdib ${LIBTYPE} sources/cpp/CTDIB.cpp)
4
set_property(TARGET rdib PROPERTY COMPILE_DEFINITIONS __RDIB__)
4
5
5
if(WIN32)
6
if(WIN32)
6
  install(TARGETS rdib ARCHIVE DESTINATION ${LIBDIR})
7
  install(TARGETS rdib ARCHIVE DESTINATION ${LIBDIR})
(-)a/cuneiform_src/Kern/rdib/sources/cpp/CTDIB.cpp (-3 lines)
Lines 57-65 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
57
// CTDIB.cpp: implementation of the CTDIB class.
57
// CTDIB.cpp: implementation of the CTDIB class.
58
//
58
//
59
//////////////////////////////////////////////////////////////////////
59
//////////////////////////////////////////////////////////////////////
60
#define __RDIB__
61
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
62
63
#include <memory.h>
60
#include <memory.h>
64
#include <stdlib.h>
61
#include <stdlib.h>
65
#include "ctdib.h"
62
#include "ctdib.h"
(-)a/cuneiform_src/Kern/rfrmt/CMakeLists.txt (+1 lines)
Lines 19-24 sources/main/util.cpp Link Here
19
sources/main/util_lst.cpp
19
sources/main/util_lst.cpp
20
sources/main/util_spl.cpp
20
sources/main/util_spl.cpp
21
)
21
)
22
set_property(TARGET rfrmt PROPERTY COMPILE_DEFINITIONS __RFRMT__)
22
23
23
target_link_libraries(rfrmt
24
target_link_libraries(rfrmt
24
ced
25
ced
(-)a/cuneiform_src/Kern/rfrmt/sources/main/frmt.cpp (-1 lines)
Lines 69-75 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
69
#include <unistd.h>
69
#include <unistd.h>
70
#include "stdafx.h"
70
#include "stdafx.h"
71
#include "resource.h"
71
#include "resource.h"
72
#define __RFRMT__
73
#include "rfrmt.h"
72
#include "rfrmt.h"
74
#include "mymem.h"
73
#include "mymem.h"
75
#include "rtffragrect.h"
74
#include "rtffragrect.h"
(-)a/cuneiform_src/Kern/rfrmt/sources/main/frmtdll.cpp (-1 lines)
Lines 63-69 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
63
63
64
/*#include <windows.h>*/
64
/*#include <windows.h>*/
65
#include "resource.h"
65
#include "resource.h"
66
#define __RFRMT__
67
#define __RFRMT_EXTERN__
66
#define __RFRMT_EXTERN__
68
#include "rfrmt.h"
67
#include "rfrmt.h"
69
#include "dpuma.h"
68
#include "dpuma.h"
(-)a/cuneiform_src/Kern/rimage/CMakeLists.txt (+1 lines)
Lines 16-21 sources/main/crturner.cpp Link Here
16
sources/main/dll.cpp
16
sources/main/dll.cpp
17
sources/main/rprogressor.cpp
17
sources/main/rprogressor.cpp
18
)
18
)
19
set_property(TARGET rimage PROPERTY COMPILE_DEFINITIONS __RIMAGE__)
19
20
20
target_link_libraries(rimage
21
target_link_libraries(rimage
21
cfio
22
cfio
(-)a/cuneiform_src/Kern/rimage/sources/main/criimage.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RIMAGE__
58
59
#include "resource.h"
57
#include "resource.h"
60
#include "criimage.h"
58
#include "criimage.h"
61
#include "crimemory.h"
59
#include "crimemory.h"
(-)a/cuneiform_src/Kern/rimage/sources/main/dll.cpp (-2 lines)
Lines 60-67 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
60
//
60
//
61
// dll_cpage.cpp :
61
// dll_cpage.cpp :
62
// ============================================================================
62
// ============================================================================
63
#define __RIMAGE__
64
65
/*#include <windows.h>*/
63
/*#include <windows.h>*/
66
64
67
#include "resource.h"
65
#include "resource.h"
(-)a/cuneiform_src/Kern/rline/CMakeLists.txt (+1 lines)
Lines 6-11 sources/findlostlines.cpp Link Here
6
sources/newline.cpp
6
sources/newline.cpp
7
sources/rline.cpp
7
sources/rline.cpp
8
)
8
)
9
set_property(TARGET rline PROPERTY COMPILE_DEFINITIONS __RLINE__)
9
10
10
target_link_libraries(rline
11
target_link_libraries(rline
11
cimage
12
cimage
(-)a/cuneiform_src/Kern/rline/sources/dll.cpp (-2 lines)
Lines 58-65 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
58
//
58
//
59
// ============================================================================
59
// ============================================================================
60
60
61
#define __RLINE__
62
63
#include <stdlib.h>
61
#include <stdlib.h>
64
#include "stdafx.h"
62
#include "stdafx.h"
65
#include "resource.h"
63
#include "resource.h"
(-)a/cuneiform_src/Kern/rline/sources/findlostlines.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RLINE__
58
59
#ifdef _DEBUG
57
#ifdef _DEBUG
60
#define SOURCE_FILE_NAME "FindLostLines.cpp"
58
#define SOURCE_FILE_NAME "FindLostLines.cpp"
61
#endif
59
#endif
(-)a/cuneiform_src/Kern/rline/sources/newline.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RLINE__
58
59
#include <stdlib.h>
57
#include <stdlib.h>
60
#include <stdio.h>
58
#include <stdio.h>
61
#include <math.h>
59
#include <math.h>
(-)a/cuneiform_src/Kern/rline/sources/rline.cpp (-2 lines)
Lines 58-65 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
58
//
58
//
59
// ============================================================================
59
// ============================================================================
60
60
61
#define __RLINE__
62
63
#include <stdlib.h>
61
#include <stdlib.h>
64
/*#include <windows.h>*/
62
/*#include <windows.h>*/
65
#include <memory.h>
63
#include <memory.h>
(-)a/cuneiform_src/Kern/rling/CMakeLists.txt (+1 lines)
Lines 37-42 sources/c/spelspec.c Link Here
37
sources/c/udictini.c
37
sources/c/udictini.c
38
sources/c/udictuti.c
38
sources/c/udictuti.c
39
)
39
)
40
set_property(TARGET rling PROPERTY COMPILE_DEFINITIONS __RLING__)
40
41
41
target_link_libraries(rling cstr rlings)
42
target_link_libraries(rling cstr rlings)
42
43
(-)a/cuneiform_src/Kern/rling/sources/CMakeLists.txt (+1 lines)
Lines 31-36 c/spelspec.c Link Here
31
c/udictini.c
31
c/udictini.c
32
c/udictuti.c
32
c/udictuti.c
33
)
33
)
34
set_property(TARGET rlings PROPERTY COMPILE_DEFINITIONS __RLINGS__)
34
35
35
target_link_libraries(rlings cstr windummy)
36
target_link_libraries(rlings cstr windummy)
36
37
(-)a/cuneiform_src/Kern/rling/sources/cpp/crling.cpp (-6 lines)
Lines 54-65 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#ifndef RLING_SECONDARY
58
  #define __RLING__
59
#else
60
  #define __RLINGS__
61
#endif
62
63
#include "resource.h"
57
#include "resource.h"
64
#include "rlcontrol.h"
58
#include "rlcontrol.h"
65
#include "crling.h"
59
#include "crling.h"
(-)a/cuneiform_src/Kern/rling/sources/cpp/dll.cpp (-6 lines)
Lines 61-72 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
61
//
61
//
62
// dll_cpage.cpp :
62
// dll_cpage.cpp :
63
// ============================================================================
63
// ============================================================================
64
#ifndef RLING_SECONDARY
65
  #define __RLING__
66
#else
67
  #define __RLINGS__
68
#endif
69
70
/*#include <windows.h>*/
64
/*#include <windows.h>*/
71
65
72
#include "resource.h"
66
#include "resource.h"
(-)a/cuneiform_src/Kern/rmarker/CMakeLists.txt (+1 lines)
Lines 13-18 shortverticallinesfilter.cpp Link Here
13
../usage/puma_err.cpp
13
../usage/puma_err.cpp
14
../usage/un_buff.cpp
14
../usage/un_buff.cpp
15
)
15
)
16
set_property(TARGET rmarker PROPERTY COMPILE_DEFINITIONS __RMARKER__)
16
17
17
target_link_libraries(rmarker
18
target_link_libraries(rmarker
18
cfio
19
cfio
(-)a/cuneiform_src/Kern/rneg/CMakeLists.txt (+1 lines)
Lines 9-14 sources/src/negmain/recnegmain.cpp Link Here
9
sources/src/negmain/rnegbase.cpp
9
sources/src/negmain/rnegbase.cpp
10
sources/src/searchneg/searchneg.cpp
10
sources/src/searchneg/searchneg.cpp
11
)
11
)
12
set_property(TARGET rneg PROPERTY COMPILE_DEFINITIONS __RNEG__)
12
13
13
target_link_libraries(rneg
14
target_link_libraries(rneg
14
cimage
15
cimage
(-)a/cuneiform_src/Kern/rneg/sources/src/negatest/negatestcell.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RNEG__
58
59
#include "rneg.h"
57
#include "rneg.h"
60
#include "recnegmain.h"
58
#include "recnegmain.h"
61
#include "compat_defs.h"
59
#include "compat_defs.h"
(-)a/cuneiform_src/Kern/rneg/sources/src/negmain/recnegmain.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RNEG__
58
59
#include <string.h>
57
#include <string.h>
60
#include "rneg.h"
58
#include "rneg.h"
61
#include "recnegmain.h"
59
#include "recnegmain.h"
(-)a/cuneiform_src/Kern/rneg/sources/src/negmain/rnegbase.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RNEG__
58
59
#include "rneg.h"
57
#include "rneg.h"
60
#include "rnegbase.h"
58
#include "rnegbase.h"
61
#include "compat_defs.h"
59
#include "compat_defs.h"
(-)a/cuneiform_src/Kern/rout/CMakeLists.txt (+1 lines)
Lines 13-18 src/tabletext.cpp Link Here
13
src/text.cpp
13
src/text.cpp
14
src/words.cpp
14
src/words.cpp
15
)
15
)
16
set_property(TARGET rout PROPERTY COMPILE_DEFINITIONS __ROUT__)
16
17
17
target_link_libraries(rout ced cfio)
18
target_link_libraries(rout ced cfio)
18
19
(-)a/cuneiform_src/Kern/rout/src/rout_own.h (-2 lines)
Lines 59-66 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
59
59
60
#pragma once
60
#pragma once
61
61
62
#define __ROUT__
63
64
#include "stdafx.h"
62
#include "stdafx.h"
65
#include "rout.h"
63
#include "rout.h"
66
#include "cfio.h"
64
#include "cfio.h"
(-)a/cuneiform_src/Kern/rpic/CMakeLists.txt (+1 lines)
Lines 12-17 sources/polypic.cpp Link Here
12
sources/rectpic.cpp
12
sources/rectpic.cpp
13
sources/rpic.cpp
13
sources/rpic.cpp
14
)
14
)
15
set_property(TARGET rpic PROPERTY COMPILE_DEFINITIONS __RPIC__)
15
16
16
target_link_libraries(rpic cpage ccom rstr)
17
target_link_libraries(rpic cpage ccom rstr)
17
18
(-)a/cuneiform_src/Kern/rpic/sources/dll.cpp (-2 lines)
Lines 58-65 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
58
//
58
//
59
// ============================================================================
59
// ============================================================================
60
60
61
#define __RPIC__
62
63
/*# include <windows.h>*/
61
/*# include <windows.h>*/
64
#include "compat_defs.h"
62
#include "compat_defs.h"
65
63
(-)a/cuneiform_src/Kern/rpic/sources/rpic.cpp (-2 lines)
Lines 58-65 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
58
//
58
//
59
// ============================================================================
59
// ============================================================================
60
60
61
#define __RPIC__
62
63
#define __RPIC_CPP__
61
#define __RPIC_CPP__
64
62
65
/*#include <windows.h>*/
63
/*#include <windows.h>*/
(-)a/cuneiform_src/Kern/rpstr/CMakeLists.txt (+1 lines)
Lines 8-13 src/incl/cor_incl.c Link Here
8
src/cor_spel.c 
8
src/cor_spel.c 
9
src/rpstr.c 
9
src/rpstr.c 
10
src/vertstr.cpp)
10
src/vertstr.cpp)
11
set_property(TARGET rpstr PROPERTY COMPILE_DEFINITIONS __RPSTR__)
11
12
12
target_link_libraries(rpstr
13
target_link_libraries(rpstr
13
ccom
14
ccom
(-)a/cuneiform_src/Kern/rreccom/CMakeLists.txt (+1 lines)
Lines 5-10 src/cpp/alphabet.cpp Link Here
5
src/cpp/recog.cpp
5
src/cpp/recog.cpp
6
src/cpp/rreccom.cpp
6
src/cpp/rreccom.cpp
7
)
7
)
8
set_property(TARGET rreccom PROPERTY COMPILE_DEFINITIONS __RRECCOM__)
8
9
9
target_link_libraries(rreccom ccom evn32 windummy)
10
target_link_libraries(rreccom ccom evn32 windummy)
10
11
(-)a/cuneiform_src/Kern/rreccom/src/cpp/recog.cpp (-2 lines)
Lines 55-62 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
55
*/
55
*/
56
56
57
/*********************************************************************************************/
57
/*********************************************************************************************/
58
#define __RRECCOM__
59
60
//#define _USE_GRA_ 1
58
//#define _USE_GRA_ 1
61
/*********************************************************************************************/
59
/*********************************************************************************************/
62
/*#include <windows.h>
60
/*#include <windows.h>
(-)a/cuneiform_src/Kern/rreccom/src/cpp/rreccom.cpp (-2 lines)
Lines 55-62 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
55
*/
55
*/
56
56
57
/*********************************************************************************************/
57
/*********************************************************************************************/
58
#define __RRECCOM__
59
/*********************************************************************************************/
60
#include <string.h>
58
#include <string.h>
61
#include "stdafx.h"
59
#include "stdafx.h"
62
#include "rreccom.h"
60
#include "rreccom.h"
(-)a/cuneiform_src/Kern/rsadd/CMakeLists.txt (+1 lines)
Lines 1-6 Link Here
1
include_directories(BEFORE src)
1
include_directories(BEFORE src)
2
2
3
add_library(rsadd ${LIBTYPE} src/rsadd.c)
3
add_library(rsadd ${LIBTYPE} src/rsadd.c)
4
set_property(TARGET rsadd PROPERTY COMPILE_DEFINITIONS __RSADD__)
4
5
5
target_link_libraries(rsadd cstr)
6
target_link_libraries(rsadd cstr)
6
7
(-)a/cuneiform_src/Kern/rselstr/CMakeLists.txt (+1 lines)
Lines 40-45 sources/src/cpp/sestring.cpp Link Here
40
sources/src/cpp/sevbreak.cpp
40
sources/src/cpp/sevbreak.cpp
41
sources/src/chstr/vertical/testforvertical.cpp
41
sources/src/chstr/vertical/testforvertical.cpp
42
)
42
)
43
set_property(TARGET rselstr PROPERTY COMPILE_DEFINITIONS __RSELSTR__)
43
44
44
target_link_libraries(rselstr
45
target_link_libraries(rselstr
45
cimage
46
cimage
(-)a/cuneiform_src/Kern/rselstr/sources/src/chstr/addtocstr/puttocstr.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RSELSTR__
58
59
#include <string.h>
57
#include <string.h>
60
#include <stdlib.h>
58
#include <stdlib.h>
61
#include "puttocstr.h"
59
#include "puttocstr.h"
(-)a/cuneiform_src/Kern/rselstr/sources/src/chstr/cont/puttocont.cpp (-3 lines)
Lines 54-62 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RSELSTR__
58
59
60
#include "rselstr.h"
57
#include "rselstr.h"
61
#include "puttocont.h"
58
#include "puttocont.h"
62
59
(-)a/cuneiform_src/Kern/rselstr/sources/src/chstr/cutstr/chstr_cutstr.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RSELSTR__
58
59
#include "cutstr.h"
57
#include "cutstr.h"
60
#include "rselstr.h"
58
#include "rselstr.h"
61
#include <assert.h>
59
#include <assert.h>
(-)a/cuneiform_src/Kern/rselstr/sources/src/chstr/rotate/rotate.cpp (-1 lines)
Lines 54-60 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RSELSTR__
58
#include <string.h>
57
#include <string.h>
59
#include "rotate.h"
58
#include "rotate.h"
60
#include "rselstr.h"
59
#include "rselstr.h"
(-)a/cuneiform_src/Kern/rselstr/sources/src/chstr/vertical/testforvertical.cpp (-2 lines)
Lines 54-61 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RSELSTR__
58
59
#include <stdlib.h>
57
#include <stdlib.h>
60
#include <string.h>
58
#include <string.h>
61
#include "puttocstr.h"
59
#include "puttocstr.h"
(-)a/cuneiform_src/Kern/rselstr/sources/src/cpp/cutstr.cpp (-1 lines)
Lines 54-60 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RSELSTR__
58
#include<math.h>
57
#include<math.h>
59
#include<time.h>
58
#include<time.h>
60
#include "rselstr.h"
59
#include "rselstr.h"
(-)a/cuneiform_src/Kern/rselstr/sources/src/rselstrmain/rselstrbase.cpp (-1 lines)
Lines 54-60 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RSELSTR__
58
/*#include <windows.h>*/
57
/*#include <windows.h>*/
59
#include <setjmp.h>
58
#include <setjmp.h>
60
59
(-)a/cuneiform_src/Kern/rselstr/sources/src/rselstrmain/rselstrmain.cpp (-3 lines)
Lines 54-62 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE Link Here
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
*/
55
*/
56
56
57
#define __RSELSTR__
58
59
60
# include <setjmp.h>
57
# include <setjmp.h>
61
# include <string.h>
58
# include <string.h>
62
#include<math.h>
59
#include<math.h>
(-)a/cuneiform_src/Kern/rshelllines/CMakeLists.txt (+1 lines)
Lines 9-14 src/rshelllines.cpp Link Here
9
#src/RShellLines.rc
9
#src/RShellLines.rc
10
src/stdafx.cpp
10
src/stdafx.cpp
11
)
11
)
12
set_property(TARGET rshelllines PROPERTY COMPILE_DEFINITIONS __RSHELLLINES_EXPORTS__)
12
13
13
target_link_libraries(rshelllines
14
target_link_libraries(rshelllines
14
cfio
15
cfio
(-)a/cuneiform_src/Kern/rshelllines/src/rshelllines.cpp (-18 / +18 lines)
Lines 176-182 Bool32 AboutLines (PRSPreProcessImage Image, Bool32 *BadScan, Int32 *ScanQual); Link Here
176
176
177
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
177
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
178
//                     FindLineFrag
178
//                     FindLineFrag
179
RSHELLLINES_API Bool32 FindLineFrag(CLINE_handle processedline, Bool32 OnlyPosyAndStat,
179
RSHELLLINES_FUNC(Bool32) FindLineFrag(CLINE_handle processedline, Bool32 OnlyPosyAndStat,
180
									Bool32 Is2ndPath, CLINE_handle hContainer,
180
									Bool32 Is2ndPath, CLINE_handle hContainer,
181
									Bool32 IfNeedFragment, Bool32 IfStraightFrag)
181
									Bool32 IfNeedFragment, Bool32 IfStraightFrag)
182
{
182
{
Lines 185-191 RSHELLLINES_API Bool32 FindLineFrag(CLINE_handle processedline, Bool32 OnlyPosyA Link Here
185
185
186
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
186
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
187
//                     FindLineAttr
187
//                     FindLineAttr
188
RSHELLLINES_API Bool32 FindLineAttr(CLINE_handle line, DLine* pCLine, Bool32 AbleSeeOldAttr)
188
RSHELLLINES_FUNC(Bool32) FindLineAttr(CLINE_handle line, DLine* pCLine, Bool32 AbleSeeOldAttr)
189
{
189
{
190
    //SetWidth(line, pCLine);
190
    //SetWidth(line, pCLine);
191
    return TRUE;
191
    return TRUE;
Lines 575-586 Bool32 CompareRasterParts(CPDLine pLine, LPSTR pSourceRaster, Bool32 CheckSerif) Link Here
575
    return TRUE;
575
    return TRUE;
576
}
576
}
577
577
578
RSHELLLINES_API Bool32 RSL_CorrectDoubleLines(CLINE_handle hLine1, CLINE_handle hLine2)
578
RSHELLLINES_FUNC(Bool32) RSL_CorrectDoubleLines(CLINE_handle hLine1, CLINE_handle hLine2)
579
{
579
{
580
	return TRUE;
580
	return TRUE;
581
}
581
}
582
582
583
RSHELLLINES_API Bool32     RSL_SplitLine(CLINE_handle hLine, CLINE_handle hContainer)
583
RSHELLLINES_FUNC(Bool32)     RSL_SplitLine(CLINE_handle hLine, CLINE_handle hContainer)
584
{
584
{
585
	return TRUE;
585
	return TRUE;
586
}
586
}
Lines 662-668 Handle DrawLineFragments(CLINE_handle line, CPDLine pCLine, Handle HndMyWindow, Link Here
662
    return NULL;
662
    return NULL;
663
}
663
}
664
664
665
RSHELLLINES_API void DrawFriendLines(CLINE_handle hContainer, GLM* friendlinesmass)
665
RSHELLLINES_FUNC(void) DrawFriendLines(CLINE_handle hContainer, GLM* friendlinesmass)
666
{
666
{
667
}
667
}
668
668
Lines 670-727 void DrawGroupOfExtensibleLines(CLINE_handle hContainer, GLM* hGroup, int CountL Link Here
670
{
670
{
671
}
671
}
672
672
673
RSHELLLINES_API void DrawLosedVerticalLines(GLM* friendlinesmass, int CountLines)
673
RSHELLLINES_FUNC(void) DrawLosedVerticalLines(GLM* friendlinesmass, int CountLines)
674
{
674
{
675
}
675
}
676
676
677
RSHELLLINES_API void DrowAllLines(CLINE_handle hContainer, Handle hDrowAllLines)
677
RSHELLLINES_FUNC(void) DrowAllLines(CLINE_handle hContainer, Handle hDrowAllLines)
678
{
678
{
679
}
679
}
680
680
681
RSHELLLINES_API void DrawBigComps(CLINE_handle hContainer)
681
RSHELLLINES_FUNC(void) DrawBigComps(CLINE_handle hContainer)
682
{
682
{
683
}
683
}
684
684
685
RSHELLLINES_API void DrawFragsForAllLines(CLINE_handle hContainer, Handle hDebugDrawAllLineFragments)
685
RSHELLLINES_FUNC(void) DrawFragsForAllLines(CLINE_handle hContainer, Handle hDebugDrawAllLineFragments)
686
{
686
{
687
}
687
}
688
688
689
RSHELLLINES_API void InitLine(DLine* linedata)
689
RSHELLLINES_FUNC(void) InitLine(DLine* linedata)
690
{
690
{
691
}
691
}
692
692
693
RSHELLLINES_API void FindDotLines(Handle hCCOM,Handle hCPAGE, CLINE_handle hContainer)
693
RSHELLLINES_FUNC(void) FindDotLines(Handle hCCOM,Handle hCPAGE, CLINE_handle hContainer)
694
{
694
{
695
}
695
}
696
696
697
RSHELLLINES_API Bool32 CheckSeparationPoints(CLINE_handle hLine, CLINE_handle hComp)
697
RSHELLLINES_FUNC(Bool32) CheckSeparationPoints(CLINE_handle hLine, CLINE_handle hComp)
698
{
698
{
699
    return FALSE;
699
    return FALSE;
700
}
700
}
701
701
702
RSHELLLINES_API Bool SL_GetRaster(Rect32* rect, Word8** ppData, PAGEINFO* page_info)
702
RSHELLLINES_FUNC(Bool) SL_GetRaster(Rect32* rect, Word8** ppData, PAGEINFO* page_info)
703
{
703
{
704
    return TRUE;
704
    return TRUE;
705
}
705
}
706
706
707
RSHELLLINES_API void SetLinesAndCompsRelationship(CLINE_handle hContainer, CLINE_handle hFictContainer)
707
RSHELLLINES_FUNC(void) SetLinesAndCompsRelationship(CLINE_handle hContainer, CLINE_handle hFictContainer)
708
{
708
{
709
}
709
}
710
710
711
RSHELLLINES_API void FindFriendLines(CLINE_handle hContainer, GLM* friendlinesmass)
711
RSHELLLINES_FUNC(void) FindFriendLines(CLINE_handle hContainer, GLM* friendlinesmass)
712
{
712
{
713
}
713
}
714
714
715
RSHELLLINES_API void FindGroupOfExtensibleLines(CLINE_handle hContainer, GLM* friendlinesmass, Bool32 IfDrawResult)
715
RSHELLLINES_FUNC(void) FindGroupOfExtensibleLines(CLINE_handle hContainer, GLM* friendlinesmass, Bool32 IfDrawResult)
716
{
716
{
717
}
717
}
718
718
719
RSHELLLINES_API Int32 RSL_VerifyShortLine(CPDLine pLine, Handle hCCOM, PAGEINFO* page_info, Word8 lang, Word8 debug_flags, Int32 *cross_point)
719
RSHELLLINES_FUNC(Int32) RSL_VerifyShortLine(CPDLine pLine, Handle hCCOM, PAGEINFO* page_info, Word8 lang, Word8 debug_flags, Int32 *cross_point)
720
{
720
{
721
    return 0;
721
    return 0;
722
}
722
}
723
723
724
RSHELLLINES_API Bool32 GetNextPartOfLine(CLINE_handle hContainer, CLINE_handle hLine)
724
RSHELLLINES_FUNC(Bool32) GetNextPartOfLine(CLINE_handle hContainer, CLINE_handle hLine)
725
{
725
{
726
    return FALSE;
726
    return FALSE;
727
}
727
}
(-)a/cuneiform_src/Kern/rstr/CMakeLists.txt (+1 lines)
Lines 88-93 src/sweeper.c Link Here
88
src/tm.c
88
src/tm.c
89
src/tools.c
89
src/tools.c
90
src/ukr.c)
90
src/ukr.c)
91
set_property(TARGET rstr PROPERTY COMPILE_DEFINITIONS __RSTR__)
91
92
92
target_link_libraries(rstr
93
target_link_libraries(rstr
93
ccom
94
ccom
(-)a/cuneiform_src/Kern/rstuff/CMakeLists.txt (+1 lines)
Lines 25-30 sources/main/rstuff.cpp Link Here
25
../usage/puma_err.cpp
25
../usage/puma_err.cpp
26
../usage/un_buff.cpp
26
../usage/un_buff.cpp
27
)
27
)
28
set_property(TARGET rstuff PROPERTY COMPILE_DEFINITIONS __RSTUFF__)
28
29
29
target_link_libraries(rstuff
30
target_link_libraries(rstuff
30
cfio
31
cfio
(-)a/cuneiform_src/Kern/rstuff/sources/main/dll.cpp (-2 lines)
Lines 64-71 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
64
/*  Ñîäåðæàíèå :  Èíòåðôåéñ áèáëèîòåêè                                        */
64
/*  Ñîäåðæàíèå :  Èíòåðôåéñ áèáëèîòåêè                                        */
65
/*  Íàçíà÷åíèå :                                                              */
65
/*  Íàçíà÷åíèå :                                                              */
66
/*----------------------------------------------------------------------------*/
66
/*----------------------------------------------------------------------------*/
67
#define __RSTUFF__
68
69
/*#include <windows.h>*/
67
/*#include <windows.h>*/
70
#include "resource.h"
68
#include "resource.h"
71
#include "rstuff.h"
69
#include "rstuff.h"
(-)a/cuneiform_src/Kern/rverline/CMakeLists.txt (+1 lines)
Lines 12-17 src/service/vl_data.cpp Link Here
12
src/service/vl_rule.cpp
12
src/service/vl_rule.cpp
13
src/service/vl_snap.cpp
13
src/service/vl_snap.cpp
14
)
14
)
15
set_property(TARGET rverline PROPERTY COMPILE_DEFINITIONS __RVERLINE__)
15
16
16
target_link_libraries(rverline
17
target_link_libraries(rverline
17
cimage
18
cimage
(-)a/cuneiform_src/Kern/rverline/src/root/vl_kern.cpp (-2 lines)
Lines 61-68 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
61
/*  Ñîäåðæàíèå :  Ñîäåðæàòåëüíûå ôóíêöèè áèáëèîòåêè "RVERLINE"                */
61
/*  Ñîäåðæàíèå :  Ñîäåðæàòåëüíûå ôóíêöèè áèáëèîòåêè "RVERLINE"                */
62
/*  Íàçíà÷åíèå :  Ñòàíäàðòíûé äèàëîã ñ äðóãèìè áèáëèîòåêàìè                   */
62
/*  Íàçíà÷åíèå :  Ñòàíäàðòíûé äèàëîã ñ äðóãèìè áèáëèîòåêàìè                   */
63
/*----------------------------------------------------------------------------*/
63
/*----------------------------------------------------------------------------*/
64
#define __RVERLINE__
65
66
#include <stdio.h>
64
#include <stdio.h>
67
/*#include <windows.h>*/
65
/*#include <windows.h>*/
68
#include <string.h>
66
#include <string.h>
(-)a/cuneiform_src/Kern/rverline/src/root/vl_resid.cpp (-2 lines)
Lines 61-68 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
61
/*  Ñîäåðæàíèå :  Îáùèå ôóíêöèè áèáëèîòåêè "RVERLINE"                         */
61
/*  Ñîäåðæàíèå :  Îáùèå ôóíêöèè áèáëèîòåêè "RVERLINE"                         */
62
/*  Íàçíà÷åíèå :  Ñòàíäàðòíûé äèàëîã ñ äðóãèìè áèáëèîòåêàìè                   */
62
/*  Íàçíà÷åíèå :  Ñòàíäàðòíûé äèàëîã ñ äðóãèìè áèáëèîòåêàìè                   */
63
/*----------------------------------------------------------------------------*/
63
/*----------------------------------------------------------------------------*/
64
#define __RVERLINE__
65
66
#include <stdio.h>
64
#include <stdio.h>
67
#include <string.h>
65
#include <string.h>
68
/*#include <windows.h>*/
66
/*#include <windows.h>*/
(-)a/cuneiform_src/Kern/smetric/CMakeLists.txt (+1 lines)
Lines 10-15 src/ugol.cpp Link Here
10
../usage/puma_comm.cpp
10
../usage/puma_comm.cpp
11
../usage/un_buff.cpp
11
../usage/un_buff.cpp
12
)
12
)
13
set_property(TARGET smetric PROPERTY COMPILE_DEFINITIONS __SMETRIC__)
13
14
14
target_link_libraries(smetric windummy)
15
target_link_libraries(smetric windummy)
15
16
(-)a/cuneiform_src/Kern/std/CMakeLists.txt (+1 lines)
Lines 17-22 src/stdprt.cpp Link Here
17
src/stdsort.cpp
17
src/stdsort.cpp
18
src/stdwapi.cpp
18
src/stdwapi.cpp
19
)
19
)
20
set_property(TARGET std32 PROPERTY COMPILE_DEFINITIONS __STD__)
20
21
21
target_link_libraries(std32 windummy)
22
target_link_libraries(std32 windummy)
22
23
(-)a/cuneiform_src/Kern/windummy.c (-2 / +1 lines)
Lines 60-66 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Link Here
60
60
61
#include "compat_defs.h"
61
#include "compat_defs.h"
62
62
63
int HFILE_ERROR;
63
WINDUMMY_FUNC(int) HFILE_ERROR;
64
64
65
int LoadString(HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax) {
65
int LoadString(HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax) {
66
    return 0;
66
    return 0;
67
- 

Return to bug 234824