Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 49801: [CMAKE] Add missing asm dependency.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Nov 26 23:05:46 2010 New Revision: 49801 URL: http://svn.reactos.org/svn/reactos?rev=49801&view=rev Log: [CMAKE] Add missing asm dependency. Modified: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt Modified: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/win32ksys/CMa… ============================================================================== --- branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] Fri Nov 26 23:05:46 2010 @@ -1,4 +1,4 @@ set_source_files_properties(${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S PROPERTIES GENERATED TRUE) add_library(win32ksys ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) -add_dependencies(win32ksys win32k_S) +add_dependencies(win32ksys win32k_S asm)

14 years, 5 months

[fireball] 49800: [VENDOR/WINE] - Import Wine-1.3.8 gdi32, user32, winex11.drv, server.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Nov 26 22:59:37 2010 New Revision: 49800 URL: http://svn.reactos.org/svn/reactos?rev=49800&view=rev Log: [VENDOR/WINE] - Import Wine-1.3.8 gdi32, user32, winex11.drv, server. Modified: vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/gdi32/current/tests/icm.c vendor/wine/dlls/user32/current/focus.c vendor/wine/dlls/user32/current/message.c vendor/wine/dlls/user32/current/painting.c vendor/wine/dlls/user32/current/tests/win.c vendor/wine/dlls/user32/current/user32.spec vendor/wine/dlls/user32/current/win.c vendor/wine/dlls/winex11.drv/current/event.c vendor/wine/dlls/winex11.drv/current/window.c vendor/wine/dlls/winex11.drv/current/x11drv_main.c Modified: vendor/wine/dlls/gdi32/current/tests/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/fon… ============================================================================== --- vendor/wine/dlls/gdi32/current/tests/font.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/tests/font.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -1017,16 +1017,28 @@ hdc = GetDC(0); + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "System"); + lf.lfHeight = 16; + lf.lfCharSet = ANSI_CHARSET; + + hfont = CreateFontIndirectA(&lf); ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); - flags |= GGI_MARK_NONEXISTING_GLYPHS; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndicesW should have returned a nonexistent char not %04x\n", glyphs[4]); - flags = 0; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + if (textm.tmCharSet == ANSI_CHARSET) + { + flags |= GGI_MARK_NONEXISTING_GLYPHS; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndicesW should have returned a nonexistent char not %04x\n", glyphs[4]); + flags = 0; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", + textm.tmDefaultChar, glyphs[4]); + } + else + /* FIXME: Write tests for non-ANSI charsets. */ + skip("GetGlyphIndices System font tests only for ANSI_CHARSET\n"); if(!is_font_installed("Tahoma")) { Modified: vendor/wine/dlls/gdi32/current/tests/icm.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/icm… ============================================================================== --- vendor/wine/dlls/gdi32/current/tests/icm.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/tests/icm.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -217,7 +217,7 @@ ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); ret = EnumICMProfilesW( dc, enum_profiles_callbackW, 0 ); - ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); + ok(ret == -1 || ret == 1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); } static void test_SetICMProfileA( HDC dc ) Modified: vendor/wine/dlls/user32/current/focus.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/focus.c?… ============================================================================== --- vendor/wine/dlls/user32/current/focus.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/focus.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -160,6 +160,7 @@ { GUITHREADINFO info; + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); /* Do not change focus if the window is no more active */ if (hwnd == info.hwndActive) Modified: vendor/wine/dlls/user32/current/message.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/message.… ============================================================================== --- vendor/wine/dlls/user32/current/message.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/message.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -2359,6 +2359,7 @@ /* find the window to dispatch this mouse message to */ + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); if (info.hwndCapture) { @@ -4229,11 +4230,27 @@ /********************************************************************** + * IsGUIThread (USER32.@) + */ +BOOL WINAPI IsGUIThread( BOOL convert ) +{ + FIXME( "%u: stub\n", convert ); + return TRUE; +} + + +/********************************************************************** * GetGUIThreadInfo (USER32.@) */ BOOL WINAPI GetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) { BOOL ret; + + if (info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } SERVER_START_REQ( get_thread_input ) { Modified: vendor/wine/dlls/user32/current/painting.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/painting… ============================================================================== --- vendor/wine/dlls/user32/current/painting.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/painting.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -801,6 +801,7 @@ RECT rect, mapped_rcCaret; BOOL hide_caret = FALSE; + info.cbSize = sizeof(info); if (!GetGUIThreadInfo( GetCurrentThreadId(), &info )) return 0; if (!info.hwndCaret) return 0; Modified: vendor/wine/dlls/user32/current/tests/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/wi… ============================================================================== --- vendor/wine/dlls/user32/current/tests/win.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/win.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -610,6 +610,22 @@ HWND hwnd[3]; BOOL ret; MSG msg; + + if (pGetGUIThreadInfo) + { + GUITHREADINFO info; + info.cbSize = sizeof(info); + ret = pGetGUIThreadInfo( GetCurrentThreadId(), &info ); + ok( ret || broken(!ret), /* win9x */ + "GetGUIThreadInfo failed without message queue\n" ); + SetLastError( 0xdeadbeef ); + info.cbSize = sizeof(info) + 1; + ret = pGetGUIThreadInfo( GetCurrentThreadId(), &info ); + ok( !ret, "GetGUIThreadInfo succeeded with wrong size\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* win9x */ + "wrong error %u\n", GetLastError() ); + } PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); /* make sure we have a message queue */ Modified: vendor/wine/dlls/user32/current/user32.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/user32.s… ============================================================================== --- vendor/wine/dlls/user32/current/user32.spec [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/user32.spec [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -436,7 +436,7 @@ @ stdcall IsDialogMessageA(long ptr) @ stdcall IsDialogMessageW(long ptr) @ stdcall IsDlgButtonChecked(long long) -# @ stub IsGUIThread +@ stdcall IsGUIThread(long) @ stdcall IsHungAppWindow(long) # @ stub IsHungThread @ stdcall IsIconic(long) Modified: vendor/wine/dlls/user32/current/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/win.c?re… ============================================================================== --- vendor/wine/dlls/user32/current/win.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/win.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -1587,6 +1587,7 @@ { GUITHREADINFO info; + info.cbSize = sizeof(info); if (GetGUIThreadInfo( GetCurrentThreadId(), &info )) { if (hwnd == info.hwndCaret) DestroyCaret(); Modified: vendor/wine/dlls/winex11.drv/current/event.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/eve… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/event.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/event.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -497,6 +497,7 @@ TRACE( "setting foreground window to %p\n", hwnd ); SetForegroundWindow( hwnd ); + threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); focus = threadinfo.hwndFocus; if (!focus) focus = threadinfo.hwndActive; Modified: vendor/wine/dlls/winex11.drv/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/window.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/window.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -78,6 +78,7 @@ static Time last_user_time; static Window user_time_window; +static const char foreign_window_prop[] = "__wine_x11_foreign_window"; static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char client_window_prop[]= "__wine_x11_client_window"; static const char icon_window_prop[] = "__wine_x11_icon_window"; @@ -1753,7 +1754,23 @@ */ static void destroy_whole_window( Display *display, struct x11drv_win_data *data, BOOL already_destroyed ) { - if (!data->whole_window) return; + if (!data->whole_window) + { + if (data->embedded) + { + Window xwin = (Window)GetPropA( data->hwnd, foreign_window_prop ); + if (xwin) + { + wine_tsx11_lock(); + if (!already_destroyed) XSelectInput( display, xwin, 0 ); + XDeleteContext( display, xwin, winContext ); + wine_tsx11_unlock(); + RemovePropA( data->hwnd, foreign_window_prop ); + } + } + return; + } + TRACE( "win %p xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); wine_tsx11_lock(); @@ -1894,14 +1911,7 @@ if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->embedded) FIXME( "window %p/%lx destroyed from the outside\n", hwnd, data->whole_window ); - if (!data->whole_window) - { - wine_tsx11_lock(); - XDeleteContext( display, event->xdestroywindow.window, winContext ); - wine_tsx11_unlock(); - } - else destroy_whole_window( display, data, TRUE ); - + destroy_whole_window( display, data, TRUE ); if (data->embedded) SendMessageW( hwnd, WM_CLOSE, 0, 0 ); } @@ -2153,6 +2163,7 @@ data->embedded = TRUE; data->mapped = TRUE; + SetPropA( hwnd, foreign_window_prop, (HANDLE)xwin ); wine_tsx11_lock(); XSaveContext( display, xwin, winContext, (char *)data->hwnd ); wine_tsx11_unlock(); Modified: vendor/wine/dlls/winex11.drv/current/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/x11… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/x11drv_main.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/x11drv_main.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -197,7 +197,7 @@ */ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { - if (event->request_code == X_SetInputFocus && + if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; /* ignore a number of errors on gdi display caused by creating/destroying windows */

