Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Fix hardcoded path, blitter stub

Browse Source 
git-svn-id: svn://kolibrios.org@8411 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
maxcodehack 2020-12-15 07:15:55 +00:00
parent feeb972821
commit 36193aaf9a
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/media/updf_newlib/apps/kolibri.c
View File

@ -469,6 +469,8 @@ struct blit_call
void kos_blit(int dstx, int dsty, int w, int h, int srcx, void kos_blit(int dstx, int dsty, int w, int h, int srcx,
int srcy,int srcw, int srch, int stride, char *d) int srcy,int srcw, int srch, int stride, char *d)
{ {
// Page fault
/*
struct blit_call image; struct blit_call image;
image.dstx=dstx; image.dstx=dstx;
image.dsty=dsty; image.dsty=dsty;
@ -480,6 +482,7 @@ void kos_blit(int dstx, int dsty, int w, int h, int srcx,
image.srch=srch; image.srch=srch;
image.stride=stride; image.stride=stride;
image.d=d; image.d=d;
asm ("int $0x40"::"a"(73),"b"(0),"c"(&image)); asm("int $0x40"::"a"(73),"b"(0),"c"(&image));
*/
} }

9
contrib/media/updf_newlib/apps/kos_main.c
View File

@ -356,18 +356,17 @@ void PageRotateRight(void)
DrawPageSides(); DrawPageSides();
} }
int main (void) int main (int argc, char* argv[])
{ {
char ii, mouse_wheels_state; char ii, mouse_wheels_state;
char* original_command_line = *(char**)0x1C;
if (*original_command_line == 0) { if (argc == 1) {
kol_board_puts("uPDF: no param set, showing OpenDialog"); kol_board_puts("uPDF: no param set, showing OpenDialog");
RunOpenApp(); RunOpenApp();
__menuet__sys_exit(); __menuet__sys_exit();
} }
kol_board_puts(original_command_line); kol_board_puts(argv[1]);
kol_board_puts("\n"); kol_board_puts("\n");
char buf[128]; char buf[128];
@ -381,7 +380,7 @@ int main (void)
gapp.resolution = resolution; gapp.resolution = resolution;
gapp.pageno = pageno; gapp.pageno = pageno;
kol_board_puts("PDF Open\n"); kol_board_puts("PDF Open\n");
pdfapp_open(&gapp, original_command_line, 0, 0); pdfapp_open(&gapp, argv[1], 0, 0);
kol_board_puts("PDF Opened\n"); kol_board_puts("PDF Opened\n");
wintitle(&gapp, 0); wintitle(&gapp, 0);

2
contrib/media/updf_newlib/apps/resource.h
View File

@ -53,7 +53,7 @@ struct rlimit {
long rlim_max; /* maximum value for rlim_cur */ long rlim_max; /* maximum value for rlim_cur */
}; };
/// ZAGLUSHKA /// /// STUB ///
int getrusage(int _who, struct rusage *_rusage) {}; int getrusage(int _who, struct rusage *_rusage) {};
#endif /* !_POSIX_SOURCE */ #endif /* !_POSIX_SOURCE */

5
contrib/media/updf_newlib/compile.sh
View File

@ -1,3 +1,5 @@
# BUILD ONLY LIBRARIES
cd SYSCALL/src cd SYSCALL/src
make make
cd ../.. cd ../..
@ -22,7 +24,4 @@ cd draw
make make
cd .. cd ..
cd apps
make
sleep 100 sleep 100

2
contrib/media/updf_newlib/fitz/Makefile
View File

@ -5,7 +5,7 @@ SDK_DIR = $(abspath ../../../sdk)
CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32
INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/freetype/include -I /media/maxim/E22406D62406AE1B/SVNKOS/contrib/sdk/sources/zlib -I ../libopenjpeg -I ../include INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/zlib -I ../libopenjpeg -I ../include
FITZ_SRC := $(notdir $(wildcard *.c)) FITZ_SRC := $(notdir $(wildcard *.c))
OBJECTS = $(patsubst %.c, %.o, $(FITZ_SRC)) OBJECTS = $(patsubst %.c, %.o, $(FITZ_SRC))

2
contrib/media/updf_newlib/libopenjpeg/Makefile
View File

@ -1,7 +1,7 @@
CC = kos32-gcc CC = kos32-gcc
LD = kos32-ld LD = kos32-ld
SDK_DIR = /media/maxim/E22406D62406AE1B/SVNKOS/contrib/sdk SDK_DIR = ../../../sdk
CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32
INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/zlib -I . INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/zlib -I .

2
contrib/media/updf_newlib/pdf/pdf_font.c
View File

@ -87,7 +87,7 @@ enum { UNKNOWN, TYPE1, TRUETYPE };
static int ft_kind(FT_Face face) static int ft_kind(FT_Face face)
{ {
/// ZAGLUSHKA /// /// STUB ///
//const char *kind = FT_Get_X11_Font_Format(face); //const char *kind = FT_Get_X11_Font_Format(face);
const char *kind = "TrueType"; const char *kind = "TrueType";