diff --git a/cpp/JavaWinampApi/Makefile.win b/cpp/JavaWinampApi/Makefile.win deleted file mode 100644 index 1620722..0000000 --- a/cpp/JavaWinampApi/Makefile.win +++ /dev/null @@ -1,34 +0,0 @@ -# Project: wpcom -# Makefile created by Dev-C++ 4.9.9.2 - -CPP = g++.exe -CC = gcc.exe -WINDRES = windres.exe -RES = -OBJ = WinampController.o $(RES) -LINKOBJ = WinampController.o $(RES) -LIBS = -L"E:/java/Dev-Cpp/lib" --no-export-all-symbols --add-stdcall-alias -INCS = -I"E:/java/Dev-Cpp/include" -I"E:/Program Files/Java/jdk1.6.0_11/include" -I"E:/Program Files/Java/jdk1.6.0_11/include/win32" -CXXINCS = -I"E:/java/Dev-Cpp/lib/gcc/mingw32/3.4.2/include" -I"E:/java/Dev-Cpp/include/c++/3.4.2/backward" -I"E:/java/Dev-Cpp/include/c++/3.4.2/mingw32" -I"E:/java/Dev-Cpp/include/c++/3.4.2" -I"E:/java/Dev-Cpp/include" -I"E:/Program Files/Java/jdk1.6.0_11/include" -I"E:/Program Files/Java/jdk1.6.0_11/include/win32" -BIN = ../../wpcom.dll -CXXFLAGS = $(CXXINCS) -DBUILDING_DLL=1 -CFLAGS = $(INCS) -DBUILDING_DLL=1 -RM = rm -f - -.PHONY: all all-before all-after clean clean-custom - -all: all-before ../../wpcom.dll all-after - - -clean: clean-custom - ${RM} $(OBJ) $(BIN) - -DLLWRAP=dllwrap.exe -DEFFILE=../../libwpcom.def -STATICLIB=../../libwpcom.a - -$(BIN): $(LINKOBJ) - $(DLLWRAP) --output-def $(DEFFILE) --implib $(STATICLIB) $(LINKOBJ) $(LIBS) -o $(BIN) - -WinampController.o: WinampController.c - $(CC) -c WinampController.c -o WinampController.o $(CFLAGS) diff --git a/cpp/JavaWinampApi/WinampController.c b/cpp/JavaWinampApi/WinampController.c index 84b0db8..a1a2336 100644 --- a/cpp/JavaWinampApi/WinampController.c +++ b/cpp/JavaWinampApi/WinampController.c @@ -60,13 +60,13 @@ LPDWORD temp; void initWinampHandle() { hwnd_winamp = NULL; if (hwnd_winamp == NULL) { - hwnd_winamp = FindWindow("Winamp v1.x", NULL); + hwnd_winamp = FindWindow((LPCWSTR) "Winamp v1.x", NULL); } if (hwnd_winamp == NULL) { - hwnd_winamp = FindWindow("Winamp v2.x", NULL); + hwnd_winamp = FindWindow((LPCWSTR) "Winamp v2.x", NULL); } if (hwnd_winamp == NULL) { - hwnd_winamp = FindWindow("Winamp v3.x", NULL); + hwnd_winamp = FindWindow((LPCWSTR) "Winamp v3.x", NULL); } } @@ -81,7 +81,7 @@ jboolean runWinamp(unsigned char* pathWinamp) { // Start the child process. - if(!CreateProcess(pathWinamp, + if(!CreateProcess((LPCWSTR) pathWinamp, NULL, 0, 0, @@ -145,7 +145,7 @@ JNIEXPORT jboolean JNICALL Java_com_qotsa_jni_controller_JNIWinamp_run HKEY key; DWORD tipo; - if (!RegOpenKey(HKEY_LOCAL_MACHINE,"Software\\Clients\\Media\\Winamp\\shell\\open\\command",&key)==ERROR_SUCCESS) + if (!RegOpenKey(HKEY_LOCAL_MACHINE,(LPCWSTR) "Software\\Clients\\Media\\Winamp\\shell\\open\\command",&key)==ERROR_SUCCESS) { printf("0"); @@ -153,7 +153,7 @@ JNIEXPORT jboolean JNICALL Java_com_qotsa_jni_controller_JNIWinamp_run } - if (!(RegQueryValueEx(key,"",NULL,&tipo,path,&size))==ERROR_SUCCESS) + if (!(RegQueryValueEx(key,(LPCWSTR) "",NULL,&tipo,path,&size))==ERROR_SUCCESS) { RegCloseKey(key); diff --git a/cpp/JavaWinampApi/cpy.bat b/cpp/JavaWinampApi/cpy.bat deleted file mode 100644 index 2abdf4a..0000000 --- a/cpp/JavaWinampApi/cpy.bat +++ /dev/null @@ -1 +0,0 @@ -copy /y wpcom.dll c:\winnt\system32\ \ No newline at end of file diff --git a/cpp/JavaWinampApi/include/w32api.h b/cpp/JavaWinampApi/include/w32api.h new file mode 100644 index 0000000..c3e36c3 --- /dev/null +++ b/cpp/JavaWinampApi/include/w32api.h @@ -0,0 +1,52 @@ +#ifndef _W32API_H +#define _W32API_H +#define _W32API_H_ +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#define __W32API_VERSION 3.14 +#define __W32API_MAJOR_VERSION 3 +#define __W32API_MINOR_VERSION 14 + +/* The following defines are for documentation purposes. The following defines + * identify the versions of Windows and Internet Explorer. They are not to be + * used in the w32api library but may be used by a user to set the _WIN32_WINNT + * or _WIN32_WINDOWS and the WINVER values to their minimum level of support. + * + * Similarly the user can use the Internet Explorer values to set the _WIN32_IE + * value to their minimum level of support. + */ + +/* Use these values to set _WIN32_WINDOWS and WINVER to your minimum support + * level */ +#define Windows95 0x0400 +#define Windows98 0x0410 +#define WindowsME 0x0500 + +/* Use these values to set _WIN32_WINNT and WINVER to your mimimum support + * level. */ +#define WindowsNT4 0x0400 +#define Windows2000 0x0500 +#define WindowsXP 0x0501 +#define Windows2003 0x0502 +#define WindowsVista 0x0600 + +/* Use these values to set _WIN32_IE to your minimum support level */ +#define IE3 0x0300 +#define IE301 0x0300 +#define IE302 0x0300 +#define IE4 0x0400 +#define IE401 0x0401 +#define IE5 0x0500 +#define IE5a 0x0500 +#define IE5b 0x0500 +#define IE501 0x0501 +#define IE55 0x0501 +#define IE56 0x0560 +#define IE6 0x0600 +#define IE601 0x0601 +#define IE602 0x0603 +#define IE7 0x0700 + +#endif /* ndef _W32API_H */ diff --git a/cpp/JavaWinampApi/libwpcom.def b/cpp/JavaWinampApi/libwpcom.def deleted file mode 100644 index 8a95977..0000000 --- a/cpp/JavaWinampApi/libwpcom.def +++ /dev/null @@ -1,58 +0,0 @@ -; dlltool --base-file C:\DOCUME~1\FRANCI~1\CONFIG~1\Temp/cca03628.base --output-exp wpcom.exp --dllname wpcom.dll --output-def libwpcom.def --no-export-all-symbols --add-stdcall-alias --exclude-symbol=DllMainCRTStartup@12 --def C:\DOCUME~1\FRANCI~1\CONFIG~1\Temp/cca03628.def --output-lib libwpcom.a -EXPORTS - Java_controller_JNIWinampController_appendToPlayList = Java_controller_JNIWinampController_appendToPlayList@12 @ 1 - Java_controller_JNIWinampController_appendToPlayList@12 @ 2 - Java_controller_JNIWinampController_clearPlayList = Java_controller_JNIWinampController_clearPlayList@8 @ 3 - Java_controller_JNIWinampController_clearPlayList@8 @ 4 - Java_controller_JNIWinampController_clearPlayListCache = Java_controller_JNIWinampController_clearPlayListCache@8 @ 5 - Java_controller_JNIWinampController_clearPlayListCache@8 @ 6 - Java_controller_JNIWinampController_decreaseVolume = Java_controller_JNIWinampController_decreaseVolume@8 @ 7 - Java_controller_JNIWinampController_decreaseVolume@8 @ 8 - Java_controller_JNIWinampController_decreaseVolumePercent = Java_controller_JNIWinampController_decreaseVolumePercent@12 @ 9 - Java_controller_JNIWinampController_decreaseVolumePercent@12 @ 10 - Java_controller_JNIWinampController_exit = Java_controller_JNIWinampController_exit@8 @ 11 - Java_controller_JNIWinampController_exit@8 @ 12 - Java_controller_JNIWinampController_getListPos = Java_controller_JNIWinampController_getListPos@8 @ 13 - Java_controller_JNIWinampController_getListPos@8 @ 14 - Java_controller_JNIWinampController_getPlayListLength = Java_controller_JNIWinampController_getPlayListLength@8 @ 15 - Java_controller_JNIWinampController_getPlayListLength@8 @ 16 - Java_controller_JNIWinampController_getSeconds = Java_controller_JNIWinampController_getSeconds@8 @ 17 - Java_controller_JNIWinampController_getSeconds@8 @ 18 - Java_controller_JNIWinampController_getStatus = Java_controller_JNIWinampController_getStatus@8 @ 19 - Java_controller_JNIWinampController_getStatus@8 @ 20 - Java_controller_JNIWinampController_getTitle = Java_controller_JNIWinampController_getTitle@8 @ 21 - Java_controller_JNIWinampController_getTitle@8 @ 22 - Java_controller_JNIWinampController_increaseVolume = Java_controller_JNIWinampController_increaseVolume@8 @ 23 - Java_controller_JNIWinampController_increaseVolume@8 @ 24 - Java_controller_JNIWinampController_increaseVolumePercent = Java_controller_JNIWinampController_increaseVolumePercent@12 @ 25 - Java_controller_JNIWinampController_increaseVolumePercent@12 @ 26 - Java_controller_JNIWinampController_isRepeatStatusOn = Java_controller_JNIWinampController_isRepeatStatusOn@8 @ 27 - Java_controller_JNIWinampController_isRepeatStatusOn@8 @ 28 - Java_controller_JNIWinampController_isShuffleStatusOn = Java_controller_JNIWinampController_isShuffleStatusOn@8 @ 29 - Java_controller_JNIWinampController_isShuffleStatusOn@8 @ 30 - Java_controller_JNIWinampController_nextTrack = Java_controller_JNIWinampController_nextTrack@8 @ 31 - Java_controller_JNIWinampController_nextTrack@8 @ 32 - Java_controller_JNIWinampController_pause = Java_controller_JNIWinampController_pause@8 @ 33 - Java_controller_JNIWinampController_pause@8 @ 34 - Java_controller_JNIWinampController_play = Java_controller_JNIWinampController_play@8 @ 35 - Java_controller_JNIWinampController_play@8 @ 36 - Java_controller_JNIWinampController_previousTrack = Java_controller_JNIWinampController_previousTrack@8 @ 37 - Java_controller_JNIWinampController_previousTrack@8 @ 38 - Java_controller_JNIWinampController_restart = Java_controller_JNIWinampController_restart@8 @ 39 - Java_controller_JNIWinampController_restart@8 @ 40 - Java_controller_JNIWinampController_resume = Java_controller_JNIWinampController_resume@8 @ 41 - Java_controller_JNIWinampController_resume@8 @ 42 - Java_controller_JNIWinampController_run = Java_controller_JNIWinampController_run@8 @ 43 - Java_controller_JNIWinampController_run@8 @ 44 - Java_controller_JNIWinampController_setPlaylistPosition = Java_controller_JNIWinampController_setPlaylistPosition@12 @ 45 - Java_controller_JNIWinampController_setPlaylistPosition@12 @ 46 - Java_controller_JNIWinampController_setRepeatStatusOn = Java_controller_JNIWinampController_setRepeatStatusOn@12 @ 47 - Java_controller_JNIWinampController_setRepeatStatusOn@12 @ 48 - Java_controller_JNIWinampController_setShuffleStatusOn = Java_controller_JNIWinampController_setShuffleStatusOn@12 @ 49 - Java_controller_JNIWinampController_setShuffleStatusOn@12 @ 50 - Java_controller_JNIWinampController_setVolume = Java_controller_JNIWinampController_setVolume@12 @ 51 - Java_controller_JNIWinampController_setVolume@12 @ 52 - Java_controller_JNIWinampController_stop = Java_controller_JNIWinampController_stop@8 @ 53 - Java_controller_JNIWinampController_stop@8 @ 54 - Java_controller_JNIWinampController_writePlayListToFile = Java_controller_JNIWinampController_writePlayListToFile@8 @ 55 - Java_controller_JNIWinampController_writePlayListToFile@8 @ 56 diff --git a/cpp/JavaWinampApi/wpcom.dev b/cpp/JavaWinampApi/wpcom.dev deleted file mode 100644 index eddc3c2..0000000 --- a/cpp/JavaWinampApi/wpcom.dev +++ /dev/null @@ -1,69 +0,0 @@ -[Project] -FileName=wpcom.dev -Name=wpcom -UnitCount=2 -Type=3 -Ver=1 -ObjFiles= -Includes="E:\Program Files\Java\jdk1.6.0_11\include";"E:\Program Files\Java\jdk1.6.0_11\include\win32" -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler=-DBUILDING_DLL=1_@@_ -CppCompiler=-DBUILDING_DLL=1_@@_ -Linker=--no-export-all-symbols --add-stdcall-alias_@@_ -IsCpp=0 -Icon= -ExeOutput=..\..\..\JavaWinampAPI -ObjectOutput= -OverrideOutput=1 -OverrideOutputName=wpcom.dll -HostApplication= -Folders= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=0 -CompilerSettings=0000000000000000000000 - -[Unit1] -FileName=WinampController.c -CompileCpp=0 -Folder=wacon -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd=$(CC) -c WinampController.c -o WinampController.o $(CFLAGS) - -[VersionInfo] -Major=0 -Minor=1 -Release=1 -Build=1 -LanguageID=1033 -CharsetID=1252 -CompanyName= -FileVersion= -FileDescription=Developed using the Dev-C++ IDE -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion= -AutoIncBuildNr=0 - -[Unit2] -FileName=WinampController.h -CompileCpp=0 -Folder=wacon -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - diff --git a/cpp/JavaWinampApi/wpcom.layout b/cpp/JavaWinampApi/wpcom.layout deleted file mode 100644 index 4beaa20..0000000 --- a/cpp/JavaWinampApi/wpcom.layout +++ /dev/null @@ -1,17 +0,0 @@ -[Editor_0] -CursorCol=32 -CursorRow=359 -TopLine=338 -LeftChar=1 -Open=1 -Top=1 -[Editors] -Focused=0 -Order=1,0 -[Editor_1] -Open=1 -Top=0 -CursorCol=73 -CursorRow=143 -TopLine=127 -LeftChar=1 diff --git a/cpp/jintellitype/msvc/jintellitype.suo b/cpp/jintellitype/msvc/jintellitype.suo index ee600bc..13fcffd 100644 Binary files a/cpp/jintellitype/msvc/jintellitype.suo and b/cpp/jintellitype/msvc/jintellitype.suo differ diff --git a/cpp/wiiuse/msvc/copy.bat b/cpp/wiiuse/msvc/copy.bat index ae549f4..7082d8a 100644 --- a/cpp/wiiuse/msvc/copy.bat +++ b/cpp/wiiuse/msvc/copy.bat @@ -1,4 +1,5 @@ copy ..\wiiuse.h ..\..\WiiUseJ\ copy ..\speaker.h ..\..\WiiUseJ\ copy Release\wiiuse.lib ..\..\WiiUseJ\lib\ -copy Release\wiiuse.dll ..\..\..\java\native\ \ No newline at end of file +copy Release\wiiuse.dll ..\..\..\java\ +pause \ No newline at end of file diff --git a/cpp/wiiuse/msvc/wiiuse.suo b/cpp/wiiuse/msvc/wiiuse.suo index 5d4b41d..982849a 100644 Binary files a/cpp/wiiuse/msvc/wiiuse.suo and b/cpp/wiiuse/msvc/wiiuse.suo differ diff --git a/cpp/wiiusej/lib/wiiuse.lib b/cpp/wiiusej/lib/wiiuse.lib index fe754f9..98aeaa3 100644 Binary files a/cpp/wiiusej/lib/wiiuse.lib and b/cpp/wiiusej/lib/wiiuse.lib differ diff --git a/cpp/wiiusej/msvc/WiiUseJ.suo b/cpp/wiiusej/msvc/WiiUseJ.suo index 5864828..93a5e57 100644 Binary files a/cpp/wiiusej/msvc/WiiUseJ.suo and b/cpp/wiiusej/msvc/WiiUseJ.suo differ diff --git a/cpp/wiiusej/msvc/WiiUseJ.vcxproj b/cpp/wiiusej/msvc/WiiUseJ.vcxproj index 5364935..65fe5f8 100644 --- a/cpp/wiiusej/msvc/WiiUseJ.vcxproj +++ b/cpp/wiiusej/msvc/WiiUseJ.vcxproj @@ -39,13 +39,15 @@ true - C:\Program Files\Java\jdk1.6.0_20\include;C:\Program Files\Java\jdk1.6.0_20\include\win32;C:\Users\Rik\My Dropbox\Eclipse\WiiTunes\c\wiiuse;$(IncludePath) + C:\Program Files (x86)\Java\jdk1.6.0_23\include;C:\Program Files (x86)\Java\jdk1.6.0_23\include\win32;$(IncludePath) + ..\lib;$(LibraryPath) false C:\Program Files (x86)\Java\jdk1.6.0_23\include;C:\Program Files (x86)\Java\jdk1.6.0_23\include\win32;$(IncludePath) .\Release\ $(ExtensionsToDeleteOnClean) + ..\lib;$(LibraryPath) @@ -58,9 +60,11 @@ Windows true - C:\Users\Rik\My Dropbox\Eclipse\WiiTunes\c\wiiuse\msvc\Release;%(AdditionalLibraryDirectories) wiiuse.lib;%(AdditionalDependencies) + + copy.bat + @@ -78,7 +82,6 @@ true true wiiuse.lib;%(AdditionalDependencies) - ..\..\wiiuse\msvc\Release;%(AdditionalLibraryDirectories) copy.bat diff --git a/java/native/wiiuse.dll b/java/native/wiiuse.dll deleted file mode 100644 index b9ee349..0000000 Binary files a/java/native/wiiuse.dll and /dev/null differ