14 years, 5 months

[tkreuzer] 49799: [MINGW] Merge .CRT section into .rdata when linking to mingw lib. This silences the warnings about uninitialized constructors.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 26 22:52:46 2010 New Revision: 49799 URL: http://svn.reactos.org/svn/reactos?rev=49799&view=rev Log: [MINGW] Merge .CRT section into .rdata when linking to mingw lib. This silences the warnings about uninitialized constructors. Modified: branches/cmake-bringup/lib/3rdparty/mingw/cinitexe.c Modified: branches/cmake-bringup/lib/3rdparty/mingw/cinitexe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/cinitexe.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/cinitexe.c [iso-8859-1] Fri Nov 26 22:52:46 2010 @@ -1,6 +1,10 @@ #include <stdio.h> #include <internal.h> #include <sect_attribs.h> + +#ifdef _MSC_VER +#pragma comment(linker, "/merge:.CRT=.rdata") +#endif _CRTALLOC(".CRT$XIA") _PVFV __xi_a[] = { NULL }; _CRTALLOC(".CRT$XIZ") _PVFV __xi_z[] = { NULL };

14 years, 5 months

[tkreuzer] 49798: [MINGW] Fix .CRT section attributes to avoid linker warning, when merging with .rdata

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 26 22:51:06 2010 New Revision: 49798 URL: http://svn.reactos.org/svn/reactos?rev=49798&view=rev Log: [MINGW] Fix .CRT section attributes to avoid linker warning, when merging with .rdata Modified: branches/cmake-bringup/include/reactos/mingw-w64/sect_attribs.h Modified: branches/cmake-bringup/include/reactos/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/m… ============================================================================== --- branches/cmake-bringup/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Fri Nov 26 22:51:06 2010 @@ -9,7 +9,7 @@ #if defined(_M_IA64) || defined(_M_AMD64) #define _ATTRIBUTES #else -#define _ATTRIBUTES shared +#define _ATTRIBUTES read #endif /* Reference list of existing section for msvcrt. */

