* Sync up to trunk HEAD (r62502).

svn path=/branches/shell-experiments/; revision=62503
This commit is contained in:
Amine Khaldi 2014-03-15 14:56:08 +00:00
commit f4388e723d
442 changed files with 16244 additions and 5506 deletions

View file

@ -53,7 +53,7 @@ if((ARCH STREQUAL "i386") AND (NOT MSVC))
target_link_libraries(opengl32 mesa_x86)
endif()
set_module_type(opengl32 win32dll)
set_module_type(opengl32 win32dll HOTPATCHABLE)
add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll)
add_pch(opengl32 opengl32.h SOURCE)

View file

@ -871,7 +871,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrcSrc, HGLRC hglrcDst)
return sw_ShareLists(ctx_src->dhglrc, ctx_dst->dhglrc);
}
BOOL WINAPI wglSwapBuffers(HDC hdc)
BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers(HDC hdc)
{
struct wgl_dc_data* dc_data = get_dc_data(hdc);