Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[hpoussin] 36044: Replace .def file by a .spec file
by hpoussin＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: hpoussin Date: Mon Sep 8 04:48:09 2008 New Revision: 36044 URL: http://svn.reactos.org/svn/reactos?rev=36044&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/dll/win32/msgina/msgina.spec - copied, changed from r35368, trunk/reactos/dll/win32/msgina/msgina.def Removed: trunk/reactos/dll/win32/msgina/msgina.def Modified: trunk/reactos/dll/win32/msgina/msgina.rbuild Removed: trunk/reactos/dll/win32/msgina/msgina.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.de… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.def (removed) @@ -1,55 +1,0 @@ -LIBRARY msgina.dll - -EXPORTS -;MSGINA.1@0 -;MSGINA.2@0 -;MSGINA.3@0 -;MSGINA.4@0 -;MSGINA.5@0 -;MSGINA.6@0 -;MSGINA.7@0 -;MSGINA.8@0 -;MSGINA.9@0 -;MSGINA.10@0 -;MSGINA.11@0 -;MSGINA.12@0 -;MSGINA.13@0 -;MSGINA.14@0 -;MSGINA.15@0 -;MSGINA.16@0 -;MSGINA.17@0 -;MSGINA.18@0 -;MSGINA.19@0 -;MSGINA.20@0 -;MSGINA.21@0 -;MSGINA.22@0 -;MSGINA.23@0 -;MSGINA.24@0 -;MSGINA.25@0 -;MSGINA.26@0 -;MSGINA.27@0 -;MSGINA.28@0 -ShellShutdownDialog@12 -WlxActivateUserShell@16 -WlxDisplayLockedNotice@4 -WlxDisplaySASNotice@4 -WlxInitialize@20 -WlxIsLockOk@4 -WlxIsLogoffOk@4 -WlxLoggedOnSAS@12 -WlxLoggedOutSAS@32 -WlxLogoff@4 -WlxNegotiate@8 -WlxShutdown@8 -WlxWkstaLockedSAS@8 -WlxScreenSaverNotify@8 -WlxStartApplication@16 -WlxDisplayStatusMessage@20 -WlxGetStatusMessage@16 -WlxNetworkProviderLoad@8 -;WlxReconnectNotify@0 -WlxRemoveStatusMessage@4 -WlxDisconnectNotify@4 -WlxGetConsoleSwitchCredentials@8 - -; EOF Modified: trunk/reactos/dll/win32/msgina/msgina.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rb… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rbuild [iso-8859-1] Mon Sep 8 04:48:09 2008 @@ -1,5 +1,5 @@ <module name="msgina" type="win32dll" baseaddress="${BASEADDRESS_MSGINA}" installbase="system32" installname="msgina.dll"> - <importlibrary definition="msgina.def" /> + <importlibrary definition="msgina.spec.def" /> <include base="msgina">.</include> <include base="msgina">include</include> <library>ntdll</library> @@ -14,4 +14,5 @@ <file>stubs.c</file> <file>tui.c</file> <file>msgina.rc</file> + <file>msgina.spec</file> </module> Copied: trunk/reactos/dll/win32/msgina/msgina.spec (from r35368, trunk/reactos/dll/win32/msgina/msgina.def) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.sp… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] Mon Sep 8 04:48:09 2008 @@ -1,55 +1,50 @@ -LIBRARY msgina.dll - -EXPORTS -;MSGINA.1@0 -;MSGINA.2@0 -;MSGINA.3@0 -;MSGINA.4@0 -;MSGINA.5@0 -;MSGINA.6@0 -;MSGINA.7@0 -;MSGINA.8@0 -;MSGINA.9@0 -;MSGINA.10@0 -;MSGINA.11@0 -;MSGINA.12@0 -;MSGINA.13@0 -;MSGINA.14@0 -;MSGINA.15@0 -;MSGINA.16@0 -;MSGINA.17@0 -;MSGINA.18@0 -;MSGINA.19@0 -;MSGINA.20@0 -;MSGINA.21@0 -;MSGINA.22@0 -;MSGINA.23@0 -;MSGINA.24@0 -;MSGINA.25@0 -;MSGINA.26@0 -;MSGINA.27@0 -;MSGINA.28@0 -ShellShutdownDialog@12 -WlxActivateUserShell@16 -WlxDisplayLockedNotice@4 -WlxDisplaySASNotice@4 -WlxInitialize@20 -WlxIsLockOk@4 -WlxIsLogoffOk@4 -WlxLoggedOnSAS@12 -WlxLoggedOutSAS@32 -WlxLogoff@4 -WlxNegotiate@8 -WlxShutdown@8 -WlxWkstaLockedSAS@8 -WlxScreenSaverNotify@8 -WlxStartApplication@16 -WlxDisplayStatusMessage@20 -WlxGetStatusMessage@16 -WlxNetworkProviderLoad@8 -;WlxReconnectNotify@0 -WlxRemoveStatusMessage@4 -WlxDisconnectNotify@4 -WlxGetConsoleSwitchCredentials@8 - -; EOF +1 stub -noname stub1 +2 stub -noname stub2 +3 stub -noname stub3 +4 stub -noname stub4 +5 stub -noname stub5 +6 stub -noname stub6 +7 stub -noname stub7 +8 stub -noname stub8 +9 stub -noname stub9 +10 stub -noname stub10 +11 stub -noname stub11 +12 stub -noname stub12 +13 stub -noname stub13 +14 stub -noname stub14 +15 stub -noname stub15 +16 stub -noname stub16 +17 stub -noname stub17 +18 stub -noname stub18 +19 stub -noname stub19 +20 stub -noname stub20 +21 stub -noname stub21 +22 stub -noname stub22 +23 stub -noname stub23 +24 stub -noname stub24 +25 stub -noname stub25 +26 stub -noname stub26 +27 stub -noname stub27 +28 stub -noname stub28 +@ stdcall ShellShutdownDialog(ptr long long) +@ stdcall WlxActivateUserShell(ptr wstr wstr ptr) +@ stdcall WlxDisconnectNotify(ptr) +@ stdcall WlxDisplayLockedNotice(ptr) +@ stdcall WlxDisplaySASNotice(ptr) +@ stdcall WlxDisplayStatusMessage(ptr ptr long wstr wstr) +@ stdcall WlxGetConsoleSwitchCredentials(ptr ptr) +@ stdcall WlxGetStatusMessage(ptr ptr ptr long) +@ stdcall WlxInitialize(wstr ptr ptr ptr ptr) +@ stdcall WlxIsLockOk(ptr) +@ stdcall WlxIsLogoffOk(ptr) +@ stdcall WlxLoggedOnSAS(ptr long ptr) +@ stdcall WlxLoggedOutSAS(ptr long ptr ptr ptr ptr ptr ptr) +@ stdcall WlxLogoff(ptr) +@ stdcall WlxNegotiate(long ptr) +@ stdcall WlxNetworkProviderLoad(ptr ptr) +@ stub WlxReconnectNotify +@ stdcall WlxRemoveStatusMessage(ptr) +@ stdcall WlxScreenSaverNotify(ptr ptr) +@ stdcall WlxShutdown(ptr long) +@ stdcall WlxStartApplication(ptr wstr ptr wstr) +@ stdcall WlxWkstaLockedSAS(ptr long)

