Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 64734: [SETUPAPI] Load a property sheet extension dll only once, otherwise we might leak module handles.
by ekohl＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: ekohl Date: Mon Oct 13 18:31:55 2014 New Revision: 64734 URL: http://svn.reactos.org/svn/reactos?rev=64734&view=rev Log: [SETUPAPI] Load a property sheet extension dll only once, otherwise we might leak module handles. Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Mon Oct 13 18:31:55 2014 @@ -1272,14 +1272,22 @@ if (DeviceInfoData) { struct DeviceInfo *devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - devInfo->hmodDevicePropPageProvider = hModule; - devInfo->pDevicePropPageProvider = pPropPageProvider; + + if (devInfo->hmodDevicePropPageProvider == NULL) + { + devInfo->hmodDevicePropPageProvider = hModule; + devInfo->pDevicePropPageProvider = pPropPageProvider; + } } else { struct DeviceInfoSet *devInfoSet = (struct DeviceInfoSet *)DeviceInfoSet; - devInfoSet->hmodClassPropPageProvider = hModule; - devInfoSet->pClassPropPageProvider = pPropPageProvider; + + if (devInfoSet->hmodClassPropPageProvider == NULL) + { + devInfoSet->hmodClassPropPageProvider = hModule; + devInfoSet->pClassPropPageProvider = pPropPageProvider; + } } InitialNumberOfPages = PropertySheetHeader->nPages;

1 0

[akhaldi] 64733: [CRT] * Update free_fd(). * Fixes some msvcrt:file tests. CORE-8540
by akhaldi＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: akhaldi Date: Mon Oct 13 18:08:34 2014 New Revision: 64733 URL: http://svn.reactos.org/svn/reactos?rev=64733&view=rev Log: [CRT] * Update free_fd(). * Fixes some msvcrt:file tests. CORE-8540 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Mon Oct 13 18:08:34 2014 @@ -233,40 +233,37 @@ /* INTERNAL: free a file entry fd */ static void free_fd(int fd) { - HANDLE old_handle; ioinfo *fdinfo; LOCK_FILES(); fdinfo = get_ioinfo(fd); - old_handle = fdinfo->handle; if(fdinfo != &__badioinfo) { fdinfo->handle = INVALID_HANDLE_VALUE; fdinfo->wxflag = 0; } TRACE(":fd (%d) freed\n",fd); - if (fd < 3) /* don't use 0,1,2 for user files */ + + if (fd < 3) { switch (fd) { case 0: - if (GetStdHandle(STD_INPUT_HANDLE) == old_handle) SetStdHandle(STD_INPUT_HANDLE, 0); + SetStdHandle(STD_INPUT_HANDLE, 0); break; case 1: - if (GetStdHandle(STD_OUTPUT_HANDLE) == old_handle) SetStdHandle(STD_OUTPUT_HANDLE, 0); + SetStdHandle(STD_OUTPUT_HANDLE, 0); break; case 2: - if (GetStdHandle(STD_ERROR_HANDLE) == old_handle) SetStdHandle(STD_ERROR_HANDLE, 0); + SetStdHandle(STD_ERROR_HANDLE, 0); break; } } - else - { - if (fd == fdend - 1) - fdend--; - if (fd < fdstart) - fdstart = fd; - } + + if (fd == fdend - 1) + fdend--; + if (fd < fdstart) + fdstart = fd; UNLOCK_FILES(); }

1 0

[pschweitzer] 64732: [NTFS] So far, keep our NTFS read-only. Booh, that's sad! *sob*. I know.
by pschweitzer＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: pschweitzer Date: Mon Oct 13 17:57:25 2014 New Revision: 64732 URL: http://svn.reactos.org/svn/reactos?rev=64732&view=rev Log: [NTFS] So far, keep our NTFS read-only. Booh, that's sad! *sob*. I know. Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Mon Oct 13 17:57:25 2014 @@ -243,6 +243,28 @@ NtfsCloseFile(DeviceExt, FileObject); return STATUS_NOT_A_DIRECTORY; } + + /* HUGLY HACK: remain RO so far... */ + if (RequestedDisposition == FILE_OVERWRITE || + RequestedDisposition == FILE_OVERWRITE_IF || + RequestedDisposition == FILE_SUPERSEDE) + { + DPRINT1("Denying write request on NTFS volume\n"); + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_ACCESS_DENIED; + } + } + else + { + /* HUGLY HACK: remain RO so far... */ + if (RequestedDisposition == FILE_CREATE || + RequestedDisposition == FILE_OPEN_IF || + RequestedDisposition == FILE_OVERWRITE_IF || + RequestedDisposition == FILE_SUPERSEDE) + { + DPRINT1("Denying write request on NTFS volume\n"); + return STATUS_ACCESS_DENIED; + } } /*

1 0

[akhaldi] 64731: [CRT] * Update setvbuf() and ungetc(). * Fixes some msvcrt:file tests. CORE-8540
by akhaldi＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: akhaldi Date: Mon Oct 13 17:50:17 2014 New Revision: 64731 URL: http://svn.reactos.org/svn/reactos?rev=64731&view=rev Log: [CRT] * Update setvbuf() and ungetc(). * Fixes some msvcrt:file tests. CORE-8540 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Mon Oct 13 17:50:17 2014 @@ -3674,23 +3674,39 @@ */ int CDECL setvbuf(FILE* file, char *buf, int mode, size_t size) { - _lock_file(file); - if(file->_bufsiz) { - free(file->_base); - file->_bufsiz = 0; - file->_cnt = 0; - } - if(mode == _IOFBF) { - file->_flag &= ~_IONBF; - file->_base = file->_ptr = buf; - if(buf) { - file->_bufsiz = size; - } - } else { - file->_flag |= _IONBF; - } - _unlock_file(file); - return 0; + if(!MSVCRT_CHECK_PMT(file != NULL)) return -1; + if(!MSVCRT_CHECK_PMT(mode==_IONBF || mode==_IOFBF || mode==_IOLBF)) return -1; + if(!MSVCRT_CHECK_PMT(mode==_IONBF || (size>=2 && size<=INT_MAX))) return -1; + + _lock_file(file); + + fflush(file); + if(file->_flag & _IOMYBUF) + free(file->_base); + file->_flag &= ~(_IONBF | _IOMYBUF | _USERBUF); + file->_cnt = 0; + + if(mode == _IONBF) { + file->_flag |= _IONBF; + file->_base = file->_ptr = (char*)&file->_charbuf; + file->_bufsiz = 2; + }else if(buf) { + file->_base = file->_ptr = buf; + file->_flag |= _USERBUF; + file->_bufsiz = size; + }else { + file->_base = file->_ptr = malloc(size); + if(!file->_base) { + file->_bufsiz = 0; + _unlock_file(file); + return -1; + } + + file->_flag |= _IOMYBUF; + file->_bufsiz = size; + } + _unlock_file(file); + return 0; } /********************************************************************* @@ -3798,12 +3814,18 @@ */ int CDECL ungetc(int c, FILE * file) { - if (c == EOF) + if(!MSVCRT_CHECK_PMT(file != NULL)) return EOF; + + if (c == EOF || !(file->_flag&_IOREAD || + (file->_flag&_IORW && !(file->_flag&_IOWRT)))) return EOF; _lock_file(file); - if(file->_bufsiz == 0 && alloc_buffer(file)) + if((!(file->_flag & (_IONBF | _IOMYBUF | _USERBUF)) + && alloc_buffer(file)) + || (!file->_cnt && file->_ptr==file->_base)) file->_ptr++; + if(file->_ptr>file->_base) { file->_ptr--; if(file->_flag & _IOSTRG) { @@ -3817,6 +3839,7 @@ } file->_cnt++; clearerr(file); + file->_flag |= _IOREAD; _unlock_file(file); return c; }

1 0

[jimtabor] 64730: [Win32k] - Remove code that breaks API SetActiveWindow tests. See CORE-7447. - Dedicated to Victor Martinez Calvo.
by jimtabor＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: jimtabor Date: Mon Oct 13 17:15:04 2014 New Revision: 64730 URL: http://svn.reactos.org/svn/reactos?rev=64730&view=rev Log: [Win32k] - Remove code that breaks API SetActiveWindow tests. See CORE-7447. - Dedicated to Victor Martinez Calvo. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Mon Oct 13 17:15:04 2014 @@ -1544,22 +1544,17 @@ WinPos->flags |= SWP_NOMOVE; } - if (WinPos->hwnd == UserGetForegroundWindow()) - { - WinPos->flags |= SWP_NOACTIVATE; /* Already active */ - } - else - if ((Wnd->style & (WS_POPUP | WS_CHILD)) != WS_CHILD) - { - /* Bring to the top when activating */ - if (!(WinPos->flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) && - (WinPos->flags & SWP_NOZORDER || - (WinPos->hwndInsertAfter != HWND_TOPMOST && WinPos->hwndInsertAfter != HWND_NOTOPMOST))) - { - WinPos->flags &= ~SWP_NOZORDER; - WinPos->hwndInsertAfter = (0 != (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_TOP); - } - } + if (WinPos->hwnd != UserGetForegroundWindow() && (Wnd->style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + { + /* Bring to the top when activating */ + if (!(WinPos->flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) && + (WinPos->flags & SWP_NOZORDER || + (WinPos->hwndInsertAfter != HWND_TOPMOST && WinPos->hwndInsertAfter != HWND_NOTOPMOST))) + { + WinPos->flags &= ~SWP_NOZORDER; + WinPos->hwndInsertAfter = (0 != (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_TOP); + } + } /* Check hwndInsertAfter */ if (!(WinPos->flags & SWP_NOZORDER))

1 0

[jgardou] 64729: Arch, stop screwing up your commits.
by jgardou＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: jgardou Date: Mon Oct 13 16:25:23 2014 New Revision: 64729 URL: http://svn.reactos.org/svn/reactos?rev=64729&view=rev Log: Arch, stop screwing up your commits. Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Mon Oct 13 16:25:23 2014 @@ -1,4 +1,4 @@ -set(baseaddress_ntdll a 0x7c920000) # should be above 0x7c920000 +set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 set(baseaddress_kernel32 0x77d80000) set(baseaddress_msvcrt 0x77cd0000) set(baseaddress_advapi32 0x77c20000)

1 0

[jgardou] 64728: [CMAKE] - Also give a base address to d3dwine.dll
by jgardou＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: jgardou Date: Mon Oct 13 16:21:48 2014 New Revision: 64728 URL: http://svn.reactos.org/svn/reactos?rev=64728&view=rev Log: [CMAKE] - Also give a base address to d3dwine.dll Modified: trunk/reactos/cmake/baseaddress.cmake trunk/reactos/cmake/baseaddress_dwarf.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Mon Oct 13 16:21:48 2014 @@ -1,4 +1,4 @@ -set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 +set(baseaddress_ntdll a 0x7c920000) # should be above 0x7c920000 set(baseaddress_kernel32 0x77d80000) set(baseaddress_msvcrt 0x77cd0000) set(baseaddress_advapi32 0x77c20000) @@ -272,7 +272,7 @@ set(baseaddress_wbemprox 0x70c70000) set(baseaddress_windowscodecs 0x70b60000) set(baseaddress_windowscodecsext 0x70b30000) -set(baseaddress_wined3d 0x70960000) +set(baseaddress_d3dwine 0x70960000) set(baseaddress_winfax 0x70930000) set(baseaddress_wing32 0x70900000) set(baseaddress_winhttp 0x708a0000) Modified: trunk/reactos/cmake/baseaddress_dwarf.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress_dwarf.cm… ============================================================================== --- trunk/reactos/cmake/baseaddress_dwarf.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress_dwarf.cmake [iso-8859-1] Mon Oct 13 16:21:48 2014 @@ -280,7 +280,7 @@ set(baseaddress_wbemprox 0x6ebf0000) set(baseaddress_windowscodecs 0x6ea60000) set(baseaddress_windowscodecsext 0x6ea30000) -set(baseaddress_wined3d 0x6e790000) +set(baseaddress_d3dwine 0x6e790000) set(baseaddress_winfax 0x6e760000) set(baseaddress_wing32 0x6e730000) set(baseaddress_winhttp 0x6e6b0000)

1 0

[dquintana] 64727: [RSHELL] * Actually send an OnSelect message right before executing the menu items. Fixes the problem where going to start->shutdown would keep the start menu open in the backgro...
by dquintana＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: dquintana Date: Mon Oct 13 16:09:57 2014 New Revision: 64727 URL: http://svn.reactos.org/svn/reactos?rev=64727&view=rev Log: [RSHELL] * Actually send an OnSelect message right before executing the menu items. Fixes the problem where going to start->shutdown would keep the start menu open in the background. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Mon Oct 13 16:09:57 2014 @@ -934,6 +934,10 @@ switch (changeType) { case MPOS_EXECUTE: + if (m_subMenuParent) + { + m_subMenuParent->OnSelect(changeType); + } m_hotBar->ExecuteItem(m_hotItem); break;

1 0

[jgardou] 64726: [WINED3D] - Fix build: This is wha happens when youknow you should perform a clean build but don't.
by jgardou＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: jgardou Date: Mon Oct 13 16:07:46 2014 New Revision: 64726 URL: http://svn.reactos.org/svn/reactos?rev=64726&view=rev Log: [WINED3D] - Fix build: This is wha happens when youknow you should perform a clean build but don't. Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Mon Oct 13 16:07:46 2014 @@ -44,7 +44,7 @@ add_library(d3dwine SHARED ${SOURCE} version.rc - ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) + ${CMAKE_CURRENT_BINARY_DIR}/d3dwine.def) set_module_type(d3dwine win32dll) target_link_libraries(d3dwine wine)

1 0

[dquintana] 64725: [MSGINA] * Fix an exception in the shutdown dialog that was silently eaten by the window proc.
by dquintana＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: dquintana Date: Mon Oct 13 16:07:19 2014 New Revision: 64725 URL: http://svn.reactos.org/svn/reactos?rev=64725&view=rev Log: [MSGINA] * Fix an exception in the shutdown dialog that was silently eaten by the window proc. Modified: branches/shell-experiments/dll/win32/msgina/shutdown.c Modified: branches/shell-experiments/dll/win32/msgina/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/shutdown.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/shutdown.c [iso-8859-1] Mon Oct 13 16:07:19 2014 @@ -115,6 +115,11 @@ WCHAR tmpBuffer2[512]; pgContext = (PGINA_CONTEXT)lParam; + if (!pgContext) + { + WARN("pgContext is NULL, branding bitmaps will not be displayed.\n"); + } + SetWindowLongPtr(hwnd, GWL_USERDATA, (DWORD_PTR)pgContext); /* Clears the content before it's used */ @@ -158,7 +163,8 @@ UpdateShutdownShellDesc(hwnd); /* Draw the logo graphic */ - pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + if (pgContext) + pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); return TRUE; } @@ -166,17 +172,19 @@ { PAINTSTRUCT ps; HDC hdc; - if (pgContext->hBitmap) + if (pgContext && pgContext->hBitmap) { hdc = BeginPaint(hwnd, &ps); DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); EndPaint(hwnd, &ps); - } - return TRUE; + return TRUE; + } + return FALSE; } case WM_DESTROY: { - DeleteObject(pgContext->hBitmap); + if (pgContext) + DeleteObject(pgContext->hBitmap); return TRUE; } case WM_COMMAND: @@ -226,6 +234,7 @@ LPWSTR lpUsername, BOOL bHideLogoff) { + GINA_CONTEXT pgContext = { 0 }; int dlgValue = 0; g_logoffHideState = bHideLogoff; @@ -233,10 +242,11 @@ UNREFERENCED_PARAMETER(lpUsername); // Loads the shut down dialog box - dlgValue = DialogBox(hDllInstance, - MAKEINTRESOURCE(IDD_SHUTDOWN_SHELL), - hParent, - ExitWindowsDialogShellProc); + dlgValue = DialogBoxParam(hDllInstance, + MAKEINTRESOURCE(IDD_SHUTDOWN_SHELL), + hParent, + ExitWindowsDialogShellProc, + (LPARAM)&pgContext); // Determines what to do based on user selection if (dlgValue == IDOK)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs