Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[cwittich] 66553: [WLANAPI] add stubs for WlanReasonCodeToString, WlanIhvControl, WlanSetSecuritySettings and WlanGetAvailableNetworkList

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Mar 3 11:43:24 2015 New Revision: 66553 URL: http://svn.reactos.org/svn/reactos?rev=66553&view=rev Log: [WLANAPI] add stubs for WlanReasonCodeToString, WlanIhvControl, WlanSetSecuritySettings and WlanGetAvailableNetworkList Modified: trunk/reactos/base/services/wlansvc/rpcserver.c trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/dll/win32/wlanapi/wlanapi.spec trunk/reactos/include/psdk/wlanapi.h Modified: trunk/reactos/base/services/wlansvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/rpcs… ============================================================================== --- trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] Tue Mar 3 11:43:24 2015 @@ -39,9 +39,6 @@ DWORD dwIndex; MIB_IF_ROW2 IfRow; PWLAN_INTERFACE_INFO_LIST InterfaceList; - - if (!hClientHandle || !ppInterfaceList) - return ERROR_INVALID_PARAMETER; dwResult = GetNumberOfInterfaces(&dwNumInterfaces); dwSize = sizeof(WLAN_INTERFACE_INFO_LIST); Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Tue Mar 3 11:43:24 2015 @@ -281,6 +281,66 @@ return ERROR_SUCCESS; } +DWORD +WINAPI +WlanReasonCodeToString(IN DWORD dwReasonCode, + IN DWORD dwBufferSize, + IN PWCHAR pStringBuffer, + PVOID pReserved) +{ + if ((pReserved != NULL) || (pStringBuffer == NULL) || (dwBufferSize == 0)) + return ERROR_INVALID_PARAMETER; + + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanIhvControl(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + IN WLAN_IHV_CONTROL_TYPE Type, + IN DWORD dwInBufferSize, + IN PVOID pInBuffer, + IN DWORD dwOutBufferSize, + PVOID pOutBuffer, + OUT PDWORD pdwBytesReturned) +{ + if ((hClientHandle == NULL) || (pInterfaceGuid == NULL) || (pdwBytesReturned == NULL)) + return ERROR_INVALID_PARAMETER; + + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanSetSecuritySettings(IN HANDLE hClientHandle, + IN WLAN_SECURABLE_OBJECT SecurableObject, + IN LPCWSTR strModifiedSDDL) +{ + if ((hClientHandle == NULL) || (strModifiedSDDL == NULL) || (SecurableObject >= WLAN_SECURABLE_OBJECT_COUNT)) + return ERROR_INVALID_PARAMETER; + + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanGetAvailableNetworkList(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + IN DWORD dwFlags, + PVOID pReserved, + OUT PWLAN_AVAILABLE_NETWORK_LIST *ppAvailableNetworkList) +{ + if ((pReserved != NULL) || (pInterfaceGuid == NULL) || (hClientHandle == NULL) || (ppAvailableNetworkList == NULL)) + return ERROR_INVALID_PARAMETER; + + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) { Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] Tue Mar 3 11:43:24 2015 @@ -6,7 +6,7 @@ @ stdcall WlanEnumInterfaces (ptr ptr ptr) @ stub WlanExtractPsdIEDataList @ stdcall WlanFreeMemory (ptr) -@ stub WlanGetAvailableNetworkList +@ stdcall WlanGetAvailableNetworkList (ptr ptr long ptr ptr) @ stub WlanGetFilterList @ stdcall WlanGetInterfaceCapability (ptr ptr ptr ptr) @ stub WlanGetNetworkBssList @@ -14,11 +14,11 @@ @ stdcall WlanGetProfileCustomUserData (ptr ptr ptr ptr ptr ptr) @ stdcall WlanGetProfileList (ptr ptr ptr ptr) @ stub WlanGetSecuritySettings -@ stub WlanIhvControl +@ stdcall WlanIhvControl (ptr ptr ptr long ptr long ptr ptr) @ stdcall WlanOpenHandle (long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter @ stdcall WlanQueryInterface (ptr ptr ptr ptr ptr ptr ptr) -@ stub WlanReasonCodeToString +@ stdcall WlanReasonCodeToString (long long ptr ptr) @ stub WlanRegisterNotification @ stdcall WlanRenameProfile (ptr ptr ptr ptr ptr) @ stub WlanSaveTemporaryProfile @@ -33,4 +33,4 @@ @ stdcall WlanSetProfileList (ptr ptr long ptr ptr) @ stub WlanSetProfilePosition @ stub WlanSetPsdIEDataList -@ stub WlanSetSecuritySettings +@ stdcall WlanSetSecuritySettings (ptr long ptr) Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Tue Mar 3 11:43:24 2015 @@ -51,6 +51,15 @@ wlan_connection_mode_auto, wlan_connection_mode_invalid } WLAN_CONNECTION_MODE, *PWLAN_CONNECTION_MODE; + +#if defined(__midl) || defined(__WIDL__) +typedef [v1_enum] enum _WLAN_IHV_CONTROL_TYPE { +#else +typedef enum _WLAN_IHV_CONTROL_TYPE { +#endif + wlan_ihv_control_type_service, + wlan_ihv_control_type_driver +} WLAN_IHV_CONTROL_TYPE; /* HACK , *PWLAN_IHV_CONTROL_TYPE; */ #if defined(__midl) || defined(__WIDL__) typedef [v1_enum] enum _WLAN_INTF_OPCODE { @@ -226,18 +235,22 @@ DWORD WINAPI WlanConnect(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN const PWLAN_CONNECTION_PARAMETERS pConnectionParameters, PVOID pReserved); DWORD WINAPI WlanDisconnect(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, PVOID pReserved); DWORD WINAPI WlanEnumInterfaces(IN HANDLE hClientHandle, PVOID pReserved, OUT PWLAN_INTERFACE_INFO_LIST *ppInterfaceList); +DWORD WINAPI WlanGetAvailableNetworkList(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN DWORD dwFlags, PVOID pReserved, OUT PWLAN_AVAILABLE_NETWORK_LIST *ppAvailableNetworkList); DWORD WINAPI WlanGetInterfaceCapability(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, PVOID pReserved, OUT PWLAN_INTERFACE_CAPABILITY *ppCapability); -DWORD WINAPI WlanScan(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN PDOT11_SSID pDot11Ssid, IN PWLAN_RAW_DATA pIeData, PVOID pReserved); DWORD WINAPI WlanDeleteProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, PVOID pReserved); DWORD WINAPI WlanGetProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, PVOID pReserved, OUT LPWSTR *pstrProfileXml, DWORD *pdwFlags, PDWORD pdwGrantedAccess); DWORD WINAPI WlanGetProfileCustomUserData(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, PVOID pReserved, OUT DWORD *pdwDataSize, OUT PBYTE *ppData); DWORD WINAPI WlanGetProfileList(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, PVOID pReserved, OUT PWLAN_PROFILE_INFO_LIST *ppProfileList); +DWORD WINAPI WlanIhvControl(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN WLAN_IHV_CONTROL_TYPE Type, IN DWORD dwInBufferSize, IN PVOID pInBuffer, IN DWORD dwOutBufferSize, PVOID pOutBuffer, OUT PDWORD pdwBytesReturned); DWORD WINAPI WlanQueryInterface(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN WLAN_INTF_OPCODE OpCode, PVOID pReserved, OUT PDWORD pdwDataSize, OUT PVOID *ppData, WLAN_OPCODE_VALUE_TYPE *pWlanOpcodeValueType); +DWORD WINAPI WlanReasonCodeToString(IN DWORD dwReasonCode, IN DWORD dwBufferSize, IN PWCHAR pStringBuffer, PVOID pReserved); DWORD WINAPI WlanRenameProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strOldProfileName, IN LPCWSTR strNewProfileName, PVOID pReserved); DWORD WINAPI WlanSetProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN DWORD dwFlags, IN LPCWSTR strProfileXml, LPCWSTR strAllUserProfileSecurity, IN BOOL bOverwrite, PVOID pReserved, OUT DWORD *pdwReasonCode); DWORD WINAPI WlanSetProfileCustomUserData(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, IN DWORD dwDataSize, IN const PBYTE pData, PVOID pReserved); DWORD WINAPI WlanSetProfileEapUserData(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, IN EAP_METHOD_TYPE eapType, IN DWORD dwFlags, IN DWORD dwEapUserDataSize, IN const LPBYTE pbEapUserData, PVOID pReserved); DWORD WINAPI WlanSetProfileList(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, DWORD dwItems, IN LPCWSTR *strProfileNames, PVOID pReserved); +DWORD WINAPI WlanSetSecuritySettings(IN HANDLE hClientHandle, IN WLAN_SECURABLE_OBJECT SecurableObject, IN LPCWSTR strModifiedSDDL); +DWORD WINAPI WlanScan(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN PDOT11_SSID pDot11Ssid, IN PWLAN_RAW_DATA pIeData, PVOID pReserved); #endif #ifdef __cplusplus