1 0

[cgutman] 36043: - Make sure memory allocation succeeded
by cgutman＠svn.reactos.org 07 Sep '08

07 Sep '08

Author: cgutman Date: Sun Sep 7 17:28:19 2008 New Revision: 36043 URL: http://svn.reactos.org/svn/reactos?rev=36043&view=rev Log: - Make sure memory allocation succeeded Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Sun Sep 7 17:28:19 2008 @@ -626,6 +626,13 @@ ScanLineAhead = (PIXEL *)ExAllocatePool(PagedPool, (DestRect->right - DestRect->left) * sizeof(PIXEL)); + + if (!ScanLine || !ScanLineAhead) + { + if (ScanLine) ExFreePool(ScanLine); + if (ScanLineAhead) ExFreePool(ScanLineAhead); + return FALSE; + } DestY = DestRect->top; SpanIndex = 0; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sun Sep 7 17:28:19 2008 @@ -402,6 +402,13 @@ ScanLine = (PIXEL*)ExAllocatePool(PagedPool, (DestRect->right - DestRect->left) * sizeof(PIXEL)); ScanLineAhead = (PIXEL *)ExAllocatePool(PagedPool, (DestRect->right - DestRect->left) * sizeof(PIXEL)); + if (!ScanLine || !ScanLineAhead) + { + if (ScanLine) ExFreePool(ScanLine); + if (ScanLineAhead) ExFreePool(ScanLineAhead); + return FALSE; + } + DestY = DestRect->top; SpanIndex = 0; while (NumPixels-- > 0) { Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] Sun Sep 7 17:28:19 2008 @@ -387,6 +387,13 @@ ScanLine = (PIXEL*)ExAllocatePool(PagedPool, (DestRect->right - DestRect->left) * sizeof(PIXEL)); ScanLineAhead = (PIXEL *)ExAllocatePool(PagedPool, (DestRect->right - DestRect->left) * sizeof(PIXEL)); + if (!ScanLine || !ScanLineAhead) + { + if (ScanLine) ExFreePool(ScanLine); + if (ScanLineAhead) ExFreePool(ScanLineAhead); + return FALSE; + } + DestY = DestRect->top; SpanIndex = 0; while (NumPixels-- > 0) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sun Sep 7 17:28:19 2008 @@ -558,8 +558,8 @@ if (PrimarySurface.pEDDgpl) { RtlZeroMemory( PrimarySurface.pEDDgpl ,sizeof(EDD_DIRECTDRAW_GLOBAL)); - } - ret = TRUE; + ret = TRUE; + } goto cleanup; } @@ -963,6 +963,11 @@ { // This is a cheesy way to do this. PDC dc = DC_LockDc ( hDC ); defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); + if (!defaultDCstate) + { + DC_UnlockDc( dc ); + return NULL; + } RtlZeroMemory(defaultDCstate, sizeof(DC)); IntGdiCopyToSaveState(dc, defaultDCstate); DC_UnlockDc( dc );

