From 8562d1bedb1eda84b17758edc78b4354857d37c0 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Fri, 12 Aug 2011 04:52:46 +0200 Subject: add wmpa plugin --- build/build-small.bat | 6 +- build/build-x64.bat | 3 +- build/build-x86.bat | 3 +- build/build.bat | 1 + build/release-x64.bat | 3 +- build/release-x86.bat | 2 +- build/xchat-wdk.skel.iss | 12 +- plugins/makefile.mak | 67 ++---- plugins/wmpa/makefile.mak | 53 +++++ plugins/wmpa/wmpa.clw | 43 ---- plugins/wmpa/wmpa.def | 3 +- plugins/wmpa/wmpa.dsp | 421 -------------------------------------- plugins/wmpa/wmpa.dsw | 31 --- plugins/wmpa/wmpa.ico | Bin 0 -> 1150 bytes plugins/wmpa/wmpa.plg | 16 -- plugins/wmpa/wmpa.rc | 2 +- plugins/wmpa/wmpa.sln | 20 ++ plugins/wmpa/wmpa.vcxproj | 231 +++++++++++++++++++++ plugins/wmpa/wmpa.vcxproj.filters | 172 ++++++++++++++++ plugins/wmpa/wmpplayer4.h | 4 +- plugins/wmpa/xchat.ico | Bin 25670 -> 0 bytes 21 files changed, 512 insertions(+), 581 deletions(-) create mode 100644 plugins/wmpa/makefile.mak delete mode 100644 plugins/wmpa/wmpa.clw delete mode 100644 plugins/wmpa/wmpa.dsp delete mode 100644 plugins/wmpa/wmpa.dsw create mode 100644 plugins/wmpa/wmpa.ico delete mode 100644 plugins/wmpa/wmpa.plg create mode 100644 plugins/wmpa/wmpa.sln create mode 100644 plugins/wmpa/wmpa.vcxproj create mode 100644 plugins/wmpa/wmpa.vcxproj.filters delete mode 100644 plugins/wmpa/xchat.ico diff --git a/build/build-small.bat b/build/build-small.bat index ca9f74af..cccd2af4 100644 --- a/build/build-small.bat +++ b/build/build-small.bat @@ -1,7 +1,7 @@ @echo off set WDK_ROOT=c:\WinDDK\7600.16385.1 -set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70 -set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386 +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%WDK_ROOT%\inc\mfc42;%WDK_ROOT%\inc\ddk;%WDK_ROOT%\inc\api\dao360 +set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386;%WDK_ROOT%\lib\Mfc\i386;%WDK_ROOT%\lib\ATL\i386 set OPATH=%PATH% set DEV_32=%cd%\..\dep-x86 set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin @@ -66,8 +66,8 @@ copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins -::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins +copy ..\plugins\winamp\xcwmpa.dll %XCHAT_DEST%\plugins copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST% pause diff --git a/build/build-x64.bat b/build/build-x64.bat index 29db6400..d862736c 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -7,8 +7,7 @@ cd src echo X64 = YES > makeinc.mak echo DEV = %DEV_64% >> makeinc.mak type makeinc.skel.mak >> makeinc.mak -set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70 -set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64 +set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64;%WDK_ROOT%\lib\Mfc\amd64;%WDK_ROOT%\lib\ATL\amd64 set OPATH=%PATH% set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin cd common diff --git a/build/build-x86.bat b/build/build-x86.bat index 4e7d0ef0..8cc3a30c 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -1,6 +1,5 @@ @echo off -set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70 -set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386 +set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386;%WDK_ROOT%\lib\Mfc\i386;%WDK_ROOT%\lib\ATL\i386 set OPATH=%PATH% set DEV_32=%cd%\..\dep-x86 set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin diff --git a/build/build.bat b/build/build.bat index 363205c0..deb7e0bc 100644 --- a/build/build.bat +++ b/build/build.bat @@ -1,5 +1,6 @@ @echo off set WDK_ROOT=c:\WinDDK\7600.16385.1 +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%WDK_ROOT%\inc\mfc42;%WDK_ROOT%\inc\ddk;%WDK_ROOT%\inc\api\dao360 call build-x86.bat call build-x64.bat ::call compress.bat diff --git a/build/release-x64.bat b/build/release-x64.bat index 4c5ad3c5..08959f1d 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -31,7 +31,6 @@ copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64 copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64 copy %DEPS_ROOT%\bin\libenchant.dll %XCHAT_DEST%\libenchant.dll.x64 copy %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\libenchant_myspell.dll.x64 -::copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64 copy ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\xcchecksum.dll.x64 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64 copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins\xcmpcinfo.dll.x64 @@ -40,7 +39,7 @@ copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins\xcperl-514.dll.x64 copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64 copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\xctcl.dll.x64 copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins\xcupd.dll.x64 -::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\xcxdcc.dll.x64 copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\xtray.dll.x64 copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins\xcwinamp.dll.x64 +copy ..\plugins\winamp\xcwmpa.dll %XCHAT_DEST%\plugins\xcwmpa.dll.x64 copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%\lua51.dll.x64 diff --git a/build/release-x86.bat b/build/release-x86.bat index 7deebb31..cd246318 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -54,9 +54,9 @@ copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins -::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins +copy ..\plugins\winamp\xcwmpa.dll %XCHAT_DEST%\plugins copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST% xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale xcopy /q /s /i %DEPS_ROOT%\share\locale %XCHAT_DEST%\share\locale diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss index 3fc93f13..afefe28a 100644 --- a/build/xchat-wdk.skel.iss +++ b/build/xchat-wdk.skel.iss @@ -33,12 +33,11 @@ Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenou Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning ;Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins"; Description: "Plugins"; Types: full custom; Flags: disablenouninstallwarning -;Name: "plugins\ewc"; Description: "EasyWinampControl"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\checksum"; Description: "Checksum"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; Flags: disablenouninstallwarning Name: "plugins\winamp"; Description: "Winamp"; Types: full custom; Flags: disablenouninstallwarning -;Name: "plugins\xdcc"; Description: "XDCC"; Types: full custom; Flags: disablenouninstallwarning +Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\xtray"; Description: "X-Tray"; Types: full custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning Name: "langs\lua"; Description: "Lua"; Types: full custom; Flags: disablenouninstallwarning @@ -189,9 +188,6 @@ Source: "xchat-text.exe.x64"; DestDir: "{app}"; DestName: "xchat-text.exe"; Comp -;Source: "plugins\xcewc.dll"; DestDir: "{app}\plugins"; Components: plugins\ewc; Tasks: x86 -;Source: "plugins\xcewc.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcewc.dll"; Components: plugins\ewc; Tasks: x64 - Source: "plugins\xcchecksum.dll"; DestDir: "{app}\plugins"; Components: plugins\checksum; Tasks: x86 Source: "plugins\xcchecksum.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcchecksum.dll"; Components: plugins\checksum; Tasks: x64 @@ -204,12 +200,12 @@ Source: "plugins\xcupd.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcupd.dll" Source: "plugins\xcwinamp.dll"; DestDir: "{app}\plugins"; Components: plugins\winamp; Tasks: x86 Source: "plugins\xcwinamp.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcwinamp.dll"; Components: plugins\winamp; Tasks: x64 -;Source: "plugins\xcxdcc.dll"; DestDir: "{app}\plugins"; Components: plugins\xdcc; Tasks: x86 -;Source: "plugins\xcxdcc.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcxdcc.dll"; Components: plugins\xdcc; Tasks: x64 - Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: plugins\xtray; Tasks: x86 Source: "plugins\xtray.dll.x64"; DestDir: "{app}\plugins"; DestName: "xtray.dll"; Components: plugins\xtray; Tasks: x64 +Source: "plugins\xcwmpa.dll"; DestDir: "{app}\plugins"; Components: plugins\wmpa; Tasks: x86 +Source: "plugins\xcwmpa.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcwmpa.dll"; Components: plugins\wmpa; Tasks: x64 + Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: langs\lua; Tasks: x86 diff --git a/plugins/makefile.mak b/plugins/makefile.mak index d15c7f84..e56a2db7 100644 --- a/plugins/makefile.mak +++ b/plugins/makefile.mak @@ -11,56 +11,29 @@ all: @-$(MAKE) /nologo /s /f makefile.mak $@ @cd ..\upd @-$(MAKE) /nologo /s /f makefile.mak $@ -# @cd ..\xdcc -# @-$(MAKE) /nologo /s /f makefile.mak $@ @cd ..\xtray @-$(MAKE) /nologo /s /f makefile.mak $@ @cd ..\winamp @-$(MAKE) /nologo /s /f makefile.mak $@ + @cd ..\wmpa + @-$(MAKE) /nologo /s /f makefile.mak $@ clean: - @del checksum\*.def - @del checksum\*.dll - @del checksum\*.exp - @del checksum\*.lib - @del checksum\*.obj - @del lua\*.def - @del lua\*.dll - @del lua\*.exp - @del lua\*.lib - @del lua\*.obj - @del mpcinfo\*.def - @del mpcinfo\*.dll - @del mpcinfo\*.exp - @del mpcinfo\*.lib - @del mpcinfo\*.obj - @del python\*.def - @del python\*.dll - @del python\*.exp - @del python\*.lib - @del python\*.obj - @del tcl\*.def - @del tcl\*.dll - @del tcl\*.exp - @del tcl\*.lib - @del tcl\*.obj - @del upd\*.def - @del upd\*.dll - @del upd\*.exp - @del upd\*.lib - @del upd\*.obj -# @del xdcc\*.def -# @del xdcc\*.dll -# @del xdcc\*.exp -# @del xdcc\*.lib -# @del xdcc\*.obj - @del xtray\*.def - @del xtray\*.dll - @del xtray\*.exp - @del xtray\*.lib - @del xtray\*.obj - @del winamp\*.def - @del winamp\*.dll - @del winamp\*.exp - @del winamp\*.lib - @del winamp\*.obj + @cd checksum + @-$(MAKE) /nologo /s /f makefile.mak clean $@ + @cd ..\lua + @-$(MAKE) /nologo /s /f makefile.mak clean $@ + @cd ..\mpcinfo + @-$(MAKE) /nologo /s /f makefile.mak clean $@ + @cd ..\python + @-$(MAKE) /nologo /s /f makefile.mak clean $@ + @cd ..\tcl + @-$(MAKE) /nologo /s /f makefile.mak clean $@ + @cd ..\upd + @-$(MAKE) /nologo /s /f makefile.mak clean $@ + @cd ..\xtray + @-$(MAKE) /nologo /s /f makefile.mak clean $@ + @cd ..\winamp + @-$(MAKE) /nologo /s /f makefile.mak clean $@ + @cd ..\wmpa + @-$(MAKE) /nologo /s /f makefile.mak clean $@ diff --git a/plugins/wmpa/makefile.mak b/plugins/wmpa/makefile.mak new file mode 100644 index 00000000..37e0ecd0 --- /dev/null +++ b/plugins/wmpa/makefile.mak @@ -0,0 +1,53 @@ +include "..\..\src\makeinc.mak" + +TARGET = xcwmpa.dll + +WMPA_OBJECTS = \ +wmpa.obj \ +wmpadialog.obj \ +wmpcdrom.obj \ +wmpcdromcollection.obj \ +wmpclosedcaption.obj \ +wmpcontrols.obj \ +wmpdvd.obj \ +wmperror.obj \ +wmperroritem.obj \ +wmpmedia.obj \ +wmpmediacollection.obj \ +wmpnetwork.obj \ +wmpplayer4.obj \ +wmpplayerapplication.obj \ +wmpplaylist.obj \ +wmpplaylistarray.obj \ +wmpplaylistcollection.obj \ +wmpsettings.obj \ +wmpstringcollection.obj \ +xchat-plugin.obj + +CPPFLAGS = $(CPPFLAGS) /EHsc /D_AFXDLL /D_AFX_NO_DAO_SUPPORT /D_WINDLL /D_USRDLL + +all: $(WMPA_OBJECTS) $(TARGET) + +.cpp.obj: + $(CC) $(CPPFLAGS) /Yc"StdAfx.h" /Fp"wmpa.pch" StdAfx.cpp + $(CC) $(CPPFLAGS) /Yu"StdAfx.h" /Fp"wmpa.pch" /c $< + +$(TARGET): $(WMPA_OBJECTS) + rc /nologo /D_AFXDLL wmpa.rc +!ifdef X64 + midl /nologo /mktyplib203 /char signed /env x64 /h wmpa_h.h /tlb wmpa.tlb wmpa.odl +!else + midl /nologo /mktyplib203 /char signed /env win32 /h wmpa_h.h /tlb wmpa.tlb wmpa.odl +!endif + $(LINK) /DLL /out:$(TARGET) $(LDFLAGS) $(WMPA_OBJECTS) $(LIBS) /def:wmpa.def wmpa.res + +clean: + del $(TARGET) + del *.obj + del wmpa.pch + del wmpa.res + del wmpa.tlb + del wmpa_h.h + del wmpa_i.c + del *.exp + del *.lib diff --git a/plugins/wmpa/wmpa.clw b/plugins/wmpa/wmpa.clw deleted file mode 100644 index 6d850e3e..00000000 --- a/plugins/wmpa/wmpa.clw +++ /dev/null @@ -1,43 +0,0 @@ -; CLW file contains information for the MFC ClassWizard - -[General Info] -Version=1 -ODLFile=wmpa.odl -ClassCount=2 -Class1=CWmpaApp -LastClass=CWMPADialog -NewFileInclude2=#include "wmpa.h" -ResourceCount=1 -NewFileInclude1=#include "stdafx.h" -Class2=CWMPADialog -LastTemplate=CDialog -Resource1=IDD_WMPADIALOG - -[CLS:CWmpaApp] -Type=0 -HeaderFile=wmpa.h -ImplementationFile=wmpa.cpp -Filter=N -LastObject=CWmpaApp -BaseClass=CWinApp -VirtualFilter=AC - -[DLG:IDD_WMPADIALOG] -Type=1 -Class=CWMPADialog -ControlCount=5 -Control1=IDC_PLAYLIST,listbox,1353777409 -Control2=IDC_STATIC1,static,1342308352 -Control3=IDC_WMP,{6BF52A52-394A-11D3-B153-00C04F79FAA6},1342242816 -Control4=IDC_SONGLIST,listbox,1352728833 -Control5=IDC_STATIC2,static,1342308352 - -[CLS:CWMPADialog] -Type=0 -HeaderFile=wmpadialog.h -ImplementationFile=wmpadialog.cpp -BaseClass=CDialog -LastObject=CWMPADialog -Filter=D -VirtualFilter=dWC - diff --git a/plugins/wmpa/wmpa.def b/plugins/wmpa/wmpa.def index d3162b7d..3555558e 100644 --- a/plugins/wmpa/wmpa.def +++ b/plugins/wmpa/wmpa.def @@ -1,7 +1,6 @@ ; wmpa.def : Declares the module parameters for the DLL. -LIBRARY "wmpa" -DESCRIPTION 'wmpa Windows Dynamic Link Library' +LIBRARY "xcwmpa" EXPORTS ; Explicit exports can go here diff --git a/plugins/wmpa/wmpa.dsp b/plugins/wmpa/wmpa.dsp deleted file mode 100644 index 6f2e7458..00000000 --- a/plugins/wmpa/wmpa.dsp +++ /dev/null @@ -1,421 +0,0 @@ -# Microsoft Developer Studio Project File - Name="wmpa" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=wmpa - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "wmpa.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "wmpa.mak" CFG="wmpa - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "wmpa - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "wmpa - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "wmpa - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "C:\Program Files\Microsoft Platform SDK\Include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 -# Begin Custom Build -InputPath=.\Release\wmpa.dll -InputName=wmpa -SOURCE="$(InputPath)" - -"C:\msys\1.0\local\src\xchat\src\fe-gtk\plugins\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy /Y $(InputPath) "C:\msys\1.0\local\src\xchat\src\fe-gtk\plugins\$(InputName).dll" - -# End Custom Build - -!ELSEIF "$(CFG)" == "wmpa - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "C:\Program Files\Microsoft Platform SDK\Include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# Begin Custom Build -InputPath=.\Debug\wmpa.dll -InputName=wmpa -SOURCE="$(InputPath)" - -"C:\msys\1.0\local\src\xchat\src\fe-gtk\plugins\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy /Y $(InputPath) "C:\msys\1.0\local\src\xchat\src\fe-gtk\plugins\$(InputName).dll" - -# End Custom Build - -!ENDIF - -# Begin Target - -# Name "wmpa - Win32 Release" -# Name "wmpa - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# Begin Source File - -SOURCE=.\wmpa.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpa.def -# End Source File -# Begin Source File - -SOURCE=.\wmpa.odl -# End Source File -# Begin Source File - -SOURCE=.\wmpa.rc -# End Source File -# Begin Source File - -SOURCE=.\WMPADialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpcdrom.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpcdromcollection.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpclosedcaption.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpcontrols.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpdvd.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmperror.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmperroritem.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpmedia.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpmediacollection.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpnetwork.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpplayer4.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpplayerapplication.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpplaylist.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpplaylistarray.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpplaylistcollection.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpsettings.cpp -# End Source File -# Begin Source File - -SOURCE=.\wmpstringcollection.cpp -# End Source File -# Begin Source File - -SOURCE=".\xchat-plugin.cpp" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# Begin Source File - -SOURCE=.\wmpa.h -# End Source File -# Begin Source File - -SOURCE=.\WMPADIALOG.h -# End Source File -# Begin Source File - -SOURCE=.\wmpcdrom.h -# End Source File -# Begin Source File - -SOURCE=.\wmpcdromcollection.h -# End Source File -# Begin Source File - -SOURCE=.\wmpclosedcaption.h -# End Source File -# Begin Source File - -SOURCE=.\wmpcontrols.h -# End Source File -# Begin Source File - -SOURCE=.\wmpdvd.h -# End Source File -# Begin Source File - -SOURCE=.\wmperror.h -# End Source File -# Begin Source File - -SOURCE=.\wmperroritem.h -# End Source File -# Begin Source File - -SOURCE=.\wmpmedia.h -# End Source File -# Begin Source File - -SOURCE=.\wmpmediacollection.h -# End Source File -# Begin Source File - -SOURCE=.\wmpnetwork.h -# End Source File -# Begin Source File - -SOURCE=.\wmpplayer4.h -# End Source File -# Begin Source File - -SOURCE=.\wmpplayerapplication.h -# End Source File -# Begin Source File - -SOURCE=.\wmpplaylist.h -# End Source File -# Begin Source File - -SOURCE=.\wmpplaylistarray.h -# End Source File -# Begin Source File - -SOURCE=.\wmpplaylistcollection.h -# End Source File -# Begin Source File - -SOURCE=.\wmpsettings.h -# End Source File -# Begin Source File - -SOURCE=.\wmpstringcollection.h -# End Source File -# Begin Source File - -SOURCE=".\xchat-plugin.h" -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\wmpa.rc2 -# End Source File -# Begin Source File - -SOURCE=.\xchat.ico -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project -# Section wmpa : {10A13217-23A7-439B-B1C0-D847C79B7774} -# 2:5:Class:CWMPPlaylistCollection -# 2:10:HeaderFile:wmpplaylistcollection.h -# 2:8:ImplFile:wmpplaylistcollection.cpp -# End Section -# Section wmpa : {EC21B779-EDEF-462D-BBA4-AD9DDE2B29A7} -# 2:5:Class:CWMPNetwork -# 2:10:HeaderFile:wmpnetwork.h -# 2:8:ImplFile:wmpnetwork.cpp -# End Section -# Section wmpa : {4A976298-8C0D-11D3-B389-00C04F68574B} -# 2:5:Class:CWMPStringCollection -# 2:10:HeaderFile:wmpstringcollection.h -# 2:8:ImplFile:wmpstringcollection.cpp -# End Section -# Section wmpa : {B7ABC220-DF71-11CF-8E74-00A0C90F26F8} -# 2:5:Class:Cmci -# 2:10:HeaderFile:mci.h -# 2:8:ImplFile:mci.cpp -# End Section -# Section wmpa : {8363BC22-B4B4-4B19-989D-1CD765749DD1} -# 2:5:Class:CWMPMediaCollection -# 2:10:HeaderFile:wmpmediacollection.h -# 2:8:ImplFile:wmpmediacollection.cpp -# End Section -# Section wmpa : {679409C0-99F7-11D3-9FB7-00105AA620BB} -# 2:5:Class:CWMPPlaylistArray -# 2:10:HeaderFile:wmpplaylistarray.h -# 2:8:ImplFile:wmpplaylistarray.cpp -# End Section -# Section wmpa : {74C09E02-F828-11D2-A74B-00A0C905F36E} -# 2:5:Class:CWMPControls -# 2:10:HeaderFile:wmpcontrols.h -# 2:8:ImplFile:wmpcontrols.cpp -# End Section -# Section wmpa : {CFAB6E98-8730-11D3-B388-00C04F68574B} -# 2:5:Class:CWMPCdrom -# 2:10:HeaderFile:wmpcdrom.h -# 2:8:ImplFile:wmpcdrom.cpp -# End Section -# Section wmpa : {8DA61686-4668-4A5C-AE5D-803193293DBE} -# 2:5:Class:CWMPDVD -# 2:10:HeaderFile:wmpdvd.h -# 2:8:ImplFile:wmpdvd.cpp -# End Section -# Section wmpa : {6C497D62-8919-413C-82DB-E935FB3EC584} -# 2:5:Class:CWMPPlayer4 -# 2:10:HeaderFile:wmpplayer4.h -# 2:8:ImplFile:wmpplayer4.cpp -# End Section -# Section wmpa : {40897764-CEAB-47BE-AD4A-8E28537F9BBF} -# 2:5:Class:CWMPPlayerApplication -# 2:10:HeaderFile:wmpplayerapplication.h -# 2:8:ImplFile:wmpplayerapplication.cpp -# End Section -# Section wmpa : {6BF52A52-394A-11D3-B153-00C04F79FAA6} -# 2:21:DefaultSinkHeaderFile:wmpplayer4.h -# 2:16:DefaultSinkClass:CWMPPlayer4 -# End Section -# Section wmpa : {C1A8AF25-1257-101B-8FB0-0020AF039CA3} -# 2:21:DefaultSinkHeaderFile:mci.h -# 2:16:DefaultSinkClass:Cmci -# End Section -# Section wmpa : {9104D1AB-80C9-4FED-ABF0-2E6417A6DF14} -# 2:5:Class:CWMPSettings -# 2:10:HeaderFile:wmpsettings.h -# 2:8:ImplFile:wmpsettings.cpp -# End Section -# Section wmpa : {A12DCF7D-14AB-4C1B-A8CD-63909F06025B} -# 2:5:Class:CWMPError -# 2:10:HeaderFile:wmperror.h -# 2:8:ImplFile:wmperror.cpp -# End Section -# Section wmpa : {7BF80981-BF32-101A-8BBB-00AA00300CAB} -# 2:5:Class:CPicture -# 2:10:HeaderFile:picture.h -# 2:8:ImplFile:picture.cpp -# End Section -# Section wmpa : {D5F0F4F1-130C-11D3-B14E-00C04F79FAA6} -# 2:5:Class:CWMPPlaylist -# 2:10:HeaderFile:wmpplaylist.h -# 2:8:ImplFile:wmpplaylist.cpp -# End Section -# Section wmpa : {EE4C8FE2-34B2-11D3-A3BF-006097C9B344} -# 2:5:Class:CWMPCdromCollection -# 2:10:HeaderFile:wmpcdromcollection.h -# 2:8:ImplFile:wmpcdromcollection.cpp -# End Section -# Section wmpa : {4F2DF574-C588-11D3-9ED0-00C04FB6E937} -# 2:5:Class:CWMPClosedCaption -# 2:10:HeaderFile:wmpclosedcaption.h -# 2:8:ImplFile:wmpclosedcaption.cpp -# End Section -# Section wmpa : {94D55E95-3FAC-11D3-B155-00C04F79FAA6} -# 2:5:Class:CWMPMedia -# 2:10:HeaderFile:wmpmedia.h -# 2:8:ImplFile:wmpmedia.cpp -# End Section -# Section wmpa : {3614C646-3B3B-4DE7-A81E-930E3F2127B3} -# 2:5:Class:CWMPErrorItem -# 2:10:HeaderFile:wmperroritem.h -# 2:8:ImplFile:wmperroritem.cpp -# End Section diff --git a/plugins/wmpa/wmpa.dsw b/plugins/wmpa/wmpa.dsw deleted file mode 100644 index e0098b15..00000000 --- a/plugins/wmpa/wmpa.dsw +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "wmpa"=".\wmpa.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ - {6BF52A52-394A-11D3-B153-00C04F79FAA6} - {C1A8AF25-1257-101B-8FB0-0020AF039CA3} -}}} - -############################################################################### - diff --git a/plugins/wmpa/wmpa.ico b/plugins/wmpa/wmpa.ico new file mode 100644 index 00000000..fb781daa Binary files /dev/null and b/plugins/wmpa/wmpa.ico differ diff --git a/plugins/wmpa/wmpa.plg b/plugins/wmpa/wmpa.plg deleted file mode 100644 index a1b967ae..00000000 --- a/plugins/wmpa/wmpa.plg +++ /dev/null @@ -1,16 +0,0 @@ - - -
-
Build Log

