Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[dquintana] 69120: [FATTEN] * Do not allow "/" as a parameter prefix in unixes.

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Sep 8 15:30:32 2015 New Revision: 69120 URL: http://svn.reactos.org/svn/reactos?rev=69120&view=rev Log: [FATTEN] * Do not allow "/" as a parameter prefix in unixes. Modified: trunk/reactos/tools/fatten/fatten.c Modified: trunk/reactos/tools/fatten/fatten.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/fatten/fatten.c?rev=… ============================================================================== --- trunk/reactos/tools/fatten/fatten.c [iso-8859-1] (original) +++ trunk/reactos/tools/fatten/fatten.c [iso-8859-1] Tue Sep 8 15:30:32 2015 @@ -15,7 +15,8 @@ FATFS g_Filesystem; -int isMounted = 0; +static int isMounted = 0; +static char buff[32768]; // tool needed by fatfs DWORD get_fattime() @@ -57,7 +58,11 @@ int is_command(const char* parg) { +#if _WIN32 return (parg[0] == '/') || (parg[0] == '-'); +#else + return (parg[0] == '-'); +#endif } #define NEED_PARAMS(_min_,_max_) \ @@ -175,7 +180,6 @@ { FILE* fe; FIL fv = { 0 }; - char buff[32768]; UINT rdlen = 0; UINT wrlen = 0; @@ -212,7 +216,6 @@ { FIL fe = { 0 }; FILE* fv; - char buff[32768]; UINT rdlen = 0; UINT wrlen = 0; @@ -260,7 +263,6 @@ { FIL fe = { 0 }; FIL fv = { 0 }; - char buff[32768]; UINT rdlen = 0; UINT wrlen = 0;

9 years, 7 months

[dquintana] 69119: [EFISYS][BOOTMGFW] * Compute and use a "platform short name" in the EFI filenames.

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Sep 8 15:26:34 2015 New Revision: 69119 URL: http://svn.reactos.org/svn/reactos?rev=69119&view=rev Log: [EFISYS][BOOTMGFW] * Compute and use a "platform short name" in the EFI filenames. Modified: trunk/reactos/boot/CMakeLists.txt trunk/reactos/boot/environ/CMakeLists.txt Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=69… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Tue Sep 8 15:26:34 2015 @@ -1,7 +1,22 @@ ## efisys.bin +# EFI platform ID, used in environ/CMakelists.txt for bootmgfw filename naming also. +if(ARCH STREQUAL "amd64") + set(EFI_PLATFORM_ID "x64") +elseif(ARCH STREQUAL "i386") + set(EFI_PLATFORM_ID "ia32") +elseif(ARCH STREQUAL "ia64") + set(EFI_PLATFORM_ID "ia64") +elseif(ARCH STREQUAL "arm") + set(EFI_PLATFORM_ID "arm") +elseif(ARCH STREQUAL "aarch64") + set(EFI_PLATFORM_ID "aa64") +else() + message(FATAL_ERROR "Unknown ARCH, can't generate a valid UEFI boot filename.") +endif() + add_custom_target(efisys - COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 -mkdir efi -mkdir efi/boot -add $<TARGET_FILE:bootmgfw> efi/boot/bootia32.efi + COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.EFI DEPENDS native-fatten bootmgfw VERBATIM) @@ -10,8 +25,9 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst "") add_custom_target(bootcd +# COMMAND native-cdmake -j -m -bootdata:2\#p0,e,b${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin\#pEF,e,b${CMAKE_CURRENT_BINARY_DIR}/efisys.bin @${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso COMMAND native-cdmake -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin @${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso - DEPENDS native-cdmake + DEPENDS native-cdmake efisys VERBATIM) ##bootcdregtest Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Tue Sep 8 15:26:34 2015 @@ -91,5 +91,5 @@ add_dependencies(bootmgfw asm bugcodes) -add_cd_file(TARGET bootmgfw FILE ${_bootmgfw_output_file} DESTINATION efi/boot NO_CAB FOR bootcd regtest NAME_ON_CD bootia32.efi) +add_cd_file(TARGET bootmgfw FILE ${_bootmgfw_output_file} DESTINATION efi/boot NO_CAB FOR bootcd regtest NAME_ON_CD boot${EFI_PLATFORM_ID}.efi)