1 0

[cgutman] 36042: - Make sure we successfully allocated memory
by cgutman＠svn.reactos.org 07 Sep '08

07 Sep '08

Author: cgutman Date: Sun Sep 7 14:38:21 2008 New Revision: 36042 URL: http://svn.reactos.org/svn/reactos?rev=36042&view=rev Log: - Make sure we successfully allocated memory Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sun Sep 7 14:38:21 2008 @@ -861,6 +861,11 @@ ExFreePool( Kbio ); KbioLength = ResultLength; Kbio = ExAllocatePool( NonPagedPool, KbioLength ); + if( !Kbio ) { + TI_DbgPrint(DEBUG_DATALINK,("Failed to allocate memory\n")); + NtClose( EnumKey ); + return STATUS_NO_MEMORY; + } Status = ZwEnumerateKey( EnumKey, i, KeyBasicInformation, Kbio, KbioLength, &ResultLength );

1 0

[janderwald] 36041: - Acquire INetCfgLock before enumerating the items - Check if a network component is enabled for a specific network adapter - Get INetCfgComponent from the INetComponent - Use ReportView for component dialog
by janderwald＠svn.reactos.org 07 Sep '08

07 Sep '08

Author: janderwald Date: Sun Sep 7 13:28:37 2008 New Revision: 36041 URL: http://svn.reactos.org/svn/reactos?rev=36041&view=rev Log: - Acquire INetCfgLock before enumerating the items - Check if a network component is enabled for a specific network adapter - Get INetCfgComponent from the INetComponent - Use ReportView for component dialog Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Sun Sep 7 13:28:37 2008 @@ -24,6 +24,7 @@ { INetConnectionPropertyUi *lpVtbl; INetConnection * pCon; + INetCfgLock *NCfgLock; INetCfg * pNCfg; LONG ref; }INetConnectionPropertyUiImpl, *LPINetConnectionPropertyUiImpl; @@ -49,7 +50,7 @@ } VOID -AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName) +AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName, BOOL bChecked) { LVITEMW lvItem; @@ -59,20 +60,63 @@ lvItem.lParam = (LPARAM)pItem; lvItem.iItem = ListView_GetItemCount(hDlgCtrl); lvItem.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&lvItem); - ListView_SetCheckState(hDlgCtrl, lvItem.iItem, TRUE); + ListView_SetCheckState(hDlgCtrl, lvItem.iItem, bChecked); +} + +BOOL +GetINetCfgComponent(INetCfg * pNCfg, INetConnection * pNetCon, INetCfgComponent ** pOut) +{ + LPWSTR pName; + HRESULT hr; + NETCON_PROPERTIES* pProps; + INetCfgComponent * pNCg; + ULONG Fetched; + IEnumNetCfgComponent * pEnumCfg; + + hr = INetConnection_GetProperties(pNetCon, &pProps); + if (FAILED(hr)) + return FALSE; + + hr = INetCfg_EnumComponents(pNCfg, &GUID_DEVCLASS_NET, &pEnumCfg); + if (FAILED(hr)) + { + NcFreeNetconProperties(pProps); + return FALSE; + } + + while(IEnumNetCfgComponent_Next(pEnumCfg, 1, &pNCg, &Fetched) == S_OK) + { + hr = INetCfgComponent_GetDisplayName(pNCg, &pName); + if (SUCCEEDED(hr)) + { + if (!wcsicmp(pName, pProps->pszwDeviceName)) + { + *pOut = pNCg; + IEnumNetCfgComponent_Release(pEnumCfg); + NcFreeNetconProperties(pProps); + return TRUE; + } + CoTaskMemFree(pName); + } + INetCfgComponent_Release(pNCg); + } + IEnumNetCfgComponent_Release(pEnumCfg); + NcFreeNetconProperties(pProps); + return FALSE; } VOID -EnumComponents(HWND hDlgCtrl, INetCfg * pNCfg, const GUID * CompGuid, UINT Type) +EnumComponents(HWND hDlgCtrl, INetConnectionPropertyUiImpl * This, INetCfg * pNCfg, const GUID * CompGuid, UINT Type) { HRESULT hr; IEnumNetCfgComponent * pENetCfg; - INetCfgComponent *pNCfgComp; + INetCfgComponent *pNCfgComp, *pAdapterCfgComp; + INetCfgComponentBindings * pCompBind; ULONG Num; DWORD dwCharacteristics; LPOLESTR pDisplayName, pHelpText; PNET_ITEM pItem; - + BOOL bChecked; hr = INetCfg_EnumComponents(pNCfg, CompGuid, &pENetCfg); if (FAILED(hr)) @@ -92,16 +136,29 @@ pHelpText = NULL; hr = INetCfgComponent_GetDisplayName(pNCfgComp, &pDisplayName); hr = INetCfgComponent_GetHelpText(pNCfgComp, &pHelpText); - - pItem = CoTaskMemAlloc(sizeof(NET_ITEM)); - if (!pItem) - continue; + hr = INetCfgComponent_QueryInterface(pNCfgComp, &IID_INetCfgComponentBindings, (LPVOID*)&pCompBind); + + bChecked = FALSE; + if (GetINetCfgComponent(pNCfg, This->pCon, &pAdapterCfgComp)) + { + hr = INetCfgComponentBindings_IsBoundTo(pCompBind, pAdapterCfgComp); + if (hr == S_OK) + bChecked = TRUE; + else + bChecked = FALSE; + INetCfgComponent_Release(pAdapterCfgComp); + } + pItem = CoTaskMemAlloc(sizeof(NET_ITEM)); + if (!pItem) + continue; pItem->dwCharacteristics = dwCharacteristics; pItem->szHelp = pHelpText; pItem->Type = Type; pItem->pNCfgComp = pNCfgComp; pItem->NumPropDialogOpen = 0; - AddItemToListView(hDlgCtrl, pItem, pDisplayName); + + + AddItemToListView(hDlgCtrl, pItem, pDisplayName, bChecked); CoTaskMemFree(pDisplayName); } IEnumNetCfgComponent_Release(pENetCfg); @@ -113,11 +170,14 @@ { HRESULT hr; INetCfg * pNCfg; + INetCfgLock * pNCfgLock; HWND hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMPONENTSLIST); LVCOLUMNW lc; RECT rc; DWORD dwStyle; NETCON_PROPERTIES * pProperties; + LPWSTR pDisplayName; + LVITEMW li; hr = INetConnection_GetProperties(This->pCon, &pProperties); if (FAILED(hr)) @@ -155,6 +215,15 @@ if (FAILED(hr)) return; + hr = INetCfgLock_QueryInterface(pNCfg, &IID_INetCfgLock, (LPVOID*)&pNCfgLock); + hr = INetCfgLock_AcquireWriteLock(pNCfgLock, 100, L"", &pDisplayName); + if (hr == S_FALSE) + { + CoTaskMemFree(pDisplayName); + return; + } + + This->NCfgLock = pNCfgLock; hr = INetCfg_Initialize(pNCfg, NULL); if (FAILED(hr)) { @@ -162,10 +231,16 @@ return; } - EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETCLIENT, NET_TYPE_CLIENT); - EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETSERVICE, NET_TYPE_SERVICE); - EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETTRANS, NET_TYPE_PROTOCOL); + EnumComponents(hDlgCtrl, This, pNCfg, &GUID_DEVCLASS_NETCLIENT, NET_TYPE_CLIENT); + EnumComponents(hDlgCtrl, This, pNCfg, &GUID_DEVCLASS_NETSERVICE, NET_TYPE_SERVICE); + EnumComponents(hDlgCtrl, This, pNCfg, &GUID_DEVCLASS_NETTRANS, NET_TYPE_PROTOCOL); This->pNCfg = pNCfg; + + ZeroMemory(&li, sizeof(li)); + li.mask = LVIF_STATE; + li.stateMask = (UINT)-1; + li.state = LVIS_FOCUSED|LVIS_SELECTED; + (void)SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); } VOID @@ -180,8 +255,7 @@ INetConnectionPropertyUi * pConUI = NULL; INetCfgComponent * pNCfgComp; PNET_ITEM pItem; - INetCfgLock * pLock; - LPWSTR pLockApp; + WCHAR szBuffer[200]; hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMPONENTSLIST); Count = ListView_GetItemCount(hDlgCtrl); @@ -228,26 +302,15 @@ pItem = (PNET_ITEM)lvItem.lParam; pNCfgComp = (INetCfgComponent*) pItem->pNCfgComp; - hr = INetCfg_QueryInterface(This->pNCfg, &IID_INetCfgLock, (LPVOID*)&pLock); - if (FAILED(hr)) - return; - - hr = INetCfgLock_AcquireWriteLock(pLock, 10000, L"", &pLockApp); - if (FAILED(hr)) - { - CoTaskMemFree(pLockApp); - INetConnectionPropertyUi_Release(pConUI); - return; - } - - hr = INetCfgComponent_RaisePropertyUi(pNCfgComp, GetParent(hwndDlg), NCRP_QUERY_PROPERTY_UI, (IUnknown*)pConUI); if (SUCCEEDED(hr)) { hr = INetCfgComponent_RaisePropertyUi(pNCfgComp, GetParent(hwndDlg), NCRP_SHOW_PROPERTY_UI, (IUnknown*)pConUI); } - INetCfgLock_ReleaseWriteLock(pLock); + swprintf(szBuffer, L"result %08x", hr); + MessageBoxW(NULL, szBuffer, NULL, MB_OK); + INetConnectionPropertyUi_Release(pConUI); } Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Sun Sep 7 13:28:37 2008 @@ -5,7 +5,7 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List3", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP | LVS_EX_FULLROWSELECT, 9, 71, 230, 55 + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 LTEXT "Verbindung herstellen über:", -1, 9,9,217,8 EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 Modified: trunk/reactos/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Sun Sep 7 13:28:37 2008 @@ -5,7 +5,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 LTEXT "Connect Using:", -1, 9,9,217,8 EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] Sun Sep 7 13:28:37 2008 @@ -5,7 +5,7 @@ CAPTION "Îáùèå" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 LTEXT "Ïîäêëþ÷åíèå ÷åðåç:", -1, 9, 9, 217, 8 EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Íàñòðîèòü...", IDC_CONFIGURE, 174, 38, 65, 14