9 years, 8 months

[dreimer] 66552: [LAUTUS] Patch: Make it translatable and add German translation by Robert Naumann + fixed one typo by me. CORE-9310 #resolve #comment Committed with one lil typo fixed, thx.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Mar 3 01:35:12 2015 New Revision: 66552 URL: http://svn.reactos.org/svn/reactos?rev=66552&view=rev Log: [LAUTUS] Patch: Make it translatable and add German translation by Robert Naumann + fixed one typo by me. CORE-9310 #resolve #comment Committed with one lil typo fixed, thx. Added: trunk/reactos/media/themes/lautus.msstyles/lang/ trunk/reactos/media/themes/lautus.msstyles/lang/de-DE.rc (with props) trunk/reactos/media/themes/lautus.msstyles/lang/en-US.rc (with props) Modified: trunk/reactos/media/themes/lautus.msstyles/lautus.rc Added: trunk/reactos/media/themes/lautus.msstyles/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lang/de-DE.rc (added) +++ trunk/reactos/media/themes/lautus.msstyles/lang/de-DE.rc [iso-8859-1] Tue Mar 3 01:35:12 2015 @@ -0,0 +1,37 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ +1000, "Ater" +} + +STRINGTABLE +{ +2000, "Lautus Ater" +} + +STRINGTABLE +{ +3000, "StandardgrÃ¶Ãe" +3001, "GroÃ" +3002, "ExtragroÃ" +} + +STRINGTABLE +{ +4000, "StandardgrÃ¶Ãe" +4001, "GroÃ" +4002, "ExtragroÃ" +} + +STRINGTABLE +{ +5000, "Lautus" +5001, "Visueller Stil" +5002, "ReactOS Foundation" +5003, "Pisarz, basierend auf Luna Inspirat" +5004, "VerÃ¶ffentlicht unter GNU/GPL 2.0, 2011" +5005, "http://www.reactos.org" +5006, "1.0" +5007, "Visueller Stil fÃ¼r ReactOS" +} Propchange: trunk/reactos/media/themes/lautus.msstyles/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/themes/lautus.msstyles/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lang/en-US.rc (added) +++ trunk/reactos/media/themes/lautus.msstyles/lang/en-US.rc [iso-8859-1] Tue Mar 3 01:35:12 2015 @@ -0,0 +1,37 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +{ +1000, "Ater" +} + +STRINGTABLE +{ +2000, "Lautus Ater" +} + +STRINGTABLE +{ +3000, "Normal" +3001, "Large Fonts" +3002, "Extra Large Fonts" +} + +STRINGTABLE +{ +4000, "Normal" +4001, "Large Fonts" +4002, "Extra Large Fonts" +} + +STRINGTABLE +{ +5000, "Lautus" +5001, "Visual Style" +5002, "ReactOS Foundation" +5003, "Pisarz, based on Luna Inspirat" +5004, "Released under GNU/GPL 2.0, 2011" +5005, "http://www.reactos.org" +5006, "1.0" +5007, "Visual Style for ReactOS" +} Propchange: trunk/reactos/media/themes/lautus.msstyles/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/themes/lautus.msstyles/lautus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] Tue Mar 3 01:35:12 2015 @@ -1,7 +1,12 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Lautus Theme\0" +#define REACTOS_STR_INTERNAL_NAME "Lautus\0" +#define REACTOS_STR_ORIGINAL_FILENAME "lautus.msstyles\0" +#include <reactos/version.rc> + #include <windows.h> -#pragma code_page(65001) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 COLORNAMES {L"Normal Color\0\0"} COMBO COMBODATA {0x0003,0x0003, 0x0000, 0x0003, 0x0006, 0x0001,0x0004,0x0007,0x0002,0x0005,0x08,} @@ -176,44 +181,11 @@ NORMAL_NORMALGROUPCOLLAPSE_BMP BITMAP "bitmaps/dummy.bmp" NORMAL_NORMALGROUPEXPAND_BMP BITMAP "bitmaps/dummy.bmp" -STRINGTABLE -{ -1000, "Ater" -} +#pragma code_page(65001) -STRINGTABLE -{ -2000, "Lautus Ater" -} - -STRINGTABLE -{ -3000, "Normal" -3001, "Large Fonts" -3002, "Extra Large Fonts" -} - -STRINGTABLE -{ -4000, "Normal" -4001, "Large Fonts" -4002, "Extra Large Fonts" -} - -STRINGTABLE -{ -5000, "Lautus" -5001, "Visual Style" -5002, "ReactOS Foundation" -5003, "Pisarz, based on Luna Inspirat" -5004, "Released under GNU/GPL 2.0, 2011" -5005, "http://www.reactos.org" -5006, "1.0" -5007, "Visual Style for ReactOS" -} - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Lautus Theme\0" -#define REACTOS_STR_INTERNAL_NAME "Lautus\0" -#define REACTOS_STR_ORIGINAL_FILENAME "lautus.msstyles\0" -#include <reactos/version.rc> +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif

9 years, 8 months

[akhaldi] 66551: [PSDK] Fix winternl.h version of SECTION_IMAGE_INFORMATION and add missing MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION definition.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 2 23:38:49 2015 New Revision: 66551 URL: http://svn.reactos.org/svn/reactos?rev=66551&view=rev Log: [PSDK] Fix winternl.h version of SECTION_IMAGE_INFORMATION and add missing MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION definition. Modified: trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Mon Mar 2 23:38:49 2015 @@ -705,6 +705,7 @@ #define MEM_EXECUTE_OPTION_DISABLE 0x01 #define MEM_EXECUTE_OPTION_ENABLE 0x02 +#define MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION 0x04 #define MEM_EXECUTE_OPTION_PERMANENT 0x08 typedef enum _SECTION_INHERIT { @@ -1685,23 +1686,28 @@ } SECTION_INFORMATION_CLASS; typedef struct _SECTION_BASIC_INFORMATION { - ULONG BaseAddress; + PVOID BaseAddress; ULONG Attributes; LARGE_INTEGER Size; } SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION; typedef struct _SECTION_IMAGE_INFORMATION { - PVOID EntryPoint; - ULONG StackZeroBits; - ULONG StackReserved; - ULONG StackCommit; - ULONG ImageSubsystem; + PVOID TransferAddress; + ULONG ZeroBits; + SIZE_T MaximumStackSize; + SIZE_T CommittedStackSize; + ULONG SubSystemType; WORD SubsystemVersionLow; WORD SubsystemVersionHigh; - ULONG Unknown1; + ULONG GpValue; ULONG ImageCharacteristics; - ULONG ImageMachineType; - ULONG Unknown2[3]; + USHORT DllCharacteristics; + USHORT Machine; + BOOLEAN ImageContainsCode; + UCHAR ImageFlags; + ULONG LoaderFlags; + ULONG ImageFileSize; + ULONG CheckSum; } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; typedef struct _LPC_SECTION_WRITE {