9 years, 7 months

[jimtabor] 69118: [Win32k] - Fix non-client paint. See CORE-10101.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Sep 8 14:18:56 2015 New Revision: 69118 URL: http://svn.reactos.org/svn/reactos?rev=69118&view=rev Log: [Win32k] - Fix non-client paint. See CORE-10101. Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Tue Sep 8 14:18:56 2015 @@ -1041,9 +1041,11 @@ { Active = (gpqForeground == pWnd->head.pti->MessageQueue); } - } - - Flags = DC_NC; // Redraw everything! + Flags = DC_NC; // Redraw everything! + } + else + Flags |= DC_NC; + IntGetWindowRect(pWnd, &WindowRect);

9 years, 7 months

[akhaldi] 69117: [APITESTS] Add missing xdk dependency. CORE-9586

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 8 12:51:53 2015 New Revision: 69117 URL: http://svn.reactos.org/svn/reactos?rev=69117&view=rev Log: [APITESTS] Add missing xdk dependency. CORE-9586 Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Tue Sep 8 12:51:53 2015 @@ -1,6 +1,7 @@ include_directories(include) add_library(apitest apitest.c) +add_dependencies(apitest xdk) add_subdirectory(advapi32) add_subdirectory(browseui)

9 years, 7 months

[akhaldi] 69116: [UXTHEME] Revert Wine Commit 2b650fa as it breaks themed Explorer Toolbar Separators. CORE-9636 and Wine Bug #38538.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 8 12:47:33 2015 New Revision: 69116 URL: http://svn.reactos.org/svn/reactos?rev=69116&view=rev Log: [UXTHEME] Revert Wine Commit 2b650fa as it breaks themed Explorer Toolbar Separators. CORE-9636 and Wine Bug #38538. Modified: trunk/reactos/dll/win32/uxtheme/draw.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Tue Sep 8 12:47:33 2015 @@ -714,6 +714,9 @@ GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); /* Resize source image if destination smaller than margins */ +#ifndef __REACTOS__ + /* Revert Wine Commit 2b650fa as it breaks themed Explorer Toolbar Separators + FIXME: Revisit this when the bug is fixed. CORE-9636 and Wine Bug #38538 */ if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y || sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.y); @@ -740,6 +743,7 @@ rcSrc.right = srcSize.x; rcSrc.bottom = srcSize.y; } +#endif hdcDst = hdc; OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org);

9 years, 7 months