1 0

[janderwald] 36040: - Add IID_INetCfgComponentBindings
by janderwald＠svn.reactos.org 07 Sep '08

07 Sep '08

Author: janderwald Date: Sun Sep 7 13:01:59 2008 New Revision: 36040 URL: http://svn.reactos.org/svn/reactos?rev=36040&view=rev Log: - Add IID_INetCfgComponentBindings Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=36… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Sun Sep 7 13:01:59 2008 @@ -103,6 +103,7 @@ DEFINE_GUID(IID_IEnumNetCfgComponent, 0xC0E8AE92,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetCfg, 0xC0E8AE93,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetCfgComponent, 0xC0E8AE99,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgComponentBindings, 0xC0E8AE9E,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetCfgLock, 0xC0E8AE9F,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E);

1 0

[janderwald] 36039: - Add interfaces for netcfgx
by janderwald＠svn.reactos.org 07 Sep '08

07 Sep '08

Author: janderwald Date: Sun Sep 7 12:57:11 2008 New Revision: 36039 URL: http://svn.reactos.org/svn/reactos?rev=36039&view=rev Log: - Add interfaces for netcfgx Modified: trunk/reactos/include/psdk/netcfgx.h Modified: trunk/reactos/include/psdk/netcfgx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcfgx.h?rev… ============================================================================== --- trunk/reactos/include/psdk/netcfgx.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netcfgx.h [iso-8859-1] Sun Sep 7 12:57:11 2008 @@ -77,6 +77,168 @@ EXTERN_C const IID IID_INetCfgComponent; #undef INTERFACE +#define INTERFACE INetCfgBindingInterface +DECLARE_INTERFACE_(INetCfgBindingInterface, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,GetName)(THIS_ LPWSTR *ppszwInterfaceName) PURE; + STDMETHOD_(HRESULT,GetUpperComponent)(THIS_ INetCfgComponent **ppnccItem) PURE; + STDMETHOD_(HRESULT,GetLowerComponent)(THIS_ INetCfgComponent **ppnccItem) PURE; +}; +#undef INTERFACE + + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfgBindingInterface_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfgBindingInterface_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfgBindingInterface_Release(p) (p)->lpVtbl->Release(p) +#define INetCfgBindingInterface_GetName(p,a) (p)->lpVtbl->GetName(p) +#define INetCfgBindingInterface_GetUpperComponent(p,a) (p)->lpVtbl->GetUpperComponent(p) +#define INetCfgBindingInterface_GetLowerComponent(p,a) (p)->lpVtbl->GetLowerComponent(p) +#endif + +EXTERN_C const IID IID_INetCfgBindingInterface; + + +#undef INTERFACE +#define INTERFACE IEnumNetCfgBindingInterface +DECLARE_INTERFACE_(IEnumNetCfgBindingInterface, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,Next)(THIS_ ULONG celt, INetCfgBindingInterface **rgelt, ULONG *pceltFetched) PURE; + STDMETHOD_(HRESULT,Skip) (THIS_ ULONG celt) PURE; + STDMETHOD_(HRESULT,Reset) (THIS) PURE; + STDMETHOD_(HRESULT,Clone) (THIS_ IEnumNetCfgBindingInterface **ppenum) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IEnumNetCfgBindingInterface_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IEnumNetCfgBindingInterface_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IEnumNetCfgBindingInterface_Release(p) (p)->lpVtbl->Release(p) +#define IEnumNetCfgBindingInterface_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) +#define IEnumNetCfgBindingInterface_Skip(p,a) (p)->lpVtbl->Skip(p,a) +#define IEnumNetCfgBindingInterface_Reset(p) (p)->lpVtbl->Reset(p) +#define IEnumNetCfgBindingInterface_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif + +EXTERN_C const IID IID_IEnumNetCfgBindingInterface; + +#undef INTERFACE +#define INTERFACE INetCfgBindingPath +DECLARE_INTERFACE_(INetCfgBindingPath, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,IsSamePathAs)(THIS_ INetCfgBindingPath *pPath) PURE; + STDMETHOD_(HRESULT,IsSubPathOf)(THIS_ INetCfgBindingPath *pPath) PURE; + STDMETHOD_(HRESULT,IsEnabled) (THIS) PURE; + STDMETHOD_(HRESULT,Enable) (THIS_ BOOL fEnable) PURE; + STDMETHOD_(HRESULT,GetPathToken) (THIS_ LPWSTR *ppszwPathToken) PURE; + STDMETHOD_(HRESULT,GetOwner)(THIS_ INetCfgComponent **ppComponent) PURE; + STDMETHOD_(HRESULT,GetDepth)(THIS_ ULONG *pcInterfaces) PURE; + STDMETHOD_(HRESULT,EnumBindingInterfaces)(THIS_ IEnumNetCfgBindingInterface **ppenumInterface) PURE; +}; + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfgBindingPath_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfgBindingPath_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfgBindingPath_Release(p) (p)->lpVtbl->Release(p) +#define INetCfgBindingPath_IsSamePathAs(p,a) (p)->lpVtbl->IsSamePathAs(p,a) +#define INetCfgBindingPath_IsSubPathOf(p,a) (p)->lpVtbl->IsSubPathOf(p,a) +#define INetCfgBindingPath_IsEnabled(p) (p)->lpVtbl->IsEnabled(p) +#define INetCfgBindingPath_Enable(p,a) (p)->lpVtbl->Enable(p,a) +#define INetCfgBindingPath_GetPathToken(p,a) (p)->lpVtbl->GetPathToken(p,a) +#define INetCfgBindingPath_GetOwner(p,a) (p)->lpVtbl->GetOwner(p,a) +#define INetCfgBindingPath_GetDepth(p,a) (p)->lpVtbl->GetDepth(p,a) +#define INetCfgBindingPath_EnumBindingInterfaces(p,a) (p)->lpVtbl->EnumBindingInterfaces(p,a) +#endif + +EXTERN_C const IID IID_INetCfgBindingPath; + +#undef INTERFACE +#define INTERFACE IEnumNetCfgBindingPath +DECLARE_INTERFACE_(IEnumNetCfgBindingPath, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,Next)(THIS_ ULONG celt, INetCfgBindingPath **rgelt, ULONG *pceltFetched) PURE; + STDMETHOD_(HRESULT,Skip)(THIS_ ULONG celt) PURE; + STDMETHOD_(HRESULT,Reset)(THIS) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ IEnumNetCfgBindingPath **ppenum) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IEnumNetCfgBindingPath_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IEnumNetCfgBindingPath_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IEnumNetCfgBindingPath_Release(p) (p)->lpVtbl->Release(p) +#define IEnumNetCfgBindingPath_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) +#define IEnumNetCfgBindingPath_Skip(p,a) (p)->lpVtbl->Skip(p,a) +#define IEnumNetCfgBindingPath_Reset(p) (p)->lpVtbl->Reset(p) +#define IEnumNetCfgBindingPath_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif + +EXTERN_C const IID IID_IEnumNetCfgBindingPath; + +typedef enum +{ + NCF_LOWER = 0x1, + NCF_UPPER = 0x2 +}SUPPORTS_BINDING_INTERFACE_FLAGS; + +typedef enum +{ + EBP_ABOVE = 0x1, + EBP_BELOW = 0x2 +}ENUM_BINDING_PATHS_FLAGS; + +#undef INTERFACE +#define INTERFACE INetCfgComponentBindings +DECLARE_INTERFACE_(INetCfgComponentBindings, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,BindTo)(THIS_ INetCfgComponent *pnccItem) PURE; + STDMETHOD_(HRESULT,UnbindFrom)(THIS_ INetCfgComponent *pnccItem) PURE; + STDMETHOD_(HRESULT,SupportsBindingInterface)(THIS_ DWORD dwFlags, LPCWSTR pszwInterfaceName) PURE; + STDMETHOD_(HRESULT,IsBoundTo)(THIS_ INetCfgComponent *pnccItem) PURE; + STDMETHOD_(HRESULT,IsBindableTo)(THIS_ INetCfgComponent *pnccItem) PURE; + STDMETHOD_(HRESULT,EnumBindingPaths)(THIS_ DWORD dwFlags, IEnumNetCfgBindingPath **ppIEnum) PURE; + STDMETHOD_(HRESULT,MoveBefore)(THIS_ DWORD dwFlags, INetCfgBindingPath *pncbItemSrc, INetCfgBindingPath *pncbItemDest) PURE; + STDMETHOD_(HRESULT,MoveAfter)(THIS_ DWORD dwFlags, INetCfgBindingPath *pncbItemSrc, INetCfgBindingPath *pncbItemDest) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfgComponentBindings_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfgComponentBindings_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfgComponentBindings_Release(p) (p)->lpVtbl->Release(p) +#define INetCfgComponentBindings_BindTo(p,a) (p)->lpVtbl->BindTo(p,a) +#define INetCfgComponentBindings_UnbindFrom(p,a) (p)->lpVtbl->UnbindFrom(p,a) +#define INetCfgComponentBindings_SupportsBindingInterface(p,a,b) (p)->lpVtbl->UnbindFrom(p,a,b) +#define INetCfgComponentBindings_IsBoundTo(p,a) (p)->lpVtbl->IsBoundTo(p,a) +#define INetCfgComponentBindings_IsBindableTo(p,a) (p)->lpVtbl->IsBindableTo(p,a) +#define INetCfgComponentBindings_EnumBindingPaths(p,a,b) (p)->lpVtbl->EnumBindingPaths(p,a,b) +#define INetCfgComponentBindings_MoveBefore(p,a,b,c) (p)->lpVtbl->MoveBefore(p,a,b,c) +#define INetCfgComponentBindings_MoveAfter(p,a,b,c) (p)->lpVtbl->MoveAfter(p,a,b,c) +#endif + +EXTERN_C const IID IID_INetCfgComponentBindings; + +#undef INTERFACE #define INTERFACE IEnumNetCfgComponent DECLARE_INTERFACE_(IEnumNetCfgComponent, IUnknown) {

