Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 60219: Fix dxdiag with the help of hbelusca and the nice trick he uses to get the dialog colorization done right.
by dreimer＠svn.reactos.org 19 Sep '13

19 Sep '13

Author: dreimer Date: Thu Sep 19 22:05:19 2013 New Revision: 60219 URL: http://svn.reactos.org/svn/reactos?rev=60219&view=rev Log: Fix dxdiag with the help of hbelusca and the nice trick he uses to get the dialog colorization done right. Modified: trunk/reactos/base/applications/dxdiag/display.c trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/sound.c Modified: trunk/reactos/base/applications/dxdiag/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] Thu Sep 19 22:05:19 2013 @@ -339,7 +339,7 @@ break; pContext->hDisplayWnd = hDlgs; - hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext); + hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext); EnableDialogTheme(hwndDlg); if (!hwndDlg) break; Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Thu Sep 19 22:05:19 2013 @@ -13,6 +13,61 @@ HINSTANCE hInst = 0; HWND hTabCtrlWnd; +//////////////////////////////////////////////////////////////////////////////// +// Taken from WinSpy++ 1.7 +// http://www.catch22.net/software/winspy +// Copyright (c) 2002 by J Brown +// + +// +// Copied from uxtheme.h +// If you have this new header, then delete these and +// #include <uxtheme.h> instead! +// +#define ETDT_DISABLE 0x00000001 +#define ETDT_ENABLE 0x00000002 +#define ETDT_USETABTEXTURE 0x00000004 +#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) + +// +typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD); + +// +// Try to call EnableThemeDialogTexture, if uxtheme.dll is present +// +BOOL EnableDialogTheme(HWND hwnd) +{ + HMODULE hUXTheme; + ETDTProc fnEnableThemeDialogTexture; + + hUXTheme = LoadLibraryA("uxtheme.dll"); + + if(hUXTheme) + { + fnEnableThemeDialogTexture = + (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture"); + + if(fnEnableThemeDialogTexture) + { + fnEnableThemeDialogTexture(hwnd, ETDT_ENABLETAB); + + FreeLibrary(hUXTheme); + return TRUE; + } + else + { + // Failed to locate API! + FreeLibrary(hUXTheme); + return FALSE; + } + } + else + { + // Not running under XP? Just fail gracefully + return FALSE; + } +} + //--------------------------------------------------------------- VOID DestroyTabCtrlDialogs(PDXDIAG_CONTEXT pContext) @@ -119,11 +174,11 @@ pContext->hTabCtrl = hTabCtrlWnd; /* create the dialogs */ - pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), pContext->hMainDialog, SystemPageWndProc, (LPARAM)pContext); - pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), pContext->hMainDialog, MusicPageWndProc, (LPARAM)pContext); - pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), pContext->hMainDialog, InputPageWndProc, (LPARAM)pContext); - pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), pContext->hMainDialog, NetworkPageWndProc, (LPARAM)pContext); - pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), pContext->hMainDialog, HelpPageWndProc, (LPARAM)pContext); + pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), pContext->hMainDialog, SystemPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[0]); + pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), pContext->hMainDialog, MusicPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[1]); + pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), pContext->hMainDialog, InputPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[2]); + pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), pContext->hMainDialog, NetworkPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[3]); + pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), pContext->hMainDialog, HelpPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[4]); /* insert tab ctrl items */ InsertTabCtrlItem(hTabCtrlWnd, 0, MAKEINTRESOURCEW(IDS_SYSTEM_DIALOG)); Modified: trunk/reactos/base/applications/dxdiag/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/p… ============================================================================== --- trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] Thu Sep 19 22:05:19 2013 @@ -42,6 +42,9 @@ /* globals */ extern HINSTANCE hInst; +/* theming hack */ +BOOL EnableDialogTheme(HWND hwnd); + /* dialog wnd proc */ INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK DisplayPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/base/applications/dxdiag/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… ============================================================================== --- trunk/reactos/base/applications/dxdiag/sound.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/sound.c [iso-8859-1] Thu Sep 19 22:05:19 2013 @@ -208,7 +208,7 @@ return FALSE; pContext->hSoundWnd = hDlgs; - hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hMainDialog, SoundPageWndProc, (LPARAM)pContext); + hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hMainDialog, SoundPageWndProc, (LPARAM)pContext); EnableDialogTheme(hwndDlg); if (!hwndDlg) return FALSE;

1 0

[akhaldi] 60218: [IMAGEHLP] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 19 Sep '13

19 Sep '13

Author: akhaldi Date: Thu Sep 19 19:39:32 2013 New Revision: 60218 URL: http://svn.reactos.org/svn/reactos?rev=60218&view=rev Log: [IMAGEHLP] * Sync with Wine 1.7.1. CORE-7469 Removed: trunk/reactos/dll/win32/imagehlp/precomp.h Modified: trunk/reactos/dll/win32/imagehlp/CMakeLists.txt trunk/reactos/dll/win32/imagehlp/access.c trunk/reactos/dll/win32/imagehlp/imagehlp_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] Thu Sep 19 19:39:32 2013 @@ -14,10 +14,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def) add_library(imagehlp SHARED ${SOURCE}) - set_module_type(imagehlp win32dll) target_link_libraries(imagehlp wine) add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll) - add_pch(imagehlp precomp.h) add_cd_file(TARGET imagehlp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/imagehlp/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/access.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] Thu Sep 19 19:39:32 2013 @@ -37,7 +37,6 @@ */ static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL; -static PLOADED_IMAGE IMAGEHLP_pLastLoadedImage=NULL; static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = { NULL, /* ModuleName */ @@ -138,9 +137,6 @@ if(pCurrent->Flink) pCurrent->Flink->Blink = pCurrent->Blink; - else - IMAGEHLP_pLastLoadedImage = pCurrent->Blink?CONTAINING_RECORD( - pCurrent->Blink, LOADED_IMAGE, Links):NULL; return FALSE; } Modified: trunk/reactos/dll/win32/imagehlp/imagehlp_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp_main.c [iso-8859-1] Thu Sep 19 19:39:32 2013 @@ -42,10 +42,8 @@ IMAGEHLP_hHeap = HeapCreate(0, 0x10000, 0); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; HeapDestroy(IMAGEHLP_hHeap); - IMAGEHLP_hHeap = NULL; - break; - default: break; } return TRUE; Removed: trunk/reactos/dll/win32/imagehlp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/precomp… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/precomp.h (removed) @@ -1,53 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS System Libraries - * FILE: lib/imagehlp/precomp.h - * PURPOSE: Imagehlp Libary Header - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -/* Definitions */ -#define _CRT_SECURE_NO_DEPRECATE -#define NTOS_MODE_USER -#define WIN32_NO_STATUS - -/* PSDK/NDK Headers */ -#include <windows.h> -#include <imagehlp.h> -#include <ndk/umtypes.h> -#include <ndk/rtlfuncs.h> - -/* C STDLIB Headers */ -#include <stdio.h> - -/* TYPES *********************************************************************/ - -typedef struct _BOUND_FORWARDER_REFS -{ - struct _BOUND_FORWARDER_REFS *Next; - ULONG TimeDateStamp; - LPSTR ModuleName; -} BOUND_FORWARDER_REFS, *PBOUND_FORWARDER_REFS; - -typedef struct _IMPORT_DESCRIPTOR -{ - struct _IMPORT_DESCRIPTOR *Next; - LPSTR ModuleName; - ULONG TimeDateStamp; - USHORT ForwaderReferences; - PBOUND_FORWARDER_REFS Forwarders; -} IMPORT_DESCRIPTOR, *PIMPORT_DESCRIPTOR; - -/* DATA **********************************************************************/ - -extern HANDLE IMAGEHLP_hHeap; - -/* FUNCTIONS *****************************************************************/ - -BOOL -IMAGEAPI -UnloadAllImages(VOID); - -/* EOF */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 19 19:39:32 2013 @@ -82,7 +82,7 @@ reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/ieframe # Synced to Wine-1.7.1 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 -reactos/dll/win32/imagehlp # Synced to Wine-1.5.4 +reactos/dll/win32/imagehlp # Synced to Wine-1.7.1 reactos/dll/win32/imm32 # Synced to Wine-1.5.19 reactos/dll/win32/inetcomm # Synced to Wine-1.5.4 reactos/dll/win32/inetmib1 # Synced to Wine-1.5.4

1 0

[akhaldi] 60217: [IMAGEHLP_WINETEST] * Speedup linking.
by akhaldi＠svn.reactos.org 19 Sep '13

19 Sep '13

Author: akhaldi Date: Thu Sep 19 19:22:17 2013 New Revision: 60217 URL: http://svn.reactos.org/svn/reactos?rev=60217&view=rev Log: [IMAGEHLP_WINETEST] * Speedup linking. Modified: trunk/rostests/winetests/imagehlp/CMakeLists.txt trunk/rostests/winetests/imagehlp/testlist.c Modified: trunk/rostests/winetests/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/CMakeL… ============================================================================== --- trunk/rostests/winetests/imagehlp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/imagehlp/CMakeLists.txt [iso-8859-1] Thu Sep 19 19:22:17 2013 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) list(APPEND SOURCE image.c @@ -9,7 +5,6 @@ testlist.c) add_executable(imagehlp_winetest ${SOURCE}) -target_link_libraries(imagehlp_winetest wine uuid) set_module_type(imagehlp_winetest win32cui) -add_importlibs(imagehlp_winetest advapi32 msvcrt kernel32 ntdll) +add_importlibs(imagehlp_winetest msvcrt kernel32) add_cd_file(TARGET imagehlp_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/imagehlp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/testli… ============================================================================== --- trunk/rostests/winetests/imagehlp/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imagehlp/testlist.c [iso-8859-1] Thu Sep 19 19:22:17 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_image(void); extern void func_integrity(void);

1 0

[akhaldi] 60216: [IMAADP32.ACM] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 19 Sep '13

19 Sep '13

Author: akhaldi Date: Thu Sep 19 18:57:58 2013 New Revision: 60216 URL: http://svn.reactos.org/svn/reactos?rev=60216&view=rev Log: [IMAADP32.ACM] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/CMa… ============================================================================== --- trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Thu Sep 19 18:57:58 2013 @@ -9,10 +9,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def) add_library(imaadp32.acm SHARED ${SOURCE}) - set_module_type(imaadp32.acm win32dll) set_target_properties(imaadp32.acm PROPERTIES SUFFIX "") target_link_libraries(imaadp32.acm wine) add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll) -add_dependencies(imaadp32.acm psdk) add_cd_file(TARGET imaadp32.acm DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima… ============================================================================== --- trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] Thu Sep 19 18:57:58 2013 @@ -138,7 +138,7 @@ static void init_wfx_ima_adpcm(IMAADPCMWAVEFORMAT* awfx/*, DWORD nba*/) { - register WAVEFORMATEX* pwfx = &awfx->wfx; + WAVEFORMATEX* pwfx = &awfx->wfx; /* we assume wFormatTag, nChannels, nSamplesPerSec and wBitsPerSample * have been initialized... */ @@ -550,7 +550,7 @@ aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_IMA_ADPCM is bigger than PCM */ break; } - /* fall thru */ + /* fall through */ case ACM_FORMATTAGDETAILSF_FORMATTAG: switch (aftd->dwFormatTag) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 19 18:57:58 2013 @@ -81,7 +81,7 @@ reactos/dll/win32/iccvid # Synced to Wine-1.7.1 reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/ieframe # Synced to Wine-1.7.1 -reactos/dll/win32/imaadp32.acm # Synced to Wine-1.5.4 +reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 reactos/dll/win32/imagehlp # Synced to Wine-1.5.4 reactos/dll/win32/imm32 # Synced to Wine-1.5.19 reactos/dll/win32/inetcomm # Synced to Wine-1.5.4

1 0

[akhaldi] 60215: [IEFRAME] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 19 Sep '13

19 Sep '13

