From 30ef8778e83ecf37bf5a04ece13adee59e917ef2 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 11 Dec 1998 13:26:26 +0000 Subject: [PATCH] Added RasEnumConnections stub. --- Makefile.in | 2 + configure | 2 + configure.in | 1 + dlls/rasapi32/Makefile.in | 15 ++++++ dlls/rasapi32/rasapi.c | 18 ++++++++ include/debug.h | 97 ++++++++++++++++++++------------------- include/debugdefs.h | 4 +- include/ras.h | 15 ++++++ include/wintypes.h | 1 + relay32/rasapi32.spec | 2 +- 10 files changed, 107 insertions(+), 50 deletions(-) create mode 100644 dlls/rasapi32/Makefile.in create mode 100644 dlls/rasapi32/rasapi.c create mode 100644 include/ras.h diff --git a/Makefile.in b/Makefile.in index 834477cc598..06bef3f0c20 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,6 +34,7 @@ LIBSUBDIRS = \ dlls/msacm32 \ dlls/ntdll \ dlls/psapi \ + dlls/rasapi32 \ dlls/shell32 \ dlls/winaspi \ dlls/wnaspi32 \ @@ -98,6 +99,7 @@ LIBOBJS = \ dlls/msacm32/msacm32.o \ dlls/ntdll/ntdll.o \ dlls/psapi/psapi.o \ + dlls/rasapi32/rasapi32.o \ dlls/shell32/shell32.o \ dlls/winaspi/winaspi.o \ dlls/wnaspi32/wnaspi32.o \ diff --git a/configure b/configure index c9b7e0b207e..40edc5b56fe 100755 --- a/configure +++ b/configure @@ -3752,6 +3752,7 @@ dlls/msacm/Makefile dlls/msacm32/Makefile dlls/ntdll/Makefile dlls/psapi/Makefile +dlls/rasapi32/Makefile dlls/shell32/Makefile dlls/winaspi/Makefile dlls/wnaspi32/Makefile @@ -3903,6 +3904,7 @@ dlls/msacm/Makefile dlls/msacm32/Makefile dlls/ntdll/Makefile dlls/psapi/Makefile +dlls/rasapi32/Makefile dlls/shell32/Makefile dlls/winaspi/Makefile dlls/wnaspi32/Makefile diff --git a/configure.in b/configure.in index 7d1120c4f0e..ffad9fa724e 100644 --- a/configure.in +++ b/configure.in @@ -517,6 +517,7 @@ dlls/msacm/Makefile dlls/msacm32/Makefile dlls/ntdll/Makefile dlls/psapi/Makefile +dlls/rasapi32/Makefile dlls/shell32/Makefile dlls/winaspi/Makefile dlls/wnaspi32/Makefile diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in new file mode 100644 index 00000000000..bfdc43d299c --- /dev/null +++ b/dlls/rasapi32/Makefile.in @@ -0,0 +1,15 @@ +DEFS = @DLLFLAGS@ -D__WINE__ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = rasapi32 + +C_SRCS = rasapi.c + +all: $(MODULE).o + +@MAKE_RULES@ + +### Dependencies: + diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c new file mode 100644 index 00000000000..98c8250a6b0 --- /dev/null +++ b/dlls/rasapi32/rasapi.c @@ -0,0 +1,18 @@ +/* + * RASAPI32 + * + * Copyright 1998 Marcus Meissner + */ + +#include "windows.h" +#include "ras.h" +#include "debug.h" + +/************************************************************************** + * RasEnumConnections32A [RASAPI32.544] + */ +DWORD WINAPI RasEnumConnections32A( LPRASCONN32A rca, LPDWORD x, LPDWORD y) { + /* Remote Access Service stuff is done by underlying OS anyway */ + FIXME(ras,"(%p,%p,%p),stub!\n",rca,x,y); + return 0; +} diff --git a/include/debug.h b/include/debug.h index a8bb29943d8..15a66ad62c1 100644 --- a/include/debug.h +++ b/include/debug.h @@ -109,54 +109,55 @@ #define dbch_prop 101 #define dbch_psapi 102 #define dbch_psdrv 103 -#define dbch_rebar 104 -#define dbch_reg 105 -#define dbch_region 106 -#define dbch_relay 107 -#define dbch_resource 108 -#define dbch_s 109 -#define dbch_scroll 110 -#define dbch_security 111 -#define dbch_segment 112 -#define dbch_selector 113 -#define dbch_sem 114 -#define dbch_sendmsg 115 -#define dbch_shell 116 -#define dbch_shm 117 -#define dbch_snoop 118 -#define dbch_sound 119 -#define dbch_static 120 -#define dbch_statusbar 121 -#define dbch_stress 122 -#define dbch_string 123 -#define dbch_syscolor 124 -#define dbch_system 125 -#define dbch_tab 126 -#define dbch_task 127 -#define dbch_text 128 -#define dbch_thread 129 -#define dbch_thunk 130 -#define dbch_timer 131 -#define dbch_toolbar 132 -#define dbch_toolhelp 133 -#define dbch_tooltips 134 -#define dbch_trackbar 135 -#define dbch_treeview 136 -#define dbch_tweak 137 -#define dbch_uitools 138 -#define dbch_updown 139 -#define dbch_ver 140 -#define dbch_virtual 141 -#define dbch_vxd 142 -#define dbch_wave 143 -#define dbch_win 144 -#define dbch_win16drv 145 -#define dbch_win32 146 -#define dbch_wing 147 -#define dbch_winsock 148 -#define dbch_wnet 149 -#define dbch_x11 150 -#define dbch_x11drv 151 +#define dbch_ras 104 +#define dbch_rebar 105 +#define dbch_reg 106 +#define dbch_region 107 +#define dbch_relay 108 +#define dbch_resource 109 +#define dbch_s 110 +#define dbch_scroll 111 +#define dbch_security 112 +#define dbch_segment 113 +#define dbch_selector 114 +#define dbch_sem 115 +#define dbch_sendmsg 116 +#define dbch_shell 117 +#define dbch_shm 118 +#define dbch_snoop 119 +#define dbch_sound 120 +#define dbch_static 121 +#define dbch_statusbar 122 +#define dbch_stress 123 +#define dbch_string 124 +#define dbch_syscolor 125 +#define dbch_system 126 +#define dbch_tab 127 +#define dbch_task 128 +#define dbch_text 129 +#define dbch_thread 130 +#define dbch_thunk 131 +#define dbch_timer 132 +#define dbch_toolbar 133 +#define dbch_toolhelp 134 +#define dbch_tooltips 135 +#define dbch_trackbar 136 +#define dbch_treeview 137 +#define dbch_tweak 138 +#define dbch_uitools 139 +#define dbch_updown 140 +#define dbch_ver 141 +#define dbch_virtual 142 +#define dbch_vxd 143 +#define dbch_wave 144 +#define dbch_win 145 +#define dbch_win16drv 146 +#define dbch_win32 147 +#define dbch_wing 148 +#define dbch_winsock 149 +#define dbch_wnet 150 +#define dbch_x11 151 +#define dbch_x11drv 152 /* Definitions for classes identifiers */ #define dbcl_fixme 0 #define dbcl_err 1 diff --git a/include/debugdefs.h b/include/debugdefs.h index 4977e5387b4..b30c3156743 100644 --- a/include/debugdefs.h +++ b/include/debugdefs.h @@ -4,7 +4,7 @@ #include "debugtools.h" #endif -#define DEBUG_CHANNEL_COUNT 152 +#define DEBUG_CHANNEL_COUNT 153 #ifdef DEBUG_RUNTIME short debug_msg_enabled[][DEBUG_CLASS_COUNT] = { {1, 1, 0, 0}, @@ -159,6 +159,7 @@ short debug_msg_enabled[][DEBUG_CLASS_COUNT] = { {1, 1, 0, 0}, {1, 1, 0, 0}, {1, 1, 0, 0}, +{1, 1, 0, 0}, }; const char* debug_ch_name[] = { "1", @@ -265,6 +266,7 @@ const char* debug_ch_name[] = { "prop", "psapi", "psdrv", +"ras", "rebar", "reg", "region", diff --git a/include/ras.h b/include/ras.h new file mode 100644 index 00000000000..497ead663a3 --- /dev/null +++ b/include/ras.h @@ -0,0 +1,15 @@ +#ifndef __WINE_RAS_H +#define __WINE_RAS_H + +#include "wintypes.h" + +#define RAS_MaxEntryName 256 + +typedef struct tagRASCONN32A { + DWORD dwSize; + HRASCONN32 hRasConn; + CHAR szEntryName[RAS_MaxEntryName+1]; +} RASCONN32A,*LPRASCONN32A; + +DWORD WINAPI RasEnumConnections32A( LPRASCONN32A rc, LPDWORD x, LPDWORD y); +#endif diff --git a/include/wintypes.h b/include/wintypes.h index 561f16da453..35b21ee4510 100644 --- a/include/wintypes.h +++ b/include/wintypes.h @@ -192,6 +192,7 @@ DECLARE_HANDLE(HDESK); DECLARE_HANDLE(HWND); DECLARE_HANDLE(HKL); DECLARE_HANDLE(HIC); +DECLARE_HANDLE(HRASCONN); #undef DECLARE_HANDLE /* Callback function pointers types */ diff --git a/relay32/rasapi32.spec b/relay32/rasapi32.spec index bb6ff06d786..a4c14770dda 100644 --- a/relay32/rasapi32.spec +++ b/relay32/rasapi32.spec @@ -45,7 +45,7 @@ type win32 541 stub RasDialW 542 stub RasEditPhonebookEntryA 543 stub RasEditPhonebookEntryW -544 stub RasEnumConnectionsA +544 stdcall RasEnumConnectionsA(ptr ptr ptr) RasEnumConnections32A 545 stub RasEnumConnectionsW 546 stub RasEnumEntriesA 547 stub RasEnumEntriesW