Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57546: [ADVAPI32] - Pre-implement InitiateSystemShutdownExW. - Cosmetic formatting code (by me). Patch by Lee Schroeder. See CORE-6613 for more details. CORE-6613 #comment Committed shut...
by hbelusca＠svn.reactos.org 12 Oct '12

12 Oct '12

Author: hbelusca Date: Fri Oct 12 22:12:44 2012 New Revision: 57546 URL: http://svn.reactos.org/svn/reactos?rev=57546&view=rev Log: [ADVAPI32] - Pre-implement InitiateSystemShutdownExW. - Cosmetic formatting code (by me). Patch by Lee Schroeder. See CORE-6613 for more details. CORE-6613 #comment Committed shutdown.c. Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sh… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] Fri Oct 12 22:12:44 2012 @@ -10,8 +10,6 @@ #include <advapi32.h> WINE_DEFAULT_DEBUG_CHANNEL(advapi); -#define USZ {0,0,0} - /********************************************************************** * AbortSystemShutdownW * @@ -28,7 +26,7 @@ /********************************************************************** * AbortSystemShutdownA * - * @unimplemented + * see AbortSystemShutdownW */ BOOL WINAPI AbortSystemShutdownA(LPCSTR lpMachineName) @@ -42,8 +40,8 @@ Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); if (STATUS_SUCCESS != Status) { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; } rv = AbortSystemShutdownW(MachineNameW.Buffer); @@ -71,7 +69,8 @@ bRebootAfterShutdown, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | - SHTDN_REASON_FLAG_PLANNED); + SHTDN_REASON_FLAG_PLANNED + /* SHTDN_REASON_MAJOR_LEGACY_API */); } /********************************************************************** @@ -94,7 +93,8 @@ bRebootAfterShutdown, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | - SHTDN_REASON_FLAG_PLANNED); + SHTDN_REASON_FLAG_PLANNED + /* SHTDN_REASON_MAJOR_LEGACY_API */); } /****************************************************************************** @@ -110,23 +110,37 @@ BOOL bRebootAfterShutdown, DWORD dwReason) { - SHUTDOWN_ACTION Action = ShutdownNoReboot; - NTSTATUS Status; - - if (lpMachineName) - { - /* FIXME: remote machine shutdown not supported yet */ + SHUTDOWN_ACTION action; + NTSTATUS Status; + ULONG Timeout_ms; + + /* Convert to milliseconds so we can use the value later on */ + Timeout_ms = dwTimeout * 1000; + + if (lpMachineName != NULL) + { + /* FIXME: Remote system shutdown not supported yet */ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - - if (dwTimeout) - { - } - - Status = NtShutdownSystem(Action); + else /* The local system is being used */ + { + /* FIXME: Right now, only basic shutting down and rebooting + is supported */ + if(bRebootAfterShutdown == TRUE) + { + action = ShutdownReboot; + } + else + { + action = ShutdownNoReboot; + } + + Status = NtShutdownSystem(action); + } + SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; + return (Status == STATUS_SUCCESS); } /****************************************************************************** @@ -186,6 +200,8 @@ bRebootAfterShutdown, dwReason); LastError = GetLastError(); + + /* Clear the values of both strings */ if (lpMachineName) RtlFreeUnicodeString(&MachineNameW); @@ -215,7 +231,7 @@ /****************************************************************************** * InitiateShutdownA [ADVAPI32.@] * - * @unimplamented + * see InitiateShutdownW */ DWORD WINAPI InitiateShutdownA(LPSTR lpMachineName, @@ -267,6 +283,8 @@ dwShutdownFlags, dwReason); LastError = GetLastError(); + + /* Clear the values of both strings */ if (lpMachineName) RtlFreeUnicodeString(&MachineNameW);

1 0

[mnordell] 57545: [ROSTESTS:WINETEST][MSHTML] add missing mshtml_ros.diff
by mnordell＠svn.reactos.org 12 Oct '12

12 Oct '12

Author: mnordell Date: Fri Oct 12 22:11:14 2012 New Revision: 57545 URL: http://svn.reactos.org/svn/reactos?rev=57545&view=rev Log: [ROSTESTS:WINETEST][MSHTML] add missing mshtml_ros.diff Added: trunk/rostests/winetests/mshtml/mshtml_ros.diff Added: trunk/rostests/winetests/mshtml/mshtml_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/mshtml_r… ============================================================================== --- trunk/rostests/winetests/mshtml/mshtml_ros.diff (added) +++ trunk/rostests/winetests/mshtml/mshtml_ros.diff [iso-8859-1] Fri Oct 12 22:11:14 2012 @@ -1,0 +1,62 @@ ++Index: htmldoc.c ++=================================================================== ++--- htmldoc.c (revision 57539) +++++ htmldoc.c (working copy) ++@@ -23,6 +23,8 @@ ++ #include <stdarg.h> ++ #include <stdio.h> ++ +++#if ROSTESTS_81_IS_FIXED +++ ++ #include "windef.h" ++ #include "winbase.h" ++ #include "initguid.h" ++@@ -5272,8 +5274,11 @@ ++ ok(ref == 0, "ref=%d, expected 0\n", ref); ++ } ++ +++#endif /* ROSTESTS_81_IS_FIXED*/ +++ ++ START_TEST(htmldoc) ++ { +++#if ROSTESTS_81_IS_FIXED ++ CoInitialize(NULL); ++ container_hwnd = create_container_window(); ++ register_protocol(); ++@@ -5299,4 +5304,5 @@ ++ ++ DestroyWindow(container_hwnd); ++ CoUninitialize(); +++#endif /* ROSTESTS_81_IS_FIXED*/ ++ } +Index: htmldoc.c +=================================================================== +--- htmldoc.c (revision 57027) ++++ htmldoc.c (revision 57542) +@@ -23,6 +23,8 @@ + #include <stdarg.h> + #include <stdio.h> + ++#if ROSTESTS_81_IS_FIXED ++ + #include "windef.h" + #include "winbase.h" + #include "initguid.h" +@@ -5272,8 +5274,11 @@ + ok(ref == 0, "ref=%d, expected 0\n", ref); + } + ++#endif /* ROSTESTS_81_IS_FIXED*/ ++ + START_TEST(htmldoc) + { ++#if ROSTESTS_81_IS_FIXED + CoInitialize(NULL); + container_hwnd = create_container_window(); + register_protocol(); +@@ -5299,4 +5304,5 @@ + + DestroyWindow(container_hwnd); + CoUninitialize(); ++#endif /* ROSTESTS_81_IS_FIXED*/ + }

