Author: hpoussin Date: Mon May 29 01:24:28 2006 New Revision: 22094
URL: http://svn.reactos.ru/svn/reactos?rev=22094&view=rev Log: Add newdev.h of the w32api package
Added: trunk/reactos/dll/win32/newdev/newdev_private.h - copied, changed from r22092, trunk/reactos/dll/win32/newdev/newdev.h trunk/reactos/include/newdev.h (with props) Removed: trunk/reactos/dll/win32/newdev/newdev.h Modified: trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/stubs.c trunk/reactos/dll/win32/newdev/wizard.c
Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?re... ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c (original) +++ trunk/reactos/dll/win32/newdev/newdev.c Mon May 29 01:24:28 2006 @@ -20,7 +20,7 @@ */
#define YDEBUG -#include "newdev.h" +#include "newdev_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(newdev);
Removed: trunk/reactos/dll/win32/newdev/newdev.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.h?re... ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.h (original) +++ trunk/reactos/dll/win32/newdev/newdev.h (removed) @@ -1,54 +1,0 @@ -#include <windows.h> -#include <windowsx.h> -#include <commctrl.h> -#include <regstr.h> -#include <setupapi.h> -#include <cfgmgr32.h> -#include <tchar.h> -#include <wine/debug.h> - -#include <stdio.h> - -#include "resource.h" - -extern HINSTANCE hDllInstance; - -typedef struct _DEVINSTDATA -{ - HFONT hTitleFont; - PBYTE buffer; - DWORD requiredSize; - DWORD regDataType; - HWND hDialog; - HDEVINFO hDevInfo; - SP_DEVINFO_DATA devInfoData; - SP_DRVINFO_DATA drvInfoData; - - LPTSTR CustomSearchPath; /* MULTI_SZ string */ -} DEVINSTDATA, *PDEVINSTDATA; - -#define WM_SEARCH_FINISHED (WM_USER + 10) -#define WM_INSTALL_FINISHED (WM_USER + 11) - -/* newdev.c */ -BOOL -SearchDriver( - IN PDEVINSTDATA DevInstData, - IN LPCTSTR Directory OPTIONAL, - IN LPCTSTR InfFile OPTIONAL); - -BOOL -SearchDriverRecursive( - IN PDEVINSTDATA DevInstData, - IN LPCTSTR Path); - -BOOL -InstallCurrentDriver( - IN PDEVINSTDATA DevInstData); - -/* wizard.c */ -BOOL -DisplayWizard( - IN PDEVINSTDATA DevInstData, - IN HWND hwndParent, - IN UINT startPage);
Copied: trunk/reactos/dll/win32/newdev/newdev_private.h (from r22092, trunk/reactos/dll/win32/newdev/newdev.h) URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/newdev_priv... ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.h (original) +++ trunk/reactos/dll/win32/newdev/newdev_private.h Mon May 29 01:24:28 2006 @@ -1,6 +1,10 @@ +#ifndef __NEWDEV_PRIVATE_H +#define __NEWDEV_PRIVATE_H + #include <windows.h> #include <windowsx.h> #include <commctrl.h> +#include <newdev.h> #include <regstr.h> #include <setupapi.h> #include <cfgmgr32.h> @@ -52,3 +56,5 @@ IN PDEVINSTDATA DevInstData, IN HWND hwndParent, IN UINT startPage); + +#endif /* __NEWDEV_PRIVATE_H */
Modified: trunk/reactos/dll/win32/newdev/stubs.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/stubs.c?rev... ============================================================================== --- trunk/reactos/dll/win32/newdev/stubs.c (original) +++ trunk/reactos/dll/win32/newdev/stubs.c Mon May 29 01:24:28 2006 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#include "newdev.h" +#include "newdev_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(newdev);
Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?re... ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c (original) +++ trunk/reactos/dll/win32/newdev/wizard.c Mon May 29 01:24:28 2006 @@ -19,7 +19,7 @@ */
#define YDEBUG -#include "newdev.h" +#include "newdev_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(newdev);
Added: trunk/reactos/include/newdev.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/newdev.h?rev=22094&a... ============================================================================== --- trunk/reactos/include/newdev.h (added) +++ trunk/reactos/include/newdev.h Mon May 29 01:24:28 2006 @@ -1,0 +1,70 @@ +/* + * newdev.h + * + * Driver installation DLL interface + * + * This file is part of the w32api package. + * + * Contributors: + * Created by Casper S. Hornstrup chorns@users.sourceforge.net + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#ifndef __NEWDEV_H +#define __NEWDEV_H + +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#pragma pack(push,4) + +/* UpdateDriverForPlugAndPlayDevices.InstallFlags constants */ +#define INSTALLFLAG_FORCE 0x00000001 +#define INSTALLFLAG_READONLY 0x00000002 +#define INSTALLFLAG_NONINTERACTIVE 0x00000004 +#define INSTALLFLAG_BITS 0x00000007 + +BOOL WINAPI +UpdateDriverForPlugAndPlayDevicesA( + HWND hwndParent, + LPCSTR HardwareId, + LPCSTR FullInfPath, + DWORD InstallFlags, + PBOOL bRebootRequired OPTIONAL); + +BOOL WINAPI +UpdateDriverForPlugAndPlayDevicesW( + HWND hwndParent, + LPCWSTR HardwareId, + LPCWSTR FullInfPath, + DWORD InstallFlags, + PBOOL bRebootRequired OPTIONAL); + +#ifdef UNICODE +#define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesW +#else +#define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesA +#endif /* UNICODE */ + +#pragma pack(pop) + +#ifdef __cplusplus +} +#endif + +#endif /* __NEWDEV_H */
Propchange: trunk/reactos/include/newdev.h ------------------------------------------------------------------------------ svn:eol-style = native