Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[gvg] 19392: Tag Wine-0_9_1

by gvg＠svn.reactos.com

Tag Wine-0_9_1 Added: vendor/wine/dlls/netapi32/Wine-0_9_1/ _____ Copied: vendor/wine/dlls/netapi32/Wine-0_9_1 (from rev 19391, vendor/wine/dlls/netapi32/current)

18 years, 10 months

[gvg] 19391: New netapi32 vendor import

by gvg＠svn.reactos.com

New netapi32 vendor import Added: trunk/reactos/include/wine/lmbrowsr.h Modified: trunk/reactos/lib/aclui/precomp.h Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/netapi32/ Deleted: trunk/reactos/lib/netapi32/Makefile.in Modified: trunk/reactos/lib/netapi32/access.c Modified: trunk/reactos/lib/netapi32/netapi32.c Added: trunk/reactos/lib/netapi32/netapi32.xml Modified: trunk/reactos/lib/netapi32/wksta.c Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/w32api/include/lm.h Deleted: trunk/reactos/w32api/include/lmbrowsr.h Added: trunk/reactos/w32api/include/lmjoin.h Modified: trunk/reactos/w32api/include/ntsecapi.h _____ Added: trunk/reactos/include/wine/lmbrowsr.h --- trunk/reactos/include/wine/lmbrowsr.h 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/include/wine/lmbrowsr.h 2005-11-20 21:19:17 UTC (rev 19391) @@ -0,0 +1,47 @@ +/* + * Copyright 2002 Andriy Palamarchuk + * + * Browser NET API calls + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_LMBROWSR_H +#define __WINE_LMBROWSR_H + + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _BROWSER_EMULATED_DOMAIN { + LPWSTR DomainName; + LPWSTR EmulatedServerName; + DWORD Role; +} BROWSER_EMULATED_DOMAIN, *PBROWSER_EMULATED_DOMAIN; + +NET_API_STATUS WINAPI I_BrowserSetNetlogonState( + LPWSTR ServerName, LPWSTR DomainName, LPWSTR EmulatedServerName, + DWORD Role); + +NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains( + LPWSTR ServerName, PBROWSER_EMULATED_DOMAIN *EmulatedDomains, + LPDWORD EntriesRead); + +#ifdef __cplusplus +} +#endif + +#endif Property changes on: trunk/reactos/include/wine/lmbrowsr.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/aclui/precomp.h --- trunk/reactos/lib/aclui/precomp.h 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/lib/aclui/precomp.h 2005-11-20 21:19:17 UTC (rev 19391) @@ -5,6 +5,7 @@ #include <prsht.h> #include <aclui.h> #include <sddl.h> +#include <winternl.h> #include <ntsecapi.h> #if SUPPORT_UXTHEME #include <uxtheme.h> _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/lib/directory.xml 2005-11-20 21:19:17 UTC (rev 19391) @@ -176,6 +176,9 @@ <directory name="mswsock"> <xi:include href="mswsock/mswsock.xml" /> </directory> +<directory name="netapi32"> + <xi:include href="netapi32/netapi32.xml" /> +</directory> <directory name="netcfgx"> <xi:include href="netcfgx/netcfgx.xml" /> </directory> _____ Copied: trunk/reactos/lib/netapi32 (from rev 19390, vendor/wine/dlls/netapi32/current) Property changes on: trunk/reactos/lib/netapi32 ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Deleted: trunk/reactos/lib/netapi32/Makefile.in --- vendor/wine/dlls/netapi32/current/Makefile.in 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/lib/netapi32/Makefile.in 2005-11-20 21:19:17 UTC (rev 19391) @@ -1,25 +0,0 @@ -EXTRADEFS = -D_SVRAPI_ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = netapi32.dll -IMPORTLIB = libnetapi32.$(IMPLIBEXT) -IMPORTS = iphlpapi ws2_32 advapi32 kernel32 - -C_SRCS = \ - access.c \ - apibuf.c \ - browsr.c \ - nbcmdqueue.c \ - nbnamecache.c \ - nbt.c \ - netapi32.c \ - netbios.c \ - wksta.c - -SUBDIRS = tests - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Modified: trunk/reactos/lib/netapi32/access.c --- vendor/wine/dlls/netapi32/current/access.c 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/lib/netapi32/access.c 2005-11-20 21:19:17 UTC (rev 19391) @@ -95,8 +95,8 @@ /************************************************************ * NetUserAdd (NETAPI32.@) */ -NET_API_STATUS WINAPI NetUserAdd(LMSTR servername, - DWORD level, LPBYTE* bufptr, LPDWORD parm_err) +NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername, + DWORD level, LPBYTE bufptr, LPDWORD parm_err) { NET_API_STATUS status; FIXME("(%s, %ld, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err); @@ -433,7 +433,7 @@ */ NET_API_STATUS WINAPI NetQueryDisplayInformation( - LPWSTR ServerName, DWORD Level, DWORD Index, DWORD EntriesRequested, + LPCWSTR ServerName, DWORD Level, DWORD Index, DWORD EntriesRequested, DWORD PreferredMaximumLength, LPDWORD ReturnedEntryCount, PVOID *SortedBuffer) { @@ -540,7 +540,7 @@ */ NET_API_STATUS WINAPI -NetGetDCName(LPWSTR servername, LPWSTR domainname, LPBYTE *bufptr) +NetGetDCName(LPCWSTR servername, LPCWSTR domainname, LPBYTE *bufptr) { FIXME("(%s, %s, %p) stub!\n", debugstr_w(servername), debugstr_w(domainname), bufptr); _____ Modified: trunk/reactos/lib/netapi32/netapi32.c --- vendor/wine/dlls/netapi32/current/netapi32.c 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/lib/netapi32/netapi32.c 2005-11-20 21:19:17 UTC (rev 19391) @@ -71,7 +71,7 @@ /************************************************************ * NetServerGetInfo (NETAPI32.@) */ -NET_API_STATUS WINAPI NetServerGetInfo(LPCWSTR servername, DWORD level, LPBYTE* bufptr) +NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bufptr) { FIXME("stub (%p, %ld, %p)\n", servername, level, bufptr); return ERROR_ACCESS_DENIED; _____ Added: trunk/reactos/lib/netapi32/netapi32.xml --- vendor/wine/dlls/netapi32/current/netapi32.xml 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/lib/netapi32/netapi32.xml 2005-11-20 21:19:17 UTC (rev 19391) @@ -0,0 +1,27 @@ +<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" allowwarnings="true"> + <importlibrary definition="netapi32.spec.def" /> + <include base="netapi32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SVRAPI_" /> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>access.c</file> + <file>apibuf.c</file> + <file>browsr.c</file> + <file>nbcmdqueue.c</file> + <file>nbnamecache.c</file> + <file>nbt.c</file> + <file>netapi32.c</file> + <file>netbios.c</file> + <file>wksta.c</file> + <file>netapi32.spec</file> +</module> Property changes on: trunk/reactos/lib/netapi32/netapi32.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/netapi32/wksta.c --- vendor/wine/dlls/netapi32/current/wksta.c 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/lib/netapi32/wksta.c 2005-11-20 21:19:17 UTC (rev 19391) @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdlib.h> +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winsock2.h" @@ -33,6 +34,7 @@ #include "lmwksta.h" #include "iphlpapi.h" #include "winerror.h" +#undef WIN32_NO_STATUS #include "ntstatus.h" #include "winreg.h" #include "winternl.h" _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/media/doc/README.WINE 2005-11-20 21:19:17 UTC (rev 19391) @@ -54,7 +54,7 @@ reactos/lib/msimg32 # Synced to Wine-0_9_1 reactos/lib/msi # Synced to Wine-0_9_1 reactos/lib/msvideo # Out of sync -reactos/lib/netapi32 # Out of sync +reactos/lib/netapi32 # Synced to Wine-0_9_1 reactos/lib/objsel # Synced to Wine-0_9_1 reactos/lib/odbc32 # Out of sync. Depends on port of Linux ODBC. reactos/lib/ole32 # Synced to Wine-0_9_1 _____ Modified: trunk/reactos/w32api/include/lm.h --- trunk/reactos/w32api/include/lm.h 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/w32api/include/lm.h 2005-11-20 21:19:17 UTC (rev 19391) @@ -23,5 +23,6 @@ #include <lmwksta.h> #include <lmserver.h> #include <lmstats.h> +#include <lmjoin.h> #endif _____ Deleted: trunk/reactos/w32api/include/lmbrowsr.h --- trunk/reactos/w32api/include/lmbrowsr.h 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/w32api/include/lmbrowsr.h 2005-11-20 21:19:17 UTC (rev 19391) @@ -1,74 +0,0 @@ -#ifndef _LMBROWSR_H -#define _LMBROWSR_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif -#define BROWSER_ROLE_PDC 1 -#define BROWSER_ROLE_BDC 2 -typedef struct _BROWSER_STATISTICS { - LARGE_INTEGER StatisticsStartTime; - LARGE_INTEGER NumberOfServerAnnouncements; - LARGE_INTEGER NumberOfDomainAnnouncements; - ULONG NumberOfElectionPackets; - ULONG NumberOfMailslotWrites; - ULONG NumberOfGetBrowserServerListRequests; - ULONG NumberOfServerEnumerations; - ULONG NumberOfDomainEnumerations; - ULONG NumberOfOtherEnumerations; - ULONG NumberOfMissedServerAnnouncements; - ULONG NumberOfMissedMailslotDatagrams; - ULONG NumberOfMissedGetBrowserServerListRequests; - ULONG NumberOfFailedServerAnnounceAllocations; - ULONG NumberOfFailedMailslotAllocations; - ULONG NumberOfFailedMailslotReceives; - ULONG NumberOfFailedMailslotWrites; - ULONG NumberOfFailedMailslotOpens; - ULONG NumberOfDuplicateMasterAnnouncements; -LARGE_INTEGER NumberOfIllegalDatagrams; -} BROWSER_STATISTICS,*PBROWSER_STATISTICS,*LPBROWSER_STATISTICS; -typedef struct _BROWSER_STATISTICS_100 { - LARGE_INTEGER StartTime; - LARGE_INTEGER NumberOfServerAnnouncements; - LARGE_INTEGER NumberOfDomainAnnouncements; - ULONG NumberOfElectionPackets; - ULONG NumberOfMailslotWrites; - ULONG NumberOfGetBrowserServerListRequests; - LARGE_INTEGER NumberOfIllegalDatagrams; -} BROWSER_STATISTICS_100,*PBROWSER_STATISTICS_100; -typedef struct _BROWSER_STATISTICS_101 { - LARGE_INTEGER StartTime; - LARGE_INTEGER NumberOfServerAnnouncements; - LARGE_INTEGER NumberOfDomainAnnouncements; - ULONG NumberOfElectionPackets; - ULONG NumberOfMailslotWrites; - ULONG NumberOfGetBrowserServerListRequests; - LARGE_INTEGER NumberOfIllegalDatagrams; - ULONG NumberOfMissedServerAnnouncements; - ULONG NumberOfMissedMailslotDatagrams; - ULONG NumberOfMissedGetBrowserServerListRequests; - ULONG NumberOfFailedServerAnnounceAllocations; - ULONG NumberOfFailedMailslotAllocations; - ULONG NumberOfFailedMailslotReceives; - ULONG NumberOfFailedMailslotWrites; - ULONG NumberOfFailedMailslotOpens; - ULONG NumberOfDuplicateMasterAnnouncements; -} BROWSER_STATISTICS_101,*PBROWSER_STATISTICS_101; - -NET_API_STATUS WINAPI I_BrowserServerEnum(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PD WORD,DWORD,LPCWSTR,PDWORD); -NET_API_STATUS WINAPI I_BrowserServerEnumEx(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD, PDWORD,DWORD,LPCWSTR,LPCWSTR); -NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains(LPWSTR,PBYTE*,PDWORD); -NET_API_STATUS I_BrowserQueryOtherDomains(LPCWSTR,PBYTE*,PDWORD,PDWORD); -NET_API_STATUS I_BrowserResetNetlogonState(LPCWSTR); -NET_API_STATUS WINAPI I_BrowserSetNetlogonState(LPWSTR,LPWSTR,LPWSTR,DWORD); -NET_API_STATUS I_BrowserQueryStatistics(LPCWSTR,LPBROWSER_STATISTICS*); -NET_API_STATUS I_BrowserResetStatistics(LPCWSTR); -WORD I_BrowserServerEnumForXactsrv(LPCWSTR,LPCWSTR,ULONG,USHORT,PVOID,WORD,DW ORD,PDWORD,PDWORD,DWORD,LPCWSTR,LPCWSTR,PWORD); -NET_API_STATUS I_BrowserDebugTrace(PWCHAR,PCHAR); -#ifdef __cplusplus -} -#endif -#endif _____ Added: trunk/reactos/w32api/include/lmjoin.h --- trunk/reactos/w32api/include/lmjoin.h 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/w32api/include/lmjoin.h 2005-11-20 21:19:17 UTC (rev 19391) @@ -0,0 +1,43 @@ +/* + * Copyright 2005 Ulrich Czekalla (For CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_LMJOIN_H +#define __WINE_LMJOIN_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum tagNETSETUP_JOIN_STATUS +{ + NetSetupUnknownStatus = 0, + NetSetupUnjoined, + NetSetupWorkgroupName, + NetSetupDomainName +} NETSETUP_JOIN_STATUS, *PNETSETUP_JOIN_STATUS; + +NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( + LPCWSTR Server, + LPWSTR *Name, + PNETSETUP_JOIN_STATUS type); + +#ifdef __cplusplus +} +#endif + +#endif Property changes on: trunk/reactos/w32api/include/lmjoin.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/w32api/include/ntsecapi.h --- trunk/reactos/w32api/include/ntsecapi.h 2005-11-20 21:13:09 UTC (rev 19390) +++ trunk/reactos/w32api/include/ntsecapi.h 2005-11-20 21:19:17 UTC (rev 19391) @@ -125,16 +125,6 @@ #if !defined(_NTDEF_H) && !defined(_SUBAUTH_H) typedef LONG NTSTATUS, *PNTSTATUS; -typedef struct _UNICODE_STRING { - USHORT Length; - USHORT MaximumLength; - PWSTR Buffer; -} UNICODE_STRING, *PUNICODE_STRING; -typedef struct _STRING { - USHORT Length; - USHORT MaximumLength; - PCHAR Buffer; -} STRING, *PSTRING; #endif #if defined (_NTDEF_H)

18 years, 10 months

[gvg] 19390: Remove old netapi32 in preparation for a new vendor import

by gvg＠svn.reactos.com

Remove old netapi32 in preparation for a new vendor import Modified: trunk/reactos/lib/directory.xml Deleted: trunk/reactos/lib/netapi32/ _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-11-20 21:12:43 UTC (rev 19389) +++ trunk/reactos/lib/directory.xml 2005-11-20 21:13:09 UTC (rev 19390) @@ -176,9 +176,6 @@ <directory name="mswsock"> <xi:include href="mswsock/mswsock.xml" /> </directory> -<directory name="netapi32"> - <xi:include href="netapi32/netapi32.xml" /> -</directory> <directory name="netcfgx"> <xi:include href="netcfgx/netcfgx.xml" /> </directory>

18 years, 10 months

[greatlrd] 19389: Remove hardcode of Find one device of midiout and wavout now scan for WaveOutXX, WaveInXX, MidiInXX, MidiOutXX, AuxXX.

by greatlrd＠svn.reactos.com

Remove hardcode of Find one device of midiout and wavout now scan for WaveOutXX, WaveInXX, MidiInXX, MidiOutXX, AuxXX. Modified: trunk/reactos/lib/mmdrv/utils.c _____ Modified: trunk/reactos/lib/mmdrv/utils.c --- trunk/reactos/lib/mmdrv/utils.c 2005-11-20 20:48:38 UTC (rev 19388) +++ trunk/reactos/lib/mmdrv/utils.c 2005-11-20 21:12:43 UTC (rev 19389) @@ -166,12 +166,51 @@ // DriverKey = OpenParametersKey(); // see drvutil.c of MS DDK for how this SHOULD be done... - // FIXME: This is hard-coded for now, to use the hardware emulated by Bochs... + + SHORT i; + HANDLE h; + WCHAR DeviceName[SOUND_MAX_DEVICE_NAME]; + for (i=0; OpenDevice(WaveOutDevice, i, &h, GENERIC_READ) == MMSYSERR_NOERROR; i++) + { + wsprintf(DeviceName, L"WaveOut%d\0", i); + CloseHandle(h); + AddDeviceToList(&DeviceList, WaveOutDevice, 0, DeviceName); + } + + for (i=0; OpenDevice(WaveInDevice, i, &h, GENERIC_READ) == MMSYSERR_NOERROR; i++) + { + wsprintf(DeviceName, L"WaveIn%d\0", i); + CloseHandle(h); + AddDeviceToList(&DeviceList, WaveInDevice, 0, DeviceName); + } + + for (i=0; OpenDevice(MidiOutDevice, i, &h, GENERIC_READ) == MMSYSERR_NOERROR; i++) + { + wsprintf(DeviceName, L"MidiOut%d\0", i); + CloseHandle(h); + AddDeviceToList(&DeviceList, MidiOutDevice, 0, DeviceName); + } + + for (i=0; OpenDevice(MidiInDevice, i, &h, GENERIC_READ) == MMSYSERR_NOERROR; i++) + { + wsprintf(DeviceName, L"MidiIn%d\0", i); + CloseHandle(h); + AddDeviceToList(&DeviceList, MidiInDevice, 0, DeviceName); + } + + for (i=0; OpenDevice(AuxDevice, i, &h, GENERIC_READ) == MMSYSERR_NOERROR; i++) + { + wsprintf(DeviceName, L"Aux%d\0", i); + CloseHandle(h); + AddDeviceToList(&DeviceList, AuxDevice, 0, DeviceName); + } + + // MIDI Out 0: MPU-401 UART - AddDeviceToList(&DeviceList, MidiOutDevice, 0, L"MidiOut0"); + // AddDeviceToList(&DeviceList, MidiOutDevice, 0, L"MidiOut0"); // Wave Out 0: Sound Blaster 16 (ok?) - AddDeviceToList(&DeviceList, WaveOutDevice, 0, L"WaveOut0"); + // AddDeviceToList(&DeviceList, WaveOutDevice, 0, L"WaveOut0"); return MMSYSERR_NOERROR; // ok? }

18 years, 10 months

[ion] 19388: Fix really stupid typo (thanks Hartmut)

by ion＠svn.reactos.com

Fix really stupid typo (thanks Hartmut) Modified: trunk/reactos/hal/halx86/generic/fmutex.c _____ Modified: trunk/reactos/hal/halx86/generic/fmutex.c --- trunk/reactos/hal/halx86/generic/fmutex.c 2005-11-20 20:45:35 UTC (rev 19387) +++ trunk/reactos/hal/halx86/generic/fmutex.c 2005-11-20 20:48:38 UTC (rev 19388) @@ -42,7 +42,7 @@ FastMutex->Contention++; KeWaitForSingleObject(&FastMutex->Gate, WrExecutive, - WaitAny, + KernelMode, FALSE, NULL); }

18 years, 10 months

[hbirr] 19387: Waiting for a fast mutex should be done in kernel mode.

by hbirr＠svn.reactos.com

Waiting for a fast mutex should be done in kernel mode. Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-11-20 20:19:05 UTC (rev 19386) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-11-20 20:45:35 UTC (rev 19387) @@ -765,7 +765,7 @@ /* Wait for the event */ KeWaitForSingleObject(&FastMutex->Gate, WrMutex, - WaitAny, + KernelMode, FALSE, NULL); }