1 0

[sginsberg] 36038: - Patch by Cameron "aicom" Gutman: Ensure allocation succeeded and wrap MmProbeAndLockPages in SEH
by sginsberg＠svn.reactos.org 07 Sep '08

07 Sep '08

Author: sginsberg Date: Sun Sep 7 12:31:09 2008 New Revision: 36038 URL: http://svn.reactos.org/svn/reactos?rev=36038&view=rev Log: - Patch by Cameron "aicom" Gutman: Ensure allocation succeeded and wrap MmProbeAndLockPages in SEH Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sun Sep 7 12:31:09 2008 @@ -359,14 +359,41 @@ /* Allocate a Kernel Profile Object. */ ProfileObject = ExAllocatePoolWithTag(NonPagedPool, - sizeof(EPROFILE), - TAG_PROFILE); + sizeof(EPROFILE), + TAG_PROFILE); + if (!ProfileObject) + { + /* Out of memory, fail */ + KeReleaseMutex(&ExpProfileMutex, FALSE); + ObDereferenceObject(Profile); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Allocate the Mdl Structure */ Profile->Mdl = MmCreateMdl(NULL, Profile->Buffer, Profile->BufferSize); - /* Probe and Lock for Write Access */ - MmProbeAndLockPages(Profile->Mdl, PreviousMode, IoWriteAccess); + /* Protect this in SEH as we might raise an exception */ + _SEH_TRY + { + /* Probe and Lock for Write Access */ + MmProbeAndLockPages(Profile->Mdl, PreviousMode, IoWriteAccess); + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Fail if we raised an exception */ + if (!NT_SUCCESS(Status)) + { + /* Release our lock, free the buffer, dereference and return */ + KeReleaseMutex(&ExpProfileMutex, FALSE); + ObDereferenceObject(Profile); + ExFreePool(ProfileObject); + return Status; + } /* Map the pages */ TempLockedBufferAddress = MmMapLockedPages(Profile->Mdl, KernelMode);