9 years, 8 months

[akhaldi] 66550: [PSDK] Add missing PF_NX_ENABLED, PROCESS_DEP_ENABLE and PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 2 23:37:00 2015 New Revision: 66550 URL: http://svn.reactos.org/svn/reactos?rev=66550&view=rev Log: [PSDK] Add missing PF_NX_ENABLED, PROCESS_DEP_ENABLE and PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION definitions. Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Mon Mar 2 23:37:00 2015 @@ -587,6 +587,11 @@ #define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT +#if (_WIN32_WINNT >= 0x0600) +#define PROCESS_DEP_ENABLE 0x00000001 +#define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 0x00000002 +#endif + #ifndef RC_INVOKED #ifndef _FILETIME_ Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Mar 2 23:37:00 2015 @@ -2029,6 +2029,8 @@ #define PF_RDTSC_INSTRUCTION_AVAILABLE 8 #define PF_PAE_ENABLED 9 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#define PF_NX_ENABLED 12 + /* also in ddk/ntifs.h */ #define FILE_ACTION_ADDED 0x00000001 #define FILE_ACTION_REMOVED 0x00000002

9 years, 8 months

[khornicek] 66549: [MESA] - remove a stray debug break CORE-8781

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Mar 2 20:26:25 2015 New Revision: 66549 URL: http://svn.reactos.org/svn/reactos?rev=66549&view=rev Log: [MESA] - remove a stray debug break CORE-8781 Modified: trunk/reactos/dll/opengl/mesa/vbo/vbo_save_api.c Modified: trunk/reactos/dll/opengl/mesa/vbo/vbo_save_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/vbo/vbo_sa… ============================================================================== --- trunk/reactos/dll/opengl/mesa/vbo/vbo_save_api.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/vbo/vbo_save_api.c [iso-8859-1] Mon Mar 2 20:26:25 2015 @@ -730,8 +730,6 @@ _mesa_compile_error(ctx, GL_INVALID_ENUM, "glMaterial(face)"); return; } - - __debugbreak(); switch (pname) { case GL_EMISSION:

9 years, 8 months

[cwittich] 66548: [WLANAPI_WINETEST] add more tests

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Mar 2 19:28:15 2015 New Revision: 66548 URL: http://svn.reactos.org/svn/reactos?rev=66548&view=rev Log: [WLANAPI_WINETEST] add more tests Modified: trunk/rostests/winetests/wlanapi/wlanapi.c Modified: trunk/rostests/winetests/wlanapi/wlanapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/wlanapi… ============================================================================== --- trunk/rostests/winetests/wlanapi/wlanapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wlanapi/wlanapi.c [iso-8859-1] Mon Mar 2 19:28:15 2015 @@ -205,6 +205,25 @@ ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); } +static void WlanGetInterfaceCapability_test(void) +{ + DWORD ret; + PWLAN_INTERFACE_CAPABILITY pInterfaceCapability; + + /* invalid pReserved */ + ret = WlanGetInterfaceCapability((HANDLE) -1, &InterfaceGuid, (PVOID) 1, &pInterfaceCapability); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid InterfaceGuid */ + ret = WlanGetInterfaceCapability((HANDLE) -1, NULL, NULL, &pInterfaceCapability); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid pInterfaceCapability */ + ret = WlanGetInterfaceCapability((HANDLE) -1, &InterfaceGuid, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); +} + + START_TEST(wlanapi) { WlanOpenHandle_test(); @@ -216,4 +235,5 @@ WlanDeleteProfile_test(); WlanGetProfile_test(); WlanEnumInterfaces_test(); -} + WlanGetInterfaceCapability_test(); +}

