Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[tkreuzer] 41418: - Fix definition of RTL_HANDLE_TABLE_ENTRY - Fix check in RtlFreeHandle and add a DPRINT - Fixes the last ntdll:rtl winetest
by tkreuzer＠svn.reactos.org 15 Jun '09

15 Jun '09

Author: tkreuzer Date: Mon Jun 15 18:49:31 2009 New Revision: 41418 URL: http://svn.reactos.org/svn/reactos?rev=41418&view=rev Log: - Fix definition of RTL_HANDLE_TABLE_ENTRY - Fix check in RtlFreeHandle and add a DPRINT - Fixes the last ntdll:rtl winetest Modified: trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/handle.c Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Mon Jun 15 18:49:31 2009 @@ -958,8 +958,11 @@ // typedef struct _RTL_HANDLE_TABLE_ENTRY { - ULONG Flags; - struct _RTL_HANDLE_TABLE_ENTRY *NextFree; + union + { + ULONG Flags; + struct _RTL_HANDLE_TABLE_ENTRY *NextFree; + }; } RTL_HANDLE_TABLE_ENTRY, *PRTL_HANDLE_TABLE_ENTRY; typedef struct _RTL_HANDLE_TABLE Modified: trunk/reactos/lib/rtl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/handle.c?rev=41418… ============================================================================== --- trunk/reactos/lib/rtl/handle.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/handle.c [iso-8859-1] Mon Jun 15 18:49:31 2009 @@ -127,8 +127,12 @@ { #ifdef DBG /* check if handle is valid */ - if (RtlIsValidHandle(HandleTable, Handle)) + if (!RtlIsValidHandle(HandleTable, Handle)) + { + DPRINT1("Invalid Handle! HandleTable=0x%p, Handle=0x%p, Handle->Flags=0x%x\n", + HandleTable, Handle, Handle ? Handle->Flags : 0); return FALSE; + } #endif /* clear handle */

1 0

[khornicek] 41417: - import dmusic from Wine, it's mostly stubs but it should be enough for now
by khornicek＠svn.reactos.org 15 Jun '09

15 Jun '09

Author: khornicek Date: Mon Jun 15 17:52:04 2009 New Revision: 41417 URL: http://svn.reactos.org/svn/reactos?rev=41417&view=rev Log: - import dmusic from Wine, it's mostly stubs but it should be enough for now Added: trunk/reactos/dll/directx/dmusic/ trunk/reactos/dll/directx/dmusic/buffer.c (with props) trunk/reactos/dll/directx/dmusic/clock.c (with props) trunk/reactos/dll/directx/dmusic/collection.c (with props) trunk/reactos/dll/directx/dmusic/dmusic.c (with props) trunk/reactos/dll/directx/dmusic/dmusic.rbuild (with props) trunk/reactos/dll/directx/dmusic/dmusic.spec (with props) trunk/reactos/dll/directx/dmusic/dmusic_main.c (with props) trunk/reactos/dll/directx/dmusic/dmusic_private.h (with props) trunk/reactos/dll/directx/dmusic/download.c (with props) trunk/reactos/dll/directx/dmusic/downloadedinstrument.c (with props) trunk/reactos/dll/directx/dmusic/instrument.c (with props) trunk/reactos/dll/directx/dmusic/port.c (with props) trunk/reactos/dll/directx/dmusic/regsvr.c (with props) trunk/reactos/dll/directx/dmusic/version.rc (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/directx/directx.rbuild trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… Added: trunk/reactos/dll/directx/dmusic/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/buffer.… Added: trunk/reactos/dll/directx/dmusic/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/clock.c… Added: trunk/reactos/dll/directx/dmusic/collection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/collect… Added: trunk/reactos/dll/directx/dmusic/dmusic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/dmusic.… Added: trunk/reactos/dll/directx/dmusic/dmusic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/dmusic.… Added: trunk/reactos/dll/directx/dmusic/dmusic.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/dmusic.… Added: trunk/reactos/dll/directx/dmusic/dmusic_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/dmusic_… Added: trunk/reactos/dll/directx/dmusic/dmusic_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/dmusic_… Added: trunk/reactos/dll/directx/dmusic/download.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/downloa… Added: trunk/reactos/dll/directx/dmusic/downloadedinstrument.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/downloa… Added: trunk/reactos/dll/directx/dmusic/instrument.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/instrum… Added: trunk/reactos/dll/directx/dmusic/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/port.c?… Added: trunk/reactos/dll/directx/dmusic/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/regsvr.… Added: trunk/reactos/dll/directx/dmusic/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/version… Modified: trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/dxguid-ming… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[fireball] 41416: - Don't reinitialize in case of error. Fixes a "DPC > 1 sec" problem related to an infinite loop in usbdriver.
by fireball＠svn.reactos.org 15 Jun '09

