https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cea71896cfdd4beb78e60...
commit 3cea71896cfdd4beb78e60144b8362c43e3a0b51 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Wed Mar 21 13:15:06 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Wed Mar 21 13:15:06 2018 +0100
[RASAPI32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/rasapi32/rasapi.c | 14 ++++++-------- dll/win32/rasapi32/rasapi32.spec | 2 +- media/doc/README.WINE | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/dll/win32/rasapi32/rasapi.c b/dll/win32/rasapi32/rasapi.c index 259fdd3f97..791b0dab13 100644 --- a/dll/win32/rasapi32/rasapi.c +++ b/dll/win32/rasapi32/rasapi.c @@ -18,15 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS +#include <stdarg.h>
-//#include <stdarg.h> - -#include <windef.h> -//#include "winbase.h" -#include <ras.h> -#include <raserror.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "ras.h" +#include "raserror.h" +#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ras);
diff --git a/dll/win32/rasapi32/rasapi32.spec b/dll/win32/rasapi32/rasapi32.spec index 48d7a73dc8..e8a28a8814 100644 --- a/dll/win32/rasapi32/rasapi32.spec +++ b/dll/win32/rasapi32/rasapi32.spec @@ -29,11 +29,11 @@ @ stdcall RasGetAutodialEnableW(long ptr) @ stdcall RasGetAutodialParamA(long ptr ptr) @ stdcall RasGetAutodialParamW(long ptr ptr) -@ stdcall RasGetConnectionStatistics(ptr ptr) @ stub RasGetConnectResponse @ stdcall RasGetConnectStatusA(ptr ptr) @ stdcall RasGetConnectStatusW(ptr ptr) @ stub RasGetConnectStatusWow +@ stdcall RasGetConnectionStatistics(ptr ptr) @ stub RasGetCountryInfoA @ stub RasGetCountryInfoW @ stub RasGetCredentialsA diff --git a/media/doc/README.WINE b/media/doc/README.WINE index c36e4856f1..2ba9257b54 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -156,7 +156,7 @@ reactos/dll/win32/pstorec # Synced to WineStaging-3.3 reactos/dll/win32/qmgr # Synced to WineStaging-3.3 reactos/dll/win32/qmgrprxy # Synced to WineStaging-2.9 reactos/dll/win32/query # Synced to WineStaging-3.3 -reactos/dll/win32/rasapi32 # Synced to WineStaging-2.9 +reactos/dll/win32/rasapi32 # Synced to WineStaging-3.3 reactos/dll/win32/resutils # Synced to WineStaging-2.9 reactos/dll/win32/riched20 # Synced to Wine-3.0 reactos/dll/win32/riched32 # Synced to WineStaging-2.9