Author: akhaldi Date: Thu Sep 19 18:48:34 2013 New Revision: 60215 URL: http://svn.reactos.org/svn/reactos?rev=60215&view=rev Log: [IEFRAME] * Sync with Wine 1.7.1. CORE-7469 Added: trunk/reactos/dll/win32/ieframe/ieframe_v1.tlb.rgs (with props) Modified: trunk/reactos/dll/win32/ieframe/dochost.c trunk/reactos/dll/win32/ieframe/events.c trunk/reactos/dll/win32/ieframe/ie.c trunk/reactos/dll/win32/ieframe/ieframe.h trunk/reactos/dll/win32/ieframe/ieframe.rc trunk/reactos/dll/win32/ieframe/ieframe_main.c trunk/reactos/dll/win32/ieframe/ieframe_v1.rgs trunk/reactos/dll/win32/ieframe/iexplore.c trunk/reactos/dll/win32/ieframe/navigate.c trunk/reactos/dll/win32/ieframe/shellbrowser.c trunk/reactos/dll/win32/ieframe/webbrowser.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ieframe/dochost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/dochost.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/dochost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/dochost.c [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -20,6 +20,7 @@ #include <exdispid.h> //#include "mshtml.h" +#include <perhist.h> #include <initguid.h> #include <wine/debug.h> @@ -120,15 +121,29 @@ } hres = IUnknown_QueryInterface(This->document, &IID_IHlinkTarget, (void**)&hlink); - if(FAILED(hres)) { - FIXME("Could not get IHlinkTarget interface\n"); - return; - } - - hres = IHlinkTarget_Navigate(hlink, 0, NULL); - IHlinkTarget_Release(hlink); - if(FAILED(hres)) - FIXME("Navigate failed\n"); + if(SUCCEEDED(hres)) { + hres = IHlinkTarget_Navigate(hlink, 0, NULL); + IHlinkTarget_Release(hlink); + if(FAILED(hres)) + FIXME("Navigate failed\n"); + }else { + IOleObject *ole_object; + RECT rect; + + TRACE("No IHlink iface\n"); + + hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&ole_object); + if(FAILED(hres)) { + FIXME("Could not get IOleObject iface: %08x\n", hres); + return; + } + + GetClientRect(This->hwnd, &rect); + hres = IOleObject_DoVerb(ole_object, OLEIVERB_SHOW, NULL, &This->IOleClientSite_iface, -1, This->hwnd, &rect); + IOleObject_Release(ole_object); + if(FAILED(hres)) + FIXME("DoVerb failed: %08x\n", hres); + } } static HRESULT get_doc_ready_state(DocHost *This, READYSTATE *ret) @@ -195,6 +210,12 @@ static void update_ready_state(DocHost *This, READYSTATE ready_state) { + if(ready_state > READYSTATE_LOADING && This->travellog.loading_pos != -1) { + WARN("histupdate not notified\n"); + This->travellog.position = This->travellog.loading_pos; + This->travellog.loading_pos = -1; + } + if(ready_state > READYSTATE_LOADING && This->doc_state <= READYSTATE_LOADING && !This->browser_service /* FIXME */) notif_complete(This, DISPID_NAVIGATECOMPLETE2); @@ -289,6 +310,10 @@ push_ready_state_task(This, READYSTATE_COMPLETE); if(ready_state != READYSTATE_COMPLETE || This->doc_navigate) advise_prop_notif(This, TRUE); + }else if(!This->doc_navigate) { + /* If we can't get document's ready state, there is not much we can do. + * Assume that document is complete at this point. */ + push_ready_state_task(This, READYSTATE_COMPLETE); } return S_OK; @@ -327,37 +352,91 @@ return DefWindowProcW(hwnd, msg, wParam, lParam); } +static void free_travellog_entry(travellog_entry_t *entry) +{ + if(entry->stream) + IStream_Release(entry->stream); + heap_free(entry->url); +} + +static IStream *get_travellog_stream(DocHost *This) +{ + IPersistHistory *persist_history; + IStream *stream; + HRESULT hres; + + hres = IUnknown_QueryInterface(This->document, &IID_IPersistHistory, (void**)&persist_history); + if(FAILED(hres)) + return NULL; + + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if(SUCCEEDED(hres)) + hres = IPersistHistory_SaveHistory(persist_history, stream); + IPersistHistory_Release(persist_history); + if(FAILED(hres)) { + IStream_Release(stream); + return NULL; + } + + return stream; +} + +static void dump_travellog(DocHost *This) +{ + unsigned i; + + for(i=0; i < This->travellog.length; i++) + TRACE("%d: %s %s\n", i, i == This->travellog.position ? "=>" : " ", debugstr_w(This->travellog.log[i].url)); + if(i == This->travellog.position) + TRACE("%d: =>\n", i); +} + static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; - if(!This->travellog) { - This->travellog = heap_alloc(4 * sizeof(*This->travellog)); - if(!This->travellog) - return; - - This->travellog_size = 4; - }else if(This->travellog_size < This->travellog_position+1) { - travellog_entry_t *new_travellog; - - new_travellog = heap_realloc(This->travellog, This->travellog_size*2*sizeof(*This->travellog)); - if(!new_travellog) - return; - - This->travellog = new_travellog; - This->travellog_size *= 2; - } - - while(This->travellog_length > This->travellog_position) - heap_free(This->travellog[--This->travellog_length].url); - - new_entry = This->travellog + This->travellog_position; + if(This->travellog.loading_pos == -1) { + /* Clear forward history. */ + if(!This->travellog.log) { + This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); + if(!This->travellog.log) + return; + + This->travellog.size = 4; + }else if(This->travellog.size < This->travellog.position+1) { + travellog_entry_t *new_travellog; + + new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); + if(!new_travellog) + return; + + This->travellog.log = new_travellog; + This->travellog.size *= 2; + } + + while(This->travellog.length > This->travellog.position) + free_travellog_entry(This->travellog.log + --This->travellog.length); + } + + new_entry = This->travellog.log + This->travellog.position; new_entry->url = heap_strdupW(This->url); + TRACE("Adding %s at %d\n", debugstr_w(This->url), This->travellog.position); if(!new_entry->url) return; - This->travellog_position++; + new_entry->stream = get_travellog_stream(This); + + if(This->travellog.loading_pos == -1) { + This->travellog.position++; + }else { + This->travellog.position = This->travellog.loading_pos; + This->travellog.loading_pos = -1; + } + if(This->travellog.position > This->travellog.length) + This->travellog.length = This->travellog.position; + + dump_travellog(This); } void create_doc_view_hwnd(DocHost *This) @@ -975,6 +1054,8 @@ This->ready_state = READYSTATE_UNINITIALIZED; list_init(&This->task_queue); + This->travellog.loading_pos = -1; + DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); @@ -994,9 +1075,9 @@ ConnectionPointContainer_Destroy(&This->cps); - while(This->travellog_length) - heap_free(This->travellog[--This->travellog_length].url); - heap_free(This->travellog); + while(This->travellog.length) + free_travellog_entry(This->travellog.log + --This->travellog.length); + heap_free(This->travellog.log); heap_free(This->url); } Modified: trunk/reactos/dll/win32/ieframe/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/events.c… ============================================================================== --- trunk/reactos/dll/win32/ieframe/events.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/events.c [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -109,8 +109,6 @@ return CONNECT_E_NOCONNECTION; } -#undef impl_from_IConnectionPointContainer - static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { ConnectionPointContainer_QueryInterface, @@ -129,6 +127,120 @@ { return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); } + +typedef struct { + IEnumConnections IEnumConnections_iface; + + LONG ref; + + ConnectionPoint *cp; + DWORD iter; +} EnumConnections; + +static inline EnumConnections *impl_from_IEnumConnections(IEnumConnections *iface) +{ + return CONTAINING_RECORD(iface, EnumConnections, IEnumConnections_iface); +} + +static HRESULT WINAPI EnumConnections_QueryInterface(IEnumConnections *iface, REFIID riid, void **ppv) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumConnections_iface; + }else if(IsEqualGUID(&IID_IEnumConnections, riid)) { + TRACE("(%p)->(IID_IEnumConnections %p)\n", This, ppv); + *ppv = &This->IEnumConnections_iface; + }else { + WARN("Unsupported interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + IConnectionPoint_Release(&This->cp->IConnectionPoint_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConnections, CONNECTDATA *pgcd, ULONG *pcFetched) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + ULONG cnt = 0; + + TRACE("(%p)->(%u %p %p)\n", This, cConnections, pgcd, pcFetched); + + while(cConnections--) { + while(This->iter < This->cp->sinks_size && !This->cp->sinks[This->iter]) + This->iter++; + if(This->iter == This->cp->sinks_size) + break; + + pgcd[cnt].pUnk = (IUnknown*)This->cp->sinks[This->iter]; + pgcd[cnt].dwCookie = cnt+1; + This->iter++; + cnt++; + } + + if(pcFetched) + *pcFetched = cnt; + return cnt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG cConnections) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)->(%u)\n", This, cConnections); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumConnections_Reset(IEnumConnections *iface) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumConnections_Clone(IEnumConnections *iface, IEnumConnections **ppEnum) +{ + EnumConnections *This = impl_from_IEnumConnections(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumConnectionsVtbl EnumConnectionsVtbl = { + EnumConnections_QueryInterface, + EnumConnections_AddRef, + EnumConnections_Release, + EnumConnections_Next, + EnumConnections_Skip, + EnumConnections_Reset, + EnumConnections_Clone +}; static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, REFIID riid, LPVOID *ppv) @@ -245,8 +357,23 @@ IEnumConnections **ppEnum) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p)\n", This, ppEnum); - return E_NOTIMPL; + EnumConnections *ret; + + TRACE("(%p)->(%p)\n", This, ppEnum); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumConnections_iface.lpVtbl = &EnumConnectionsVtbl; + ret->ref = 1; + ret->iter = 0; + + IConnectionPoint_AddRef(&This->IConnectionPoint_iface); + ret->cp = This; + + *ppEnum = &ret->IEnumConnections_iface; + return S_OK; } static const IConnectionPointVtbl ConnectionPointVtbl = Modified: trunk/reactos/dll/win32/ieframe/ie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ie.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -50,7 +50,10 @@ *ppv = &This->IWebBrowser2_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); - *ppv = &This->doc_host->doc_host.cps.IConnectionPointContainer_iface; + *ppv = &This->doc_host.cps.IConnectionPointContainer_iface; + }else if(IsEqualGUID(&IID_IExternalConnection, riid)) { + TRACE("(%p)->(IID_IExternalConnection %p)\n", This, ppv); + *ppv = &This->IExternalConnection_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; @@ -83,14 +86,8 @@ TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->doc_host) { - deactivate_document(&This->doc_host->doc_host); - DocHost_Release(&This->doc_host->doc_host); - if(This->doc_host) { - This->doc_host->ie = NULL; - This->doc_host->doc_host.container_vtbl->release(&This->doc_host->doc_host); - } - } + deactivate_document(&This->doc_host); + DocHost_Release(&This->doc_host); if(This->frame_hwnd) DestroyWindow(This->frame_hwnd); @@ -143,21 +140,21 @@ { InternetExplorer *This = impl_from_IWebBrowser2(iface); TRACE("(%p)\n", This); - return go_back(&This->doc_host->doc_host); + return go_back(&This->doc_host); } static HRESULT WINAPI InternetExplorer_GoForward(IWebBrowser2 *iface) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return go_forward(&This->doc_host); } static HRESULT WINAPI InternetExplorer_GoHome(IWebBrowser2 *iface) { InternetExplorer *This = impl_from_IWebBrowser2(iface); TRACE("(%p)\n", This); - return go_home(&This->doc_host->doc_host); + return go_home(&This->doc_host); } static HRESULT WINAPI InternetExplorer_GoSearch(IWebBrowser2 *iface) @@ -176,7 +173,7 @@ TRACE("(%p)->(%s %p %p %p %p)\n", This, debugstr_w(szUrl), Flags, TargetFrameName, PostData, Headers); - return navigate_url(&This->doc_host->doc_host, szUrl, Flags, TargetFrameName, PostData, Headers); + return navigate_url(&This->doc_host, szUrl, Flags, TargetFrameName, PostData, Headers); } static HRESULT WINAPI InternetExplorer_Refresh(IWebBrowser2 *iface) @@ -185,7 +182,7 @@ TRACE("(%p)\n", This); - return refresh_document(&This->doc_host->doc_host); + return refresh_document(&This->doc_host); } static HRESULT WINAPI InternetExplorer_Refresh2(IWebBrowser2 *iface, VARIANT *Level) @@ -313,7 +310,7 @@ TRACE("(%p)->(%p)\n", This, LocationURL); - return get_location_url(&This->doc_host->doc_host, LocationURL); + return get_location_url(&This->doc_host, LocationURL); } static HRESULT WINAPI InternetExplorer_get_Busy(IWebBrowser2 *iface, VARIANT_BOOL *pBool) @@ -495,7 +492,7 @@ return E_INVALIDARG; } - return navigate_url(&This->doc_host->doc_host, V_BSTR(URL), Flags, TargetFrameName, PostData, Headers); + return navigate_url(&This->doc_host, V_BSTR(URL), Flags, TargetFrameName, PostData, Headers); } static HRESULT WINAPI InternetExplorer_QueryStatusWB(IWebBrowser2 *iface, OLECMDID cmdID, OLECMDF *pcmdf) @@ -705,6 +702,86 @@ InternetExplorer_put_Resizable }; +static inline InternetExplorer *impl_from_IExternalConnection(IExternalConnection *iface) +{ + return CONTAINING_RECORD(iface, InternetExplorer, IExternalConnection_iface); +} + +/* + * Document may keep references to InternetExplorer object causing circular references. + * We keep track of external references and release the document object when all + * external references are released. A visible main window is also considered as + * an external reference. + */ +DWORD release_extern_ref(InternetExplorer *This, BOOL last_closes) +{ + LONG ref = InterlockedDecrement(&This->extern_ref); + + TRACE("ref = %d\n", ref); + + if(ref) + return ref; + + if(!last_closes) { + WARN("Last external connection released with FALSE last_closes.\n"); + return ref; + } + + deactivate_document(&This->doc_host); + return ref; +} + +static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) +{ + InternetExplorer *This = impl_from_IExternalConnection(iface); + return IWebBrowser2_QueryInterface(&This->IWebBrowser2_iface, riid, ppv); +} + +static ULONG WINAPI ExternalConnection_AddRef(IExternalConnection *iface) +{ + InternetExplorer *This = impl_from_IExternalConnection(iface); + return IWebBrowser2_AddRef(&This->IWebBrowser2_iface); +} + +static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) +{ + InternetExplorer *This = impl_from_IExternalConnection(iface); + return IWebBrowser2_Release(&This->IWebBrowser2_iface); +} + +static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) +{ + InternetExplorer *This = impl_from_IExternalConnection(iface); + + TRACE("(%p)->(%x %x)\n", This, extconn, reserved); + + if(extconn != EXTCONN_STRONG) + return 0; + + return InterlockedIncrement(&This->extern_ref); +} + +static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, + DWORD reserved, BOOL fLastReleaseCloses) +{ + InternetExplorer *This = impl_from_IExternalConnection(iface); + + TRACE("(%p)->(%x %x %x)\n", This, extconn, reserved, fLastReleaseCloses); + + if(extconn != EXTCONN_STRONG) + return 0; + + return release_extern_ref(This, fLastReleaseCloses); +} + +static const IExternalConnectionVtbl ExternalConnectionVtbl = { + ExternalConnection_QueryInterface, + ExternalConnection_AddRef, + ExternalConnection_Release, + ExternalConnection_AddConnection, + ExternalConnection_ReleaseConnection +}; + static inline InternetExplorer *impl_from_IServiceProvider(IServiceProvider *iface) { return CONTAINING_RECORD(iface, InternetExplorer, IServiceProvider_iface); @@ -736,7 +813,7 @@ if(IsEqualGUID(&SID_SHTMLWindow, riid)) { TRACE("(%p)->(SID_SHTMLWindow)\n", This); - return IHTMLWindow2_QueryInterface(&This->doc_host->doc_host.html_window.IHTMLWindow2_iface, riid, ppv); + return IHTMLWindow2_QueryInterface(&This->doc_host.html_window.IHTMLWindow2_iface, riid, ppv); } FIXME("(%p)->(%s, %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); @@ -755,5 +832,6 @@ void InternetExplorer_WebBrowser_Init(InternetExplorer *This) { This->IWebBrowser2_iface.lpVtbl = &InternetExplorerVtbl; + This->IExternalConnection_iface.lpVtbl = &ExternalConnectionVtbl; This->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; } Modified: trunk/reactos/dll/win32/ieframe/ieframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -101,6 +101,7 @@ typedef struct { WCHAR *url; + IStream *stream; } travellog_entry_t; typedef struct _IDocHostContainerVtbl @@ -158,10 +159,13 @@ ShellBrowser *browser_service; IShellUIHelper2 *shell_ui_helper; - travellog_entry_t *travellog; - unsigned travellog_size; - unsigned travellog_length; - unsigned travellog_position; + struct { + travellog_entry_t *log; + unsigned size; + unsigned length; + unsigned position; + int loading_pos; + } travellog; ConnectionPointContainer cps; IEHTMLWindow html_window; @@ -215,20 +219,15 @@ DocHost doc_host; }; -typedef struct { +struct InternetExplorer { DocHost doc_host; - - LONG ref; - - InternetExplorer *ie; -} IEDocHost; - -struct InternetExplorer { IWebBrowser2 IWebBrowser2_iface; + IExternalConnection IExternalConnection_iface; IServiceProvider IServiceProvider_iface; HlinkFrame hlink_frame; LONG ref; + LONG extern_ref; HWND frame_hwnd; HWND status_hwnd; @@ -236,7 +235,6 @@ BOOL nohome; struct list entry; - IEDocHost *doc_host; }; void WebBrowser_OleObject_Init(WebBrowser*) DECLSPEC_HIDDEN; @@ -270,6 +268,7 @@ HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; HRESULT go_back(DocHost*) DECLSPEC_HIDDEN; +HRESULT go_forward(DocHost*) DECLSPEC_HIDDEN; HRESULT refresh_document(DocHost*) DECLSPEC_HIDDEN; HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; @@ -287,6 +286,7 @@ void InternetExplorer_WebBrowser_Init(InternetExplorer*) DECLSPEC_HIDDEN; HRESULT update_ie_statustext(InternetExplorer*, LPCWSTR) DECLSPEC_HIDDEN; void released_obj(void) DECLSPEC_HIDDEN; +DWORD release_extern_ref(InternetExplorer*,BOOL) DECLSPEC_HIDDEN; void register_iewindow_class(void) DECLSPEC_HIDDEN; void unregister_iewindow_class(void) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -104,14 +104,15 @@ #define WINE_PRODUCTVERSION_STR "8.00.7601.17601" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" -#include "wine/wine_common_ver.rc" +#include <wine/wine_common_ver.rc> /* @makedep: ietoolbar.bmp */ IDB_IETOOLBAR BITMAP ietoolbar.bmp /* @makedep: ieframe.rgs */ -2 WINE_REGISTRY ieframe.rgs +1 WINE_REGISTRY ieframe.rgs -3 WINE_REGISTRY ieframe_v1.rgs +2 WINE_REGISTRY ieframe_v1.rgs +3 WINE_REGISTRY ieframe_v1.tlb.rgs 1 TYPELIB ieframe_v1.tlb Modified: trunk/reactos/dll/win32/ieframe/ieframe_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe_… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe_main.c [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -218,6 +218,7 @@ DisableThreadLibraryCalls(ieframe_instance); break; case DLL_PROCESS_DETACH: + if (lpv) break; unregister_iewindow_class(); release_typelib(); } Modified: trunk/reactos/dll/win32/ieframe/ieframe_v1.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe_… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe_v1.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe_v1.rgs [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -23,276 +23,4 @@ { CLSID = s '{FBF23B40-E3F0-101B-8488-00AA003E56F8}' } - NoRemove Typelib - { - NoRemove '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' - { - '1.1' = s 'Microsoft Internet Controls' - { - '0' { win32 = s '%MODULE%' } - FLAGS = s '0' - } - } - } - NoRemove Interface - { - '{EAB22AC1-30C1-11CF-A7EB-0000C05BAE0B}' = s 'IWebBrowser' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{EAB22AC2-30C1-11CF-A7EB-0000C05BAE0B}' = s 'DWebBrowserEvents' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{0002DF05-0000-0000-C000-000000000046}' = s 'IWebBrowserApp' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{D30C1661-CDAF-11D0-8A3E-00C04FC9E26E}' = s 'IWebBrowser2' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{34A715A0-6587-11D0-924A-0020AFC7AC4D}' = s 'DWebBrowserEvents2' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{FE4106E0-399A-11D0-A48C-00A0C90A8F39}' = s 'DShellWindowsEvents' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{85CB6900-4D95-11CF-960C-0080C7F4EE85}' = s 'IShellWindows' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}' = s 'IShellUIHelper' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{A7FE6EDA-1932-4281-B881-87B31B8BC52C}' = s 'IShellUIHelper2' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{55136806-B2DE-11D1-B9F2-00A0C98BC547}' = s 'DShellNameSpaceEvents' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{55136804-B2DE-11D1-B9F2-00A0C98BC547}' = s 'IShellFavoritesNameSpace' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{E572D3C9-37BE-4AE2-825D-D521763E3108}' = s 'IShellNameSpace' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{F3470F24-15FD-11D2-BB2E-00805FF7EFCA}' = s 'IScriptErrorList' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{BA9239A4-3DD5-11D2-BF8B-00C04FB93661}' = s 'ISearch' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{47C922A2-3DD5-11D2-BF8B-00C04FB93661}' = s 'ISearches' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{72423E8F-8011-11D2-BE79-00A0C9A83DA1}' = s 'ISearchAssistantOC' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{72423E8F-8011-11D2-BE79-00A0C9A83DA2}' = s 'ISearchAssistantOC2' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{72423E8F-8011-11D2-BE79-00A0C9A83DA3}' = s 'ISearchAssistantOC3' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - '{1611FDDA-445B-11D2-85DE-00C04FA35C89}' = s '_SearchAssistantEvents' - { - ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' - ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } - } - } - NoRemove CLSID - { - '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' = s 'Microsoft Web Browser Version 1' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - ProgId = s 'Shell.Explorer.1' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' - Version = s '1.1' - VersionIndependentProgId = s 'Shell.Explorer' - } - '{8856F961-340A-11D0-A96B-00C04FD705A2}' = s 'Microsoft Web Browser' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - ProgId = s 'Shell.Explorer.2' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' - Version = s '1.1' - VersionIndependentProgId = s 'Shell.Explorer' - } - '{0002DF01-0000-0000-C000-000000000046}' = s 'Internet Explorer(Ver 1.0)' - { - ProgId = s 'InternetExplorer.Application.1' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' - Version = s '1.1' - VersionIndependentProgId = s 'InternetExplorer.Application' - } - '{9BA05972-F6A8-11CF-A442-00A0C90A8F39}' = s 'ShellWindows' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' - Version = s '1.1' - } - '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' = s 'Microsoft Shell UI Helper' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - ProgId = s 'Shell.UIHelper.1' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' - Version = s '1.1' - VersionIndependentProgId = s 'Shell.UIHelper' - } - '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' = s 'Shell Name Space' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - ProgId = s 'ShellNameSpace.ShellNameSpace.1' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' - Version = s '1.1' - VersionIndependentProgId = s 'ShellNameSpace.ShellNameSpace' - } - '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' = s 'Shell Name Space' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - ProgId = s 'ShellNameSpace.ShellNameSpace.1' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' - Version = s '1.1' - VersionIndependentProgId = s 'ShellNameSpace.ShellNameSpace' - } - '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' = s 'SearchAssistantOC' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - ProgId = s 'SearchAssistantOC.SearchAssistantOC.1' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' - Version = s '1.1' - VersionIndependentProgId = s 'SearchAssistantOC.SearchAssistantOC' - } - '{B45FF030-4447-11D2-85DE-00C04FA35C89}' = s 'SearchAssistantOC' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - ProgId = s 'SearchAssistantOC.SearchAssistantOC.1' - TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' - Version = s '1.1' - VersionIndependentProgId = s 'SearchAssistantOC.SearchAssistantOC' - } - } - 'Shell.Explorer.1' = s 'Microsoft Web Browser Version 1' - { - CLSID = s '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' - } - 'Shell.Explorer' = s 'Microsoft Web Browser Version 1' - { - CLSID = s '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' - CurVer = s 'Shell.Explorer.1' - } - 'Shell.Explorer.2' = s 'Microsoft Web Browser' - { - CLSID = s '{8856F961-340A-11D0-A96B-00C04FD705A2}' - } - 'Shell.Explorer' = s 'Microsoft Web Browser' - { - CLSID = s '{8856F961-340A-11D0-A96B-00C04FD705A2}' - CurVer = s 'Shell.Explorer.2' - } - 'InternetExplorer.Application.1' = s 'Internet Explorer(Ver 1.0)' - { - CLSID = s '{0002DF01-0000-0000-C000-000000000046}' - } - 'InternetExplorer.Application' = s 'Internet Explorer(Ver 1.0)' - { - CLSID = s '{0002DF01-0000-0000-C000-000000000046}' - CurVer = s 'InternetExplorer.Application.1' - } - 'Shell.UIHelper.1' = s 'Microsoft Shell UI Helper' - { - CLSID = s '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' - } - 'Shell.UIHelper' = s 'Microsoft Shell UI Helper' - { - CLSID = s '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' - CurVer = s 'Shell.UIHelper.1' - } - 'ShellNameSpace.ShellNameSpace.1' = s 'Shell Name Space' - { - CLSID = s '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' - } - 'ShellNameSpace.ShellNameSpace' = s 'Shell Name Space' - { - CLSID = s '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' - CurVer = s 'ShellNameSpace.ShellNameSpace.1' - } - 'ShellNameSpace.ShellNameSpace.1' = s 'Shell Name Space' - { - CLSID = s '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' - } - 'ShellNameSpace.ShellNameSpace' = s 'Shell Name Space' - { - CLSID = s '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' - CurVer = s 'ShellNameSpace.ShellNameSpace.1' - } - 'SearchAssistantOC.SearchAssistantOC.1' = s 'SearchAssistantOC' - { - CLSID = s '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' - } - 'SearchAssistantOC.SearchAssistantOC' = s 'SearchAssistantOC' - { - CLSID = s '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' - CurVer = s 'SearchAssistantOC.SearchAssistantOC.1' - } - 'SearchAssistantOC.SearchAssistantOC.1' = s 'SearchAssistantOC' - { - CLSID = s '{B45FF030-4447-11D2-85DE-00C04FA35C89}' - } - 'SearchAssistantOC.SearchAssistantOC' = s 'SearchAssistantOC' - { - CLSID = s '{B45FF030-4447-11D2-85DE-00C04FA35C89}' - CurVer = s 'SearchAssistantOC.SearchAssistantOC.1' - } } Added: trunk/reactos/dll/win32/ieframe/ieframe_v1.tlb.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe_… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe_v1.tlb.rgs (added) +++ trunk/reactos/dll/win32/ieframe/ieframe_v1.tlb.rgs [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -0,0 +1,275 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + { + '1.1' = s 'Microsoft Internet Controls' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + '{EAB22AC1-30C1-11CF-A7EB-0000C05BAE0B}' = s 'IWebBrowser' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{EAB22AC2-30C1-11CF-A7EB-0000C05BAE0B}' = s 'DWebBrowserEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{0002DF05-0000-0000-C000-000000000046}' = s 'IWebBrowserApp' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{D30C1661-CDAF-11D0-8A3E-00C04FC9E26E}' = s 'IWebBrowser2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{34A715A0-6587-11D0-924A-0020AFC7AC4D}' = s 'DWebBrowserEvents2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{FE4106E0-399A-11D0-A48C-00A0C90A8F39}' = s 'DShellWindowsEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{85CB6900-4D95-11CF-960C-0080C7F4EE85}' = s 'IShellWindows' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}' = s 'IShellUIHelper' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{A7FE6EDA-1932-4281-B881-87B31B8BC52C}' = s 'IShellUIHelper2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{55136806-B2DE-11D1-B9F2-00A0C98BC547}' = s 'DShellNameSpaceEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{55136804-B2DE-11D1-B9F2-00A0C98BC547}' = s 'IShellFavoritesNameSpace' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{E572D3C9-37BE-4AE2-825D-D521763E3108}' = s 'IShellNameSpace' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{F3470F24-15FD-11D2-BB2E-00805FF7EFCA}' = s 'IScriptErrorList' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{BA9239A4-3DD5-11D2-BF8B-00C04FB93661}' = s 'ISearch' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{47C922A2-3DD5-11D2-BF8B-00C04FB93661}' = s 'ISearches' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{72423E8F-8011-11D2-BE79-00A0C9A83DA1}' = s 'ISearchAssistantOC' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{72423E8F-8011-11D2-BE79-00A0C9A83DA2}' = s 'ISearchAssistantOC2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{72423E8F-8011-11D2-BE79-00A0C9A83DA3}' = s 'ISearchAssistantOC3' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{1611FDDA-445B-11D2-85DE-00C04FA35C89}' = s '_SearchAssistantEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + } + NoRemove CLSID + { + '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' = s 'Microsoft Web Browser Version 1' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'Shell.Explorer.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'Shell.Explorer' + } + '{8856F961-340A-11D0-A96B-00C04FD705A2}' = s 'Microsoft Web Browser' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'Shell.Explorer.2' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'Shell.Explorer' + } + '{0002DF01-0000-0000-C000-000000000046}' = s 'Internet Explorer(Ver 1.0)' + { + ProgId = s 'InternetExplorer.Application.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'InternetExplorer.Application' + } + '{9BA05972-F6A8-11CF-A442-00A0C90A8F39}' = s 'ShellWindows' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + } + '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' = s 'Microsoft Shell UI Helper' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'Shell.UIHelper.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'Shell.UIHelper' + } + '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' = s 'Shell Name Space' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'ShellNameSpace.ShellNameSpace.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'ShellNameSpace.ShellNameSpace' + } + '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' = s 'Shell Name Space' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'ShellNameSpace.ShellNameSpace.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'ShellNameSpace.ShellNameSpace' + } + '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' = s 'SearchAssistantOC' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'SearchAssistantOC.SearchAssistantOC.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'SearchAssistantOC.SearchAssistantOC' + } + '{B45FF030-4447-11D2-85DE-00C04FA35C89}' = s 'SearchAssistantOC' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'SearchAssistantOC.SearchAssistantOC.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'SearchAssistantOC.SearchAssistantOC' + } + } + 'Shell.Explorer.1' = s 'Microsoft Web Browser Version 1' + { + CLSID = s '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' + } + 'Shell.Explorer' = s 'Microsoft Web Browser Version 1' + { + CLSID = s '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' + CurVer = s 'Shell.Explorer.1' + } + 'Shell.Explorer.2' = s 'Microsoft Web Browser' + { + CLSID = s '{8856F961-340A-11D0-A96B-00C04FD705A2}' + } + 'Shell.Explorer' = s 'Microsoft Web Browser' + { + CLSID = s '{8856F961-340A-11D0-A96B-00C04FD705A2}' + CurVer = s 'Shell.Explorer.2' + } + 'InternetExplorer.Application.1' = s 'Internet Explorer(Ver 1.0)' + { + CLSID = s '{0002DF01-0000-0000-C000-000000000046}' + } + 'InternetExplorer.Application' = s 'Internet Explorer(Ver 1.0)' + { + CLSID = s '{0002DF01-0000-0000-C000-000000000046}' + CurVer = s 'InternetExplorer.Application.1' + } + 'Shell.UIHelper.1' = s 'Microsoft Shell UI Helper' + { + CLSID = s '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' + } + 'Shell.UIHelper' = s 'Microsoft Shell UI Helper' + { + CLSID = s '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' + CurVer = s 'Shell.UIHelper.1' + } + 'ShellNameSpace.ShellNameSpace.1' = s 'Shell Name Space' + { + CLSID = s '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' + } + 'ShellNameSpace.ShellNameSpace' = s 'Shell Name Space' + { + CLSID = s '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' + CurVer = s 'ShellNameSpace.ShellNameSpace.1' + } + 'ShellNameSpace.ShellNameSpace.1' = s 'Shell Name Space' + { + CLSID = s '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' + } + 'ShellNameSpace.ShellNameSpace' = s 'Shell Name Space' + { + CLSID = s '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' + CurVer = s 'ShellNameSpace.ShellNameSpace.1' + } + 'SearchAssistantOC.SearchAssistantOC.1' = s 'SearchAssistantOC' + { + CLSID = s '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' + } + 'SearchAssistantOC.SearchAssistantOC' = s 'SearchAssistantOC' + { + CLSID = s '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' + CurVer = s 'SearchAssistantOC.SearchAssistantOC.1' + } + 'SearchAssistantOC.SearchAssistantOC.1' = s 'SearchAssistantOC' + { + CLSID = s '{B45FF030-4447-11D2-85DE-00C04FA35C89}' + } + 'SearchAssistantOC.SearchAssistantOC' = s 'SearchAssistantOC' + { + CLSID = s '{B45FF030-4447-11D2-85DE-00C04FA35C89}' + CurVer = s 'SearchAssistantOC.SearchAssistantOC.1' + } +} Propchange: trunk/reactos/dll/win32/ieframe/ieframe_v1.tlb.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/ieframe/iexplore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/iexplore… ============================================================================== --- trunk/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -518,8 +518,8 @@ adjust_ie_docobj_rect(This->frame_hwnd, &docarea); - if(This->doc_host->doc_host.hwnd) - SetWindowPos(This->doc_host->doc_host.hwnd, NULL, docarea.left, docarea.top, docarea.right, docarea.bottom, + if(This->doc_host.hwnd) + SetWindowPos(This->doc_host.hwnd, NULL, docarea.left, docarea.top, docarea.right, docarea.bottom, SWP_NOZORDER | SWP_NOACTIVATE); SetWindowPos(hwndRebar, NULL, 0, 0, width, barHeight, SWP_NOZORDER | SWP_NOACTIVATE); @@ -557,8 +557,8 @@ GetClientRect(This->frame_hwnd, &docarea); adjust_ie_docobj_rect(This->frame_hwnd, &docarea); - if(This->doc_host->doc_host.hwnd) - SetWindowPos(This->doc_host->doc_host.hwnd, NULL, docarea.left, docarea.top, docarea.right, docarea.bottom, + if(This->doc_host.hwnd) + SetWindowPos(This->doc_host.hwnd, NULL, docarea.left, docarea.top, docarea.right, docarea.bottom, SWP_NOZORDER | SWP_NOACTIVATE); } @@ -589,11 +589,11 @@ break; case ID_BROWSE_PRINT: - if(This->doc_host->doc_host.document) + if(This->doc_host.document) { IOleCommandTarget* target; - if(FAILED(IUnknown_QueryInterface(This->doc_host->doc_host.document, &IID_IOleCommandTarget, (LPVOID*)&target))) + if(FAILED(IUnknown_QueryInterface(This->doc_host.document, &IID_IOleCommandTarget, (LPVOID*)&target))) break; IOleCommandTarget_Exec(target, &CGID_MSHTML, IDM_PRINT, OLECMDEXECOPT_DODEFAULT, NULL, NULL); @@ -669,10 +669,13 @@ return 0; case WM_SHOWWINDOW: TRACE("WM_SHOWWINDOW %lx\n", wparam); - if(wparam) + if(wparam) { IWebBrowser2_AddRef(&This->IWebBrowser2_iface); - else + InterlockedIncrement(&This->extern_ref); + }else { + release_extern_ref(This, TRUE); IWebBrowser2_Release(&This->IWebBrowser2_iface); + } break; case WM_DESTROY: return iewnd_OnDestroy(This); @@ -683,7 +686,7 @@ case WM_NOTIFY: return iewnd_OnNotify(This, wparam, lparam); case WM_DOCHOSTTASK: - return process_dochost_tasks(&This->doc_host->doc_host); + return process_dochost_tasks(&This->doc_host); case WM_UPDATEADDRBAR: return update_addrbar(This, lparam); } @@ -727,39 +730,25 @@ CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL /* FIXME */, ieframe_instance, This); - This->doc_host->doc_host.frame_hwnd = This->frame_hwnd; - create_doc_view_hwnd(&This->doc_host->doc_host); -} - -static inline IEDocHost *impl_from_DocHost(DocHost *iface) -{ - return CONTAINING_RECORD(iface, IEDocHost, doc_host); + This->doc_host.frame_hwnd = This->frame_hwnd; + create_doc_view_hwnd(&This->doc_host); +} + +static inline InternetExplorer *impl_from_DocHost(DocHost *iface) +{ + return CONTAINING_RECORD(iface, InternetExplorer, doc_host); } static ULONG IEDocHost_addref(DocHost *iface) { - IEDocHost *This = impl_from_DocHost(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; + InternetExplorer *This = impl_from_DocHost(iface); + return IWebBrowser2_AddRef(&This->IWebBrowser2_iface); } static ULONG IEDocHost_release(DocHost *iface) { - IEDocHost *This = impl_from_DocHost(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) { - if(This->ie) - ERR("This->ie is not NULL\n"); - heap_free(This); - } - - return ref; + InternetExplorer *This = impl_from_DocHost(iface); + return IWebBrowser2_Release(&This->IWebBrowser2_iface); } static void WINAPI DocHostContainer_GetDocObjRect(DocHost* This, RECT* rc) @@ -770,19 +759,16 @@ static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost *iface, LPCWSTR text) { - IEDocHost *This = impl_from_DocHost(iface); - return update_ie_statustext(This->ie, text); + InternetExplorer *This = impl_from_DocHost(iface); + return update_ie_statustext(This, text); } static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) { - IEDocHost *This = impl_from_DocHost(iface); - - if(!This->ie) - return; - - This->ie->nohome = FALSE; - SendMessageW(This->ie->frame_hwnd, WM_UPDATEADDRBAR, 0, (LPARAM)url); + InternetExplorer *This = impl_from_DocHost(iface); + + This->nohome = FALSE; + SendMessageW(This->frame_hwnd, WM_UPDATEADDRBAR, 0, (LPARAM)url); } static HRESULT DocHostContainer_exec(DocHost* This, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, @@ -808,21 +794,13 @@ if(!ret) return E_OUTOFMEMORY; - ret->doc_host = heap_alloc_zero(sizeof(IEDocHost)); - if(!ret->doc_host) { - heap_free(ret); - return E_OUTOFMEMORY; - } - ret->ref = 1; - ret->doc_host->ref = 1; - ret->doc_host->ie = ret; - - DocHost_Init(&ret->doc_host->doc_host, &ret->IWebBrowser2_iface, &DocHostContainerVtbl); + + DocHost_Init(&ret->doc_host, &ret->IWebBrowser2_iface, &DocHostContainerVtbl); InternetExplorer_WebBrowser_Init(ret); - HlinkFrame_Init(&ret->hlink_frame, (IUnknown*)&ret->IWebBrowser2_iface, &ret->doc_host->doc_host); + HlinkFrame_Init(&ret->hlink_frame, (IUnknown*)&ret->IWebBrowser2_iface, &ret->doc_host); create_frame_hwnd(ret); @@ -1030,9 +1008,8 @@ if(!ddestr_openurl) WARN("Failed to create string handle: %u\n", DdeGetLastError(dde_inst)); - res = HandleToULong(DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER)); - if(res != DMLERR_NO_ERROR) - WARN("DdeNameService failed: %u\n", res); + if(!DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER)) + WARN("DdeNameService failed\n"); } static void release_dde(void) Modified: trunk/reactos/dll/win32/ieframe/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/navigate… ============================================================================== --- trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -27,6 +27,7 @@ #include <shlwapi.h> #include <wininet.h> //#include "mshtml.h" +#include <perhist.h> #include "resource.h" #include <wine/debug.h> @@ -1058,27 +1059,54 @@ return navigate_url(This, wszPageName, NULL, NULL, NULL, NULL); } +static HRESULT navigate_history(DocHost *This, unsigned travellog_pos) +{ + IPersistHistory *persist_history; + travellog_entry_t *entry; + LARGE_INTEGER li; + HRESULT hres; + + if(!This->doc_navigate) { + FIXME("unsupported doc_navigate FALSE\n"); + return E_NOTIMPL; + } + + This->travellog.loading_pos = travellog_pos; + entry = This->travellog.log + This->travellog.loading_pos; + + if(!entry->stream) + return async_doc_navigate(This, entry->url, NULL, NULL, 0, FALSE); + + hres = IUnknown_QueryInterface(This->document, &IID_IPersistHistory, (void**)&persist_history); + if(FAILED(hres)) + return hres; + + li.QuadPart = 0; + IStream_Seek(entry->stream, li, STREAM_SEEK_SET, NULL); + + hres = IPersistHistory_LoadHistory(persist_history, entry->stream, NULL); + IPersistHistory_Release(persist_history); + return hres; +} + HRESULT go_back(DocHost *This) { - WCHAR *url; - HRESULT hres; - - if(!This->travellog_position) { + if(!This->travellog.position) { WARN("No history available\n"); return E_FAIL; } - url = This->travellog[--This->travellog_position].url; - - if(This->doc_navigate) { - hres = async_doc_navigate(This, url, NULL, NULL, 0, FALSE); - }else { - FIXME("unsupported doc_navigate FALSE\n"); - hres = E_NOTIMPL; - } - - heap_free(url); - return hres; + return navigate_history(This, This->travellog.position-1); +} + +HRESULT go_forward(DocHost *This) +{ + if(This->travellog.position >= This->travellog.length) { + WARN("No history available\n"); + return E_FAIL; + } + + return navigate_history(This, This->travellog.position+1); } HRESULT get_location_url(DocHost *This, BSTR *ret) Modified: trunk/reactos/dll/win32/ieframe/shellbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shellbro… ============================================================================== --- trunk/reactos/dll/win32/ieframe/shellbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/shellbrowser.c [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -726,6 +726,7 @@ DWORD dwFlags) { ShellBrowser *This = impl_from_IDocObjectService(iface); + DocHost *doc_host = This->doc_host; IHTMLPrivateWindow *priv_window; VARIANTARG params[2]; DISPPARAMS dp = {params, NULL, 2, 0}; @@ -735,6 +736,12 @@ TRACE("%p %p %x\n", This, pHTMLWindow2, dwFlags); + if(doc_host->travellog.loading_pos != -1) { + WARN("histupdate not notified\n"); + doc_host->travellog.position = doc_host->travellog.loading_pos; + doc_host->travellog.loading_pos = -1; + } + hres = IHTMLWindow2_QueryInterface(pHTMLWindow2, &IID_IHTMLPrivateWindow, (void**)&priv_window); if(FAILED(hres)) return hres; @@ -751,7 +758,7 @@ V_VARIANTREF(params) = &url_var; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; + V_DISPATCH(params+1) = (IDispatch*)doc_host->wb; V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; @@ -817,12 +824,18 @@ V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dp); TRACE("<<<\n"); SysFreeString(url); - This->doc_host->busy = VARIANT_FALSE; + if(This->doc_host) + This->doc_host->busy = VARIANT_FALSE; + + IShellBrowser_Release(&This->IShellBrowser_iface); return S_OK; } Modified: trunk/reactos/dll/win32/ieframe/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/webbrows… ============================================================================== --- trunk/reactos/dll/win32/ieframe/webbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/webbrowser.c [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -259,8 +259,8 @@ static HRESULT WINAPI WebBrowser_GoForward(IWebBrowser2 *iface) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return go_forward(&This->doc_host); } static HRESULT WINAPI WebBrowser_GoHome(IWebBrowser2 *iface) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 19 18:48:34 2013 @@ -80,7 +80,7 @@ reactos/dll/win32/httpapi # Synced to Wine-1.7.1 reactos/dll/win32/iccvid # Synced to Wine-1.7.1 reactos/dll/win32/icmp # Synced to Wine-0_9_10 -reactos/dll/win32/ieframe # Synced to Wine-1.5.26 +reactos/dll/win32/ieframe # Synced to Wine-1.7.1 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.5.4 reactos/dll/win32/imagehlp # Synced to Wine-1.5.4 reactos/dll/win32/imm32 # Synced to Wine-1.5.19

1 0

[akhaldi] 60214: [ICCVID] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 19 Sep '13

19 Sep '13

Author: akhaldi Date: Thu Sep 19 17:52:48 2013 New Revision: 60214 URL: http://svn.reactos.org/svn/reactos?rev=60214&view=rev Log: [ICCVID] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/iccvid/CMakeLists.txt trunk/reactos/dll/win32/iccvid/iccvid.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/iccvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] Thu Sep 19 17:52:48 2013 @@ -5,10 +5,9 @@ list(APPEND SOURCE iccvid.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def) -add_library(iccvid SHARED ${SOURCE}) +add_library(iccvid SHARED ${SOURCE} rsrc.rc) set_module_type(iccvid win32dll) target_link_libraries(iccvid wine) add_importlibs(iccvid user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/iccvid/iccvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.c?… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid.c [iso-8859-1] Thu Sep 19 17:52:48 2013 @@ -1039,9 +1039,6 @@ DisableThreadLibraryCalls(hModule); ICCVID_hModule = hModule; break; - - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 19 17:52:48 2013 @@ -78,7 +78,7 @@ reactos/dll/win32/hlink # Synced to Wine-1.7.1 reactos/dll/win32/hnetcfg # Synced to Wine-1.7.1 reactos/dll/win32/httpapi # Synced to Wine-1.7.1 -reactos/dll/win32/iccvid # Synced to Wine-1.5.19 +reactos/dll/win32/iccvid # Synced to Wine-1.7.1 reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/ieframe # Synced to Wine-1.5.26 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.5.4

