Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:45:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHDOCVW]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60377
This commit is contained in:
Amine Khaldi 2013-09-26 16:48:23 +00:00
parent a63c9f2204
commit d3ff11fa03
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/shdocvw/CMakeLists.txt
View file

@ -2,8 +2,8 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D_SHDOCVW_) -D_SHDOCVW_)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB) spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB)
list(APPEND SOURCE list(APPEND SOURCE
@ -17,11 +17,9 @@ set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT
add_library(shdocvw SHARED ${SOURCE} shdocvw.rc) add_library(shdocvw SHARED ${SOURCE} shdocvw.rc)
set_module_type(shdocvw win32dll) set_module_type(shdocvw win32dll)
target_link_libraries(shdocvw uuid wine) target_link_libraries(shdocvw uuid wine)
add_delay_importlibs(shdocvw ole32 oleaut32 ieframe)
add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll) add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll)
add_delay_importlibs(shdocvw version ole32 oleaut32 ieframe)
# shdocvw_v1.tlb needs stdole2.tlb # shdocvw_v1.tlb needs stdole2.tlb
add_dependencies(shdocvw stdole2) add_dependencies(shdocvw stdole2)
add_pch(shdocvw shdocvw.h) add_pch(shdocvw shdocvw.h)
add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all)

6
reactos/dll/win32/shdocvw/shdocvw_main.c
View file

@ -149,9 +149,9 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
break; break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
if (fImpLoad) break;
if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32); if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32);
if(ieframe_instance) if (ieframe_instance) FreeLibrary(ieframe_instance);
FreeLibrary(ieframe_instance);
break; break;
} }
return TRUE; return TRUE;
@ -442,7 +442,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
} }
len = sizeof(buffer) / sizeof(buffer[0]); len = sizeof(buffer) / sizeof(buffer[0]);
res = ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown);
HeapFree(GetProcessHeap(), 0, urlW); HeapFree(GetProcessHeap(), 0, urlW);
needed = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); needed = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL);

2
reactos/media/doc/README.WINE
View file

@ -174,7 +174,7 @@ reactos/dll/win32/security # Forked (different .spec)
reactos/dll/win32/sensapi # Synced to Wine-1.7.1 reactos/dll/win32/sensapi # Synced to Wine-1.7.1
reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/setupapi # Forked at Wine-20050524
reactos/dll/win32/shdoclc # Synced to Wine-1.5.19 reactos/dll/win32/shdoclc # Synced to Wine-1.5.19
reactos/dll/win32/shdocvw # Synced to Wine-1.5.26 reactos/dll/win32/shdocvw # Synced to Wine-1.7.1
reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shell32 # Forked at Wine-20071011
reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shfolder # Autosync
reactos/dll/win32/shlwapi # Synced to Wine-1.5.26 reactos/dll/win32/shlwapi # Synced to Wine-1.5.26