+2006-01-15 Keishi Suenaga <s_keishi@mutt.freemai.ne.jp>
+
+ * configure.in: MSVC compile fix
+ * windrv/timiditydrv.cpp: use _beginthreadex not CreateThread
+ * doc/ja_JP.eucJP/README.w32: typo
+ * script/Makefile.am: add script/wpp386_w.sh
+ * interface/ncurs_c.c:
+
2006-01-12 Keishi Suenaga <s_keishi@mutt.freemai.ne.jp>
- *doc/C/README.w32
- *doc/ja_JP.eucJP/README.w32: add wine wrc.exe discription
- *interface/Makefile.am: ad rc.exe japanese language option -l0x11
+ * doc/C/README.w32
+ * doc/ja_JP.eucJP/README.w32: add wine wrc.exe discription
+ * interface/Makefile.am: ad rc.exe japanese language option -l0x11
2006-01-12 Keishi Suenaga <s_keishi@mutt.freemai.ne.jp>
- *configure.in: Add mkstemp check
- *doc/C/README.w32
- *doc/ja_JP.eucJP/README.w32: About timiditydrv compilation
- *windrv/Makefile.am: Change to use midl.exe
- *windrv/dlldata.c
- *windrv/timiditydrv.h
- *windrv/timiditydrv_i.c
- *windrv/timiditydrv_p.c: Rmoved because will be ganerated by midl.exe.
+ * configure.in: Add mkstemp check
+ * doc/C/README.w32
+ * doc/ja_JP.eucJP/README.w32: About timiditydrv compilation
+ * windrv/Makefile.am: Change to use midl.exe
+ * windrv/dlldata.c
+ * windrv/timiditydrv.h
+ * windrv/timiditydrv_i.c
+ * windrv/timiditydrv_p.c: Rmoved because will be ganerated by midl.exe.
2006-01-08 Keishi Suenaga <s_keishi@mutt.freemai.ne.jp>
test -n "$SHLD" || SHLD="link -dll"
VCPP=yes
case " $CFLAGS " in
- *" -MT "*) NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmtd.lib" ;;
- *" -MD "*) NODEF="-nodefaultlib:libcmt.lib -nodefaultlib:libcmtd.lib -nodefaultlib:msvcrtd.lib" ;;
- *" -MTd "*) NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmt.lib" ;;
- *" -MDd "*) NODEF="-nodefaultlib:libcmt.lib -nodefaultlib:libcmtd.lib -nodefaultlib:msvcrt.lib" ;;
- *) CFLAGS = "$CFLAGS -MT"; NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmtd.lib" ;;
+ *" -MT "*) NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmtd.lib -nodefaultlib:libc.lib -nodefaultlib:libcd.lib" ;;
+ *" -MD "*) NODEF="-nodefaultlib:libcmt.lib -nodefaultlib:libcmtd.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libc.lib -nodefaultlib:libcd.lib" ;;
+ *" -MTd "*) NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmt.lib -nodefaultlib:libc.lib -nodefaultlib:libcd.lib" ;;
+ *" -MDd "*) NODEF="-nodefaultlib:libcmt.lib -nodefaultlib:libcmtd.lib -nodefaultlib:msvcrt.lib -nodefaultlib:libc.lib -nodefaultlib:libcd.lib" ;;
+ *) CFLAGS="$CFLAGS -MT"; NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmtd.lib -nodefaultlib:libc.lib -nodefaultlib:libcd.lib" ;;
esac
VCPP_LDFLAGS="-nologo -incremental:no $NODEF kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib"
CFLAGS="$CFLAGS -nologo -Zp16 -W3 -GX -Ob2"
test -n "$SHLD" || SHLD="link -dll"
VCPP=yes
case " $CFLAGS " in
- *" -MT "*) NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmtd.lib" ;;
- *" -MD "*) NODEF="-nodefaultlib:libcmt.lib -nodefaultlib:libcmtd.lib -nodefaultlib:msvcrtd.lib" ;;
- *" -MTd "*) NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmt.lib" ;;
- *" -MDd "*) NODEF="-nodefaultlib:libcmt.lib -nodefaultlib:libcmtd.lib -nodefaultlib:msvcrt.lib" ;;
- *) CFLAGS = "$CFLAGS -MT"; NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmtd.lib" ;;
+ *" -MT "*) NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmtd.lib -nodefaultlib:libc.lib -nodefaultlib:libcd.lib" ;;
+ *" -MD "*) NODEF="-nodefaultlib:libcmt.lib -nodefaultlib:libcmtd.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libc.lib -nodefaultlib:libcd.lib" ;;
+ *" -MTd "*) NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmt.lib -nodefaultlib:libc.lib -nodefaultlib:libcd.lib" ;;
+ *" -MDd "*) NODEF="-nodefaultlib:libcmt.lib -nodefaultlib:libcmtd.lib -nodefaultlib:msvcrt.lib -nodefaultlib:libc.lib -nodefaultlib:libcd.lib" ;;
+ *) CFLAGS="$CFLAGS -MT"; NODEF="-nodefaultlib:msvcrt.lib -nodefaultlib:msvcrtd.lib -nodefaultlib:libcmtd.lib -nodefaultlib:libc.lib -nodefaultlib:libcd.lib" ;;
esac
VCPP_LDFLAGS="-nologo -incremental:no $NODEF kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib"
CFLAGS="$CFLAGS -nologo -Zp16 -W3 -GX -Ob2"
wcc386.exe¤Î¤«¤ï¤ê¤Ëwcc386_w.sh¤ò¸Æ¤Ó½Ð¤·¤Æ»È¤¦¡£
4-1)timw32g.exe
(configure)
- CC="wcc386_w.sh" CXX="wpp86_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \
+ CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \
./configure --enable-network --enable-w32gui --enable-spline=gauss \
--enable-audio=w32,vorbis,gogo,ogg,flac,portaudio \
--disable-oggtest --disable-vorbistest --disable-libFLACtest --disable-libOggFLACtest
#include "config.h"
#endif /* HAVE_CONFIG_H */
#include <stdio.h>
+#if defined(__W32__) && !defined(STDOUT_FILENO)
+#define STDOUT_FILENO 1
+#endif
#if defined(__MINGW32__) && defined(USE_PDCURSES)
#define _NO_OLDNAMES 1 /* avoid type mismatch of beep() */
dllutl.rb \
lspatch.pl \
readme.txt \
- wcc386_w.sh
+ wcc386_w.sh \
+ wpp386_w.sh
dllutl.rb \
lspatch.pl \
readme.txt \
- wcc386_w.sh
+ wcc386_w.sh \
+ wpp386_w.sh
all: all-am
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0400
#endif
+
+#include <process.h>
#ifdef DEBUG
#include <stdio.h>
#endif
static volatile int stop_thread = 0;
static volatile int stop_rtthread = 0;
static HANDLE hCalcThread = NULL;
-static HANDLE hRtsynThread =NULL;
+static HANDLE hRtsynThread = NULL;
extern "C"
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ){
}
-DWORD WINAPI threadfunc2(LPVOID lpV);
+unsigned __stdcall threadfunc2(LPVOID lpV);
STDAPI_(LONG) DefDriverProc(DWORD dwDriverId, HDRVR hdrvr, UINT msg, LONG lParam1, LONG lParam2);
STDAPI_(LONG) DriverProc(DWORD dwDriverId, HDRVR hdrvr, UINT msg, LONG lParam1, LONG lParam2){
return played;
}
-DWORD WINAPI threadfunc(LPVOID lpV){
+unsigned __stdcall threadfunc(LPVOID lpV){
while(stop_thread == 0){
Sleep(1);
//EnterCriticalSection(&mim_section);
//LeaveCriticalSection(&mim_section);
}
stop_thread=0;
- ExitThread(TRUE);
+ _endthreadex(0);
return 0;
}
-DWORD WINAPI threadfunc2(LPVOID lpV){
+unsigned __stdcall threadfunc2(LPVOID lpV){
int argc,i;
char *argv[2];
HANDLE hThread = NULL;
- DWORD ThreadID;
+ unsigned int thrdaddr;
int opend=0;
;
while(opend == 0) {
argv[1] = strdup("-iW");
if ( 0 == timiwp_main_ini(argc, argv)){
rtsyn_init();
- hThread=CreateThread(NULL,0,threadfunc,0,0,&ThreadID);
+ hThread=(HANDLE)_beginthreadex(NULL,0,threadfunc,0,0,&thrdaddr);
SetPriorityClass(hThread, REALTIME_PRIORITY_CLASS);
SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL);
opend = 1;
rtsyn_close();
timiwp_main_close();
stop_rtthread=0;
- ExitThread(TRUE);
+ _endthreadex(0);
return 0;
}
STDAPI_(LONG) modMessage(UINT uDeviceID, UINT uMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2){
- DWORD ThreadID;
+ unsigned int thrdaddr;
DWORD tstate;
int OCount;
DWORD Exit;
if ( OpenCount == 1 && modm_closed == 1 ){
processPriority = GetPriorityClass(GetCurrentProcess());
SetPriorityClass(GetCurrentProcess(), REALTIME_PRIORITY_CLASS);
- hRtsynThread=CreateThread(NULL,0,threadfunc2,0,0,&ThreadID);
+ hRtsynThread=(HANDLE)_beginthreadex(NULL,0,threadfunc2,0,0,&thrdaddr);
modm_closed = 0;
}