1 0

[pschweitzer] 36037: Patch by Cameron Gutman: Encapsulate MmProbeAndLockPages call inside a SEH block
by pschweitzer＠svn.reactos.org 07 Sep '08

07 Sep '08

Author: pschweitzer Date: Sun Sep 7 11:14:36 2008 New Revision: 36037 URL: http://svn.reactos.org/svn/reactos?rev=36037&view=rev Log: Patch by Cameron Gutman: Encapsulate MmProbeAndLockPages call inside a SEH block Modified: branches/pierre-fsd/drivers/filesystems/fastfat/misc.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/misc.c [iso-8859-1] Sun Sep 7 11:14:36 2008 @@ -258,6 +258,8 @@ NTSTATUS VfatLockUserBuffer(IN PIRP Irp, IN ULONG Length, IN LOCK_OPERATION Operation) { + NTSTATUS Status = STATUS_SUCCESS; + ASSERT(Irp); if (Irp->MdlAddress) @@ -272,9 +274,13 @@ return STATUS_INSUFFICIENT_RESOURCES; } - MmProbeAndLockPages(Irp->MdlAddress, Irp->RequestorMode, Operation); - - return STATUS_SUCCESS; -} - - + _SEH_TRY { + MmProbeAndLockPages(Irp->MdlAddress, Irp->RequestorMode, Operation); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + return Status; +} + +

