diff --git a/c/jintellitype/JIntellitype.cpp b/c/jintellitype/JIntellitype.cpp index 060b2d5..3481412 100644 --- a/c/jintellitype/JIntellitype.cpp +++ b/c/jintellitype/JIntellitype.cpp @@ -149,7 +149,7 @@ JNIEXPORT jboolean JNICALL Java_com_melloware_jintellitype_JIntellitype_isRunnin CHAR szAppName[] = "SunAwtFrame"; const char *cWndName = env->GetStringUTFChars(wndName, 0); // Find out if there's a hidden window with the given title - HWND mHwnd = FindWindow(szAppName, cWndName); + HWND mHwnd = FindWindow((LPCWSTR)szAppName, (LPCWSTR)cWndName); env->ReleaseStringUTFChars(wndName, cWndName); // If there is, another instance of our app is already running return mHwnd != NULL; diff --git a/c/jintellitype/JIntellitype.dev b/c/jintellitype/JIntellitype.dev deleted file mode 100644 index 62fa7e1..0000000 --- a/c/jintellitype/JIntellitype.dev +++ /dev/null @@ -1,149 +0,0 @@ -[Project] -FileName=JIntellitype.dev -Name=JIntellitype -Ver=1 -IsCpp=1 -Type=3 -Compiler=-D__GNUWIN32__ -W -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D_USRDLL -DBUILDING_DLL=1_@@_ -CppCompiler=-D__GNUWIN32__ -W -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D_USRDLL_@@_ -Includes=c:\java\jdk1.2.2\include;c:\java\jdk1.2.2\include\win32 -Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 --no-export-all-symbols --add-stdcall-alias_@@_ -Libs= -UnitCount=8 -Folders="Header Files","Resource Files","Source Files" -ObjFiles= -PrivateResource=JIntellitype_private.rc -ResourceIncludes= -MakeIncludes= -Icon= -ExeOutput=..\..\..\..\jintellitype -ObjectOutput=..\..\..\target -OverrideOutput=0 -OverrideOutputName=JIntellitype.dll -HostApplication= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=1 -SupportXPThemes=0 -CompilerSet=0 -CompilerSettings=0000000001001000000100 - -[Unit1] -FileName=JIntellitypeThread.cpp -Folder="Source Files" -Compile=1 -CompileCpp=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit2] -FileName=JIntellitype.cpp -Folder="Source Files" -Compile=1 -CompileCpp=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit3] -FileName=JIntellitypeHandler.cpp -Folder="Source Files" -Compile=1 -CompileCpp=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit5] -FileName=JIntellitypeHandler.h -Folder="Header Files" -Compile=1 -CompileCpp=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit7] -FileName=StdAfx.h -Folder="Header Files" -Compile=1 -CompileCpp=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit8] -FileName=com_melloware_jintellitype_JIntellitype.h -Folder=Header Files -Compile=1 -CompileCpp=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[VersionInfo] -Major=1 -Minor=0 -Release=0 -Build=465 -LanguageID=1033 -CharsetID=1252 -CompanyName=Melloware Inc (www.melloware.com) -FileVersion=1.0 -FileDescription=Java JNI bridge to MS Intellitype commands -InternalName= -LegalCopyright=Copyright 2006 Melloware Inc -LegalTrademarks=Copyright 2006 Melloware Inc -OriginalFilename= -ProductName=JIntellitype -ProductVersion=1.0 -AutoIncBuildNr=1 - -[Unit11] -FileName=com_melloware_jintellitype_JIntellitype.h -CompileCpp=1 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit10] -FileName=com_melloware_jintellitype_JIntellitype.h -CompileCpp=1 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit4] -FileName=StdAfx.cpp -CompileCpp=1 -Folder="Source Files" -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit6] -FileName=JIntellitypeThread.h -CompileCpp=1 -Folder="Header Files" -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - diff --git a/c/jintellitype/JIntellitype.layout b/c/jintellitype/JIntellitype.layout deleted file mode 100644 index 6956056..0000000 --- a/c/jintellitype/JIntellitype.layout +++ /dev/null @@ -1,76 +0,0 @@ -[Editor_9] -CursorCol=1 -CursorRow=20 -TopLine=1 -LeftChar=1 -Open=0 -Top=0 -[Editors] -Focused=2 -Order=1,2,0,7,4 -[Editor_0] -Open=1 -Top=0 -CursorCol=5 -CursorRow=118 -TopLine=71 -LeftChar=1 -[Editor_1] -Open=1 -Top=0 -CursorCol=36 -CursorRow=149 -TopLine=75 -LeftChar=1 -[Editor_2] -Open=1 -Top=1 -CursorCol=14 -CursorRow=209 -TopLine=162 -LeftChar=1 -[Editor_3] -Open=0 -Top=0 -CursorCol=23 -CursorRow=3 -TopLine=1 -LeftChar=1 -[Editor_4] -Open=1 -Top=0 -CursorCol=1 -CursorRow=27 -TopLine=1 -LeftChar=1 -[Editor_5] -Open=0 -Top=0 -CursorCol=3 -CursorRow=24 -TopLine=11 -LeftChar=1 -[Editor_6] -Open=0 -Top=0 -CursorCol=1 -CursorRow=16 -TopLine=1 -LeftChar=1 -[Editor_7] -Open=1 -Top=0 -CursorCol=54 -CursorRow=35 -TopLine=3 -LeftChar=1 -[Editor_8] -Open=0 -Top=0 -CursorCol=1 -CursorRow=3 -TopLine=1 -LeftChar=1 -[Editor_10] -Open=0 -Top=0 diff --git a/c/jintellitype/JIntellitypeHandler.cpp b/c/jintellitype/JIntellitypeHandler.cpp index 666fc5d..b937c10 100644 --- a/c/jintellitype/JIntellitypeHandler.cpp +++ b/c/jintellitype/JIntellitypeHandler.cpp @@ -146,7 +146,7 @@ void JIntellitypeHandler::doInitialize() //register this window as a shell hook to intercept WM_APPCOMMAND messages WM_SHELLHOOK = RegisterWindowMessage(TEXT("SHELLHOOK")); BOOL (__stdcall *RegisterShellHookWindow)(HWND) = NULL; - RegisterShellHookWindow = (BOOL (__stdcall *)(HWND))GetProcAddress(GetModuleHandle("USER32.DLL"), "RegisterShellHookWindow"); + RegisterShellHookWindow = (BOOL (__stdcall *)(HWND))GetProcAddress(GetModuleHandle((LPCWSTR)"USER32.DLL"), "RegisterShellHookWindow"); //make sure it worked if (!RegisterShellHookWindow(m_window)) { diff --git a/c/jintellitype/JIntellitype_private.rc b/c/jintellitype/JIntellitype_private.rc deleted file mode 100644 index 77374f8..0000000 --- a/c/jintellitype/JIntellitype_private.rc +++ /dev/null @@ -1,35 +0,0 @@ -/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */ -/* DO NOT EDIT! */ - -#include // include for version info constants - - -// -// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS... -// -1 VERSIONINFO -FILEVERSION 1,0,0,465 -PRODUCTVERSION 1,0,0,465 -FILETYPE VFT_DLL -{ - BLOCK "StringFileInfo" - { - BLOCK "040904E4" - { - VALUE "CompanyName", "Melloware Inc (www.melloware.com)" - VALUE "FileVersion", "1.0" - VALUE "FileDescription", "Java JNI bridge to MS Intellitype commands" - VALUE "InternalName", "" - VALUE "LegalCopyright", "Copyright 2006 Melloware Inc" - VALUE "LegalTrademarks", "Copyright 2006 Melloware Inc" - VALUE "OriginalFilename", "" - VALUE "ProductName", "JIntellitype" - VALUE "ProductVersion", "1.0" - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation", 0x0409, 1252 - } -} - diff --git a/c/jintellitype/Makefile.win b/c/jintellitype/Makefile.win deleted file mode 100644 index 0ad1b2c..0000000 --- a/c/jintellitype/Makefile.win +++ /dev/null @@ -1,46 +0,0 @@ -# Project: JIntellitype -# Makefile created by Dev-C++ 4.9.9.2 - -CPP = g++.exe -CC = gcc.exe -WINDRES = windres.exe -RES = ../../../target/JIntellitype_private.res -OBJ = ../../../target/JIntellitypeThread.o ../../../target/JIntellitype.o ../../../target/JIntellitypeHandler.o ../../../target/StdAfx.o $(RES) -LINKOBJ = ../../../target/JIntellitypeThread.o ../../../target/JIntellitype.o ../../../target/JIntellitypeHandler.o ../../../target/StdAfx.o $(RES) -LIBS = -L"C:/Dev-Cpp/lib" -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 --no-export-all-symbols --add-stdcall-alias -s -INCS = -I"C:/Dev-Cpp/include" -CXXINCS = -I"C:/Dev-Cpp/lib/gcc/mingw32/3.4.2/include" -I"C:/Dev-Cpp/include/c++/3.4.2/backward" -I"C:/Dev-Cpp/include/c++/3.4.2/mingw32" -I"C:/Dev-Cpp/include/c++/3.4.2" -I"C:/Dev-Cpp/include" -BIN = ../../../../jintellitype/JIntellitype.dll -CXXFLAGS = $(CXXINCS) -D__GNUWIN32__ -W -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D_USRDLL -fexpensive-optimizations -O3 -CFLAGS = $(INCS) -D__GNUWIN32__ -W -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D_USRDLL -DBUILDING_DLL=1 -fexpensive-optimizations -O3 -RM = rm -f - -.PHONY: all all-before all-after clean clean-custom - -all: all-before ../../../../jintellitype/JIntellitype.dll all-after - - -clean: clean-custom - ${RM} $(OBJ) $(BIN) - -DLLWRAP=dllwrap.exe -DEFFILE=../../../../jintellitype/libJIntellitype.def -STATICLIB=../../../../jintellitype/libJIntellitype.a - -$(BIN): $(LINKOBJ) - $(DLLWRAP) --output-def $(DEFFILE) --driver-name c++ --implib $(STATICLIB) $(LINKOBJ) $(LIBS) -o $(BIN) - -../../../target/JIntellitypeThread.o: JIntellitypeThread.cpp - $(CPP) -c JIntellitypeThread.cpp -o ../../../target/JIntellitypeThread.o $(CXXFLAGS) - -../../../target/JIntellitype.o: JIntellitype.cpp - $(CPP) -c JIntellitype.cpp -o ../../../target/JIntellitype.o $(CXXFLAGS) - -../../../target/JIntellitypeHandler.o: JIntellitypeHandler.cpp - $(CPP) -c JIntellitypeHandler.cpp -o ../../../target/JIntellitypeHandler.o $(CXXFLAGS) - -../../../target/StdAfx.o: StdAfx.cpp - $(CPP) -c StdAfx.cpp -o ../../../target/StdAfx.o $(CXXFLAGS) - -../../../target/JIntellitype_private.res: JIntellitype_private.rc - $(WINDRES) -i JIntellitype_private.rc --input-format=rc -o ../../../target/JIntellitype_private.res -O coff diff --git a/c/jintellitype/msvc/copy.bat b/c/jintellitype/msvc/copy.bat new file mode 100644 index 0000000..3f521b0 --- /dev/null +++ b/c/jintellitype/msvc/copy.bat @@ -0,0 +1 @@ +copy Release\jintellitype.dll ..\..\..\java\native\ \ No newline at end of file diff --git a/c/jintellitype/msvc/jintellitype.sln b/c/jintellitype/msvc/jintellitype.sln new file mode 100644 index 0000000..8acae3c --- /dev/null +++ b/c/jintellitype/msvc/jintellitype.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jintellitype", "jintellitype.vcxproj", "{29297EB4-DE7D-4F2B-9FD7-FEB53409AA7D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {29297EB4-DE7D-4F2B-9FD7-FEB53409AA7D}.Debug|Win32.ActiveCfg = Debug|Win32 + {29297EB4-DE7D-4F2B-9FD7-FEB53409AA7D}.Debug|Win32.Build.0 = Debug|Win32 + {29297EB4-DE7D-4F2B-9FD7-FEB53409AA7D}.Release|Win32.ActiveCfg = Release|Win32 + {29297EB4-DE7D-4F2B-9FD7-FEB53409AA7D}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/c/jintellitype/msvc/jintellitype.suo b/c/jintellitype/msvc/jintellitype.suo new file mode 100644 index 0000000..ee600bc Binary files /dev/null and b/c/jintellitype/msvc/jintellitype.suo differ diff --git a/c/jintellitype/msvc/jintellitype.vcxproj b/c/jintellitype/msvc/jintellitype.vcxproj new file mode 100644 index 0000000..f5334da --- /dev/null +++ b/c/jintellitype/msvc/jintellitype.vcxproj @@ -0,0 +1,96 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {29297EB4-DE7D-4F2B-9FD7-FEB53409AA7D} + Win32Proj + jintellitype + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + true + C:\Program Files %28x86%29\Java\jdk1.6.0_23\include;C:\Program Files %28x86%29\Java\jdk1.6.0_23\include\win32;$(IncludePath) + + + false + C:\Program Files %28x86%29\Java\jdk1.6.0_23\include;C:\Program Files %28x86%29\Java\jdk1.6.0_23\include\win32;$(IncludePath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;JINTELLITYPE_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;JINTELLITYPE_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + copy.bat + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/c/jintellitype/msvc/jintellitype.vcxproj.filters b/c/jintellitype/msvc/jintellitype.vcxproj.filters new file mode 100644 index 0000000..4374356 --- /dev/null +++ b/c/jintellitype/msvc/jintellitype.vcxproj.filters @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/c/jintellitype/msvc/jintellitype.vcxproj.user b/c/jintellitype/msvc/jintellitype.vcxproj.user new file mode 100644 index 0000000..695b5c7 --- /dev/null +++ b/c/jintellitype/msvc/jintellitype.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/c/wiiusej/msvc/WiiUseJ.suo b/c/wiiusej/msvc/WiiUseJ.suo index 397276d..5864828 100644 Binary files a/c/wiiusej/msvc/WiiUseJ.suo and b/c/wiiusej/msvc/WiiUseJ.suo differ diff --git a/java/native/jintellitype.dll b/java/native/jintellitype.dll new file mode 100644 index 0000000..ac380ab Binary files /dev/null and b/java/native/jintellitype.dll differ