Author: fireball Date: Tue Jul 4 23:22:00 2006 New Revision: 22842
URL: http://svn.reactos.org/svn/reactos?rev=22842&view=rev Log: Revert netapi and mpr winesyncs (needs to be re-applied correctly next time)
Added: trunk/reactos/dll/win32/mpr/mpr_Ru.rc - copied unchanged from r22828, trunk/reactos/dll/win32/mpr/mpr_Ru.rc trunk/reactos/dll/win32/mpr/mpr_Sv.rc - copied unchanged from r22828, trunk/reactos/dll/win32/mpr/mpr_Sv.rc trunk/reactos/dll/win32/mpr/mpr_Uk.rc - copied unchanged from r22828, trunk/reactos/dll/win32/mpr/mpr_Uk.rc Removed: trunk/reactos/dll/win32/mpr/mpr_Eo.rc trunk/reactos/dll/win32/mpr/mpr_Tr.rc trunk/reactos/dll/win32/netapi32/share.c Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild trunk/reactos/dll/win32/mpr/mpr.rc trunk/reactos/dll/win32/mpr/mpr.spec trunk/reactos/dll/win32/mpr/mpr_Cs.rc trunk/reactos/dll/win32/mpr/mpr_Hu.rc trunk/reactos/dll/win32/mpr/mpr_Ja.rc trunk/reactos/dll/win32/mpr/nps.c trunk/reactos/dll/win32/mpr/wnet.c trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/netapi32.rbuild trunk/reactos/dll/win32/netapi32/wksta.c
Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rbuild?re... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rbuild (original) +++ trunk/reactos/dll/win32/mpr/mpr.rbuild Tue Jul 4 23:22:00 2006 @@ -2,29 +2,24 @@ <importlibrary definition="mpr.spec.def" /> <include base="mpr">.</include> <include base="ReactOS">include/reactos/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> <define name="__REACTOS__" /> - <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> <library>user32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>ntdll</library> <file>auth.c</file> - <library>ntdll</library> <file>mpr_main.c</file> - <library>ntdll</library> <file>multinet.c</file> - <library>ntdll</library> <file>nps.c</file> - <library>ntdll</library> <file>pwcache.c</file> - <library>ntdll</library> <file>wnet.c</file> - <library>ntdll</library> <file>mpr.rc</file> <file>mpr.spec</file> </module>
Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=22... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr.rc Tue Jul 4 23:22:00 2006 @@ -30,11 +30,13 @@ #include "mpr_En.rc" #include "mpr_Es.rc" #include "mpr_Fr.rc" -#include "mpr_Hu.rc" #include "mpr_It.rc" #include "mpr_Ja.rc" #include "mpr_Ko.rc" #include "mpr_Nl.rc" #include "mpr_No.rc" #include "mpr_Pt.rc" -#include "mpr_Tr.rc" +#include "mpr_Ru.rc" +#include "mpr_Sv.rc" +#include "mpr_Hu.rc" +#include "mpr_Uk.rc"
Modified: trunk/reactos/dll/win32/mpr/mpr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.spec?rev=... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.spec (original) +++ trunk/reactos/dll/win32/mpr/mpr.spec Tue Jul 4 23:22:00 2006 @@ -40,12 +40,12 @@ @ stdcall NPSNotifyRegisterA(long ptr) @ stdcall NPSSetCustomTextA(str) @ stdcall NPSSetExtendedErrorA(long str) -@ stdcall PwdChangePasswordA(str ptr long ptr) -@ stdcall PwdChangePasswordW(wstr ptr long ptr) -@ stdcall PwdGetPasswordStatusA(str long ptr) -@ stdcall PwdGetPasswordStatusW(wstr long ptr) -@ stdcall PwdSetPasswordStatusA(str long long) -@ stdcall PwdSetPasswordStatusW(wstr long long) +@ stub PwdChangePasswordA +@ stub PwdChangePasswordW +@ stub PwdGetPasswordStatusA +@ stub PwdGetPasswordStatusW +@ stub PwdSetPasswordStatusA +@ stub PwdSetPasswordStatusW @ stdcall WNetAddConnection2A(ptr str str long) @ stdcall WNetAddConnection2W(ptr wstr wstr long) @ stdcall WNetAddConnection3A(long ptr str str long)
Modified: trunk/reactos/dll/win32/mpr/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Cs.rc?rev... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Cs.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Cs.rc Tue Jul 4 23:22:00 2006 @@ -1,5 +1,4 @@ -/* Hey, Emacs, open this file with -*- coding: cp1250 -*- - * +/* * Czech MPR dll resources * Copyright (C) 2004 Juan Lang * Copyright (C) 2004, 2005 David Kredba @@ -21,29 +20,27 @@
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-/* Czech strings in CP1250 */ - STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "Celá sí" + IDS_ENTIRENETWORK "Celá sí»" }
IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Zadání síového hesla" +CAPTION "Zadání sí»ového hesla" FONT 8, "MS Shell Dlg" { - LTEXT "Prosím zadejte své uivatelské jméno a heslo:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Prosím zadejte své u¾ivatelské jméno a heslo:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Uivatel", -1, 40, 66, 50, 10 + LTEXT "U¾ivatel", -1, 40, 66, 50, 10 LTEXT "Heslo", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Uloit toto heslo (Není bezpeèné) ?", IDC_SAVEPASSWORD, + CHECKBOX "&Ulo¾it toto heslo (Není bezpeèné) ?", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Zruit", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Zru¹it", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP }
Removed: trunk/reactos/dll/win32/mpr/mpr_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Eo.rc?rev... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Eo.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Eo.rc (removed) @@ -1,46 +1,0 @@ -/* - * MPR dll resources - Esperanto Language Support - * - * Copyright 2006 Antonio Codazzi - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Tuta Reto" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Enmetu Retan Pasvorton" -FONT 8, "MS Shell Dlg" -{ -LTEXT "Enmetu uzantonomon kaj pasvorton:", IDC_EXPLAIN, 40, 6, 150, 15 -LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ -LTEXT "Uzanto", -1, 40, 66, 50, 10 -LTEXT "Pasvorto", -1, 40, 86, 50, 10 -LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 -LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 -EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP -EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD -CHECKBOX "&Storu pasvorton ( RISKE! )", IDC_SAVEPASSWORD, -80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -PUSHBUTTON "Bone", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON -PUSHBUTTON "Rezigni", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -}
Modified: trunk/reactos/dll/win32/mpr/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Hu.rc?rev... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Hu.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Hu.rc Tue Jul 4 23:22:00 2006 @@ -1,7 +1,8 @@ /* * MPR dll resources * - * Copyright (C) 2006 Andras Kovacs + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2005 Gergely Risko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,28 +19,28 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "Teljes hálózat" + IDS_ENTIRENETWORK "Teljes álózat" }
IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Hálózati jelszó megadása" +CAPTION "Hálózati Bejelentkezés" FONT 8, "MS Shell Dlg" { - LTEXT "Kérem adja meg a felhasználónevét és jelszavát:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Írd be a felhasználó nevet és jelszót:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Felhasználónév", -1, 40, 66, 50, 10 + LTEXT "Felhasználó", -1, 40, 66, 50, 10 LTEXT "Jelszó", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Jelszó mentése (nem biztonságos)", IDC_SAVEPASSWORD, + CHECKBOX "Jelszó &mentése (Nem biztonságos)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Mégse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
Modified: trunk/reactos/dll/win32/mpr/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ja.rc?rev... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ja.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ja.rc Tue Jul 4 23:22:00 2006 @@ -18,9 +18,29 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE { IDS_ENTIRENETWORK "lbg[NSÌ" } + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "lbg[NpX[hÌüÍ" +FONT 9, "MS UI Gothic" +{ + LTEXT "[U[¼ÆpX[hðü͵ĺ³¢:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "vLV", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "[U¼", -1, 40, 66, 50, 10 + LTEXT "pX[h", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "pX[hðÛ¶·é(&S) (ÀSÅÍ èܹñ)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "LZ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +}
Removed: trunk/reactos/dll/win32/mpr/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Tr.rc?rev... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Tr.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Tr.rc (removed) @@ -1,46 +1,0 @@ -/* - * MPR dll resources for Turkish - * - * Copyright (C) 2006 Fatih Aþýcý - * - * 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 - */ - -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Tüm Að" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Að Parolanýzý Girin" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Lütfen kullanýcý adýnýzý ve parolanýzý girin:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Kullanýcý", -1, 40, 66, 50, 10 - LTEXT "Parola", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "Bu parolayý &sakla (Güvensiz)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Tamam", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ýptal", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -}
Modified: trunk/reactos/dll/win32/mpr/nps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/nps.c?rev=228... ============================================================================== --- trunk/reactos/dll/win32/mpr/nps.c (original) +++ trunk/reactos/dll/win32/mpr/nps.c Tue Jul 4 23:22:00 2006 @@ -211,71 +211,3 @@ FIXME( "(%p): stub\n", pfNotifyCallBack ); return NULL; } - -/***************************************************************** - * PwdGetPasswordStatusA [MPR.@] - */ -DWORD WINAPI PwdGetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, LPDWORD status ) -{ - FIXME("%s %ld %p\n", debugstr_a(lpProvider), dwIndex, status ); - *status = 0; - return WN_SUCCESS; -} - -/***************************************************************** - * PwdGetPasswordStatusA [MPR.@] - */ -DWORD WINAPI PwdGetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, LPDWORD status ) -{ - FIXME("%s %ld %p\n", debugstr_w(lpProvider), dwIndex, status ); - *status = 0; - return WN_SUCCESS; -} - -/***************************************************************** - * PwdSetPasswordStatusA [MPR.@] - */ -DWORD WINAPI PwdSetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, DWORD status ) -{ - FIXME("%s %ld %ld\n", debugstr_a(lpProvider), dwIndex, status ); - return WN_SUCCESS; -} - -/***************************************************************** - * PwdSetPasswordStatusW [MPR.@] - */ -DWORD WINAPI PwdSetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, DWORD status ) -{ - FIXME("%s %ld %ld\n", debugstr_w(lpProvider), dwIndex, status ); - return WN_SUCCESS; -} - -typedef struct _CHANGEPWDINFOA { - LPSTR lpUsername; - LPSTR lpPassword; - DWORD cbPassword; -} CHANGEPWDINFOA, *LPCHANGEPWDINFOA; - -typedef struct _CHANGEPWDINFOW { - LPWSTR lpUsername; - LPWSTR lpPassword; - DWORD cbPassword; -} CHANGEPWDINFOW, *LPCHANGEPWDINFOW; - -/***************************************************************** - * PwdChangePasswordA [MPR.@] - */ -DWORD WINAPI PwdChangePasswordA( LPCSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOA info ) -{ - FIXME("%s %p %lx %p\n", debugstr_a(lpProvider), hWnd, flags, info ); - return WN_SUCCESS; -} - -/***************************************************************** - * PwdChangePasswordA [MPR.@] - */ -DWORD WINAPI PwdChangePasswordW( LPCWSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOW info ) -{ - FIXME("%s %p %lx %p\n", debugstr_w(lpProvider), hWnd, flags, info ); - return WN_SUCCESS; -}
Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=22... ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c (original) +++ trunk/reactos/dll/win32/mpr/wnet.c Tue Jul 4 23:22:00 2006 @@ -22,6 +22,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "winnls.h" #include "winnetwk.h" #include "npapi.h"
Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.c... ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c (original) +++ trunk/reactos/dll/win32/netapi32/access.c Tue Jul 4 23:22:00 2006 @@ -554,12 +554,6 @@ NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR szServer, DWORD level, LPBYTE *pbuffer) { FIXME("(%s %ld %p) stub!\n", debugstr_w(szServer), level, pbuffer); - - if (level == 2) - { - *pbuffer = NULL; - return NERR_Success; - } return NERR_InternalError; }
Modified: trunk/reactos/dll/win32/netapi32/netapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi32... ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.rbuild (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.rbuild Tue Jul 4 23:22:00 2006 @@ -3,35 +3,26 @@ <include base="netapi32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> - <define name="__WINESRC__" /> <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> - <library>ws2_32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>ntdll</library> <file>access.c</file> - <library>ntdll</library> <file>apibuf.c</file> - <library>ntdll</library> <file>browsr.c</file> - <library>ntdll</library> <file>ds.c</file> - <library>ntdll</library> <file>nbcmdqueue.c</file> - <library>ntdll</library> <file>nbnamecache.c</file> - <library>ntdll</library> <file>nbt.c</file> - <library>ntdll</library> <file>netapi32.c</file> - <library>ntdll</library> <file>netbios.c</file> - <library>ntdll</library> <file>wksta.c</file> <file>netapi32.spec</file> </module>
Removed: trunk/reactos/dll/win32/netapi32/share.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c?... ============================================================================== --- trunk/reactos/dll/win32/netapi32/share.c (original) +++ trunk/reactos/dll/win32/netapi32/share.c (removed) @@ -1,85 +1,0 @@ -/* Copyright 2006 Paul Vriens - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "wine/debug.h" -#include "lm.h" -#include "winerror.h" - -WINE_DEFAULT_DEBUG_CHANNEL(share); - -/************************************************************ - * NetSessionEnum (NETAPI32.@) - * - * PARAMS - * servername [I] Pointer to a string with the name of the server - * UncClientName [I] Pointer to a string with the name of the session - * username [I] Pointer to a string with the name of the user - * level [I] Data information level - * bufptr [O] Buffer to the data - * prefmaxlen [I] Preferred maximum length of the data - * entriesread [O] Pointer to the number of entries enumerated - * totalentries [O] Pointer to the possible number of entries - * resume_handle [I/O] Pointer to a handle for subsequent searches - * - * RETURNS - * If successful, the function returns NERR_Success - * On failure it returns: - * ERROR_ACCESS_DENIED User has no access to the requested information - * ERROR_INVALID_LEVEL Value of 'level' is not correct - * ERROR_INVALID_PARAMETER Wrong parameter - * ERROR_MORE_DATA Need a larger buffer - * ERROR_NOT_ENOUGH_MEMORY Not enough memory - * NERR_ClientNameNotFound A session does not exist on a given computer - * NERR_InvalidComputer Invalid computer name - * NERR_UserNotFound User name could not be found. - */ -NET_API_STATUS WINAPI NetSessionEnum(LPWSTR servername, LPWSTR UncClientName, - LPWSTR username, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, - LPDWORD totalentries, LPDWORD resume_handle) -{ - FIXME("Stub (%s %s %s %ld %p %ld %p %p %p)\n", debugstr_w(servername), - debugstr_w(UncClientName), debugstr_w(username), - level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); - - return NERR_Success; -} - -/************************************************************ - * NetShareEnum (NETAPI32.@) - * - * PARAMS - * servername [I] Pointer to a string with the name of the server - * level [I] Data information level - * bufptr [O] Buffer to the data - * prefmaxlen [I] Preferred maximum length of the data - * entriesread [O] Pointer to the number of entries enumerated - * totalentries [O] Pointer to the possible number of entries - * resume_handle [I/O] Pointer to a handle for subsequent searches - * - * RETURNS - * If successful, the function returns NERR_Success - * On failure it returns a system error code (FIXME: find out which) - * - */ -NET_API_STATUS WINAPI NetShareEnum( LPWSTR servername, DWORD level, LPBYTE* bufptr, - DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) -{ - FIXME("Stub (%s %ld %p %ld %p %p %p)\n", debugstr_w(servername), level, bufptr, - prefmaxlen, entriesread, totalentries, resume_handle); - - return ERROR_NOT_SUPPORTED; -}
Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c?... ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c Tue Jul 4 23:22:00 2006 @@ -36,7 +36,6 @@ #include "iphlpapi.h" #include "winerror.h" #include "winreg.h" -#include "winternl.h" #include "ntsecapi.h" #include "netbios.h" #include "wine/debug.h"