9 years, 8 months

[cwittich] 66547: [WLANAPI] add stubs for WlanQueryInterface and WlanGetInterfaceCapability

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Mar 2 19:27:45 2015 New Revision: 66547 URL: http://svn.reactos.org/svn/reactos?rev=66547&view=rev Log: [WLANAPI] add stubs for WlanQueryInterface and WlanGetInterfaceCapability Modified: trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/dll/win32/wlanapi/wlanapi.spec trunk/reactos/include/psdk/wlanapi.h Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Mon Mar 2 19:27:45 2015 @@ -250,6 +250,37 @@ return dwError; } +DWORD +WINAPI +WlanQueryInterface(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + IN WLAN_INTF_OPCODE OpCode, + PVOID pReserved, + OUT PDWORD pdwDataSize, + OUT PVOID *ppData, + WLAN_OPCODE_VALUE_TYPE *pWlanOpcodeValueType) +{ + if ((pReserved != NULL) || (pInterfaceGuid == NULL) || (hClientHandle == NULL) || (pdwDataSize == NULL) || (ppData == NULL)) + return ERROR_INVALID_PARAMETER; + + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WlanGetInterfaceCapability(IN HANDLE hClientHandle, + IN const GUID *pInterfaceGuid, + PVOID pReserved, + OUT PWLAN_INTERFACE_CAPABILITY *ppCapability) +{ + if ((pReserved != NULL) || (pInterfaceGuid == NULL) || (hClientHandle == NULL) || (ppCapability == NULL)) + return ERROR_INVALID_PARAMETER; + + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) { Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] Mon Mar 2 19:27:45 2015 @@ -8,7 +8,7 @@ @ stdcall WlanFreeMemory (ptr) @ stub WlanGetAvailableNetworkList @ stub WlanGetFilterList -@ stub WlanGetInterfaceCapability +@ stdcall WlanGetInterfaceCapability (ptr ptr ptr ptr) @ stub WlanGetNetworkBssList @ stdcall WlanGetProfile (ptr ptr ptr ptr ptr long ptr) @ stdcall WlanGetProfileCustomUserData (ptr ptr ptr ptr ptr ptr) @@ -17,7 +17,7 @@ @ stub WlanIhvControl @ stdcall WlanOpenHandle (long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter -@ stub WlanQueryInterface +@ stdcall WlanQueryInterface (ptr ptr ptr ptr ptr ptr ptr) @ stub WlanReasonCodeToString @ stub WlanRegisterNotification @ stdcall WlanRenameProfile (ptr ptr ptr ptr ptr) Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Mon Mar 2 19:27:45 2015 @@ -24,7 +24,7 @@ wlan_opcode_value_type_set_by_group_policy, wlan_opcode_value_type_set_by_user, wlan_opcode_value_type_invalid -} WLAN_OPCODE_VALUE_TYPE; +} WLAN_OPCODE_VALUE_TYPE; /* HACK: WIDL is broken , *PWLAN_OPCODE_VALUE_TYPE; */ typedef enum _WLAN_SECURABLE_OBJECT { wlan_secure_permit_list = 0, @@ -51,6 +51,39 @@ wlan_connection_mode_auto, wlan_connection_mode_invalid } WLAN_CONNECTION_MODE, *PWLAN_CONNECTION_MODE; + +#if defined(__midl) || defined(__WIDL__) +typedef [v1_enum] enum _WLAN_INTF_OPCODE { +#else +typedef enum _WLAN_INTF_OPCODE { +#endif + wlan_intf_opcode_autoconf_start = 0x000000000, + wlan_intf_opcode_autoconf_enabled, + wlan_intf_opcode_background_scan_enabled, + wlan_intf_opcode_media_streaming_mode, + wlan_intf_opcode_radio_state, + wlan_intf_opcode_bss_type, + wlan_intf_opcode_interface_state, + wlan_intf_opcode_current_connection, + wlan_intf_opcode_channel_number, + wlan_intf_opcode_supported_infrastructure_auth_cipher_pairs, + wlan_intf_opcode_supported_adhoc_auth_cipher_pairs, + wlan_intf_opcode_supported_country_or_region_string_list, + wlan_intf_opcode_current_operation_mode, + wlan_intf_opcode_supported_safe_mode, + wlan_intf_opcode_certified_safe_mode, + wlan_intf_opcode_hosted_network_capable, + wlan_intf_opcode_management_frame_protection_capable, + wlan_intf_opcode_autoconf_end = 0x0fffffff, + wlan_intf_opcode_msm_start = 0x10000100, + wlan_intf_opcode_statistics, + wlan_intf_opcode_rssi, + wlan_intf_opcode_msm_end = 0x1fffffff, + wlan_intf_opcode_security_start = 0x20010000, + wlan_intf_opcode_security_end = 0x2fffffff, + wlan_intf_opcode_ihv_start = 0x30000000, + wlan_intf_opcode_ihv_end = 0x3fffffff +} WLAN_INTF_OPCODE; /* HACK: WIDL is broken , *PWLAN_INTF_OPCODE; */ #if defined(__midl) || defined(__WIDL__) typedef [v1_enum] enum _WLAN_INTERFACE_STATE { @@ -193,16 +226,18 @@ DWORD WINAPI WlanConnect(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN const PWLAN_CONNECTION_PARAMETERS pConnectionParameters, PVOID pReserved); DWORD WINAPI WlanDisconnect(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, PVOID pReserved); DWORD WINAPI WlanEnumInterfaces(IN HANDLE hClientHandle, PVOID pReserved, OUT PWLAN_INTERFACE_INFO_LIST *ppInterfaceList); +DWORD WINAPI WlanGetInterfaceCapability(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, PVOID pReserved, OUT PWLAN_INTERFACE_CAPABILITY *ppCapability); DWORD WINAPI WlanScan(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN PDOT11_SSID pDot11Ssid, IN PWLAN_RAW_DATA pIeData, PVOID pReserved); DWORD WINAPI WlanDeleteProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, PVOID pReserved); DWORD WINAPI WlanGetProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, PVOID pReserved, OUT LPWSTR *pstrProfileXml, DWORD *pdwFlags, PDWORD pdwGrantedAccess); DWORD WINAPI WlanGetProfileCustomUserData(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, PVOID pReserved, OUT DWORD *pdwDataSize, OUT PBYTE *ppData); DWORD WINAPI WlanGetProfileList(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, PVOID pReserved, OUT PWLAN_PROFILE_INFO_LIST *ppProfileList); +DWORD WINAPI WlanQueryInterface(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN WLAN_INTF_OPCODE OpCode, PVOID pReserved, OUT PDWORD pdwDataSize, OUT PVOID *ppData, WLAN_OPCODE_VALUE_TYPE *pWlanOpcodeValueType); +DWORD WINAPI WlanRenameProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strOldProfileName, IN LPCWSTR strNewProfileName, PVOID pReserved); DWORD WINAPI WlanSetProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN DWORD dwFlags, IN LPCWSTR strProfileXml, LPCWSTR strAllUserProfileSecurity, IN BOOL bOverwrite, PVOID pReserved, OUT DWORD *pdwReasonCode); DWORD WINAPI WlanSetProfileCustomUserData(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, IN DWORD dwDataSize, IN const PBYTE pData, PVOID pReserved); DWORD WINAPI WlanSetProfileEapUserData(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, IN EAP_METHOD_TYPE eapType, IN DWORD dwFlags, IN DWORD dwEapUserDataSize, IN const LPBYTE pbEapUserData, PVOID pReserved); DWORD WINAPI WlanSetProfileList(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, DWORD dwItems, IN LPCWSTR *strProfileNames, PVOID pReserved); -DWORD WINAPI WlanRenameProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strOldProfileName, IN LPCWSTR strNewProfileName, PVOID pReserved); #endif #ifdef __cplusplus