14 years, 5 months

[tkreuzer] 49797: [CMAKE] add importlib target for csrsrv

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 26 00:20:29 2010 New Revision: 49797 URL: http://svn.reactos.org/svn/reactos?rev=49797&view=rev Log: [CMAKE] add importlib target for csrsrv Modified: branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt Modified: branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] Fri Nov 26 00:20:29 2010 @@ -24,4 +24,5 @@ add_pch(csrsrv ${CMAKE_CURRENT_SOURCE_DIR}/srv.h ${SOURCE}) add_dependencies(csrsrv psdk bugcodes) -add_cab_target(csrsrv 1) +add_cab_target(csrsrv 1) +add_importlib_target(csrsrv.spec)

14 years, 5 months

[tkreuzer] 49796: [CMAKE] No mesa32 for MSVC for now. It has lots of assembly that would need to be ported. It also talkes ages to compile.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 26 00:01:20 2010 New Revision: 49796 URL: http://svn.reactos.org/svn/reactos?rev=49796&view=rev Log: [CMAKE] No mesa32 for MSVC for now. It has lots of assembly that would need to be ported. It also talkes ages to compile. Modified: branches/cmake-bringup/dll/3rdparty/CMakeLists.txt Modified: branches/cmake-bringup/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/CMak… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/CMakeLists.txt [iso-8859-1] Fri Nov 26 00:01:20 2010 @@ -6,4 +6,6 @@ add_subdirectory(libpng) #add_subdirectory(libtiff)#FIXME : unresolved symbol _pei386_runtime_relocator add_subdirectory(libxslt) +if(NOT MSVC) add_subdirectory(mesa32) +endif()

14 years, 5 months

[tkreuzer] 49795: [LIBXML2] add a hack around the hack

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 25 23:16:12 2010 New Revision: 49795 URL: http://svn.reactos.org/svn/reactos?rev=49795&view=rev Log: [LIBXML2] add a hack around the hack Modified: branches/cmake-bringup/lib/3rdparty/libxml2/config.h Modified: branches/cmake-bringup/lib/3rdparty/libxml2/config.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libx… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libxml2/config.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libxml2/config.h [iso-8859-1] Thu Nov 25 23:16:12 2010 @@ -302,6 +302,12 @@ #define vsnprintf _vsnprintf #endif +#if defined(_MSC_VER) +#define GetModuleHandleA GetModuleHandleA_ +#endif #if defined(__MINGW32__) #include <windows.h> #endif +#if defined(_MSC_VER) +#undef GetModuleHandleA +#endif

14 years, 5 months

[tkreuzer] 49794: [CRT] simplify and fix definition of setjmp

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 25 22:35:57 2010 New Revision: 49794 URL: http://svn.reactos.org/svn/reactos?rev=49794&view=rev Log: [CRT] simplify and fix definition of setjmp Modified: branches/cmake-bringup/include/crt/setjmp.h Modified: branches/cmake-bringup/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/setjm… ============================================================================== --- branches/cmake-bringup/include/crt/setjmp.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/setjmp.h [iso-8859-1] Thu Nov 25 22:35:57 2010 @@ -136,9 +136,6 @@ #define _JMP_BUF_DEFINED #endif -#ifdef _MSC_VER -int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); -#else #ifdef USE_MINGW_SETJMP_TWO_ARGS #ifndef _INC_SETJMPEX #if defined(__x86_64) @@ -150,19 +147,18 @@ #endif #define setjmp(BUF) _setjmp((BUF),mingw_getsp()) int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx); -#else +#else /* _INC_SETJMPEX */ #undef setjmp #define setjmp(BUF) _setjmpex((BUF),mingw_getsp()) #define setjmpex(BUF) _setjmpex((BUF),mingw_getsp()) int __cdecl __MINGW_NOTHROW _setjmpex(jmp_buf _Buf,void *_Ctx); -#endif -#else +#endif /* _INC_SETJMPEX */ +#else /* !USE_MINGW_SETJMP_TWO_ARGS */ #ifndef _INC_SETJMPEX #define setjmp _setjmp #endif int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); -#endif -#endif +#endif /* !USE_MINGW_SETJMP_TWO_ARGS */ __declspec(noreturn) __MINGW_NOTHROW void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/; __declspec(noreturn) __MINGW_NOTHROW void __cdecl longjmp(jmp_buf _Buf,int _Value);

14 years, 5 months

[tkreuzer] 49793: [CMAKE] Link libjpg explicitly to kernel32 and link to mingw_common on MSVC builds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 25 22:14:07 2010 New Revision: 49793 URL: http://svn.reactos.org/svn/reactos?rev=49793&view=rev Log: [CMAKE] Link libjpg explicitly to kernel32 and link to mingw_common on MSVC builds Modified: branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt Modified: branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libj… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Thu Nov 25 22:14:07 2010 @@ -61,7 +61,12 @@ set_entrypoint(libjpeg 0) -add_importlibs(libjpeg msvcrt) +if(MSVC) +# for _fltused +target_link_libraries(libjpeg mingw_common) +endif() + +add_importlibs(libjpeg msvcrt kernel32) add_dependencies(libjpeg psdk buildno_header)

14 years, 5 months

[fireball] 49792: [FREELDR] - Conditionally enable heap-related debugging and validation checks by an MM_DBG define for all architectures. Inspired by 49744.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Nov 25 22:03:56 2010 New Revision: 49792 URL: http://svn.reactos.org/svn/reactos?rev=49792&view=rev Log: [FREELDR] - Conditionally enable heap-related debugging and validation checks by an MM_DBG define for all architectures. Inspired by 49744. Modified: trunk/reactos/boot/freeldr/freeldr/rtl/bget.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/bget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/b… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/rtl/bget.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/rtl/bget.c [iso-8859-1] Thu Nov 25 22:03:56 2010 @@ -407,7 +407,7 @@ all buffers allocated are a multiple of this size. This MUST be a power of two. */ -#ifndef _M_ARM +#ifdef MM_DBG #define BufDump 1 /* Define this symbol to enable the bpoold() function which dumps the

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs