Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 34307: - converted 1st stage setup stub from message box style to property sheet style - property page for English and German added - other languages needs to be translated and enabled in rsrc.rc
by mkupfer＠svn.reactos.org 05 Jul '08

05 Jul '08

Author: mkupfer Date: Sat Jul 5 12:55:38 2008 New Revision: 34307 URL: http://svn.reactos.org/svn/reactos?rev=34307&view=rev Log: - converted 1st stage setup stub from message box style to property sheet style - property page for English and German added - other languages needs to be translated and enabled in rsrc.rc Added: trunk/reactos/base/setup/reactos/res/header.bmp (with props) trunk/reactos/base/setup/reactos/res/watermark.bmp (with props) Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/reactos.rbuild trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/reactos/resource.h trunk/reactos/base/setup/reactos/rsrc.rc Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -2,12 +2,16 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -/* String Tables */ - -STRINGTABLE DISCARDABLE +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" BEGIN - IDS_CAPTION "ReactOS Setup" - IDS_TEXT "ReactOS kann nicht direkt von dieser CD installiert werden!\n\nBitte starten Sie Ihren Computer mit dieser CD um ReactOS zu installieren." + LTEXT "Willkommen beim ReactOS Setup Assistenten.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "ReactOS kann noch nicht direkt von dieser CD installiert werden! "\ + "Bitte starten Sie Ihren Computer mit dieser CD um ReactOS zu "\ + "installieren.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Klicken Sie auf Beenden um das Setup zu verlassen.", IDC_STATIC, 115, 169, 195, 17 END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -2,11 +2,16 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -/* String Tables */ -STRINGTABLE DISCARDABLE +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" BEGIN - IDS_CAPTION "ReactOS Setup" - IDS_TEXT "You cannot install ReactOS directly from this CD!\n\nPlease restart your computer from this CD in order to install ReactOS." + LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "You cannot install ReactOS directly from this CD yet! "\ + "Please restart your computer from this CD in order to "\ + "install ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 END /* EOF */ Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -1,6 +1,6 @@ /* * ReactOS applications - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2004-2008 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,24 +21,90 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application * FILE: subsys/system/reactos/reactos.c - * PROGRAMMERS: Eric Kohl + * PROGRAMMERS: Eric Kohl, Matthias Kupfer */ #include <windows.h> -#include <tchar.h> +#include <commctrl.h> #include "resource.h" -/* GLOBALS ******************************************************************/ +/* FUNCTIONS ****************************************************************/ -TCHAR szCaption[256]; -TCHAR szText[256]; +static VOID +CenterWindow(HWND hWnd) +{ + HWND hWndParent; + RECT rcParent; + RECT rcWindow; -HINSTANCE hInstance; + hWndParent = GetParent(hWnd); + if (hWndParent == NULL) + hWndParent = GetDesktopWindow(); + GetWindowRect(hWndParent, &rcParent); + GetWindowRect(hWnd, &rcWindow); -/* FUNCTIONS ****************************************************************/ + SetWindowPos(hWnd, + HWND_TOP, + ((rcParent.right - rcParent.left) - (rcWindow.right - rcWindow.left)) / 2, + ((rcParent.bottom - rcParent.top) - (rcWindow.bottom - rcWindow.top)) / 2, + 0, + 0, + SWP_NOSIZE); +} + +static INT_PTR CALLBACK +StartDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + /* Hide and disable the 'Cancel' button at the moment, + * later we use this button to cancel the setup process + * like F3 in usetup + */ + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow (hwndControl, SW_HIDE); + EnableWindow (hwndControl, FALSE); + } + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: // Only "Finish" for closing the App + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + break; + default: + break; + } + break; + default: + break; + } + + } + return FALSE; +} int WINAPI WinMain(HINSTANCE hInst, @@ -46,26 +112,38 @@ LPSTR lpszCmdLine, int nCmdShow) { - hInstance = hInst; + PROPSHEETHEADER psh; + HPROPSHEETPAGE ahpsp[1]; + PROPSHEETPAGE psp = {0}; + UINT nPages = 0; - if (!LoadString(hInstance, - IDS_CAPTION, - szCaption, - (sizeof szCaption / sizeof szCaption[0]))) - return 0; + /* Create the Start page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = StartDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_STARTPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); - if (!LoadString(hInstance, - IDS_TEXT, - szText, - (sizeof szText / sizeof szText[0]))) - return 0; + // Here we can add the next pages and switch on later - MessageBox(NULL, - szText, - szCaption, - MB_OK | MB_ICONINFORMATION); + /* Create the property sheet */ + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; + psh.hInstance = hInst; + psh.hwndParent = NULL; + psh.nPages = nPages; + psh.nStartPage = 0; + psh.phpage = ahpsp; + psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); + psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); + + /* Display the wizard */ + PropertySheet(&psh); return 0; + } /* EOF */ Modified: trunk/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -8,6 +8,7 @@ <library>kernel32</library> <library>gdi32</library> <library>user32</library> + <library>comctl32</library> <file>reactos.c</file> <file>reactos.rc</file> </module> Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -14,6 +14,9 @@ /* Icons */ IDI_MAIN ICON "res/reactos.ico" +/* Bitmaps */ +IDB_WATERMARK BITMAP "res/watermark.bmp" +IDB_HEADER BITMAP "res/header.bmp" /* Language-specific resources */ #include "rsrc.rc" Added: trunk/reactos/base/setup/reactos/res/header.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/hea… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/setup/reactos/res/header.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/setup/reactos/res/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/wat… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/setup/reactos/res/watermark.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -1,5 +1,15 @@ -#define IDS_CAPTION 1000 -#define IDS_TEXT 1001 +#ifndef RESOURCE_H +#define RESOURCE_H + +#define IDB_WATERMARK 100 +#define IDB_HEADER 101 + +#define IDC_STATIC -1 + +#define IDD_STARTPAGE 2000 +#define IDC_STARTTITLE 2001 #define IDI_MAIN 3000 + +#endif Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -2,12 +2,12 @@ #include "resource.h" /* Language-specific resources */ -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" +/*#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc"*/ #include "lang/de-DE.rc" -#include "lang/el-GR.rc" +//#include "lang/el-GR.rc" #include "lang/en-US.rc" -#include "lang/es-ES.rc" +/*#include "lang/es-ES.rc" #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" @@ -24,4 +24,4 @@ #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" -#include "lang/zh-CN.rc" +#include "lang/zh-CN.rc"*/

1 0

[cfinck] 34306: - Get our Win32 version of ccache to compile warning-free under MSVC (tested with 2008 at /W4) and GCC (tested with RosBE-Windows 1.2 at -Wall -pedantic) - Fix the MSVC project file - Add a Makefile for compiling with mingw32-gcc
by cfinck＠svn.reactos.org 05 Jul '08

05 Jul '08

Author: cfinck Date: Sat Jul 5 09:37:46 2008 New Revision: 34306 URL: http://svn.reactos.org/svn/reactos?rev=34306&view=rev Log: - Get our Win32 version of ccache to compile warning-free under MSVC (tested with 2008 at /W4) and GCC (tested with RosBE-Windows 1.2 at -Wall -pedantic) - Fix the MSVC project file - Add a Makefile for compiling with mingw32-gcc Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/Makefile Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ (props changed) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/snprintf.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 09:37:46 2008 @@ -1,0 +1,7 @@ +*.exe +*.user +*.ncb +*.suo +*.sln +Debug +Release Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/Makefile (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/Makefile [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -1,0 +1,24 @@ +# mingw32 makefile for ccache + +TARGET := ccache.exe + +.PHONY: all + +all: $(TARGET) + +CC=gcc +CFLAGS := -Wall -pedantic -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0400 -O2 +LFLAGS := -s +SRCS := args.c ccache.c cleanup.c execute.c getopt.c hash.c mdfour.c snprintf.c stats.c unify.c util.c win32-dirent.c +OBJS := $(SRCS:.c=.o) + +$(TARGET): $(OBJS) + $(CC) $(LFLAGS) -o $@ $(OBJS) + +.c.o: $< + $(CC) $(CFLAGS) -c $< -o $@ + +.PHONY: clean +clean: + -@del $(TARGET) + -@del $(OBJS) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -17,7 +17,7 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="." + OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" @@ -45,8 +45,8 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" + WarningLevel="4" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -84,15 +84,12 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="C:\RosBE\4.1.3\bin" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" @@ -115,11 +112,11 @@ /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" + WarningLevel="4" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -157,9 +154,6 @@ /> <Tool Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" @@ -203,10 +197,6 @@ > </File> <File - RelativePath=".\mkstemps.c" - > - </File> - <File RelativePath=".\snprintf.c" > </File> @@ -253,12 +243,6 @@ > </File> </Filter> - <Filter - Name="Ressourcendateien" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> </Files> <Globals> </Globals> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -126,7 +126,7 @@ { char *e; #ifdef _WIN32 - STARTUPINFO si; + STARTUPINFOA si; PROCESS_INFORMATION pi; char* merged = build_command(orig_args->argv); #endif @@ -150,7 +150,7 @@ /* strip any local args */ args_strip(orig_args, "--ccache-"); - if ((e=getenv("CCACHE_PREFIX"))) { + if ((e=getenv("CCACHE_PREFIX")) != NULL) { char *p = find_executable(e, MYNAME); if (!p) { perror(e); @@ -160,10 +160,10 @@ } #ifdef _WIN32 - ZeroMemory(&si, sizeof(STARTUPINFO)); + ZeroMemory(&si, sizeof(STARTUPINFOA)); ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); - si.cb = sizeof(STARTUPINFO); + si.cb = sizeof(STARTUPINFOA); if(!CreateProcessA(orig_args->argv[0], merged, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { @@ -334,7 +334,7 @@ char *input_base; char *tmp; - if ((s = getenv("CCACHE_NLEVELS"))) { + if ((s = getenv("CCACHE_NLEVELS")) != NULL) { nlevels = atoi(s); if (nlevels < 1) nlevels = 1; if (nlevels > 8) nlevels = 8; @@ -646,7 +646,7 @@ } /* support user override of the compiler */ - if ((path=getenv("CCACHE_CC"))) { + if ((path=getenv("CCACHE_CC")) != NULL) { base = strdup(path); } @@ -874,7 +874,7 @@ if (!output_file) { char *p; output_file = x_strdup(input_file); - if ((p = strrchr(output_file, PATH_SEP_CHAR))) { + if ((p = strrchr(output_file, PATH_SEP_CHAR)) != NULL) { output_file = p+1; } p = strrchr(output_file, '.'); @@ -894,7 +894,7 @@ failed(); } - if ((e=getenv("CCACHE_PREFIX"))) { + if ((e=getenv("CCACHE_PREFIX")) != NULL) { char *p = find_executable(e, MYNAME); if (!p) { perror(e); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -44,7 +44,11 @@ #define link(filename, linkname) CreateHardLinkA(linkname, filename, NULL) #define PROT_READ 0x0001 #define MAP_PRIVATE 0x02 - typedef int mode_t; + + #ifdef _MSC_VER + typedef unsigned int mode_t; + #endif + #ifndef S_ISREG #define S_ISREG(m) ((m & _S_IFREG) == _S_IFREG) #endif @@ -62,7 +66,10 @@ #define PATH_SEP USUAL_PATH_SEP #define PATH_SEP_CHAR USUAL_PATH_SEP_CHAR #define DEV_NULL "/dev/null" -#endif + + char *x_realpath(const char *path); +#endif + #include <fcntl.h> #include <time.h> #include <string.h> @@ -142,7 +149,6 @@ int lock_fd(int fd); size_t file_size(struct stat *st); int safe_open(const char *fname); -char *x_realpath(const char *path); char *gnu_getcwd(void); int create_empty_file(const char *fname); const char *get_home_directory(void); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -1,4 +1,3 @@ - #define HAVE_STRING_H #define HAVE_STDLIB_H -#define HAVE_CTYPE_H +#define HAVE_CTYPE_H Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -92,7 +92,7 @@ _close(fd); /* Spawn process (_exec* familly doesn't return) */ - status = _spawnv(_P_WAIT, argv[0], argv); + status = _spawnv(_P_WAIT, argv[0], (const char* const*)argv); out: cc_log("%s:\n stdout -> %s\n stderr -> %s\n process status=%i\n", @@ -115,7 +115,13 @@ */ char is_exec_file(const char *fname, const char *exclude_name) { - struct stat st1, st2; + struct stat st2; + +#ifdef _WIN32 + UNREFERENCED_PARAMETER(exclude_name); +#else + struct stat st1; +#endif if (access(fname, 0) == 0 && #ifndef _WIN32 /* Symlinks not used under windows */ Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -74,7 +74,7 @@ } } /* option letter okay? */ if ((optopt = (int)*place++) == (int)':' || - !(oli = strchr(ostr, optopt))) { + (oli = strchr(ostr, optopt)) == NULL) { /* * if the user didn't specify '-' as an option, * assume it means EOF. @@ -84,7 +84,7 @@ if (!*place) ++optind; if (opterr) { - if (!(p = strrchr(*nargv, '/'))) + if ((p = strrchr(*nargv, '/')) == NULL) p = *nargv; else ++p; @@ -103,7 +103,7 @@ optarg = place; else if (nargc <= ++optind) { /* no arg */ place = EMSG; - if (!(p = strrchr(*nargv, '/'))) + if ((p = strrchr(*nargv, '/')) == NULL) p = *nargv; else ++p; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/snprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/snprintf.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/snprintf.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -329,7 +329,7 @@ fvalue = va_arg (args, double); break; case 'c': - dopr_outch (buffer, &currlen, maxlen, va_arg (args, int)); + dopr_outch (buffer, &currlen, maxlen, (char)va_arg (args, int)); break; case 's': strvalue = va_arg (args, char *); @@ -348,7 +348,7 @@ if (cflags == DP_C_SHORT) { short int *num; num = va_arg (args, short int *); - *num = currlen; + *num = (short)currlen; } else if (cflags == DP_C_LONG) { long int *num; num = va_arg (args, long int *); @@ -437,7 +437,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base, int min, int max, int flags) { - int signvalue = 0; + char signvalue = 0; unsigned long uvalue; char convert[20]; int place = 0; @@ -496,7 +496,7 @@ } /* Sign */ - if (signvalue) + if (signvalue) dopr_outch (buffer, currlen, maxlen, signvalue); /* Zeros */ @@ -556,7 +556,7 @@ static double my_modf(double x0, double *iptr) { int i; - long l; + long l = 0; double x = x0; double f = 1.0; @@ -590,7 +590,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen, LDOUBLE fvalue, int min, int max, int flags) { - int signvalue = 0; + char signvalue = 0; double ufvalue; char iconvert[311]; char fconvert[311]; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -21,10 +21,7 @@ static FILE *logfile; #ifdef _WIN32 -int fchmod(int fildes, mode_t mode) -{ - return 0; -} +#define fchmod(a, b) #endif #ifndef HAVE_MKSTEMP @@ -255,7 +252,7 @@ d = opendir(dir); if (!d) return; - while ((de = readdir(d))) { + while ((de = readdir(d)) != 0) { char *fname; struct stat st; @@ -450,7 +447,7 @@ { unsigned size = 128; - while (1) { + for(;;) { char *buffer = (char *)x_malloc(size); if (_getcwd(buffer, size) == buffer) { return buffer; @@ -486,7 +483,7 @@ #ifdef _WIN32 static char szPath[MAX_PATH]; - // "Documents and Settings\user\Application Data" is CSIDL_APPDATA + /* "Documents and Settings\user\Application Data" is CSIDL_APPDATA */ if(SHGetSpecialFolderPathA(NULL, szPath, CSIDL_PROFILE, FALSE)) { return szPath; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -73,7 +73,7 @@ entry.d_off = dir->filepos; strncpy (entry.d_name, find->cFileName, sizeof (entry.d_name)); - entry.d_reclen = strlen (find->cFileName); + entry.d_reclen = (unsigned short)strlen (find->cFileName); dir->filepos++; return &entry; }

1 0

[pschweitzer] 34305: Finally reverted most of r34036: it only created problems...
by pschweitzer＠svn.reactos.org 05 Jul '08

05 Jul '08

Author: pschweitzer Date: Sat Jul 5 08:40:17 2008 New Revision: 34305 URL: http://svn.reactos.org/svn/reactos?rev=34305&view=rev Log: Finally reverted most of r34036: it only created problems... Modified: branches/pierre-fsd/drivers/filesystems/ntfs/fcb.c branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h Modified: branches/pierre-fsd/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sat Jul 5 08:40:17 2008 @@ -68,20 +68,15 @@ PNTFS_FCB -NtfsCreateFCB(PCWSTR FileName, PNTFS_VCB Vcb) +NtfsCreateFCB(PCWSTR FileName) { PNTFS_FCB Fcb; - - ASSERT(Vcb); - ASSERT(Vcb->Identifier.Type == NTFS_TYPE_VCB); Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_FCB), TAG_FCB); RtlZeroMemory(Fcb, sizeof(NTFS_FCB)); Fcb->Identifier.Type = NTFS_TYPE_FCB; Fcb->Identifier.Size = sizeof(NTFS_TYPE_FCB); - - Fcb->Vcb = Vcb; if (FileName) { @@ -99,10 +94,6 @@ ExInitializeResourceLite(&Fcb->MainResource); Fcb->RFCB.Resource = &(Fcb->MainResource); -#if 0 - ExInterlockedInsertTailList(&(Vcb->FcbListHead), &(Fcb->FcbListEntry), &(Vcb->FcbListLock)); -#endif - return(Fcb); } @@ -110,20 +101,16 @@ VOID NtfsDestroyFCB(PNTFS_FCB Fcb) { -#if 0 KIRQL oldIrql; -#endif ASSERT(Fcb); ASSERT(Fcb->Identifier.Type == NTFS_TYPE_FCB); ExDeleteResourceLite(&Fcb->MainResource); -#if 0 KeAcquireSpinLock(&(Fcb->Vcb->FcbListLock), &oldIrql); RemoveEntryList(&(Fcb->FcbListEntry)); KeReleaseSpinLock(&(Fcb->Vcb->FcbListLock), oldIrql); -#endif ExFreePool(Fcb); } @@ -189,12 +176,8 @@ NtfsAddFCBToTable(PNTFS_VCB Vcb, PNTFS_FCB Fcb) { - KIRQL oldIrql; - - KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); Fcb->Vcb = Vcb; - InsertTailList(&Vcb->FcbListHead, &Fcb->FcbListEntry); - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); + ExInterlockedInsertTailList(&(Vcb->FcbListHead), &(Fcb->FcbListEntry), &(Vcb->FcbListLock)); } @@ -286,7 +269,7 @@ { PNTFS_FCB Fcb; - Fcb = NtfsCreateFCB(L"\\", Vcb); + Fcb = NtfsCreateFCB(L"\\"); // memset(Fcb->entry.Filename, ' ', 11); Modified: branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sat Jul 5 08:40:17 2008 @@ -381,8 +381,9 @@ Vcb->StorageDevice); InitializeListHead(&Vcb->FcbListHead); - - Fcb = NtfsCreateFCB(NULL, Vcb); + KeInitializeSpinLock(&Vcb->FcbListLock); + + Fcb = NtfsCreateFCB(NULL); if (Fcb == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -447,8 +448,6 @@ Vcb->MftBuffer = MftRecord; ExInitializeResourceLite(&Vcb->DirResource); - - KeInitializeSpinLock(&Vcb->FcbListLock); ExAcquireResourceExclusiveLite(&NtfsGlobalData->VolumeListLock, TRUE); InsertHeadList(&NtfsGlobalData->VolumeListHead, &Vcb->VolumeListEntry); Modified: branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat Jul 5 08:40:17 2008 @@ -434,7 +434,7 @@ /* fcb.c */ PNTFS_FCB -NtfsCreateFCB(PCWSTR FileName, PNTFS_VCB Vcb); +NtfsCreateFCB(PCWSTR FileName); VOID NtfsDestroyFCB(PNTFS_FCB Fcb);

1 0

[silverblade] 34304: Rename MME entrypoint files to avoid Windows issues with the aux.c file name. Now it is called auxMessage.c - the other files have been renamed accordingly.
by silverblade＠svn.reactos.org 05 Jul '08