1 0

[mnordell] 57544: Disable correct test with ROSTESTS_81_IS_FIXED */
by mnordell＠svn.reactos.org 12 Oct '12

12 Oct '12

Author: mnordell Date: Fri Oct 12 22:04:30 2012 New Revision: 57544 URL: http://svn.reactos.org/svn/reactos?rev=57544&view=rev Log: Disable correct test with ROSTESTS_81_IS_FIXED */ Removed: trunk/rostests/winetests/mshtml/msxml_ros.diff Modified: trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/htmllocation.c Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Fri Oct 12 22:04:30 2012 @@ -22,8 +22,6 @@ #include <wine/test.h> #include <stdarg.h> #include <stdio.h> - -#if ROSTESTS_81_IS_FIXED #include "windef.h" #include "winbase.h" @@ -5274,11 +5272,8 @@ ok(ref == 0, "ref=%d, expected 0\n", ref); } -#endif /* ROSTESTS_81_IS_FIXED*/ - START_TEST(htmldoc) { -#if ROSTESTS_81_IS_FIXED CoInitialize(NULL); container_hwnd = create_container_window(); register_protocol(); @@ -5304,5 +5299,4 @@ DestroyWindow(container_hwnd); CoUninitialize(); -#endif /* ROSTESTS_81_IS_FIXED*/ -} +} Modified: trunk/rostests/winetests/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmlloca… ============================================================================== --- trunk/rostests/winetests/mshtml/htmllocation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmllocation.c [iso-8859-1] Fri Oct 12 22:04:30 2012 @@ -21,6 +21,8 @@ #include <wine/test.h> +#if ROSTESTS_81_IS_FIXED + #include "mshtml.h" #include "wininet.h" @@ -349,9 +351,11 @@ IMoniker_Release(url_mon); IBindCtx_Release(bc); } +#endif /* ROSTESTS_81_IS_FIXED */ START_TEST(htmllocation) { +#if ROSTESTS_81_IS_FIXED int i; CoInitialize(NULL); @@ -360,4 +364,5 @@ perform_test(location_tests+i); CoUninitialize(); -} +#endif /* ROSTESTS_81_IS_FIXED */ +} Removed: trunk/rostests/winetests/mshtml/msxml_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/msxml_ro… ============================================================================== --- trunk/rostests/winetests/mshtml/msxml_ros.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/msxml_ros.diff (removed) @@ -1,31 +1,0 @@ -Index: htmldoc.c -=================================================================== ---- htmldoc.c (revision 57539) -+++ htmldoc.c (working copy) -@@ -23,6 +23,8 @@ - #include <stdarg.h> - #include <stdio.h> - -+#if ROSTESTS_81_IS_FIXED -+ - #include "windef.h" - #include "winbase.h" - #include "initguid.h" -@@ -5272,8 +5274,11 @@ - ok(ref == 0, "ref=%d, expected 0\n", ref); - } - -+#endif /* ROSTESTS_81_IS_FIXED*/ -+ - START_TEST(htmldoc) - { -+#if ROSTESTS_81_IS_FIXED - CoInitialize(NULL); - container_hwnd = create_container_window(); - register_protocol(); -@@ -5299,4 +5304,5 @@ - - DestroyWindow(container_hwnd); - CoUninitialize(); -+#endif /* ROSTESTS_81_IS_FIXED*/ - }

1 0

[hbelusca] 57543: [BOOTDATA] Correct the SP number (==> SP1) we are reporting (currently SP1 of Windows Server 2003). The SP6 thingie was a remainder from our previous target, Windows NT 4 SP6.
by hbelusca＠svn.reactos.org 12 Oct '12

12 Oct '12

Author: hbelusca Date: Fri Oct 12 20:43:48 2012 New Revision: 57543 URL: http://svn.reactos.org/svn/reactos?rev=57543&view=rev Log: [BOOTDATA] Correct the SP number (==> SP1) we are reporting (currently SP1 of Windows Server 2003). The SP6 thingie was a remainder from our previous target, Windows NT 4 SP6. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Fri Oct 12 20:43:48 2012 @@ -1132,12 +1132,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"WinNT" HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"" +; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012 - -; Some installers check for SP6 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000600 ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Fri Oct 12 20:43:48 2012 @@ -693,8 +693,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale\Alternate Sorts","00021404",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale\Alternate Sorts","00030404",0x00000000,"" -; Some installers check for SP6 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000600 +; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Oct 12 20:43:48 2012 @@ -1132,12 +1132,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"WinNT" HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"" +; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012 - -; Some installers check for SP6 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000600 ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \

1 0

[mnordell] 57542: Disable test due to crash in XUL during Release call. ROSTESTS-81
by mnordell＠svn.reactos.org 12 Oct '12

12 Oct '12

Author: mnordell Date: Fri Oct 12 20:29:50 2012 New Revision: 57542 URL: http://svn.reactos.org/svn/reactos?rev=57542&view=rev Log: Disable test due to crash in XUL during Release call. ROSTESTS-81 Added: trunk/rostests/winetests/mshtml/msxml_ros.diff Modified: trunk/rostests/winetests/mshtml/htmldoc.c Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Fri Oct 12 20:29:50 2012 @@ -22,6 +22,8 @@ #include <wine/test.h> #include <stdarg.h> #include <stdio.h> + +#if ROSTESTS_81_IS_FIXED #include "windef.h" #include "winbase.h" @@ -5272,8 +5274,11 @@ ok(ref == 0, "ref=%d, expected 0\n", ref); } +#endif /* ROSTESTS_81_IS_FIXED*/ + START_TEST(htmldoc) { +#if ROSTESTS_81_IS_FIXED CoInitialize(NULL); container_hwnd = create_container_window(); register_protocol(); @@ -5299,4 +5304,5 @@ DestroyWindow(container_hwnd); CoUninitialize(); -} +#endif /* ROSTESTS_81_IS_FIXED*/ +} Added: trunk/rostests/winetests/mshtml/msxml_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/msxml_ro… ============================================================================== --- trunk/rostests/winetests/mshtml/msxml_ros.diff (added) +++ trunk/rostests/winetests/mshtml/msxml_ros.diff [iso-8859-1] Fri Oct 12 20:29:50 2012 @@ -1,0 +1,31 @@ +Index: htmldoc.c +=================================================================== +--- htmldoc.c (revision 57539) ++++ htmldoc.c (working copy) +@@ -23,6 +23,8 @@ + #include <stdarg.h> + #include <stdio.h> + ++#if ROSTESTS_81_IS_FIXED ++ + #include "windef.h" + #include "winbase.h" + #include "initguid.h" +@@ -5272,8 +5274,11 @@ + ok(ref == 0, "ref=%d, expected 0\n", ref); + } + ++#endif /* ROSTESTS_81_IS_FIXED*/ ++ + START_TEST(htmldoc) + { ++#if ROSTESTS_81_IS_FIXED + CoInitialize(NULL); + container_hwnd = create_container_window(); + register_protocol(); +@@ -5299,4 +5304,5 @@ + + DestroyWindow(container_hwnd); + CoUninitialize(); ++#endif /* ROSTESTS_81_IS_FIXED*/ + }

1 0

[mnordell] 57541: [WINETEST:MSXML3] [domdoc:savexml] Disable test for saving XML data until CORE_6738_IS_FIXED.
by mnordell＠svn.reactos.org 12 Oct '12

12 Oct '12

Author: mnordell Date: Fri Oct 12 17:17:33 2012 New Revision: 57541 URL: http://svn.reactos.org/svn/reactos?rev=57541&view=rev Log: [WINETEST:MSXML3] [domdoc:savexml] Disable test for saving XML data until CORE_6738_IS_FIXED. Modified: trunk/rostests/winetests/msxml3/msxml3_ros.diff Modified: trunk/rostests/winetests/msxml3/msxml3_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/msxml3_r… ============================================================================== --- trunk/rostests/winetests/msxml3/msxml3_ros.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/msxml3_ros.diff [iso-8859-1] Fri Oct 12 17:17:33 2012 @@ -52,3 +52,43 @@ hr = IXMLDOMNodeList_get_length( node_list, &len ); EXPECT_HR(hr, S_OK); ok( len == 4, "len %d\n", len); +Index: domdoc.c +=================================================================== +--- domdoc.c (revision 57539) ++++ domdoc.c (revision 57540) +@@ -1398,7 +1398,9 @@ + istream_Clone + }; + ++#if CORE_6738_IS_FIXED + static IStream savestream = { &StreamVtbl }; ++#endif + + #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) + static void _expect_children(IXMLDOMNode *node, int line) +@@ -7274,6 +7276,7 @@ + free_bstrs(); + } + ++#if CORE_6738_IS_FIXED + static void test_save(void) + { + IXMLDOMDocument *doc, *doc2; +@@ -7410,6 +7413,7 @@ + IXMLDOMDocument_Release(doc); + free_bstrs(); + } ++#endif /* CORE_6738_IS_FIXED */ + + static void test_testTransforms(void) + { +@@ -12538,7 +12542,9 @@ + test_XSLPattern(); + test_cloneNode(); + test_xmlTypes(); ++#if CORE_6738_IS_FIXED + test_save(); ++#endif + test_testTransforms(); + test_namespaces_basic(); + test_namespaces_change();

1 0

[mnordell] 57540: Disable test for saving XML data until '
by mnordell＠svn.reactos.org 12 Oct '12

12 Oct '12

Author: mnordell Date: Fri Oct 12 17:06:28 2012 New Revision: 57540 URL: http://svn.reactos.org/svn/reactos?rev=57540&view=rev Log: Disable test for saving XML data until ' Modified: trunk/rostests/winetests/msxml3/domdoc.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Fri Oct 12 17:06:28 2012 @@ -1398,7 +1398,9 @@ istream_Clone }; +#if CORE_6738_IS_FIXED static IStream savestream = { &StreamVtbl }; +#endif #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) static void _expect_children(IXMLDOMNode *node, int line) @@ -7274,6 +7276,7 @@ free_bstrs(); } +#if CORE_6738_IS_FIXED static void test_save(void) { IXMLDOMDocument *doc, *doc2; @@ -7410,6 +7413,7 @@ IXMLDOMDocument_Release(doc); free_bstrs(); } +#endif /* CORE_6738_IS_FIXED */ static void test_testTransforms(void) { @@ -12538,7 +12542,9 @@ test_XSLPattern(); test_cloneNode(); test_xmlTypes(); +#if CORE_6738_IS_FIXED test_save(); +#endif test_testTransforms(); test_namespaces_basic(); test_namespaces_change();

1 0

[tfaber] 57539: [WLANCONF] - Add localization support. Patch by Lee Schroeder. CORE-6721
by tfaber＠svn.reactos.org 12 Oct '12

12 Oct '12

Author: tfaber Date: Fri Oct 12 11:40:53 2012 New Revision: 57539 URL: http://svn.reactos.org/svn/reactos?rev=57539&view=rev Log: [WLANCONF] - Add localization support. Patch by Lee Schroeder. CORE-6721 Added: trunk/reactos/base/applications/network/wlanconf/lang/ trunk/reactos/base/applications/network/wlanconf/lang/en-US.rc (with props) trunk/reactos/base/applications/network/wlanconf/resource.h (with props) Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt trunk/reactos/base/applications/network/wlanconf/wlanconf.c trunk/reactos/base/applications/network/wlanconf/wlanconf.rc Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] Fri Oct 12 11:40:53 2012 @@ -3,6 +3,13 @@ BEFORE include ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio) add_executable(wlanconf wlanconf.c wlanconf.rc) + +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 +if(NOT MSVC) + #add_target_compile_flags(wlanconf "-Wno-format") + set_source_files_properties(wlanconf.c PROPERTIES COMPILE_FLAGS "-Wno-format") +endif() + set_module_type(wlanconf win32cui) -add_importlibs(wlanconf msvcrt iphlpapi kernel32) +add_importlibs(wlanconf msvcrt user32 iphlpapi kernel32) add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all) Added: trunk/reactos/base/applications/network/wlanconf/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/lang/en-US.rc (added) +++ trunk/reactos/base/applications/network/wlanconf/lang/en-US.rc [iso-8859-1] Fri Oct 12 11:40:53 2012 @@ -1,0 +1,40 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN +IDS_USAGE, "\nConfigure a WLAN adapter.\n\n\ +WLANCONF [-c SSID [-w WEP] [-a]] [-d] [-s]\n\n\ +\t-c SSID\t\tConnects to a supplied SSID,\n\ +\t-w WEP\t\tSpecifies a WEP key to use.\n\ +\t-a\t\tSpecifies the target network is ad-hoc\n\ +\t-d\t\tDisconnects from the current AP.\n\ +\t-s\t\tScans and displays a list of access points\n\ +\t\t\tin range.\n\n\ +Passing no parameters will print information about the current WLAN connection\n" +/* === */ +IDS_NO_NETWORK, "No networks found in range\n" +IDS_NO_WLAN_ADAPTER, "Unable to find a WLAN adapter on the system\n" +IDS_SUCCESS, "The operation completed successfully.\n" +IDS_WLAN_DISCONNECT, "\nWLAN disconnected\n" +/* === */ +IDS_MSG_WEP_ENABLED, "WEP enabled: %s\n" +IDS_MSG_NETWORK_MODE, "Network mode: %s\n" +IDS_MSG_CURRENT_WIRELESS, "\nCurrent wireless configuration information:\n\n" +IDS_MSG_ENCRYPTED, "Encrypted: %s\n" +IDS_MSG_NETWORK_TYPE, "Network Type: %s\n" +IDS_MSG_RSSI, "RSSI: %i dBm\n" +IDS_MSG_SUPPORT_RATE, "Supported Rates (Mbps): " +IDS_MSG_TRANSMISSION_POWER, "Transmission power: %d mW\n" +IDS_MSG_ANTENNA_COUNT, "Antenna count: %d\n" +IDS_MSG_TRANSMIT_ANTENNA, "Transmit antenna: %d\n" +IDS_MSG_TRANSMIT_ANTENNA_ANY, "Transmit antenna: Any\n" +IDS_MSG_RECEIVE_ANTENNA, "Receive antenna: %d\n" +IDS_MSG_RECEIVE_ANTENNA_ANY, "Receive antenna: Any\n" +IDS_MSG_FRAGMENT_THRESHOLD, "Fragmentation threshold: %d bytes\n" +IDS_MSG_RTS_THRESHOLD, "RTS threshold: %d bytes\n" +/* === */ +IDS_YES, "Yes" +IDS_NO, "No" +IDS_ADHOC, "Adhoc" +IDS_INFRASTRUCTURE, "Infrastructure" +END Propchange: trunk/reactos/base/applications/network/wlanconf/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/wlanconf/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/resource.h (added) +++ trunk/reactos/base/applications/network/wlanconf/resource.h [iso-8859-1] Fri Oct 12 11:40:53 2012 @@ -1,0 +1,24 @@ +#define IDS_USAGE 0 +#define IDS_NO_NETWORK 1 +#define IDS_NO_WLAN_ADAPTER 2 +#define IDS_SUCCESS 3 +#define IDS_WLAN_DISCONNECT 4 +#define IDS_MSG_WEP_ENABLED 5 +#define IDS_MSG_NETWORK_MODE 6 +#define IDS_MSG_CURRENT_WIRELESS 7 +#define IDS_MSG_ENCRYPTED 8 +#define IDS_MSG_NETWORK_TYPE 9 +#define IDS_MSG_RSSI 10 +#define IDS_MSG_SUPPORT_RATE 11 +#define IDS_MSG_TRANSMISSION_POWER 12 +#define IDS_MSG_ANTENNA_COUNT 13 +#define IDS_MSG_TRANSMIT_ANTENNA 14 +#define IDS_MSG_TRANSMIT_ANTENNA_ANY 15 +#define IDS_MSG_RECEIVE_ANTENNA 16 +#define IDS_MSG_RECEIVE_ANTENNA_ANY 17 +#define IDS_MSG_FRAGMENT_THRESHOLD 18 +#define IDS_MSG_RTS_THRESHOLD 19 +#define IDS_YES 20 +#define IDS_NO 21 +#define IDS_ADHOC 22 +#define IDS_INFRASTRUCTURE 23 Propchange: trunk/reactos/base/applications/network/wlanconf/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Fri Oct 12 11:40:53 2012 @@ -14,14 +14,32 @@ #include <nuiouser.h> #include <iphlpapi.h> +#include "resource.h" + +#define COUNT_OF(a) (sizeof(a) / sizeof(a[0])) +#define MAX_BUFFER_SIZE 5024 + BOOL bScan = FALSE; BOOL bConnect = FALSE; -char* sSsid = NULL; -char* sWepKey = NULL; +char *sSsid = NULL; +char *sWepKey = NULL; BOOL bAdhoc = FALSE; BOOL bDisconnect = FALSE; + +/* This takes strings from a resource stringtable and outputs it to +the command prompt. */ +VOID PrintResourceString(INT resID, ...) +{ + TCHAR szMsgBuf[MAX_BUFFER_SIZE]; + va_list arg_ptr; + + va_start(arg_ptr, resID); + LoadString(GetModuleHandle(NULL), resID, szMsgBuf, MAX_BUFFER_SIZE); + _vtprintf(szMsgBuf, arg_ptr); + va_end(arg_ptr); +} DWORD DoFormatMessage(DWORD ErrorCode) { @@ -258,7 +276,7 @@ if (!bSuccess) return FALSE; - _tprintf(_T("The operation completed successfully.\n")); + PrintResourceString(IDS_SUCCESS); return TRUE; } @@ -317,6 +335,7 @@ PNDIS_802_11_SSID SsidInfo; CHAR SsidBuffer[NDIS_802_11_LENGTH_SSID + 1]; DWORD i; + TCHAR szMsgBuf[128]; QueryOidSize = FIELD_OFFSET(NDISUIO_QUERY_OID, Data) + sizeof(NDIS_802_11_SSID); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); @@ -362,16 +381,16 @@ NULL); if (SsidInfo->SsidLength == 0 || !bSuccess) { - _tprintf(_T("\nWLAN disconnected\n")); + PrintResourceString(IDS_WLAN_DISCONNECT); HeapFree(GetProcessHeap(), 0, QueryOid); return TRUE; } else { - _tprintf(_T("\nCurrent wireless configuration information:\n\n")); - } - - _tprintf(_T("SSID: %s\n"), SsidBuffer); + PrintResourceString(IDS_MSG_CURRENT_WIRELESS); + } + + _tprintf(_T("SSID: %hs\n"), SsidBuffer); _tprintf(_T("BSSID: ")); for (i = 0; i < sizeof(NDIS_802_11_MAC_ADDRESS); i++) @@ -407,7 +426,11 @@ return FALSE; } - _tprintf(_T("Network mode: %s\n"), (*(PUINT)QueryOid->Data == Ndis802_11IBSS) ? "Adhoc" : "Infrastructure"); + LoadString(GetModuleHandle(NULL), + *(PUINT)QueryOid->Data == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, + szMsgBuf, + COUNT_OF(szMsgBuf)); + PrintResourceString(IDS_MSG_NETWORK_MODE, szMsgBuf); QueryOid->Oid = OID_802_11_WEP_STATUS; @@ -425,9 +448,13 @@ return FALSE; } - _tprintf(_T("WEP enabled: %s\n"), (*(PUINT)QueryOid->Data == Ndis802_11WEPEnabled) ? "Yes" : "No"); - - _tprintf("\n"); + LoadString(GetModuleHandle(NULL), + *(PUINT)QueryOid->Data == Ndis802_11WEPEnabled ? IDS_YES : IDS_NO, + szMsgBuf, + COUNT_OF(szMsgBuf)); + PrintResourceString(IDS_MSG_WEP_ENABLED, szMsgBuf); + + _tprintf(_T("\n")); QueryOid->Oid = OID_802_11_RSSI; bSuccess = DeviceIoControl(hAdapter, @@ -457,7 +484,7 @@ if (bSuccess) { /* This OID is optional */ - _tprintf(_T("Transmission power: %d mW\n"), *(PUINT)QueryOid->Data); + PrintResourceString(IDS_MSG_TRANSMISSION_POWER, *(PUINT)QueryOid->Data); } _tprintf(_T("\n")); @@ -475,7 +502,7 @@ if (bSuccess) { /* This OID is optional */ - _tprintf(_T("Antenna count: %d\n"), *(PUINT)QueryOid->Data); + PrintResourceString(IDS_MSG_ANTENNA_COUNT, *(PUINT)QueryOid->Data); } QueryOid->Oid = OID_802_11_TX_ANTENNA_SELECTED; @@ -493,9 +520,9 @@ UINT TransmitAntenna = *(PUINT)QueryOid->Data; if (TransmitAntenna != 0xFFFFFFFF) - _tprintf(_T("Transmit antenna: %d\n"), TransmitAntenna); + PrintResourceString(IDS_MSG_TRANSMIT_ANTENNA, TransmitAntenna); else - _tprintf(_T("Transmit antenna: Any\n")); + PrintResourceString(IDS_MSG_TRANSMIT_ANTENNA_ANY); } QueryOid->Oid = OID_802_11_RX_ANTENNA_SELECTED; @@ -513,9 +540,9 @@ UINT ReceiveAntenna = *(PUINT)QueryOid->Data; if (ReceiveAntenna != 0xFFFFFFFF) - _tprintf(_T("Receive antenna: %d\n"), ReceiveAntenna); + PrintResourceString(IDS_MSG_RECEIVE_ANTENNA, ReceiveAntenna); else - _tprintf(_T("Receive antenna: Any\n")); + PrintResourceString(IDS_MSG_RECEIVE_ANTENNA_ANY); } _tprintf(_T("\n")); @@ -533,7 +560,7 @@ if (bSuccess) { /* This OID is optional */ - _tprintf(_T("Fragmentation threshold: %d bytes\n"), *(PUINT)QueryOid->Data); + PrintResourceString(IDS_MSG_FRAGMENT_THRESHOLD, *(PUINT)QueryOid->Data); } QueryOid->Oid = OID_802_11_RTS_THRESHOLD; @@ -549,7 +576,7 @@ if (bSuccess) { /* This OID is optional */ - _tprintf(_T("RTS threshold: %d bytes\n"), *(PUINT)QueryOid->Data); + PrintResourceString(IDS_MSG_RTS_THRESHOLD, *(PUINT)QueryOid->Data); } HeapFree(GetProcessHeap(), 0, QueryOid); @@ -722,7 +749,7 @@ if (!bSuccess) return FALSE; - _tprintf(_T("The operation completed successfully.\n")); + PrintResourceString(IDS_SUCCESS); return TRUE; } @@ -736,6 +763,7 @@ DWORD QueryOidSize; PNDIS_802_11_BSSID_LIST BssidList; DWORD i, j; + TCHAR szMsgBuf[128]; SetOid.Oid = OID_802_11_BSSID_LIST_SCAN; @@ -776,7 +804,7 @@ if (BssidList->NumberOfItems == 0) { - _tprintf(_T("No networks found in range\n")); + PrintResourceString(IDS_NO_NETWORK); } else { @@ -793,9 +821,7 @@ RtlCopyMemory(SsidBuffer, Ssid->Ssid, Ssid->SsidLength); SsidBuffer[Ssid->SsidLength] = 0; - _tprintf(_T("\n")); - - _tprintf(_T("SSID: %s\n"), SsidBuffer); + _tprintf(_T("\nSSID: %hs\n"), SsidBuffer); _tprintf(_T("BSSID: ")); for (j = 0; j < sizeof(NDIS_802_11_MAC_ADDRESS); j++) @@ -809,13 +835,18 @@ } _tprintf(_T("\n")); - _tprintf(_T("Encrypted: %s\n" - "Network Type: %s\n" - "RSSI: %i dBm\n" - "Supported Rates (Mbps): "), - BssidInfo->Privacy == 0 ? "No" : "Yes", - NetworkType == Ndis802_11IBSS ? "Adhoc" : "Infrastructure", - (int)Rssi); + LoadString(GetModuleHandle(NULL), + BssidInfo->Privacy == 0 ? IDS_NO : IDS_YES, + szMsgBuf, + COUNT_OF(szMsgBuf)); + PrintResourceString(IDS_MSG_ENCRYPTED, szMsgBuf); + LoadString(GetModuleHandle(NULL), + NetworkType == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, + szMsgBuf, + COUNT_OF(szMsgBuf)); + PrintResourceString(IDS_MSG_NETWORK_TYPE, szMsgBuf); + PrintResourceString(IDS_MSG_RSSI, (int)Rssi); + PrintResourceString(IDS_MSG_SUPPORT_RATE); for (j = 0; j < NDIS_802_11_LENGTH_RATES; j++) { @@ -850,20 +881,7 @@ return bSuccess; } -VOID Usage() -{ - _tprintf(_T("\nConfigures a WLAN adapter.\n\n" - "WLANCONF [-c SSID [-w WEP] [-a]] [-d] [-s]\n\n" - " -c SSID Connects to a supplied SSID.\n" - " -w WEP Specifies a WEP key to use.\n" - " -a Specifies the target network is ad-hoc\n" - " -d Disconnects from the current AP.\n" - " -s Scans and displays a list of access points in range.\n\n" - " Passing no parameters will print information about the current WLAN connection\n")); -} - - -BOOL ParseCmdline(int argc, char* argv[]) +BOOL ParseCmdline(int argc, char *argv[]) { INT i; @@ -882,7 +900,7 @@ case 'c': if (i == argc - 1) { - Usage(); + PrintResourceString(IDS_USAGE); return FALSE; } bConnect = TRUE; @@ -891,7 +909,7 @@ case 'w': if (i == argc - 1) { - Usage(); + PrintResourceString(IDS_USAGE); return FALSE; } sWepKey = argv[++i]; @@ -900,14 +918,14 @@ bAdhoc = TRUE; break; default : - Usage(); + PrintResourceString(IDS_USAGE); return FALSE; } } else { - Usage(); + PrintResourceString(IDS_USAGE); return FALSE; } } @@ -915,7 +933,7 @@ return TRUE; } -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { HANDLE hAdapter; IP_ADAPTER_INDEX_MAP IpInfo; @@ -925,7 +943,7 @@ if (!OpenWlanAdapter(&hAdapter, &IpInfo)) { - _tprintf(_T("Unable to find a WLAN adapter on the system\n")); + PrintResourceString(IDS_NO_WLAN_ADAPTER); return -1; } Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] Fri Oct 12 11:40:53 2012 @@ -1,7 +1,17 @@ +#include "resource.h" + +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define REACTOS_STR_FILE_DESCRIPTION "ReactOS WLAN Configuration Tool\0" #define REACTOS_STR_INTERNAL_NAME "wlanconf\0" #define REACTOS_STR_ORIGINAL_FILENAME "wlanconf.exe\0" #define REACTOS_STR_ORIGINAL_COPYRIGHT "Cameron Gutman (cameron.gutman(a)reactos.org)\0" #include <reactos/version.rc> - +// UTF-8 +#pragma code_page(65001) +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif

1 0

[tfaber] 57538: [WLANCONF] - Fix a potential buffer overflow, fix a handle leak, fix an MSVC warning
by tfaber＠svn.reactos.org 12 Oct '12

12 Oct '12

Author: tfaber Date: Fri Oct 12 10:56:08 2012 New Revision: 57538 URL: http://svn.reactos.org/svn/reactos?rev=57538&view=rev Log: [WLANCONF] - Fix a potential buffer overflow, fix a handle leak, fix an MSVC warning Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Fri Oct 12 10:56:08 2012 @@ -68,7 +68,7 @@ NULL); if (hDriver == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; - + /* Wait for binds */ bSuccess = DeviceIoControl(hDriver, IOCTL_NDISUIO_BIND_WAIT, @@ -83,7 +83,7 @@ CloseHandle(hDriver); return INVALID_HANDLE_VALUE; } - + return hDriver; } @@ -119,14 +119,15 @@ DWORD dwBytesReturned; DWORD QueryBindingSize = sizeof(NDISUIO_QUERY_BINDING) + (1024 * sizeof(WCHAR)); PNDISUIO_QUERY_BINDING QueryBinding; - DWORD dwStatus, dwSize, i; + DWORD dwStatus, dwSize; + LONG i; PIP_INTERFACE_INFO InterfaceInfo = NULL; - + /* Open the driver handle */ hDriver = OpenDriverHandle(); if (hDriver == INVALID_HANDLE_VALUE) return FALSE; - + /* Allocate the binding struct */ QueryBinding = HeapAlloc(GetProcessHeap(), 0, QueryBindingSize); if (!QueryBinding) @@ -152,7 +153,7 @@ CloseHandle(hDriver); return FALSE; } - + /* Bind to the adapter */ bSuccess = DeviceIoControl(hDriver, IOCTL_NDISUIO_OPEN_DEVICE, @@ -174,7 +175,7 @@ dwSize = sizeof(IP_INTERFACE_INFO); do { if (InterfaceInfo) HeapFree(GetProcessHeap(), 0, InterfaceInfo); - InterfaceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(IP_INTERFACE_INFO)); + InterfaceInfo = HeapAlloc(GetProcessHeap(), 0, dwSize); if (!InterfaceInfo) { HeapFree(GetProcessHeap(), 0, QueryBinding); @@ -183,14 +184,15 @@ } dwStatus = GetInterfaceInfo(InterfaceInfo, &dwSize); } while (dwStatus == ERROR_INSUFFICIENT_BUFFER); - + if (dwStatus != NO_ERROR) { HeapFree(GetProcessHeap(), 0, QueryBinding); HeapFree(GetProcessHeap(), 0, InterfaceInfo); - return FALSE; - } - + CloseHandle(hDriver); + return FALSE; + } + for (i = 0; i < InterfaceInfo->NumAdapters; i++) { if (wcsstr((PWCHAR)((PUCHAR)QueryBinding + QueryBinding->DeviceNameOffset), @@ -198,10 +200,10 @@ { *IpInfo = InterfaceInfo->Adapter[i]; *hAdapter = hDriver; - + HeapFree(GetProcessHeap(), 0, QueryBinding); HeapFree(GetProcessHeap(), 0, InterfaceInfo); - + return TRUE; } } @@ -223,7 +225,7 @@ { if (!OpenAdapterHandle(dwCurrentIndex, hAdapter, IpInfo)) break; - + if (IsWlanAdapter(*hAdapter)) return TRUE; else @@ -239,7 +241,7 @@ BOOL bSuccess; DWORD dwBytesReturned; NDISUIO_SET_OID SetOid; - + /* Release this IP address */ IpReleaseAddress(IpInfo); @@ -265,7 +267,7 @@ CharToHex(CHAR Char) { Char = toupper(Char); - + switch (Char) { case '0': @@ -315,12 +317,12 @@ PNDIS_802_11_SSID SsidInfo; CHAR SsidBuffer[NDIS_802_11_LENGTH_SSID + 1]; DWORD i; - + QueryOidSize = FIELD_OFFSET(NDISUIO_QUERY_OID, Data) + sizeof(NDIS_802_11_SSID); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); if (!QueryOid) return FALSE; - + QueryOid->Oid = OID_802_11_SSID; SsidInfo = (PNDIS_802_11_SSID)QueryOid->Data; @@ -337,7 +339,7 @@ HeapFree(GetProcessHeap(), 0, QueryOid); return FALSE; } - + /* Copy the SSID to our internal buffer and terminate it */ RtlCopyMemory(SsidBuffer, SsidInfo->Ssid, SsidInfo->SsidLength); SsidBuffer[SsidInfo->SsidLength] = 0; @@ -349,7 +351,7 @@ return FALSE; QueryOid->Oid = OID_802_11_BSSID; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -382,15 +384,15 @@ _tprintf(_T(":")); } _tprintf(_T("\n")); - + HeapFree(GetProcessHeap(), 0, QueryOid); QueryOidSize = sizeof(NDISUIO_QUERY_OID); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); if (!QueryOid) return FALSE; - + QueryOid->Oid = OID_802_11_INFRASTRUCTURE_MODE; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -404,11 +406,11 @@ HeapFree(GetProcessHeap(), 0, QueryOid); return FALSE; } - + _tprintf(_T("Network mode: %s\n"), (*(PUINT)QueryOid->Data == Ndis802_11IBSS) ? "Adhoc" : "Infrastructure"); - + QueryOid->Oid = OID_802_11_WEP_STATUS; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -422,12 +424,12 @@ HeapFree(GetProcessHeap(), 0, QueryOid); return FALSE; } - + _tprintf(_T("WEP enabled: %s\n"), (*(PUINT)QueryOid->Data == Ndis802_11WEPEnabled) ? "Yes" : "No"); - + _tprintf("\n"); QueryOid->Oid = OID_802_11_RSSI; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -441,9 +443,9 @@ /* This OID is optional */ _tprintf(_T("RSSI: %i dBm\n"), *(PINT)QueryOid->Data); } - + QueryOid->Oid = OID_802_11_TX_POWER_LEVEL; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -457,11 +459,11 @@ /* This OID is optional */ _tprintf(_T("Transmission power: %d mW\n"), *(PUINT)QueryOid->Data); } - + _tprintf(_T("\n")); - + QueryOid->Oid = OID_802_11_NUMBER_OF_ANTENNAS; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -475,9 +477,9 @@ /* This OID is optional */ _tprintf(_T("Antenna count: %d\n"), *(PUINT)QueryOid->Data); } - + QueryOid->Oid = OID_802_11_TX_ANTENNA_SELECTED; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -489,15 +491,15 @@ if (bSuccess) { UINT TransmitAntenna = *(PUINT)QueryOid->Data; - + if (TransmitAntenna != 0xFFFFFFFF) _tprintf(_T("Transmit antenna: %d\n"), TransmitAntenna); else _tprintf(_T("Transmit antenna: Any\n")); } - + QueryOid->Oid = OID_802_11_RX_ANTENNA_SELECTED; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -509,17 +511,17 @@ if (bSuccess) { UINT ReceiveAntenna = *(PUINT)QueryOid->Data; - + if (ReceiveAntenna != 0xFFFFFFFF) _tprintf(_T("Receive antenna: %d\n"), ReceiveAntenna); else _tprintf(_T("Receive antenna: Any\n")); } - + _tprintf(_T("\n")); - + QueryOid->Oid = OID_802_11_FRAGMENTATION_THRESHOLD; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -533,9 +535,9 @@ /* This OID is optional */ _tprintf(_T("Fragmentation threshold: %d bytes\n"), *(PUINT)QueryOid->Data); } - + QueryOid->Oid = OID_802_11_RTS_THRESHOLD; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -549,9 +551,9 @@ /* This OID is optional */ _tprintf(_T("RTS threshold: %d bytes\n"), *(PUINT)QueryOid->Data); } - + HeapFree(GetProcessHeap(), 0, QueryOid); - + _tprintf(_T("\n")); return TRUE; } @@ -564,7 +566,7 @@ PNDISUIO_SET_OID SetOid; PNDIS_802_11_SSID Ssid; DWORD i; - + SetOidSize = sizeof(NDISUIO_SET_OID); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) @@ -573,7 +575,7 @@ /* Set the network mode */ SetOid->Oid = OID_802_11_INFRASTRUCTURE_MODE; *(PULONG)SetOid->Data = bAdhoc ? Ndis802_11IBSS : Ndis802_11Infrastructure; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, SetOid, @@ -591,7 +593,7 @@ /* Set the authentication mode */ SetOid->Oid = OID_802_11_AUTHENTICATION_MODE; *(PULONG)SetOid->Data = sWepKey ? Ndis802_11AuthModeShared : Ndis802_11AuthModeOpen; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, SetOid, @@ -605,11 +607,11 @@ HeapFree(GetProcessHeap(), 0, SetOid); return FALSE; } - + if (sWepKey) { PNDIS_802_11_WEP WepData; - + HeapFree(GetProcessHeap(), 0, SetOid); SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + @@ -618,7 +620,7 @@ SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; - + /* Add the WEP key */ SetOid->Oid = OID_802_11_ADD_WEP; WepData = (PNDIS_802_11_WEP)SetOid->Data; @@ -626,7 +628,7 @@ WepData->KeyIndex = 0x80000000; WepData->KeyLength = strlen(sWepKey) >> 1; WepData->Length = FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + WepData->KeyLength; - + /* Assemble the hex key */ i = 0; while (sWepKey[i << 1] != '\0') @@ -635,7 +637,7 @@ WepData->KeyMaterial[i] |= CharToHex(sWepKey[(i << 1) + 1]); i++; } - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, SetOid, @@ -668,17 +670,17 @@ HeapFree(GetProcessHeap(), 0, SetOid); return FALSE; } - + HeapFree(GetProcessHeap(), 0, SetOid); SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + sizeof(NDIS_802_11_MAC_ADDRESS); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; - + /* Set the BSSID */ SetOid->Oid = OID_802_11_BSSID; RtlFillMemory(SetOid->Data, sizeof(NDIS_802_11_MAC_ADDRESS), 0xFF); - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, SetOid, @@ -692,20 +694,20 @@ HeapFree(GetProcessHeap(), 0, SetOid); return FALSE; } - + HeapFree(GetProcessHeap(), 0, SetOid); SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + sizeof(NDIS_802_11_SSID); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; - + /* Finally, set the SSID */ SetOid->Oid = OID_802_11_SSID; Ssid = (PNDIS_802_11_SSID)SetOid->Data; - + RtlCopyMemory(Ssid->Ssid, sSsid, strlen(sSsid)); Ssid->SsidLength = strlen(sSsid); - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, SetOid, @@ -714,9 +716,9 @@ 0, &dwBytesReturned, NULL); - + HeapFree(GetProcessHeap(), 0, SetOid); - + if (!bSuccess) return FALSE; @@ -736,7 +738,7 @@ DWORD i, j; SetOid.Oid = OID_802_11_BSSID_LIST_SCAN; - + /* Send the scan OID */ bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, @@ -748,13 +750,13 @@ NULL); if (!bSuccess) return FALSE; - + /* Allocate space for 15 networks to be returned */ QueryOidSize = sizeof(NDISUIO_QUERY_OID) + (sizeof(NDIS_WLAN_BSSID) * 15); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); if (!QueryOid) return FALSE; - + QueryOid->Oid = OID_802_11_BSSID_LIST; BssidList = (PNDIS_802_11_BSSID_LIST)QueryOid->Data; @@ -814,7 +816,7 @@ BssidInfo->Privacy == 0 ? "No" : "Yes", NetworkType == Ndis802_11IBSS ? "Adhoc" : "Infrastructure", (int)Rssi); - + for (j = 0; j < NDIS_802_11_LENGTH_RATES; j++) { Rate = BssidInfo->SupportedRates[j]; @@ -837,14 +839,14 @@ } } _tprintf(_T("\n")); - + /* Move to the next entry */ BssidInfo = (PNDIS_WLAN_BSSID)((PUCHAR)BssidInfo + BssidInfo->Length); } } - + HeapFree(GetProcessHeap(), 0, QueryOid); - + return bSuccess; } @@ -864,7 +866,7 @@ BOOL ParseCmdline(int argc, char* argv[]) { INT i; - + for (i = 1; i < argc; i++) { if (argv[i][0] == '-') @@ -920,13 +922,13 @@ if (!ParseCmdline(argc, argv)) return -1; - + if (!OpenWlanAdapter(&hAdapter, &IpInfo)) { _tprintf(_T("Unable to find a WLAN adapter on the system\n")); return -1; } - + if (bScan) { if (!WlanScan(hAdapter))

1 0

[jgardou] 57537: [WIN32K] - Accept to fill a BITMAPCOREINFO structure in NtGdiGetDIBitsInternal
by jgardou＠svn.reactos.org 11 Oct '12

11 Oct '12

Author: jgardou Date: Thu Oct 11 13:33:09 2012 New Revision: 57537 URL: http://svn.reactos.org/svn/reactos?rev=57537&view=rev Log: [WIN32K] - Accept to fill a BITMAPCOREINFO structure in NtGdiGetDIBitsInternal Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Thu Oct 11 13:33:09 2012 @@ -1014,7 +1014,7 @@ if (iUsage > 2) return 0; /* Check if the size of the bitmap info is large enough */ - if (cjMaxInfo < sizeof(BITMAPINFOHEADER)) + if (cjMaxInfo < sizeof(BITMAPCOREHEADER)) { return 0; } @@ -1048,7 +1048,7 @@ _SEH2_END; /* Check if the header size is large enough */ - if ((pbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) || + if ((pbmi->bmiHeader.biSize < sizeof(BITMAPCOREHEADER)) || (pbmi->bmiHeader.biSize > cjMaxInfo)) { goto cleanup;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs