Ros-diffs December 2004

ros-diffs@reactos.org

26 participants
824 discussions

Integrated change by gvg in revision 12541

by gvg＠svn.reactos.com

Wine-20041201 vendor drop Added: vendor/wine/dlls/mpr/ Added: vendor/wine/dlls/mpr/current/ Added: vendor/wine/dlls/mpr/current/Makefile.in Added: vendor/wine/dlls/mpr/current/auth.c Added: vendor/wine/dlls/mpr/current/mpr.rc Added: vendor/wine/dlls/mpr/current/mpr.spec Added: vendor/wine/dlls/mpr/current/mpr_Cs.rc Added: vendor/wine/dlls/mpr/current/mpr_De.rc Added: vendor/wine/dlls/mpr/current/mpr_En.rc Added: vendor/wine/dlls/mpr/current/mpr_Es.rc Added: vendor/wine/dlls/mpr/current/mpr_It.rc Added: vendor/wine/dlls/mpr/current/mpr_Ja.rc Added: vendor/wine/dlls/mpr/current/mpr_Nl.rc Added: vendor/wine/dlls/mpr/current/mpr_Pt.rc Added: vendor/wine/dlls/mpr/current/mpr_main.c Added: vendor/wine/dlls/mpr/current/mprres.h Added: vendor/wine/dlls/mpr/current/multinet.c Added: vendor/wine/dlls/mpr/current/nps.c Added: vendor/wine/dlls/mpr/current/pwcache.c Added: vendor/wine/dlls/mpr/current/version.rc Added: vendor/wine/dlls/mpr/current/wnet.c Added: vendor/wine/dlls/mpr/current/wnetpriv.h _____ Added: vendor/wine/dlls/mpr/current/Makefile.in --- vendor/wine/dlls/mpr/current/Makefile.in 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/Makefile.in 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,21 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mpr.dll +IMPORTS = user32 advapi32 kernel32 +EXTRALIBS = $(LIBUNICODE) + +C_SRCS = \ + auth.c \ + mpr_main.c \ + multinet.c \ + nps.c \ + pwcache.c \ + wnet.c + +RC_SRCS = mpr.rc + +@MAKE_DLL_RULES@ + +### Dependencies: _____ Added: vendor/wine/dlls/mpr/current/auth.c --- vendor/wine/dlls/mpr/current/auth.c 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/auth.c 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,95 @@ +/* + * MPR Authentication and Logon functions + * + * Copyright 1999 Ulrich Weigand + * + * 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 "winnetwk.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + + +/***************************************************************** + * WNetLogoffA [MPR.@] + */ +DWORD WINAPI WNetLogoffA( LPCSTR lpProvider, HWND hwndOwner ) +{ + FIXME( "(%s, %p): stub\n", debugstr_a(lpProvider), hwndOwner ); + + SetLastError(WN_NO_NETWORK); + return WN_NO_NETWORK; +} + +/***************************************************************** + * WNetLogoffW [MPR.@] + */ +DWORD WINAPI WNetLogoffW( LPCWSTR lpProvider, HWND hwndOwner ) +{ + FIXME( "(%s, %p): stub\n", debugstr_w(lpProvider), hwndOwner ); + + SetLastError(WN_NO_NETWORK); + return WN_NO_NETWORK; +} + +/***************************************************************** + * WNetLogonA [MPR.@] + */ +DWORD WINAPI WNetLogonA( LPCSTR lpProvider, HWND hwndOwner ) +{ + FIXME( "(%s, %p): stub\n", debugstr_a(lpProvider), hwndOwner ); + + SetLastError(WN_NO_NETWORK); + return WN_NO_NETWORK; +} + +/***************************************************************** + * WNetLogonW [MPR.@] + */ +DWORD WINAPI WNetLogonW( LPCWSTR lpProvider, HWND hwndOwner ) +{ + FIXME( "(%s, %p): stub\n", debugstr_w(lpProvider), hwndOwner ); + + SetLastError(WN_NO_NETWORK); + return WN_NO_NETWORK; +} + +/***************************************************************** + * WNetVerifyPasswordA [MPR.@] + */ +DWORD WINAPI WNetVerifyPasswordA( LPCSTR lpszPassword, BOOL *pfMatch ) +{ + FIXME( "(%p, %p): stub\n", lpszPassword, pfMatch ); + + SetLastError(WN_NO_NETWORK); + return WN_NO_NETWORK; +} + +/***************************************************************** + * WNetVerifyPasswordW [MPR.@] + */ +DWORD WINAPI WNetVerifyPasswordW( LPCWSTR lpszPassword, BOOL *pfMatch ) +{ + FIXME( "(%p, %p): stub\n", lpszPassword, pfMatch ); + + SetLastError(WN_NO_NETWORK); + return WN_NO_NETWORK; +} _____ Added: vendor/wine/dlls/mpr/current/mpr.rc --- vendor/wine/dlls/mpr/current/mpr.rc 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr.rc 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,33 @@ +/* + * MPR dll resources + * + * Copyright (C) 2004 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 "windef.h" +#include "winbase.h" +#include "mprres.h" + +#include "version.rc" + +#include "mpr_Cs.rc" +#include "mpr_De.rc" +#include "mpr_En.rc" +#include "mpr_Nl.rc" +#include "mpr_Es.rc" +#include "mpr_It.rc" +#include "mpr_Ja.rc" +#include "mpr_Pt.rc" _____ Added: vendor/wine/dlls/mpr/current/mpr.spec --- vendor/wine/dlls/mpr/current/mpr.spec 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr.spec 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,116 @@ +# ordinal exports + 1 stub @ + 2 stub @ + 3 stub @ + 4 stub @ + 5 stub @ + 6 stub @ + 7 stub @ + 8 stub @ + 9 stub @ +12 stub @ +13 stub @ +14 stub @ +15 stub @ +16 stub @ +17 stub @ +18 stub @ +19 stub @ +20 stub @ +21 stub @ +22 stdcall @(long) MPR_Alloc +23 stdcall @(ptr long) MPR_ReAlloc +24 stdcall @(ptr) MPR_Free +25 stdcall @(ptr long) _MPR_25 + +@ stdcall -private DllCanUnloadNow() MPR_DllCanUnloadNow +@ stub DllGetClassObject +@ stdcall MultinetGetConnectionPerformanceA(ptr ptr) +@ stdcall MultinetGetConnectionPerformanceW(ptr ptr) +@ stdcall MultinetGetErrorTextA(long ptr long) +@ stdcall MultinetGetErrorTextW(long ptr long) +@ stdcall NPSAuthenticationDialogA(ptr) +@ stdcall NPSCopyStringA(str ptr ptr) +@ stdcall NPSDeviceGetNumberA(str ptr ptr) +@ stdcall NPSDeviceGetStringA(long long ptr long) +@ stdcall NPSGetProviderHandleA(ptr) +@ stdcall NPSGetProviderNameA(long ptr) +@ stdcall NPSGetSectionNameA(long ptr) +@ stdcall NPSNotifyGetContextA(ptr) +@ stdcall NPSNotifyRegisterA(long ptr) +@ stdcall NPSSetCustomTextA(str) +@ stdcall NPSSetExtendedErrorA(long str) +@ 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) +@ stdcall WNetAddConnection3W(long ptr wstr wstr long) +@ stdcall WNetAddConnectionA(str str str) +@ stdcall WNetAddConnectionW(wstr wstr wstr) +@ stdcall WNetCachePassword(str long str long long long) +@ stdcall WNetCancelConnection2A(str long long) +@ stdcall WNetCancelConnection2W(wstr long long) +@ stdcall WNetCancelConnectionA(str long) +@ stdcall WNetCancelConnectionW(wstr long) +@ stdcall WNetCloseEnum(long) +@ stdcall WNetConnectionDialog1A(ptr) +@ stdcall WNetConnectionDialog1W(ptr) +@ stdcall WNetConnectionDialog(long long) +@ stdcall WNetDisconnectDialog1A(ptr) +@ stdcall WNetDisconnectDialog1W(ptr) +@ stdcall WNetDisconnectDialog(long long) +@ stdcall WNetEnumCachedPasswords(str long long ptr long) +@ stdcall WNetEnumResourceA(long ptr ptr ptr) +@ stdcall WNetEnumResourceW(long ptr ptr ptr) +@ stub WNetFormatNetworkNameA +@ stub WNetFormatNetworkNameW +@ stdcall WNetGetCachedPassword(ptr long ptr ptr long) +@ stdcall WNetGetConnectionA(str ptr ptr) +@ stdcall WNetGetConnectionW(wstr ptr ptr) +@ stub WNetGetHomeDirectoryA +@ stub WNetGetHomeDirectoryW +@ stdcall WNetGetLastErrorA(ptr ptr long ptr long) +@ stdcall WNetGetLastErrorW(ptr ptr long ptr long) +@ stdcall WNetGetNetworkInformationA(str ptr) +@ stdcall WNetGetNetworkInformationW(wstr ptr) +@ stdcall WNetGetProviderNameA(long ptr ptr) +@ stdcall WNetGetProviderNameW(long ptr ptr) +@ stdcall WNetGetResourceInformationA(ptr ptr ptr ptr) +@ stdcall WNetGetResourceInformationW(ptr ptr ptr ptr) +@ stdcall WNetGetResourceParentA(ptr ptr ptr) +@ stdcall WNetGetResourceParentW(ptr ptr ptr) +@ stdcall WNetGetUniversalNameA (str long ptr ptr) +@ stdcall WNetGetUniversalNameW (wstr long ptr ptr) +@ stdcall WNetGetUserA(str ptr ptr) +@ stdcall WNetGetUserW(wstr wstr ptr) +@ stdcall WNetLogoffA(str long) +@ stdcall WNetLogoffW(wstr long) +@ stdcall WNetLogonA(str long) +@ stdcall WNetLogonW(wstr long) +@ stdcall WNetOpenEnumA(long long long ptr ptr) +@ stdcall WNetOpenEnumW(long long long ptr ptr) +@ stdcall WNetRemoveCachedPassword(long long long) +@ stdcall WNetRestoreConnectionA(long str) +@ stdcall WNetRestoreConnectionW(long wstr) +@ stdcall WNetSetConnectionA(str long ptr) +@ stdcall WNetSetConnectionW(wstr long ptr) +@ stdcall WNetUseConnectionA(long ptr str str long str ptr ptr) +@ stdcall WNetUseConnectionW(long ptr wstr wstr long wstr ptr ptr) +@ stdcall WNetVerifyPasswordA(str ptr) +@ stdcall WNetVerifyPasswordW(wstr ptr) + +#additions, not in win95 mpr.dll +@ stub WNetRestoreConnection +@ stub WNetLogonNotify +@ stub WNetPasswordChangeNotify +@ stub WNetGetPropertyTextA +@ stub WNetPropertyDialogA +@ stub WNetGetDirectoryTypeA +@ stub WNetFMXGetPermHelp +@ stub WNetFMXEditPerm +@ stub WNetFMXGetPermCaps _____ Added: vendor/wine/dlls/mpr/current/mpr_Cs.rc --- vendor/wine/dlls/mpr/current/mpr_Cs.rc 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr_Cs.rc 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,26 @@ +/* + * Czech MPR dll resources + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2004 David Kredba + * + * 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_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Celá sí»" +} _____ Added: vendor/wine/dlls/mpr/current/mpr_De.rc --- vendor/wine/dlls/mpr/current/mpr_De.rc 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr_De.rc 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,26 @@ +/* + * MPR dll resources + * + * Copyright (C) 2004 Henning Gerhardt + * + * 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_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Gesamtes Netzwerk" +} _____ Added: vendor/wine/dlls/mpr/current/mpr_En.rc --- vendor/wine/dlls/mpr/current/mpr_En.rc 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr_En.rc 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,26 @@ +/* + * MPR dll resources + * + * Copyright (C) 2004 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 + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Entire Network" +} _____ Added: vendor/wine/dlls/mpr/current/mpr_Es.rc --- vendor/wine/dlls/mpr/current/mpr_Es.rc 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr_Es.rc 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,26 @@ +/* + * MPR dll Spanish resources + * + * Copyright (C) 2004 José Manuel Ferrer Ortiz + * + * 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_SPANISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Toda la red" +} _____ Added: vendor/wine/dlls/mpr/current/mpr_It.rc --- vendor/wine/dlls/mpr/current/mpr_It.rc 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr_It.rc 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,26 @@ +/* + * MPR dll Italian resources + * + * Copyright 2004 Ivan Leo Puoti + * + * 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_ITALIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Tutta la rete" +} _____ Added: vendor/wine/dlls/mpr/current/mpr_Ja.rc --- vendor/wine/dlls/mpr/current/mpr_Ja.rc 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr_Ja.rc 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,26 @@ +/* + * MPR dll resources + * + * Copyright (C) 2004 Hajime Segawa + * + * 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_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "flfbfgf[fN'S'Ì" +} _____ Added: vendor/wine/dlls/mpr/current/mpr_Nl.rc --- vendor/wine/dlls/mpr/current/mpr_Nl.rc 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr_Nl.rc 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,26 @@ +/* + * Dutch resources for MPR + * + * Copyright (C) 2004 Hans Leidekker + * + * 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_DUTCH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Gehele netwerk" +} _____ Added: vendor/wine/dlls/mpr/current/mpr_Pt.rc --- vendor/wine/dlls/mpr/current/mpr_Pt.rc 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr_Pt.rc 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,26 @@ +/* + * MPR dll resources + * + * Copyright (C) 2004 Marcelo Duarte + * + * 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_PORTUGUESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Toda a rede" +} _____ Added: vendor/wine/dlls/mpr/current/mpr_main.c --- vendor/wine/dlls/mpr/current/mpr_main.c 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mpr_main.c 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,100 @@ +/* + * MPR undocumented functions + * + * Copyright 1999 Ulrich Weigand + * + * 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 "winnetwk.h" +#include "wine/debug.h" +#include "wnetpriv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + + /* + * FIXME: The following routines should use a private heap ... + */ + +/***************************************************************** + * @ [MPR.22] + */ +LPVOID WINAPI MPR_Alloc( DWORD dwSize ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize ); +} + +/***************************************************************** + * @ [MPR.23] + */ +LPVOID WINAPI MPR_ReAlloc( LPVOID lpSrc, DWORD dwSize ) +{ + if ( lpSrc ) + return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, lpSrc, dwSize ); + else + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize ); +} + +/***************************************************************** + * @ [MPR.24] + */ +BOOL WINAPI MPR_Free( LPVOID lpMem ) +{ + if ( lpMem ) + return HeapFree( GetProcessHeap(), 0, lpMem ); + else + return FALSE; +} + +/***************************************************************** + * @ [MPR.25] + */ +BOOL WINAPI _MPR_25( LPBYTE lpMem, INT len ) +{ + FIXME( "(%p, %d): stub\n", lpMem, len ); + + return FALSE; +} + +/***************************************************************** + * DllCanUnloadNow [MPR.@] + */ +DWORD WINAPI MPR_DllCanUnloadNow(void) +{ + FIXME("Stub\n"); + return S_OK; +} + +/***************************************************************** + * DllMain [MPR.init] + */ +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + wnetInit(hinstDLL); + break; + + case DLL_PROCESS_DETACH: + wnetFree(); + break; + } + return TRUE; +} _____ Added: vendor/wine/dlls/mpr/current/mprres.h --- vendor/wine/dlls/mpr/current/mprres.h 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/mprres.h 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2004 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 + */ +#ifndef __WINE_MPRRES_H__ +#define __WINE_MPRRES_H__ + +#define IDS_ENTIRENETWORK 1 + +#endif /* ndef __WINE_MPRRES_H__ */ _____ Added: vendor/wine/dlls/mpr/current/multinet.c --- vendor/wine/dlls/mpr/current/multinet.c 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/multinet.c 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,81 @@ +/* + * MPR Multinet functions + * + * Copyright 1999 Ulrich Weigand + * + * 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 "winnetwk.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + + +/***************************************************************** + * MultinetGetConnectionPerformanceA [MPR.@] + * + * RETURNS + * Success: NO_ERROR + * Failure: ERROR_NOT_SUPPORTED, ERROR_NOT_CONNECTED, + * ERROR_NO_NET_OR_BAD_PATH, ERROR_BAD_DEVICE, + * ERROR_BAD_NET_NAME, ERROR_INVALID_PARAMETER, + * ERROR_NO_NETWORK, ERROR_EXTENDED_ERROR + */ +DWORD WINAPI MultinetGetConnectionPerformanceA( + LPNETRESOURCEA lpNetResource, + LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct ) +{ + FIXME( "(%p, %p): stub\n", lpNetResource, lpNetConnectInfoStruct ); + + SetLastError(WN_NO_NETWORK); + return WN_NO_NETWORK; +} + +/***************************************************************** + * MultinetGetConnectionPerformanceW [MPR.@] + */ +DWORD WINAPI MultinetGetConnectionPerformanceW( + LPNETRESOURCEW lpNetResource, + LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct ) +{ + FIXME( "(%p, %p): stub\n", lpNetResource, lpNetConnectInfoStruct ); + + SetLastError(WN_NO_NETWORK); + return WN_NO_NETWORK; +} + +/***************************************************************** + * MultinetGetErrorTextA [MPR.@] + */ +DWORD WINAPI MultinetGetErrorTextA( DWORD x, DWORD y, DWORD z ) +{ + FIXME( "(%lx, %lx, %lx): stub\n", x, y, z ); + return 0; +} + +/***************************************************************** + * MultinetGetErrorTextW [MPR.@] + */ +DWORD WINAPI MultinetGetErrorTextW( DWORD x, DWORD y, DWORD z ) +{ + FIXME( "(%lx, %lx, %lx ): stub\n", x, y, z ); + return 0; +} + _____ Added: vendor/wine/dlls/mpr/current/nps.c --- vendor/wine/dlls/mpr/current/nps.c 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/nps.c 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,129 @@ +/* + * MPR Network Provider Services functions + * + * Copyright 1999 Ulrich Weigand + * + * 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 "winnetwk.h" +#include "netspi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + + +/***************************************************************** + * NPSAuthenticationDialogA [MPR.@] + */ +DWORD WINAPI NPSAuthenticationDialogA( LPAUTHDLGSTRUCTA lpAuthDlgStruct ) +{ + FIXME( "(%p): stub\n", lpAuthDlgStruct ); + return WN_NOT_SUPPORTED; +} + +/***************************************************************** + * NPSGetProviderHandleA [MPR.@] + */ +DWORD WINAPI NPSGetProviderHandleA( PHPROVIDER phProvider ) +{ + FIXME( "(%p): stub\n", phProvider ); + return WN_NOT_SUPPORTED; +} + +/***************************************************************** + * NPSGetProviderNameA [MPR.@] + */ +DWORD WINAPI NPSGetProviderNameA( HPROVIDER hProvider, LPCSTR *lpszProviderName ) +{ + FIXME( "(%p, %p): stub\n", hProvider, lpszProviderName ); + return WN_NOT_SUPPORTED; +} + +/***************************************************************** + * NPSGetSectionNameA [MPR.@] + */ +DWORD WINAPI NPSGetSectionNameA( HPROVIDER hProvider, LPCSTR *lpszSectionName ) +{ + FIXME( "(%p, %p): stub\n", hProvider, lpszSectionName ); + return WN_NOT_SUPPORTED; +} + +/***************************************************************** + * NPSSetExtendedErrorA [MPR.@] + */ +DWORD WINAPI NPSSetExtendedErrorA( DWORD NetSpecificError, LPSTR lpExtendedErrorText ) +{ + FIXME( "(%08lx, %s): stub\n", NetSpecificError, debugstr_a(lpExtendedErrorText) ); + return WN_NOT_SUPPORTED; +} + +/***************************************************************** + * NPSSetCustomTextA [MPR.@] + */ +VOID WINAPI NPSSetCustomTextA( LPSTR lpCustomErrorText ) +{ + FIXME( "(%s): stub\n", debugstr_a(lpCustomErrorText) ); +} + +/***************************************************************** + * NPSCopyStringA [MPR.@] + */ +DWORD WINAPI NPSCopyStringA( LPCSTR lpString, LPVOID lpBuffer, LPDWORD lpdwBufferSize ) +{ + FIXME( "(%s, %p, %p): stub\n", debugstr_a(lpString), lpBuffer, lpdwBufferSize ); + return WN_NOT_SUPPORTED; +} + +/***************************************************************** + * NPSDeviceGetNumberA [MPR.@] + */ +DWORD WINAPI NPSDeviceGetNumberA( LPSTR lpLocalName, LPDWORD lpdwNumber, LPDWORD lpdwType ) +{ + FIXME( "(%s, %p, %p): stub\n", debugstr_a(lpLocalName), lpdwNumber, lpdwType ); + return WN_NOT_SUPPORTED; +} + +/***************************************************************** + * NPSDeviceGetStringA [MPR.@] + */ +DWORD WINAPI NPSDeviceGetStringA( DWORD dwNumber, DWORD dwType, LPSTR lpLocalName, LPDWORD lpdwBufferSize ) +{ + FIXME( "(%ld, %ld, %p, %p): stub\n", dwNumber, dwType, lpLocalName, lpdwBufferSize ); + return WN_NOT_SUPPORTED; +} + +/***************************************************************** + * NPSNotifyRegisterA [MPR.@] + */ +DWORD WINAPI NPSNotifyRegisterA( enum NOTIFYTYPE NotifyType, NOTIFYCALLBACK pfNotifyCallBack ) +{ + FIXME( "(%d, %p): stub\n", NotifyType, pfNotifyCallBack ); + return WN_NOT_SUPPORTED; +} + +/***************************************************************** + * NPSNotifyGetContextA [MPR.@] + */ +LPVOID WINAPI NPSNotifyGetContextA( NOTIFYCALLBACK pfNotifyCallBack ) +{ + FIXME( "(%p): stub\n", pfNotifyCallBack ); + return NULL; +} + _____ Added: vendor/wine/dlls/mpr/current/pwcache.c --- vendor/wine/dlls/mpr/current/pwcache.c 2004-12-31 15:02:50 UTC (rev 12540) +++ vendor/wine/dlls/mpr/current/pwcache.c 2004-12-31 15:02:54 UTC (rev 12541) @@ -0,0 +1,315 @@ +/* + * MPR Password Cache functions + * + * Copyright 1999 Ulrich Weigand + * Copyright 2003,2004 Mike McCormack 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winnetwk.h" +#include "winreg.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + +static const char mpr_key[] = "Software\\Wine\\Wine\\Mpr\\"; + +static inline BYTE hex( BYTE x ) +{ + if( x <= 9 ) + return x + '0'; + return x + 'A' - 10; +} + +static inline CHAR ctox( CHAR x ) +{ + if( ( x >= '0' ) && ( x <= '9' ) ) + return x - '0'; + if( ( x >= 'A' ) && ( x <= 'F' ) ) + return x - 'A' + 10; + if( ( x >= 'a' ) && ( x <= 'a' ) ) + return x - 'a' + 10; + return -1; +} + +static LPSTR MPR_GetValueName( LPSTR pbResource, WORD cbResource, BYTE nType ) +{ + LPSTR name; + DWORD i; + + name = HeapAlloc( GetProcessHeap(), 0, 6+cbResource*2 ); + if( name ) + sprintf( name, "X-%02X-", nType ); + for(i=0; i<cbResource; i++) + { + name[5+i*2]=hex((pbResource[i]&0xf0)>>4); + name[6+i*2]=hex(pbResource[i]&0x0f); + } + name[5+i*2]=0; + TRACE( "Value is %s\n", name ); + return name; +} + + +/********************************************************************** **** + * WNetCachePassword [MPR.@] Saves password in cache + * + * NOTES + * only the parameter count is verifyed + * + * ---- everything below this line might be wrong (js) ----- + * RETURNS + * Success: WN_SUCCESS + * Failure: WN_ACCESS_DENIED, WN_BAD_PASSWORD, WN_BADVALUE, WN_NET_ERROR, + * WN_NOT_SUPPORTED, WN_OUT_OF_MEMORY + */ +DWORD WINAPI WNetCachePassword( + LPSTR pbResource, /* [in] Name of workgroup, computer, or resource */ + WORD cbResource, /* [in] Size of name */ + LPSTR pbPassword, /* [in] Buffer containing password */ + WORD cbPassword, /* [in] Size of password */ + BYTE nType, /* [in] Type of password to cache */ + WORD x) + +{ + HKEY hkey; + DWORD r; + LPSTR valname; + + WARN( "(%p(%s), %d, %p(%s), %d, %d, 0x%08x): totally insecure\n", + pbResource, debugstr_a(pbResource), cbResource, + pbPassword, debugstr_a(pbPassword), cbPassword, + nType, x ); + + r = RegCreateKeyA( HKEY_CURRENT_USER, mpr_key, &hkey ); + if( r ) + return WN_ACCESS_DENIED; + + valname = MPR_GetValueName( pbResource, cbResource, nType ); + if( valname ) + { + r = RegSetValueExA( hkey, valname, 0, REG_BINARY, [truncated at 1000 lines; 2320 more skipped]

19 years, 12 months

Integrated change by chorns in revision 12540

by chorns＠svn.reactos.com

Remove ss200201 tag. Deleted: tags/ss200201/

19 years, 12 months

Integrated change by chorns in revision 12539

by chorns＠svn.reactos.com

Remove ss200112 tag. Deleted: tags/ss200112/

19 years, 12 months

Integrated change by chorns in revision 12538

by chorns＠svn.reactos.com

Remove ss200111 tag. Deleted: tags/ss200111/

19 years, 12 months

Integrated change by chorns in revision 12537

by chorns＠svn.reactos.com

Remove ss200110 tag. Deleted: tags/ss200110/

19 years, 12 months

Integrated change by chorns in revision 12536

by chorns＠svn.reactos.com

Remove ss200109 tag. Deleted: tags/ss200109/

19 years, 12 months

Integrated change by chorns in revision 12535

by chorns＠svn.reactos.com

Remove ss200108 tag. Deleted: tags/ss200108/

19 years, 12 months

Integrated change by chorns in revision 12534

by chorns＠svn.reactos.com

Remove ss200107 tag. Deleted: tags/ss200107/

19 years, 12 months

Integrated change by gvg in revision 12533

by gvg＠svn.reactos.com

Import and merge Wine-20041201 Added: trunk/reactos/lib/icmp/ Modified: trunk/reactos/lib/icmp/Makefile.in Added: trunk/reactos/lib/icmp/Makefile.ros-template Added: trunk/reactos/lib/icmp/icmp.dsp Added: trunk/reactos/lib/icmp/icmp.rc Modified: trunk/reactos/lib/icmp/icmp_main.c Modified: trunk/reactos/lib/icmp/ip.h Added: trunk/reactos/lib/icmp/makefile _____ Copied: trunk/reactos/lib/icmp (from rev 12529, vendor/wine/dlls/icmp/current) _____ Modified: trunk/reactos/lib/icmp/Makefile.in --- vendor/wine/dlls/icmp/current/Makefile.in 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/Makefile.in 2004-12-31 15:01:00 UTC (rev 12533) @@ -4,6 +4,7 @@ VPATH = @srcdir@ MODULE = icmp.dll IMPORTS = kernel32 +EXTRALIBS = @SOCKETLIBS@ C_SRCS = icmp_main.c _____ Added: trunk/reactos/lib/icmp/Makefile.ros-template --- vendor/wine/dlls/icmp/current/Makefile.ros-template 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/Makefile.ros-template 2004-12-31 15:01:00 UTC (rev 12533) @@ -0,0 +1,21 @@ +# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ + +TARGET_NAME = icmp + +TARGET_OBJECTS = @C_SRCS@ + +TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ + +TARGET_SDKLIBS = @IMPORTS@ ws2_32.a wine.a wine_uuid.a ntdll.a + +TARGET_BASE = $(TARGET_BASE_LIB_COMCTL32) + +#TARGET_RC_SRCS = @RC_SRCS@ +#TARGET_RC_BINSRC = @RC_BINSRC@ +#TARGET_RC_BINARIES = @RC_BINARIES@ + +default: all + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(TOOLS_PATH)/depend.mk _____ Added: trunk/reactos/lib/icmp/icmp.dsp --- vendor/wine/dlls/icmp/current/icmp.dsp 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/icmp.dsp 2004-12-31 15:01:00 UTC (rev 12533) @@ -0,0 +1,96 @@ +# Microsoft Developer Studio Project File - Name="icmp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=icmp - Win32 +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "icmp.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "icmp.mak" CFG="icmp - Win32" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "icmp - Win32" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Output\Win32" +# PROP BASE Intermediate_Dir "Output\Win32" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Output\Win32" +# PROP Intermediate_Dir "Output\Win32" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICMP_EXPORTS" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ..\..\include /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ICMP_" /D "__WINESRC__" /D __WINETEST_OUTPUT_DIR=\"Output\\Win32\" /D "__i386__" /D "_X86_" /D inline=__inline /FR /FD /GZ /c +# SUBTRACT CPP /X /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x41d /d "_DEBUG" +# ADD RSC /l 0x41d /i "..\..\include" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /def:"icmp.def" /pdbtype:sept +# Begin Target + +# Name "icmp - Win32" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\icmp.dll.dbg.c +# End Source File +# Begin Source File + +SOURCE=.\icmp.spec +# Begin Custom Build +InputPath=.\icmp.spec + +BuildCmds= \ + ..\..\tools\winebuild\Output\\Win32\winebuild.exe --def .\icmp.spec > .\icmp.def \ + ..\..\tools\winebuild\Output\\Win32\winebuild.exe -o .\icmp.dll.dbg.c --debug -C. icmp_main.c \ + + +".\icmp.def" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +".\icmp.dll.dbg.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build +# End Source File +# Begin Source File + +SOURCE=.\icmp_main.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project _____ Added: trunk/reactos/lib/icmp/icmp.rc --- vendor/wine/dlls/icmp/current/icmp.rc 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/icmp.rc 2004-12-31 15:01:00 UTC (rev 12533) @@ -0,0 +1 @@ +#include "wine/wine_common_ver.rc" _____ Modified: trunk/reactos/lib/icmp/icmp_main.c --- vendor/wine/dlls/icmp/current/icmp_main.c 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/icmp_main.c 2004-12-31 15:01:00 UTC (rev 12533) @@ -95,7 +95,6 @@ #include "ip.h" #include "ip_icmp.h" - WINE_DEFAULT_DEBUG_CHANNEL(icmp); @@ -136,8 +135,6 @@ return(answer); } - - /* * Exported Routines. */ _____ Modified: trunk/reactos/lib/icmp/ip.h --- vendor/wine/dlls/icmp/current/ip.h 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/ip.h 2004-12-31 15:01:00 UTC (rev 12533) @@ -39,6 +39,21 @@ */ #define IPVERSION 4 +/* A little magic to make the Windows build happy. */ +#if defined(_MSC_VER) || defined(__MINGW32__) +#include <winsock2.h> +#include <ws2tcpip.h> +#include <time.h> + +typedef u_short n_short; +typedef u_int n_long; +typedef u_int n_time; + +#define EMSGSIZE WSAEMSGSIZE +#define ENETUNREACH WSAENETUNREACH +#define EHOSTUNREACH WSAEHOSTUNREACH +#endif + /* * Structure of an internet header, naked of options. */ _____ Added: trunk/reactos/lib/icmp/makefile --- vendor/wine/dlls/icmp/current/makefile 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/makefile 2004-12-31 15:01:00 UTC (rev 12533) @@ -0,0 +1,9 @@ +# $Id: makefile 11108 2004-09-28 19:07:56Z sedwards $ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = winedll + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk

19 years, 12 months

Integrated change by chorns in revision 12532

by chorns＠svn.reactos.com

Remove ss200106 tag. Deleted: tags/ss200106/

19 years, 12 months

← Newer
1
...
11
12
13
14
15
16
17
...
83
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 December 2004