9 years, 8 months

[janderwald] 66546: [HIDCLASS] - remove no longer required pnp hack

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Mar 2 19:16:45 2015 New Revision: 66546 URL: http://svn.reactos.org/svn/reactos?rev=66546&view=rev Log: [HIDCLASS] - remove no longer required pnp hack Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Mon Mar 2 19:16:45 2015 @@ -146,23 +146,12 @@ CommonDeviceExtension = DeviceObject->DeviceExtension; if (CommonDeviceExtension->IsFDO) { -#ifndef __REACTOS__ - // // only supported for PDO // Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; -#else - // - // ReactOS PnP manager [...] - // - DPRINT1("[HIDCLASS] PnP HACK\n"); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; -#endif } //

9 years, 8 months

[janderwald] 66545: [NTOS] - use IopGetDeviceObjectFromDeviceInstance to retrieve PDO

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Mar 2 19:14:16 2015 New Revision: 66545 URL: http://svn.reactos.org/svn/reactos?rev=66545&view=rev Log: [NTOS] - use IopGetDeviceObjectFromDeviceInstance to retrieve PDO Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Mon Mar 2 19:14:16 2015 @@ -17,6 +17,9 @@ #include <debug.h> /* FUNCTIONS *****************************************************************/ + +PDEVICE_OBJECT +IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance); static PWCHAR BaseKeyString = L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\DeviceClasses\\"; @@ -1308,17 +1311,17 @@ IN BOOLEAN Enable) { PDEVICE_OBJECT PhysicalDeviceObject; - PFILE_OBJECT FileObject; UNICODE_STRING GuidString; PWCHAR StartPosition; PWCHAR EndPosition; NTSTATUS Status; LPCGUID EventGuid; HANDLE InstanceHandle, ControlHandle; - UNICODE_STRING KeyName; + UNICODE_STRING KeyName, DeviceInstance; OBJECT_ATTRIBUTES ObjectAttributes; - ULONG LinkedValue; + ULONG LinkedValue, Index; GUID DeviceGuid; + if (SymbolicLinkName == NULL) return STATUS_INVALID_PARAMETER_1; @@ -1381,23 +1384,38 @@ return Status; } - /* Get pointer to the PDO */ - Status = IoGetDeviceObjectPointer( - SymbolicLinkName, - 0, /* DesiredAccess */ - &FileObject, - &PhysicalDeviceObject); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoGetDeviceObjectPointer() failed with status 0x%08lx\n", Status); - return Status; - } - + DeviceInstance.Buffer = ExAllocatePool(PagedPool, (ULONG_PTR)StartPosition - (ULONG_PTR)SymbolicLinkName->Buffer); + if (DeviceInstance.Buffer == NULL) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + DeviceInstance.MaximumLength = DeviceInstance.Length = ((ULONG_PTR)StartPosition - (ULONG_PTR)SymbolicLinkName->Buffer) - 5 * sizeof(WCHAR); + RtlCopyMemory(DeviceInstance.Buffer, &SymbolicLinkName->Buffer[4], DeviceInstance.Length); + for(Index = 0; Index < DeviceInstance.Length / sizeof(WCHAR); Index++) + { + if (DeviceInstance.Buffer[Index] == L'#') + { + DeviceInstance.Buffer[Index] = L'\\'; + } + } + + PhysicalDeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); + + if (!PhysicalDeviceObject) + { + DPRINT1("IopGetDeviceObjectFromDeviceInstance failed to find status %wZ\n", &DeviceInstance); + ExFreePool(DeviceInstance.Buffer); + return STATUS_NOT_FOUND; + } + + ExFreePool(DeviceInstance.Buffer); Status = RtlGUIDFromString(&GuidString, &DeviceGuid); if (!NT_SUCCESS(Status)) { DPRINT1("RtlGUIDFromString() failed with status 0x%08lx\n", Status); - ObDereferenceObject(FileObject); + ObDereferenceObject(PhysicalDeviceObject); return Status; } @@ -1409,7 +1427,7 @@ &DeviceGuid, (PVOID)SymbolicLinkName); - ObDereferenceObject(FileObject); + ObDereferenceObject(PhysicalDeviceObject); DPRINT("Status %x\n", Status); return STATUS_SUCCESS; }