-

---------------------Configuration: wmpa - Win32 Release--------------------
-

-
Command Lines

-
-
-
-
Results

-wmpa.dll - 0 error(s), 0 warning(s)
-
- - diff --git a/plugins/wmpa/wmpa.rc b/plugins/wmpa/wmpa.rc index 367805a5..4f3d239a 100644 --- a/plugins/wmpa/wmpa.rc +++ b/plugins/wmpa/wmpa.rc @@ -174,7 +174,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_XCHAT ICON DISCARDABLE "xchat.ico" +IDI_XCHAT ICON DISCARDABLE "wmpa.ico" #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/wmpa/wmpa.sln b/plugins/wmpa/wmpa.sln new file mode 100644 index 00000000..a3b71091 --- /dev/null +++ b/plugins/wmpa/wmpa.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wmpa", "wmpa.vcxproj", "{08AD7C4D-DDDC-9545-A8D7-1808E6056143}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {08AD7C4D-DDDC-9545-A8D7-1808E6056143}.Release|Win32.ActiveCfg = Release|Win32 + {08AD7C4D-DDDC-9545-A8D7-1808E6056143}.Release|Win32.Build.0 = Release|Win32 + {08AD7C4D-DDDC-9545-A8D7-1808E6056143}.Release|x64.ActiveCfg = Release|x64 + {08AD7C4D-DDDC-9545-A8D7-1808E6056143}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/plugins/wmpa/wmpa.vcxproj b/plugins/wmpa/wmpa.vcxproj new file mode 100644 index 00000000..919c2c00 --- /dev/null +++ b/plugins/wmpa/wmpa.vcxproj @@ -0,0 +1,231 @@ + + + + + Release + Win32 + + + Release + x64 + + + + + + MFCProj + + + + DynamicLibrary + Dynamic + MultiByte + + + DynamicLibrary + Dynamic + MultiByte + + + + + + + + + + + + + + + .\Release\ + .\Release\ + false + xcwmpa + + + .\Release\ + .\Release\ + false + xcwmpa + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\mfc42;c:\WinDDK\7600.16385.1\inc\ddk;c:\WinDDK\7600.16385.1\inc\api\dao360 + WIN32;NDEBUG;_WINDOWS;_WINDLL;_USRDLL;_AFXDLL;_AFX_NO_DAO_SUPPORT + .\Release\ + .\Release\wmpa.pch + Use + stdafx.h + .\Release\ + .\Release\ + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\wmpa.tlb + true + Win32 + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\wmpa.bsc + + + true + true + Windows + .\Release\xcwmpa.dll + .\Release\wmpa.lib + .\wmpa.def + c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Mfc\i386;c:\WinDDK\7600.16385.1\lib\ATL\i386 + msvcrt_winxp.obj + + + + + + + + + + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\mfc42;c:\WinDDK\7600.16385.1\inc\ddk;c:\WinDDK\7600.16385.1\inc\api\dao360 + WIN32;NDEBUG;_WINDOWS;_WINDLL;_USRDLL;_AFXDLL;_AFX_NO_DAO_SUPPORT + .\Release\ + .\Release\wmpa.pch + Use + stdafx.h + .\Release\ + .\Release\ + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\wmpa.tlb + true + X64 + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\wmpa.bsc + + + true + true + Windows + .\Release\xcwmpa.dll + .\Release\wmpa.lib + .\wmpa.def + c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Mfc\amd64;c:\WinDDK\7600.16385.1\lib\ATL\amd64 + msvcrt_win2003.obj + + + + + + + + + + + + + Create + Create + stdafx.h + stdafx.h + + + + + + + + + + + + + + + + + + + + + + + + + + RC + + + + + + + Win32 + + + + + $(OUTDIR);%(AdditionalIncludeDirectories) + $(OUTDIR);%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/wmpa/wmpa.vcxproj.filters b/plugins/wmpa/wmpa.vcxproj.filters new file mode 100644 index 00000000..6962f46e --- /dev/null +++ b/plugins/wmpa/wmpa.vcxproj.filters @@ -0,0 +1,172 @@ + + + + + {3206fd00-efdb-4bca-9740-9708bd405701} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {17e13eb2-1243-4ff2-9532-1d6dab0bfef9} + h;hpp;hxx;hm;inl + + + {a1d9cf8c-f0bb-4a19-bfff-5223276e650a} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Resource Files + + + Resource Files + + + + \ No newline at end of file diff --git a/plugins/wmpa/wmpplayer4.h b/plugins/wmpa/wmpplayer4.h index 5ec3c331..687d9361 100644 --- a/plugins/wmpa/wmpplayer4.h +++ b/plugins/wmpa/wmpplayer4.h @@ -38,12 +38,12 @@ public: = { 0x6bf52a52, 0x394a, 0x11d3, { 0xb1, 0x53, 0x0, 0xc0, 0x4f, 0x79, 0xfa, 0xa6 } }; return clsid; } - virtual BOOL Create(LPCTSTR lpszClassName, + /*virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID, CCreateContext* pContext = NULL) - { return CreateControl(GetClsid(), lpszWindowName, dwStyle, rect, pParentWnd, nID); } + { return CreateControl(GetClsid(), lpszWindowName, dwStyle, rect, pParentWnd, nID); }*/ BOOL Create(LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID, diff --git a/plugins/wmpa/xchat.ico b/plugins/wmpa/xchat.ico deleted file mode 100644 index 73247fd0..00000000 Binary files a/plugins/wmpa/xchat.ico and /dev/null differ -- cgit 1.4.1