ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync to trunk (r44371)

Browse Source 
svn path=/branches/ros-amd64-bringup/; revision=44372
This commit is contained in:
Samuel Serapion
2009-12-03 07:26:32 +00:00
parent d2a93c234a 7dc08676d7
commit 07bd1f96bd
886 changed files with 21642 additions and 86317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/applications/cacls/cacls.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="cacls" type="win32cui" installbase="system32" installname="cacls.exe" unicode="true">
<include base="cacls">.</include>
<library>kernel32</library>
<library>advapi32</library>
<library>ntdll</library>
<library>user32</library>
reactos/base/applications/calc/calc.rbuild
-1
View File
@@ -4,7 +4,6 @@
<include base="calc">.</include>
<define name="DISABLE_HTMLHELP_SUPPORT">1</define>
<library>advapi32</library>
<library>kernel32</library>
<library>gdi32</library>
<library>user32</library>
<file>about.c</file>
reactos/base/applications/calc/lang/nl-NL.rc
+1 -1
View File
@@ -703,7 +703,7 @@ END
STRINGTABLE DISCARDABLE
BEGIN
IDS_WEIGHT_BAHT "Baht"
IDS_WEIGHT_CARATS "Carats"
IDS_WEIGHT_CARATS "Karaat"
IDS_WEIGHT_CHUNG "Chung"
IDS_WEIGHT_DON "Don"
IDS_WEIGHT_GEUN "Geun"
reactos/base/applications/charmap/charmap.rbuild
-1
View File
@@ -3,7 +3,6 @@
<module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
<include base="charmap">.</include>
<library>gdi32</library>
<library>kernel32</library>
<library>user32</library>
<library>comctl32</library>
<compilationunit name="unit.c">
reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild
-1
View File
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
<library>kernel32</library>
<file>dbgprint.c</file>
</module>
reactos/base/applications/cmdutils/doskey/doskey.rbuild
-1
View File
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe" unicode="yes">
<library>kernel32</library>
<library>user32</library>
<file>doskey.c</file>
<file>doskey.rc</file>
reactos/base/applications/cmdutils/find/find.rbuild
-1
View File
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="find" type="win32cui" installbase="system32" installname="find.exe">
<library>kernel32</library>
<library>user32</library>
<file>find.c</file>
<file>find.rc</file>
reactos/base/applications/cmdutils/hostname/hostname.rbuild
-1
View File
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe">
<library>kernel32</library>
<file>hostname.c</file>
<file>hostname.rc</file>
</module>
reactos/base/applications/cmdutils/lodctr/lodctr.rbuild
-1
View File
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="lodctr" type="win32cui" installbase="system32" installname="lodctr.exe" unicode="yes">
<library>kernel32</library>
<library>loadperf</library>
<library>wine</library>
<file>lodctr_main.c</file>
reactos/base/applications/cmdutils/more/more.rbuild
-1
View File
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="more" type="win32cui" installbase="system32" installname="more.exe">
<library>kernel32</library>
<library>ntdll</library>
<library>user32</library>
<file>more.c</file>
reactos/base/applications/cmdutils/reg/reg.rbuild
-1
View File
@@ -4,7 +4,6 @@
<library>wine</library>
<library>advapi32</library>
<library>user32</library>
<library>kernel32</library>
<file>reg.c</file>
<file>rsrc.rc</file>
</module>
reactos/base/applications/cmdutils/xcopy/xcopy.rbuild
-1
View File
@@ -5,7 +5,6 @@
<library>wine</library>
<library>shell32</library>
<library>user32</library>
<library>kernel32</library>
<file>xcopy.c</file>
<file>rsrc.rc</file>
<metadata description="xcopy command-line tool" />
reactos/base/applications/control/control.rbuild
-1
View File
@@ -3,7 +3,6 @@
<module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}" installbase="system32" installname="control.exe" unicode="yes">
<include base="control">.</include>
<library>advapi32</library>
<library>kernel32</library>
<library>shell32</library>
<file>control.c</file>
<file>control.rc</file>
reactos/base/applications/downloader/downloader.rbuild
-1
View File
@@ -5,7 +5,6 @@
<include base="downloader">.</include>
<include base="expat">.</include>
<library>kernel32</library>
<library>advapi32</library>
<library>ntdll</library>
<library>user32</library>
reactos/base/applications/dxdiag/dxdiag.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe" unicode="yes">
<include base="dxdiag">.</include>
<library>kernel32</library>
<library>user32</library>
<library>advapi32</library>
<library>comctl32</library>
reactos/base/applications/fontview/fontview.rbuild
-1
View File
@@ -3,7 +3,6 @@
<library>gdi32</library>
<library>user32</library>
<library>shell32</library>
<library>kernel32</library>
<file>fontview.c</file>
<file>display.c</file>
<file>fontview.rc</file>
reactos/base/applications/games/winemine/winemine.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="winemine" type="win32gui" installbase="system32" installname="winemine.exe" unicode="yes">
<include base="winemine">.</include>
<library>kernel32</library>
<library>gdi32</library>
<library>user32</library>
<library>advapi32</library>
reactos/base/applications/hh/hh.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="hh" type="win32gui" installbase="system32" installname="hh.exe" unicode="no">
<include base="hh">.</include>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<file>main.c</file>
reactos/base/applications/iexplore/iexplore.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="iexplore" type="win32gui" installbase="system32" installname="iexplore.exe" unicode="no">
<include base="iexplore">.</include>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<library>shdocvw</library>
reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
-1
View File
@@ -3,7 +3,6 @@
<module name="kbsdll" type="win32dll" baseaddress="0x74720000" installbase="system32" installname="kbsdll.dll" unicode="yes">
<importlibrary definition="kbsdll.spec" />
<include base="kbsdll">.</include>
<library>kernel32</library>
<library>user32</library>
<library>comctl32</library>
<file>kbsdll.c</file>
reactos/base/applications/kbswitch/kbswitch.rbuild
-1
View File
@@ -2,7 +2,6 @@
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="kbswitch" type="win32gui" installbase="system32" installname="kbswitch.exe" unicode="yes">
<include base="kbswitch">.</include>
<library>kernel32</library>
<library>advapi32</library>
<library>user32</library>
<library>shell32</library>
reactos/base/applications/logoff/logoff.rbuild
-1
View File
@@ -4,7 +4,6 @@
<include base="logoff">.</include>
<library>advapi32</library>
<library>user32</library>
<library>kernel32</library>
<file>misc.c</file>
<file>logoff.c</file>
<file>logoff.rc</file>
reactos/base/applications/magnify/magnify.rbuild
-1
View File
@@ -6,7 +6,6 @@
<library>gdi32</library>
<library>advapi32</library>
<library>shell32</library>
<library>kernel32</library>
<file>magnifier.c</file>
<file>settings.c</file>
<file>magnify.rc</file>
reactos/base/applications/mmc/mmc.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes">
<include base="mmcclient">.</include>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<library>comdlg32</library>
reactos/base/applications/mplay32/mplay32.rbuild
-1
View File
@@ -3,7 +3,6 @@
<library>advapi32</library>
<library>comctl32</library>
<library>comdlg32</library>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<library>winmm</library>
reactos/base/applications/msconfig/msconfig.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe" unicode="yes">
<include base="msconfig">.</include>
<library>kernel32</library>
<library>user32</library>
<library>advapi32</library>
<library>version</library>
reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild
-1
View File
@@ -5,7 +5,6 @@
<library>ntdll</library>
<library>setupapi</library>
<library>gdi32</library>
<library>kernel32</library>
<library>user32</library>
<library>comctl32</library>
<library>advapi32</library>
reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild
-1
View File
@@ -2,7 +2,6 @@
<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" unicode="yes">
<include base="eventvwr">.</include>
<library>kernel32</library>
<library>user32</library>
<library>comctl32</library>
<library>advapi32</library>
reactos/base/applications/mscutils/servman/servman.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="servman" type="win32gui" installbase="system32" installname="servman.exe" unicode="yes">
<include base="servman">.</include>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<library>advapi32</library>
reactos/base/applications/mstsc/mstsc.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="mstsc" type="win32gui" installbase="system32" installname="mstsc.exe" unicode="yes">
<include base="mstsc">.</include>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<library>comctl32</library>
reactos/base/applications/network/arp/arp.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="arp" type="win32cui" installbase="system32" installname="arp.exe">
<include base="arp">.</include>
<library>kernel32</library>
<library>iphlpapi</library>
<library>ws2_32</library>
<library>shlwapi</library>
reactos/base/applications/network/dwnl/dwnl.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="dwnl" type="win32cui" installbase="system32" installname="dwnl.exe" unicode="yes">
<include base="dwnl">.</include>
<library>kernel32</library>
<library>urlmon</library>
<library>wininet</library>
<library>uuid</library>
reactos/base/applications/network/finger/finger.rbuild
-1
View File
@@ -3,7 +3,6 @@
<module name="finger" type="win32cui" installbase="system32" installname="finger.exe">
<include base="finger">.</include>
<define name="__USE_W32_SOCKETS" />
<library>kernel32</library>
<library>ws2_32</library>
<file>finger.c</file>
<file>err.c</file>
reactos/base/applications/network/ftp/ftp.rbuild
+12 -1
View File
@@ -3,7 +3,18 @@
<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe">
<include base="ftp">.</include>
<define name="lint" />
<library>kernel32</library>
<!-- FIXME: workarounds until we have a proper oldnames library -->
<define name="chdir">_chdir</define>
<define name="getcwd">_getcwd</define>
<define name="mktemp">_mktemp</define>
<define name="unlink">_unlink</define>
<define name="close">_close</define>
<define name="fileno">_fileno</define>
<define name="read">_read</define>
<define name="write">_write</define>
<define name="lseek">_lseek</define>
<library>ws2_32</library>
<library>iphlpapi</library>
<file>cmds.c</file>
reactos/base/applications/network/ipconfig/ipconfig.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe">
<include base="ipconfig">.</include>
<library>kernel32</library>
<library>user32</library>
<library>iphlpapi</library>
<library>advapi32</library>
reactos/base/applications/network/net/net.rbuild
-1
View File
@@ -3,7 +3,6 @@
<module name="net" type="win32cui" installbase="system32" installname="net.exe">
<include base="ping">.</include>
<define name="__USE_W32_SOCKETS" />
<library>kernel32</library>
<library>ws2_32</library>
<file>main.c</file>
<file>cmdstart.c</file>
reactos/base/applications/network/netstat/netstat.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe">
<include base="netstat">.</include>
<library>kernel32</library>
<library>user32</library>
<library>ws2_32</library>
<library>snmpapi</library>
reactos/base/applications/network/nslookup/nslookup.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="nslookup" type="win32cui" installbase="system32" installname="nslookup.exe">
<include base="nslookup">.</include>
<library>kernel32</library>
<library>user32</library>
<library>ws2_32</library>
<library>snmpapi</library>
reactos/base/applications/network/ping/ping.rbuild
-1
View File
@@ -3,7 +3,6 @@
<module name="ping" type="win32cui" installbase="system32" installname="ping.exe">
<include base="ping">.</include>
<define name="__USE_W32_SOCKETS" />
<library>kernel32</library>
<library>ws2_32</library>
<file>ping.c</file>
<file>ping.rc</file>
reactos/base/applications/network/route/route.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="route" type="win32cui" installbase="system32" installname="route.exe" unicode="yes">
<include base="route">.</include>
<library>kernel32</library>
<library>ws2_32</library>
<library>iphlpapi</library>
<file>route.c</file>
reactos/base/applications/network/telnet/src/tnetwork.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
TNetwork(SOCKET s = 0): socket(s), local_echo(1), line_mode(1),
net_type(TN_NETSOCKET), naws_func((Naws_func_t)NULL),
local_address((char *)NULL) {}
~TNetwork() {if(local_address) delete local_address;}
~TNetwork() {if(local_address) delete[] local_address;}
void SetSocket(SOCKET s);
SOCKET GetSocket() {return socket;}
reactos/base/applications/network/telnet/telnet.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" >
<include base="telnet">.</include>
<library>kernel32</library>
<library>ws2_32</library>
<library>user32</library>
<define name="_CRT_NONSTDC_NO_DEPRECATE" />
reactos/base/applications/network/tracert/tracert.rbuild
-1
View File
@@ -3,7 +3,6 @@
<module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe">
<include base="tracert">.</include>
<define name="__USE_W32_SOCKETS" />
<library>kernel32</library>
<library>ws2_32</library>
<file>tracert.c</file>
<file>tracert.rc</file>
reactos/base/applications/network/whois/whois.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="whois" type="win32cui" installbase="system32" installname="whois.exe">
<include base="whois">.</include>
<library>kernel32</library>
<library>ws2_32</library>
<file>whois.c</file>
<file>whois.rc</file>
reactos/base/applications/notepad/notepad.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="notepad" type="win32gui" installbase="system32" installname="notepad.exe" unicode="yes">
<include base="notepad">.</include>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<library>comdlg32</library>
reactos/base/applications/paint/paint.rbuild
-1
View File
@@ -7,7 +7,6 @@
<library>user32</library>
<library>gdi32</library>
<library>advapi32</library>
<library>kernel32</library>
<library>comctl32</library>
<file>dialogs.c</file>
<file>dib.c</file>
reactos/base/applications/rapps/installed.c
+3 -1
View File
@@ -89,6 +89,7 @@ UninstallApplication(INT Index, BOOL bModify)
INT ItemIndex;
LVITEM Item;
HKEY hKey;
PINSTALLED_INFO ItemInfo;
if (!IS_INSTALLED_ENUM(SelectedEnumType))
return FALSE;
@@ -114,7 +115,8 @@ UninstallApplication(INT Index, BOOL bModify)
if (!ListView_GetItem(hListView, &Item))
return FALSE;
hKey = (HKEY)Item.lParam;
ItemInfo = (PINSTALLED_INFO)Item.lParam;
hKey = ItemInfo->hSubKey;
dwType = REG_SZ;
dwSize = MAX_PATH;
reactos/base/applications/rapps/rapps.rbuild
-1
View File
@@ -6,7 +6,6 @@
<library>advapi32</library>
<library>comctl32</library>
<library>kernel32</library>
<library>gdi32</library>
<library>urlmon</library>
<library>user32</library>
reactos/base/applications/rapps/rapps/abiword.txt
+3 -3
View File
@@ -2,13 +2,13 @@
[Section]
Name = AbiWord
Version = 2.6.4
Version = 2.6.8
Licence = GPL
Description = Word processor.
Size = 5.9MB
Size = 5.6MB
Category = 6
URLSite = http://www.abisource.com/
URLDownload = http://www.abisource.com/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.exe
URLDownload = http://www.abisource.com/downloads/abiword/2.6.8/Windows/abiword-setup-2.6.8.exe
CDPath = none
[Section.0407]
reactos/base/applications/rapps/rapps/mingw.txt
+3 -3
View File
@@ -2,13 +2,13 @@
[Section]
Name = MinGW
Version = 5.1.4
Version = 5.1.6
Licence = Public domain/GPL
Description = A Port of the GNU toolchain with GCC, GDB, GNU make, etc.
Size = 136kb
Size = 155kb
Category = 7
URLSite = http://mingw.org/
URLDownload = http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.4.exe
URLDownload = http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.6.exe
CDPath = none
reactos/base/applications/rapps/rapps/mirandaim.txt
+3 -3
View File
@@ -1,14 +1,14 @@
; UTF-8
; UTF-8
[Section]
Name = Miranda IM
Version = 0.8.9
Version = 0.8.10
Licence = GPL
Description = Open source multiprotocol instant messaging application - May not work completely.
Size = 1.6MB
Category = 5
URLSite = http://www.miranda-im.org/
URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.9-unicode.exe
URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.10-unicode.exe
CDPath = none
reactos/base/applications/rapps/rapps/opera.txt
+3 -3
View File
@@ -2,13 +2,13 @@
[Section]
Name = Opera
Version = 9.64
Version = 10.10
Licence = Freeware
Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.
Size = 7.1M
Size = 11.0M
Category = 5
URLSite = http://www.opera.com/
URLDownload = http://ftp.opera.com/pub/opera/win/964/int/Opera_964_int_Setup.exe
URLDownload = http://ftp.opera.com/pub/opera/win/1010/int/Opera_1010_in_Setup.exe
CDPath = none
[Section.0419]
reactos/base/applications/rapps/rapps/scummvm.txt
+3 -3
View File
@@ -2,13 +2,13 @@
[Section]
Name = ScummVM
Version = 0.13.1
Version = 1.0.0
Licence = GPL
Description = Sam and Max, Day of the Tentacle, etc on ReactOS.
Size = 2.9MB
Size = 3.1MB
Category = 4
URLSite = http://scummvm.org/
URLDownload = http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.13.1-win32.exe
URLDownload = http://dfn.dl.sourceforge.net/project/scummvm/scummvm/1.0.0/scummvm-1.0.0-win32.exe
CDPath = none
reactos/base/applications/rapps/rapps/sdl_mixer.txt
+3 -3
View File
@@ -1,14 +1,14 @@
; UTF-8
; UTF-8
[Section]
Name = Simple Direct Media Layer (SDL) Mixer
Version = 1.2.9
Version = 1.2.11
Licence = LGPL
Description = Needed for some Open Source Games to run. You need 7-Zip or a similar Utility to extract it.
Size = 307kB
Category = 14
URLSite = http://www.libsdl.org/projects/SDL_mixer/
URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.9-win32.zip
URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.11-win32.zip
CDPath = none
reactos/base/applications/rapps/rapps/seamonkey.txt
+10 -10
View File
@@ -2,26 +2,26 @@
[Section]
Name = Mozilla SeaMonkey
Version = 1.1.18
Version = 2.0
Licence = MPL/GPL/LGPL
Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.
Size = 12.4MB
Size = 10.0MB
Category = 5
URLSite = http://www.seamonkey-project.org/
URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.18/seamonkey-1.1.18.en-US.win32.installer.exe
URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/en-US/SeaMonkey%20Setup%202.0.exe
CDPath = none
[Section.0419]
Description = Продолжение Mozilla Suite. Включает браузер, почтовый клиент, IRC-клиент и HTML-редактор.
Size = 9.0MB
URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.18/contrib-localized/seamonkey-1.1.18.ru-RU.win32.installer.exe
Size = 10.4MB
URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/ru/SeaMonkey%20Setup%202.0.exe
[Section.0407]
Description = Mozilla Suite ist lebendig. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benötigen.
Size = 9.0MB
URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.18/contrib-localized/seamonkey-1.1.18.de-AT.win32.installer.exe
Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benötigen.
Size = 10.0MB
URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/de/SeaMonkey%20Setup%202.0.exe
[Section.0415]
Description = Pakiet Mozilla żyje. W zestawie: przeglądarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz.
Size = 12.4MB
URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.18/contrib-localized/seamonkey-1.1.18.pl-PL.win32.installer.exe
Size = 10.8MB
URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/pl/SeaMonkey%20Setup%202.0.exe
reactos/base/applications/rapps/rapps/ultravnc.txt
+2 -2
View File
@@ -2,11 +2,11 @@
[Section]
Name = UltraVNC
Version = 1.0.6.5
Version = 1.0.8.0
Licence = GPL
Description = Open-source VNC client/server
Size = 1.9MB
Category = 5
URLSite = http://www.uvnc.com
URLDownload = http://support1.uvnc.com/download/1065/UltraVNC_1.0.6.5_Setup.exe
URLDownload = http://support1.uvnc.com/download/1080/UltraVNC_1.0.8.0_Setup.exe
CDPath = none
reactos/base/applications/rapps/rapps/utorrent.txt
+2 -2
View File
@@ -2,13 +2,13 @@
[Section]
Name = µTorrent
Version = 1.8.4
Version = 1.8.5
Licence = Freeware for non-commercial uses
Description = Small and fast BitTorrent Client.
Size = 282K
Category = 5
URLSite = http://www.utorrent.com/
URLDownload = http://download.utorrent.com/1.8.3/utorrent.exe
URLDownload = http://download.utorrent.com/1.8.5/utorrent.exe
CDPath = none
[Section.0419]
reactos/base/applications/rapps/rapps/vlc.txt
+3 -3
View File
@@ -2,11 +2,11 @@
[Section]
Name = VLC media player
Version = 1.0.2
Version = 1.0.3
Licence = GPL
Description = A media player.
Size = 18MB
Size = 17.2MB
Category = 1
URLSite = http://www.videolan.org/vlc/
URLDownload = http://mirror.services.wisc.edu/mirrors/videolan/vlc/1.0.2/win32/vlc-1.0.2-win32.exe
URLDownload = http://mirror.services.wisc.edu/mirrors/videolan/vlc/1.0.3/win32/vlc-1.0.3-win32.exe
CDPath = none
reactos/base/applications/regedit/clb/clb.rbuild
-1
View File
@@ -4,7 +4,6 @@
<importlibrary definition="clb.spec" />
<include base="clb">.</include>
<library>ntdll</library>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<library>comctl32</library>
reactos/base/applications/regedit/regedit.rbuild
-1
View File
@@ -6,7 +6,6 @@
<define name="UNICODE" />
<define name="_UNICODE" />
<library>uuid</library>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<library>advapi32</library>
reactos/base/applications/regedt32/regedt32.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="regedt32" type="win32gui" installbase="system32" installname="regedt32.exe" unicode="yes">
<include base="regedt32">.</include>
<library>kernel32</library>
<library>shell32</library>
<library>shlwapi</library>
<file>regedt32.c</file>
reactos/base/applications/sc/sc.rbuild
-1
View File
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="sc" type="win32cui" installbase="system32" installname="sc.exe" unicode="yes">
<define name="DEFINE_GUID" />
<library>kernel32</library>
<library>advapi32</library>
<file>control.c</file>
<file>create.c</file>
reactos/base/applications/screensavers/3dtext/3dtext.rbuild
-1
View File
@@ -3,7 +3,6 @@
<module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr" unicode="yes">
<library>scrnsave</library>
<library>chkstk</library>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<library>opengl32</library>
reactos/base/applications/screensavers/logon/logon.rbuild
-1
View File
@@ -3,7 +3,6 @@
<module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="yes">
<include base="logon">.</include>
<library>scrnsave</library>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
reactos/base/applications/shutdown/shutdown.rbuild
-1
View File
@@ -4,7 +4,6 @@
<include base="shutdown">.</include>
<library>advapi32</library>
<library>user32</library>
<library>kernel32</library>
<file>misc.c</file>
<file>shutdown.c</file>
<file>shutdown.rc</file>
reactos/base/applications/sndrec32/audio_def.hpp
+34
View File
@@ -0,0 +1,34 @@
#ifndef _AUDIO_DEF__H_
#define _AUDIO_DEF__H_
#include <iostream>
//
// Defaults
//
#define _AUDIO_DEFAULT_FORMAT A44100_16BIT_STEREO
#define _AUDIO_DEFAULT_WAVEINBUFFERS 8
#define _AUDIO_DEFAULT_WAVEINBUFSECS 0.1f
#define _AUDIO_DEFAULT_WAVEOUTBUFFERS 8
#define _AUDIO_DEFAULT_WAVEOUTBUFSECS 0.1f
#define _AUDIO_DEFAULT_BUFSECS 1.0f
//
// Namespace stuff
//
#define _AUDIO_NAMESPACE_START_ namespace snd {
#define _AUDIO_NAMESPACE_END_ };
//
// Platform depend stuff
//
#include <windows.h>
#include <mmsystem.h> //Windows MultiMedia (WINMM) audio apis
#include <mmreg.h> //codecs stuff
#include <Msacm.h> //codecs stuff
#endif //ifdef _AUDIO_DEF__H_
reactos/base/applications/sndrec32/audio_format.cpp
+24
View File
@@ -0,0 +1,24 @@
/*
* PROJECT: ReactOS Sound Record Application
* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/sndrec32/audio_format.cpp
* PURPOSE: Audio Format
* PROGRAMMERS: Marco Pagliaricci <ms_blue (at) hotmail (dot) it>
*/
#include "stdafx.h"
#include "audio_format.hpp"
_AUDIO_NAMESPACE_START_
//
// Standard audio formats (declared as
// externs in `audio_format.hpp')
//
audio_format UNNKOWN_FORMAT( 0, 0, 0);
audio_format A44100_16BIT_STEREO( 44100, 16, 2 );
_AUDIO_NAMESPACE_END_
reactos/base/applications/sndrec32/audio_format.hpp
+147
View File
@@ -0,0 +1,147 @@
#ifndef _AUDIOFORMAT__H_
#define _AUDIOFORMAT__H_
#include "audio_def.hpp"
_AUDIO_NAMESPACE_START_
class audio_format
{
protected:
unsigned int samples_psec;
unsigned short int bits_psample;
unsigned short int chan;
public:
//
// Ctors
//
audio_format( unsigned int samples_per_second,
unsigned short int bits_per_sample, unsigned short int channels )
: samples_psec( samples_per_second ), bits_psample( bits_per_sample ),
chan( channels )
{ }
//
// Dtor
//
virtual ~audio_format( void )
{ }
//
// Operators
//
bool operator==( audio_format & eq ) const
{
//
// The same audio format is when samples per second,
// bit per sample, and channels mono/stereo are equal.
//
return (( samples_psec == eq.samples_psec )
&& ( bits_psample == eq.bits_psample ) && ( chan == eq.chan ));
}
//
// Public Functions
//
unsigned int sample_rate( void ) const
{ return samples_psec; }
unsigned short int bits( void ) const
{ return bits_psample; }
unsigned short int channels( void ) const
{ return chan; }
unsigned int byte_rate( void ) const
{ return ( samples_psec * chan * ( bits_psample / 8 )); }
unsigned int block_align( void ) const
{ return ( chan * ( bits_psample / 8 )); }
unsigned int samples_in_seconds( float seconds ) const
{
return ( unsigned int )
((( float )samples_psec * ( float ) chan ) * seconds );
}
unsigned int samples_in_bytes ( unsigned int bytes ) const
{
return ( bytes / (( bits_psample / 8 ) * chan ));
}
};
extern audio_format UNKNOWN_FORMAT;
extern audio_format A44100_16BIT_STEREO;
_AUDIO_NAMESPACE_END_
#endif //ifdef _AUDIOFORMAT__H_
reactos/base/applications/sndrec32/audio_membuffer.cpp
+501
View File
@@ -0,0 +1,501 @@
/*
* PROJECT: ReactOS Sound Record Application
* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/sndrec32/audio_membuffer.cpp
* PURPOSE: Audio MemBuffer
* PROGRAMMERS: Marco Pagliaricci <ms_blue (at) hotmail (dot) it>
*/
#include "stdafx.h"
#include "audio_membuffer.hpp"
_AUDIO_NAMESPACE_START_
void
audio_membuffer::alloc_mem_( unsigned int bytes )
{
//
// Some checking
//
if ( bytes == 0 )
return;
//
// Checks previsiously alloc'd memory
// and frees it.
//
if ( audio_data )
delete[] audio_data;
//
// Allocs new memory and zeros it.
//
audio_data = new BYTE[ bytes ];
memset( audio_data, 0, bytes * sizeof( BYTE ));
//
// Sets the correct buffer size
//
buf_size = bytes;
init_size = bytes;
}
void
audio_membuffer::free_mem_( void )
{
if ( audio_data )
delete[] audio_data;
buf_size = 0;
audio_data = 0;
}
void
audio_membuffer::resize_mem_( unsigned int new_size )
{
if ( new_size == 0 )
return;
//
// The new_size, cannot be <= of the
// `bytes_received' member value of the
// parent class `audio_receiver'.
// We cannot touch received audio data,
// so we have to alloc at least
// bytes_received+1 bytes.
//
// But we can truncate unused memory, so
// `new_size' can be < of `buf_size'.
//
if ( new_size <= bytes_received )
return;
BYTE * new_mem;
//
// Allocs new memory and zeros it.
//
new_mem = new BYTE[ new_size ];
memset( new_mem, 0, new_size * sizeof( BYTE ));
if ( audio_data )
{
//
// Copies received audio data, and discard
// unused memory.
//
memcpy( new_mem, audio_data, bytes_received );
//
// Frees old memory.
//
delete[] audio_data;
//
// Commit new memory.
//
audio_data = new_mem;
buf_size = new_size;
} else {
audio_data = new_mem;
buf_size = new_size;
}
if ( buffer_resized )
buffer_resized( new_size );
}
void
audio_membuffer::truncate_( void )
{
//
// If `buf_size' is already = to the
// `bytes_received' of audio data, then
// this operation is useless; simply return.
//
if ( bytes_received == buf_size )
return;
if ( audio_data )
{
//
// Allocs a new buffer.
//
BYTE * newbuf = new BYTE[ bytes_received ];
//
// Copies audio data.
//
memcpy( newbuf, audio_data, bytes_received );
//
// Frees old memory.
//
delete[] audio_data;
//
// Commit the new buffer.
//
audio_data = newbuf;
buf_size = bytes_received;
//
// Buffer truncation successfull.
// Now the buffer size is exactly big
// as much audio data was received.
//
}
}
//////////////////////////////////////
/////// Public Functions ///////////
//////////////////////////////////////
void
audio_membuffer::clear( void )
{
free_mem_();
bytes_received = 0;
}
void
audio_membuffer::reset( void )
{
//
// Frees memory and reset
// to initial state.
//
clear();
//
// Alloc memory of size specified
// at the constructor.
//
alloc_mem_( init_size );
}
void
audio_membuffer::alloc_bytes( unsigned int bytes )
{
alloc_mem_( bytes );
}
void
audio_membuffer::alloc_seconds( unsigned int secs )
{
alloc_mem_( aud_info.byte_rate() * secs );
}
void
audio_membuffer::alloc_seconds( float secs )
{
alloc_mem_(( unsigned int )(( float ) aud_info.byte_rate() * secs ));
}
void
audio_membuffer::resize_bytes( unsigned int bytes )
{
resize_mem_( bytes );
}
void
audio_membuffer::resize_seconds( unsigned int secs )
{
resize_mem_( aud_info.byte_rate() * secs );
}
void
audio_membuffer::resize_seconds( float secs )
{
resize_mem_(( unsigned int )
(( float )aud_info.byte_rate() * secs )
);
}
///////////////////////////////////////
/////// Inherited Functions /////////
///////////////////////////////////////
void
audio_membuffer::audio_receive
( unsigned char * data, unsigned int size )
{
//
// If there isn't a buffer, allocs memory for
// it of size*2, and copies audio data arrival.
//
if (( audio_data == 0 ) || ( buf_size == 0 ))
{
alloc_mem_( size * 2 );
memcpy( audio_data, data, size );
return;
}
//
// If buffer's free memory is < of `size',
// we have to realloc buffer memory of
// buf_size*2, while free memory is enough
// to contain `size' bytes.
//
// In this case free memory is represented
// by `buf_size - bytes_recorded'.
//
unsigned int tot_mem = buf_size,
free_mem = buf_size - bytes_received;
if ( free_mem < size )
{
//
// Calcs new buffer size.
// TODO: flags for other behaviour?
while ( free_mem < size )
{
tot_mem *= 2;
free_mem = tot_mem - bytes_received;
}
//
// Resize buffer memory.
//
resize_mem_( tot_mem );
}
//
// Now we have enough free space in the
// buffer, so let's copy audio data arrivals.
//
memcpy( audio_data + bytes_received, data, size );
if ( audio_arrival )
audio_arrival( aud_info.samples_in_bytes( size ));
}
unsigned int
audio_membuffer::read( BYTE * out_buf, unsigned int bytes )
{
//
// Some checking
//
if ( !audio_data )
return 0;
if ( bytes_played_ >= bytes_received )
return 0;
unsigned int to_play =
bytes_received - bytes_played_;
unsigned int to_copy =
bytes > to_play ? to_play : bytes;
//
// Copies the audio data out.
//
if (( out_buf ) && ( to_copy ) && ( audio_data ))
memcpy( out_buf, audio_data + bytes_played_, to_copy );
//
// Increments the number of total bytes
// played (audio data gone out from the
// `audio_producer' object).
//
bytes_played_ += bytes;
if ( audio_arrival )
audio_arrival( aud_info.samples_in_bytes( bytes ));
//
// Returns the exact size of audio data
// produced.
//
return to_copy;
}
bool
audio_membuffer::finished( void )
{
if ( bytes_played_ < bytes_received )
return false;
else
return true;
}
_AUDIO_NAMESPACE_END_
reactos/base/applications/sndrec32/audio_membuffer.hpp
+338
View File
@@ -0,0 +1,338 @@
#ifndef _AUDIOMEMBUFFER__H_
#define _AUDIOMEMBUFFER__H_
#include "audio_def.hpp"
#include "audio_receiver.hpp"
#include "audio_format.hpp"
#include "audio_producer.hpp"
_AUDIO_NAMESPACE_START_
class audio_membuffer : public audio_receiver, public audio_producer
{
protected:
BYTE * audio_data;
audio_format aud_info;
unsigned int buf_size;
unsigned int init_size;
//
// Protected Functions
//
//allocs N bytes for the audio buffer.
void alloc_mem_( unsigned int );
//frees memory
void free_mem_( void );
//resizes memory, and copies old
//audio data to new-size memory
void resize_mem_( unsigned int );
//truncates and discards unused memory.
//`buf_size' will be the same as `bytes_received'.
void truncate_( void );
public:
void ( * audio_arrival )( unsigned int );
void ( * buffer_resized ) ( unsigned int );
//
// Ctors
//
audio_membuffer( void )
: audio_data( 0 ), aud_info( _AUDIO_DEFAULT_FORMAT ),
buf_size( 0 ), init_size( 0 )
{
//
// Allocs memory for at least 1 or some seconds
// of recording.
//
init_size = ( unsigned int )
(( float )aud_info.byte_rate() * _AUDIO_DEFAULT_BUFSECS );
alloc_mem_( init_size );
}
audio_membuffer( audio_format aud_fmt )
: audio_data( 0 ), aud_info( aud_fmt ), buf_size( 0 ),
init_size( 0 )
{
//
// Allocs memory for at least 1 or some seconds
// of recording.
//
init_size = ( unsigned int )
(( float )aud_info.byte_rate() * _AUDIO_DEFAULT_BUFSECS );
alloc_mem_( init_size );
}
audio_membuffer( audio_format aud_fmt, unsigned int seconds )
: audio_data( 0 ), aud_info( aud_fmt ), buf_size( 0 ),
init_size( 0 )
{
//
// Allocs memory for audio recording
// the specified number of seconds.
//
init_size = aud_info.byte_rate() * seconds;
alloc_mem_( init_size );
}
audio_membuffer( audio_format aud_fmt, float seconds )
: audio_data( 0 ), aud_info( aud_fmt ), buf_size( 0 ),
init_size( 0 )
{
//
// Allocs memory for audio recording
// the specified number of seconds.
//
init_size = ( unsigned int )(( float ) aud_info.byte_rate() *
seconds <= 0 ? 1 : seconds );
alloc_mem_( init_size );
}
audio_membuffer( unsigned int bytes )
: audio_data( 0 ), aud_info( _AUDIO_DEFAULT_FORMAT ),
buf_size( 0 ), init_size( 0 )
{
//
// Allocs memory for the specified bytes
//
init_size = bytes;
alloc_mem_( init_size );
}
//
// Dtor
//
virtual ~audio_membuffer( void )
{
//
// Frees memory and reset values.
//
clear();
}
//
// Public functions
//
//returns the audio buffer size in bytes.
unsigned int mem_size( void ) const
{ return buf_size; }
//returns how many audio data has been
//received, in bytes.
unsigned int bytes_recorded( void ) const
{ return bytes_received; }
//returns the integer number of seconds
//that the buffer can record
unsigned int seconds_total( void ) const
{ return buf_size / aud_info.byte_rate(); }
//returns the integer number of seconds
//that the buffer can record
unsigned int seconds_recorded( void ) const
{ return bytes_received / aud_info.byte_rate(); }
//returns the float number of seconds
//that the buffer can record
float fseconds_total( void ) const
{ return ( float )(( float ) buf_size /
( float ) aud_info.byte_rate()); }
//returns the float number of seconds
//that has been recorded
float fseconds_recorded( void ) const
{ return ( float )(( float ) bytes_received /
( float ) aud_info.byte_rate()); }
unsigned int total_samples( void ) const
{
return ( aud_info.samples_in_seconds( fseconds_total() ));
}
unsigned int samples_received( void ) const
{
return ( aud_info.samples_in_bytes( bytes_received ));
}
//returns a pointer to the audio buffer
BYTE * audio_buffer( void ) const
{ return audio_data; }
//frees memory and resets values.
void clear( void );
audio_format & audinfo( void ) { return aud_info; }
//discard audio data, resets values,
//but, instead of clear() which frees memory,
//reset the memory to the initial size, ready
//for receiving "new" audio data.
void reset( void );
//truncates and discards unused memory.
//`buf_size' will be the same as `bytes_received'.
void truncate( void )
{ truncate_( ); }//TODO: fare truncate N bytes
//if there is a buffer, discards current buffer
//memory and realloc a new memory buffer with a
//new size expressed in bytes.
void alloc_bytes( unsigned int );
//if there is a buffer, discards current buffer
//memory and realloc a new memory buffer with a
//new size expressed in seconds, integer and float.
void alloc_seconds( unsigned int );
void alloc_seconds( float );
//resizes in bytes the current buffer,
//without discarding previsiously audio data received.
void resize_bytes( unsigned int );
//resizes in seconds the current buffer,
//without discarding previsiously audio data received.
void resize_seconds( unsigned int );
void resize_seconds( float );
//
// Inherited Functions from `audio_receiver'
//
void audio_receive( unsigned char *, unsigned int );
//
// Inherited Functions from `audio_buffer'
//
unsigned int read( BYTE *, unsigned int );
bool finished( void );
};
_AUDIO_NAMESPACE_END_
#endif //ifdef _AUDIOMEMBUFFER__H_
reactos/base/applications/sndrec32/audio_producer.cpp
+12
View File
@@ -0,0 +1,12 @@
/*
* PROJECT: ReactOS Sound Record Application
* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/sndrec32/audio_producer.cpp
* PURPOSE: Audio Format
* PROGRAMMERS: Marco Pagliaricci <ms_blue (at) hotmail (dot) it>
*/
#include "StdAfx.h"
#include "audio_producer.hpp"
reactos/base/applications/sndrec32/audio_producer.hpp
+112
View File
@@ -0,0 +1,112 @@
#ifndef _AUDIOAUDBUF__H_
#define _AUDIOAUDBUF__H_
#include "audio_def.hpp"
_AUDIO_NAMESPACE_START_
class audio_producer
{
protected:
unsigned int bytes_played_;
public:
//
// Ctors
//
audio_producer ( ) : bytes_played_( 0 )
{ }
//
// Dtor
//
virtual ~audio_producer( void )
{ }
//
// Public Functions
//
//reads N bytes from the buffer
virtual unsigned int read( BYTE *, unsigned int ) = 0;
virtual bool finished ( void ) = 0;
unsigned int bytes_played( void ) const
{
return bytes_played_;
}
void set_position( unsigned int pos )
{
bytes_played_ = pos;
}
void set_position_start( void )
{
bytes_played_ = 0 ;
}
void forward( unsigned int bytes )
{
bytes_played_ += bytes ;
}
void backward( unsigned int bytes )
{
bytes_played_ += bytes ;
}
void ( * play_finished )( void );
};
_AUDIO_NAMESPACE_END_
#endif //ifdef _AUDIOAUDBUF__H_
reactos/base/applications/sndrec32/audio_receiver.cpp
+17
View File
@@ -0,0 +1,17 @@
/*
* PROJECT: ReactOS Sound Record Application
* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/sndrec32/audio_producer.cpp
* PURPOSE: Audio Format
* PROGRAMMERS: Marco Pagliaricci <ms_blue (at) hotmail (dot) it>
*/
#include "stdafx.h"
#include "audio_receiver.hpp"
_AUDIO_NAMESPACE_START_
_AUDIO_NAMESPACE_END_
reactos/base/applications/sndrec32/audio_receiver.hpp
+103
View File
@@ -0,0 +1,103 @@
#ifndef _AUDIORECEIVER_DEF__H_
#define _AUDIORECEIVER_DEF__H_
#include "audio_def.hpp"
_AUDIO_NAMESPACE_START_
//TODO: differenziare audio_receiver da audio_sink?
//TODO: creare un audio_receiver Tee
class audio_receiver
{
//
// The `audio_wavein' class, while is
// recording audio, has to access to
// protected members of `audio_receiver'
// such as `bytes_received' protected
// variable.
//
friend class audio_wavein;
protected:
unsigned int bytes_received;
unsigned int status;
public:
//
// Ctors
//
audio_receiver( void )
: bytes_received( 0 )
{ }
//
// Dtor
//
virtual ~audio_receiver( void )
{ }
//
// Public Functions
//
virtual void audio_receive( unsigned char *, unsigned int ) = 0;
//virtual void start_rec( void ) = 0;
//virtual void stop_rec( void ) = 0;
void set_b_received( unsigned int r )
{ bytes_received = r; }
};
_AUDIO_NAMESPACE_END_
#endif //ifdef _AUDIORECEIVER_DEF__H_
reactos/base/applications/sndrec32/audio_resampler_acm.cpp
+387
View File
@@ -0,0 +1,387 @@
/*
* PROJECT: ReactOS Sound Record Application
* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/sndrec32/audio_resampler_acm.cpp
* PURPOSE: Audio Resampler
* PROGRAMMERS: Marco Pagliaricci <ms_blue (at) hotmail (dot) it>
*/
#include "stdafx.h"
#include "audio_resampler_acm.hpp"
_AUDIO_NAMESPACE_START_
/////////////////////////////////////////
/////// Private Functions ////////
/////////////////////////////////////////
void
audio_resampler_acm::init_( void )
{
//
// Zeroing structures
//
ZeroMemory( &acm_header, sizeof( ACMSTREAMHEADER ));
ZeroMemory( &wformat_src, sizeof( WAVEFORMATEX ));
ZeroMemory( &wformat_dst, sizeof( WAVEFORMATEX ));
//
// Setting structures sizes
//
acm_header.cbStruct = sizeof( ACMSTREAMHEADER );
wformat_src.cbSize = sizeof( WAVEFORMATEX );
wformat_dst.cbSize = sizeof( WAVEFORMATEX );
//
// Setting WAVEFORMATEX structure parameters
// according to `audio_format' in/out classes
//
wformat_src.wFormatTag = WAVE_FORMAT_PCM;
wformat_src.nSamplesPerSec = audfmt_in.sample_rate();
wformat_src.nChannels = audfmt_in.channels();
wformat_src.wBitsPerSample = audfmt_in.bits();
wformat_src.nAvgBytesPerSec = audfmt_in.byte_rate();
wformat_src.nBlockAlign = audfmt_in.block_align();
wformat_dst.wFormatTag = WAVE_FORMAT_PCM;
wformat_dst.nSamplesPerSec = audfmt_out.sample_rate();
wformat_dst.nChannels = audfmt_out.channels();
wformat_dst.wBitsPerSample = audfmt_out.bits();
wformat_dst.nAvgBytesPerSec = audfmt_out.byte_rate();
wformat_dst.nBlockAlign = audfmt_out.block_align();
//
// Init acm structures completed successfull
//
}
/////////////////////////////////////////
/////// Public Functions ////////
/////////////////////////////////////////
void
audio_resampler_acm::open( void )
{
MMRESULT err;
//
// Opens ACM stream
//
err = acmStreamOpen( &acm_stream, 0, &wformat_src, &wformat_dst,
0, 0, 0, ACM_STREAMOPENF_NONREALTIME );
if ( err != MMSYSERR_NOERROR )
{
//TODO: throw error
printf("acmOpen error: %i\n", err);
}
//
// Calcs source buffer lenght
//
src_buflen = ( unsigned int )
(( float )audfmt_in.byte_rate() * ( float )buf_secs );
//
// Calcs destination source buffer lenght
// with help of ACM apis
//
err = acmStreamSize( acm_stream,
src_buflen, &dst_buflen, ACM_STREAMSIZEF_SOURCE );
if ( err != MMSYSERR_NOERROR )
{
//TODO: throw error
printf("acmSize error\n");
}
//
// Initialize ACMSTREAMHEADER structure,
// and alloc memory for source and destination
// buffers.
//
acm_header.fdwStatus = 0;
acm_header.dwUser = 0;
acm_header.pbSrc = ( LPBYTE ) new BYTE [ src_buflen ];
acm_header.cbSrcLength = src_buflen;
acm_header.cbSrcLengthUsed = 0;
acm_header.dwSrcUser = src_buflen;
acm_header.pbDst = ( LPBYTE ) new BYTE [ dst_buflen ];
acm_header.cbDstLength = dst_buflen;
acm_header.cbDstLengthUsed = 0;
acm_header.dwDstUser = dst_buflen;
//
// Give ACMSTREAMHEADER initialized correctly to the
// driver.
//
err = acmStreamPrepareHeader( acm_stream, &acm_header, 0L );
if ( err != MMSYSERR_NOERROR )
{
//TODO: throw error
printf("prep. header error\n");
}
//
// ACM stream successfully opened.
//
stream_opened = true;
}
void
audio_resampler_acm::close( void )
{
MMRESULT err;
if ( acm_stream )
{
if ( acm_header.fdwStatus & ACMSTREAMHEADER_STATUSF_PREPARED )
{
acm_header.cbSrcLength = src_buflen;
acm_header.cbDstLength = dst_buflen;
err = acmStreamUnprepareHeader( acm_stream, &acm_header, 0L );
if ( err != MMSYSERR_NOERROR )
{
//
// Free buffer memory
//
if ( acm_header.pbSrc != 0 )
delete[] acm_header.pbSrc;
if ( acm_header.pbDst != 0 )
delete[] acm_header.pbDst;
//
// Re-init structures
//
init_();
//
// Updating status
//
stream_opened = false;
//TODO: throw error
}
}
err = acmStreamClose( acm_stream, 0 );
acm_stream = 0;
if ( err != MMSYSERR_NOERROR )
{
//
// Free buffer memory
//
if ( acm_header.pbSrc != 0 )
delete[] acm_header.pbSrc;
if ( acm_header.pbDst != 0 )
delete[] acm_header.pbDst;
//
// Re-init structures
//
init_();
//
// Updating status
//
stream_opened = false;
//TODO: throw error!
}
}//if acm_stream != 0
//
// Free buffer memory
//
if ( acm_header.pbSrc != 0 )
delete[] acm_header.pbSrc;
if ( acm_header.pbDst != 0 )
delete[] acm_header.pbDst;
//
// Re-init structures
//
init_();
//
// Updating status
//
stream_opened = false;
//
// ACM sream successfully closed.
//
}
void
audio_resampler_acm::audio_receive( unsigned char * data, unsigned int size )
{
MMRESULT err;
//
// Checking for acm stream opened
//
if ( stream_opened )
{
//
// Copy audio data from extern to
// internal source buffer
//
memcpy( acm_header.pbSrc, data, size );
acm_header.cbSrcLength = size;
acm_header.cbDstLengthUsed = 0;
err = acmStreamConvert( acm_stream, &acm_header, ACM_STREAMCONVERTF_BLOCKALIGN );
if ( err != MMSYSERR_NOERROR )
{
//TODO: throw error
printf("acm convert error\n");
}
//
// Wait for sound conversion
//
while(( ACMSTREAMHEADER_STATUSF_DONE & acm_header.fdwStatus ) == 0 );
printf("Processed successfully %lu bytes of audio.\n", acm_header.cbDstLengthUsed );
//
// Copy resampled audio, to destination buffer.
//
//memcpy( pbOutputData, acm_header.pbDst, acm_header.cbDstLengthUsed );
}
}
_AUDIO_NAMESPACE_END_
reactos/base/applications/sndrec32/audio_resampler_acm.hpp
+99
View File
@@ -0,0 +1,99 @@
#ifndef _AUDIORESAMPLERACM__H_
#define _AUDIORESAMPLERACM__H_
#include "audio_def.hpp"
#include "audio_receiver.hpp"
#include "audio_format.hpp"
_AUDIO_NAMESPACE_START_
//TODO: inherit from a base resampler?
class audio_resampler_acm : public audio_receiver
{
private:
void init_( void );
protected:
HACMSTREAM acm_stream;
ACMSTREAMHEADER acm_header;
DWORD src_buflen;
DWORD dst_buflen;
bool stream_opened;
audio_format audfmt_in;
audio_format audfmt_out;
float buf_secs;
WAVEFORMATEX wformat_src;
WAVEFORMATEX wformat_dst;
public:
//
// Ctors
//
audio_resampler_acm( audio_format fmt_in, audio_format fmt_out )
: acm_stream( 0 ), src_buflen( 0 ), dst_buflen( 0 ),
stream_opened( false ), audfmt_in( fmt_in ), audfmt_out( fmt_out ),
buf_secs( _AUDIO_DEFAULT_BUFSECS )
{
init_();
}
//
// Dtor
//
~audio_resampler_acm( void )
{ }
//
// Public functions
//
void open( void );
void close( void );
void audio_receive( unsigned char *, unsigned int );
};
_AUDIO_NAMESPACE_END_
#endif //ifdef _AUDIORESAMPLERACM_H_
reactos/base/applications/sndrec32/audio_wavein.cpp
+880
View File
@@ -0,0 +1,880 @@
/*
* PROJECT: ReactOS Sound Record Application
* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/sndrec32/audio_wavein.cpp
* PURPOSE: Audio WaveIn
* PROGRAMMERS: Marco Pagliaricci <ms_blue (at) hotmail (dot) it>
*/
#include "stdafx.h"
#include "audio_wavein.hpp"
_AUDIO_NAMESPACE_START_
void
audio_wavein::init_( void )
{
ZeroMemory(( LPVOID ) &wave_format,
sizeof( WAVEFORMATEX ));
wave_format.cbSize = sizeof( WAVEFORMATEX );
wavein_handle = 0;
recthread_id = 0;
wakeup_recthread = 0;
buf_secs = _AUDIO_DEFAULT_WAVEINBUFSECS;
status = WAVEIN_NOTREADY;
}
void
audio_wavein::alloc_buffers_mem_( unsigned int buffs, float secs )
{
unsigned int
onebuf_size = 0, tot_size = 0;
//
// Release old memory
//
if ( main_buffer )
delete[] main_buffer;
if ( wave_headers )
delete[] wave_headers;
//
// Calcs size of the buffers
//
onebuf_size = ( unsigned int )
(( float )aud_info.byte_rate() * secs );
tot_size = onebuf_size * buffs;
//
// Allocs memory for the audio buffers
//
main_buffer = new BYTE [ tot_size ];
//
// Allocs memory for the `WAVEHDR' structures.
//
wave_headers = ( WAVEHDR * )
new BYTE [ sizeof( WAVEHDR ) * buffs ];
//
// Zeros memory.
//
ZeroMemory( main_buffer, tot_size );
ZeroMemory( wave_headers,
sizeof( WAVEHDR ) * buffs );
//
// Updates total size of the buffers.
//
mb_size = tot_size;
}
void
audio_wavein::free_buffers_mem_( void )
{
//
// Frees memory
//
if ( main_buffer )
delete[] main_buffer;
if ( wave_headers )
delete[] wave_headers;
main_buffer = 0;
wave_headers = 0;
}
void
audio_wavein::init_headers_( void )
{
//
// If there is no memory for memory or
// headers, simply return.
//
if (( !wave_headers ) || ( !main_buffer ))
return;
//
// This is the size for one buffer
//
DWORD buf_sz = mb_size / buffers;
//
// This is the base address for one buffer
//
BYTE * buf_addr = main_buffer;
//
// Initializes headers.
//
for ( unsigned int i = 0; i < buffers; ++i )
{
wave_headers[ i ].dwBufferLength = mb_size / buffers;
wave_headers[ i ].lpData = ( LPSTR ) buf_addr;
buf_addr += buf_sz;
}
}
void
audio_wavein::prep_headers_( void )
{
MMRESULT err;
bool error = false;
//
// If there is no memory for memory or
// headers, throw error.
//
if (( !wave_headers )
|| ( !main_buffer ) || ( !wavein_handle ))
{} //TODO: throw error!
for ( unsigned int i = 0; i < buffers; ++i )
{
err = waveInPrepareHeader( wavein_handle,
&wave_headers[ i ], sizeof( WAVEHDR ));
if ( err != MMSYSERR_NOERROR )
error = true;
}
if ( error )
MessageBox( 0, TEXT("waveInPrepareHeader Error."), 0, 0 );
}
void
audio_wavein::unprep_headers_( void )
{
MMRESULT err;
bool error = false;
//
// If there is no memory for memory or
// headers, throw error.
//
if (( !wave_headers )
|| ( !main_buffer ) || ( !wavein_handle ))
{} //TODO: throw error!
for ( unsigned int i = 0; i < buffers; ++i )
{
err = waveInUnprepareHeader( wavein_handle,
&wave_headers[ i ], sizeof( WAVEHDR ));
if ( err != MMSYSERR_NOERROR )
error = true;
}
if ( error )
MessageBox( 0, TEXT("waveInUnPrepareHeader Error."), 0, 0 );
}
void
audio_wavein::add_buffers_to_driver_( void )
{
MMRESULT err;
bool error = false;
//
// If there is no memory for memory or
// headers, throw error.
//
if (( !wave_headers )
|| ( !main_buffer ) || ( !wavein_handle ))
{} //TODO: throw error!
for ( unsigned int i = 0; i < buffers; ++i )
{
err = waveInAddBuffer( wavein_handle,
&wave_headers[ i ], sizeof( WAVEHDR ));
if ( err != MMSYSERR_NOERROR )
error = true;
}
if ( error )
MessageBox( 0, TEXT("waveInAddBuffer Error."), 0, 0 );
}
void
audio_wavein::close( void )
{
//
// If wavein object is already in the status
// NOTREADY, nothing to do.
//
if ( status == WAVEIN_NOTREADY )
return;
//
// If the wavein is recording,
// then stop recording and close it.
//
if ( status == WAVEIN_RECORDING )
stop_recording();
//
// Updating status.
//
status = WAVEIN_NOTREADY;
//
// Wakeing up recording thread, so it
// can receive the `MM_WIM_CLOSE' message
// then dies.
//
if ( wakeup_recthread )
SetEvent( wakeup_recthread );
//
// Closing wavein stream
//
while (( waveInClose( wavein_handle ))
!= MMSYSERR_NOERROR ) Sleep( 1 );
//
// Release buffers memory.
//
free_buffers_mem_();
//
// Re-initialize variables to the
// initial state.
//
init_();
}
void
audio_wavein::open( void )
{
MMRESULT err;
HANDLE recthread_handle = 0;
//
// Checkin the status of the object
//
if ( status != WAVEIN_NOTREADY )
{} //TODO: throw error
//
// Creating the EVENT object that will be signaled
// when the recording thread has to wake up.
//
wakeup_recthread =
CreateEvent( 0, FALSE, FALSE, 0 );
data_flushed_event =
CreateEvent( 0, FALSE, FALSE, 0 );
if (( !wakeup_recthread ) || ( !data_flushed_event ))
{
status = WAVEIN_ERR;
MessageBox( 0, TEXT("Thread Error."), 0, 0 );
//TODO: throw error
}
//
// Inialize buffers for recording audio
// data from the wavein audio line.
//
alloc_buffers_mem_( buffers, buf_secs );
init_headers_();
//
// Sound format that will be captured by wavein
//
wave_format.wFormatTag = WAVE_FORMAT_PCM;
wave_format.nChannels = aud_info.channels();
wave_format.nSamplesPerSec = aud_info.sample_rate();
wave_format.wBitsPerSample = aud_info.bits();
wave_format.nBlockAlign = aud_info.block_align();
wave_format.nAvgBytesPerSec = aud_info.byte_rate();
//
// Creating the recording thread
//
recthread_handle =
CreateThread( NULL,
0,
audio_wavein::recording_procedure,
( PVOID ) this,
0,
&recthread_id
);
//
// Checking thread handle
//
if ( !recthread_handle )
{
//
// Updating status
//
status = WAVEIN_ERR;
MessageBox( 0, TEXT("Thread Error."), 0, 0 );
//TODO: throw error
}
//
// We don't need the thread handle anymore,
// so we can close it from now. (We'll just
// need the thread ID for the `waveInOpen' API)
//
CloseHandle( recthread_handle );
//
// Opening audio line wavein
//
err = waveInOpen( &wavein_handle,
0,
&wave_format,
recthread_id,
0,
CALLBACK_THREAD
);
if ( err != MMSYSERR_NOERROR )
{
//
// Updating status
//
status = WAVEIN_ERR;
if ( err == WAVERR_BADFORMAT )
MessageBox( 0, TEXT("waveInOpen Error"), 0, 0 );
//TODO: throw error
}
//
// Update object status
//
status = WAVEIN_READY;
//
// Now `audio_wavein' object is ready
// for audio recording!
//
}
void
audio_wavein::start_recording( void )
{
MMRESULT err;
BOOL ev;
if (( status != WAVEIN_READY )
&& ( status != WAVEIN_STOP ))
{} //TODO: throw error
//
// Updating to the recording status
//
status = WAVEIN_RECORDING;
//
// Let's prepare header of type WAVEHDR that
// we will pass to the driver with our
// audio informations, and buffer informations.
//
prep_headers_();
//
// The waveInAddBuffer function sends an input buffer
// to the given waveform-audio input device.
// When the buffer is filled, the application is notified.
//
add_buffers_to_driver_();
//
// Signaling event for waking up
// the recorder thread.
//
ev = SetEvent( wakeup_recthread );
if ( !ev )
{
MessageBox( 0, TEXT("Event Error."), 0, 0 );
}
//
// Start recording
//
err = waveInStart( wavein_handle );
if ( err != MMSYSERR_NOERROR )
{
//
// Updating status
//
status = WAVEIN_ERR;
MessageBox( 0, TEXT("waveInStart Error."), 0, 0 );
//TODO: throw error
}
}
void
audio_wavein::stop_recording( void )
{
MMRESULT err;
DWORD wait;
if ( status != WAVEIN_RECORDING )
return;
status = WAVEIN_FLUSHING;
if ( data_flushed_event )
wait = WaitForSingleObject(
data_flushed_event, INFINITE
);
//
// waveInReset will make all pending buffer as done.
//
err = waveInReset( wavein_handle );
if ( err != MMSYSERR_NOERROR )
{
//TODO: throw error
MessageBox( 0, TEXT("waveInReset Error."), 0, 0 );
}
//
// Stop recording.
//
err = waveInStop( wavein_handle );
if ( err != MMSYSERR_NOERROR )
{
//TODO: throw error
MessageBox( 0, TEXT("waveInStop Error."), 0, 0 );
}
//
// The waveInUnprepareHeader function cleans up the
// preparation performed by the waveInPrepareHeader function.
//
unprep_headers_();
status = WAVEIN_STOP;
}
DWORD WINAPI
audio_wavein::recording_procedure( LPVOID arg )
{
MSG msg;
WAVEHDR * phdr;
DWORD wait;
audio_wavein * _this = ( audio_wavein * ) arg;
//
// Check the arg pointer
//
if ( _this == 0 )
return 0;
//
// The thread can go to sleep for now.
// It will be wake up only when there is audio data
// to be recorded.
//
if ( _this->wakeup_recthread )
wait = WaitForSingleObject(
_this->wakeup_recthread, INFINITE
);
//
// If status of the `audio_wavein' object
// is not ready or recording the thread can exit.
//
if (( _this->status != WAVEIN_READY ) &&
( _this->status != WAVEIN_RECORDING ))
return 0;
//
// Entering main polling loop
//
while ( GetMessage( &msg, 0, 0, 0 ))
{
switch ( msg.message )
{
case MM_WIM_DATA:
phdr = ( WAVEHDR * ) msg.lParam;
if (( _this->status == WAVEIN_RECORDING )
|| ( _this->status == WAVEIN_FLUSHING ))
{
//
// Flushes recorded audio data to
// the `audio_receiver' object.
//
_this->audio_rcvd.audio_receive(
( unsigned char * )phdr->lpData,
phdr->dwBytesRecorded
);
//
// Updating `audio_receiver' total
// bytes received _AFTER_ calling
// `audio_receive' function.
//
_this->audio_rcvd.bytes_received +=
phdr->dwBytesRecorded;
//
// If status is not flushing data, then
// we can re-add the buffer for reusing it.
// Otherwise, if we are flushing pending data,
// we cannot re-add buffer because we don't need
// it anymore
//
if ( _this->status != WAVEIN_FLUSHING )
{
//
// Let the audio driver reuse the buffer
//
waveInAddBuffer( _this->wavein_handle,
phdr, sizeof( WAVEHDR ));
} else {
//
// If we are flushing pending data, we have
// to prepare to stop recording.
// Set WAVEHDR flag to 0, and fires the event
// `data_flushed_event', that will wake up
// the main thread that is sleeping into
// wavein_in::stop_recording() member function,
// waiting the last `MM_WIM_DATA' message that
// contain pending data.
//
phdr->dwFlags = 0;
SetEvent( _this->data_flushed_event );
//
// The recording is gooing to stop, so the
// recording thread can go to sleep!
//
wait = WaitForSingleObject(
_this->wakeup_recthread, INFINITE );
}
}//if WAVEIN_RECORDING || WAVEIN_FLUSHING
break;
case MM_WIM_CLOSE:
//
// The thread can exit now.
//
return 0;
break;
} //end switch( msg.message )
} //end while( GetMessage( ... ))
return 0;
}
_AUDIO_NAMESPACE_END_
reactos/base/applications/sndrec32/audio_wavein.hpp
+271
View File
@@ -0,0 +1,271 @@
#ifndef _AUDIOWAVEIN_H_
#define _AUDIOWAVEIN_H_
#include "audio_def.hpp"
#include "audio_format.hpp"
#include "audio_receiver.hpp"
_AUDIO_NAMESPACE_START_
enum audio_wavein_status { WAVEIN_NOTREADY, WAVEIN_READY,
WAVEIN_RECORDING, WAVEIN_ERR,
WAVEIN_STOP, WAVEIN_FLUSHING
};
class audio_wavein
{
private:
//
// The new recording thread sends message to this procedure
// about open recording, close, and sound data recorded
//
static DWORD WINAPI recording_procedure( LPVOID );
//
// When this event is signaled, then the previsiously created
// recording thread will wake up and start recording audio
// and will pass audio data to an `audio_receiver' object.
//
HANDLE wakeup_recthread;
HANDLE data_flushed_event;
protected:
//TODO: puts these structs in private?!
//
// Audio wavein device stuff
//
WAVEFORMATEX wave_format;
WAVEHDR * wave_headers;
HWAVEIN wavein_handle;
audio_format aud_info;
audio_receiver & audio_rcvd;
//
// Audio Recorder Thread id
//
DWORD recthread_id;
//
// Object status
//
audio_wavein_status status;
//
// How many seconds of audio
// can record the internal buffer
// before flushing audio data
// to the `audio_receiver' class?
//
float buf_secs;
//
// The temporary buffers for the audio
// data incoming from the wavein device
// and its size, and its total number.
//
BYTE * main_buffer;
unsigned int mb_size;
unsigned int buffers;
//
// Protected Functions
//
//initialize all structures and variables.
void init_( void );
void alloc_buffers_mem_( unsigned int, float );
void free_buffers_mem_( void );
void init_headers_( void );
void prep_headers_( void );
void unprep_headers_( void );
void add_buffers_to_driver_( void );
public:
//
// Ctors
//
audio_wavein(
const audio_format & a_info, audio_receiver & a_receiver )
: wave_headers( 0 ),
aud_info( a_info ), audio_rcvd( a_receiver ),
status( WAVEIN_NOTREADY ), main_buffer( 0 ), mb_size( 0 ),
buffers( _AUDIO_DEFAULT_WAVEINBUFFERS )
{
//
// Initializing internal wavein data
//
init_();
aud_info = a_info;
}
//
// Dtor
//
~audio_wavein( void )
{
//close(); TODO!
}
//
// Public functions
//
void open( void );
void close ( void );
void start_recording( void );
void stop_recording( void );
audio_wavein_status current_status ( void ) const
{
return status;
}
float buffer_secs( void ) const
{ return buf_secs; }
void buffer_secs( float bsecs )
{
//
// Some checking
//
if ( bsecs <= 0 )
return;
//
// Set seconds lenght for each
// buffer.
//
buf_secs = bsecs;
}
unsigned int total_buffers( void ) const
{ return buffers; }
void total_buffers( unsigned int tot_bufs )
{
//
// Some checking
//
if ( tot_bufs == 0 )
return;
//
// Sets the number of total buffers.
//
buffers = tot_bufs;
}
audio_format format( void ) const
{ return aud_info; }
};
_AUDIO_NAMESPACE_END_
#endif //ifdef _AUDIOWAVEIN_H_
reactos/base/applications/sndrec32/audio_waveout.cpp
+889
View File
@@ -0,0 +1,889 @@
/*
* PROJECT: ReactOS Sound Record Application
* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/sndrec32/audio_waveout.cpp
* PURPOSE: Audio WaveOut
* PROGRAMMERS: Marco Pagliaricci <ms_blue (at) hotmail (dot) it>
*/
#include "stdafx.h"
#include "audio_waveout.hpp"
_AUDIO_NAMESPACE_START_
void
audio_waveout::init_( void )
{
ZeroMemory(( LPVOID ) &wave_format,
sizeof( WAVEFORMATEX ));
wave_format.cbSize = sizeof( WAVEFORMATEX );
waveout_handle = 0;
playthread_id = 0;
wakeup_playthread = 0;
buf_secs = _AUDIO_DEFAULT_WAVEOUTBUFSECS;
status = WAVEOUT_NOTREADY;
}
void
audio_waveout::alloc_buffers_mem_( unsigned int buffs, float secs )
{
unsigned int
onebuf_size = 0, tot_size = 0;
//
// Release old memory
//
if ( main_buffer )
delete[] main_buffer;
if ( wave_headers )
delete[] wave_headers;
//
// Calcs size of the buffers
//
onebuf_size = ( unsigned int )
(( float )aud_info.byte_rate() * secs );
tot_size = onebuf_size * buffs;
//
// Allocs memory for the audio buffers
//
main_buffer = new BYTE [ tot_size ];
//
// Allocs memory for the `WAVEHDR' structures.
//
wave_headers = ( WAVEHDR * )
new BYTE [ sizeof( WAVEHDR ) * buffs ];
//
// Zeros memory.
//
ZeroMemory( main_buffer, tot_size );
ZeroMemory( wave_headers,
sizeof( WAVEHDR ) * buffs );
//
// Updates total size of the buffers.
//
mb_size = tot_size;
}
void
audio_waveout::init_headers_( void )
{
//
// If there is no memory for memory or
// headers, simply return.
//
if (( !wave_headers ) || ( !main_buffer ))
return;
//
// This is the size for one buffer
//
DWORD buf_sz = mb_size / buffers;
//
// This is the base address for one buffer
//
BYTE * buf_addr = main_buffer;
ZeroMemory( wave_headers, sizeof( WAVEHDR ) * buffers );
//
// Initializes headers.
//
for ( unsigned int i = 0; i < buffers; ++i )
{
//
// Sets the correct base address and
// lenght for the little buffer.
//
wave_headers[ i ].dwBufferLength = mb_size / buffers;
wave_headers[ i ].lpData = ( LPSTR ) buf_addr;
//
// Unsets the WHDR_DONE flag.
//
wave_headers[ i ].dwFlags &= ~WHDR_DONE;
//
// Sets the WAVEHDR user data with an
// unique little buffer ID#
//
wave_headers[ i ].dwUser = ( unsigned int ) i;
//
// Increments little buffer base address.
//
buf_addr += buf_sz;
}
}
void
audio_waveout::prep_headers_( void )
{
MMRESULT err;
bool error = false;
//
// If there is no memory for memory or
// headers, throw error.
//
if (( !wave_headers )
|| ( !main_buffer ) || ( !waveout_handle ))
{} //TODO: throw error!
for ( unsigned int i = 0; i < buffers; ++i )
{
err = waveOutPrepareHeader( waveout_handle,
&wave_headers[ i ], sizeof( WAVEHDR ));
if ( err != MMSYSERR_NOERROR )
error = true;
}
if ( error )
{} //TODO: throw error indicating which
//header i-th is errorneous
}
void
audio_waveout::unprep_headers_( void )
{
MMRESULT err;
bool error = false;
//
// If there is no memory for memory or
// headers, throw error.
//
if (( !wave_headers )
|| ( !main_buffer ) || ( !waveout_handle ))
{} //TODO: throw error!
for ( unsigned int i = 0; i < buffers; ++i )
{
err = waveOutUnprepareHeader( waveout_handle,
&wave_headers[ i ], sizeof( WAVEHDR ));
if ( err != MMSYSERR_NOERROR )
error = true;
}
if ( error )
{} //TODO: throw error indicating which
//header i-th is errorneous
}
void
audio_waveout::free_buffers_mem_( void )
{
//
// Frees memory
//
if ( main_buffer )
delete[] main_buffer;
if ( wave_headers )
delete[] wave_headers;
main_buffer = 0;
wave_headers = 0;
}
void
audio_waveout::open( void )
{
MMRESULT err;
HANDLE playthread_handle = 0;
//
// Checkin the status of the object
//
if ( status != WAVEOUT_NOTREADY )
{} //TODO: throw error
//
// Creating the EVENT object that will be signaled
// when the playing thread has to wake up.
//
wakeup_playthread =
CreateEvent( 0, FALSE, FALSE, 0 );
if ( !wakeup_playthread )
{
status = WAVEOUT_ERR;
//TODO: throw error
}
//
// Inialize buffers for recording audio
// data from the wavein audio line.
//
alloc_buffers_mem_( buffers, buf_secs );
init_headers_();
//
// Sound format that will be captured by wavein
//
wave_format.wFormatTag = WAVE_FORMAT_PCM;
wave_format.nChannels = aud_info.channels();
wave_format.nSamplesPerSec = aud_info.sample_rate();
wave_format.wBitsPerSample = aud_info.bits();
wave_format.nBlockAlign = aud_info.block_align();
wave_format.nAvgBytesPerSec = aud_info.byte_rate();
//
// Creating the recording thread
//
playthread_handle =
CreateThread( NULL,
0,
audio_waveout::playing_procedure,
( PVOID ) this,
0,
&playthread_id
);
//
// Checking thread handle
//
if ( !playthread_handle )
{
//
// Updating status
//
status = WAVEOUT_ERR;
//TODO: throw error
}
//
// We don't need the thread handle anymore,
// so we can close it from now. (We'll just
// need the thread ID for the `waveInOpen' API)
//
CloseHandle( playthread_handle );
//
// Reset the `audio_source' to the start
// position.
//
audio_buf.set_position_start();
//
// Opens the WAVE_OUT device.
//
err = waveOutOpen(
&waveout_handle,
WAVE_MAPPER,
&wave_format,
playthread_id,
0,
CALLBACK_THREAD | WAVE_ALLOWSYNC
);
if ( err != MMSYSERR_NOERROR )
{
MessageBox(0, _T("waveOutOpen Error"), 0, 0);
//TODO: throw error
}
status = WAVEOUT_READY;
}
void
audio_waveout::play( void )
{
MMRESULT err;
unsigned int i;
BOOL ev;
if ( !main_buffer )
{ return; } //TODO; throw error, or assert
//
// If the status is PAUSED, we have to
// resume the audio playing.
//
if ( status == WAVEOUT_PAUSED )
{
//
// Updates status.
//
status = WAVEOUT_PLAYING;
//
// Tells to the driver to resume
// audio playing.
//
waveOutRestart( waveout_handle );
//
// Wakeup playing thread.
//
ev = SetEvent( wakeup_playthread );
return;
} //if status == WAVEOUT_PAUSED
if ( status != WAVEOUT_READY )
return;
//
// Prepares WAVEHDR structures.
//
prep_headers_();
//
// Sets correct status.
//
status = WAVEOUT_PLAYING;
//
// Reads the audio from the start.
//
audio_buf.set_position_start();
//
// Reads the first N bytes from the audio
// buffer, where N = the total size of all
// little buffers.
//
audio_buf.read( main_buffer, mb_size );
//
// Wakeup the playing thread.
//
ev = SetEvent( wakeup_playthread );
//
// Sends all the little buffers to the
// audio driver, so it can play the sound
// data.
//
for ( i = 0; i < buffers; ++ i )
{
err = waveOutWrite( waveout_handle, &wave_headers[ i ], sizeof( WAVEHDR ));
if ( err != MMSYSERR_NOERROR )
{
MessageBox(0, _T("waveOutWrite Error"), 0, 0);
//TODO: throw error
}
}
}
void
audio_waveout::pause( void )
{
MMRESULT err;
//
// If the waveout object is not playing audio,
// do nothing.
//
if ( status == WAVEOUT_PLAYING )
{
//
// Updating status.
//
status = WAVEOUT_PAUSED;
//
// Tells to audio driver to pause audio.
//
err = waveOutPause( waveout_handle );
if ( err != MMSYSERR_NOERROR )
{
MessageBox(0, _T("waveOutPause Error"), 0, 0);
//TODO: throw error
}
}
}
void
audio_waveout::stop( void )
{
MMRESULT err;
status = WAVEOUT_STOP;
err = waveOutReset( waveout_handle );
if ( err != MMSYSERR_NOERROR )
{
MessageBox(0, _T("err waveout reset.\n"),_T("ERROR"), 0);
//TODO: throw error
}
//
// Sets the start position of the audio
// buffer.
//
audio_buf.set_position_start();
unprep_headers_();
init_headers_();
status = WAVEOUT_READY;
}
void
audio_waveout::close( void )
{
MMRESULT err;
//
// If the `wave_out' object is playing audio,
// or it is in paused state, we have to call
// the `stop' member function, to flush
// pending buffers.
//
if (( status == WAVEOUT_PLAYING )
|| ( status== WAVEOUT_PAUSED ))
{
stop();
}
//
// When we have flushed all pending buffers,
// the wave out handle can be successfully closed.
//
err = waveOutClose( waveout_handle );
if ( err != MMSYSERR_NOERROR )
{
MessageBox(0, _T("waveOutClose Error"), 0, 0);
//TODO: throw error
}
free_buffers_mem_();
}
DWORD WINAPI
audio_waveout::playing_procedure( LPVOID arg )
{
MSG msg;
WAVEHDR * phdr;
DWORD wait;
MMRESULT err;
audio_waveout * _this = ( audio_waveout * ) arg;
unsigned int read_size;
//
// Check the arg pointer
//
if ( _this == 0 )
return 0;
//
// The thread can go to sleep for now.
// It will be wake up only when there is audio data
// to be recorded.
//
if ( _this->wakeup_playthread )
wait = WaitForSingleObject(
_this->wakeup_playthread, INFINITE
);
//
// Entering main polling loop
//
while ( GetMessage( &msg, 0, 0, 0 ))
{
switch ( msg.message )
{
case MM_WOM_DONE:
phdr = ( WAVEHDR * ) msg.lParam;
//
// If the status of the `wave_out' object
// is different than playing, then the thread
// can go to sleep.
//
if (( _this->status != WAVEOUT_PLAYING )
&& ( _this->wakeup_playthread ))
{
wait = WaitForSingleObject(
_this->wakeup_playthread,
INFINITE
);
}
//TODO: quando il thread si risveglia, deve
//entrare nel prossimo if o no? o metter un else { ?
if ( phdr->dwFlags & WHDR_DONE )
{
read_size =
_this->audio_buf.read(
( BYTE * ) phdr->lpData,
phdr->dwBufferLength
);
if ( read_size )
{
phdr->dwBufferLength = read_size;
phdr->dwFlags &= ~WHDR_DONE;
err = waveOutWrite(
_this->waveout_handle,
phdr,
sizeof( WAVEHDR )
);
if ( err != MMSYSERR_NOERROR )
{
MessageBox(0, _T("waveOutWrite Error"), 0, 0);
//TODO: throw error
}
} else {
//
// Here `read_sizep' is 0
//
if ( phdr->dwUser == ( _this->buffers - 1 ))
{
//
// Here `read_size' and the buffer user
// data, that contain a buffer ID#,
// is equal to the number of the total
// buffers - 1. This means that this is the
// _LAST_ little buffer that has been played
// by the audio driver. We can STOP the
// `wave_out' object now, or restart the
// sound playing, if we have a infinite loop.
//
_this->stop();
//
// Let the thread go to sleep.
//
if ( _this->audio_buf.play_finished )
_this->audio_buf.play_finished();
if ( _this->wakeup_playthread )
wait = WaitForSingleObject(
_this->wakeup_playthread,
INFINITE
);
}
} //if read_size != 0
} //( phdr->dwFlags & WHDR_DONE )
break; // end case
case MM_WOM_CLOSE:
//
// The thread can exit now.
//
return 0;
break;
case MM_WOM_OPEN:
//
// Do nothing.
//
break;
} //end switch( msg.message )
} //end while( GetMessage( ... ))
return 0;
}
_AUDIO_NAMESPACE_END_
reactos/base/applications/sndrec32/audio_waveout.hpp
+186
View File
@@ -0,0 +1,186 @@
#ifndef _AUDIOWAVEOUT__H_
#define _AUDIOWAVEOUT__H_
#include "audio_def.hpp"
#include "audio_format.hpp"
#include "audio_producer.hpp"
_AUDIO_NAMESPACE_START_
enum audio_waveout_status { WAVEOUT_NOTREADY, WAVEOUT_READY,
WAVEOUT_PLAYING, WAVEOUT_ERR,
WAVEOUT_PAUSED, WAVEOUT_STOP
};
class audio_waveout
{
friend class audio_buffer;
private:
static DWORD WINAPI playing_procedure( LPVOID );
HANDLE wakeup_playthread;
protected:
WAVEFORMATEX wave_format;
WAVEHDR * wave_headers;
HWAVEOUT waveout_handle;
const audio_format & aud_info;
audio_producer & audio_buf;
//
// Audio Playing Thread id
//
DWORD playthread_id;
audio_waveout_status status;
float buf_secs;
//
// The temporary buffers for the audio
// data outgoing to the waveout device
// and its size, and its total number.
//
//base address for entire memory
BYTE * main_buffer;
//size in bytes for the entire memory
unsigned int mb_size;
//number of little buffers
unsigned int buffers;
//
// Protected Functions
//
void init_( void );
void alloc_buffers_mem_( unsigned int, float );
void free_buffers_mem_( void );
void init_headers_( void );
void prep_headers_( void );
void unprep_headers_( void );
public:
//
// Ctors
//
audio_waveout( const audio_format & aud_fmt,
audio_producer & a_buf )
: wave_headers( 0 ), aud_info( aud_fmt ),
audio_buf( a_buf ), status( WAVEOUT_NOTREADY ),
main_buffer( 0 ), mb_size( 0 ),
buffers( _AUDIO_DEFAULT_WAVEOUTBUFFERS )
{
//
// Initializing internal wavein data
//
init_();
}
//
// Dtor
//
~audio_waveout( void )
{ }
//
// Public Functions
//
void open ( void );
void play ( void );
void pause ( void );
void stop ( void );
void close ( void );
audio_waveout_status current_status( void )
{ return status; }
};
_AUDIO_NAMESPACE_END_
#endif //ifdef _AUDIOWAVEOUT__H_
reactos/base/applications/tsclient/.gitignore → reactos/base/applications/sndrec32/bitmap1.bmp
View File
reactos/base/applications/sndrec32/but_end.bmp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