9 years, 8 months

[cwittich] 66544: [WLANAPI_WINETEST] add some more tests

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Mar 2 17:24:30 2015 New Revision: 66544 URL: http://svn.reactos.org/svn/reactos?rev=66544&view=rev Log: [WLANAPI_WINETEST] add some more tests Modified: trunk/rostests/winetests/wlanapi/wlanapi.c Modified: trunk/rostests/winetests/wlanapi/wlanapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/wlanapi… ============================================================================== --- trunk/rostests/winetests/wlanapi/wlanapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wlanapi/wlanapi.c [iso-8859-1] Mon Mar 2 17:24:30 2015 @@ -27,6 +27,8 @@ #include "wlanapi.h" #include "wine/test.h" + +static const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a, 0xf0, 0xc6, 0x8d, 0x43}}; static void WlanOpenHandle_test(void) { @@ -78,24 +80,14 @@ static void WlanConnect_test(void) { DWORD ret; - DWORD dwNegotiatedVersion; - HANDLE hClientHandle; WLAN_CONNECTION_PARAMETERS pConnectParams; - const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a, 0xf0, 0xc6, 0x8d, 0x43}}; - - ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, &hClientHandle); - if (ret != ERROR_SUCCESS) - { - skip("WlanOpenHandle failed. Skipping wlanapi_WlanConnect tests\n"); - return; - } - - /* invalid pReserved */ - ret = WlanConnect(hClientHandle, &InterfaceGuid, &pConnectParams, (PVOID) 1); - ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); - - /* invalid InterfaceGuid */ - ret = WlanConnect(hClientHandle, NULL, &pConnectParams, NULL); + + /* invalid pReserved */ + ret = WlanConnect((HANDLE) -1, &InterfaceGuid, &pConnectParams, (PVOID) 1); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid InterfaceGuid */ + ret = WlanConnect((HANDLE) -1, NULL, &pConnectParams, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); /* invalid hClientHandle */ @@ -103,72 +95,115 @@ ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); /* invalid connection parameters */ - ret = WlanConnect(hClientHandle, &InterfaceGuid, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); - - WlanCloseHandle(hClientHandle, NULL); + ret = WlanConnect((HANDLE) -1, &InterfaceGuid, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); } static void WlanDisconnect_test(void) { DWORD ret; - DWORD dwNegotiatedVersion; - HANDLE hClientHandle; - const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a, 0xf0, 0xc6, 0x8d, 0x43}}; - - ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, &hClientHandle); - if (ret != ERROR_SUCCESS) - { - skip("WlanOpenHandle failed. Skipping wlanapi_WlanDisconnect tests\n"); - return; - } - - /* invalid pReserved */ - ret = WlanDisconnect(hClientHandle, &InterfaceGuid, (PVOID) 1); - ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); - - /* invalid InterfaceGuid */ - ret = WlanDisconnect(hClientHandle, NULL, NULL); + + /* invalid pReserved */ + ret = WlanDisconnect((HANDLE) -1, &InterfaceGuid, (PVOID) 1); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid InterfaceGuid */ + ret = WlanDisconnect((HANDLE) -1, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); /* invalid hClientHandle */ ret = WlanDisconnect(NULL, &InterfaceGuid, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); - - WlanCloseHandle(hClientHandle, NULL); } static void WlanScan_test(void) { DWORD ret; - DWORD dwNegotiatedVersion; - HANDLE hClientHandle; DOT11_SSID Ssid; WLAN_RAW_DATA RawData; - const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a, 0xf0, 0xc6, 0x8d, 0x43}}; - - ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, &hClientHandle); - if (ret != ERROR_SUCCESS) - { - skip("WlanOpenHandle failed. Skipping wlanapi_WlanDisconnect tests\n"); - return; - } - - /* invalid pReserved */ - ret = WlanScan(hClientHandle, &InterfaceGuid, &Ssid, &RawData, (PVOID) 1); - ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); - - /* invalid InterfaceGuid */ - ret = WlanScan(hClientHandle, NULL, &Ssid, &RawData, NULL); + + /* invalid pReserved */ + ret = WlanScan((HANDLE) -1, &InterfaceGuid, &Ssid, &RawData, (PVOID) 1); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid InterfaceGuid */ + ret = WlanScan((HANDLE) -1, NULL, &Ssid, &RawData, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); /* invalid hClientHandle */ ret = WlanScan(NULL, &InterfaceGuid, &Ssid, &RawData, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); - - WlanCloseHandle(hClientHandle, NULL); -} - +} + +static void WlanRenameProfile_test(void) +{ + DWORD ret; + + /* invalid pReserved */ + ret = WlanRenameProfile((HANDLE) -1, &InterfaceGuid, L"test", L"test1", (PVOID) 1); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid InterfaceGuid */ + ret = WlanRenameProfile((HANDLE) -1, NULL, L"test", L"test1", NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid strOldProfileName */ + ret = WlanRenameProfile((HANDLE) -1, &InterfaceGuid, NULL, L"test1", NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid strNewProfileName */ + ret = WlanRenameProfile((HANDLE) -1, &InterfaceGuid, L"test", NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); +} + +static void WlanDeleteProfile_test(void) +{ + DWORD ret; + + /* invalid pReserved */ + ret = WlanDeleteProfile((HANDLE) -1, &InterfaceGuid, L"test", (PVOID) 1); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid InterfaceGuid */ + ret = WlanDeleteProfile((HANDLE) -1, NULL, L"test", NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid strProfileName */ + ret = WlanDeleteProfile((HANDLE) -1, &InterfaceGuid, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); +} + +static void WlanGetProfile_test(void) +{ + DWORD ret; + WCHAR *strProfileXml; + + /* invalid pReserved */ + ret = WlanGetProfile((HANDLE) -1, &InterfaceGuid, L"", (PVOID) 1, &strProfileXml, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid InterfaceGuid */ + ret = WlanGetProfile((HANDLE) -1, NULL, L"test", NULL, &strProfileXml, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid pstrProfileXml */ + ret = WlanGetProfile((HANDLE) -1, &InterfaceGuid, L"test", NULL, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); +} + +static void WlanEnumInterfaces_test(void) +{ + DWORD ret; + PWLAN_INTERFACE_INFO_LIST pInterfaceList; + + /* invalid pReserved */ + ret = WlanEnumInterfaces((HANDLE) -1, (PVOID) 1, &pInterfaceList); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid pInterfaceList */ + ret = WlanEnumInterfaces((HANDLE) -1, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); +} START_TEST(wlanapi) { @@ -177,4 +212,8 @@ WlanConnect_test(); WlanDisconnect_test(); WlanScan_test(); -} + WlanRenameProfile_test(); + WlanDeleteProfile_test(); + WlanGetProfile_test(); + WlanEnumInterfaces_test(); +}

9 years, 8 months

← Newer
1
...
43
44
45
46
47
48
49
50
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 March 2015