18 years, 10 months

[hpoussin] 19386: - Fix some error codes

by hpoussin＠svn.reactos.com

- Fix some error codes - Add stubs for SetupDiGetClassImageList, SetupDiGetClassImageListExA/W, SetupDiDestroyClassImageList Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-20 20:18:00 UTC (rev 19385) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-20 20:19:05 UTC (rev 19386) @@ -2774,7 +2774,7 @@ else { ERR("Invalid Flags parameter!\n"); - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_FLAGS); return INVALID_HANDLE_VALUE; } @@ -3805,7 +3805,7 @@ else if (CreationFlags & ~(DICD_GENERATE_ID | DICD_INHERIT_CLASSDRVS)) { TRACE("Unknown flags: 0x%08lx\n", CreationFlags & ~(DICD_GENERATE_ID | DICD_INHERIT_CLASSDRVS)); - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_FLAGS); } else { @@ -4706,7 +4706,7 @@ else if (OpenFlags & ~(DIOD_CANCEL_REMOVE | DIOD_INHERIT_CLASSDRVS)) { TRACE("Unknown flags: 0x%08lx\n", OpenFlags & ~(DIOD_CANCEL_REMOVE | DIOD_INHERIT_CLASSDRVS)); - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_FLAGS); } else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -4755,6 +4755,8 @@ RegCloseKey(hEnumKey); if (rc != ERROR_SUCCESS) { + if (rc == ERROR_FILE_NOT_FOUND) + rc = ERROR_NO_SUCH_DEVINST; SetLastError(rc); return FALSE; } _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-11-20 20:18:00 UTC (rev 19385) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-11-20 20:19:05 UTC (rev 19386) @@ -291,7 +291,7 @@ @ stub SetupDiDeleteDevRegKey @ stdcall SetupDiDeleteDeviceInfo(long ptr) @ stub SetupDiDeleteDeviceInterfaceData -@ stub SetupDiDestroyClassImageList +@ stdcall SetupDiDestroyClassImageList(ptr) @ stdcall SetupDiDestroyDeviceInfoList(long) @ stdcall SetupDiDestroyDriverInfoList(long ptr long) @ stub SetupDiDrawMiniIcon @@ -313,9 +313,9 @@ @ stdcall SetupDiGetClassDevsExW(ptr wstr ptr long ptr wstr ptr) @ stdcall SetupDiGetClassDevsW(ptr ptr long long) @ stub SetupDiGetClassImageIndex -@ stub SetupDiGetClassImageList -@ stub SetupDiGetClassImageListExA -@ stub SetupDiGetClassImageListExW +@ stdcall SetupDiGetClassImageList(ptr) +@ stdcall SetupDiGetClassImageListExA(ptr str ptr) +@ stdcall SetupDiGetClassImageListExW(ptr wstr ptr) @ stub SetupDiGetClassInstallParamsA @ stub SetupDiGetClassInstallParamsW @ stub SetupDiGetDeviceInfoListClass _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-11-20 20:18:00 UTC (rev 19385) +++ trunk/reactos/lib/setupapi/stubs.c 2005-11-20 20:19:05 UTC (rev 19386) @@ -175,3 +175,48 @@ FIXME ("Stub %p\n",FileLogHandle); return TRUE; } + + +/********************************************************************** * + * SetupDiGetClassImageList(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData) +{ + FIXME ("Stub %p\n", ClassImageListData); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/********************************************************************** * + * SetupDiGetClassImageListExA(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassImageListExA(PSP_CLASSIMAGELIST_DATA ClassImageListData, + PCSTR MachineName, PVOID Reserved) +{ + FIXME ("Stub %p %s %p\n", ClassImageListData, debugstr_a(MachineName), Reserved); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/********************************************************************** * + * SetupDiGetClassImageListExW(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassImageListExW(PSP_CLASSIMAGELIST_DATA ClassImageListData, + PCWSTR MachineName, PVOID Reserved) +{ + FIXME ("Stub %p %s %p\n", ClassImageListData, debugstr_w(MachineName), Reserved); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/********************************************************************** * + * SetupDiDestroyClassImageList(SETUPAPI.@) + */ +BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData) +{ + FIXME ("Stub %p\n", ClassImageListData); + return TRUE; +}

18 years, 10 months

[ekohl] 19385: - Prepare to delete marked services upon startup.

by ekohl＠svn.reactos.com

- Prepare to delete marked services upon startup. - ControlService: Implement unloading of drivers. Modified: trunk/reactos/subsys/system/services/database.c Added: trunk/reactos/subsys/system/services/driver.c Modified: trunk/reactos/subsys/system/services/rpcserver.c Modified: trunk/reactos/subsys/system/services/services.h Modified: trunk/reactos/subsys/system/services/services.xml _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-11-20 19:31:49 UTC (rev 19384) +++ trunk/reactos/subsys/system/services/database.c 2005-11-20 20:18:00 UTC (rev 19385) @@ -404,6 +404,32 @@ } +VOID +ScmDeleteMarkedServices(VOID) +{ + PLIST_ENTRY ServiceEntry; + PSERVICE CurrentService; + + ServiceEntry = ServiceListHead.Flink; + while (ServiceEntry != &ServiceListHead) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); + + ServiceEntry = ServiceEntry->Flink; + + if (CurrentService->bDeleted == TRUE) + { + DPRINT1("Delete service: %S\n", CurrentService->lpServiceName); + + /* FIXME: Delete the registry keys */ + + /* FIXME: Delete the service record from the list */ + + } + } +} + + DWORD ScmCreateServiceDatabase(VOID) { @@ -474,7 +500,8 @@ RegCloseKey(hServicesKey); - /* FIXME: Delete services that are marked for delete */ + /* Delete services that are marked for delete */ + ScmDeleteMarkedServices(); DPRINT("ScmCreateServiceDatabase() done\n"); @@ -836,8 +863,6 @@ ScmStartService(PSERVICE Service, PSERVICE_GROUP Group) { - WCHAR szDriverPath[MAX_PATH]; - UNICODE_STRING DriverPath; NTSTATUS Status; DPRINT("ScmStartService() called\n"); @@ -845,21 +870,12 @@ Service->ControlPipeHandle = INVALID_HANDLE_VALUE; DPRINT("Service->Type: %lu\n", Service->Status.dwServiceType); - if (Service->Status.dwServiceType == SERVICE_KERNEL_DRIVER || - Service->Status.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER || - Service->Status.dwServiceType == SERVICE_RECOGNIZER_DRIVER) + if (Service->Status.dwServiceType & SERVICE_DRIVER) { /* Load driver */ - wcscpy(szDriverPath, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); - wcscat(szDriverPath, - Service->lpServiceName); - - RtlInitUnicodeString(&DriverPath, - szDriverPath); - - DPRINT(" Path: %wZ\n", &DriverPath); - Status = NtLoadDriver(&DriverPath); + Status = ScmLoadDriver(Service); + if (Status == STATUS_SUCCESS) + Service->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; } else { _____ Added: trunk/reactos/subsys/system/services/driver.c --- trunk/reactos/subsys/system/services/driver.c 2005-11-20 19:31:49 UTC (rev 19384) +++ trunk/reactos/subsys/system/services/driver.c 2005-11-20 20:18:00 UTC (rev 19385) @@ -0,0 +1,113 @@ +/* + * driver.c + */ + +/* INCLUDES *****************************************************************/ + +#include "services.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS +ScmLoadDriver(PSERVICE lpService) +{ + WCHAR szDriverPath[MAX_PATH]; + UNICODE_STRING DriverPath; + NTSTATUS Status; + + /* Build the driver path */ + wcscpy(szDriverPath, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); + wcscat(szDriverPath, + lpService->lpServiceName); + + RtlInitUnicodeString(&DriverPath, + szDriverPath); + + /* FIXME: Acquire privilege */ + + DPRINT(" Path: %wZ\n", &DriverPath); + Status = NtLoadDriver(&DriverPath); + + /* FIXME: Release privilege */ + + return Status; +} + + +DWORD +ScmUnloadDriver(PSERVICE lpService) +{ + WCHAR szDriverPath[MAX_PATH]; + UNICODE_STRING DriverPath; + NTSTATUS Status; + DWORD dwError = ERROR_SUCCESS; + + /* Build the driver path */ + wcscpy(szDriverPath, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); + wcscat(szDriverPath, + lpService->lpServiceName); + + RtlInitUnicodeString(&DriverPath, + szDriverPath); + + /* FIXME: Acquire privilege */ + + Status = NtUnloadDriver(&DriverPath); + + /* FIXME: Release privilege */ + + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + } + + return dwError; +} + + +DWORD +ScmControlDriver(PSERVICE lpService, + DWORD dwControl, + LPSERVICE_STATUS lpServiceStatus) +{ + DWORD dwError; + + DPRINT("ScmControlDriver() called\n"); + + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + if (lpService->Status.dwCurrentState != SERVICE_RUNNING) + { + dwError = ERROR_INVALID_SERVICE_CONTROL; + goto done; + } + + dwError = ScmUnloadDriver(lpService); + if (dwError == ERROR_SUCCESS) + { + lpService->Status.dwControlsAccepted = 0; + lpService->Status.dwCurrentState = SERVICE_STOPPED; + } + break; + + case SERVICE_CONTROL_INTERROGATE: + dwError = ERROR_INVALID_SERVICE_CONTROL; + break; + + default: + dwError = ERROR_INVALID_SERVICE_CONTROL; + } + +done:; + DPRINT("ScmControlDriver() done (Erorr: %lu)\n", dwError); + + return dwError; +} + +/* EOF */ _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-11-20 19:31:49 UTC (rev 19384) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-11-20 20:18:00 UTC (rev 19385) @@ -281,6 +281,7 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService; ACCESS_MASK DesiredAccess; + DWORD dwError = ERROR_SUCCESS; DPRINT("ScmrControlService() called\n"); @@ -335,16 +336,30 @@ return ERROR_INVALID_HANDLE; } + if (lpService->Status.dwServiceType & SERVICE_DRIVER) + { + /* Send control code to the driver */ + dwError = ScmControlDriver(lpService, + dwControl, + lpServiceStatus); + } + else + { + /* FIXME: Send control code to the service */ +#if 0 + dwError = ScmControlService(lpService, + dwControl, + lpServiceStatus); +#endif + dwError = ERROR_INVALID_SERVICE_CONTROL; + } - /* FIXME: Send control code to the service */ - - /* Return service status information */ RtlCopyMemory(lpServiceStatus, &lpService->Status, sizeof(SERVICE_STATUS)); - return ERROR_SUCCESS; + return dwError; } _____ Modified: trunk/reactos/subsys/system/services/services.h --- trunk/reactos/subsys/system/services/services.h 2005-11-20 19:31:49 UTC (rev 19384) +++ trunk/reactos/subsys/system/services/services.h 2005-11-20 20:18:00 UTC (rev 19385) @@ -76,6 +76,15 @@ DWORD ScmMarkServiceForDelete(PSERVICE pService); +/* driver.c */ + +NTSTATUS ScmLoadDriver(PSERVICE lpService); +DWORD ScmUnloadDriver(PSERVICE lpService); +DWORD ScmControlDriver(PSERVICE lpService, + DWORD dwControl, + LPSERVICE_STATUS lpServiceStatus); + + /* rpcserver.c */ VOID ScmStartRpcServer(VOID); _____ Modified: trunk/reactos/subsys/system/services/services.xml --- trunk/reactos/subsys/system/services/services.xml 2005-11-20 19:31:49 UTC (rev 19384) +++ trunk/reactos/subsys/system/services/services.xml 2005-11-20 20:18:00 UTC (rev 19385) @@ -12,6 +12,7 @@ <library>rpcrt4</library> <file>config.c</file> <file>database.c</file> + <file>driver.c</file> <file>rpcserver.c</file> <file>services.c</file> <file>services.rc</file>

18 years, 10 months

[gvg] 19384: netapi32 vendor drop

by gvg＠svn.reactos.com

netapi32 vendor drop Added: vendor/wine/dlls/netapi32/ Added: vendor/wine/dlls/netapi32/current/ Added: vendor/wine/dlls/netapi32/current/Makefile.in Added: vendor/wine/dlls/netapi32/current/access.c Added: vendor/wine/dlls/netapi32/current/apibuf.c Added: vendor/wine/dlls/netapi32/current/browsr.c Added: vendor/wine/dlls/netapi32/current/nbcmdqueue.c Added: vendor/wine/dlls/netapi32/current/nbcmdqueue.h Added: vendor/wine/dlls/netapi32/current/nbnamecache.c Added: vendor/wine/dlls/netapi32/current/nbnamecache.h Added: vendor/wine/dlls/netapi32/current/nbt.c Added: vendor/wine/dlls/netapi32/current/netapi32.c Added: vendor/wine/dlls/netapi32/current/netapi32.spec Added: vendor/wine/dlls/netapi32/current/netapi32_misc.h Added: vendor/wine/dlls/netapi32/current/netbios.c Added: vendor/wine/dlls/netapi32/current/netbios.h Added: vendor/wine/dlls/netapi32/current/wksta.c _____ Added: vendor/wine/dlls/netapi32/current/Makefile.in --- vendor/wine/dlls/netapi32/current/Makefile.in 2005-11-20 19:28:28 UTC (rev 19383) +++ vendor/wine/dlls/netapi32/current/Makefile.in 2005-11-20 19:31:49 UTC (rev 19384) @@ -0,0 +1,25 @@ +EXTRADEFS = -D_SVRAPI_ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = netapi32.dll +IMPORTLIB = libnetapi32.$(IMPLIBEXT) +IMPORTS = iphlpapi ws2_32 advapi32 kernel32 + +C_SRCS = \ + access.c \ + apibuf.c \ + browsr.c \ + nbcmdqueue.c \ + nbnamecache.c \ + nbt.c \ + netapi32.c \ + netbios.c \ + wksta.c + +SUBDIRS = tests + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: vendor/wine/dlls/netapi32/current/Makefile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/netapi32/current/access.c --- vendor/wine/dlls/netapi32/current/access.c 2005-11-20 19:28:28 UTC (rev 19383) +++ vendor/wine/dlls/netapi32/current/access.c 2005-11-20 19:31:49 UTC (rev 19384) @@ -0,0 +1,580 @@ +/* + * Copyright 2002 Andriy Palamarchuk + * + * netapi32 access functions + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "lmcons.h" +#include "lmaccess.h" +#include "lmapibuf.h" +#include "lmerr.h" +#include "netapi32_misc.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a','t', + 'o','r',0}; +static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; + +/************************************************************ + * NETAPI_ValidateServername + * + * Validates server name + */ +static NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName) +{ + if (ServerName) + { + if (ServerName[0] == 0) + return ERROR_BAD_NETPATH; + else if ( + ((ServerName[0] == '\\') && + (ServerName[1] != '\\')) + || + ((ServerName[0] == '\\') && + (ServerName[1] == '\\') && + (ServerName[2] == 0)) + ) + return ERROR_INVALID_NAME; + } + return NERR_Success; +} + +/************************************************************ + * NETAPI_IsKnownUser + * + * Checks whether the user name indicates current user. + */ +static BOOL NETAPI_IsKnownUser(LPCWSTR UserName) +{ + DWORD dwSize = UNLEN + 1; + BOOL Result; + LPWSTR buf; + + if (!lstrcmpW(UserName, sAdminUserName) || + !lstrcmpW(UserName, sGuestUserName)) + return TRUE; + NetApiBufferAllocate(dwSize * sizeof(WCHAR), (LPVOID *) &buf); + Result = GetUserNameW(buf, &dwSize); + + Result = Result && !lstrcmpW(UserName, buf); + NetApiBufferFree(buf); + + return Result; +} + +#define NETAPI_ForceKnownUser(UserName, FailureCode) \ + if (!NETAPI_IsKnownUser(UserName)) \ + { \ + FIXME("Can't find information for user %s\n", \ + debugstr_w(UserName)); \ + return FailureCode; \ + } + +/************************************************************ + * NetUserAdd (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetUserAdd(LMSTR servername, + DWORD level, LPBYTE* bufptr, LPDWORD parm_err) +{ + NET_API_STATUS status; + FIXME("(%s, %ld, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err); + + status = NETAPI_ValidateServername(servername); + if (status != NERR_Success) + return status; + + if ((bufptr != NULL) && (level > 0) && (level <= 4)) + { + PUSER_INFO_1 ui = (PUSER_INFO_1) bufptr; + TRACE("usri%ld_name: %s\n", level, debugstr_w(ui->usri1_name)); + TRACE("usri%ld_password: %s\n", level, debugstr_w(ui->usri1_password)); + TRACE("usri%ld_comment: %s\n", level, debugstr_w(ui->usri1_comment)); + } + return status; +} + +/************************************************************ + * NetUserDel (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetUserDel(LPCWSTR servername, LPCWSTR username) +{ + NET_API_STATUS status; + FIXME("(%s, %s) stub!\n", debugstr_w(servername), debugstr_w(username)); + + status = NETAPI_ValidateServername(servername); + if (status != NERR_Success) + return status; + + if (!NETAPI_IsKnownUser(username)) + return NERR_UserNotFound; + + /* Delete the user here */ + return status; +} + +/************************************************************ + * NetUserGetInfo (NETAPI32.@) + */ +NET_API_STATUS WINAPI +NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, + LPBYTE* bufptr) +{ + NET_API_STATUS status; + TRACE("(%s, %s, %ld, %p)\n", debugstr_w(servername), debugstr_w(username), + level, bufptr); + status = NETAPI_ValidateServername(servername); + if (status != NERR_Success) + return status; + NETAPI_ForceLocalComputer(servername, NERR_InvalidComputer); + NETAPI_ForceKnownUser(username, NERR_UserNotFound); + + switch (level) + { + case 0: + { + PUSER_INFO_0 ui; + int name_sz; + + name_sz = lstrlenW(username) + 1; + + /* set up buffer */ + NetApiBufferAllocate(sizeof(USER_INFO_0) + name_sz * sizeof(WCHAR), + (LPVOID *) bufptr); + + ui = (PUSER_INFO_0) *bufptr; + ui->usri0_name = (LPWSTR) (*bufptr + sizeof(USER_INFO_0)); + + /* get data */ + lstrcpyW(ui->usri0_name, username); + break; + } + + case 10: + { + PUSER_INFO_10 ui; + PUSER_INFO_0 ui0; + NET_API_STATUS status; + /* sizes of the field buffers in WCHARS */ + int name_sz, comment_sz, usr_comment_sz, full_name_sz; + + comment_sz = 1; + usr_comment_sz = 1; + full_name_sz = 1; + + /* get data */ + status = NetUserGetInfo(servername, username, 0, (LPBYTE *) &ui0); + if (status != NERR_Success) + { + NetApiBufferFree(ui0); + return status; + } + name_sz = lstrlenW(ui0->usri0_name) + 1; + + /* set up buffer */ + NetApiBufferAllocate(sizeof(USER_INFO_10) + + (name_sz + comment_sz + usr_comment_sz + + full_name_sz) * sizeof(WCHAR), + (LPVOID *) bufptr); + ui = (PUSER_INFO_10) *bufptr; + ui->usri10_name = (LPWSTR) (*bufptr + sizeof(USER_INFO_10)); + ui->usri10_comment = (LPWSTR) ( + ((PBYTE) ui->usri10_name) + name_sz * sizeof(WCHAR)); + ui->usri10_usr_comment = (LPWSTR) ( + ((PBYTE) ui->usri10_comment) + comment_sz * sizeof(WCHAR)); + ui->usri10_full_name = (LPWSTR) ( + ((PBYTE) ui->usri10_usr_comment) + usr_comment_sz * sizeof(WCHAR)); + + /* set data */ + lstrcpyW(ui->usri10_name, ui0->usri0_name); + NetApiBufferFree(ui0); + ui->usri10_comment[0] = 0; + ui->usri10_usr_comment[0] = 0; + ui->usri10_full_name[0] = 0; + break; + } + + case 1: + { + static const WCHAR homedirW[] = {'H','O','M','E',0}; + PUSER_INFO_1 ui; + PUSER_INFO_0 ui0; + NET_API_STATUS status; + /* sizes of the field buffers in WCHARS */ + int name_sz, password_sz, home_dir_sz, comment_sz, script_path_sz; + + password_sz = 1; /* not filled out for security reasons for NetUserGetInfo*/ + comment_sz = 1; + script_path_sz = 1; + + /* get data */ + status = NetUserGetInfo(servername, username, 0, (LPBYTE *) &ui0); + if (status != NERR_Success) + { + NetApiBufferFree(ui0); + return status; + } + name_sz = lstrlenW(ui0->usri0_name) + 1; + home_dir_sz = GetEnvironmentVariableW(homedirW, NULL,0); + /* set up buffer */ + NetApiBufferAllocate(sizeof(USER_INFO_1) + + (name_sz + password_sz + home_dir_sz + + comment_sz + script_path_sz) * sizeof(WCHAR), + (LPVOID *) bufptr); + + ui = (PUSER_INFO_1) *bufptr; + ui->usri1_name = (LPWSTR) (ui + 1); + ui->usri1_password = ui->usri1_name + name_sz; + ui->usri1_home_dir = ui->usri1_password + password_sz; + ui->usri1_comment = ui->usri1_home_dir + home_dir_sz; + ui->usri1_script_path = ui->usri1_comment + comment_sz; + /* set data */ + lstrcpyW(ui->usri1_name, ui0->usri0_name); + NetApiBufferFree(ui0); + ui->usri1_password[0] = 0; + ui->usri1_password_age = 0; + ui->usri1_priv = 0; + GetEnvironmentVariableW(homedirW, ui->usri1_home_dir,home_dir_sz); + ui->usri1_comment[0] = 0; + ui->usri1_flags = 0; + ui->usri1_script_path[0] = 0; + break; + } + case 2: + case 3: + case 4: + case 11: + case 20: + case 23: + case 1003: + case 1005: + case 1006: + case 1007: + case 1008: + case 1009: + case 1010: + case 1011: + case 1012: + case 1013: + case 1014: + case 1017: + case 1018: + case 1020: + case 1023: + case 1024: + case 1025: + case 1051: + case 1052: + case 1053: + { + FIXME("Level %ld is not implemented\n", level); + break; + } + default: + ERR("Invalid level %ld is specified\n", level); + return ERROR_INVALID_LEVEL; + } + return NERR_Success; +} + + + +/************************************************************ + * NetUserEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI +NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, + DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, + LPDWORD resume_handle) +{ + FIXME("(%s,%ld, 0x%ld,%p,%ld,%p,%p,%p) stub!\n", debugstr_w(servername), level, + filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + + return ERROR_ACCESS_DENIED; +} + +/************************************************************ + * ACCESS_QueryAdminDisplayInformation + * + * Creates a buffer with information for the Admin User + */ +static void ACCESS_QueryAdminDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD pdwSize) +{ + static const WCHAR sAdminUserName[] = { + 'A','d','m','i','n','i','s','t','r','a','t','o','r',0}; + + /* sizes of the field buffers in WCHARS */ + int name_sz, comment_sz, full_name_sz; + PNET_DISPLAY_USER usr; + + /* set up buffer */ + name_sz = lstrlenW(sAdminUserName); + comment_sz = 1; + full_name_sz = 1; + + *pdwSize = sizeof(NET_DISPLAY_USER); + *pdwSize += (name_sz + comment_sz + full_name_sz) * sizeof(WCHAR); + NetApiBufferAllocate(*pdwSize, (LPVOID *) buf); + + usr = *buf; + usr->usri1_name = (LPWSTR) ((PBYTE) usr + sizeof(NET_DISPLAY_USER)); + usr->usri1_comment = (LPWSTR) ( + ((PBYTE) usr->usri1_name) + name_sz * sizeof(WCHAR)); + usr->usri1_full_name = (LPWSTR) ( + ((PBYTE) usr->usri1_comment) + comment_sz * sizeof(WCHAR)); + + /* set data */ + lstrcpyW(usr->usri1_name, sAdminUserName); + usr->usri1_comment[0] = 0; + usr->usri1_flags = UF_SCRIPT | UF_NORMAL_ACCOUNT | UF_DONT_EXPIRE_PASSWD; + usr->usri1_full_name[0] = 0; + usr->usri1_user_id = 500; + usr->usri1_next_index = 0; +} + +/************************************************************ + * ACCESS_QueryGuestDisplayInformation + * + * Creates a buffer with information for the Guest User + */ +static void ACCESS_QueryGuestDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD pdwSize) +{ + static const WCHAR sGuestUserName[] = { + 'G','u','e','s','t',0 }; + + /* sizes of the field buffers in WCHARS */ + int name_sz, comment_sz, full_name_sz; + PNET_DISPLAY_USER usr; + + /* set up buffer */ + name_sz = lstrlenW(sGuestUserName); + comment_sz = 1; + full_name_sz = 1; + + *pdwSize = sizeof(NET_DISPLAY_USER); + *pdwSize += (name_sz + comment_sz + full_name_sz) * sizeof(WCHAR); + NetApiBufferAllocate(*pdwSize, (LPVOID *) buf); + + usr = *buf; + usr->usri1_name = (LPWSTR) ((PBYTE) usr + sizeof(NET_DISPLAY_USER)); + usr->usri1_comment = (LPWSTR) ( + ((PBYTE) usr->usri1_name) + name_sz * sizeof(WCHAR)); + usr->usri1_full_name = (LPWSTR) ( + ((PBYTE) usr->usri1_comment) + comment_sz * sizeof(WCHAR)); + + /* set data */ + lstrcpyW(usr->usri1_name, sGuestUserName); + usr->usri1_comment[0] = 0; + usr->usri1_flags = UF_ACCOUNTDISABLE | UF_SCRIPT | UF_NORMAL_ACCOUNT | + UF_DONT_EXPIRE_PASSWD; + usr->usri1_full_name[0] = 0; + usr->usri1_user_id = 500; + usr->usri1_next_index = 0; +} + +/************************************************************ + * NetQueryDisplayInformation (NETAPI32.@) + * Copies NET_DISPLAY_USER record. + */ +static void ACCESS_CopyDisplayUser(PNET_DISPLAY_USER dest, LPWSTR *dest_buf, + PNET_DISPLAY_USER src) +{ + LPWSTR str = *dest_buf; + + src->usri1_name = str; + lstrcpyW(src->usri1_name, dest->usri1_name); + str = (LPWSTR) ( + ((PBYTE) str) + (lstrlenW(str) + 1) * sizeof(WCHAR)); + + src->usri1_comment = str; + lstrcpyW(src->usri1_comment, dest->usri1_comment); + str = (LPWSTR) ( + ((PBYTE) str) + (lstrlenW(str) + 1) * sizeof(WCHAR)); + + src->usri1_flags = dest->usri1_flags; + + src->usri1_full_name = str; + lstrcpyW(src->usri1_full_name, dest->usri1_full_name); + str = (LPWSTR) ( + ((PBYTE) str) + (lstrlenW(str) + 1) * sizeof(WCHAR)); + + src->usri1_user_id = dest->usri1_user_id; + src->usri1_next_index = dest->usri1_next_index; + *dest_buf = str; +} + +/************************************************************ + * NetQueryDisplayInformation (NETAPI32.@) + * + * The buffer structure: + * - array of fixed size record of the level type + * - strings, referenced by the record of the level type + */ +NET_API_STATUS WINAPI +NetQueryDisplayInformation( + LPWSTR ServerName, DWORD Level, DWORD Index, DWORD EntriesRequested, + DWORD PreferredMaximumLength, LPDWORD ReturnedEntryCount, + PVOID *SortedBuffer) +{ + TRACE("(%s, %ld, %ld, %ld, %ld, %p, %p)\n", debugstr_w(ServerName), + Level, Index, EntriesRequested, PreferredMaximumLength, + ReturnedEntryCount, SortedBuffer); + NETAPI_ForceLocalComputer(ServerName, ERROR_ACCESS_DENIED); + switch (Level) + { + case 1: + { + /* current record */ + PNET_DISPLAY_USER inf; + /* current available strings buffer */ + LPWSTR str; + PNET_DISPLAY_USER admin, guest; + DWORD admin_size, guest_size; + LPWSTR name = NULL; + DWORD dwSize; + + /* sizes of the field buffers in WCHARS */ + int name_sz, comment_sz, full_name_sz; + + /* number of the records, returned in SortedBuffer + 3 - for current user, Administrator and Guest users + */ + int records = 3; + + FIXME("Level %ld partially implemented\n", Level); + *ReturnedEntryCount = records; + comment_sz = 1; + full_name_sz = 1; + + /* get data */ + dwSize = UNLEN + 1; + NetApiBufferAllocate(dwSize, (LPVOID *) &name); + if (!GetUserNameW(name, &dwSize)) + { + NetApiBufferFree(name); + return ERROR_ACCESS_DENIED; + } + name_sz = dwSize; + ACCESS_QueryAdminDisplayInformation(&admin, &admin_size); + ACCESS_QueryGuestDisplayInformation(&guest, &guest_size); + + /* set up buffer */ + dwSize = sizeof(NET_DISPLAY_USER) * records; + dwSize += (name_sz + comment_sz + full_name_sz) * sizeof(WCHAR); + + NetApiBufferAllocate(dwSize + + admin_size - sizeof(NET_DISPLAY_USER) + + guest_size - sizeof(NET_DISPLAY_USER), + (LPVOID *) SortedBuffer); + inf = (PNET_DISPLAY_USER) *SortedBuffer; + str = (LPWSTR) ((PBYTE) inf + sizeof(NET_DISPLAY_USER) * records); + inf->usri1_name = str; + str = (LPWSTR) ( + ((PBYTE) str) + name_sz * sizeof(WCHAR)); + inf->usri1_comment = str; + str = (LPWSTR) ( + ((PBYTE) str) + comment_sz * sizeof(WCHAR)); + inf->usri1_full_name = str; + str = (LPWSTR) ( + ((PBYTE) str) + full_name_sz * sizeof(WCHAR)); + + /* set data */ + lstrcpyW(inf->usri1_name, name); + NetApiBufferFree(name); + inf->usri1_comment[0] = 0; + inf->usri1_flags = + UF_SCRIPT | UF_NORMAL_ACCOUNT | UF_DONT_EXPIRE_PASSWD; + inf->usri1_full_name[0] = 0; + inf->usri1_user_id = 0; + inf->usri1_next_index = 0; + + inf++; + ACCESS_CopyDisplayUser(admin, &str, inf); + NetApiBufferFree(admin); + + inf++; + ACCESS_CopyDisplayUser(guest, &str, inf); + NetApiBufferFree(guest); + break; + } + + case 2: + case 3: + { + FIXME("Level %ld is not implemented\n", Level); + break; + } + + default: + ERR("Invalid level %ld is specified\n", Level); + return ERROR_INVALID_LEVEL; + } + return NERR_Success; +} + +/************************************************************ + * NetGetDCName (NETAPI32.@) + * + * Return the name of the primary domain controller (PDC) + */ + +NET_API_STATUS WINAPI +NetGetDCName(LPWSTR servername, LPWSTR domainname, LPBYTE *bufptr) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_w(servername), + debugstr_w(domainname), bufptr); + return NERR_DCNotFound; /* say we can't find a domain controller */ +} + + +/************************************************************ + * NetUserModalsGet (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR szServer, DWORD level, LPBYTE *pbuffer) +{ + FIXME("(%s %ld %p) stub!\n", debugstr_w(szServer), level, pbuffer); + return NERR_InternalError; +} + +/************************************************************ + * NetLocalGroupAdd (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetLocalGroupAdd(LPCWSTR servername, DWORD level, + LPBYTE buf, LPDWORD parm_err) +{ + FIXME("(%s %ld %p %p) stub!\n", debugstr_w(servername), level, buf, parm_err); + return NERR_Success; +} + +/************************************************************ + * NetLocalGroupSetMember (NETAPI32.@) + */ + +NET_API_STATUS WINAPI NetLocalGroupSetMembers(LPCWSTR servername, + LPCWSTR groupname, DWORD level, LPBYTE buf, DWORD totalentries) +{ + FIXME("(%s %s %ld %p %ld) stub!\n", debugstr_w(servername), + debugstr_w(groupname),level, buf, totalentries); + return NERR_Success; +} Property changes on: vendor/wine/dlls/netapi32/current/access.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/netapi32/current/apibuf.c --- vendor/wine/dlls/netapi32/current/apibuf.c 2005-11-20 19:28:28 UTC (rev 19383) +++ vendor/wine/dlls/netapi32/current/apibuf.c 2005-11-20 19:31:49 UTC (rev 19384) @@ -0,0 +1,97 @@ +/* + * Copyright 2002 Andriy Palamarchuk + * + * Net API buffer calls + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "lmcons.h" +#include "lmapibuf.h" +#include "lmerr.h" +#include "winerror.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/************************************************************ + * NetApiBufferAllocate (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer) +{ + TRACE("(%ld, %p)\n", ByteCount, Buffer); + *Buffer = HeapAlloc(GetProcessHeap(), 0, ByteCount); + if (*Buffer) + return NERR_Success; + else + return GetLastError(); +} + +/************************************************************ + * NetApiBufferFree (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferFree(LPVOID Buffer) +{ + TRACE("(%p)\n", Buffer); + HeapFree(GetProcessHeap(), 0, Buffer); + return NERR_Success; +} + +/************************************************************ + * NetApiBufferReallocate (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferReallocate(LPVOID OldBuffer, DWORD NewByteCount, + LPVOID* NewBuffer) +{ + TRACE("(%p, %ld, %p)\n", OldBuffer, NewByteCount, NewBuffer); + if (NewByteCount) + { + if (OldBuffer) + *NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount); + else + *NewBuffer = HeapAlloc(GetProcessHeap(), 0, NewByteCount); + return *NewBuffer ? NERR_Success : GetLastError(); + } + else + { + if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) return GetLastError(); + *NewBuffer = 0; + return NERR_Success; + } +} + +/************************************************************ + * NetApiBufferSize (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferSize(LPVOID Buffer, LPDWORD ByteCount) +{ + DWORD dw; + + TRACE("(%p, %p)\n", Buffer, ByteCount); + if (Buffer == NULL) + return ERROR_INVALID_PARAMETER; + dw = HeapSize(GetProcessHeap(), 0, Buffer); + TRACE("size: %ld\n", dw); + if (dw != 0xFFFFFFFF) + *ByteCount = dw; + else + *ByteCount = 0; + + return NERR_Success; +} Property changes on: vendor/wine/dlls/netapi32/current/apibuf.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/netapi32/current/browsr.c --- vendor/wine/dlls/netapi32/current/browsr.c 2005-11-20 19:28:28 UTC (rev 19383) +++ vendor/wine/dlls/netapi32/current/browsr.c 2005-11-20 19:31:49 UTC (rev 19384) @@ -0,0 +1,61 @@ +/* + * Copyright 2002 Andriy Palamarchuk + * + * netapi32 browser functions + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "lmcons.h" +#include "lmbrowsr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/************************************************************ + * I_BrowserSetNetlogonState (NETAPI32.@) + */ +NET_API_STATUS WINAPI I_BrowserSetNetlogonState( + LPWSTR ServerName, LPWSTR DomainName, LPWSTR EmulatedServerName, + DWORD Role) +{ + return ERROR_NOT_SUPPORTED; +} + +/************************************************************ + * I_BrowserQueryEmulatedDomains (NETAPI32.@) + */ +NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains( + LPWSTR ServerName, PBROWSER_EMULATED_DOMAIN *EmulatedDomains, + LPDWORD EntriesRead) +{ + return ERROR_NOT_SUPPORTED; +} + +/************************************************************ + * NetShareEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetShareEnum( LPWSTR servername, DWORD level, LPBYTE* bufptr, + DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) +{ + FIXME("%s %ld %p %ld %p %p %p\n", debugstr_w(servername), level, bufptr, + prefmaxlen, entriesread, totalentries, resume_handle); + return ERROR_NOT_SUPPORTED; +} Property changes on: vendor/wine/dlls/netapi32/current/browsr.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/netapi32/current/nbcmdqueue.c --- vendor/wine/dlls/netapi32/current/nbcmdqueue.c 2005-11-20 19:28:28 UTC (rev 19383) +++ vendor/wine/dlls/netapi32/current/nbcmdqueue.c 2005-11-20 19:31:49 UTC (rev 19384) @@ -0,0 +1,199 @@ +/* Copyright (c) 2003 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include "config.h" +#include "wine/debug.h" +#include "nbcmdqueue.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netbios); + +struct NBCmdQueue +{ + HANDLE heap; + CRITICAL_SECTION cs; + PNCB head; +}; + +#define CANCEL_EVENT_PTR(ncb) (PHANDLE)((ncb)->ncb_reserve) +#define NEXT_PTR(ncb) (PNCB *)((ncb)->ncb_reserve + sizeof(HANDLE)) + +/* The reserved area of an ncb will be used for the following data: + * - a cancelled flag (BOOL, 4 bytes??) + * - a handle to an event that's set by a cancelled command on completion + * (HANDLE, 4 bytes) + * These members are used in the following way + * - on cancel, set the event member of the reserved field (with create event) + * - NBCmdComplete will delete the ncb from the queue of there's no event; + * otherwise it will set the event and not delete the ncb + * - cancel must lock the queue before finding the ncb in it, and can unlock it + * once it's set the event (and the cancelled flag) + * - NBCmdComplete must lock the queue before attempting to remove the ncb or + * check the event + * - NBCmdQueueCancelAll will lock the queue, and cancel all ncb's in the queue. + * It'll then unlock the queue, and wait on the event in the head of the queue + * until there's no more ncb's in the queue. + * Space optimization: use the handle as a boolean. NULL == 0 => not cancelled. + * Non-NULL == valid handle => cancelled. This allows storing a next pointer + * in the ncb's reserved field as well, avoiding a memory alloc for a new + * command (cool). + */ + +struct NBCmdQueue *NBCmdQueueCreate(HANDLE heap) +{ + struct NBCmdQueue *queue; + + if (heap == NULL) + heap = GetProcessHeap(); + queue = HeapAlloc(heap, 0, sizeof(struct NBCmdQueue)); + if (queue) + { + queue->heap = heap; + InitializeCriticalSection(&queue->cs); + queue->head = NULL; + } + return queue; +} + +UCHAR NBCmdQueueAdd(struct NBCmdQueue *queue, PNCB ncb) +{ + UCHAR ret; + + TRACE(": queue %p, ncb %p\n", queue, ncb); + + if (!queue) + return NRC_BADDR; + if (!ncb) + return NRC_INVADDRESS; + + *CANCEL_EVENT_PTR(ncb) = NULL; + EnterCriticalSection(&queue->cs); + *NEXT_PTR(ncb) = queue->head; + queue->head = ncb; + ret = NRC_GOODRET; + LeaveCriticalSection(&queue->cs); + TRACE("returning 0x%02x\n", ret); + return ret; +} + +static PNCB *NBCmdQueueFindNBC(struct NBCmdQueue *queue, PNCB ncb) +{ + PNCB *ret; + + if (!queue || !ncb) + ret = NULL; + else + { + ret = &queue->head; + while (ret && *ret != ncb) + ret = NEXT_PTR(*ret); + } + return ret; +} + +UCHAR NBCmdQueueCancel(struct NBCmdQueue *queue, PNCB ncb) +{ + UCHAR ret; + PNCB *spot; + + TRACE(": queue %p, ncb %p\n", queue, ncb); + + if (!queue) + return NRC_BADDR; + if (!ncb) + return NRC_INVADDRESS; + + EnterCriticalSection(&queue->cs); + spot = NBCmdQueueFindNBC(queue, ncb); + if (spot) + { + *CANCEL_EVENT_PTR(*spot) = CreateEventW(NULL, FALSE, FALSE, NULL); + WaitForSingleObject(*CANCEL_EVENT_PTR(*spot), INFINITE); + CloseHandle(*CANCEL_EVENT_PTR(*spot)); + *spot = *NEXT_PTR(*spot); + if (ncb->ncb_retcode == NRC_CMDCAN) + ret = NRC_CMDCAN; + else + ret = NRC_CANOCCR; + } + else + ret = NRC_INVADDRESS; + LeaveCriticalSection(&queue->cs); + TRACE("returning 0x%02x\n", ret); + return ret; +} + +UCHAR NBCmdQueueComplete(struct NBCmdQueue *queue, PNCB ncb, UCHAR retcode) +{ + UCHAR ret; + PNCB *spot; + + TRACE(": queue %p, ncb %p\n", queue, ncb); + + if (!queue) + return NRC_BADDR; + if (!ncb) + return NRC_INVADDRESS; + + EnterCriticalSection(&queue->cs); + spot = NBCmdQueueFindNBC(queue, ncb); + if (spot) + { + if (*CANCEL_EVENT_PTR(*spot)) + SetEvent(*CANCEL_EVENT_PTR(*spot)); + else + *spot = *NEXT_PTR(*spot); + ret = NRC_GOODRET; + } + else + ret = NRC_INVADDRESS; + LeaveCriticalSection(&queue->cs); + TRACE("returning 0x%02x\n", ret); + return ret; +} + +UCHAR NBCmdQueueCancelAll(struct NBCmdQueue *queue) +{ + UCHAR ret; + + TRACE(": queue %p\n", queue); + + if (!queue) + return NRC_BADDR; + + EnterCriticalSection(&queue->cs); + while (queue->head) + { + TRACE(": waiting for ncb %p (command 0x%02x)\n", queue->head, + queue->head->ncb_command); + NBCmdQueueCancel(queue, queue->head); + } + LeaveCriticalSection(&queue->cs); + ret = NRC_GOODRET; + TRACE("returning 0x%02x\n", ret); + return ret; +} + [truncated at 1000 lines; 4091 more skipped]

18 years, 10 months

[greatlrd] 19383: implement GetDeviceCapabilities and GetDeviceCount for midMessage

by greatlrd＠svn.reactos.com

implement GetDeviceCapabilities and GetDeviceCount for midMessage Modified: trunk/reactos/lib/mmdrv/midi.c Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/midi.c --- trunk/reactos/lib/mmdrv/midi.c 2005-11-20 18:54:55 UTC (rev 19382) +++ trunk/reactos/lib/mmdrv/midi.c 2005-11-20 19:28:28 UTC (rev 19383) @@ -17,7 +17,43 @@ // MIDI device instance information // +#define LOCAL_DATA_SIZE 20 +typedef struct _LOCALMIDIHDR { + OVERLAPPED Ovl; + DWORD BytesReturned; + struct _LOCALMIDIHDR *lpNext; + BOOL Done; + PVOID pClient; + // MIDI_DD_INPUT_DATA MidiData; + BYTE ExtraData[LOCAL_DATA_SIZE - sizeof(ULONG)]; + +} LOCALMIDIHDR, *PLOCALMIDIHDR; +#define LOCAL_MIDI_BUFFERS 8 + +typedef struct { + + BOOL fMidiInStarted; + DWORD dwMsg; + DWORD dwCurData; + BYTE status; + BOOLEAN fSysex; + BOOLEAN Bad; + BYTE bBytesLeft; + BYTE bBytePos; + DWORD dwCurTime; + DWORD dwMsgTime; + + + PLOCALMIDIHDR DeviceQueue; + + LOCALMIDIHDR + Bufs[LOCAL_MIDI_BUFFERS]; + + +} LOCALMIDIDATA, *PLOCALMIDIDATA; + + typedef struct tag_MIDIALLOC { struct tag_MIDIALLOC *Next; // Chain of devices UINT DeviceNumber; // Number of device @@ -54,7 +90,7 @@ HANDLE AuxEvent2; // Aux thread caller waits on this DWORD AuxReturnCode; // Return code from Aux task DWORD dwFlags; // Open flags -// PLOCALMIDIDATA Mid; // Extra midi input structures + PLOCALMIDIDATA Mid; // Extra midi input structures int l; // Helper global for modMidiLength } MIDIALLOC, *PMIDIALLOC; @@ -79,13 +115,24 @@ break; case MidiInDevice : - // TODO + pClient = (PMIDIALLOC) HeapAlloc(Heap, 0, sizeof(MIDIALLOC) + sizeof(LOCALMIDIDATA)); + if ( pClient ) memset(pClient, 0, sizeof(MIDIALLOC) + sizeof(LOCALMIDIDATA)); break; }; if ( !pClient ) return MMSYSERR_NOMEM; - + + if (DeviceType == MidiInDevice) + { + int i; + pClient->Mid = (PLOCALMIDIDATA)(pClient + 1); + for (i = 0 ;i < LOCAL_MIDI_BUFFERS ; i++) + { + pClient->Mid->Bufs[i].pClient = pClient; + } + } + pClient->DeviceType = DeviceType; pClient->dwCallback = ((LPMIDIOPENDESC)Param1)->dwCallback; pClient->dwInstance = ((LPMIDIOPENDESC)Param1)->dwInstance; @@ -108,11 +155,34 @@ return MMSYSERR_NOMEM; } + if (DeviceType == MidiInDevice) + { + pClient->AuxEvent1 = CreateEvent(NULL, FALSE, FALSE, NULL); + if (pClient->AuxEvent1 == NULL) + { + // cleanup + return MMSYSERR_NOMEM; + } + + pClient->AuxEvent2 = CreateEvent(NULL, FALSE, FALSE, NULL); + if (pClient->AuxEvent2 == NULL) + { + // cleanup + return MMSYSERR_NOMEM; + } + + + // TaskCreate + + WaitForSingleObject(pClient->AuxEvent2, INFINITE); + } + PMIDIALLOC *pUserHandle; pUserHandle = (PMIDIALLOC*) User; *pUserHandle = pClient; - // callback + // callback + return MMSYSERR_NOERROR; } @@ -183,11 +253,11 @@ switch (dwMessage) { case MIDM_GETNUMDEVS: DPRINT("MIDM_GETNUMDEVS"); - return 0; + return GetDeviceCount(MidiInDevice); case MIDM_GETDEVCAPS: DPRINT("MIDM_GETDEVCAPS"); - return MMSYSERR_NOERROR; + return GetDeviceCapabilities(dwId, MidiInDevice, (LPBYTE)dwParam1, (DWORD)dwParam2); case MIDM_OPEN: DPRINT("MIDM_OPEN"); _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-20 18:54:55 UTC (rev 19382) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-20 19:28:28 UTC (rev 19383) @@ -51,7 +51,7 @@ &BytesReturned, NULL) ? MMSYSERR_NOERROR : TranslateStatus(); } - else if (DeviceType == MidiOutDevice) + else if ((DeviceType == MidiInDevice) || (DeviceType == MidiOutDevice)) { Result = DeviceIoControl(DeviceHandle, IOCTL_MIDI_GET_CAPABILITIES, NULL, 0, (LPVOID)pCaps, Size,

18 years, 10 months

← Newer
1
...
38
39
40
41
42
43
44
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005