15 Jun '09

Author: fireball Date: Mon Jun 15 17:48:55 2009 New Revision: 41416 URL: http://svn.reactos.org/svn/reactos?rev=41416&view=rev Log: - Don't reinitialize in case of error. Fixes a "DPC > 1 sec" problem related to an infinite loop in usbdriver. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c [iso-8859-1] Mon Jun 15 17:48:55 2009 @@ -768,9 +768,6 @@ if (port_idx) hub_check_reset_port_status(pdev, port_idx); - - //reinitialize the int request, here to reduce some uncertainty of concurrency - hub_start_int_request(pdev); } } return;

1 0

[fireball] 41415: - Fix NULL pointer access in an error branch inside hub_clear_port_feature_completion(). Thanks to Christoph for testing.
by fireball＠svn.reactos.org 15 Jun '09

15 Jun '09

Author: fireball Date: Mon Jun 15 17:30:50 2009 New Revision: 41415 URL: http://svn.reactos.org/svn/reactos?rev=41415&view=rev Log: - Fix NULL pointer access in an error branch inside hub_clear_port_feature_completion(). Thanks to Christoph for testing. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c [iso-8859-1] Mon Jun 15 17:30:50 2009 @@ -762,10 +762,15 @@ // // do not think the device is workable, no requests to it any more. // including the int polling - // - // usb_free_mem( purb ); - // - goto LBL_SCAN_PORT_STAT; + + if (purb) + usb_free_mem(purb); + + if (port_idx) + hub_check_reset_port_status(pdev, port_idx); + + //reinitialize the int request, here to reduce some uncertainty of concurrency + hub_start_int_request(pdev); } } return;

1 0

[dchapyshev] 41414: - Add target process reference/dereference in ProcessLdtInformation/ProcessWorkingSetWatch/ProcessWx86Information cases of NtQueryInformationProcess.
by dchapyshev＠svn.reactos.org 15 Jun '09

15 Jun '09

Author: dchapyshev Date: Mon Jun 15 11:05:19 2009 New Revision: 41414 URL: http://svn.reactos.org/svn/reactos?rev=41414&view=rev Log: - Add target process reference/dereference in ProcessLdtInformation/ProcessWorkingSetWatch/ProcessWx86Information cases of NtQueryInformationProcess. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Mon Jun 15 11:05:19 2009 @@ -304,7 +304,20 @@ case ProcessLdtInformation: case ProcessWorkingSetWatch: case ProcessWx86Information: + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) break; + DPRINT1("Not implemented: %lx\n", ProcessInformationClass); + + /* Dereference the process */ + ObDereferenceObject(Process); Status = STATUS_NOT_IMPLEMENTED; break;

1 0

[dgorbachev] 41413: Dutch translation of NetID DLL by Oscar van Egmond. Bug #4606.
by dgorbachev＠svn.reactos.org 14 Jun '09

14 Jun '09