reactos/base/applications/sndrec32/but_play.bmp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

reactos/base/applications/sndrec32/but_rec.bmp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

reactos/base/applications/sndrec32/but_start.bmp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

reactos/base/applications/sndrec32/but_stop.bmp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

reactos/base/applications/sndrec32/kkaudio.hpp
+18
View File
@@ -0,0 +1,18 @@
#ifndef _AUDIO__H_
#define _AUDIO__H_
#include "audio_def.hpp"
#include "audio_wavein.hpp"
#include "audio_waveout.hpp"
#include "audio_resampler_acm.hpp"
#include "audio_format.hpp"
#include "audio_membuffer.hpp"
#include "audio_producer.hpp"
#include "audio_receiver.hpp"
#endif //ifdef _KKAUDIO__H_
reactos/base/applications/sndrec32/reactOS_sndrec32.ico
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

reactos/base/applications/sndrec32/resource.h
+44
View File
@@ -0,0 +1,44 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by reactOS_sndrec32.rc
//
#define IDC_MYICON 2
#define IDD_REACTOS_SNDREC32_DIALOG 102
#define IDS_APP_TITLE 103
#define IDD_ABOUTBOX 103
#define IDM_ABOUT 104
#define IDI_REACTOS_SNDREC32 107
#define IDI_REACTOS_SNDREC32LL 107
#define IDI_SMALL 108
#define IDC_REACTOS_SNDREC32 109
#define IDR_MAINFRAME 128
#define IDB_BITMAP1 132
#define IDB_BITMAP_REC 132
#define IDB_BITMAP2_START 133
#define IDB_BITMAP2_END 134
#define IDB_BITMAP2_PLAY 135
#define IDB_BITMAP2_STOP 136
#define IDB_BITMAP2_REC 137
#define IDI_ICON1 138
#define IDR_MENU1 139
#define ID_FILE_NEW 32771
#define ID_FILE_OPEN 32772
#define ID_FILE_SAVE 32773
#define ID_FILE_SAVEAS 32774
#define ID_FILE_EXIT 32775
#define ID__ABOUT 32776
#define ID_EXIT 32777
#define ID_NEW 32778
#define IDC_STATIC -1
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 140
#define _APS_NEXT_COMMAND_VALUE 32779
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 110
#endif
#endif
reactos/base/applications/sndrec32/small.ico
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

reactos/base/applications/sndrec32/sndrec32.cpp
+1042
View File
File diff suppressed because it is too large Load Diff
reactos/base/applications/sndrec32/sndrec32.h
+96
View File
@@ -0,0 +1,96 @@
#pragma once
#include "resource.h"
#define MAX_LOADSTRING 100
#define MAINWINDOW_W 350
#define MAINWINDOW_H 190
#define CONTROLS_CX 10
#define INITIAL_BUFREC_SECONDS 30.0f
#define BUTSTART_ID 0
#define BUTEND_ID 1
#define BUTPLAY_ID 2
#define BUTSTOP_ID 3
#define BUTREC_ID 4
#define SLIDER_ID 5
#define BUTTONS_H 30
#define BUTTONS_W 60
#define BUTTONS_CY 100
#define BUTTONS_CX CONTROLS_CX
#define BUTTONS_SPACE 5
#define SLIDER_CX CONTROLS_CX
#define SLIDER_CY 65
#define SLIDER_H 30
#define SLIDER_W 320
struct riff_hdr
{
DWORD magic;
DWORD chunksize;
DWORD format;
};
struct wave_hdr
{
DWORD Subchunkid;
DWORD Subchunk1Size;
WORD AudioFormat;
WORD NumChannels;
DWORD SampleRate;
DWORD ByteRate;
WORD BlockAlign;
WORD BitsPerSample;
};
struct data_chunk
{
DWORD subc;
DWORD subc_size;
//unsigned char data[];
};
//
// Functions prototypes
//
LRESULT CALLBACK
Buttons_proc(HWND, UINT, WPARAM, LPARAM);
BOOL
write_wav( TCHAR * );
BOOL
open_wav( TCHAR * );
VOID enable_but( DWORD );
VOID disable_but( DWORD );
void
l_play_finished ( void );
void
l_audio_arrival ( unsigned int );
void
l_buffer_resized ( unsigned int );
reactos/base/applications/sndrec32/sndrec32.rbuild
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="sndrec32" type="win32gui" installbase="system32" installname="sndrec32.exe">
<include base="sndrec32">.</include>
<library>winmm</library>
<library>user32</library>
<library>msacm32</library>
<library>comctl32</library>
<library>comdlg32</library>
<file>audio_format.cpp</file>
<file>audio_membuffer.cpp</file>
<file>audio_producer.cpp</file>
<file>audio_receiver.cpp</file>
<file>audio_resampler_acm.cpp</file>
<file>audio_wavein.cpp</file>
<file>audio_waveout.cpp</file>
<file>sndrec32.cpp</file>
<file>sndrec32.rc</file>
</module>
reactos/base/applications/sndrec32/sndrec32.rc
+179
View File
@@ -0,0 +1,179 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#ifndef APSTUDIO_INVOKED
#include "targetver.h"
#endif
#define APSTUDIO_HIDDEN_SYMBOLS
#include "windows.h"
#undef APSTUDIO_HIDDEN_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Italiano (Italia) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
#ifdef _WIN32
LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_REACTOS_SNDREC32LL ICON "reactOS_sndrec32.ico"
IDI_SMALL ICON "small.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
//
IDC_REACTOS_SNDREC32 ACCELERATORS
BEGIN
"?", IDM_ABOUT, ASCII, ALT
"/", IDM_ABOUT, ASCII, ALT
END
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Informazioni su reactOS_sndrec32"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20
LTEXT "reactOS_sndrec32, versione 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX
LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8
DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
IDD_ABOUTBOX, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 189
TOPMARGIN, 7
BOTTOMMARGIN, 68
END
END
#endif // APSTUDIO_INVOKED
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#ifndef APSTUDIO_INVOKED\r\n"
"#include ""targetver.h""\r\n"
"#endif\r\n"
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
"#include ""windows.h""\r\n"
"#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
IDB_BITMAP2_START BITMAP "but_start.bmp"
IDB_BITMAP2_END BITMAP "but_end.bmp"
IDB_BITMAP2_PLAY BITMAP "but_play.bmp"
IDB_BITMAP2_STOP BITMAP "but_stop.bmp"
IDB_BITMAP2_REC BITMAP "but_rec.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// Menu
//
IDR_MENU1 MENU
BEGIN
POPUP "File"
BEGIN
MENUITEM "New", ID_NEW
MENUITEM "Open...", ID_FILE_OPEN
MENUITEM "Save", ID_FILE_SAVE, GRAYED
MENUITEM "Save As...", ID_FILE_SAVEAS
MENUITEM SEPARATOR
MENUITEM "Exit", ID_EXIT
END
MENUITEM "todo1", 0
MENUITEM "todo2", 0
POPUP "?"
BEGIN
MENUITEM "About...", ID__ABOUT
END
END
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE
BEGIN
IDS_APP_TITLE "reactOS_sndrec32"
IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32"
END
#endif // Italiano (Italia) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
reactos/base/applications/sndrec32/stdafx.h
+23
View File
@@ -0,0 +1,23 @@
// stdafx.h : file di inclusione per file di inclusione di sistema standard
// o file di inclusione specifici del progetto utilizzati di frequente, ma
// modificati raramente
//
#pragma once
#include "targetver.h"
#define WIN32_LEAN_AND_MEAN // Escludere gli elementi utilizzati di rado dalle intestazioni di Windows
// File di intestazione di Windows:
#include <windows.h>
#include <commctrl.h>
#include <Commdlg.h>
// File di intestazione Runtime C
#include <stdlib.h>
#include <malloc.h>
#include <memory.h>
#include <tchar.h>
// TODO: fare riferimento qui alle intestazioni aggiuntive richieste dal programma
reactos/base/applications/sndrec32/targetver.h
+24
View File
@@ -0,0 +1,24 @@
#pragma once
// Le macro seguenti definiscono la piattaforma minima richiesta. La piattaforma minima richiesta
// è costituita dalla versione meno recente di Windows, Internet Explorer e così via contenenti le funzionalità necessarie per eseguire
// l'applicazione. Le macro consentono di attivare tutte le funzionalità disponibili nelle versioni delle piattaforme fino
// alla versione specificata compresa.
// Modificare le seguenti definizioni se è necessario utilizzare come destinazione una piattaforma prima di quelle specificate di seguito.
// Fare riferimento a MSDN per informazioni aggiornate sui valori corrispondenti per le differenti piattaforme.
#ifndef WINVER // Specifica che la piattaforma minima richiesta è Windows Vista.
#define WINVER 0x0600 // Modificare il valore con quello appropriato per altre versioni di Windows.
#endif
#ifndef _WIN32_WINNT // Specifica che la piattaforma minima richiesta è Windows Vista.
#define _WIN32_WINNT 0x0600 // Modificare il valore con quello appropriato per altre versioni di Windows.
#endif
#ifndef _WIN32_WINDOWS // Specifica che la piattaforma minima richiesta è Windows 98.
#define _WIN32_WINDOWS 0x0410 // Modificare il valore con quello appropriato per Windows Me o versioni successive.
#endif
#ifndef _WIN32_IE // Specifica che la piattaforma minima richiesta è Internet Explorer 7.0.
#define _WIN32_IE 0x0700 // Modificare il valore con quello appropriato per altre versioni di IE.
#endif
reactos/base/applications/sndvol32/sndvol32.rbuild
-1
View File
@@ -7,7 +7,6 @@
<library>user32</library>
<library>advapi32</library>
<library>gdi32</library>
<library>kernel32</library>
<library>comctl32</library>
<library>shell32</library>
<library>winmm</library>
reactos/base/applications/taskmgr/taskmgr.rbuild
-1
View File
@@ -3,7 +3,6 @@
<module name="taskmgr" type="win32gui" installbase="system32" installname="taskmgr.exe" unicode="yes">
<include base="taskmgr">.</include>
<library>ntdll</library>
<library>kernel32</library>
<library>advapi32</library>
<library>user32</library>
<library>gdi32</library>
reactos/base/applications/tsclient/MissTosca.sln
-38
View File
@@ -1,38 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rdesktop-core", "rdesktop\rdesktop-core.vcproj", "{8620E9B2-9AF0-4F69-A5AF-C195D5F86372}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mstsc", "mstsc\mstsc.vcproj", "{1B415732-1F37-415F-957B-EA436301860D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mstscax", "mstscax\mstscax.vcproj", "{2C217E9E-9D77-4D6A-9259-216FD56BA56F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rdesktop-core-tester", "porting-tools\rdesktop-core-tester\rdesktop-core-tester.vcproj", "{B172A623-E2BD-4E3F-86E6-620548FE255B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8620E9B2-9AF0-4F69-A5AF-C195D5F86372}.Debug|Win32.ActiveCfg = Debug|Win32
{8620E9B2-9AF0-4F69-A5AF-C195D5F86372}.Debug|Win32.Build.0 = Debug|Win32
{8620E9B2-9AF0-4F69-A5AF-C195D5F86372}.Release|Win32.ActiveCfg = Release|Win32
{8620E9B2-9AF0-4F69-A5AF-C195D5F86372}.Release|Win32.Build.0 = Release|Win32
{1B415732-1F37-415F-957B-EA436301860D}.Debug|Win32.ActiveCfg = Debug|Win32
{1B415732-1F37-415F-957B-EA436301860D}.Debug|Win32.Build.0 = Debug|Win32
{1B415732-1F37-415F-957B-EA436301860D}.Release|Win32.ActiveCfg = Release|Win32
{1B415732-1F37-415F-957B-EA436301860D}.Release|Win32.Build.0 = Release|Win32
{2C217E9E-9D77-4D6A-9259-216FD56BA56F}.Debug|Win32.ActiveCfg = Debug|Win32
{2C217E9E-9D77-4D6A-9259-216FD56BA56F}.Debug|Win32.Build.0 = Debug|Win32
{2C217E9E-9D77-4D6A-9259-216FD56BA56F}.Release|Win32.ActiveCfg = Release|Win32
{2C217E9E-9D77-4D6A-9259-216FD56BA56F}.Release|Win32.Build.0 = Release|Win32
{B172A623-E2BD-4E3F-86E6-620548FE255B}.Debug|Win32.ActiveCfg = Debug|Win32
{B172A623-E2BD-4E3F-86E6-620548FE255B}.Debug|Win32.Build.0 = Debug|Win32
{B172A623-E2BD-4E3F-86E6-620548FE255B}.Release|Win32.ActiveCfg = Release|Win32
{B172A623-E2BD-4E3F-86E6-620548FE255B}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
reactos/base/applications/tsclient/mstsc/.gitignore
View File

Some files were not shown because too many files have changed in this diff Show More