[akhaldi] 69115: [COMCTL32] Revert Wine Commit 5b7b911 as it breaks Explorer Toolbar Buttons. Update comctl32_ros.diff accordingly. CORE-9970

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 8 12:41:11 2015 New Revision: 69115 URL: http://svn.reactos.org/svn/reactos?rev=69115&view=rev Log: [COMCTL32] Revert Wine Commit 5b7b911 as it breaks Explorer Toolbar Buttons. Update comctl32_ros.diff accordingly. CORE-9970 Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Tue Sep 8 12:41:11 2015 @@ -1,6 +1,6 @@ diff -pudN e:\wine\dlls\comctl32/commctrl.c e:\reactos\dll\win32\comctl32/commctrl.c ---- e:\wine\dlls\comctl32/commctrl.c 2015-02-21 17:13:08.585542200 +0100 -+++ e:\reactos\dll\win32\comctl32/commctrl.c 2015-03-18 17:10:39.955584600 +0100 +--- e:\wine\dlls\comctl32/commctrl.c 2015-02-21 17:13:09 +0100 ++++ e:\reactos\dll\win32\comctl32/commctrl.c 2015-08-27 22:05:04 +0100 @@ -52,25 +52,26 @@ * -- ICC_WIN95_CLASSES */ @@ -259,8 +259,8 @@ + return TRUE; +} diff -pudN e:\wine\dlls\comctl32/imagelist.c e:\reactos\dll\win32\comctl32/imagelist.c ---- e:\wine\dlls\comctl32/imagelist.c 2015-02-21 17:13:08.589542200 +0100 -+++ e:\reactos\dll\win32\comctl32/imagelist.c 2015-03-18 17:15:00.458921400 +0100 +--- e:\wine\dlls\comctl32/imagelist.c 2015-02-21 17:13:09 +0100 ++++ e:\reactos\dll\win32\comctl32/imagelist.c 2015-08-27 22:05:04 +0100 @@ -33,27 +33,14 @@ * * TODO: @@ -430,8 +430,8 @@ if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n"); diff -pudN e:\wine\dlls\comctl32/listview.c e:\reactos\dll\win32\comctl32/listview.c ---- e:\wine\dlls\comctl32/listview.c 2015-04-05 20:44:56.799078500 +0100 -+++ e:\reactos\dll\win32\comctl32/listview.c 2015-07-20 23:15:49.816768600 +0100 +--- e:\wine\dlls\comctl32/listview.c 2015-04-05 20:44:57 +0100 ++++ e:\reactos\dll\win32\comctl32/listview.c 2015-08-27 22:05:04 +0100 @@ -306,6 +287,9 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; @@ -549,8 +549,8 @@ /* case WM_TIMER: */ diff -pudN e:\wine\dlls\comctl32/propsheet.c e:\reactos\dll\win32\comctl32/propsheet.c ---- e:\wine\dlls\comctl32/propsheet.c 2015-03-21 14:04:47.573770300 +0100 -+++ e:\reactos\dll\win32\comctl32/propsheet.c 2015-03-18 17:24:03.692899000 +0100 +--- e:\wine\dlls\comctl32/propsheet.c 2015-03-21 14:04:48 +0100 ++++ e:\reactos\dll\win32\comctl32/propsheet.c 2015-08-27 22:05:04 +0100 @@ -2432,12 +2416,19 @@ static void PROPSHEET_SetWizButtons(HWND HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); @@ -606,8 +606,8 @@ /****************************************************************************** diff -pudN e:\wine\dlls\comctl32/rebar.c e:\reactos\dll\win32\comctl32/rebar.c ---- e:\wine\dlls\comctl32/rebar.c 2015-04-05 20:44:56.800079100 +0100 -+++ e:\reactos\dll\win32\comctl32/rebar.c 2015-07-20 23:20:27.952677100 +0100 +--- e:\wine\dlls\comctl32/rebar.c 2015-04-05 20:44:57 +0100 ++++ e:\reactos\dll\win32\comctl32/rebar.c 2015-08-27 22:05:04 +0100 @@ -50,7 +50,6 @@ * - WM_QUERYNEWPALETTE * - WM_RBUTTONDOWN @@ -793,8 +793,8 @@ /* case WM_VKEYTOITEM: supported according to ControlSpy */ diff -pudN e:\wine\dlls\comctl32/toolbar.c e:\reactos\dll\win32\comctl32/toolbar.c ---- e:\wine\dlls\comctl32/toolbar.c 2015-07-14 15:44:33.982074600 +0100 -+++ e:\reactos\dll\win32\comctl32/toolbar.c 2015-07-20 23:37:43.996935400 +0100 +--- e:\wine\dlls\comctl32/toolbar.c 2015-07-14 15:44:34 +0100 ++++ e:\reactos\dll\win32\comctl32/toolbar.c 2015-09-08 13:22:39 +0100 @@ -33,11 +33,9 @@ * - TBSTYLE_REGISTERDROP * - TBSTYLE_EX_DOUBLEBUFFER @@ -1006,7 +1006,22 @@ if (sizeString.cy > 0) sizeButton.cy += 1 + sizeString.cy; sizeButton.cx = infoPtr->szPadding.cx + -@@ -1970,6 +2038,17 @@ TOOLBAR_RelayEvent (HWND hwndTip, HWND h +@@ -1711,7 +1779,14 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *info + { + if (btnPtr->cx) + cx = btnPtr->cx; ++#ifdef __REACTOS__ ++ /* Revert Wine Commit 5b7b911 as it breaks Explorer Toolbar Buttons ++ FIXME: Revisit this when the bug is fixed. CORE-9970 */ ++ else if ((infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || ++ (btnPtr->fsStyle & BTNS_AUTOSIZE)) ++#else + else if (btnPtr->fsStyle & BTNS_AUTOSIZE) ++#endif + { + SIZE sz; + HDC hdc; +@@ -1970,6 +2045,17 @@ TOOLBAR_RelayEvent (HWND hwndTip, HWND h SendMessageW (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg); } @@ -1024,7 +1039,7 @@ static void TOOLBAR_TooltipAddTool(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *button) { -@@ -3551,6 +3630,36 @@ TOOLBAR_GetMaxSize (const TOOLBAR_INFO * +@@ -3551,6 +3637,36 @@ TOOLBAR_GetMaxSize (const TOOLBAR_INFO * return TRUE; } @@ -1061,7 +1076,7 @@ /* << TOOLBAR_GetObject >> */ -@@ -4806,6 +4915,44 @@ TOOLBAR_SetMaxTextRows (TOOLBAR_INFO *in +@@ -4806,6 +4922,44 @@ TOOLBAR_SetMaxTextRows (TOOLBAR_INFO *in return TRUE; } @@ -1106,7 +1121,7 @@ /* MSDN gives slightly wrong info on padding. * 1. It is not only used on buttons with the BTNS_AUTOSIZE style -@@ -6052,6 +6199,8 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wPar +@@ -6052,6 +6206,8 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wPar infoPtr->clrBtnShadow = CLR_DEFAULT; infoPtr->szPadding.cx = DEFPAD_CX; infoPtr->szPadding.cy = DEFPAD_CY; @@ -1115,7 +1130,7 @@ infoPtr->iListGap = DEFLISTGAP; infoPtr->iTopMargin = default_top_margin(infoPtr); infoPtr->dwStyle = lpcs->style; -@@ -6461,7 +6610,7 @@ TOOLBAR_SysColorChange (void) +@@ -6461,7 +6617,7 @@ TOOLBAR_SysColorChange (void) return 0; } @@ -1124,7 +1139,7 @@ /* update theme after a WM_THEMECHANGED message */ static LRESULT theme_changed (HWND hwnd) { -@@ -6470,7 +6619,7 @@ static LRESULT theme_changed (HWND hwnd) +@@ -6470,7 +6626,7 @@ static LRESULT theme_changed (HWND hwnd) OpenThemeData (hwnd, themeClass); return 0; } @@ -1133,7 +1148,7 @@ static LRESULT WINAPI ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -@@ -6575,6 +6724,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, +@@ -6575,6 +6731,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, case TB_GETMAXSIZE: return TOOLBAR_GetMaxSize (infoPtr, (LPSIZE)lParam); @@ -1144,7 +1159,7 @@ /* case TB_GETOBJECT: */ /* 4.71 */ -@@ -6716,6 +6869,11 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, +@@ -6716,6 +6876,11 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, case TB_SETMAXTEXTROWS: return TOOLBAR_SetMaxTextRows (infoPtr, wParam); @@ -1156,7 +1171,7 @@ case TB_SETPADDING: return TOOLBAR_SetPadding (infoPtr, lParam); -@@ -6855,8 +7013,12 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, +@@ -6855,8 +7020,12 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, case WM_SYSCOLORCHANGE: return TOOLBAR_SysColorChange (); @@ -1171,8 +1186,8 @@ /* case WM_WININICHANGE: */ diff -pudN e:\wine\dlls\comctl32/tooltips.c e:\reactos\dll\win32\comctl32/tooltips.c ---- e:\wine\dlls\comctl32/tooltips.c 2015-05-25 19:35:12.759980900 +0100 -+++ e:\reactos\dll\win32\comctl32/tooltips.c 2015-07-20 23:40:13.399480800 +0100 +--- e:\wine\dlls\comctl32/tooltips.c 2015-05-25 19:35:13 +0100 ++++ e:\reactos\dll\win32\comctl32/tooltips.c 2015-08-27 22:05:04 +0100 @@ -2009,7 +1996,36 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO static LRESULT TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) @@ -1211,8 +1226,8 @@ return 0; } diff -pudN e:\wine\dlls\comctl32/treeview.c e:\reactos\dll\win32\comctl32/treeview.c ---- e:\wine\dlls\comctl32/treeview.c 2015-07-14 15:44:33.989075000 +0100 -+++ e:\reactos\dll\win32\comctl32/treeview.c 2015-07-20 23:42:19.453690600 +0100 +--- e:\wine\dlls\comctl32/treeview.c 2015-07-14 15:44:34 +0100 ++++ e:\reactos\dll\win32\comctl32/treeview.c 2015-08-27 22:05:04 +0100 @@ -2890,7 +2868,14 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, } } Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Tue Sep 8 12:41:11 2015 @@ -1779,7 +1779,14 @@ { if (btnPtr->cx) cx = btnPtr->cx; +#ifdef __REACTOS__ + /* Revert Wine Commit 5b7b911 as it breaks Explorer Toolbar Buttons + FIXME: Revisit this when the bug is fixed. CORE-9970 */ + else if ((infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || + (btnPtr->fsStyle & BTNS_AUTOSIZE)) +#else else if (btnPtr->fsStyle & BTNS_AUTOSIZE) +#endif { SIZE sz; HDC hdc;

9 years, 7 months

[tfaber] 69114: [KERNEL32] - Issue a debug print on LoadLibrary failure, since this is often a good lead when debugging

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Sep 8 11:41:08 2015 New Revision: 69114 URL: http://svn.reactos.org/svn/reactos?rev=69114&view=rev Log: [KERNEL32] - Issue a debug print on LoadLibrary failure, since this is often a good lead when debugging Modified: trunk/reactos/dll/win32/kernel32/client/loader.c Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Tue Sep 8 11:41:08 2015 @@ -381,6 +381,7 @@ /* Set last error in failure case */ if (!NT_SUCCESS(Status)) { + DPRINT1("LoadLibraryExW(%ls) failing with status %lx\n", lpLibFileName, Status); BaseSetLastNTError(Status); return NULL; }

9 years, 7 months

[tfaber] 69113: [BROWSEUI] - Check for NULL return from LoadLibrary CORE-10135 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Sep 8 11:39:10 2015 New Revision: 69113 URL: http://svn.reactos.org/svn/reactos?rev=69113&view=rev Log: [BROWSEUI] - Check for NULL return from LoadLibrary CORE-10135 #resolve Modified: trunk/reactos/dll/win32/browseui/precomp.h Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Tue Sep 8 11:39:10 2015 @@ -65,12 +65,15 @@ if (!hRShell) hRShell = LoadLibrary(L"rshell.dll"); - PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) - GetProcAddress(hRShell, "CMergedFolder_Constructor"); + if (hRShell) + { + PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) + GetProcAddress(hRShell, "CMergedFolder_Constructor"); - if (pCMergedFolder_Constructor) - { - return pCMergedFolder_Constructor(riid, ppv); + if (pCMergedFolder_Constructor) + { + return pCMergedFolder_Constructor(riid, ppv); + } } #endif return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv); @@ -85,10 +88,13 @@ if (!hRShell) hRShell = LoadLibraryW(L"rshell.dll"); - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); - if (func) + if (hRShell) { - return func(iid , ppv); + PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); + if (func) + { + return func(iid , ppv); + } } #endif return CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, iid, ppv);

9 years, 7 months

[dquintana] 69112: [FATTEN] * Switch to using our existing host-tools header for types. Thanks Colin for pointing me to the right header (it was discrete so I missed it when looking).

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Sep 8 10:26:12 2015 New Revision: 69112 URL: http://svn.reactos.org/svn/reactos?rev=69112&view=rev Log: [FATTEN] * Switch to using our existing host-tools header for types. Thanks Colin for pointing me to the right header (it was discrete so I missed it when looking). Removed: trunk/reactos/tools/fatten/fatfs/integer.h Modified: trunk/reactos/tools/fatten/fatfs/diskio.h trunk/reactos/tools/fatten/fatfs/ff.h Modified: trunk/reactos/tools/fatten/fatfs/diskio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/fatten/fatfs/diskio.… ============================================================================== --- trunk/reactos/tools/fatten/fatfs/diskio.h [iso-8859-1] (original) +++ trunk/reactos/tools/fatten/fatfs/diskio.h [iso-8859-1] Tue Sep 8 10:26:12 2015 @@ -12,7 +12,7 @@ #define _USE_WRITE 1 /* 1: Enable disk_write function */ #define _USE_IOCTL 1 /* 1: Enable disk_ioctl fucntion */ -#include "integer.h" +#include <typedefs.h> /* Status of Disk Functions */ Modified: trunk/reactos/tools/fatten/fatfs/ff.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/fatten/fatfs/ff.h?re… ============================================================================== --- trunk/reactos/tools/fatten/fatfs/ff.h [iso-8859-1] (original) +++ trunk/reactos/tools/fatten/fatfs/ff.h [iso-8859-1] Tue Sep 8 10:26:12 2015 @@ -21,7 +21,7 @@ extern "C" { #endif -#include "integer.h" /* Basic integer types */ +#include <typedefs.h> /* Basic integer types */ #include "ffconf.h" /* FatFs configuration options */ #if _FATFS != _FFCONF Removed: trunk/reactos/tools/fatten/fatfs/integer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/fatten/fatfs/integer… ============================================================================== --- trunk/reactos/tools/fatten/fatfs/integer.h [iso-8859-1] (original) +++ trunk/reactos/tools/fatten/fatfs/integer.h (removed) @@ -1,35 +0,0 @@ -/*-------------------------------------------*/ -/* Integer type definitions for FatFs module */ -/*-------------------------------------------*/ - -#ifndef _FF_INTEGER -#define _FF_INTEGER - -#if defined(_MSC_VER) && (_MSC_VER < 0x1700) /* Windows with older MSVC */ - -#include <windows.h> -#include <tchar.h> - -#else /* Unixes */ - -#include <stdint.h> - -/* This type MUST be 8 bit */ -typedef uint8_t BYTE; - -/* These types MUST be 16 bit */ -typedef int16_t SHORT; -typedef uint16_t WORD; -typedef uint16_t WCHAR; - -/* These types MUST be at least 16 bit */ -typedef int_fast16_t INT; -typedef uint_fast16_t UINT; - -/* These types MUST be 32 bit */ -typedef int32_t LONG; -typedef uint32_t DWORD; - -#endif - -#endif

9 years, 7 months

[tfaber] 69111: [FATTEN] - Fix VC2010 build

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Sep 8 08:27:00 2015 New Revision: 69111 URL: http://svn.reactos.org/svn/reactos?rev=69111&view=rev Log: [FATTEN] - Fix VC2010 build Modified: trunk/reactos/tools/fatten/fatten.c Modified: trunk/reactos/tools/fatten/fatten.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/fatten/fatten.c?rev=… ============================================================================== --- trunk/reactos/tools/fatten/fatten.c [iso-8859-1] (original) +++ trunk/reactos/tools/fatten/fatten.c [iso-8859-1] Tue Sep 8 08:27:00 2015 @@ -29,6 +29,7 @@ time(&rawtime); timeinfo = localtime(&rawtime); + { union FatTime { struct { DWORD Second : 5; // div 2 @@ -51,6 +52,7 @@ }; return myTime.whole; + } } int is_command(const char* parg) @@ -66,10 +68,12 @@ int need_mount() { + int r; + if (isMounted) return FR_OK; - int r = f_mount(&g_Filesystem, "0:", 0); + r = f_mount(&g_Filesystem, "0:", 0); if (r) return r; @@ -116,6 +120,8 @@ while (argc > 0) { char *parg = *argv; + int nargs = 0; + int i = 0; if (!is_command(parg)) { @@ -128,21 +134,20 @@ argc--; // find next command, to calculare number of args - int nargs = 0; - int i = 0; while ((argv[i] != NULL) && !is_command(argv[i++])) nargs++; if (strcmp(parg, "format") == 0) { // NOTE: The fs driver detects which FAT format fits best based on size + int sectors; NEED_PARAMS(1, 1); NEED_MOUNT(); // Arg 1: number of sectors - int sectors = atoi(argv[0]); + sectors = atoi(argv[0]); if (sectors <= 0) { @@ -168,34 +173,33 @@ } else if (strcmp(parg, "add") == 0) { - NEED_PARAMS(2, 2); - - NEED_MOUNT(); - - // Arg 1: external file to add - // Arg 2: virtual filename - FILE* fe; FIL fv = { 0 }; - - fe = fopen(argv[0], "rb"); - - if (!fe) - { - printf("Error: unable to open external file '%s' for reading.", argv[0]); - return 1; - } - - if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS)) - { - printf("Error: unable to open file '%s' for writing.", argv[1]); - return 1; - } - char buff[32768]; UINT rdlen = 0; UINT wrlen = 0; + NEED_PARAMS(2, 2); + + NEED_MOUNT(); + + // Arg 1: external file to add + // Arg 2: virtual filename + + fe = fopen(argv[0], "rb"); + + if (!fe) + { + printf("Error: unable to open external file '%s' for reading.", argv[0]); + return 1; + } + + if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS)) + { + printf("Error: unable to open file '%s' for writing.", argv[1]); + return 1; + } + while ((rdlen = fread(buff, 1, 32768, fe)) > 0) { f_write(&fv, buff, rdlen, &wrlen); @@ -206,34 +210,33 @@ } else if (strcmp(parg, "extract") == 0) { - NEED_PARAMS(2, 2); - - NEED_MOUNT(); - - // Arg 1: virtual file to extract - // Arg 2: external filename - FIL fe = { 0 }; FILE* fv; - - if (f_open(&fe, argv[0], FA_READ)) - { - printf("Error: unable to open file '%s' for reading.", argv[0]); - return 1; - } - - fv = fopen(argv[1], "wb"); - - if (!fv) - { - printf("Error: unable to open external file '%s' for writing.", argv[1]); - return 1; - } - char buff[32768]; UINT rdlen = 0; UINT wrlen = 0; + NEED_PARAMS(2, 2); + + NEED_MOUNT(); + + // Arg 1: virtual file to extract + // Arg 2: external filename + + if (f_open(&fe, argv[0], FA_READ)) + { + printf("Error: unable to open file '%s' for reading.", argv[0]); + return 1; + } + + fv = fopen(argv[1], "wb"); + + if (!fv) + { + printf("Error: unable to open external file '%s' for writing.", argv[1]); + return 1; + } + while ((f_read(&fe, buff, 32768, &rdlen) == 0) && (rdlen > 0)) { fwrite(buff, 1, rdlen, fv); @@ -255,30 +258,29 @@ } else if (strcmp(parg, "copy") == 0) { - NEED_PARAMS(2, 2); - - NEED_MOUNT(); - // Arg 1: src path & filename - // Arg 2: new path & filename - FIL fe = { 0 }; FIL fv = { 0 }; - - if (f_open(&fe, argv[0], FA_READ)) - { - printf("Error: unable to open file '%s' for reading.", argv[0]); - return 1; - } - if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS)) - { - printf("Error: unable to open file '%s' for writing.", argv[1]); - return 1; - } - char buff[32768]; UINT rdlen = 0; UINT wrlen = 0; + NEED_PARAMS(2, 2); + + NEED_MOUNT(); + // Arg 1: src path & filename + // Arg 2: new path & filename + + if (f_open(&fe, argv[0], FA_READ)) + { + printf("Error: unable to open file '%s' for reading.", argv[0]); + return 1; + } + if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS)) + { + printf("Error: unable to open file '%s' for writing.", argv[1]); + return 1; + } + while ((f_read(&fe, buff, 32768, &rdlen) == 0) && (rdlen > 0)) { f_write(&fv, buff, rdlen, &wrlen); @@ -307,28 +309,28 @@ } else if (strcmp(parg, "list") == 0) { - NEED_PARAMS(0, 1); - - // Arg 1: folder path (optional) char* root = "/"; - - if (nargs == 1) - { - root = argv[0]; - } - DIR dir = { 0 }; - - if (f_opendir(&dir, root)) - { - printf("Error opening directory '%s'.\n", root); - return 1; - } - - printf("Listing directory contents of: %s\n", root); - FILINFO info = { 0 }; char lfname[257]; + + NEED_PARAMS(0, 1); + + // Arg 1: folder path (optional) + + if (nargs == 1) + { + root = argv[0]; + } + + if (f_opendir(&dir, root)) + { + printf("Error opening directory '%s'.\n", root); + return 1; + } + + printf("Listing directory contents of: %s\n", root); + info.lfname = lfname; info.lfsize = 256; while ((!f_readdir(&dir, &info)) && (strlen(info.fname) > 0))

9 years, 7 months

← Newer
1
...
28
29
30
31
32
33
34
...
54
Older →

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 September 2015