1 0

[akhaldi] 60213: [HTTPAPI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 19 Sep '13

19 Sep '13

Author: akhaldi Date: Thu Sep 19 17:38:46 2013 New Revision: 60213 URL: http://svn.reactos.org/svn/reactos?rev=60213&view=rev Log: [HTTPAPI] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/httpapi/CMakeLists.txt trunk/reactos/dll/win32/httpapi/httpapi.spec trunk/reactos/dll/win32/httpapi/httpapi_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/httpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/httpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/httpapi/CMakeLists.txt [iso-8859-1] Thu Sep 19 17:38:46 2013 @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(httpapi.dll httpapi.spec) list(APPEND SOURCE @@ -11,7 +9,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def) add_library(httpapi SHARED ${SOURCE}) - set_module_type(httpapi win32dll) target_link_libraries(httpapi wine) add_importlibs(httpapi msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/httpapi/httpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/httpapi.… ============================================================================== --- trunk/reactos/dll/win32/httpapi/httpapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/httpapi/httpapi.spec [iso-8859-1] Thu Sep 19 17:38:46 2013 @@ -1,5 +1,5 @@ @ stub HttpAddFragmentToCache -@ stub HttpAddUrl +@ stdcall HttpAddUrl(ptr wstr ptr) @ stub HttpAddUrlToConfigGroup @ stub HttpCancelHttpRequest @ stub HttpCreateAppPool Modified: trunk/reactos/dll/win32/httpapi/httpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/httpapi_… ============================================================================== --- trunk/reactos/dll/win32/httpapi/httpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/httpapi/httpapi_main.c [iso-8859-1] Thu Sep 19 17:38:46 2013 @@ -41,8 +41,6 @@ return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); - break; - case DLL_PROCESS_DETACH: break; } return TRUE; @@ -180,3 +178,12 @@ FIXME( "(%p, %d): stub!\n", handle, reserved); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * HttpAddUrl (HTTPAPI.@) + */ +ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved ) +{ + FIXME( "(%p, %s, %p): stub!\n", handle, debugstr_w(url), reserved ); + return ERROR_CALL_NOT_IMPLEMENTED; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 19 17:38:46 2013 @@ -77,7 +77,7 @@ reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.1 reactos/dll/win32/hlink # Synced to Wine-1.7.1 reactos/dll/win32/hnetcfg # Synced to Wine-1.7.1 -reactos/dll/win32/httpapi # Synced to Wine-1.5.4 +reactos/dll/win32/httpapi # Synced to Wine-1.7.1 reactos/dll/win32/iccvid # Synced to Wine-1.5.19 reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/ieframe # Synced to Wine-1.5.26

1 0

[akhaldi] 60212: [HNETCFG] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 19 Sep '13

19 Sep '13

Author: akhaldi Date: Thu Sep 19 17:25:36 2013 New Revision: 60212 URL: http://svn.reactos.org/svn/reactos?rev=60212&view=rev Log: [HNETCFG] * Sync with Wine 1.7.1. CORE-7469 Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg_tlb.idl (with props) trunk/reactos/dll/win32/hnetcfg/hnetcfg_tlb.rgs (with props) Modified: trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt trunk/reactos/dll/win32/hnetcfg/apps.c trunk/reactos/dll/win32/hnetcfg/hnetcfg.c trunk/reactos/dll/win32/hnetcfg/hnetcfg.rc trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h trunk/reactos/dll/win32/hnetcfg/manager.c trunk/reactos/dll/win32/hnetcfg/policy.c trunk/reactos/dll/win32/hnetcfg/profile.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -1,6 +1,3 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -14,18 +11,18 @@ port.c profile.c service.c - hnetcfg.rc ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def) -add_library(hnetcfg SHARED ${SOURCE}) +add_library(hnetcfg SHARED ${SOURCE} hnetcfg.rc) +add_typelib(hnetcfg_tlb.idl) + +list(APPEND hnetcfg_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/hnetcfg.rgs + ${CMAKE_CURRENT_SOURCE_DIR}/hnetcfg_tlb.rgs + ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg_tlb.tlb) + +set_source_files_properties(hnetcfg.rc PROPERTIES OBJECT_DEPENDS "${hnetcfg_rc_deps}") set_module_type(hnetcfg win32dll) target_link_libraries(hnetcfg wine uuid) - -add_importlibs(hnetcfg - ole32 - advapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(hnetcfg ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET hnetcfg DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/hnetcfg/apps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/apps.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -33,7 +33,7 @@ #include <netfw.h> #include <wine/debug.h> -//#include "wine/unicode.h" +#include <wine/unicode.h> #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); @@ -99,8 +99,55 @@ { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static ITypeLib *typelib; +static ITypeInfo *typeinfo[last_tid]; + +static REFIID tid_id[] = +{ + &IID_INetFwAuthorizedApplication, + &IID_INetFwAuthorizedApplications, + &IID_INetFwMgr, + &IID_INetFwPolicy, + &IID_INetFwProfile +}; + +HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) +{ + HRESULT hr; + + if (!typelib) + { + ITypeLib *lib; + + hr = LoadRegTypeLib( &LIBID_NetFwPublicTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &lib ); + if (FAILED(hr)) + { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + if (InterlockedCompareExchangePointer( (void **)&typelib, lib, NULL )) + ITypeLib_Release( lib ); + } + if (!typeinfo[tid]) + { + ITypeInfo *info; + + hr = ITypeLib_GetTypeInfoOfGuid( typelib, tid_id[tid], &info ); + if (FAILED(hr)) + { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_id[tid]), hr); + return hr; + } + if (InterlockedCompareExchangePointer( (void **)(typeinfo + tid), info, NULL )) + ITypeInfo_Release( info ); + } + *ret = typeinfo[tid]; + return S_OK; } static HRESULT WINAPI fw_app_GetTypeInfo( @@ -111,8 +158,8 @@ { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwAuthorizedApplication_tid, ppTInfo ); } static HRESULT WINAPI fw_app_GetIDsOfNames( @@ -124,9 +171,18 @@ DISPID *rgDispId ) { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwAuthorizedApplication_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_app_Invoke( @@ -141,10 +197,20 @@ UINT *puArgErr ) { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwAuthorizedApplication_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwAuthorizedApplication_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_app_get_Name( @@ -224,7 +290,7 @@ fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %u\n", This, scope); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI fw_app_get_RemoteAddresses( @@ -382,8 +448,8 @@ { fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwAuthorizedApplications_tid, ppTInfo ); } static HRESULT WINAPI fw_apps_GetIDsOfNames( @@ -395,9 +461,18 @@ DISPID *rgDispId ) { fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); - - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwAuthorizedApplications_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_apps_Invoke( @@ -412,10 +487,20 @@ UINT *puArgErr ) { fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); - - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwAuthorizedApplications_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwAuthorizedApplications_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_apps_get_Count( Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -128,8 +128,6 @@ instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.rc [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -1 +1,3 @@ 1 WINE_REGISTRY hnetcfg.rgs +2 WINE_REGISTRY hnetcfg_tlb.rgs +1 TYPELIB hnetcfg_tlb.tlb Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -16,6 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +enum type_id +{ + INetFwAuthorizedApplication_tid, + INetFwAuthorizedApplications_tid, + INetFwMgr_tid, + INetFwPolicy_tid, + INetFwProfile_tid, + last_tid +}; + +HRESULT get_typeinfo(enum type_id, ITypeInfo **) DECLSPEC_HIDDEN; + HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwProfile_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_tlb.idl (added) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_tlb.idl [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -0,0 +1,21 @@ +/* + * Typelib for hnetcfg + * + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "netfw.idl" Propchange: trunk/reactos/dll/win32/hnetcfg/hnetcfg_tlb.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg_tlb.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_tlb.rgs (added) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_tlb.rgs [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -0,0 +1,20 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{DB4F3345-3EF8-45ED-B976-25A6D3B81B71}' + { + '1.0' = s 'NetFwPublicTypeLib' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + } + NoRemove CLSID + { + } +} Propchange: trunk/reactos/dll/win32/hnetcfg/hnetcfg_tlb.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/hnetcfg/manager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/manager.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/manager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/manager.c [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -100,8 +100,9 @@ { fw_manager *This = impl_from_INetFwMgr( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_manager_GetTypeInfo( @@ -112,8 +113,8 @@ { fw_manager *This = impl_from_INetFwMgr( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwMgr_tid, ppTInfo ); } static HRESULT WINAPI fw_manager_GetIDsOfNames( @@ -125,9 +126,18 @@ DISPID *rgDispId ) { fw_manager *This = impl_from_INetFwMgr( iface ); - - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwMgr_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_manager_Invoke( @@ -142,10 +152,20 @@ UINT *puArgErr ) { fw_manager *This = impl_from_INetFwMgr( iface ); - - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwMgr_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwMgr_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_manager_get_LocalPolicy( Modified: trunk/reactos/dll/win32/hnetcfg/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/policy.c… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/policy.c [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -99,8 +99,9 @@ { fw_policy *This = impl_from_INetFwPolicy( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_policy_GetTypeInfo( @@ -111,8 +112,8 @@ { fw_policy *This = impl_from_INetFwPolicy( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwPolicy_tid, ppTInfo ); } static HRESULT WINAPI fw_policy_GetIDsOfNames( @@ -124,9 +125,18 @@ DISPID *rgDispId ) { fw_policy *This = impl_from_INetFwPolicy( iface ); - - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwPolicy_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_policy_Invoke( @@ -141,10 +151,20 @@ UINT *puArgErr ) { fw_policy *This = impl_from_INetFwPolicy( iface ); - - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwPolicy_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwPolicy_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_policy_get_CurrentProfile( Modified: trunk/reactos/dll/win32/hnetcfg/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/profile.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/profile.c [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -99,8 +99,9 @@ { fw_profile *This = impl_from_INetFwProfile( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_profile_GetTypeInfo( @@ -111,8 +112,8 @@ { fw_profile *This = impl_from_INetFwProfile( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwProfile_tid, ppTInfo ); } static HRESULT WINAPI fw_profile_GetIDsOfNames( @@ -124,9 +125,18 @@ DISPID *rgDispId ) { fw_profile *This = impl_from_INetFwProfile( iface ); - - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwProfile_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_profile_Invoke( @@ -141,10 +151,20 @@ UINT *puArgErr ) { fw_profile *This = impl_from_INetFwProfile( iface ); - - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwProfile_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwProfile_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_profile_get_Type( Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 19 17:25:36 2013 @@ -76,7 +76,7 @@ reactos/dll/win32/gdiplus # Synced to Wine-1.7.1 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.1 reactos/dll/win32/hlink # Synced to Wine-1.7.1 -reactos/dll/win32/hnetcfg # Synced to Wine-1.5.4 +reactos/dll/win32/hnetcfg # Synced to Wine-1.7.1 reactos/dll/win32/httpapi # Synced to Wine-1.5.4 reactos/dll/win32/iccvid # Synced to Wine-1.5.19 reactos/dll/win32/icmp # Synced to Wine-0_9_10

1 0

[akhaldi] 60211: [PSDK] * Annotate mswsock.h. CORE-7474
by akhaldi＠svn.reactos.org 19 Sep '13

19 Sep '13

Author: akhaldi Date: Thu Sep 19 16:38:42 2013 New Revision: 60211 URL: http://svn.reactos.org/svn/reactos?rev=60211&view=rev Log: [PSDK] * Annotate mswsock.h. CORE-7474 Modified: trunk/reactos/include/psdk/mswsock.h Modified: trunk/reactos/include/psdk/mswsock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mswsock.h?rev… ============================================================================== --- trunk/reactos/include/psdk/mswsock.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mswsock.h [iso-8859-1] Thu Sep 19 16:38:42 2013 @@ -86,35 +86,35 @@ typedef BOOL (PASCAL FAR *LPFN_TRANSMITFILE)( - IN SOCKET hSocket, - IN HANDLE hFile, - IN DWORD nNumberOfBytesToWrite, - IN DWORD nNumberOfBytesPerSend, - IN OUT LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers OPTIONAL, - IN DWORD dwReserved); + _In_ SOCKET hSocket, + _In_ HANDLE hFile, + _In_ DWORD nNumberOfBytesToWrite, + _In_ DWORD nNumberOfBytesPerSend, + _Inout_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers, + _In_ DWORD dwReserved); typedef BOOL (PASCAL FAR *LPFN_ACCEPTEX)( - IN SOCKET sListenSocket, - IN SOCKET sAcceptSocket, - IN PVOID lpOutputBuffer, - IN DWORD dwReceiveDataLength, - IN DWORD dwLocalAddressLength, - IN DWORD dwRemoteAddressLength, - OUT LPDWORD lpdwBytesReceived, - IN OUT LPOVERLAPPED lpOverlapped); + _In_ SOCKET sListenSocket, + _In_ SOCKET sAcceptSocket, + _Out_writes_bytes_(dwReceiveDataLength + dwLocalAddressLength + dwRemoteAddressLength) PVOID lpOutputBuffer, + _In_ DWORD dwReceiveDataLength, + _In_ DWORD dwLocalAddressLength, + _In_ DWORD dwRemoteAddressLength, + _Out_ LPDWORD lpdwBytesReceived, + _Inout_ LPOVERLAPPED lpOverlapped); typedef VOID (PASCAL FAR *LPFN_GETACCEPTEXSOCKADDRS)( - IN PVOID lpOutputBuffer, - IN DWORD dwReceiveDataLength, - IN DWORD dwLocalAddressLength, - IN DWORD dwRemoteAddressLength, - OUT struct sockaddr **LocalSockaddr, - OUT LPINT LocalSockaddrLength, - OUT struct sockaddr **RemoteSockaddr, - OUT LPINT RemoteSockaddrLength); + _In_reads_bytes_(dwReceiveDataLength + dwLocalAddressLength + dwRemoteAddressLength) PVOID lpOutputBuffer, + _In_ DWORD dwReceiveDataLength, + _In_ DWORD dwLocalAddressLength, + _In_ DWORD dwRemoteAddressLength, + _Outptr_result_bytebuffer_(*LocalSockaddrLength) struct sockaddr **LocalSockaddr, + _Out_ LPINT LocalSockaddrLength, + _Outptr_result_bytebuffer_(*RemoteSockaddrLength) struct sockaddr **RemoteSockaddr, + _Out_ LPINT RemoteSockaddrLength); #if(_WIN32_WINNT >= 0x0501) @@ -132,35 +132,35 @@ typedef BOOL (PASCAL FAR *LPFN_TRANSMITPACKETS)( - IN SOCKET hSocket, - IN LPTRANSMIT_PACKETS_ELEMENT lpPacketArray OPTIONAL, - IN DWORD nElementCount, - IN DWORD nSendSize, - IN OUT LPOVERLAPPED lpOverlapped OPTIONAL, - IN DWORD dwFlags); + _In_ SOCKET hSocket, + _In_opt_ LPTRANSMIT_PACKETS_ELEMENT lpPacketArray, + _In_ DWORD nElementCount, + _In_ DWORD nSendSize, + _Inout_opt_ LPOVERLAPPED lpOverlapped, + _In_ DWORD dwFlags); #define WSAID_TRANSMITPACKETS \ {0xd9689da0,0x1f90,0x11d3,{0x99,0x71,0x00,0xc0,0x4f,0x68,0xc8,0x76}} typedef BOOL (PASCAL FAR *LPFN_CONNECTEX)( - IN SOCKET s, - IN const struct sockaddr FAR *name, - IN int namelen, - IN PVOID lpSendBuffer OPTIONAL, - IN DWORD dwSendDataLength, - OUT LPDWORD lpdwBytesSent, - IN OUT LPOVERLAPPED lpOverlapped); + _In_ SOCKET s, + _In_reads_bytes_(namelen) const struct sockaddr FAR *name, + _In_ int namelen, + _In_reads_bytes_opt_(dwSendDataLength) PVOID lpSendBuffer, + _In_ DWORD dwSendDataLength, + _Out_ LPDWORD lpdwBytesSent, + _Inout_ LPOVERLAPPED lpOverlapped); #define WSAID_CONNECTEX \ {0x25a207b9,0xddf3,0x4660,{0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e}} typedef BOOL (PASCAL FAR *LPFN_DISCONNECTEX)( - IN SOCKET s, - IN OUT LPOVERLAPPED lpOverlapped OPTIONAL, - IN DWORD dwFlags, - IN DWORD dwReserved); + _In_ SOCKET s, + _Inout_opt_ LPOVERLAPPED lpOverlapped, + _In_ DWORD dwFlags, + _In_ DWORD dwReserved); #define WSAID_DISCONNECTEX \ {0x7fda2e11,0x8630,0x436f,{0xa0, 0x31, 0xf5, 0x36, 0xa6, 0xee, 0xc1, 0x57}} @@ -231,11 +231,11 @@ typedef INT (PASCAL FAR *LPFN_WSARECVMSG)( - IN SOCKET s, - IN OUT LPWSAMSG lpMsg, - OUT LPDWORD lpdwNumberOfBytesRecvd OPTIONAL, - IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL); + _In_ SOCKET s, + _Inout_ LPWSAMSG lpMsg, + _Out_opt_ LPDWORD lpdwNumberOfBytesRecvd, + _Inout_opt_ LPWSAOVERLAPPED lpOverlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); #define WSAID_WSARECVMSG \ {0xf689d7c8,0x6f1f,0x436b,{0x8a,0x53,0xe5,0x4f,0xe3,0x51,0xc3,0x22}} @@ -271,21 +271,21 @@ typedef INT (PASCAL FAR *LPFN_WSASENDMSG)( - IN SOCKET s, - IN LPWSAMSG lpMsg, - IN DWORD dwFlags, - OUT LPDWORD lpNumberOfBytesSent OPTIONAL, - IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL); + _In_ SOCKET s, + _In_ LPWSAMSG lpMsg, + _In_ DWORD dwFlags, + _Out_opt_ LPDWORD lpNumberOfBytesSent, + _Inout_opt_ LPWSAOVERLAPPED lpOverlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); #define WSAID_WSASENDMSG {0xa441e712,0x754f,0x43ca,{0x84,0xa7,0x0d,0xee,0x44,0xcf,0x60,0x6d}} typedef INT (WSAAPI *LPFN_WSAPOLL)( - IN OUT LPWSAPOLLFD fdarray, - IN ULONG nfds, - IN INT timeout); + _Inout_ LPWSAPOLLFD fdarray, + _In_ ULONG nfds, + _In_ INT timeout); #define WSAID_WSAPOLL \ {0x18C76F85,0xDC66,0x4964,{0x97,0x2E,0x23,0xC2,0x72,0x38,0x31,0x2B}} @@ -297,58 +297,58 @@ PASCAL FAR WSARecvEx( - IN SOCKET s, - OUT char FAR *buf, - IN int len, - IN OUT int FAR *flags); + _In_ SOCKET s, + _Out_writes_bytes_to_(len, return) char FAR *buf, + _In_ int len, + _Inout_ int FAR *flags); #else INT PASCAL FAR WSARecvEx( - IN SOCKET s, - OUT CHAR FAR *buf, - IN INT len, - IN OUT INT FAR *flags); + _In_ SOCKET s, + _Out_writes_bytes_to_(len, return) CHAR FAR *buf, + _In_ INT len, + _Inout_ INT FAR *flags); #endif /* (_WIN32_WINNT < 0x0600) */ BOOL PASCAL FAR TransmitFile( - IN SOCKET hSocket, - IN HANDLE hFile, - IN DWORD nNumberOfBytesToWrite, - IN DWORD nNumberOfBytesPerSend, - IN OUT LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers OPTIONAL, - IN DWORD dwReserved); + _In_ SOCKET hSocket, + _In_ HANDLE hFile, + _In_ DWORD nNumberOfBytesToWrite, + _In_ DWORD nNumberOfBytesPerSend, + _Inout_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers, + _In_ DWORD dwReserved); BOOL PASCAL FAR AcceptEx( - IN SOCKET sListenSocket, - IN SOCKET sAcceptSocket, - OUT PVOID lpOutputBuffer, - IN DWORD dwReceiveDataLength, - IN DWORD dwLocalAddressLength, - IN DWORD dwRemoteAddressLength, - OUT LPDWORD lpdwBytesReceived, - IN OUT LPOVERLAPPED lpOverlapped); + _In_ SOCKET sListenSocket, + _In_ SOCKET sAcceptSocket, + _Out_writes_bytes_(dwReceiveDataLength + dwLocalAddressLength + dwRemoteAddressLength) PVOID lpOutputBuffer, + _In_ DWORD dwReceiveDataLength, + _In_ DWORD dwLocalAddressLength, + _In_ DWORD dwRemoteAddressLength, + _Out_ LPDWORD lpdwBytesReceived, + _Inout_ LPOVERLAPPED lpOverlapped); VOID PASCAL FAR GetAcceptExSockaddrs( - IN PVOID lpOutputBuffer, - IN DWORD dwReceiveDataLength, - IN DWORD dwLocalAddressLength, - IN DWORD dwRemoteAddressLength, - OUT struct sockaddr **LocalSockaddr, - OUT LPINT LocalSockaddrLength, - OUT struct sockaddr **RemoteSockaddr, - OUT LPINT RemoteSockaddrLength); + _In_reads_bytes_(dwReceiveDataLength + dwLocalAddressLength + dwRemoteAddressLength) PVOID lpOutputBuffer, + _In_ DWORD dwReceiveDataLength, + _In_ DWORD dwLocalAddressLength, + _In_ DWORD dwRemoteAddressLength, + _Outptr_result_bytebuffer_(*LocalSockaddrLength) struct sockaddr **LocalSockaddr, + _Out_ LPINT LocalSockaddrLength, + _Outptr_result_bytebuffer_(*RemoteSockaddrLength) struct sockaddr **RemoteSockaddr, + _Out_ LPINT RemoteSockaddrLength); #ifdef __cplusplus }

1 0

[akhaldi] 60210: [HLINK_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 19 Sep '13

19 Sep '13

Author: akhaldi Date: Thu Sep 19 16:12:38 2013 New Revision: 60210 URL: http://svn.reactos.org/svn/reactos?rev=60210&view=rev Log: [HLINK_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/hlink/CMakeLists.txt trunk/rostests/winetests/hlink/browse_ctx.c trunk/rostests/winetests/hlink/hlink.c trunk/rostests/winetests/hlink/testlist.c Modified: trunk/rostests/winetests/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/CMakeList… ============================================================================== --- trunk/rostests/winetests/hlink/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/CMakeLists.txt [iso-8859-1] Thu Sep 19 16:12:38 2013 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE browse_ctx.c @@ -9,7 +7,6 @@ testlist.c) add_executable(hlink_winetest ${SOURCE}) -target_link_libraries(hlink_winetest wine uuid) set_module_type(hlink_winetest win32cui) -add_importlibs(hlink_winetest hlink ole32 msvcrt kernel32 ntdll) +add_importlibs(hlink_winetest hlink ole32 msvcrt kernel32) add_cd_file(TARGET hlink_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/hlink/browse_ctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/browse_ct… ============================================================================== --- trunk/rostests/winetests/hlink/browse_ctx.c [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/browse_ctx.c [iso-8859-1] Thu Sep 19 16:12:38 2013 @@ -49,6 +49,19 @@ hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, NULL); ok(hres == S_OK, "SetInitialHlink failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, NULL); + ok(hres == CO_E_ALREADYINITIALIZED, "got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, five, NULL); + ok(hres == CO_E_ALREADYINITIALIZED, "got 0x%08x\n", hres); + + /* there's only one */ + hres = IHlinkBrowseContext_GetHlink(bc, HLID_PREVIOUS, &found_hlink); + ok(hres == E_FAIL, "got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetHlink(bc, HLID_NEXT, &found_hlink); + ok(hres == E_FAIL, "got 0x%08x\n", hres); hres = IHlinkBrowseContext_GetHlink(bc, HLID_CURRENT, &found_hlink); ok(hres == S_OK, "GetHlink failed: 0x%08x\n", hres); Modified: trunk/rostests/winetests/hlink/hlink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/hlink.c?r… ============================================================================== --- trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] Thu Sep 19 16:12:38 2013 @@ -55,6 +55,7 @@ DEFINE_EXPECT(IsSystemMoniker); DEFINE_EXPECT(BindToStorage); +DEFINE_EXPECT(BindToObject); DEFINE_EXPECT(GetDisplayName); DEFINE_EXPECT(ComposeWith); @@ -64,6 +65,19 @@ DEFINE_EXPECT(GetClassID); DEFINE_EXPECT(Save); + +DEFINE_EXPECT(HBC_QueryInterface_IHlinkHistory); +DEFINE_EXPECT(HBC_GetObject); +DEFINE_EXPECT(HBC_UpdateHlink); + +DEFINE_EXPECT(HT_SetBrowseContext); +DEFINE_EXPECT(HT_GetBrowseContext); +DEFINE_EXPECT(HT_Navigate); +DEFINE_EXPECT(HT_GetFriendlyName); + +DEFINE_EXPECT(HLF_UpdateHlink); + +DEFINE_GUID(IID_IHlinkHistory,0x79eac9c8,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); static const char *debugstr_guid(REFIID riid) { @@ -796,6 +810,229 @@ static IBindStatusCallback BindStatusCallback = { &BindStatusCallbackVtbl }; +static HRESULT WINAPI HlinkBrowseContext_QueryInterface( + IHlinkBrowseContext *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IHlinkHistory, riid)) { + CHECK_EXPECT(HBC_QueryInterface_IHlinkHistory); + return E_NOINTERFACE; + } + + ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI HlinkBrowseContext_AddRef(IHlinkBrowseContext *iface) +{ + return 2; +} + +static ULONG WINAPI HlinkBrowseContext_Release(IHlinkBrowseContext *iface) +{ + return 1; +} + +static HRESULT WINAPI HlinkBrowseContext_Register(IHlinkBrowseContext *iface, + DWORD reserved, IUnknown *piunk, IMoniker *pimk, DWORD *pdwRegister) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IMoniker Moniker; +static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, + IMoniker *pimk, BOOL fBindIfRootRegistered, IUnknown **ppiunk) +{ + CHECK_EXPECT(HBC_GetObject); + + ok(pimk == &Moniker, "pimk != &Moniker\n"); + ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); + *ppiunk = NULL; + return S_FALSE; +} + +static HRESULT WINAPI HlinkBrowseContext_Revoke(IHlinkBrowseContext *iface, DWORD dwRegister) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkBrowseContext_SetBrowseWindowInfo( + IHlinkBrowseContext *iface, HLBWINFO *phlbwi) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkBrowseContext_GetBrowseWindowInfo( + IHlinkBrowseContext *iface, HLBWINFO *phlbwi) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkBrowseContext_SetInitialHlink(IHlinkBrowseContext *iface, + IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkBrowseContext_OnNavigateHlink(IHlinkBrowseContext *iface, DWORD grfHLNF, + IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, ULONG *puHLID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkBrowseContext_UpdateHlink(IHlinkBrowseContext *iface, ULONG uHLID, + IMoniker *pimkTarget, LPCWSTR location, LPCWSTR friendly_name) +{ + CHECK_EXPECT(HBC_UpdateHlink); + return S_OK; +} + +static HRESULT WINAPI HlinkBrowseContext_EnumNavigationStack(IHlinkBrowseContext *iface, + DWORD dwReserved, DWORD grfHLFNAMEF, IEnumHLITEM **ppienumhlitem) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkBrowseContext_QueryHlink(IHlinkBrowseContext *iface, + DWORD grfHLQF, ULONG uHLID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkBrowseContext_GetHlink(IHlinkBrowseContext *iface, + ULONG uHLID, IHlink **ppihl) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkBrowseContext_SetCurrentHlink( + IHlinkBrowseContext *iface, ULONG uHLID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkBrowseContext_Clone(IHlinkBrowseContext *iface, + IUnknown *piunkOuter, REFIID riid, IUnknown **ppiunkObj) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkBrowseContext_Close(IHlinkBrowseContext *iface, DWORD reserved) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IHlinkBrowseContextVtbl HlinkBrowseContextVtbl = { + HlinkBrowseContext_QueryInterface, + HlinkBrowseContext_AddRef, + HlinkBrowseContext_Release, + HlinkBrowseContext_Register, + HlinkBrowseContext_GetObject, + HlinkBrowseContext_Revoke, + HlinkBrowseContext_SetBrowseWindowInfo, + HlinkBrowseContext_GetBrowseWindowInfo, + HlinkBrowseContext_SetInitialHlink, + HlinkBrowseContext_OnNavigateHlink, + HlinkBrowseContext_UpdateHlink, + HlinkBrowseContext_EnumNavigationStack, + HlinkBrowseContext_QueryHlink, + HlinkBrowseContext_GetHlink, + HlinkBrowseContext_SetCurrentHlink, + HlinkBrowseContext_Clone, + HlinkBrowseContext_Close +}; + +static IHlinkBrowseContext HlinkBrowseContext = { &HlinkBrowseContextVtbl }; + +static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IHlinkTarget, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI HlinkTarget_AddRef(IHlinkTarget *iface) +{ + return 2; +} + +static ULONG WINAPI HlinkTarget_Release(IHlinkTarget *iface) +{ + return 1; +} + +static HRESULT WINAPI HlinkTarget_SetBrowseContext(IHlinkTarget *iface, + IHlinkBrowseContext *pihlbc) +{ + CHECK_EXPECT(HT_SetBrowseContext); + + ok(pihlbc == &HlinkBrowseContext, "pihlbc != &HlinkBrowseContext (%p)\n", pihlbc); + return S_OK; +} + +static HRESULT WINAPI HlinkTarget_GetBrowseContext(IHlinkTarget *iface, + IHlinkBrowseContext **ppihlbc) +{ + CHECK_EXPECT(HT_GetBrowseContext); + + *ppihlbc = NULL; + return S_OK; +} + +static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, + DWORD grfHLNF, LPCWSTR pwzJumpLocation) +{ + CHECK_EXPECT(HT_Navigate); + + ok(grfHLNF == 0, "grfHLNF = %x\n", grfHLNF); + ok(pwzJumpLocation == NULL, "pwzJumpLocation = %s\n", wine_dbgstr_w(pwzJumpLocation)); + return S_OK; +} + +static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, + LPCWSTR pwzLocation, DWORD dwAssign, IMoniker **ppimkLocation) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkTarget_GetFriendlyName(IHlinkTarget *iface, + LPCWSTR pwzLocation, LPWSTR *ppwzFriendlyName) +{ + CHECK_EXPECT(HT_GetFriendlyName); + return E_NOTIMPL; +} + +static IHlinkTargetVtbl HlinkTargetVtbl = { + HlinkTarget_QueryInterface, + HlinkTarget_AddRef, + HlinkTarget_Release, + HlinkTarget_SetBrowseContext, + HlinkTarget_GetBrowseContext, + HlinkTarget_Navigate, + HlinkTarget_GetMoniker, + HlinkTarget_GetFriendlyName +}; + +static IHlinkTarget HlinkTarget = { &HlinkTargetVtbl }; + static HRESULT WINAPI Moniker_QueryInterface(IMoniker *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -845,11 +1082,19 @@ return E_NOTIMPL; } -static HRESULT WINAPI Moniker_BindToObject(IMoniker *iface, IBindCtx *pcb, IMoniker *pmkToLeft, - REFIID riidResult, void **ppvResult) -{ - ok(0, "unexpected call\n"); - return E_NOTIMPL; +static HRESULT WINAPI Moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, + REFIID riid, void **ppv) +{ + CHECK_EXPECT(BindToObject); + + ok(pbc != _bctx, "pbc != _bctx\n"); + ok(pmkToLeft == NULL, "pmkToLeft = %p\n", pmkToLeft); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(ppv != NULL, "ppv == NULL\n"); + ok(*ppv == NULL, "*ppv = %p\n", *ppv); + + *ppv = &HlinkTarget; + return S_OK; } static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, @@ -950,7 +1195,7 @@ {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', '/','s','i','t','e','/','a','b','o','u','t',0}; - CHECK_EXPECT(GetDisplayName); + CHECK_EXPECT2(GetDisplayName); ok(pbc != NULL, "pbc == NULL\n"); ok(pbc != _bctx, "pbc == _bctx\n"); @@ -1902,6 +2147,142 @@ IHlink_Release(hlink); } +static void test_Hlink_Navigate(void) +{ + IHlink *hlink; + IBindCtx *pbc; + HRESULT hres; + + hres = CreateBindCtx(0, &pbc); + ok(hres == S_OK, "CreateBindCtx failed: %08x\n", hres); + _bctx = pbc; + + SET_EXPECT(Reduce); + SET_EXPECT(Enum); + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(GetDisplayName); + hres = HlinkCreateFromMoniker(&Moniker, NULL, NULL, NULL, + 0, NULL, &IID_IHlink, (void**)&hlink); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: %08x\n", hres); + todo_wine CHECK_CALLED(Reduce); + todo_wine CHECK_CALLED(Enum); + todo_wine CHECK_CALLED(IsSystemMoniker); + CHECK_CALLED(GetDisplayName); + + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(GetDisplayName); + SET_EXPECT(HBC_GetObject); + SET_EXPECT(Reduce); + SET_EXPECT(BindToObject); + SET_EXPECT(HT_GetBrowseContext); + SET_EXPECT(HT_SetBrowseContext); + SET_EXPECT(HBC_QueryInterface_IHlinkHistory); + SET_EXPECT(HT_Navigate); + SET_EXPECT(HT_GetFriendlyName); + hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext); + ok(hres == S_OK, "Navigate failed: %08x\n", hres); + CHECK_CALLED(IsSystemMoniker); + todo_wine CHECK_CALLED(GetDisplayName); + todo_wine CHECK_CALLED(HBC_GetObject); + todo_wine CHECK_CALLED(Reduce); + CHECK_CALLED(BindToObject); + todo_wine CHECK_CALLED(HT_GetBrowseContext); + CHECK_CALLED(HT_SetBrowseContext); + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); + CHECK_CALLED(HT_Navigate); + todo_wine CHECK_CALLED(HT_GetFriendlyName); + + IHlink_Release(hlink); + IBindCtx_Release(pbc); + _bctx = NULL; +} + +static HRESULT WINAPI hlinkframe_QueryInterface(IHlinkFrame *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IHlinkFrame)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI hlinkframe_AddRef(IHlinkFrame *iface) +{ + return 2; +} + +static ULONG WINAPI hlinkframe_Release(IHlinkFrame *iface) +{ + return 1; +} + +static HRESULT WINAPI hlinkframe_SetBrowseContext(IHlinkFrame *iface, IHlinkBrowseContext *bc) +{ + ok(0, "unexpected %p\n", bc); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_GetBrowseContext(IHlinkFrame *iface, IHlinkBrowseContext **bc) +{ + *bc = NULL; + ok(0, "unexpected %p\n", bc); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPBC pbc, IBindStatusCallback *bsc, IHlink *navigate) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name, + DWORD reserved) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_UpdateHlink(IHlinkFrame *iface, ULONG uHLID, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name) +{ + CHECK_EXPECT(HLF_UpdateHlink); + return S_OK; +} + +static IHlinkFrameVtbl hlinkframevtbl = { + hlinkframe_QueryInterface, + hlinkframe_AddRef, + hlinkframe_Release, + hlinkframe_SetBrowseContext, + hlinkframe_GetBrowseContext, + hlinkframe_Navigate, + hlinkframe_OnNavigate, + hlinkframe_UpdateHlink +}; + +static IHlinkFrame testframe = { &hlinkframevtbl }; + +static void test_HlinkUpdateStackItem(void) +{ + static const WCHAR location[] = {'l','o','c','a','t','i','o','n',0}; + HRESULT hr; + + hr = HlinkUpdateStackItem(NULL, NULL, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + SET_EXPECT(HBC_UpdateHlink); + hr = HlinkUpdateStackItem(NULL, &HlinkBrowseContext, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(HBC_UpdateHlink); + + SET_EXPECT(HLF_UpdateHlink); + hr = HlinkUpdateStackItem(&testframe, &HlinkBrowseContext, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(HLF_UpdateHlink); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -1920,6 +2301,8 @@ test_HlinkSite(); test_HlinkClone(); test_StdHlink(); + test_Hlink_Navigate(); + test_HlinkUpdateStackItem(); CoUninitialize(); } Modified: trunk/rostests/winetests/hlink/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/testlist.… ============================================================================== --- trunk/rostests/winetests/hlink/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/testlist.c [iso-8859-1] Thu Sep 19 16:12:38 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_hlink(void); extern void func_browse_ctx(void);

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