05 Jul '08

Author: silverblade Date: Sat Jul 5 07:42:48 2008 New Revision: 34304 URL: http://svn.reactos.org/svn/reactos?rev=34304&view=rev Log: Rename MME entrypoint files to avoid Windows issues with the aux.c file name. Now it is called auxMessage.c - the other files have been renamed accordingly. Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/DriverProc.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/auxMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/midMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/modMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxdMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/widMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wodMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c (removed) @@ -1,31 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - Auxiliary device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> - -APIENTRY DWORD -auxMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("auxMessageStub called\n"); - /* TODO */ - return MMSYSERR_NOTSUPPORTED; -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c (removed) @@ -1,77 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - Default DriverProc implementation - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmddk.h> -#include <ntddsnd.h> -#include <debug.h> - -LONG -DefaultDriverProc( - DWORD driver_id, - HANDLE driver_handle, - UINT message, - LONG parameter1, - LONG parameter2) -{ - switch ( message ) - { - case DRV_LOAD : - DPRINT("DRV_LOAD\n"); - return 1L; - - case DRV_FREE : - DPRINT("DRV_FREE\n"); - return 1L; - - case DRV_OPEN : - DPRINT("DRV_OPEN\n"); - return 1L; - - case DRV_CLOSE : - DPRINT("DRV_CLOSE\n"); - return 1L; - - case DRV_ENABLE : - DPRINT("DRV_ENABLE\n"); - return 1L; - - case DRV_DISABLE : - DPRINT("DRV_DISABLE\n"); - return 1L; - - /* - We don't provide configuration capabilities. This used to be - for things like I/O port, IRQ, DMA settings, etc. - */ - - case DRV_QUERYCONFIGURE : - DPRINT("DRV_QUERYCONFIGURE\n"); - return 0L; - - case DRV_CONFIGURE : - DPRINT("DRV_CONFIGURE\n"); - return 0L; - - case DRV_INSTALL : - DPRINT("DRV_INSTALL\n"); - return DRVCNF_RESTART; - }; - - return DefDriverProc(driver_id, - driver_handle, - message, - parameter1, - parameter2); -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c (removed) @@ -1,49 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - MIDI Input device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> - -APIENTRY DWORD -midMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("midMessageStub called\n"); - - switch ( message ) - { - case MIDM_GETNUMDEVS : - return 0; - - case MIDM_GETDEVCAPS : - case MIDM_OPEN : - return MMSYSERR_BADDEVICEID; - - case MIDM_CLOSE : - case MIDM_ADDBUFFER : - case MIDM_START : - case MIDM_STOP : - case MIDM_RESET : - return MMSYSERR_INVALHANDLE; - - default : - return MMSYSERR_NOTSUPPORTED; - } -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c (removed) @@ -1,48 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - MIDI Output device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> - -APIENTRY DWORD -modMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("modMessageStub called\n"); - - switch ( message ) - { - case MODM_GETNUMDEVS : - return 0; - - case MODM_GETDEVCAPS : - case MODM_OPEN : - return MMSYSERR_BADDEVICEID; - - case MODM_CLOSE : - case MODM_DATA : - case MODM_LONGDATA : - case MODM_RESET : - return MMSYSERR_INVALHANDLE; - - default : - return MMSYSERR_NOTSUPPORTED; - } -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c (removed) @@ -1,31 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - Mixer device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> - -APIENTRY DWORD -mxdMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("mxdMessageStub called\n"); - /* TODO */ - return MMSYSERR_NOTSUPPORTED; -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c (removed) @@ -1,50 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - Wave input device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> -#include <ntddsnd.h> - -#include <mmebuddy.h> - -APIENTRY DWORD -widMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("widMessageStub called\n"); - - switch ( message ) - { - case WIDM_GETNUMDEVS : - return GetSoundDeviceCount(WAVE_IN_DEVICE_TYPE); - - case WIDM_GETDEVCAPS : - case WIDM_OPEN : - return MMSYSERR_BADDEVICEID; - - case WIDM_CLOSE : - case WIDM_START : - case WIDM_RESET : - return MMSYSERR_INVALHANDLE; - - default : - return MMSYSERR_NOTSUPPORTED; - } -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c (removed) @@ -1,81 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - Wave output device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> - -#include <ntddsnd.h> -#include <mmebuddy.h> - -APIENTRY DWORD -wodMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - MMRESULT Result = MMSYSERR_NOERROR; - PSOUND_DEVICE Device = NULL; - DPRINT("wodMessageStub called\n"); - - switch ( message ) - { - case WODM_GETNUMDEVS : - return GetSoundDeviceCount(WAVE_OUT_DEVICE_TYPE); - - case WODM_GETDEVCAPS : - { - UNIVERSAL_CAPS Capabilities; - - Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, device_id, &Device); - if ( Result != MMSYSERR_NOERROR ) - return Result; - - Result = GetSoundDeviceCapabilities(Device, &Capabilities); - if ( Result != MMSYSERR_NOERROR ) - return Result; - - CopyMemory((LPWAVEOUTCAPS)parameter1, &Capabilities.WaveOut, parameter2); - - return Result; - } - - case WODM_OPEN : - /* - OpenSoundDevice(); - */ - return MMSYSERR_BADDEVICEID; - - case WODM_CLOSE : - /* CloseSoundDevice() */ - - case WODM_WRITE : - case WODM_PAUSE : - case WODM_RESTART : - case WODM_RESET : - case WODM_BREAKLOOP : - return MMSYSERR_INVALHANDLE; - - /* Let WINMM take care of these */ - case WODM_PREPARE : - case WODM_UNPREPARE : - return MMSYSERR_NOTSUPPORTED; - - default : - return MMSYSERR_NOTSUPPORTED; - } -} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] Sat Jul 5 07:42:48 2008 @@ -10,13 +10,13 @@ <file>thread.c</file> <file>testing.c</file> <directory name="mme"> - <file>entry.c</file> - <file>wod.c</file> - <file>wid.c</file> - <file>mod.c</file> - <file>mid.c</file> - <file>mxd.c</file> - <file>aux.c</file> + <file>DriverProc.c</file> + <file>wodMessage.c</file> + <file>widMessage.c</file> + <file>modMessage.c</file> + <file>midMessage.c</file> + <file>mxdMessage.c</file> + <file>auxMessage.c</file> </directory> <directory name="wave"> <file>wavethread.c</file>

1 0

[fireball] 34303: - Start rosapps rearrange and cleanup process.
by fireball＠svn.reactos.org 05 Jul '08

05 Jul '08

Author: fireball Date: Sat Jul 5 06:46:22 2008 New Revision: 34303 URL: http://svn.reactos.org/svn/reactos?rev=34303&view=rev Log: - Start rosapps rearrange and cleanup process. Added: trunk/rosapps/applications/cmdutils/ (props changed) - copied from r34291, trunk/rosapps/cmdutils/ trunk/rosapps/applications/devutils/ (props changed) - copied from r34291, trunk/rosapps/devutils/ trunk/rosapps/applications/downloader/ (props changed) - copied from r34291, trunk/rosapps/downloader/ trunk/rosapps/applications/fontview/ (props changed) - copied from r34291, trunk/rosapps/fontview/ trunk/rosapps/applications/fraginator/ (props changed) - copied from r34291, trunk/rosapps/fraginator/ trunk/rosapps/applications/gettype/ (props changed) - copied from r34291, trunk/rosapps/gettype/ trunk/rosapps/applications/imagesoft/ (props changed) - copied from r34291, trunk/rosapps/imagesoft/ trunk/rosapps/applications/logevent/ (props changed) - copied from r34291, trunk/rosapps/logevent/ trunk/rosapps/applications/magnify/ (props changed) - copied from r34291, trunk/rosapps/magnify/ trunk/rosapps/applications/mc/ (props changed) - copied from r34291, trunk/rosapps/mc/ trunk/rosapps/applications/net/ (props changed) - copied from r34291, trunk/rosapps/net/ trunk/rosapps/applications/notevil/ (props changed) - copied from r34291, trunk/rosapps/notevil/ trunk/rosapps/applications/old_wordpad/ (props changed) - copied from r34291, trunk/rosapps/old_wordpad/ trunk/rosapps/applications/packmgr/ (props changed) - copied from r34291, trunk/rosapps/packmgr/ trunk/rosapps/applications/roshttpd/ (props changed) - copied from r34291, trunk/rosapps/roshttpd/ trunk/rosapps/applications/screenshot/ (props changed) - copied from r34291, trunk/rosapps/screenshot/ trunk/rosapps/applications/sysutils/ (props changed) - copied from r34291, trunk/rosapps/sysutils/ trunk/rosapps/applications/winfile/ (props changed) - copied from r34291, trunk/rosapps/winfile/ trunk/rosapps/applications/winver/ (props changed) - copied from r34291, trunk/rosapps/winver/ trunk/rosapps/applications/write/ (props changed) - copied from r34291, trunk/rosapps/write/ Removed: trunk/rosapps/cmdutils/ trunk/rosapps/devutils/ trunk/rosapps/downloader/ trunk/rosapps/fontview/ trunk/rosapps/fraginator/ trunk/rosapps/gettype/ trunk/rosapps/imagesoft/ trunk/rosapps/logevent/ trunk/rosapps/magnify/ trunk/rosapps/mc/ trunk/rosapps/net/ trunk/rosapps/notevil/ trunk/rosapps/old_wordpad/ trunk/rosapps/packmgr/ trunk/rosapps/roshttpd/ trunk/rosapps/screenshot/ trunk/rosapps/sysutils/ trunk/rosapps/winfile/ trunk/rosapps/winver/ trunk/rosapps/write/ Modified: trunk/rosapps/applications/applications.rbuild trunk/rosapps/applications/mc/mkinstalldirs trunk/rosapps/applications/notevil/readme.txt trunk/rosapps/applications/sysutils/regexpl/README trunk/rosapps/directory.rbuild Modified: trunk/rosapps/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.… ============================================================================== --- trunk/rosapps/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/applications.rbuild [iso-8859-1] Sat Jul 5 06:46:22 2008 @@ -4,4 +4,82 @@ <directory name="screensavers"> <xi:include href="screensavers/screensavers.rbuild" /> </directory> + + <directory name="cmdutils"> + <xi:include href="cmdutils/cmdutils.rbuild" /> + </directory> + + <directory name="devutils"> + <xi:include href="devutils/directory.rbuild" /> + </directory> + + <directory name="downloader"> + <xi:include href="downloader/downloader.rbuild" /> + </directory> + + <directory name="fontview"> + <xi:include href="fontview/fontview.rbuild" /> + </directory> + + <directory name="gettype"> + <xi:include href="gettype/gettype.rbuild" /> + </directory> + + <directory name="imagesoft"> + <xi:include href="imagesoft/imagesoft.rbuild" /> + </directory> + + <directory name="logevent"> + <xi:include href="logevent/logevent.rbuild" /> + </directory> + + <directory name="magnify"> + <xi:include href="magnify/magnify.rbuild" /> + </directory> + + <directory name="mc"> + <xi:include href="mc/mc.rbuild" /> + </directory> + + <directory name="net"> + <xi:include href="net/directory.rbuild" /> + </directory> + + <directory name="notevil"> + <xi:include href="notevil/notevil.rbuild" /> + </directory> + +  + + <directory name="roshttpd"> + <xi:include href="roshttpd/roshttpd.rbuild" /> + </directory> + + <directory name="screenshot"> + <xi:include href="screenshot/screenshot.rbuild" /> + </directory> + + <directory name="sysutils"> + <xi:include href="sysutils/sysutils.rbuild" /> + </directory> + + <directory name="winfile"> + <xi:include href="winfile/winfile.rbuild" /> + </directory> + + <directory name="winver"> + <xi:include href="winver/winver.rbuild" /> + </directory> + + <directory name="write"> + <xi:include href="write/write.rbuild" /> + </directory> </group> Propchange: trunk/rosapps/applications/cmdutils/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/cmdutils/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/devutils/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/devutils/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/downloader/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/downloader/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/fontview/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/fontview/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/fraginator/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/fraginator/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/gettype/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/gettype/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/imagesoft/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/imagesoft/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/logevent/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/logevent/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/magnify/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/magnify/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/mc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/mc/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/applications/mc/mkinstalldirs URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/mc/mkinstalld… ============================================================================== --- trunk/rosapps/applications/mc/mkinstalldirs [iso-8859-1] (original) +++ trunk/rosapps/applications/mc/mkinstalldirs [iso-8859-1] Sat Jul 5 06:46:22 2008 @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 2001/12/30 09:49:36 sedwards Exp $ +# $Id$ errstatus=0 Propchange: trunk/rosapps/applications/net/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/net/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/notevil/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/notevil/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/applications/notevil/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/notevil/readm… ============================================================================== --- trunk/rosapps/applications/notevil/readme.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/notevil/readme.txt [iso-8859-1] Sat Jul 5 06:46:22 2008 @@ -1,4 +1,4 @@ -$Id: readme.txt,v 1.1 1999/05/15 07:23:34 ea Exp $ +$Id$ ReactOS Coders Console Parade ----------------------------- Propchange: trunk/rosapps/applications/old_wordpad/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/old_wordpad/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/packmgr/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/packmgr/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/roshttpd/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/roshttpd/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/screenshot/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/screenshot/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/sysutils/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/sysutils/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/applications/sysutils/regexpl/README URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/README [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/README [iso-8859-1] Sat Jul 5 06:46:22 2008 @@ -1,5 +1,5 @@ -*- Mode: Text -*- -$Id: README,v 1.1 2003/02/09 02:13:27 narnaoud Exp $ +$Id$ Registry Explorer is console mode tool for reading/writing ReactOS registry. Currently, access is provided only by means of interactive Propchange: trunk/rosapps/applications/winfile/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/winfile/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/winver/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/winver/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/write/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/write/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=34303… ============================================================================== --- trunk/rosapps/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/directory.rbuild [iso-8859-1] Sat Jul 5 06:46:22 2008 @@ -5,101 +5,23 @@ <xi:include href="applications/applications.rbuild" /> </directory> - <directory name="cmdutils"> - <xi:include href="cmdutils/cmdutils.rbuild" /> - </directory> - <directory name="demos"> <xi:include href="demos/directory.rbuild" /> - </directory> - - <directory name="devutils"> - <xi:include href="devutils/directory.rbuild" /> </directory> <directory name="dflat32"> <xi:include href="dflat32/dflat32.rbuild" /> </directory> - <directory name="downloader"> - <xi:include href="downloader/downloader.rbuild" /> - </directory> - <directory name="drivers"> <xi:include href="drivers/directory.rbuild" /> </directory> - <directory name="fontview"> - <xi:include href="fontview/fontview.rbuild" /> - </directory> - - <directory name="gettype"> - <xi:include href="gettype/gettype.rbuild" /> - </directory> - - <directory name="imagesoft"> - <xi:include href="imagesoft/imagesoft.rbuild" /> - </directory> - <directory name="lib"> <xi:include href="lib/directory.rbuild" /> - </directory> - - <directory name="logevent"> - <xi:include href="logevent/logevent.rbuild" /> - </directory> - - <directory name="magnify"> - <xi:include href="magnify/magnify.rbuild" /> - </directory> - - <directory name="mc"> - <xi:include href="mc/mc.rbuild" /> - </directory> - - <directory name="net"> - <xi:include href="net/directory.rbuild" /> - </directory> - - <directory name="notevil"> - <xi:include href="notevil/notevil.rbuild" /> - </directory> - -  - - <directory name="roshttpd"> - <xi:include href="roshttpd/roshttpd.rbuild" /> - </directory> - - <directory name="screenshot"> - <xi:include href="screenshot/screenshot.rbuild" /> - </directory> - - <directory name="sysutils"> - <xi:include href="sysutils/sysutils.rbuild" /> </directory> <directory name="templates"> <xi:include href="templates/directory.rbuild" /> </directory> - - <directory name="winfile"> - <xi:include href="winfile/winfile.rbuild" /> - </directory> - - <directory name="winver"> - <xi:include href="winver/winver.rbuild" /> - </directory> - - <directory name="write"> - <xi:include href="write/write.rbuild" /> - </directory> </group>

1 0

[fireball] 34302: - Rearrange reactos.dff according to rosapps rearrange.
by fireball＠svn.reactos.org 05 Jul '08

05 Jul '08

Author: fireball Date: Sat Jul 5 06:45:32 2008 New Revision: 34302 URL: http://svn.reactos.org/svn/reactos?rev=34302&view=rev Log: - Rearrange reactos.dff according to rosapps rearrange. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jul 5 06:45:32 2008 @@ -565,70 +565,70 @@ modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional modules\rosapps\applications\screensavers\butterflies\butterflies.scr 1 optional -modules\rosapps\cmdutils\comp\comp.exe 1 optional -modules\rosapps\cmdutils\mode\mode.exe 1 optional -modules\rosapps\cmdutils\sort\sort.exe 1 optional -modules\rosapps\cmdutils\tee\tee.exe 1 optional -modules\rosapps\cmdutils\touch\touch.exe 1 optional -modules\rosapps\cmdutils\uptime\uptime.exe 1 optional -modules\rosapps\cmdutils\y\y.exe 1 optional +modules\rosapps\applications\cmdutils\comp\comp.exe 1 optional +modules\rosapps\applications\cmdutils\mode\mode.exe 1 optional +modules\rosapps\applications\cmdutils\sort\sort.exe 1 optional +modules\rosapps\applications\cmdutils\tee\tee.exe 1 optional +modules\rosapps\applications\cmdutils\touch\touch.exe 1 optional +modules\rosapps\applications\cmdutils\uptime\uptime.exe 1 optional +modules\rosapps\applications\cmdutils\y\y.exe 1 optional +modules\rosapps\applications\devutils\cputointel\cputointel.exe 1 optional +modules\rosapps\applications\devutils\gdb2\gdb2.exe 1 optional +modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional +modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional +modules\rosapps\applications\devutils\roswebparser\roswebparser.exe 1 optional +modules\rosapps\applications\devutils\zoomin\zoomin.exe 1 optional +modules\rosapps\applications\downloader\downloader.exe 1 optional +modules\rosapps\applications\downloader\downloader.xml 1 optional +modules\rosapps\applications\fontview\fontview.exe 1 optional +modules\rosapps\applications\gettype\gettype.exe 1 optional +modules\rosapps\applications\imagesoft\imagesoft.exe 1 optional +modules\rosapps\applications\mc\mc.exe 1 optional +modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional +modules\rosapps\applications\net\netreg\netreg.exe 1 optional +modules\rosapps\applications\net\niclist\niclist.exe 1 optional +modules\rosapps\applications\notevil\notevil.exe 1 optional +modules\rosapps\applications\magnify\magnify.exe 1 optional +modules\rosapps\applications\packmgr\cmd-line\rosget.exe 1 optional +modules\rosapps\applications\packmgr\gui\packmgr.exe 1 optional +modules\rosapps\applications\packmgr\lib\package.dll 1 optional +modules\rosapps\applications\roshttpd\roshttpd.exe 1 optional +modules\rosapps\applications\screenshot\screenshot.exe 1 optional +modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional +modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional +modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional +modules\rosapps\applications\sysutils\ctm\ctm.exe 1 optional +modules\rosapps\applications\sysutils\kill\kill.exe 1 optional +modules\rosapps\applications\sysutils\lsdd\lsdd.exe 1 optional +modules\rosapps\applications\sysutils\man\man.exe 1 optional +modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional +modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional +modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional +modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional +modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional +modules\rosapps\applications\sysutils\utils\cat\cat.exe 1 optional +modules\rosapps\applications\sysutils\utils\driver\load\load.exe 1 optional +modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe 1 optional +modules\rosapps\applications\sysutils\utils\infinst\infinst.exe 1 optional +modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional +modules\rosapps\applications\sysutils\utils\objdir\objdir.exe 1 optional +modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe 1 optional +modules\rosapps\applications\sysutils\utils\ps\ps.exe 1 optional +modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe 1 optional +modules\rosapps\applications\sysutils\utils\stats\stats.exe 1 optional +modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe 1 optional +modules\rosapps\applications\winfile\winfile.exe 1 optional +modules\rosapps\applications\winver\winver.exe 1 optional +modules\rosapps\applications\write\write.exe 1 optional modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional modules\rosapps\demos\maze\maze.exe 1 optional -modules\rosapps\devutils\cputointel\cputointel.exe 1 optional -modules\rosapps\devutils\gdb2\gdb2.exe 1 optional -modules\rosapps\devutils\gdihv\gdihv.exe 1 optional -modules\rosapps\devutils\genguid\genguid.exe 1 optional -modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional -modules\rosapps\devutils\zoomin\zoomin.exe 1 optional modules\rosapps\dflat32\edit.exe 1 optional -modules\rosapps\downloader\downloader.exe 1 optional -modules\rosapps\downloader\downloader.xml 1 optional modules\rosapps\drivers\avtest\avtest.sys 1 optional modules\rosapps\drivers\ramdrv\ramdrv.sys 1 optional modules\rosapps\drivers\green\green.sys 1 optional -modules\rosapps\fontview\fontview.exe 1 optional -modules\rosapps\gettype\gettype.exe 1 optional -modules\rosapps\imagesoft\imagesoft.exe 1 optional modules\rosapps\lib\dflat32\dflat32.dll 1 optional -modules\rosapps\mc\mc.exe 1 optional -modules\rosapps\net\ncftp\ncftp.exe 1 optional -modules\rosapps\net\netreg\netreg.exe 1 optional -modules\rosapps\net\niclist\niclist.exe 1 optional -modules\rosapps\notevil\notevil.exe 1 optional -modules\rosapps\magnify\magnify.exe 1 optional -modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional -modules\rosapps\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\packmgr\lib\package.dll 1 optional -modules\rosapps\roshttpd\roshttpd.exe 1 optional -modules\rosapps\screenshot\screenshot.exe 1 optional -modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional -modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional -modules\rosapps\sysutils\chklib\chklib.exe 1 optional -modules\rosapps\sysutils\ctm\ctm.exe 1 optional -modules\rosapps\sysutils\kill\kill.exe 1 optional -modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional -modules\rosapps\sysutils\man\man.exe 1 optional -modules\rosapps\sysutils\pedump\pedump.exe 1 optional -modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional -modules\rosapps\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\sysutils\tlist\tlist.exe 1 optional -modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional -modules\rosapps\sysutils\utils\cat\cat.exe 1 optional -modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional -modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional -modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional -modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional -modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional -modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional -modules\rosapps\sysutils\utils\ps\ps.exe 1 optional -modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional -modules\rosapps\sysutils\utils\stats\stats.exe 1 optional -modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional modules\rosapps\templates\dialog.exe 1 optional modules\rosapps\templates\mdi.exe 1 optional -modules\rosapps\winfile\winfile.exe 1 optional -modules\rosapps\winver\winver.exe 1 optional -modules\rosapps\write\write.exe 1 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional

1 0

[fireball] 34301: Dmitry Gorbachev: - Fix DriverEntry name. See issue #2073 for more details.
by fireball＠svn.reactos.org 05 Jul '08

05 Jul '08

Author: fireball Date: Sat Jul 5 06:37:35 2008 New Revision: 34301 URL: http://svn.reactos.org/svn/reactos?rev=34301&view=rev Log: Dmitry Gorbachev: - Fix DriverEntry name. See issue #2073 for more details. Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild [iso-8859-1] Sat Jul 5 06:37:35 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="framebuf" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> +<module name="framebuf" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> <importlibrary definition="framebuf.def" /> <include base="framebuf">.</include> <library>win32k</library> Modified: trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild [iso-8859-1] Sat Jul 5 06:37:35 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="framebufacc" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> +<module name="framebufacc" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> <importlibrary definition="framebufacc.def" /> <include base="framebufacc">.</include> <library>win32k</library> Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild [iso-8859-1] Sat Jul 5 06:37:35 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="vgaddi" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="vgaddi.dll"> +<module name="vgaddi" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="vgaddi.dll"> <importlibrary definition="vgaddi.def" /> <include base="vgaddi">.</include> <library>ntoskrnl</library>

1 0

[cwittich] 34300: don't try to dereference NULL pointers now Avira AntiVir installs without crashing the whole system
by cwittich＠svn.reactos.org 05 Jul '08

05 Jul '08

Author: cwittich Date: Sat Jul 5 04:19:56 2008 New Revision: 34300 URL: http://svn.reactos.org/svn/reactos?rev=34300&view=rev Log: don't try to dereference NULL pointers now Avira AntiVir installs without crashing the whole system Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Jul 5 04:19:56 2008 @@ -1550,6 +1550,8 @@ MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); return 0; } + if (!Window->Wnd) + return 0; } /* FIXME: Check for an exiting window. */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Sat Jul 5 04:19:56 2008 @@ -899,6 +899,9 @@ RETURN(hMonitor); } + if (!Window->Wnd) + RETURN(hMonitor); + Rect.left = Rect.right = Window->Wnd->WindowRect.left; Rect.top = Rect.bottom = Window->Wnd->WindowRect.bottom;

1 0

[silverblade] 34299: mmdrv.dll reimplementation begins, with a majority of its functionality shifted into a support library ("mmebuddy") for future reuse with sndblst and likely the WDM audio system. Locating NT4 sound devices is possible by 2 methods (search devices belonging to specific service, and brute-force search). Some of the code is very hacky and for testing this compiles as an EXE. No doubt a few bugs are present, however at the moment I'm satisfied (by testing) that the code is doing
by silverblade＠svn.reactos.org 05 Jul '08

05 Jul '08