1 0

[pschweitzer] 36036: Synced urlmon_winetest.exe with Wine HEAD
by pschweitzer＠svn.reactos.org 07 Sep '08

07 Sep '08

Author: pschweitzer Date: Sun Sep 7 10:13:38 2008 New Revision: 36036 URL: http://svn.reactos.org/svn/reactos?rev=36036&view=rev Log: Synced urlmon_winetest.exe with Wine HEAD Modified: trunk/rostests/winetests/urlmon/protocol.c trunk/rostests/winetests/urlmon/stream.c trunk/rostests/winetests/urlmon/testlist.c trunk/rostests/winetests/urlmon/url.c Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Sun Sep 7 10:13:38 2008 @@ -28,8 +28,6 @@ #include "ole2.h" #include "urlmon.h" #include "wininet.h" - -#include "initguid.h" #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE Modified: trunk/rostests/winetests/urlmon/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/stream.c… ============================================================================== --- trunk/rostests/winetests/urlmon/stream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/stream.c [iso-8859-1] Sun Sep 7 10:13:38 2008 @@ -76,6 +76,7 @@ DEFINE_EXPECT(OnDataAvailable); DEFINE_EXPECT(GetBindInfo); +static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static WCHAR INDEX_HTML[MAX_PATH]; static const char szHtmlDoc[] = "<HTML></HTML>"; @@ -260,26 +261,22 @@ static IBindStatusCallback BindStatusCallback = { &BindStatusCallbackVtbl }; -static void set_file_url(void) -{ - int len; - - static const WCHAR wszFile[] = {'f','i','l','e',':','/','/'}; - - memcpy(INDEX_HTML, wszFile, sizeof(wszFile)); - len = sizeof(wszFile)/sizeof(WCHAR); - INDEX_HTML[len++] = '/'; - len += GetCurrentDirectoryW(sizeof(INDEX_HTML)/sizeof(WCHAR)-len, INDEX_HTML+len); - INDEX_HTML[len++] = '\\'; - memcpy(INDEX_HTML+len, wszIndexHtml, sizeof(wszIndexHtml)); +static void set_file_url(char *path) +{ + char INDEX_HTML_A[MAX_PATH]; + + lstrcpyA(INDEX_HTML_A, "file:///"); + lstrcatA(INDEX_HTML_A, path); + MultiByteToWideChar(CP_ACP, 0, INDEX_HTML_A, -1, INDEX_HTML, MAX_PATH); } static void create_file(void) { HANDLE file; DWORD size; - - file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + CHAR path[MAX_PATH]; + + file = CreateFileA(wszIndexHtmlA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); if(file == INVALID_HANDLE_VALUE) @@ -288,7 +285,10 @@ WriteFile(file, szHtmlDoc, sizeof(szHtmlDoc)-1, &size, NULL); CloseHandle(file); - set_file_url(); + GetCurrentDirectoryA(MAX_PATH, path); + lstrcatA(path, "\\"); + lstrcatA(path, wszIndexHtmlA); + set_file_url(path); } static void test_URLOpenBlockingStreamW(void) @@ -370,5 +370,5 @@ create_file(); test_URLOpenBlockingStreamW(); test_URLOpenStreamW(); - DeleteFileW(wszIndexHtml); -} + DeleteFileA(wszIndexHtmlA); +} Modified: trunk/rostests/winetests/urlmon/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/testlist… ============================================================================== --- trunk/rostests/winetests/urlmon/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/testlist.c [iso-8859-1] Sun Sep 7 10:13:38 2008 @@ -6,18 +6,8 @@ #define STANDALONE #include "wine/test.h" -extern void func_generated(void); -extern void func_misc(void); -extern void func_protocol(void); -extern void func_stream(void); -extern void func_url(void); const struct test winetest_testlist[] = { - { "generated", func_generated }, - { "misc", func_misc }, - { "protocol", func_protocol }, - { "stream", func_stream }, - { "url", func_url }, { 0, 0 } }; Modified: trunk/rostests/winetests/urlmon/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/url.c [iso-8859-1] Sun Sep 7 10:13:38 2008 @@ -28,11 +28,16 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "urlmon.h" #include "wininet.h" #include "mshtml.h" #include "wine/test.h" + +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -154,8 +159,6 @@ static IInternetProtocolSink *protocol_sink = NULL; static HANDLE complete_event, complete_event2; static HRESULT binding_hres; - -extern IID IID_IBindStatusCallbackHolder; static LPCWSTR urls[] = { WINE_ABOUT_URL,

1 0

[pschweitzer] 36035: Synced urlmon.dll with Wine HEAD
by pschweitzer＠svn.reactos.org 07 Sep '08

07 Sep '08

Author: pschweitzer Date: Sun Sep 7 10:13:12 2008 New Revision: 36035 URL: http://svn.reactos.org/svn/reactos?rev=36035&view=rev Log: Synced urlmon.dll with Wine HEAD Modified: trunk/reactos/dll/win32/urlmon/umon.c Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Sun Sep 7 10:13:12 2008 @@ -189,7 +189,7 @@ BINDSTATUS_BEGINDOWNLOADDATA : BINDSTATUS_DOWNLOADINGDATA, This->URLName); - if (!hr) + if (hr == S_OK) { STGMEDIUM stg; FORMATETC fmt;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
75
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 September 2008