Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 16:10:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HLINK] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-15 12:20:55 +01:00
parent 96f371dcdb
commit 7e88971d05
8 changed files with 50 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/hlink/CMakeLists.txt
View file

@ -8,7 +8,7 @@ list(APPEND SOURCE
extserv.c extserv.c
hlink_main.c hlink_main.c
link.c link.c
hlink_private.h) precomp.h)
add_library(hlink SHARED add_library(hlink SHARED
${SOURCE} ${SOURCE}
@ -20,5 +20,5 @@ set_module_type(hlink win32dll)
target_link_libraries(hlink uuid wine) target_link_libraries(hlink uuid wine)
add_delay_importlibs(hlink urlmon) add_delay_importlibs(hlink urlmon)
add_importlibs(hlink shell32 ole32 advapi32 msvcrt kernel32 ntdll) add_importlibs(hlink shell32 ole32 advapi32 msvcrt kernel32 ntdll)
add_pch(hlink hlink_private.h SOURCE) add_pch(hlink precomp.h SOURCE)
add_cd_file(TARGET hlink DESTINATION reactos/system32 FOR all) add_cd_file(TARGET hlink DESTINATION reactos/system32 FOR all)

5
dll/win32/hlink/browse_ctx.c
View file

@ -20,7 +20,10 @@
#include "hlink_private.h" #include "hlink_private.h"
#include <wine/list.h> #include "wine/debug.h"
#include "wine/list.h"
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
struct link_entry struct link_entry
{ {

5
dll/win32/hlink/extserv.c
View file

@ -18,6 +18,11 @@
#include "hlink_private.h" #include "hlink_private.h"
#include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
typedef struct { typedef struct {
IUnknown IUnknown_inner; IUnknown IUnknown_inner;
IAuthenticate IAuthenticate_iface; IAuthenticate IAuthenticate_iface;

9
dll/win32/hlink/hlink_main.c
View file

@ -20,8 +20,13 @@
#include "hlink_private.h" #include "hlink_private.h"
#include <winreg.h> #include "winreg.h"
#include <rpcproxy.h> #include "rpcproxy.h"
#include "hlguids.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
static HINSTANCE instance; static HINSTANCE instance;

41
dll/win32/hlink/hlink_private.h
View file

@ -16,46 +16,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef _HLINK_PRIVATE_H #pragma once
#define _HLINK_PRIVATE_H
#include <stdarg.h> #include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS #define COBJMACROS
#include <windef.h> #include "winerror.h"
#include <winbase.h> #include "windef.h"
#include <ole2.h> #include "winbase.h"
#include <hlink.h> #include "winuser.h"
#include <hlguids.h> #include "ole2.h"
#include "hlink.h"
#include <wine/unicode.h> #include "wine/heap.h"
#include "wine/unicode.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
{
return HeapAlloc(GetProcessHeap(), 0, size);
}
static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size)
{
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
}
static inline BOOL heap_free(void *mem)
{
return HeapFree(GetProcessHeap(), 0, mem);
}
static inline LPWSTR hlink_strdupW(LPCWSTR str) static inline LPWSTR hlink_strdupW(LPCWSTR str)
{ {
LPWSTR ret = NULL; LPWSTR ret = NULL;
@ -85,5 +64,3 @@ static inline LPWSTR hlink_co_strdupW(LPCWSTR str)
return ret; return ret;
} }
#endif /* _HLINK_PRIVATE_H */

9
dll/win32/hlink/link.c
View file

@ -20,7 +20,12 @@
#include "hlink_private.h" #include "hlink_private.h"
#include <shellapi.h> #include "shellapi.h"
#include "hlguids.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
#define HLINK_SAVE_MAGIC 0x00000002 #define HLINK_SAVE_MAGIC 0x00000002
#define HLINK_SAVE_MONIKER_PRESENT 0x01 #define HLINK_SAVE_MONIKER_PRESENT 0x01
@ -488,7 +493,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc,
if (phbc) if (phbc)
{ {
r = IHlinkBrowseContext_GetObject(phbc, mon, TRUE, &unk); r = IHlinkBrowseContext_GetObject(phbc, mon, TRUE, &unk);
if (r == S_FALSE) if (r != S_OK)
{ {
CreateBindCtx(0, &bcxt); CreateBindCtx(0, &bcxt);
RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); RegisterBindStatusCallback(bcxt, pbsc, NULL, 0);

15
dll/win32/hlink/precomp.h Normal file
View file

@ -0,0 +1,15 @@
#ifndef _HLINK_PRECOMP_H
#define _HLINK_PRECOMP_H
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include "hlink_private.h"
#include <hlguids.h>
#include <wine/debug.h>
#endif /* !_HLINK_PRECOMP_H */

2
media/doc/README.WINE
View file

@ -70,7 +70,7 @@ reactos/dll/win32/fontsub # Synced to WineStaging-2.9
reactos/dll/win32/fusion # Synced to WineStaging-3.3 reactos/dll/win32/fusion # Synced to WineStaging-3.3
reactos/dll/win32/gdiplus # Synced to WineStaging-3.3 reactos/dll/win32/gdiplus # Synced to WineStaging-3.3
reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-3.3 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-3.3
reactos/dll/win32/hlink # Synced to Wine-3.0 reactos/dll/win32/hlink # Synced to WineStaging-3.3
reactos/dll/win32/hnetcfg # Synced to Wine-3.0 reactos/dll/win32/hnetcfg # Synced to Wine-3.0
reactos/dll/win32/httpapi # Synced to WineStaging-2.9 reactos/dll/win32/httpapi # Synced to WineStaging-2.9
reactos/dll/win32/iccvid # Synced to Wine-3.0 reactos/dll/win32/iccvid # Synced to Wine-3.0