Author: dgorbachev Date: Sun Jun 14 22:36:35 2009 New Revision: 41413 URL: http://svn.reactos.org/svn/reactos?rev=41413&view=rev Log: Dutch translation of NetID DLL by Oscar van Egmond. Bug #4606. Added: trunk/reactos/dll/win32/netid/lang/nl-NL.rc (with props) Modified: trunk/reactos/dll/win32/netid/lang/fr-FR.rc (props changed) trunk/reactos/dll/win32/netid/rsrc.rc Propchange: trunk/reactos/dll/win32/netid/lang/fr-FR.rc ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Added: trunk/reactos/dll/win32/netid/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/nl-NL… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/nl-NL.rc (added) +++ trunk/reactos/dll/win32/netid/lang/nl-NL.rc [iso-8859-1] Sun Jun 14 22:36:35 2009 @@ -1,0 +1,74 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Computernaam" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "ReactOS gebruikt de volgende informatie om uw computer te indentificeren op het netwerk.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "Computerbeschrijving:", IDC_STATIC, 6, 40, 90, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Volledige computernaam:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "(Standaard)", IDC_COMPUTERNAME, 98, 68, 144, 11 + LTEXT "Werkgroep:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "(leeg)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 + LTEXT "Om de Netwerk Indentificatie wizard te gebruiken, word lid van een domein en maak een lokale gebruiker aan en klik op ""Network ID"".", IDC_STATIC, 6, 113, 172, 24 + PUSHBUTTON "&Netwerk ID...", IDC_NETWORK_ID, 190, 114, 58, 15 + LTEXT "Om deze computer te hernoemen of om lid te worden van een domein, klik op ""Change"".", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "&Wijzigen...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 + LTEXT "Let op: Alleen Administrators mogen de indentificatie van deze computer aanpassen.", IDC_STATIC, 6, 179, 300, 9 +END + +IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Computernaam Wijzigen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "&Computernaam:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Volledige Computernaam:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&Meer...", 1003, 150, 102, 75, 14 + GROUPBOX "Lid van", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domein:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Werkgroep:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Vind mijn domein", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "Oke", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Annuleren", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Achtervoegsel en NetBIOS Computernaam" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primaire DNS Achtervoegsel van deze computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Wijzig de primaire DNS achtervoegsel wanneer de domein Lidmaatschap veranderd", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computernaam:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "Oke", 1, 153, 104, 50, 14 + PUSHBUTTON "Annuleren", 2, 209, 104, 50, 14 + LTEXT "Deze naam word gebruikt voor interoperabiliteit met oudere computers en services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Onbekend *" + 2 "WERKGROEP" + 3 "De volgende foutmelding is voorgekomen tijdens het lezen van domein lidmaatschap informatie:" + 4 "Computernaam Wijzigingen" + 5 "Werkgroep:" + 6 "Domein:" + 22 "Welkom bij de werkgoep %1." + 23 "Welkom bij het domein %1." + 24 "U moet de computer herstarten om de wijzigingen van kracht te laten gaan." + 1021 "Let op: Alleen Administrators mogen de indentificatie van deze computer aanpassen." + 1022 "Let op: De indentificatie van deze computer kan niet gewijzigd worden omdat:" + 3210 "&Details >>" + 3220 "<< &Details" +END Propchange: trunk/reactos/dll/win32/netid/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… ============================================================================== --- trunk/reactos/dll/win32/netid/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/rsrc.rc [iso-8859-1] Sun Jun 14 22:36:35 2009 @@ -3,13 +3,14 @@ #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" -#include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc"

1 0

[dchapyshev] 41412: - Fix one "kernel32_winetest mailslot" test
by dchapyshev＠svn.reactos.org 14 Jun '09

14 Jun '09

Author: dchapyshev Date: Sun Jun 14 21:44:22 2009 New Revision: 41412 URL: http://svn.reactos.org/svn/reactos?rev=41412&view=rev Log: - Fix one "kernel32_winetest mailslot" test Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ma… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] Sun Jun 14 21:44:22 2009 @@ -109,6 +109,11 @@ nMaxMessageSize, &DefaultTimeOut); + if (Status == STATUS_INVALID_DEVICE_REQUEST) + { + Status = STATUS_OBJECT_NAME_INVALID; + } + RtlFreeHeap(RtlGetProcessHeap(), 0, MailslotName.Buffer);

1 0

[dchapyshev] 41411: - Fix one "kernel32_winetest thread"
by dchapyshev＠svn.reactos.org 14 Jun '09

14 Jun '09

Author: dchapyshev Date: Sun Jun 14 20:51:48 2009 New Revision: 41411 URL: http://svn.reactos.org/svn/reactos?rev=41411&view=rev Log: - Fix one "kernel32_winetest thread" Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Sun Jun 14 20:51:48 2009 @@ -697,7 +697,7 @@ return -1; } - return dwIdealProcessor; + return (DWORD)Status; } /*

1 0

[cwittich] 41410: add missing include guard
by cwittich＠svn.reactos.org 14 Jun '09

14 Jun '09

Author: cwittich Date: Sun Jun 14 19:33:12 2009 New Revision: 41410 URL: http://svn.reactos.org/svn/reactos?rev=41410&view=rev Log: add missing include guard Modified: trunk/reactos/include/psdk/windot11.h Modified: trunk/reactos/include/psdk/windot11.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windot11.h?re… ============================================================================== --- trunk/reactos/include/psdk/windot11.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windot11.h [iso-8859-1] Sun Jun 14 19:33:12 2009 @@ -1,7 +1,9 @@ #ifndef __WINDOT11_H__ #define __WINDOT11_H__ +#ifndef _NTDDNDIS_ #include <ntddndis.h> +#endif #include <wlantypes.h> /* Enumerations */

1 0

[spetreolle] 41409: Cleanup GetAdaptersAddresses. Add GetIfTable2 and GetIfEntry2 stubs based on janderwald patch
by spetreolle＠svn.reactos.org 14 Jun '09

14 Jun '09

Author: spetreolle Date: Sun Jun 14 18:10:32 2009 New Revision: 41409 URL: http://svn.reactos.org/svn/reactos?rev=41409&view=rev Log: Cleanup GetAdaptersAddresses. Add GetIfTable2 and GetIfEntry2 stubs based on janderwald patch Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] Sun Jun 14 18:10:32 2009 @@ -1,6 +1,6 @@ <module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true" unicode="yes" crt="msvcrt"> <importlibrary definition="iphlpapi.spec" /> - <include base="iphlpapi">include</include> + <include base="iphlpapi">.</include> <include base="ReactOS">include/reactos/wine</include> <library>wine</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] Sun Jun 14 18:10:32 2009 @@ -40,8 +40,10 @@ @ stub GetIcmpStatsFromStack @ stub GetIcmpStatsFromStackEx @ stdcall GetIfEntry( ptr ) +@ stdcall GetIfEntry2( ptr ) @ stub GetIfEntryFromStack @ stdcall GetIfTable( ptr ptr long ) +@ stdcall GetIfTable2(ptr) @ stub GetIfTableFromStack @ stub GetIgmpList @ stdcall GetInterfaceInfo( ptr ptr ) Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Sun Jun 14 18:10:32 2009 @@ -2179,7 +2179,19 @@ DWORD WINAPI GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen) { if (!pOutBufLen) return ERROR_INVALID_PARAMETER; - + if (!pAdapterAddresses || *pOutBufLen == 0) + return ERROR_BUFFER_OVERFLOW; + if (Reserved) return ERROR_INVALID_PARAMETER; + + FIXME(":stub\n"); + return ERROR_NO_DATA; +} + +/* + * @unimplemented + */ +BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED notifyOverlapped) +{ FIXME(":stub\n"); return 0L; } @@ -2187,7 +2199,7 @@ /* * @unimplemented */ -BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED notifyOverlapped) +DWORD WINAPI GetBestInterfaceEx(struct sockaddr *pDestAddr,PDWORD pdwBestIfIndex) { FIXME(":stub\n"); return 0L; @@ -2196,7 +2208,7 @@ /* * @unimplemented */ -DWORD WINAPI GetBestInterfaceEx(struct sockaddr *pDestAddr,PDWORD pdwBestIfIndex) +DWORD WINAPI NhpAllocateAndGetInterfaceInfoFromStack(IP_INTERFACE_NAME_INFO **ppTable,PDWORD pdwCount,BOOL bOrder,HANDLE hHeap,DWORD dwFlags) { FIXME(":stub\n"); return 0L; @@ -2205,19 +2217,39 @@ /* * @unimplemented */ -DWORD WINAPI NhpAllocateAndGetInterfaceInfoFromStack(IP_INTERFACE_NAME_INFO **ppTable,PDWORD pdwCount,BOOL bOrder,HANDLE hHeap,DWORD dwFlags) +DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX pStats,DWORD dwFamily) { FIXME(":stub\n"); return 0L; } -/* - * @unimplemented - */ -DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX pStats,DWORD dwFamily) -{ - FIXME(":stub\n"); - return 0L; -} - - +/****************************************************************** + * GetIfTable2 (IPHLPAPI.@) + * + * PARAMS + * pIfTable [In/Out] + */ + +NETIOAPI_API WINAPI GetIfTable2(PMIB_IF_TABLE2 *pIfTable) +{ + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + +/****************************************************************** + * GetIfEntry2 (IPHLPAPI.@) + * + * PARAMS + * pIfRow [In/Out] + */ +NETIOAPI_API WINAPI GetIfEntry2(IN OUT PMIB_IF_ROW2 pIfRow) +{ + TRACE("pIfRow %p\n", pIfRow); + if (!pIfRow) + return ERROR_INVALID_PARAMETER; + + UNIMPLEMENTED; + return ERROR_NOT_SUPPORTED; +} + + Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sun Jun 14 18:10:32 2009 @@ -23,6 +23,7 @@ #define _WIN32_WINNT 0x500 #define WIN32_NO_STATUS #include <winsock2.h> +#include <ws2tcpip.h> #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> @@ -32,6 +33,7 @@ #include "resinfo.h" #include "wine/debug.h" +//#include "ntddndis.h" #include "ddk/tdiinfo.h" #include "tcpioctl.h"

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009