Author: silverblade Date: Fri Jul 4 21:43:17 2008 New Revision: 34299 URL: http://svn.reactos.org/svn/reactos?rev=34299&view=rev Log: mmdrv.dll reimplementation begins, with a majority of its functionality shifted into a support library ("mmebuddy") for future reuse with sndblst and likely the WDM audio system. Locating NT4 sound devices is possible by 2 methods (search devices belonging to specific service, and brute-force search). Some of the code is very hacky and for testing this compiles as an EXE. No doubt a few bugs are present, however at the moment I'm satisfied (by testing) that the code is doing what it is supposed to do. Added: branches/silverblade-audio/dll/win32/mmdrv/entry.c (with props) branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/testing.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c (with props) Modified: branches/silverblade-audio/dll/win32/mmdrv/mmdrv.def branches/silverblade-audio/dll/win32/mmdrv/mmdrv.rbuild branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c branches/silverblade-audio/include/ddk/ntddsnd.h branches/silverblade-audio/lib/drivers/sound/legacy/devname.c branches/silverblade-audio/lib/drivers/sound/sound.rbuild Added: branches/silverblade-audio/dll/win32/mmdrv/entry.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… ============================================================================== --- branches/silverblade-audio/dll/win32/mmdrv/entry.c (added) +++ branches/silverblade-audio/dll/win32/mmdrv/entry.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,45 @@ +/* + ReactOS Sound System + Default MME Driver + + Purpose: + MME driver entry-point + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmddk.h> +#include <mmebuddy.h> +#include <debug.h> + +APIENTRY LONG +DriverProc( + DWORD driver_id, + HANDLE driver_handle, + UINT message, + LONG parameter1, + LONG parameter2) +{ + switch ( message ) + { + case DRV_LOAD : + DPRINT("DRV_LOAD\n"); + return 1L; + + case DRV_FREE : + DPRINT("DRV_FREE\n"); + return 1L; + + default : + return DefaultDriverProc(driver_id, + driver_handle, + message, + parameter1, + parameter2); + } +} Propchange: branches/silverblade-audio/dll/win32/mmdrv/entry.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/dll/win32/mmdrv/mmdrv.def URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… ============================================================================== --- branches/silverblade-audio/dll/win32/mmdrv/mmdrv.def [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/mmdrv/mmdrv.def [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -11,4 +11,13 @@ ;wodMessage@20 ;midMessage@20 ;modMessage@20 +;mxdMessage@20 ;auxMessage@20 +; +; These entries are here for testing purposes only!!!! +; See testing.c +; +Test@0 +TestGetCaps@0 +TestDevEnum@0 +TestThreading@0 Modified: branches/silverblade-audio/dll/win32/mmdrv/mmdrv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… ============================================================================== --- branches/silverblade-audio/dll/win32/mmdrv/mmdrv.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/mmdrv/mmdrv.rbuild [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,9 +1,14 @@ -<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"> - <importlibrary definition="mmdrv.def" /> + +<module name="mmdrv" type="win32cui" installbase="system32" installname="mmdrv.exe" unicode="yes"> +  + <include base="ReactOS">include/reactos/libs/sound</include> <include base="mmdrv">.</include> - <define name="NDEBUG" /> +  + <library>mmebuddy</library> <library>ntdll</library> <library>kernel32</library> <library>user32</library> <library>winmm</library> + <library>advapi32</library> + <file>entry.c</file> </module> Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] (original) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -123,7 +123,7 @@ NTSTATUS result; DbgPrint("Creating sound device\n"); - result = CreateSoundDeviceWithDefaultName(DriverObject, 0, 69, 0, &g_device); + result = CreateSoundDeviceWithDefaultName(DriverObject, WAVE_OUT_DEVICE_TYPE, 0, 0, &g_device); DbgPrint("Request returned status 0x%08x\n", result); Modified: branches/silverblade-audio/include/ddk/ntddsnd.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/ddk/n… ============================================================================== --- branches/silverblade-audio/include/ddk/ntddsnd.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/ddk/ntddsnd.h [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -29,16 +29,24 @@ /* Device types - (not part of the original DDK header) -*/ - -#define WAVE_IN_DEVICE_TYPE 0 -#define WAVE_OUT_DEVICE_TYPE 1 -#define MIDI_IN_DEVICE_TYPE 2 -#define MIDI_OUT_DEVICE_TYPE 3 -#define MIXER_DEVICE_TYPE 4 + + Not part of the original DDK header, but based on the values stored in + registry by sndblst +*/ + +#define WAVE_IN_DEVICE_TYPE 1 +#define WAVE_OUT_DEVICE_TYPE 2 +#define MIDI_IN_DEVICE_TYPE 3 +#define MIDI_OUT_DEVICE_TYPE 4 #define AUX_DEVICE_TYPE 5 -#define MAX_DEVICE_TYPE AUX_DEVICE_TYPE +#define MIXER_DEVICE_TYPE 6 + +#define MIN_SOUND_DEVICE_TYPE WAVE_IN_DEVICE_TYPE +#define MAX_SOUND_DEVICE_TYPE MIXER_DEVICE_TYPE +#define SOUND_DEVICE_TYPES 6 + +#define VALID_SOUND_DEVICE_TYPE(x) \ + ( ( x >= MIN_SOUND_DEVICE_TYPE ) && ( x <= MAX_SOUND_DEVICE_TYPE ) ) /* @@ -53,35 +61,57 @@ #define SOUND_MAX_DEVICE_NAME 80 -#define DD_WAVE_IN_DEVICE_NAME "\\Device\\WaveIn" -#define DD_WAVE_IN_DEVICE_NAME_U L"\\Device\\WaveIn" -#define DD_WAVE_IN_DOS_DEVICE_NAME "\\DosDevices\\WaveIn" -#define DD_WAVE_IN_DOS_DEVICE_NAME_U L"\\DosDevices\\WaveIn" - -#define DD_WAVE_OUT_DEVICE_NAME "\\Device\\WaveOut" -#define DD_WAVE_OUT_DEVICE_NAME_U L"\\Device\\WaveOut" -#define DD_WAVE_OUT_DOS_DEVICE_NAME "\\DosDevices\\WaveOut" -#define DD_WAVE_OUT_DOS_DEVICE_NAME_U L"\\DosDevices\\WaveOut" - -#define DD_MIDI_IN_DEVICE_NAME "\\Device\\MidiIn" -#define DD_MIDI_IN_DEVICE_NAME_U L"\\Device\\MidiIn" -#define DD_MIDI_IN_DOS_DEVICE_NAME "\\DosDevices\\MidiIn" -#define DD_MIDI_IN_DOS_DEVICE_NAME_U L"\\DosDevices\\MidiIn" - -#define DD_MIDI_OUT_DEVICE_NAME "\\Device\\MidiOut" -#define DD_MIDI_OUT_DEVICE_NAME_U L"\\Device\\MidiOut" -#define DD_MIDI_OUT_DOS_DEVICE_NAME "\\DosDevices\\MidiOut" -#define DD_MIDI_OUT_DOS_DEVICE_NAME_U L"\\DosDevices\\MidiOut" - -#define DD_MIX_DEVICE_NAME "\\Device\\MMMix" -#define DD_MIX_DEVICE_NAME_U L"\\Device\\MMMix" -#define DD_MIX_DOS_DEVICE_NAME "\\DosDevices\\MMMix" -#define DD_MIX_DOS_DEVICE_NAME_U L"\\DosDevices\\MMMix" - -#define DD_AUX_DEVICE_NAME "\\Device\\MMAux" -#define DD_AUX_DEVICE_NAME_U L"\\Device\\MMAux" -#define DD_AUX_DOS_DEVICE_NAME "\\DosDevices\\MMAux" -#define DD_AUX_DOS_DEVICE_NAME_U L"\\DosDevices\\MMAux" +#define DD_WAVE_IN_DEVICE_NAME "\\Device\\WaveIn" +#define DD_WAVE_IN_DEVICE_NAME_U L"\\Device\\WaveIn" +#define DD_WAVE_IN_DOS_DEVICE_NAME "\\DosDevices\\WaveIn" +#define DD_WAVE_IN_DOS_DEVICE_NAME_U L"\\DosDevices\\WaveIn" +#define DD_WAVE_IN_WIN32_DEVICE_NAME "\\\\.\\WaveIn" +#define DD_WAVE_IN_WIN32_DEVICE_NAME_U L"\\\\.\\WaveIn" + +#define DD_WAVE_OUT_DEVICE_NAME "\\Device\\WaveOut" +#define DD_WAVE_OUT_DEVICE_NAME_U L"\\Device\\WaveOut" +#define DD_WAVE_OUT_DOS_DEVICE_NAME "\\DosDevices\\WaveOut" +#define DD_WAVE_OUT_DOS_DEVICE_NAME_U L"\\DosDevices\\WaveOut" +#define DD_WAVE_OUT_WIN32_DEVICE_NAME "\\\\.\\WaveOut" +#define DD_WAVE_OUT_WIN32_DEVICE_NAME_U L"\\\\.\\WaveOut" + +#define DD_MIDI_IN_DEVICE_NAME "\\Device\\MidiIn" +#define DD_MIDI_IN_DEVICE_NAME_U L"\\Device\\MidiIn" +#define DD_MIDI_IN_DOS_DEVICE_NAME "\\DosDevices\\MidiIn" +#define DD_MIDI_IN_DOS_DEVICE_NAME_U L"\\DosDevices\\MidiIn" +#define DD_MIDI_IN_WIN32_DEVICE_NAME "\\\\.\\MidiIn" +#define DD_MIDI_IN_WIN32_DEVICE_NAME_U L"\\\\.\\MidiIn" + +#define DD_MIDI_OUT_DEVICE_NAME "\\Device\\MidiOut" +#define DD_MIDI_OUT_DEVICE_NAME_U L"\\Device\\MidiOut" +#define DD_MIDI_OUT_DOS_DEVICE_NAME "\\DosDevices\\MidiOut" +#define DD_MIDI_OUT_DOS_DEVICE_NAME_U L"\\DosDevices\\MidiOut" +#define DD_MIDI_OUT_WIN32_DEVICE_NAME "\\\\.\\MidiOut" +#define DD_MIDI_OUT_WIN32_DEVICE_NAME_U L"\\\\.\\MidiOut" + +#define DD_MIX_DEVICE_NAME "\\Device\\MMMix" +#define DD_MIX_DEVICE_NAME_U L"\\Device\\MMMix" +#define DD_MIX_DOS_DEVICE_NAME "\\DosDevices\\MMMix" +#define DD_MIX_DOS_DEVICE_NAME_U L"\\DosDevices\\MMMix" +#define DD_MIX_WIN32_DEVICE_NAME "\\\\.\\MMMix" +#define DD_MIX_WIN32_DEVICE_NAME_U L"\\\\.\\MMMix" + +#define DD_AUX_DEVICE_NAME "\\Device\\MMAux" +#define DD_AUX_DEVICE_NAME_U L"\\Device\\MMAux" +#define DD_AUX_DOS_DEVICE_NAME "\\DosDevices\\MMAux" +#define DD_AUX_DOS_DEVICE_NAME_U L"\\DosDevices\\MMAux" +#define DD_AUX_WIN32_DEVICE_NAME "\\\\.\\MMAux" +#define DD_AUX_WIN32_DEVICE_NAME_U L"\\\\.\\MMAux" + +/* + Registry keys +*/ + +#define REG_SERVICES_KEY_NAME_U L"System\\CurrentControlSet\\Services" +#define REG_PARAMETERS_KEY_NAME_U L"Parameters" +#define REG_DEVICE_KEY_NAME_U L"Device" +#define REG_DEVICES_KEY_NAME_U L"Devices" + /* Base control codes Added: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h (added) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,299 @@ +/* + ReactOS Sound System + MME Support Helper + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created + + Notes: + MME Buddy was the best name I could come up with... +*/ + +#ifndef ROS_AUDIO_MMEBUDDY_H +#define ROS_AUDIO_MMEBUDDY_H + +struct _SOUND_DEVICE; +struct _SOUND_DEVICE_INSTANCE; + + +/* + Rather than pass caps structures around as a PVOID, this can be + used instead. +*/ + +typedef union _UNIVERSAL_CAPS +{ + WAVEOUTCAPS WaveOut; + WAVEINCAPS WaveIn; + MIDIOUTCAPS MidiOut; + MIDIINCAPS MidiIn; +} UNIVERSAL_CAPS, *PUNIVERSAL_CAPS; + + +/* + Thread helper operations +*/ + +typedef MMRESULT (*SOUND_THREAD_OPERATION)( + IN struct _SOUND_DEVICE_INSTANCE* Instance, + IN PVOID Data); + +typedef struct _THREAD_OPERATIONS +{ + struct _THREAD_OPERATIONS* Next; + DWORD Id; + SOUND_THREAD_OPERATION Operation; +} THREAD_OPERATIONS, *PTHREAD_OPERATIONS; + +typedef struct _SOUND_THREAD +{ + HANDLE Handle; + BOOLEAN Running; + PTHREAD_OPERATIONS FirstOperation; + HANDLE KillEvent; + HANDLE RequestEvent; + HANDLE RequestCompletionEvent; +} SOUND_THREAD, *PSOUND_THREAD; + + +/* + Audio device function table +*/ + +typedef MMRESULT (*MMOPEN_FUNC)( + IN UCHAR DeviceType, + IN LPWSTR DevicePath, + OUT PHANDLE Handle); + +typedef MMRESULT (*MMCLOSE_FUNC)( + IN HANDLE Handle); + +typedef MMRESULT (*MMGETCAPS_FUNC)( + IN struct _SOUND_DEVICE* SoundDevice, + OUT PUNIVERSAL_CAPS Capabilities); + +typedef struct _MMFUNCTION_TABLE +{ + MMOPEN_FUNC Open; + MMCLOSE_FUNC Close; + MMGETCAPS_FUNC GetCapabilities; +} MMFUNCTION_TABLE, *PMMFUNCTION_TABLE; + + +/* + Represents an audio device +*/ + +typedef struct _SOUND_DEVICE +{ + struct _SOUND_DEVICE* Next; + struct _SOUND_DEVICE_INSTANCE* FirstInstance; + UCHAR DeviceType; + LPWSTR DevicePath; + HANDLE Handle; + MMFUNCTION_TABLE Functions; +} SOUND_DEVICE, *PSOUND_DEVICE; + + +/* + Represents an individual instance of an audio device +*/ + +typedef struct _SOUND_DEVICE_INSTANCE +{ + struct _SOUND_DEVICE_INSTANCE* Next; + PSOUND_DEVICE Device; + PSOUND_THREAD Thread; +} SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; + + +/* + entry.c +*/ + +LONG +DefaultDriverProc( + DWORD driver_id, + HANDLE driver_handle, + UINT message, + LONG parameter1, + LONG parameter2); + + +/* + devices.c +*/ + +ULONG +GetSoundDeviceCount( + UCHAR DeviceType); + +MMRESULT +GetSoundDevice( + IN UCHAR DeviceType, + IN ULONG DeviceIndex, + OUT PSOUND_DEVICE* Device); + +MMRESULT +GetSoundDevicePath( + IN PSOUND_DEVICE SoundDevice, + OUT LPWSTR* DevicePath); + +VOID +DestroyAllSoundDevices(); + +BOOLEAN +DestroySoundDevices( + UCHAR DeviceType); + +BOOLEAN +CreateSoundDevice( + UCHAR DeviceType, + PWSTR DevicePath); + +BOOLEAN +DestroySoundDevice( + UCHAR DeviceType, + ULONG Index); + + +/* + nt4.c +*/ + +typedef BOOLEAN (*SOUND_DEVICE_DETECTED_PROC)( + UCHAR DeviceType, + PWSTR DevicePath, + HANDLE Handle); + +MMRESULT +OpenSoundDriverParametersRegKey( + IN LPWSTR ServiceName, + OUT PHKEY KeyHandle); + +MMRESULT +OpenSoundDeviceRegKey( + IN LPWSTR ServiceName, + IN DWORD DeviceIndex, + OUT PHKEY KeyHandle); + +MMRESULT +EnumerateNt4ServiceSoundDevices( + LPWSTR ServiceName, + UCHAR DeviceType, + SOUND_DEVICE_DETECTED_PROC SoundDeviceDetectedProc); + +MMRESULT +DetectNt4SoundDevices( + UCHAR DeviceType, + PWSTR BaseDevicePath, + SOUND_DEVICE_DETECTED_PROC SoundDeviceDetectedProc); + + +/* + kernel.c +*/ + +MMRESULT +OpenKernelSoundDeviceByName( + PWSTR DeviceName, + DWORD AccessRights, + PHANDLE Handle); + +MMRESULT +OpenKernelSoundDevice( + PSOUND_DEVICE SoundDevice, + DWORD AccessRights); + +MMRESULT +PerformSoundDeviceIo( + PSOUND_DEVICE SoundDevice, + DWORD IoControlCode, + LPVOID InBuffer, + DWORD InBufferSize, + LPVOID OutBuffer, + DWORD OutBufferSize, + LPDWORD BytesReturned, + LPOVERLAPPED Overlapped); + +MMRESULT +ReadSoundDevice( + PSOUND_DEVICE SoundDevice, + DWORD IoControlCode, + LPVOID OutBuffer, + DWORD OutBufferSize, + LPDWORD BytesReturned, + LPOVERLAPPED Overlapped); + +MMRESULT +WriteSoundDevice( + PSOUND_DEVICE SoundDevice, + DWORD IoControlCode, + LPVOID InBuffer, + DWORD InBufferSize, + LPDWORD BytesReturned, + LPOVERLAPPED Overlapped); + + +/* + utility.c +*/ + +ULONG +GetDigitCount( + ULONG Number); + +MMRESULT +Win32ErrorToMmResult(UINT error_code); + + +/* + instances.c +*/ + +MMRESULT +CreateSoundDeviceInstance( + IN PSOUND_DEVICE SoundDevice, + OUT PSOUND_DEVICE_INSTANCE* Instance); + +MMRESULT +DestroySoundDeviceInstance( + IN PSOUND_DEVICE_INSTANCE Instance); + +MMRESULT +DestroyAllInstancesOfSoundDevice( + IN PSOUND_DEVICE SoundDevice); + + +/* + ... +*/ + +MMRESULT +GetSoundDeviceCapabilities( + IN PSOUND_DEVICE Device, + OUT PUNIVERSAL_CAPS Capabilities); + +MMRESULT +DefaultGetSoundDeviceCapabilities( + IN PSOUND_DEVICE Device, + OUT PUNIVERSAL_CAPS Capabilities); + + +/* + thread.c +*/ + +MMRESULT +StartSoundThread( + IN PSOUND_DEVICE_INSTANCE Instance); + +MMRESULT +StopSoundThread( + IN PSOUND_DEVICE_INSTANCE Instance); + + +#endif Propchange: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/lib/drivers/sound/legacy/devname.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/legacy/devname.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/legacy/devname.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -167,7 +167,7 @@ OUT PCWSTR* DeviceNameBody, OUT PCWSTR* DosDeviceNameBody) { - if ( DeviceType > MAX_DEVICE_TYPE ) + if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) { DPRINT("Invalid device type"); return STATUS_INVALID_PARAMETER; Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,325 @@ +/* + ReactOS Sound System + MME Driver Helper + + Purpose: + Device list manager + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + + +/* + TODO: Free up devicepath on exit +*/ + +#include <windows.h> +#include <ntddsnd.h> +#include <debug.h> + +#include <mmebuddy.h> + +/* Device Lists */ +ULONG SoundDeviceTotals[SOUND_DEVICE_TYPES]; +PSOUND_DEVICE SoundDeviceLists[SOUND_DEVICE_TYPES]; + + +ULONG +GetSoundDeviceCount( + UCHAR DeviceType) +{ + if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) + { + return 0; + } + + return SoundDeviceTotals[DeviceType]; +} + + +MMRESULT +GetSoundDevice( + IN UCHAR DeviceType, + IN ULONG DeviceIndex, + OUT PSOUND_DEVICE* Device) +{ + ULONG Count = 0; + PSOUND_DEVICE CurrentDevice = NULL; + + if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) + return MMSYSERR_INVALPARAM; + + if ( DeviceIndex >= SoundDeviceTotals[DeviceType - MIN_SOUND_DEVICE_TYPE] ) + return MMSYSERR_INVALPARAM; + + if ( ! Device ) + return MMSYSERR_INVALPARAM; + + /* + We know by now that a device at the index should exist + so just loop around until we reach that index. + */ + + CurrentDevice = SoundDeviceLists[DeviceType - MIN_SOUND_DEVICE_TYPE]; + + for ( Count = 0; Count <= DeviceIndex; ++ Count ) + { + *Device = CurrentDevice; + CurrentDevice = CurrentDevice->Next; + } + + return MMSYSERR_NOERROR; +} + + +MMRESULT +GetSoundDevicePath( + IN PSOUND_DEVICE SoundDevice, + OUT LPWSTR* DevicePath) +{ + if ( ! SoundDevice ) + return MMSYSERR_INVALPARAM; + + if ( ! DevicePath ) + return MMSYSERR_INVALPARAM; + + MessageBox(0, SoundDevice->DevicePath, L"Foo", MB_TASKMODAL | MB_OK); + *DevicePath = SoundDevice->DevicePath; + + return MMSYSERR_NOERROR; +} + + +VOID +DestroyAllSoundDevices() +{ + ULONG i; + + DPRINT("Emptying all device lists\n"); + + for ( i = 0; i < SOUND_DEVICE_TYPES; ++ i ) + { + DestroySoundDevices(i); + } +} + + +BOOLEAN +DestroySoundDevices( + UCHAR DeviceType) +{ + PSOUND_DEVICE CurrentDevice; + PSOUND_DEVICE NextDevice; + + DPRINT("Emptying device list for device type %d\n", DeviceType); + + if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) + { + DPRINT("Invalid device type - %d\n", DeviceType); + return FALSE; + } + + /* Clean out the device list */ + CurrentDevice = SoundDeviceLists[DeviceType - MIN_SOUND_DEVICE_TYPE]; + + while ( CurrentDevice ) + { + /* Save the next device pointer so we can reference it later */ + NextDevice = CurrentDevice->Next; + + HeapFree(GetProcessHeap(), 0, CurrentDevice); + CurrentDevice = NextDevice; + } + + /* Reset the list content and item count */ + SoundDeviceLists[DeviceType - MIN_SOUND_DEVICE_TYPE] = NULL; + SoundDeviceTotals[DeviceType - MIN_SOUND_DEVICE_TYPE] = 0; + + return TRUE; +} + + +VOID +InitSoundDeviceFunctionTable( + IN PSOUND_DEVICE Device) +{ + Device->Functions.GetCapabilities = DefaultGetSoundDeviceCapabilities; +} + + +BOOLEAN +CreateSoundDevice( + UCHAR DeviceType, + LPWSTR DevicePath) +{ + PSOUND_DEVICE NewDevice; + ULONG DevicePathSize = 0; + UCHAR TypeIndex; + + DPRINT("Adding a sound device to list %d\n", DeviceType); + + if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) + { + return FALSE; + } + + TypeIndex = DeviceType - MIN_SOUND_DEVICE_TYPE; + + NewDevice = (PSOUND_DEVICE) + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOUND_DEVICE)); + + if ( ! NewDevice ) + { + return FALSE; + } + + DevicePathSize = (wcslen(DevicePath) + 1) * sizeof(WCHAR); + + NewDevice->Next = NULL; + NewDevice->FirstInstance = NULL; + NewDevice->DeviceType = DeviceType; + NewDevice->Handle = INVALID_HANDLE_VALUE; + + NewDevice->DevicePath = (LPWSTR) + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, DevicePathSize); + + if ( ! NewDevice->DevicePath ) + { + HeapFree(GetProcessHeap(), 0, NewDevice); + return FALSE; + } + + CopyMemory(NewDevice->DevicePath, DevicePath, DevicePathSize); + + /* Set up function table */ + InitSoundDeviceFunctionTable(NewDevice); + + /* Start or add to list */ + if ( ! SoundDeviceLists[TypeIndex] ) + { + DPRINT("Starting device list\n"); + SoundDeviceLists[TypeIndex] = NewDevice; + } + else + { + PSOUND_DEVICE CurrentDevice = SoundDeviceLists[TypeIndex]; + + DPRINT("Adding to device list\n"); + + while ( CurrentDevice != NULL ) + { + if ( ! CurrentDevice->Next ) + { + CurrentDevice->Next = NewDevice; + break; + } + + CurrentDevice = CurrentDevice->Next; + } + } + + ++ SoundDeviceTotals[TypeIndex]; + DPRINT("Now %d devices of type %d\n", SoundDeviceTotals[TypeIndex], DeviceType); + + return TRUE; +} + + +BOOLEAN +DestroySoundDevice( + UCHAR DeviceType, + ULONG Index) +{ + ULONG Counter = 0; + ULONG TypeIndex; + PSOUND_DEVICE CurrentDevice = NULL; + PSOUND_DEVICE PreviousDevice = NULL; + + DPRINT("Removing a sound device from list %d\n", DeviceType); + + if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) + { + return FALSE; + } + + TypeIndex = DeviceType - MIN_SOUND_DEVICE_TYPE; + + CurrentDevice = SoundDeviceLists[TypeIndex]; + PreviousDevice = NULL; + + while ( CurrentDevice ) + { + if ( Counter == Index ) + { + /* Clean up any instances */ + if ( CurrentDevice->FirstInstance != NULL ) + { + DestroyAllInstancesOfSoundDevice(CurrentDevice); + } + + /* Close handle (if open) */ + if ( CurrentDevice->Handle != INVALID_HANDLE_VALUE ) + { + CloseHandle(CurrentDevice->Handle); + CurrentDevice->Handle = INVALID_HANDLE_VALUE; + } + + if ( ! PreviousDevice ) + { + /* Head of list */ + SoundDeviceLists[TypeIndex] = CurrentDevice->Next; + } + else + { + /* Not the head of list */ + PreviousDevice->Next = CurrentDevice->Next; + } + + /* Free the memory associated with the device info */ + HeapFree(GetProcessHeap(), 0, CurrentDevice); + CurrentDevice = NULL; + + DPRINT("Removal succeeded\n"); + + return TRUE; + } + + PreviousDevice = CurrentDevice; + ++ Counter; + } + + DPRINT("Not found\n"); + /* Not found */ + return FALSE; +} + + + +/* Should this go somewhere else? */ + +MMRESULT +GetSoundDeviceCapabilities( + PSOUND_DEVICE SoundDevice, + PUNIVERSAL_CAPS Capabilities) +{ + if ( ! SoundDevice ) + return MMSYSERR_INVALPARAM; + + if ( ! Capabilities ) + return MMSYSERR_INVALPARAM; + + return SoundDevice->Functions.GetCapabilities(SoundDevice, Capabilities); +} + +MMRESULT +IsSoundDeviceFormatSupported( + IN PSOUND_DEVICE SoundDevice /* what else? */) +{ + /* TODO */ + return MMSYSERR_NOTSUPPORTED; +} + Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,145 @@ +/* + ReactOS Sound System + MME Driver Helper + + Purpose: + Device instance manager + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <ntddsnd.h> +#include <debug.h> + +#include <mmebuddy.h> + +/* + Instances +*/ + +MMRESULT +CreateSoundDeviceInstance( + IN PSOUND_DEVICE SoundDevice, + OUT PSOUND_DEVICE_INSTANCE* Instance) +{ + PSOUND_DEVICE_INSTANCE NewInstance = NULL; + PSOUND_DEVICE_INSTANCE CurrentInstance = NULL; + + if ( ! SoundDevice ) + return MMSYSERR_INVALPARAM; + + if ( ! Instance ) + return MMSYSERR_INVALPARAM; + + NewInstance = (PSOUND_DEVICE_INSTANCE) + HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SOUND_DEVICE_INSTANCE)); + + if ( ! NewInstance ) + return MMSYSERR_NOMEM; + + /* Initialise */ + NewInstance->Next = NULL; + NewInstance->Device = SoundDevice; + + /* Search for an appropriate place in the list to put this instance */ + CurrentInstance = SoundDevice->FirstInstance; + + if ( ! CurrentInstance ) + { + /* This is going to be the first instance */ + SoundDevice->FirstInstance = CurrentInstance; + } + else + { + /* There is already one or more instances */ + while ( CurrentInstance ) + { + if ( ! CurrentInstance->Next ) + { + /* Add to the end and get outta here */ + CurrentInstance->Next = NewInstance; + break; + } + + CurrentInstance = CurrentInstance->Next; + } + } + + /* Fill the output parameter with this */ + *Instance = NewInstance; + + return MMSYSERR_NOERROR; +} + +MMRESULT +DestroySoundDeviceInstance( + IN PSOUND_DEVICE_INSTANCE Instance) +{ + PSOUND_DEVICE_INSTANCE CurrentInstance = NULL; + PSOUND_DEVICE SoundDevice = NULL; + + if ( ! Instance ) + return MMSYSERR_INVALPARAM; + + SoundDevice = Instance->Device; + + /* TODO - Perform cleanup, stop playback etc. */ + + if ( SoundDevice->FirstInstance == Instance ) + { + /* Deleting the first instance */ + SoundDevice->FirstInstance = NULL; + } + else + { + /* Deleting an instance beyond the first */ + CurrentInstance = SoundDevice->FirstInstance; + + /* If we hit the end of the list, evidently there's a bug */ + while ( CurrentInstance->Next != Instance ) + { + CurrentInstance = CurrentInstance->Next; + ASSERT(CurrentInstance); + } + + /* This is actually the one before the one we want to remove */ + CurrentInstance->Next = Instance->Next; + } + + /* Kill it! */ + HeapFree(GetProcessHeap(), 0, Instance); + + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +DestroyAllInstancesOfSoundDevice( + IN PSOUND_DEVICE SoundDevice) +{ + PSOUND_DEVICE_INSTANCE CurrentInstance = NULL; + PSOUND_DEVICE_INSTANCE NextInstance = NULL; + MMRESULT Result; + + if ( ! SoundDevice ) + return MMSYSERR_INVALPARAM; + + CurrentInstance = SoundDevice->FirstInstance; + + while ( CurrentInstance ) + { + NextInstance = CurrentInstance->Next; + + Result = DestroySoundDeviceInstance(CurrentInstance); + ASSERT(Result == MMSYSERR_NOERROR); + } + + return MMSYSERR_NOERROR; +} + Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,181 @@ +/* + ReactOS Sound System + MME Driver Helper + + Purpose: + Kernel device I/O + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <ntddsnd.h> +#include <debug.h> + +#include <mmebuddy.h> + + +MMRESULT +OpenKernelSoundDeviceByName( + PWSTR DeviceName, + DWORD AccessRights, + PHANDLE Handle) +{ + DWORD OpenFlags = 0; + + if ( ! Handle ) + { + return MMSYSERR_INVALPARAM; + } + + if ( ! DeviceName ) + { + return MMSYSERR_INVALPARAM; + } + + if ( AccessRights != GENERIC_READ ) + { + OpenFlags = FILE_FLAG_OVERLAPPED; + } + + DPRINT("Attempting to open '%ws'\n", DeviceName); + MessageBox(0, DeviceName, L"Attempting to open", MB_OK | MB_TASKMODAL); + + *Handle = CreateFile(DeviceName, + AccessRights, + FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + OpenFlags, + NULL); + + if ( *Handle == INVALID_HANDLE_VALUE ) + { + return Win32ErrorToMmResult(GetLastError()); + } + + return MMSYSERR_NOERROR; +} + +MMRESULT +OpenKernelSoundDevice( + PSOUND_DEVICE SoundDevice, + DWORD AccessRights) +{ + MMRESULT Result; + + if ( ! SoundDevice ) + return MMSYSERR_INVALPARAM; + + Result = OpenKernelSoundDeviceByName(SoundDevice->DevicePath, + AccessRights, + &SoundDevice->Handle); + + return Result; +} + +MMRESULT +PerformSoundDeviceIo( + PSOUND_DEVICE SoundDevice, + DWORD IoControlCode, + LPVOID InBuffer, + DWORD InBufferSize, + LPVOID OutBuffer, + DWORD OutBufferSize, + LPDWORD BytesReturned, + LPOVERLAPPED Overlapped) +{ + BOOLEAN TemporaryOpen = FALSE; + BOOLEAN IoResult = FALSE; + DWORD AccessRights = GENERIC_READ; + MMRESULT Result; + + if ( ! SoundDevice ) + return MMSYSERR_INVALPARAM; + + /* Determine if we actually need to write stuff */ + if ( InBuffer != NULL ) + AccessRights |= GENERIC_WRITE; + + /* Open the device temporarily,if it's not open */ + TemporaryOpen = (SoundDevice->Handle == INVALID_HANDLE_VALUE); + + if ( TemporaryOpen ) + { + MessageBox(0, L"Opening sound device", L"Info", MB_OK | MB_TASKMODAL); + + Result = OpenKernelSoundDevice(SoundDevice, AccessRights); + + if ( Result != MMSYSERR_NOERROR ) + return Result; + } + + MessageBox(0, L"Doing IO", L"Info", MB_OK | MB_TASKMODAL); + IoResult = DeviceIoControl( + SoundDevice->Handle, + IoControlCode, + InBuffer, + InBufferSize, + OutBuffer, + OutBufferSize, + BytesReturned, + Overlapped); + + if ( ! IoResult ) + { + return Win32ErrorToMmResult(GetLastError()); + } + + /* If we opened the device, we must close it here */ + if ( TemporaryOpen ) + { + MessageBox(0, L"Closing sound device", L"Info", MB_OK | MB_TASKMODAL); + CloseHandle(SoundDevice->Handle); + SoundDevice->Handle = INVALID_HANDLE_VALUE; + } + + return MMSYSERR_NOERROR; +} + +MMRESULT +ReadSoundDevice( + PSOUND_DEVICE SoundDevice, + DWORD IoControlCode, + LPVOID OutBuffer, + DWORD OutBufferSize, + LPDWORD BytesReturned, + LPOVERLAPPED Overlapped) +{ + return PerformSoundDeviceIo(SoundDevice, + IoControlCode, + NULL, + 0, + OutBuffer, + OutBufferSize, + BytesReturned, + Overlapped); +} + +MMRESULT +WriteSoundDevice( + PSOUND_DEVICE SoundDevice, + DWORD IoControlCode, + LPVOID InBuffer, + DWORD InBufferSize, + LPDWORD BytesReturned, + LPOVERLAPPED Overlapped) +{ + return PerformSoundDeviceIo(SoundDevice, + IoControlCode, + InBuffer, + InBufferSize, + NULL, + 0, + BytesReturned, + Overlapped); +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,31 @@ +/* + ReactOS Sound System + MME Interface + + Purpose: + Auxiliary device message handler + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> +#include <debug.h> + +APIENTRY DWORD +auxMessage( + DWORD device_id, + DWORD message, + DWORD private_handle, + DWORD parameter1, + DWORD parameter2) +{ + DPRINT("auxMessageStub called\n"); + /* TODO */ + return MMSYSERR_NOTSUPPORTED; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,77 @@ +/* + ReactOS Sound System + MME Interface + + Purpose: + Default DriverProc implementation + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmddk.h> +#include <ntddsnd.h> +#include <debug.h> + +LONG +DefaultDriverProc( + DWORD driver_id, + HANDLE driver_handle, + UINT message, + LONG parameter1, + LONG parameter2) +{ + switch ( message ) + { + case DRV_LOAD : + DPRINT("DRV_LOAD\n"); + return 1L; + + case DRV_FREE : + DPRINT("DRV_FREE\n"); + return 1L; + + case DRV_OPEN : + DPRINT("DRV_OPEN\n"); + return 1L; + + case DRV_CLOSE : + DPRINT("DRV_CLOSE\n"); + return 1L; + + case DRV_ENABLE : + DPRINT("DRV_ENABLE\n"); + return 1L; + + case DRV_DISABLE : + DPRINT("DRV_DISABLE\n"); + return 1L; + + /* + We don't provide configuration capabilities. This used to be + for things like I/O port, IRQ, DMA settings, etc. + */ + + case DRV_QUERYCONFIGURE : + DPRINT("DRV_QUERYCONFIGURE\n"); + return 0L; + + case DRV_CONFIGURE : + DPRINT("DRV_CONFIGURE\n"); + return 0L; + + case DRV_INSTALL : + DPRINT("DRV_INSTALL\n"); + return DRVCNF_RESTART; + }; + + return DefDriverProc(driver_id, + driver_handle, + message, + parameter1, + parameter2); +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,49 @@ +/* + ReactOS Sound System + MME Interface + + Purpose: + MIDI Input device message handler + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> +#include <debug.h> + +APIENTRY DWORD +midMessage( + DWORD device_id, + DWORD message, + DWORD private_handle, + DWORD parameter1, + DWORD parameter2) +{ + DPRINT("midMessageStub called\n"); + + switch ( message ) + { + case MIDM_GETNUMDEVS : + return 0; + + case MIDM_GETDEVCAPS : + case MIDM_OPEN : + return MMSYSERR_BADDEVICEID; + + case MIDM_CLOSE : + case MIDM_ADDBUFFER : + case MIDM_START : + case MIDM_STOP : + case MIDM_RESET : + return MMSYSERR_INVALHANDLE; + + default : + return MMSYSERR_NOTSUPPORTED; + } +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,48 @@ +/* + ReactOS Sound System + MME Interface + + Purpose: + MIDI Output device message handler + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> +#include <debug.h> + +APIENTRY DWORD +modMessage( + DWORD device_id, + DWORD message, + DWORD private_handle, + DWORD parameter1, + DWORD parameter2) +{ + DPRINT("modMessageStub called\n"); + + switch ( message ) + { + case MODM_GETNUMDEVS : + return 0; + + case MODM_GETDEVCAPS : + case MODM_OPEN : + return MMSYSERR_BADDEVICEID; + + case MODM_CLOSE : + case MODM_DATA : + case MODM_LONGDATA : + case MODM_RESET : + return MMSYSERR_INVALHANDLE; + + default : + return MMSYSERR_NOTSUPPORTED; + } +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,31 @@ +/* + ReactOS Sound System + MME Interface + + Purpose: + Mixer device message handler + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> +#include <debug.h> + +APIENTRY DWORD +mxdMessage( + DWORD device_id, + DWORD message, + DWORD private_handle, + DWORD parameter1, + DWORD parameter2) +{ + DPRINT("mxdMessageStub called\n"); + /* TODO */ + return MMSYSERR_NOTSUPPORTED; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,50 @@ +/* + ReactOS Sound System + MME Interface + + Purpose: + Wave input device message handler + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> +#include <debug.h> +#include <ntddsnd.h> + +#include <mmebuddy.h> + +APIENTRY DWORD +widMessage( + DWORD device_id, + DWORD message, + DWORD private_handle, + DWORD parameter1, + DWORD parameter2) +{ + DPRINT("widMessageStub called\n"); + + switch ( message ) + { + case WIDM_GETNUMDEVS : + return GetSoundDeviceCount(WAVE_IN_DEVICE_TYPE); + + case WIDM_GETDEVCAPS : + case WIDM_OPEN : + return MMSYSERR_BADDEVICEID; + + case WIDM_CLOSE : + case WIDM_START : + case WIDM_RESET : + return MMSYSERR_INVALHANDLE; + + default : + return MMSYSERR_NOTSUPPORTED; + } +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,81 @@ +/* + ReactOS Sound System + MME Interface + + Purpose: + Wave output device message handler + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> +#include <debug.h> + +#include <ntddsnd.h> +#include <mmebuddy.h> + +APIENTRY DWORD +wodMessage( + DWORD device_id, + DWORD message, + DWORD private_handle, + DWORD parameter1, + DWORD parameter2) +{ + MMRESULT Result = MMSYSERR_NOERROR; + PSOUND_DEVICE Device = NULL; + DPRINT("wodMessageStub called\n"); + + switch ( message ) + { + case WODM_GETNUMDEVS : + return GetSoundDeviceCount(WAVE_OUT_DEVICE_TYPE); + + case WODM_GETDEVCAPS : + { + UNIVERSAL_CAPS Capabilities; + + Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, device_id, &Device); + if ( Result != MMSYSERR_NOERROR ) + return Result; + + Result = GetSoundDeviceCapabilities(Device, &Capabilities); + if ( Result != MMSYSERR_NOERROR ) + return Result; + + CopyMemory((LPWAVEOUTCAPS)parameter1, &Capabilities.WaveOut, parameter2); + + return Result; + } + + case WODM_OPEN : + /* + OpenSoundDevice(); + */ + return MMSYSERR_BADDEVICEID; + + case WODM_CLOSE : + /* CloseSoundDevice() */ + + case WODM_WRITE : + case WODM_PAUSE : + case WODM_RESTART : + case WODM_RESET : + case WODM_BREAKLOOP : + return MMSYSERR_INVALHANDLE; + + /* Let WINMM take care of these */ + case WODM_PREPARE : + case WODM_UNPREPARE : + return MMSYSERR_NOTSUPPORTED; + + default : + return MMSYSERR_NOTSUPPORTED; + } +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,26 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="mmebuddy" type="staticlibrary" allowwarnings="false" unicode="yes"> + <include base="ReactOS">include/reactos/libs/sound</include> + <file>devices.c</file> + <file>instances.c</file> + <file>kernel.c</file> + <file>nt4.c</file> + <file>utility.c</file> + <file>thread.c</file> + <file>testing.c</file> + <directory name="mme"> + <file>entry.c</file> + <file>wod.c</file> + <file>wid.c</file> + <file>mod.c</file> + <file>mid.c</file> + <file>mxd.c</file> + <file>aux.c</file> + </directory> + <directory name="wave"> + <file>wavethread.c</file> + </directory> + <directory name="midi"> + </directory> +</module> Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,429 @@ +/* + ReactOS Sound System + MME Driver Helper + + Purpose: + Legacy (NT4) sound device support + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +/* + A better way of detecting sound devices... + Search the appropriate registry key! +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <ntddsnd.h> +#include <debug.h> + +#include <mmebuddy.h> + +/* + Open the parameters key of a sound driver. + NT4 only. +*/ +MMRESULT +OpenSoundDriverParametersRegKey( + IN LPWSTR ServiceName, + OUT PHKEY KeyHandle) +{ + ULONG KeyLength; + PWCHAR ParametersKeyName; + + if ( ! ServiceName ) + return MMSYSERR_INVALPARAM; + + if ( ! KeyHandle ) + return MMSYSERR_INVALPARAM; + + /* Work out how long the string will be */ + KeyLength = wcslen(REG_SERVICES_KEY_NAME_U) + 1 + + wcslen(ServiceName) + 1 + + wcslen(REG_PARAMETERS_KEY_NAME_U) + 1; + + KeyLength *= sizeof(WCHAR); + + /* Allocate memory for the string */ + ParametersKeyName = (PWCHAR) HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + KeyLength); + + if ( ! ParametersKeyName ) + return MMSYSERR_NOMEM; + + /* Construct the registry path */ + wsprintf(ParametersKeyName, + L"%s\\%s\\%s", + REG_SERVICES_KEY_NAME_U, + ServiceName, + REG_PARAMETERS_KEY_NAME_U); + + MessageBox(0, ParametersKeyName, L"Parameters key is...", MB_OK | MB_TASKMODAL); + + /* Perform the open */ + if ( RegOpenKeyEx(HKEY_LOCAL_MACHINE, + ParametersKeyName, + 0, + KEY_READ, + KeyHandle) != ERROR_SUCCESS ) + { + /* Couldn't open the key */ + HeapFree(GetProcessHeap(), 0, ParametersKeyName); + return MMSYSERR_ERROR; + } + + HeapFree(GetProcessHeap(), 0, ParametersKeyName); + + return MMSYSERR_NOERROR; +} + +/* + Open one of the Device sub-keys belonging to the sound driver. + NT4 only. +*/ +MMRESULT +OpenSoundDeviceRegKey( + IN LPWSTR ServiceName, + IN DWORD DeviceIndex, + OUT PHKEY KeyHandle) +{ + DWORD PathSize; + PWCHAR RegPath; + + if ( ! ServiceName ) + return MMSYSERR_INVALPARAM; + + if ( ! KeyHandle ) + return MMSYSERR_INVALPARAM; + + /* + Work out the space required to hold the path: + + HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\ + sndblst\ + Parameters\ + Device123\ + */ + PathSize = wcslen(REG_SERVICES_KEY_NAME_U) + 1 + + wcslen(ServiceName) + 1 + + wcslen(REG_PARAMETERS_KEY_NAME_U) + 1 + + wcslen(REG_DEVICE_KEY_NAME_U) + + GetDigitCount(DeviceIndex) + 1; + + PathSize *= sizeof(WCHAR); + + /* Allocate storage for the string */ + RegPath = (PWCHAR) HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + PathSize); + + if ( ! RegPath ) + { + return MMSYSERR_NOMEM; + } + + /* Write the path */ + wsprintf(RegPath, + L"%ls\\%ls\\%ls\\%ls%d", + REG_SERVICES_KEY_NAME_U, + ServiceName, + REG_PARAMETERS_KEY_NAME_U, + REG_DEVICE_KEY_NAME_U, + DeviceIndex); + + MessageBox(0, RegPath, L"Opening registry path", MB_OK | MB_TASKMODAL); + + /* Perform the open */ + if ( RegOpenKeyEx(HKEY_LOCAL_MACHINE, + RegPath, + 0, + KEY_READ, + KeyHandle) != ERROR_SUCCESS ) + { + /* Couldn't open the key */ + HeapFree(GetProcessHeap(), 0, RegPath); + return MMSYSERR_ERROR; + } + + HeapFree(GetProcessHeap(), HEAP_ZERO_MEMORY, RegPath); + + return MMSYSERR_NOERROR; +} + +/* + This is the "nice" way to discover audio devices in NT4 - go into the + service registry key and enumerate the Parameters\Device*\Devices + values. The value names represent the device name, whereas the data + assigned to them identifies the type of device. +*/ +MMRESULT +EnumerateNt4ServiceSoundDevices( + LPWSTR ServiceName, + UCHAR DeviceType, + SOUND_DEVICE_DETECTED_PROC SoundDeviceDetectedProc) +{ + HKEY Key; + DWORD KeyIndex = 0; + + /* Validate parameters */ + if ( ! ServiceName ) + return MMSYSERR_INVALPARAM; + + if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) + return MMSYSERR_INVALPARAM; + + while ( OpenSoundDeviceRegKey(ServiceName, KeyIndex, &Key) == MMSYSERR_NOERROR ) + { + HKEY DevicesKey; + DWORD ValueType = REG_NONE, ValueIndex = 0; + DWORD MaxNameLength = 0, ValueNameLength = 0; + PWSTR DevicePath = NULL, ValueName = NULL; + DWORD ValueDataLength = sizeof(DWORD); + DWORD ValueData; + + if ( RegOpenKeyEx(Key, + REG_DEVICES_KEY_NAME_U, + 0, + KEY_READ, + &DevicesKey) == ERROR_SUCCESS ) + { + /* Find out how much memory is needed for the key name */ + if ( RegQueryInfoKey(DevicesKey, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, + &MaxNameLength, + NULL, NULL, NULL) != ERROR_SUCCESS ) + { + RegCloseKey(DevicesKey); + RegCloseKey(Key); + + return MMSYSERR_ERROR; + } + + /* Account for terminating NULL */ + ++ MaxNameLength; + + DevicePath = (PWSTR) HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (MaxNameLength + + strlen("\\\\.\\")) * + sizeof(WCHAR)); + + /* Check that the memory allocation was successful */ + if ( ! DevicePath ) + { + /* There's no point in going further */ + RegCloseKey(DevicesKey); + RegCloseKey(Key); + + return MMSYSERR_NOMEM; + } + + /* Insert the device path prefix */ + wsprintf(DevicePath, L"\\\\.\\"); + + /* The offset of the string following this prefix */ + ValueName = DevicePath + strlen("\\\\.\\"); + + /* Copy this so that it may be overwritten */ + ValueNameLength = MaxNameLength; + + while ( RegEnumValue(DevicesKey, + ValueIndex, + ValueName, + &ValueNameLength, + NULL, + &ValueType, + (LPBYTE) &ValueData, + &ValueDataLength) == ERROR_SUCCESS ) + { + /* Device types are stored as DWORDs */ + if ( ( ValueType == REG_DWORD ) && + ( ValueDataLength == sizeof(DWORD) ) ) + { + SoundDeviceDetectedProc( + DeviceType, + DevicePath, + INVALID_HANDLE_VALUE); + } + + /* Reset variables for the next iteration */ + ValueNameLength = MaxNameLength; + ZeroMemory(ValueName, MaxNameLength); + ValueDataLength = sizeof(DWORD); + ValueData = 0; + ValueType = REG_NONE; + + ++ ValueIndex; + } + + HeapFree(GetProcessHeap(), 0, DevicePath); + + RegCloseKey(DevicesKey); + } + + ++ KeyIndex; + + RegCloseKey(Key); + } + + return MMSYSERR_NOERROR; +} + +/* + Brute-force device detection, using a base device name (eg: \\.\WaveOut). + + This will add the device number as a suffix to the end of the string and + attempt to open the device based on that name. On success, it will + increment the device number and repeat this process. + + When it runs out of devices, it will give up. +*/ +MMRESULT +DetectNt4SoundDevices( + UCHAR DeviceType, + PWSTR BaseDeviceName, + SOUND_DEVICE_DETECTED_PROC SoundDeviceDetectedProc) +{ + ULONG DeviceNameLength = 0; + ULONG DeviceNameSize = 0; + PWSTR DeviceName = NULL; + ULONG Index = 0, Count = 0; + HANDLE DeviceHandle; + BOOLEAN DoSearch = TRUE; + + DPRINT("Detecting NT4 style sound devices of type %d\n", DeviceType); + + if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) + { + return MMSYSERR_INVALPARAM; + } + + DeviceNameLength = wcslen(BaseDeviceName); + /* Consider the length of the number */ + DeviceNameLength += GetDigitCount(Index); + /* ...and the terminating NULL */ + DeviceNameLength += 1; + /* Finally, this is a wide string, so... */ + DeviceNameSize = DeviceNameLength * sizeof(WCHAR); + + DeviceName = (PWSTR) + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, DeviceNameSize); + + if ( ! DeviceName ) + { + return MMSYSERR_NOMEM; + } + + while ( DoSearch ) + { + /* Nothing like a nice clean device name */ + ZeroMemory(DeviceName, DeviceNameSize); + wsprintf(DeviceName, L"%ls%d", BaseDeviceName, Index); + + if ( OpenKernelSoundDeviceByName(DeviceName, + GENERIC_READ, + &DeviceHandle) == MMSYSERR_NOERROR ) + { + DPRINT("Found device %d\n", Index); + + /* Notify the callback function */ + if ( SoundDeviceDetectedProc(DeviceType, DeviceName, DeviceHandle) ) + { + ++ Count; + } + + CloseHandle(DeviceHandle); + + ++ Index; + } + else + { + DoSearch = FALSE; + } + } + + HeapFree(GetProcessHeap(), 0, DeviceName); + + return MMSYSERR_NOERROR; +} + + +#include <ntddk.h> /* How do I avoid this? */ + +MMRESULT +DefaultGetSoundDeviceCapabilities( + IN PSOUND_DEVICE Device, + OUT PUNIVERSAL_CAPS Capabilities) +{ + PVOID RawCapsPtr = NULL; + ULONG CapsSize = 0; + DWORD Ioctl; + MMRESULT Result; + DWORD BytesReturned; + + ZeroMemory(Capabilities, sizeof(UNIVERSAL_CAPS)); + + if ( ! Device ) + return MMSYSERR_INVALPARAM; + + if ( ! Capabilities ) + return MMSYSERR_INVALPARAM; + + /* Select appropriate IOCTL and capabilities structure */ + switch ( Device->DeviceType ) + { + case WAVE_OUT_DEVICE_TYPE : + Ioctl = IOCTL_WAVE_GET_CAPABILITIES; + RawCapsPtr = (PVOID) &Capabilities->WaveOut; + CapsSize = sizeof(WAVEOUTCAPS); + break; + + case WAVE_IN_DEVICE_TYPE : + Ioctl = IOCTL_WAVE_GET_CAPABILITIES; + RawCapsPtr = (PVOID) &Capabilities->WaveIn; + CapsSize = sizeof(WAVEINCAPS); + break; + + case MIDI_OUT_DEVICE_TYPE : + Ioctl = IOCTL_MIDI_GET_CAPABILITIES; + RawCapsPtr = (PVOID) &Capabilities->MidiOut; + CapsSize = sizeof(MIDIOUTCAPS); + break; + + case MIDI_IN_DEVICE_TYPE : + Ioctl = IOCTL_MIDI_GET_CAPABILITIES; + RawCapsPtr = (PVOID) &Capabilities->MidiIn; + CapsSize = sizeof(MIDIINCAPS); + break; + + case MIXER_DEVICE_TYPE : + /* TODO */ + /*Ioctl = IOCTL_MIX_GET_CAPABILITIES;*/ + return MMSYSERR_NOTSUPPORTED; + + case AUX_DEVICE_TYPE : + /* TODO */ + Ioctl = IOCTL_AUX_GET_CAPABILITIES; + return MMSYSERR_NOTSUPPORTED; + + default : + return MMSYSERR_NOTSUPPORTED; + } + + /* Call the driver */ + Result = ReadSoundDevice( + Device, + Ioctl, + (LPVOID) RawCapsPtr, + CapsSize, + &BytesReturned, + NULL); + + return Result; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/testing.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/testing.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/testing.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,229 @@ +/* + ReactOS Sound System + MME Driver Helper + + Purpose: + Hax + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <ntddsnd.h> +#include <debug.h> + +#include <mmebuddy.h> + + +/* + **** TESTING CODE ONLY **** +*/ + +#define IDS_WAVEOUT_PNAME 0x68 + + + +BOOLEAN TestCallback( + UCHAR DeviceType, + PWSTR DevicePath, + HANDLE Handle) +{ + MessageBox(0, DevicePath, L"CALLBACK", MB_OK | MB_TASKMODAL); + + CreateSoundDevice(DeviceType, DevicePath); + + return TRUE; +} + + +APIENTRY VOID +Test() +{ + ULONG WaveInCount, WaveOutCount; + ULONG MidiInCount, MidiOutCount; + ULONG MixerCount, AuxCount; + WCHAR Message[1024]; + + DetectNt4SoundDevices(WAVE_IN_DEVICE_TYPE, + L"\\\\.\\SBWaveIn", + TestCallback); + + DetectNt4SoundDevices(WAVE_OUT_DEVICE_TYPE, + L"\\\\.\\SBWaveOut", + TestCallback); + + DetectNt4SoundDevices(MIDI_IN_DEVICE_TYPE, + L"\\\\.\\MidiIn", + TestCallback); + + DetectNt4SoundDevices(MIDI_OUT_DEVICE_TYPE, + L"\\\\.\\MidiOut", + TestCallback); + + DetectNt4SoundDevices(MIXER_DEVICE_TYPE, + L"\\\\.\\SBMixer", + TestCallback); + + DetectNt4SoundDevices(AUX_DEVICE_TYPE, + L"\\\\.\\SBAux", + TestCallback); + + WaveInCount = GetSoundDeviceCount(WAVE_IN_DEVICE_TYPE); + WaveOutCount = GetSoundDeviceCount(WAVE_OUT_DEVICE_TYPE); + MidiInCount = GetSoundDeviceCount(MIDI_IN_DEVICE_TYPE); + MidiOutCount = GetSoundDeviceCount(MIDI_OUT_DEVICE_TYPE); + MixerCount = GetSoundDeviceCount(MIXER_DEVICE_TYPE); + AuxCount = GetSoundDeviceCount(AUX_DEVICE_TYPE); + + wsprintf(Message, L"Found devices:\n- %d wave inputs\n- %d wave outputs\n- %d midi inputs\n- %d midi outputs\n- %d mixers\n- %d aux devices", + WaveInCount, WaveOutCount, + MidiInCount, MidiOutCount, + MixerCount, AuxCount); + + MessageBox(0, Message, L"Result", MB_OK | MB_TASKMODAL); +} + +APIENTRY VOID +TestGetCaps() +{ + UNIVERSAL_CAPS Caps; + WCHAR DevInfo[1024]; + PSOUND_DEVICE Device; + MMRESULT Result; + + CreateSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0"); + Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &Device); + + if ( Result != MMSYSERR_NOERROR ) + { + MessageBox(0, L"Fail 1", L"Fail", MB_OK | MB_TASKMODAL); + return; + } + + Result = GetSoundDeviceCapabilities(Device, &Caps); + if ( Result != MMSYSERR_NOERROR ) + { + MessageBox(0, L"Fail 2", L"Fail", MB_OK | MB_TASKMODAL); + return; + } + + wsprintf(DevInfo, L"Device name: %hS\nManufacturer ID: %d\nProduct ID: %d\nDriver version: %x\nChannels: %d", Caps.WaveOut.szPname, Caps.WaveOut.wMid, Caps.WaveOut.wPid, Caps.WaveOut.vDriverVersion, Caps.WaveOut.wChannels); + + MessageBox(0, DevInfo, L"Result", MB_OK | MB_TASKMODAL); + +#if 0 + HANDLE Handle; + MMRESULT Result; + WAVEOUTCAPS Caps; + DWORD BytesReturned = 0; + WCHAR DevInfo[1024]; + + Result = OpenKernelSoundDevice( + L"\\\\.\\SBWaveOut0", + GENERIC_READ, + &Handle); + + if ( Result != MMSYSERR_NOERROR ) + { + MessageBox(0, L"Fail open", L"Fail open", MB_OK | MB_TASKMODAL); + return; + } + + ZeroMemory(&Caps, sizeof(WAVEOUTCAPS)); + + if ( ! + DeviceIoControl(Handle, + IOCTL_WAVE_GET_CAPABILITIES, + NULL, + 0, + (LPVOID) &Caps, + sizeof(WAVEOUTCAPS), + &BytesReturned, + NULL) ) + { + MessageBox(0, L"Fail", L"Fail", MB_OK | MB_TASKMODAL); + } + else + { + wsprintf(DevInfo, L"%02x %02x %02x %02x %02x %02x", Caps.szPname[0], Caps.szPname[1], Caps.szPname[2], Caps.szPname[3], Caps.szPname[4], Caps.szPname[5]); +/* + wsprintf(DevInfo, L"Device name: %hS\nManufacturer ID: %d\nProduct ID: %d\nDriver version: %x\nChannels: %d", Caps.szPname, Caps.wMid, Caps.wPid, Caps.vDriverVersion, Caps.wChannels); +*/ + + MessageBox(0, DevInfo, L"Result", MB_OK | MB_TASKMODAL); + } + + CloseHandle(Handle); +#endif +} + + + +APIENTRY VOID +TestDevEnum() +{ + EnumerateNt4ServiceSoundDevices( + L"sndblst", + WAVE_OUT_DEVICE_TYPE, + TestCallback); +} + + +WINAPI VOID +TestThreading() +{ + MMRESULT Result; + PSOUND_DEVICE Device; + PSOUND_DEVICE_INSTANCE Instance; + + CreateSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0"); + Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &Device); + if ( Result != MMSYSERR_NOERROR ) + { + MessageBox(0, L"Fail 1", L"Fail 1", MB_OK | MB_TASKMODAL); + return; + } + + Result = CreateSoundDeviceInstance(Device, &Instance); + if ( Result != MMSYSERR_NOERROR ) + { + MessageBox(0, L"Fail 2", L"Fail 2", MB_OK | MB_TASKMODAL); + return; + } + + Result = StartSoundThread(Instance); + if ( Result != MMSYSERR_NOERROR ) + { + MessageBox(0, L"Fail 2", L"Fail 2", MB_OK | MB_TASKMODAL); + return; + } + + MessageBox(0, L"Click to kill thread", L"Bai", MB_OK | MB_TASKMODAL); + + StopSoundThread(Instance); +/* + P + +MMRESULT +CreateSoundThread( + IN PSOUND_DEVICE_INSTANCE Instance, + OUT PSOUND_THREAD* Thread); +*/ +} + + +int APIENTRY wWinMain( + HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nCmdShow) +{ + TestThreading(); + MessageBox(0, L"Le end", L"Bai", MB_OK | MB_TASKMODAL); + return 0; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/testing.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,230 @@ +/* + ReactOS Sound System + MME Driver Helper + + Purpose: + Sound device processing thread + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +/* + This is used internally by the internal routines + (my, how recursive of you...) +*/ + +#include <windows.h> +#include <mmsystem.h> + +#include <mmebuddy.h> + +DWORD WINAPI +SoundThreadProc( + IN LPVOID lpParameter) +{ + PSOUND_DEVICE_INSTANCE Instance; + PSOUND_THREAD Thread; + HANDLE Events[2]; + + Instance = (PSOUND_DEVICE_INSTANCE) lpParameter; + Thread = Instance->Thread; + + Events[0] = Thread->KillEvent; + Events[1] = Thread->RequestEvent; + + Thread->Running = TRUE; + + MessageBox(0, L"Hi from thread!", L"Hi!", MB_OK | MB_TASKMODAL); + + while ( Thread->Running ) + { + DWORD Signalled = 0; + + Signalled = WaitForMultipleObjects(2, Events, FALSE, INFINITE); + + if ( Signalled == WAIT_OBJECT_0 ) + { + Thread->Running = FALSE; + } + else if ( Signalled == WAIT_OBJECT_0 + 1 ) + { + /* ... */ + } + } + + MessageBox(0, L"Bye from thread!", L"Bye!", MB_OK | MB_TASKMODAL); + + ExitThread(0); + return 0; +} + +MMRESULT +CreateThreadEvents( + IN PSOUND_THREAD Thread) +{ + /* Create the request event */ + Thread->RequestEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ! Thread->RequestEvent ) + { + return MMSYSERR_NOMEM; + } + + /* Create the request completion event */ + Thread->RequestCompletionEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ! Thread->RequestCompletionEvent ) + { + CloseHandle(Thread->RequestEvent); + return MMSYSERR_NOMEM; + } + + /* Create the kill event */ + Thread->KillEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ! Thread->KillEvent ) + { + CloseHandle(Thread->RequestCompletionEvent); + CloseHandle(Thread->RequestEvent); + return MMSYSERR_NOMEM; + } + + return MMSYSERR_NOERROR; +} + +MMRESULT +DestroyThreadEvents( + IN PSOUND_THREAD Thread) +{ + CloseHandle(Thread->RequestEvent); + CloseHandle(Thread->RequestCompletionEvent); + CloseHandle(Thread->KillEvent); + + return MMSYSERR_NOERROR; +} + + +MMRESULT +StartSoundThread( + IN PSOUND_DEVICE_INSTANCE Instance) +{ + PSOUND_THREAD SoundThread = NULL; + + /* Validate parameters */ + if ( ! Instance ) + return MMSYSERR_INVALPARAM; + + /* Only allowed one thread per instance */ + if ( Instance->Thread ) + return MMSYSERR_ERROR; + + /* Allocate memory for the thread info */ + SoundThread = (PSOUND_THREAD) HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SOUND_THREAD)); + + if ( ! SoundThread ) + return MMSYSERR_NOMEM; + + /* Initialise */ + SoundThread->Running = FALSE; + SoundThread->Handle = INVALID_HANDLE_VALUE; + SoundThread->FirstOperation = NULL; + + /* Create the events */ + if ( CreateThreadEvents(SoundThread) != MMSYSERR_NOERROR ) + { + HeapFree(GetProcessHeap(), 0, SoundThread); + return MMSYSERR_NOMEM; + } + + if ( ! SoundThread->RequestEvent ) + { + CloseHandle(SoundThread->RequestEvent); + HeapFree(GetProcessHeap(), 0, SoundThread); + return MMSYSERR_NOMEM; + } + + /* Do the creation thang */ + SoundThread->Handle = CreateThread(NULL, + 0, + &SoundThreadProc, + (LPVOID) Instance, + CREATE_SUSPENDED, + NULL); + + if (SoundThread->Handle == INVALID_HANDLE_VALUE ) + { + HeapFree(GetProcessHeap(), 0, SoundThread); + return Win32ErrorToMmResult(GetLastError()); + } + + /* Assign the thread to the instance */ + Instance->Thread = SoundThread; + + /* Go! */ + ResumeThread(SoundThread->Handle); + + return MMSYSERR_NOERROR; +} + +MMRESULT +StopSoundThread( + IN PSOUND_DEVICE_INSTANCE Instance) +{ + if ( ! Instance ) + return MMSYSERR_INVALPARAM; + + if ( ! Instance->Thread ) + return MMSYSERR_ERROR; + + /* Make the thread quit */ + Instance->Thread->Running = FALSE; + + /* Wait for the thread to respond to our gentle nudge */ + SetEvent(Instance->Thread->KillEvent); + WaitForSingleObject(Instance->Thread, INFINITE); + CloseHandle(Instance->Thread); /* correct way? */ + + /* TODO: A bunch of other stuff - WAIT for thread to die */ + /* Also clean up the events */ + + DestroyThreadEvents(Instance->Thread); + HeapFree(GetProcessHeap(), 0, Instance->Thread); + + return MMSYSERR_NOERROR; +} + + +/* + Thread must be started before calling this! +*/ + +MMRESULT +AddSoundThreadOperation( + PSOUND_DEVICE_INSTANCE Instance, + DWORD OperationId, + SOUND_THREAD_OPERATION OperationFunc) +{ + /*SOUND_THREAD_OPERATION OriginalFirstOp;*/ + + if ( ! Instance ) + return MMSYSERR_INVALPARAM; + + if ( ! OperationFunc ) + return MMSYSERR_INVALPARAM; + + if ( ! Instance->Thread ) + return MMSYSERR_ERROR; + +/* + OriginalFirstOp = Instance->Thread->FirstOperation; + Instance->Thread->FirstOperation->Next = +*/ + + return MMSYSERR_NOTSUPPORTED; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,63 @@ +/* + ReactOS Sound System + MME Driver Helper + + Purpose: + Utility functions + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmsystem.h> + +ULONG +GetDigitCount( + ULONG Number) +{ + ULONG Value = Number; + ULONG Digits = 1; + + while ( Value > 9 ) + { + Value /= 10; + ++ Digits; + } + + return Digits; +} + +MMRESULT +Win32ErrorToMmResult(UINT error_code) +{ + switch ( error_code ) + { + case NO_ERROR : + case ERROR_IO_PENDING : + return MMSYSERR_NOERROR; + + case ERROR_BUSY : + return MMSYSERR_ALLOCATED; + + case ERROR_NOT_SUPPORTED : + case ERROR_INVALID_FUNCTION : + return MMSYSERR_NOTSUPPORTED; + + case ERROR_NOT_ENOUGH_MEMORY : + return MMSYSERR_NOMEM; + + case ERROR_ACCESS_DENIED : + return MMSYSERR_BADDEVICEID; + + case ERROR_INSUFFICIENT_BUFFER : + return MMSYSERR_INVALPARAM; + }; + + /* If all else fails, it's just a plain old error */ + + return MMSYSERR_ERROR; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -1,0 +1,38 @@ +/* + ReactOS Sound System + MME Driver Helper + + Purpose: + Wave thread operations + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 4 July 2008 - Created +*/ + +#include <windows.h> +#include <mmsystem.h> + +#include <mmebuddy.h> + +MMRESULT +StartWaveThread( + IN PSOUND_DEVICE_INSTANCE Instance) +{ + MMRESULT Result; + + if ( ! Instance ) + return MMSYSERR_INVALPARAM; + + /* Kick off the thread */ + Result = StartSoundThread(Instance); + if ( Result != MMSYSERR_NOERROR ) + { + return Result; + } + + /* AddSoundThreadOperation(Instance, 69, SayHello); */ + return MMSYSERR_NOTSUPPORTED; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/lib/drivers/sound/sound.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/sound.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/sound.rbuild [iso-8859-1] Fri Jul 4 21:43:17 2008 @@ -13,4 +13,7 @@ <directory name="uartmidi"> <xi:include href="uartmidi/uartmidi.rbuild" /> </directory> + <directory name="mmebuddy"> + <xi:include href="mmebuddy/mmebuddy.rbuild" /> + </directory> </group>

1 0

[cfinck] 34298: Convert the dnsapi stuff to a consistent 4 spaces indentation
by cfinck＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: cfinck Date: Fri Jul 4 17:41:28 2008 New Revision: 34298 URL: http://svn.reactos.org/svn/reactos?rev=34298&view=rev Log: Convert the dnsapi stuff to a consistent 4 spaces indentation Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/adns.c trunk/reactos/dll/win32/dnsapi/dnsapi/context.c trunk/reactos/dll/win32/dnsapi/dnsapi/free.c trunk/reactos/dll/win32/dnsapi/dnsapi/names.c trunk/reactos/dll/win32/dnsapi/dnsapi/query.c trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c trunk/reactos/dll/win32/dnsapi/include/internal/windns.h Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/adns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/ad… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/adns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/adns.c [iso-8859-1] Fri Jul 4 17:41:28 2008 @@ -13,14 +13,17 @@ #define NDEBUG #include <debug.h> -DNS_STATUS DnsIntTranslateAdnsToDNS_STATUS( int Status ) { - switch( Status ) { - case adns_s_ok: - return ERROR_SUCCESS; - case adns_s_nomemory: - case adns_s_systemfail: - default: /* There really aren't any general errors in the dns part. */ - return ERROR_OUTOFMEMORY; - } +DNS_STATUS +DnsIntTranslateAdnsToDNS_STATUS(int Status) +{ + switch(Status) + { + case adns_s_ok: + return ERROR_SUCCESS; + + case adns_s_nomemory: + case adns_s_systemfail: + default: /* There really aren't any general errors in the dns part. */ + return ERROR_OUTOFMEMORY; + } } - Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/co… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/context.c [iso-8859-1] Fri Jul 4 17:41:28 2008 @@ -30,96 +30,95 @@ * TODO: Which ones area allowed? */ -extern DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8 -( DWORD CredentialsFlags, - PVOID Credentials, - HANDLE *ContextHandle ); +extern DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8(DWORD CredentialsFlags, PVOID Credentials, HANDLE *ContextHandle); -DNS_STATUS WINAPI DnsAcquireContextHandle_W -( DWORD CredentialsFlags, - PVOID Credentials, - HANDLE *ContextHandle ) { - if( CredentialsFlags ) { - PWINDNS_CONTEXT Context; - int adns_status; +DNS_STATUS WINAPI +DnsAcquireContextHandle_W(DWORD CredentialsFlags, + PVOID Credentials, + HANDLE *ContextHandle) +{ + if(CredentialsFlags) + { + PWINDNS_CONTEXT Context; + int adns_status; - /* For now, don't worry about the user's identity. */ - Context = (PWINDNS_CONTEXT)RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof( WINDNS_CONTEXT ) ); + /* For now, don't worry about the user's identity. */ + Context = (PWINDNS_CONTEXT)RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(WINDNS_CONTEXT)); - if(!Context){ - *ContextHandle = 0; - return ERROR_OUTOFMEMORY; + if(!Context) + { + *ContextHandle = 0; + return ERROR_OUTOFMEMORY; + } + + /* The real work here is to create an adns_state that will help us + * do what we want to later. */ + adns_status = adns_init(&Context->State, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn, 0); + + if(adns_status != adns_s_ok) + { + *ContextHandle = 0; + RtlFreeHeap(RtlGetProcessHeap(), 0, Context); + return DnsIntTranslateAdnsToDNS_STATUS(adns_status); + } + else + { + *ContextHandle = (HANDLE)Context; + return ERROR_SUCCESS; + } } - - /* The real work here is to create an adns_state that will help us - * do what we want to later. */ - adns_status = adns_init( &Context->State, - adns_if_noenv | - adns_if_noerrprint | - adns_if_noserverwarn, - 0 ); - if( adns_status != adns_s_ok ) { - *ContextHandle = 0; - RtlFreeHeap( RtlGetProcessHeap(), 0, Context ); - return DnsIntTranslateAdnsToDNS_STATUS( adns_status ); - } else { - *ContextHandle = (HANDLE)Context; - return ERROR_SUCCESS; + else + { + return DnsAcquireContextHandle_UTF8(CredentialsFlags, Credentials, ContextHandle); } - } else { - return DnsAcquireContextHandle_UTF8( CredentialsFlags, - Credentials, - ContextHandle ); - } } -DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8 -( DWORD CredentialsFlags, - PVOID Credentials, - HANDLE *ContextHandle ) { - if( CredentialsFlags ) { - return DnsAcquireContextHandle_W( CredentialsFlags, - Credentials, - ContextHandle ); - } else { - /* Convert to unicode, then call the _W version - * For now, there is no conversion */ - DNS_STATUS Status; +DNS_STATUS WINAPI +DnsAcquireContextHandle_UTF8(DWORD CredentialsFlags, + PVOID Credentials, + HANDLE *ContextHandle) +{ + if( CredentialsFlags ) + { + return DnsAcquireContextHandle_W(CredentialsFlags, Credentials, ContextHandle); + } + else + { + /* Convert to unicode, then call the _W version + * For now, there is no conversion */ + DNS_STATUS Status; - Status = DnsAcquireContextHandle_W( TRUE, - Credentials, /* XXX arty */ - ContextHandle ); + Status = DnsAcquireContextHandle_W(TRUE, Credentials, /* XXX arty */ ContextHandle); - /* Free the unicode credentials when they exist. */ + /* Free the unicode credentials when they exist. */ - return Status; - } + return Status; + } } -DNS_STATUS WINAPI DnsAcquireContextHandle_A -( DWORD CredentialFlags, - PVOID Credentials, - HANDLE *ContextHandle ) { - if( CredentialFlags ) { - return DnsAcquireContextHandle_W( CredentialFlags, - Credentials, - ContextHandle ); - } else { - return DnsAcquireContextHandle_UTF8( CredentialFlags, - Credentials, - ContextHandle ); - } +DNS_STATUS WINAPI +DnsAcquireContextHandle_A(DWORD CredentialFlags, + PVOID Credentials, + HANDLE *ContextHandle) +{ + if(CredentialFlags) + { + return DnsAcquireContextHandle_W(CredentialFlags, Credentials, ContextHandle); + } + else + { + return DnsAcquireContextHandle_UTF8(CredentialFlags, Credentials, ContextHandle); + } } + /* DnsReleaseContextHandle ************* * Release a context handle, freeing all resources. */ +void WINAPI +DnsReleaseContextHandle(HANDLE ContextHandle) +{ + PWINDNS_CONTEXT Context = (PWINDNS_CONTEXT)ContextHandle; -void WINAPI DnsReleaseContextHandle -( HANDLE ContextHandle ) { - PWINDNS_CONTEXT Context = (PWINDNS_CONTEXT)ContextHandle; - adns_finish( Context->State ); - RtlFreeHeap( RtlGetProcessHeap(), 0, Context ); + adns_finish(Context->State); + RtlFreeHeap(RtlGetProcessHeap(), 0, Context); } - - Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/free.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/fr… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/free.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/free.c [iso-8859-1] Fri Jul 4 17:41:28 2008 @@ -13,24 +13,29 @@ #define NDEBUG #include <debug.h> -VOID WINAPI DnsFree -( PVOID Data, DNS_FREE_TYPE FreeType ) { - switch( FreeType ) { - case DnsFreeFlat: - RtlFreeHeap( RtlGetProcessHeap(), 0, Data ); - break; +VOID WINAPI +DnsFree(PVOID Data, + DNS_FREE_TYPE FreeType) +{ + switch(FreeType) + { + case DnsFreeFlat: + RtlFreeHeap( RtlGetProcessHeap(), 0, Data ); + break; - case DnsFreeRecordList: - DnsIntFreeRecordList( (PDNS_RECORD)Data ); - break; + case DnsFreeRecordList: + DnsIntFreeRecordList( (PDNS_RECORD)Data ); + break; - case DnsFreeParsedMessageFields: - /* assert( FALSE ); XXX arty not yet implemented. */ - break; - } + case DnsFreeParsedMessageFields: + /* assert( FALSE ); XXX arty not yet implemented. */ + break; + } } -VOID WINAPI DnsRecordListFree -( PDNS_RECORD Data, DNS_FREE_TYPE FreeType ) { - DnsFree( Data, FreeType ); +VOID WINAPI +DnsRecordListFree(PDNS_RECORD Data, + DNS_FREE_TYPE FreeType) +{ + DnsFree(Data, FreeType); } Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/names.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/na… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/names.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/names.c [iso-8859-1] Fri Jul 4 17:41:28 2008 @@ -3,16 +3,22 @@ #define NDEBUG #include <debug.h> -static BOOL DnsIntNameContainsDots( LPCWSTR Name ) { - return wcschr( Name, '.' ) ? TRUE : FALSE; -} - -static BOOL DnsIntTwoConsecutiveDots( LPCWSTR Name ) { - return wcsstr( Name, L".." ) ? TRUE : FALSE; -} - -static BOOL DnsIntContainsUnderscore( LPCWSTR Name ) { - return wcschr( Name, '_' ) ? TRUE : FALSE; +static BOOL +DnsIntNameContainsDots(LPCWSTR Name) +{ + return wcschr(Name, '.') ? TRUE : FALSE; +} + +static BOOL +DnsIntTwoConsecutiveDots(LPCWSTR Name) +{ + return wcsstr(Name, L"..") ? TRUE : FALSE; +} + +static BOOL +DnsIntContainsUnderscore(LPCWSTR Name) +{ + return wcschr(Name, '_') ? TRUE : FALSE; } /* DnsValidateName ********************* @@ -47,113 +53,126 @@ * If the name contains a non-ascii character. */ -DNS_STATUS WINAPI DnsValidateName_W -( LPCWSTR Name, - DNS_NAME_FORMAT Format ) { - BOOL AllowDot = FALSE; - BOOL AllowLeadingAst = FALSE; - BOOL AllowLeadingUnderscore = FALSE; - BOOL AllowAllDigits = FALSE; - const WCHAR *NextLabel, *CurrentLabel, *CurrentChar; - - switch( Format ) { - case DnsNameDomain: - AllowAllDigits = TRUE; - AllowDot = TRUE; - break; - case DnsNameDomainLabel: - AllowAllDigits = TRUE; - break; - case DnsNameHostnameFull: - AllowDot = TRUE; - break; - case DnsNameHostnameLabel: - break; - case DnsNameWildcard: - AllowLeadingAst = TRUE; - AllowDot = TRUE; - break; - case DnsNameSrvRecord: - AllowLeadingUnderscore = TRUE; - break; - default: - break; - } - - /* Preliminary checks */ - if( Name[0] == 0 ) return ERROR_INVALID_NAME; /* XXX arty: Check this */ - - /* Name too long */ - if( wcslen( Name ) > 255 ) { - return ERROR_INVALID_NAME; - } - - /* Violations about dots */ - if( (!AllowDot && DnsIntNameContainsDots( Name )) || - Name[0] == '.' || DnsIntTwoConsecutiveDots( Name ) ) - return ERROR_INVALID_NAME; - - /* Check component sizes */ - CurrentLabel = Name; - do { - NextLabel = CurrentLabel; - while( *NextLabel && *NextLabel != '.' ) NextLabel++; - - if( NextLabel - CurrentLabel > 63 ) - return ERROR_INVALID_NAME; - - CurrentLabel = NextLabel; - } while( *CurrentLabel ); - - CurrentChar = Name; - - while( *CurrentChar ) { - if( wcschr(L" {|}~[\\]^':;<=>?@!\"#$%^`()+/,",*CurrentChar) ) - return DNS_ERROR_INVALID_NAME_CHAR; - CurrentChar++; - } - - if( (!AllowLeadingAst && Name[0] == '*') || - (AllowLeadingAst && Name[0] == '*' && Name[1] && Name[1] != '.') ) - return DNS_ERROR_INVALID_NAME_CHAR; - - if( wcschr( Name + 1, '*' ) ) - return DNS_ERROR_INVALID_NAME_CHAR; - - CurrentChar = Name; - while( !AllowAllDigits && *CurrentChar ) { - if( *CurrentChar == '.' || (*CurrentChar >= '0' && *CurrentChar <= '9') ) - return DNS_ERROR_NUMERIC_NAME; - } - - if( ((AllowLeadingUnderscore && Name[0] == '_') || Name[0] != '_') && - !DnsIntContainsUnderscore( Name + 1 ) ) - return DNS_ERROR_NON_RFC_NAME; - - return ERROR_SUCCESS; -} - -DNS_STATUS WINAPI DnsValidateName_UTF8 -( LPCSTR Name, - DNS_NAME_FORMAT Format ) { - PWCHAR Buffer; - int StrLenWc; - DNS_STATUS Status; - - StrLenWc = mbstowcs( NULL, Name, 0 ); - Buffer = RtlAllocateHeap( GetProcessHeap(), 0, - sizeof( WCHAR ) * (StrLenWc + 1) ); - mbstowcs( Buffer, Name, StrLenWc + 1 ); - Status = DnsValidateName_W( Buffer, Format ); - RtlFreeHeap( RtlGetProcessHeap(), 0, Buffer ); - - return Status; -} - -DNS_STATUS WINAPI DnsValidateName_A -( LPCSTR Name, - DNS_NAME_FORMAT Format ) { - return DnsValidateName_UTF8( Name, Format ); +DNS_STATUS WINAPI +DnsValidateName_W(LPCWSTR Name, + DNS_NAME_FORMAT Format) +{ + BOOL AllowDot = FALSE; + BOOL AllowLeadingAst = FALSE; + BOOL AllowLeadingUnderscore = FALSE; + BOOL AllowAllDigits = FALSE; + const WCHAR *NextLabel, *CurrentLabel, *CurrentChar; + + switch(Format) + { + case DnsNameDomain: + AllowAllDigits = TRUE; + AllowDot = TRUE; + break; + + case DnsNameDomainLabel: + AllowAllDigits = TRUE; + break; + + case DnsNameHostnameFull: + AllowDot = TRUE; + break; + + case DnsNameHostnameLabel: + break; + + case DnsNameWildcard: + AllowLeadingAst = TRUE; + AllowDot = TRUE; + break; + + case DnsNameSrvRecord: + AllowLeadingUnderscore = TRUE; + break; + + default: + break; + } + + /* Preliminary checks */ + if(Name[0] == 0) + return ERROR_INVALID_NAME; /* XXX arty: Check this */ + + /* Name too long */ + if(wcslen(Name) > 255) + return ERROR_INVALID_NAME; + + /* Violations about dots */ + if((!AllowDot && DnsIntNameContainsDots(Name)) || Name[0] == '.' || DnsIntTwoConsecutiveDots(Name)) + return ERROR_INVALID_NAME; + + /* Check component sizes */ + CurrentLabel = Name; + + do + { + NextLabel = CurrentLabel; + while(*NextLabel && *NextLabel != '.') + NextLabel++; + + if(NextLabel - CurrentLabel > 63) + return ERROR_INVALID_NAME; + + CurrentLabel = NextLabel; + } while(*CurrentLabel); + + CurrentChar = Name; + + while(*CurrentChar) + { + if(wcschr(L" {|}~[\\]^':;<=>?@!\"#$%^`()+/,",*CurrentChar)) + return DNS_ERROR_INVALID_NAME_CHAR; + + CurrentChar++; + } + + if((!AllowLeadingAst && Name[0] == '*') || (AllowLeadingAst && Name[0] == '*' && Name[1] && Name[1] != '.')) + return DNS_ERROR_INVALID_NAME_CHAR; + + if(wcschr(Name + 1, '*')) + return DNS_ERROR_INVALID_NAME_CHAR; + + CurrentChar = Name; + + while(!AllowAllDigits && *CurrentChar) + { + if(*CurrentChar == '.' || (*CurrentChar >= '0' && *CurrentChar <= '9')) + return DNS_ERROR_NUMERIC_NAME; + } + + if(((AllowLeadingUnderscore && Name[0] == '_') || Name[0] != '_') && !DnsIntContainsUnderscore(Name + 1)) + return DNS_ERROR_NON_RFC_NAME; + + return ERROR_SUCCESS; +} + +DNS_STATUS WINAPI +DnsValidateName_UTF8(LPCSTR Name, + DNS_NAME_FORMAT Format) +{ + PWCHAR Buffer; + int StrLenWc; + DNS_STATUS Status; + + StrLenWc = mbstowcs(NULL, Name, 0); + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(WCHAR) * (StrLenWc + 1)); + mbstowcs(Buffer, Name, StrLenWc + 1); + Status = DnsValidateName_W(Buffer, Format); + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + return Status; +} + +DNS_STATUS WINAPI +DnsValidateName_A(LPCSTR Name, + DNS_NAME_FORMAT Format) +{ + return DnsValidateName_UTF8(Name, Format); } /* DnsNameCompare ********************** @@ -161,36 +180,39 @@ * * Name1 & Name2 -- Names. */ - -BOOL WINAPI DnsNameCompare_W -( LPWSTR Name1, - LPWSTR Name2 ) { - int offset = 0; - - while( Name1[offset] && Name2[offset] && - towupper( Name1[offset] ) == towupper( Name2[offset] ) ) offset++; - return - (!Name1[offset] && !Name2[offset]) || - (!Name1[offset] && !wcscmp( Name2 + offset, L"." )) || - (!Name2[offset] && !wcscmp( Name1 + offset, L"." )); -} - -BOOL WINAPI DnsNameCompare_UTF8 -( LPCSTR Name1, - LPCSTR Name2 ) { - int offset = 0; - - while( Name1[offset] && Name2[offset] && - toupper( Name1[offset] ) == toupper( Name2[offset] ) ) offset++; - return - (!Name1[offset] && !Name2[offset]) || - (!Name1[offset] && !strcmp( Name2 + offset, ".")) || - (!Name2[offset] && !strcmp( Name1 + offset, ".")); -} - -BOOL WINAPI DnsNameCompare_A -( LPSTR Name1, - LPSTR Name2 ) { - return DnsNameCompare_UTF8( Name1, Name2 ); -} - +BOOL WINAPI +DnsNameCompare_W(LPWSTR Name1, + LPWSTR Name2) +{ + int offset = 0; + + while(Name1[offset] && Name2[offset] && towupper(Name1[offset]) == towupper(Name2[offset])) + offset++; + + return + (!Name1[offset] && !Name2[offset]) || + (!Name1[offset] && !wcscmp(Name2 + offset, L".")) || + (!Name2[offset] && !wcscmp(Name1 + offset, L".")); +} + +BOOL WINAPI +DnsNameCompare_UTF8(LPCSTR Name1, + LPCSTR Name2) +{ + int offset = 0; + + while(Name1[offset] && Name2[offset] && toupper(Name1[offset]) == toupper(Name2[offset])) + offset++; + + return + (!Name1[offset] && !Name2[offset]) || + (!Name1[offset] && !strcmp(Name2 + offset, ".")) || + (!Name2[offset] && !strcmp(Name1 + offset, ".")); +} + +BOOL WINAPI +DnsNameCompare_A(LPSTR Name1, + LPSTR Name2) +{ + return DnsNameCompare_UTF8(Name1, Name2); +} Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Fri Jul 4 17:41:28 2008 @@ -31,312 +31,317 @@ * Reserved -- Response as it appears on the wire. Optional. */ -char *xstrsave(const char *str) { - char *p; - - p = RtlAllocateHeap( RtlGetProcessHeap(), 0, strlen(str)+1 ); - if ( NULL != p ) { - strcpy(p,str); - } - return p; -} - -DNS_STATUS WINAPI DnsQuery_A -( LPCSTR Name, - WORD Type, - DWORD Options, - PIP4_ARRAY Servers, - PDNS_RECORD *QueryResultSet, - PVOID *Reserved ) { - adns_state astate; - int quflags = 0, i; - int adns_error; - adns_answer *answer; - LPSTR CurrentName; - unsigned CNameLoop; - - *QueryResultSet = 0; - - switch( Type ) { - case DNS_TYPE_A: - adns_error = adns_init( &astate, - adns_if_noenv | - adns_if_noerrprint | - adns_if_noserverwarn | - (Servers ? adns_if_noserver : 0), - 0 ); - - if( adns_error != adns_s_ok ) { - return DnsIntTranslateAdnsToDNS_STATUS( adns_error ); +char +*xstrsave(const char *str) +{ + char *p; + + p = RtlAllocateHeap(RtlGetProcessHeap(), 0, strlen(str) + 1); + + if(p) + strcpy(p, str); + + return p; +} + +DNS_STATUS WINAPI +DnsQuery_A(LPCSTR Name, + WORD Type, + DWORD Options, + PIP4_ARRAY Servers, + PDNS_RECORD *QueryResultSet, + PVOID *Reserved) +{ + adns_state astate; + int quflags = 0, i; + int adns_error; + adns_answer *answer; + LPSTR CurrentName; + unsigned CNameLoop; + + *QueryResultSet = 0; + + switch(Type) + { + case DNS_TYPE_A: + adns_error = adns_init(&astate, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn | (Servers ? adns_if_noserver : 0), 0); + + if(adns_error != adns_s_ok) + return DnsIntTranslateAdnsToDNS_STATUS(adns_error); + + if (Servers) + { + for(i = 0; i < Servers->AddrCount; i++) + { + adns_addserver(astate, *((struct in_addr *)&Servers->AddrArray[i])); + } + } + + /* + * adns doesn't resolve chained CNAME records (a CNAME which points to + * another CNAME pointing to another... pointing to an A record), according + * to a mailing list thread the authors believe that chained CNAME records + * are invalid and the DNS entries should be fixed. That's a nice academic + * standpoint, but there certainly are chained CNAME records out there, + * even some fairly major ones (at the time of this writing + * download.mozilla.org is a chained CNAME). Everyone else seems to resolve + * these fine, so we should too. So we loop here to try to resolve CNAME + * chains ourselves. Of course, there must be a limit to protect against + * CNAME loops. + */ + +#define CNAME_LOOP_MAX 16 + + CurrentName = (LPSTR) Name; + + for (CNameLoop = 0; CNameLoop < CNAME_LOOP_MAX; CNameLoop++) + { + adns_error = adns_synchronous(astate, CurrentName, adns_r_addr, quflags, &answer); + + if(adns_error != adns_s_ok) + { + adns_finish(astate); + + if (CurrentName != Name) + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); + + return DnsIntTranslateAdnsToDNS_STATUS(adns_error); + } + + if(answer && answer->rrs.addr) + { + if (CurrentName != Name) + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); + + *QueryResultSet = (PDNS_RECORD)RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + + if (NULL == *QueryResultSet) + { + adns_finish( astate ); + return ERROR_OUTOFMEMORY; + } + + (*QueryResultSet)->pNext = NULL; + (*QueryResultSet)->wType = Type; + (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); + (*QueryResultSet)->Data.A.IpAddress = answer->rrs.addr->addr.inet.sin_addr.s_addr; + + adns_finish(astate); + + (*QueryResultSet)->pName = xstrsave( Name ); + + return NULL != (*QueryResultSet)->pName ? ERROR_SUCCESS : ERROR_OUTOFMEMORY; + } + + if (NULL == answer || adns_s_prohibitedcname != answer->status || NULL == answer->cname) + { + adns_finish(astate); + + if (CurrentName != Name) + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); + + return ERROR_FILE_NOT_FOUND; + } + + if (CurrentName != Name) + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); + + CurrentName = xstrsave(answer->cname); + + if (!CurrentName) + { + adns_finish(astate); + return ERROR_OUTOFMEMORY; + } + } + + adns_finish(astate); + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); + return ERROR_FILE_NOT_FOUND; + + default: + return ERROR_OUTOFMEMORY; /* XXX arty: find a better error code. */ } - - if (Servers) { - for( i = 0; i < Servers->AddrCount; i++ ) { - adns_addserver( astate, *((struct in_addr *)&Servers->AddrArray[i]) ); - } +} + +static PCHAR +DnsWToC(const WCHAR *WideString) +{ + int chars = wcstombs(NULL, WideString, 0); + PCHAR out = RtlAllocateHeap(RtlGetProcessHeap(), 0, chars + 1); + + wcstombs(out, WideString, chars + 1); + + return out; +} + +static PWCHAR +DnsCToW(const CHAR *NarrowString) +{ + int chars = mbstowcs(NULL, NarrowString, 0); + PWCHAR out = RtlAllocateHeap(RtlGetProcessHeap(), 0, (chars + 1) * sizeof(WCHAR)); + + mbstowcs(out, NarrowString, chars + 1); + + return out; +} + +DNS_STATUS WINAPI +DnsQuery_W(LPCWSTR Name, + WORD Type, + DWORD Options, + PIP4_ARRAY Servers, + PDNS_RECORD *QueryResultSet, + PVOID *Reserved) +{ + UINT i; + PCHAR Buffer; + DNS_STATUS Status; + PDNS_RECORD QueryResultWide; + PDNS_RECORD ConvertedRecord = 0, LastRecord = 0; + + Buffer = DnsWToC(Name); + + Status = DnsQuery_A(Buffer, Type, Options, Servers, &QueryResultWide, Reserved); + + while(Status == ERROR_SUCCESS && QueryResultWide) + { + switch(QueryResultWide->wType) + { + case DNS_TYPE_A: + case DNS_TYPE_WKS: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + ConvertedRecord->pName = (PCHAR)DnsCToW(QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = QueryResultWide->wDataLength; + memcpy(ConvertedRecord, QueryResultWide, QueryResultWide->wDataLength); + break; + + case DNS_TYPE_CNAME: + case DNS_TYPE_PTR: + case DNS_TYPE_NS: + case DNS_TYPE_MB: + case DNS_TYPE_MD: + case DNS_TYPE_MF: + case DNS_TYPE_MG: + case DNS_TYPE_MR: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + ConvertedRecord->pName = (PCHAR)DnsCToW(QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = sizeof(DNS_PTR_DATA); + ConvertedRecord->Data.PTR.pNameHost = (PCHAR)DnsCToW(QueryResultWide->Data.PTR.pNameHost); + break; + + case DNS_TYPE_MINFO: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + ConvertedRecord->pName = (PCHAR)DnsCToW(QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = sizeof(DNS_MINFO_DATA); + ConvertedRecord->Data.MINFO.pNameMailbox = (PCHAR)DnsCToW(QueryResultWide->Data.MINFO.pNameMailbox); + ConvertedRecord->Data.MINFO.pNameErrorsMailbox = (PCHAR)DnsCToW(QueryResultWide->Data.MINFO.pNameErrorsMailbox); + break; + + case DNS_TYPE_MX: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + ConvertedRecord->pName = (PCHAR)DnsCToW(QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = sizeof(DNS_MX_DATA); + ConvertedRecord->Data.MX.pNameExchange = (PCHAR)DnsCToW( QueryResultWide->Data.MX.pNameExchange); + ConvertedRecord->Data.MX.wPreference = QueryResultWide->Data.MX.wPreference; + break; + + case DNS_TYPE_HINFO: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_TXT_DATA) + QueryResultWide->Data.TXT.dwStringCount); + ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = sizeof(DNS_TXT_DATA) + (sizeof(PWCHAR) * QueryResultWide->Data.TXT.dwStringCount); + ConvertedRecord->Data.TXT.dwStringCount = QueryResultWide->Data.TXT.dwStringCount; + + for(i = 0; i < ConvertedRecord->Data.TXT.dwStringCount; i++) + ConvertedRecord->Data.TXT.pStringArray[i] = (PCHAR)DnsCToW(QueryResultWide->Data.TXT.pStringArray[i]); + + break; + + case DNS_TYPE_NULL: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_NULL_DATA) + QueryResultWide->Data.Null.dwByteCount); + ConvertedRecord->pName = (PCHAR)DnsCToW(QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = sizeof(DNS_NULL_DATA) + QueryResultWide->Data.Null.dwByteCount; + ConvertedRecord->Data.Null.dwByteCount = QueryResultWide->Data.Null.dwByteCount; + memcpy(&ConvertedRecord->Data.Null.Data, &QueryResultWide->Data.Null.Data, QueryResultWide->Data.Null.dwByteCount); + break; + } + + if(LastRecord) + { + LastRecord->pNext = ConvertedRecord; + LastRecord = LastRecord->pNext; + } + else + { + LastRecord = *QueryResultSet = ConvertedRecord; + } } - /* - * adns doesn't resolve chained CNAME records (a CNAME which points to - * another CNAME pointing to another... pointing to an A record), according - * to a mailing list thread the authors believe that chained CNAME records - * are invalid and the DNS entries should be fixed. That's a nice academic - * standpoint, but there certainly are chained CNAME records out there, - * even some fairly major ones (at the time of this writing - * download.mozilla.org is a chained CNAME). Everyone else seems to resolve - * these fine, so we should too. So we loop here to try to resolve CNAME - * chains ourselves. Of course, there must be a limit to protect against - * CNAME loops. - */ - -#define CNAME_LOOP_MAX 16 - - CurrentName = (LPSTR) Name; - for ( CNameLoop = 0; CNameLoop < CNAME_LOOP_MAX; CNameLoop++ ) { - adns_error = adns_synchronous( astate, - CurrentName, - adns_r_addr, - quflags, - &answer ); - - if( adns_error != adns_s_ok ) { - adns_finish( astate ); - if ( CurrentName != Name ) { - RtlFreeHeap( RtlGetProcessHeap(), 0, CurrentName ); + LastRecord->pNext = 0; + + /* The name */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + return Status; +} + +DNS_STATUS WINAPI +DnsQuery_UTF8(LPCSTR Name, + WORD Type, + DWORD Options, + PIP4_ARRAY Servers, + PDNS_RECORD *QueryResultSet, + PVOID *Reserved) +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +void +DnsIntFreeRecordList(PDNS_RECORD ToDelete) +{ + UINT i; + PDNS_RECORD next = 0; + + while(ToDelete) + { + if(ToDelete->pName) + RtlFreeHeap(RtlGetProcessHeap(), 0, ToDelete->pName); + + switch(ToDelete->wType) + { + case DNS_TYPE_CNAME: + case DNS_TYPE_PTR: + case DNS_TYPE_NS: + case DNS_TYPE_MB: + case DNS_TYPE_MD: + case DNS_TYPE_MF: + case DNS_TYPE_MG: + case DNS_TYPE_MR: + RtlFreeHeap(RtlGetProcessHeap(), 0, ToDelete->Data.PTR.pNameHost); + break; + + case DNS_TYPE_MINFO: + case DNS_TYPE_MX: + RtlFreeHeap(RtlGetProcessHeap(), 0, ToDelete->Data.MX.pNameExchange); + break; + + case DNS_TYPE_HINFO: + for(i = 0; i < ToDelete->Data.TXT.dwStringCount; i++) + RtlFreeHeap(RtlGetProcessHeap(), 0, ToDelete->Data.TXT.pStringArray[i]); + + RtlFreeHeap(RtlGetProcessHeap(), 0, ToDelete->Data.TXT.pStringArray); + break; } - return DnsIntTranslateAdnsToDNS_STATUS( adns_error ); - } - - if( answer && answer->rrs.addr ) { - if ( CurrentName != Name ) { - RtlFreeHeap( RtlGetProcessHeap(), 0, CurrentName ); - } - *QueryResultSet = - (PDNS_RECORD)RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof( DNS_RECORD ) ); - if ( NULL == *QueryResultSet ) { - adns_finish( astate ); - return ERROR_OUTOFMEMORY; - } - (*QueryResultSet)->pNext = NULL; - (*QueryResultSet)->wType = Type; - (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); - (*QueryResultSet)->Data.A.IpAddress = - answer->rrs.addr->addr.inet.sin_addr.s_addr; - adns_finish( astate ); - (*QueryResultSet)->pName = xstrsave( Name ); - return NULL != (*QueryResultSet)->pName ? ERROR_SUCCESS : - ERROR_OUTOFMEMORY; - } - if ( NULL == answer || adns_s_prohibitedcname != answer->status || - NULL == answer->cname ) { - adns_finish( astate ); - if ( CurrentName != Name ) { - RtlFreeHeap( RtlGetProcessHeap(), 0, CurrentName ); - } - return ERROR_FILE_NOT_FOUND; - } - if ( CurrentName != Name ) { - RtlFreeHeap( RtlGetProcessHeap(), 0, CurrentName ); - } - CurrentName = xstrsave( answer->cname ); - if ( NULL == CurrentName ) { - adns_finish( astate ); - return ERROR_OUTOFMEMORY; - } + + next = ToDelete->pNext; + RtlFreeHeap(RtlGetProcessHeap(), 0, ToDelete); + ToDelete = next; } - adns_finish( astate ); - RtlFreeHeap( RtlGetProcessHeap(), 0, CurrentName ); - return ERROR_FILE_NOT_FOUND; - default: - return ERROR_OUTOFMEMORY; /* XXX arty: find a better error code. */ - } -} - -static PCHAR DnsWToC( const WCHAR *WideString ) { - int chars = wcstombs( NULL, WideString, 0 ); - PCHAR out = RtlAllocateHeap( RtlGetProcessHeap(), 0, chars + 1 ); - wcstombs( out, WideString, chars + 1 ); - return out; -} - -static PWCHAR DnsCToW( const CHAR *NarrowString ) { - int chars = mbstowcs( NULL, NarrowString, 0 ); - PWCHAR out = RtlAllocateHeap( RtlGetProcessHeap(), 0, - (chars + 1) * sizeof(WCHAR) ); - mbstowcs( out, NarrowString, chars + 1 ); - return out; -} - -DNS_STATUS WINAPI DnsQuery_W -( LPCWSTR Name, - WORD Type, - DWORD Options, - PIP4_ARRAY Servers, - PDNS_RECORD *QueryResultSet, - PVOID *Reserved ) { - UINT i; - PCHAR Buffer; - DNS_STATUS Status; - PDNS_RECORD QueryResultWide; - PDNS_RECORD ConvertedRecord = 0, LastRecord = 0; - - Buffer = DnsWToC( Name ); - - Status = DnsQuery_A( Buffer, Type, Options, Servers, &QueryResultWide, - Reserved ); - - while( Status == ERROR_SUCCESS && QueryResultWide ) { - switch( QueryResultWide->wType ) { - case DNS_TYPE_A: - case DNS_TYPE_WKS: - ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof(DNS_RECORD) ); - ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = QueryResultWide->wDataLength; - memcpy( ConvertedRecord, QueryResultWide, - QueryResultWide->wDataLength ); - break; - - case DNS_TYPE_CNAME: - case DNS_TYPE_PTR: - case DNS_TYPE_NS: - case DNS_TYPE_MB: - case DNS_TYPE_MD: - case DNS_TYPE_MF: - case DNS_TYPE_MG: - case DNS_TYPE_MR: - ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof(DNS_RECORD) ); - ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_PTR_DATA); - ConvertedRecord->Data.PTR.pNameHost = - (PCHAR)DnsCToW( QueryResultWide->Data.PTR.pNameHost ); - break; - case DNS_TYPE_MINFO: - ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof(DNS_RECORD) ); - ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_MINFO_DATA); - ConvertedRecord->Data.MINFO.pNameMailbox = - (PCHAR)DnsCToW( QueryResultWide->Data.MINFO.pNameMailbox ); - ConvertedRecord->Data.MINFO.pNameErrorsMailbox = - (PCHAR)DnsCToW( QueryResultWide->Data.MINFO.pNameErrorsMailbox ); - break; - - case DNS_TYPE_MX: - ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof(DNS_RECORD) ); - ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_MX_DATA); - ConvertedRecord->Data.MX.pNameExchange = - (PCHAR)DnsCToW( QueryResultWide->Data.MX.pNameExchange ); - ConvertedRecord->Data.MX.wPreference = - QueryResultWide->Data.MX.wPreference; - break; - - case DNS_TYPE_HINFO: - ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof(DNS_TXT_DATA) + - QueryResultWide-> - Data.TXT.dwStringCount ); - ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = - sizeof(DNS_TXT_DATA) + - (sizeof(PWCHAR) * QueryResultWide->Data.TXT.dwStringCount); - ConvertedRecord->Data.TXT.dwStringCount = - QueryResultWide->Data.TXT.dwStringCount; - for( i = 0; i < ConvertedRecord->Data.TXT.dwStringCount; i++ ) { - ConvertedRecord->Data.TXT.pStringArray[i] = - (PCHAR)DnsCToW( QueryResultWide->Data.TXT.pStringArray[i] ); - } - break; - - case DNS_TYPE_NULL: - ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof(DNS_NULL_DATA) + - QueryResultWide-> - Data.Null.dwByteCount ); - ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = - sizeof(DNS_NULL_DATA) + QueryResultWide->Data.Null.dwByteCount; - ConvertedRecord->Data.Null.dwByteCount = - QueryResultWide->Data.Null.dwByteCount; - memcpy( &ConvertedRecord->Data.Null.Data, - &QueryResultWide->Data.Null.Data, - QueryResultWide->Data.Null.dwByteCount ); - break; - - } - - if( LastRecord ) { - LastRecord->pNext = ConvertedRecord; - LastRecord = LastRecord->pNext; - } else { - LastRecord = *QueryResultSet = ConvertedRecord; - } - } - - LastRecord->pNext = 0; - - /* The name */ - RtlFreeHeap( RtlGetProcessHeap(), 0, Buffer ); - - return Status; -} - -DNS_STATUS WINAPI DnsQuery_UTF8 -( LPCSTR Name, - WORD Type, - DWORD Options, - PIP4_ARRAY Servers, - PDNS_RECORD *QueryResultSet, - PVOID *Reserved ) { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -void DnsIntFreeRecordList( PDNS_RECORD ToDelete ) { - UINT i; - PDNS_RECORD next = 0; - - while( ToDelete ) { - if( ToDelete->pName ) - RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete->pName ); - switch( ToDelete->wType ) { - case DNS_TYPE_CNAME: - case DNS_TYPE_PTR: - case DNS_TYPE_NS: - case DNS_TYPE_MB: - case DNS_TYPE_MD: - case DNS_TYPE_MF: - case DNS_TYPE_MG: - case DNS_TYPE_MR: - RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete->Data.PTR.pNameHost ); - break; - case DNS_TYPE_MINFO: - case DNS_TYPE_MX: - RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete->Data.MX.pNameExchange ); - break; - - case DNS_TYPE_HINFO: - for( i = 0; i < ToDelete->Data.TXT.dwStringCount; i++ ) { - RtlFreeHeap( RtlGetProcessHeap(), 0, - ToDelete->Data.TXT.pStringArray[i] ); - } - RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete->Data.TXT.pStringArray ); - break; - - } - - next = ToDelete->pNext; - RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete ); - ToDelete = next; - } -} +} Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/st… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] Fri Jul 4 17:41:28 2008 @@ -8,577 +8,807 @@ typedef ULONG DNS_STATUS; -DNS_STATUS WINAPI DnsAddRecordSet_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsAddRecordSet_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsAddRecordSet_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsAllocateRecord() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsApiHeapReset() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsAsyncRegisterHostAddrs_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsAsyncRegisterHostAddrs_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsAsyncRegisterHostAddrs_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsAsyncRegisterInit() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsAsyncRegisterTerm() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsCheckNameCollision_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsCheckNameCollision_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsCheckNameCollision_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsCopyStringEx() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsCreateReverseNameStringForIpAddress() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsCreateStandardDnsNameCopy() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsCreateStringCopy() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsDhcpSrvRegisterHostName_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsDhcpSrvRegisterInit() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsDhcpSrvRegisterTerm() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsDisableAdapterDomainNameRegistration() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsDisableBNodeResolverThread() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsDisableDynamicRegistration() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsDowncaseDnsNameLabel() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsEnableAdapterDomainNameRegistration() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsEnableBNodeResolverThread() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsEnableDynamicRegistration() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsExtractRecordsFromMessage_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsExtractRecordsFromMessage_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsFindAuthoritativeZone() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsFlushResolverCache() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsFlushResolverCacheEntry_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsFlushResolverCacheEntry_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsFlushResolverCacheEntry_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsFreeAdapterInformation() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsFreeNetworkInformation() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsFreeSearchInformation() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetBufferLengthForStringCopy() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetCacheDataTable() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetDnsServerList() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetDomainName() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetHostName_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetHostName_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetHostName_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetIpAddressInfoList() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetIpAddressList() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetLastServerUpdateIP() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetMaxNumberOfAddressesToRegister() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetNetworkInformation() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetPrimaryDomainName_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetPrimaryDomainName_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetPrimaryDomainName_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsGetSearchInformation() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsIpv6AddressToString() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsIpv6StringToAddress() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsIsAMailboxType() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsIsAdapterDomainNameRegistrationEnabled() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsIsDynamicRegistrationEnabled() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsIsStatusRcode() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsIsStringCountValidForTextType() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsMapRcodeToStatus() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsModifyRecordSet_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsModifyRecordSet_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsModifyRecordSet_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsModifyRecordsInSet_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsModifyRecordsInSet_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsNameCompareEx_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsNameCompareEx_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsNameCompareEx_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsNameCopy() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsNameCopyAllocate() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsQueryConfig() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsQueryEx() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRecordBuild_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRecordBuild_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRecordCompare() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRecordCopyEx() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRecordSetCompare() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRecordSetCopyEx() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRecordSetDetach() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRecordStringForType() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRecordStringForWritableType() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRecordTypeForName() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRelationalCompare_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRelationalCompare_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsRemoveRegistrations() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsReplaceRecordSetA() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsReplaceRecordSetUTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsReplaceRecordSetW() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsReplaceRecordSet_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsReplaceRecordSet_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsReplaceRecordSet_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsServiceNotificationDeregister_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsServiceNotificationDeregister_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsServiceNotificationDeregister_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsServiceNotificationRegister_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsServiceNotificationRegister_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsServiceNotificationRegister_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsSetMaxNumberOfAddressesToRegister() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsStatusString() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsStringCopyAllocateEx() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsUnicodeToUtf8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsUpdate() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsUpdateTest_A() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsUpdateTest_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsUpdateTest_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsUtf8ToUnicode() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsValidateUtf8Byte() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsWinsRecordFlagForString() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsWinsRecordFlagString() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsWriteQuestionToBuffer_UTF8() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsWriteQuestionToBuffer_W() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI DnsWriteReverseNameStringForIpAddress() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - -DNS_STATUS WINAPI GetCurrentTimeInSeconds() { - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} +DNS_STATUS WINAPI +DnsAddRecordSet_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsAddRecordSet_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsAddRecordSet_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsAllocateRecord() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsApiHeapReset() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsAsyncRegisterHostAddrs_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsAsyncRegisterHostAddrs_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsAsyncRegisterHostAddrs_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsAsyncRegisterInit() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsAsyncRegisterTerm() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsCheckNameCollision_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsCheckNameCollision_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsCheckNameCollision_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsCopyStringEx() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsCreateReverseNameStringForIpAddress() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsCreateStandardDnsNameCopy() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsCreateStringCopy() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsDhcpSrvRegisterHostName_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsDhcpSrvRegisterInit() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsDhcpSrvRegisterTerm() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsDisableAdapterDomainNameRegistration() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsDisableBNodeResolverThread() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsDisableDynamicRegistration() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsDowncaseDnsNameLabel() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsEnableAdapterDomainNameRegistration() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsEnableBNodeResolverThread() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsEnableDynamicRegistration() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsExtractRecordsFromMessage_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsExtractRecordsFromMessage_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsFindAuthoritativeZone() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsFlushResolverCache() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsFlushResolverCacheEntry_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsFlushResolverCacheEntry_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsFlushResolverCacheEntry_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsFreeAdapterInformation() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsFreeNetworkInformation() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsFreeSearchInformation() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetBufferLengthForStringCopy() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetCacheDataTable() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetDnsServerList() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetDomainName() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetHostName_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetHostName_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetHostName_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetIpAddressInfoList() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetIpAddressList() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetLastServerUpdateIP() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetMaxNumberOfAddressesToRegister() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetNetworkInformation() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetPrimaryDomainName_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetPrimaryDomainName_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetPrimaryDomainName_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsGetSearchInformation() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsIpv6AddressToString() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsIpv6StringToAddress() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsIsAMailboxType() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsIsAdapterDomainNameRegistrationEnabled() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsIsDynamicRegistrationEnabled() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsIsStatusRcode() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsIsStringCountValidForTextType() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsMapRcodeToStatus() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsModifyRecordSet_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsModifyRecordSet_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsModifyRecordSet_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsModifyRecordsInSet_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsModifyRecordsInSet_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsModifyRecordsInSet_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsNameCompareEx_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsNameCompareEx_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsNameCompareEx_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsNameCopy() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsNameCopyAllocate() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsQueryConfig() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsQueryEx() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRecordBuild_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRecordBuild_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRecordCompare() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRecordCopyEx() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRecordSetCompare() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRecordSetCopyEx() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRecordSetDetach() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRecordStringForType() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRecordStringForWritableType() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRecordTypeForName() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRelationalCompare_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRelationalCompare_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsRemoveRegistrations() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsReplaceRecordSetA() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsReplaceRecordSetUTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsReplaceRecordSetW() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsReplaceRecordSet_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsReplaceRecordSet_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsReplaceRecordSet_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsServiceNotificationDeregister_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsServiceNotificationDeregister_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsServiceNotificationDeregister_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsServiceNotificationRegister_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsServiceNotificationRegister_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsServiceNotificationRegister_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsSetMaxNumberOfAddressesToRegister() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsStatusString() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsStringCopyAllocateEx() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsUnicodeToUtf8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsUpdate() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsUpdateTest_A() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsUpdateTest_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsUpdateTest_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsUtf8ToUnicode() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsValidateUtf8Byte() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsWinsRecordFlagForString() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsWinsRecordFlagString() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsWriteQuestionToBuffer_UTF8() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsWriteQuestionToBuffer_W() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +DnsWriteReverseNameStringForIpAddress() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} + +DNS_STATUS WINAPI +GetCurrentTimeInSeconds() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} Modified: trunk/reactos/dll/win32/dnsapi/include/internal/windns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/include/i… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/include/internal/windns.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/include/internal/windns.h [iso-8859-1] Fri Jul 4 17:41:28 2008 @@ -3,11 +3,12 @@ #include "adns.h" -typedef struct { - adns_state State; +typedef struct +{ + adns_state State; } WINDNS_CONTEXT, *PWINDNS_CONTEXT; -DNS_STATUS DnsIntTranslateAdnsToDNS_STATUS( int Status ); -void DnsIntFreeRecordList( PDNS_RECORD ToFree ); +DNS_STATUS DnsIntTranslateAdnsToDNS_STATUS(int Status); +void DnsIntFreeRecordList(PDNS_RECORD ToFree); #endif//WINDNS_INTERNAL_H

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs