Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61891: [FREELDR] * Fix MSVC x64 build.
by akhaldi＠svn.reactos.org 30 Jan '14

30 Jan '14

Author: akhaldi Date: Thu Jan 30 19:05:54 2014 New Revision: 61891 URL: http://svn.reactos.org/svn/reactos?rev=61891&view=rev Log: [FREELDR] * Fix MSVC x64 build. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Thu Jan 30 19:05:54 2014 @@ -129,6 +129,8 @@ arch/amd64/int386.S arch/amd64/pnpbios.S) list(APPEND FREELDR_COMMON_SOURCE + arch/i386/custom.c + arch/i386/drivemap.c arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Thu Jan 30 19:05:54 2014 @@ -99,10 +99,10 @@ #include <arch/pc/machpc.h> #include <arch/pc/x86common.h> #include <arch/pc/pxe.h> +#include <arch/i386/custom.h> +#include <arch/i386/drivemap.h> #endif #if defined(_M_IX86) -#include <arch/i386/custom.h> -#include <arch/i386/drivemap.h> #include <arch/i386/i386.h> #include <arch/i386/machxbox.h> #include <arch/i386/miscboot.h>

1 0

[zguo] 61890: [0.3.16] Branch from commit that updated the theme files.
by zguo＠svn.reactos.org 30 Jan '14

30 Jan '14

Author: zguo Date: Thu Jan 30 19:03:58 2014 New Revision: 61890 URL: http://svn.reactos.org/svn/reactos?rev=61890&view=rev Log: [0.3.16] Branch from commit that updated the theme files. Added: branches/ReactOS-0.3.16/ - copied from r61886, trunk/

1 0

[jimtabor] 61889: [NtUser] - Remove unnecessary UINT size checks see CORE-7825. Patch by: Lee Schroeder.
by jimtabor＠svn.reactos.org 30 Jan '14

30 Jan '14

Author: jimtabor Date: Thu Jan 30 17:36:30 2014 New Revision: 61889 URL: http://svn.reactos.org/svn/reactos?rev=61889&view=rev Log: [NtUser] - Remove unnecessary UINT size checks see CORE-7825. Patch by: Lee Schroeder. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Jan 30 17:36:30 2014 @@ -331,7 +331,7 @@ MsgMemoryEntry = FindMsgMemory(Msg); - if ((!MsgMemoryEntry) || (MsgMemoryEntry->Size < 0)) + if (!MsgMemoryEntry) { /* Keep previous behavior */ return STATUS_SUCCESS; @@ -390,11 +390,6 @@ PMSGMEMORY MsgMemoryEntry; MsgMemoryEntry = FindMsgMemory(Msg); ASSERT(MsgMemoryEntry); - if (MsgMemoryEntry->Size < 0) - { - /* Keep previous behavior */ - return STATUS_INVALID_PARAMETER; - } if (MsgMemoryEntry->Flags == MMS_FLAG_READWRITE) {

1 0

[ekohl] 61888: [MSGINA] Create a connection to the LSA upon initialization and use it to change passwords. Logon will use the connection later.
by ekohl＠svn.reactos.org 29 Jan '14

29 Jan '14

Author: ekohl Date: Wed Jan 29 21:54:49 2014 New Revision: 61888 URL: http://svn.reactos.org/svn/reactos?rev=61888&view=rev Log: [MSGINA] Create a connection to the LSA upon initialization and use it to change passwords. Logon will use the connection later. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Wed Jan 29 21:54:49 2014 @@ -259,9 +259,6 @@ ULONG RequestBufferSize; ULONG ResponseBufferSize = 0; LPWSTR Ptr; - LSA_STRING PackageName; - HANDLE LsaHandle = NULL; - ULONG AuthenticationPackage = 0; BOOL res = FALSE; NTSTATUS ProtocolStatus; NTSTATUS Status; @@ -348,30 +345,9 @@ NewPassword1, RequestBuffer->NewPassword.MaximumLength); - /* Connect to the LSA server */ - Status = LsaConnectUntrusted(&LsaHandle); - if (!NT_SUCCESS(Status)) - { - ERR("LsaConnectUntrusted failed (Status 0x%08lx)\n", Status); - goto done; - } - - /* Get the authentication package */ - RtlInitAnsiString((PANSI_STRING)&PackageName, - MSV1_0_PACKAGE_NAME); - - Status = LsaLookupAuthenticationPackage(LsaHandle, - &PackageName, - &AuthenticationPackage); - if (!NT_SUCCESS(Status)) - { - ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); - goto done; - } - /* Call the authentication package */ - Status = LsaCallAuthenticationPackage(LsaHandle, - AuthenticationPackage, + Status = LsaCallAuthenticationPackage(pgContext->LsaHandle, + pgContext->AuthenticationPackage, RequestBuffer, RequestBufferSize, (PVOID*)&ResponseBuffer, @@ -403,9 +379,6 @@ if (ResponseBuffer != NULL) LsaFreeReturnBuffer(ResponseBuffer); - - if (LsaHandle != NULL) - NtClose(LsaHandle); return res; } Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Wed Jan 29 21:54:49 2014 @@ -254,6 +254,46 @@ } +static +BOOL +ConnectToLsa( + PGINA_CONTEXT pgContext) +{ + LSA_STRING LogonProcessName; + LSA_STRING PackageName; + LSA_OPERATIONAL_MODE SecurityMode = 0; + NTSTATUS Status; + + /* Connect to the LSA server */ + RtlInitAnsiString((PANSI_STRING)&LogonProcessName, + "MSGINA"); + + Status = LsaRegisterLogonProcess(&LogonProcessName, + &pgContext->LsaHandle, + &SecurityMode); + if (!NT_SUCCESS(Status)) + { + ERR("LsaRegisterLogonProcess failed (Status 0x%08lx)\n", Status); + return FALSE; + } + + /* Get the authentication package */ + RtlInitAnsiString((PANSI_STRING)&PackageName, + MSV1_0_PACKAGE_NAME); + + Status = LsaLookupAuthenticationPackage(pgContext->LsaHandle, + &PackageName, + &pgContext->AuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); + return FALSE; + } + + return TRUE; +} + + /* * @implemented */ @@ -279,6 +319,13 @@ if (!GetRegistrySettings(pgContext)) { WARN("GetRegistrySettings() failed\n"); + LocalFree(pgContext); + return FALSE; + } + + if (!ConnectToLsa(pgContext)) + { + WARN("ConnectToLsa() failed\n"); LocalFree(pgContext); return FALSE; } Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Wed Jan 29 21:54:49 2014 @@ -38,6 +38,8 @@ PWLX_DISPATCH_VERSION_1_3 pWlxFuncs; HANDLE hDllInstance; HWND hStatusWindow; + HANDLE LsaHandle; + ULONG AuthenticationPackage; DWORD AutoLogonState; BOOL bDisableCAD; BOOL bAutoAdminLogon;

1 0

[cwittich] 61887: [crt] fix error handling (use _dosmaperr)
by cwittich＠svn.reactos.org 29 Jan '14

29 Jan '14

Author: cwittich Date: Wed Jan 29 21:49:44 2014 New Revision: 61887 URL: http://svn.reactos.org/svn/reactos?rev=61887&view=rev Log: [crt] fix error handling (use _dosmaperr) 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] Wed Jan 29 21:49:44 2014 @@ -817,18 +817,15 @@ LOCK_FILES(); hand = fdtoh(fd); TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) + if (!is_valid_fd(fd)) { ret = -1; - else if (!CloseHandle(hand)) - { - WARN(":failed-last error (%d)\n",GetLastError()); - _dosmaperr(GetLastError()); - ret = -1; - } - else - { + } else { free_fd(fd); - ret = 0; + ret = CloseHandle(hand) ? 0 : -1; + if (ret) { + WARN(":failed-last error (%d)\n",GetLastError()); + _dosmaperr(GetLastError()); + } } UNLOCK_FILES(); TRACE(":ok\n"); @@ -1718,7 +1715,9 @@ } *fd = alloc_fd(hand, wxflag); - + if (*fd == -1) + return *_errno(); + TRACE(":fd (%d) handle (%p)\n", *fd, hand); return 0; } @@ -1783,12 +1782,7 @@ TRACE("fd*: %p :file (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x\n", fd, debugstr_w(path), oflags, shflags, pmode); - if (!fd) - { - MSVCRT_INVALID_PMT("null out fd pointer"); - *_errno() = EINVAL; - return EINVAL; - } + if (!MSVCRT_CHECK_PMT( fd != NULL )) return EINVAL; *fd = -1; wxflag = split_oflags(oflags); @@ -1868,7 +1862,6 @@ } hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); - if (hand == INVALID_HANDLE_VALUE) { WARN(":failed-last error (%d)\n",GetLastError()); _dosmaperr(GetLastError()); @@ -1891,7 +1884,7 @@ if (written != sizeof(utf8_bom)) { WARN("error writing BOM\n"); CloseHandle(hand); - *_errno() = GetLastError(); + _dosmaperr(GetLastError()); return *_errno(); } } @@ -1906,7 +1899,7 @@ { WARN("error writing BOM\n"); CloseHandle(hand); - *_errno() = GetLastError(); + _dosmaperr(GetLastError()); return *_errno(); } }

1 0

[tfaber] 61886: [LAUTUS.MSSTYLES] - Update to latest version by Pisarz
by tfaber＠svn.reactos.org 29 Jan '14

29 Jan '14

Author: tfaber Date: Wed Jan 29 21:46:55 2014 New Revision: 61886 URL: http://svn.reactos.org/svn/reactos?rev=61886&view=rev Log: [LAUTUS.MSSTYLES] - Update to latest version by Pisarz Added: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp (with props) trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp (with props) trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp (with props) Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_BUTTON.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_COMBOBUTTON.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_COMBOBUTTONGLYPH.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBACKGROUND.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_GROUPBOX.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_RESIZEGRIP2.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTVERTICAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERVERTICAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SLIDERTRACK.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTGROUPBACKGROUND.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTGROUPNEWAPPBUTTON.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTGROUPTOOLBARBUTTON.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTPANELPLACESBACKGROUND.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STATUSBACKGROUND.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEM.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWGLYPHS.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBARBACKGROUND.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBARTRAY.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TOOLBARBACKGROUND.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTAL.bmp trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTALOPEN.bmp trunk/reactos/media/themes/lautus.msstyles/lautus.rc trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_BUTTON.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Added: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_COMBOBUTTON.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_COMBOBUTTONGLYPH.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBACKGROUND.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_GROUPBOX.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_RESIZEGRIP2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTVERTICAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERVERTICAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SLIDERTRACK.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Added: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTGROUPBACKGROUND.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTGROUPNEWAPPBUTTON.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTGROUPTOOLBARBUTTON.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STARTPANELPLACESBACKGROUND.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_STATUSBACKGROUND.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEM.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWGLYPHS.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBARBACKGROUND.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBARTRAY.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TOOLBARBACKGROUND.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTAL.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTALOPEN.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/lautus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] Wed Jan 29 21:46:55 2014 @@ -10,14 +10,16 @@ 1 SIZENAMES {L"Normal Size\0Large Fonts\0Extra Large Fonts\0\0"} 1 MINDEPTH {0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x0000,} -EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal.INI" -LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal.INI" -NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal.INI" +EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal.INI" +LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal.INI" +NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal.INI" THEMES_INI TEXTFILE {L"\r\n"} NORMAL_BALLOONCLOSE_BMP BITMAP "bitmaps/NORMAL_BALLOONCLOSE.bmp" NORMAL_BUTTON_BMP BITMAP "bitmaps/NORMAL_BUTTON.bmp" NORMAL_CHECKBOX13_BMP BITMAP "bitmaps/NORMAL_CHECKBOX13.bmp" +NORMAL_CHECKBOX16_BMP BITMAP "bitmaps/NORMAL_CHECKBOX16.bmp" +NORMAL_CHECKBOX25_BMP BITMAP "bitmaps/NORMAL_CHECKBOX25.bmp" NORMAL_CHEVRON_BMP BITMAP "bitmaps/NORMAL_CHEVRON.bmp" NORMAL_CLOSEBUTTON_BMP BITMAP "bitmaps/NORMAL_CLOSEBUTTON.bmp" NORMAL_CLOSEGLYPH9_BMP BITMAP "bitmaps/NORMAL_CLOSEGLYPH9.bmp" @@ -71,6 +73,7 @@ NORMAL_SEPARATORVERT_BMP BITMAP "bitmaps/NORMAL_SEPARATORVERT.bmp" NORMAL_SEPARATOR_BMP BITMAP "bitmaps/NORMAL_SEPARATOR.bmp" NORMAL_SLIDERTRACK_BMP BITMAP "bitmaps/NORMAL_SLIDERTRACK.bmp" +NORMAL_SLIDERTRACKVERT_BMP BITMAP "bitmaps/NORMAL_SLIDERTRACKVERT.bmp" NORMAL_SMALLCLOSEBUTTON_BMP BITMAP "bitmaps/NORMAL_SMALLCLOSEBUTTON.bmp" NORMAL_SMALLFRAMECAPTIONSIZING_BMP BITMAP "bitmaps/NORMAL_SMALLFRAMECAPTIONSIZING.bmp" NORMAL_SMALLFRAMECAPTION_BMP BITMAP "bitmaps/NORMAL_SMALLFRAMECAPTION.bmp" Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available.

1 0

[cwittich] 61885: [crt] partial sync of file.c with wine 1.7.11
by cwittich＠svn.reactos.org 29 Jan '14

29 Jan '14

Author: cwittich Date: Wed Jan 29 20:11:11 2014 New Revision: 61885 URL: http://svn.reactos.org/svn/reactos?rev=61885&view=rev Log: [crt] partial sync of file.c with wine 1.7.11 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] Wed Jan 29 20:11:11 2014 @@ -89,15 +89,25 @@ #define WX_APPEND 0x20 #define WX_TEXT 0x80 +/* values for exflag - it's used differently in msvcr90.dll*/ +#define EF_UTF8 0x01 +#define EF_UTF16 0x02 +#define EF_CRIT_INIT 0x04 +#define EF_UNK_UNICODE 0x08 + +static char utf8_bom[3] = { 0xef, 0xbb, 0xbf }; +static char utf16_bom[2] = { 0xff, 0xfe }; + /* FIXME: this should be allocated dynamically */ #define MAX_FILES 2048 #define FD_BLOCK_SIZE 64 +/* ioinfo structure size is different in msvcrXX.dll's */ typedef struct { HANDLE handle; unsigned char wxflag; char unk1; - BOOL crit_init; + int exflag; CRITICAL_SECTION crit; } ioinfo; @@ -734,10 +744,8 @@ /* _flushall calls fflush which calls _flushall */ int CDECL fflush(FILE* file); -/********************************************************************* - * _flushall (MSVCRT.@) - */ -int CDECL _flushall(void) +/* INTERNAL: Flush all stream buffer */ +static int flush_all_buffers(int mask) { int i, num_flushed = 0; FILE *file; @@ -748,8 +756,8 @@ if (file->_flag) { - if(file->_flag & _IOWRT) { - fflush(file); + if(file->_flag & mask) { + fflush(file); num_flushed++; } } @@ -761,21 +769,40 @@ } /********************************************************************* + * _flushall (MSVCRT.@) + */ +int CDECL _flushall(void) +{ + return flush_all_buffers(_IOWRT | _IOREAD); +} + +/********************************************************************* * fflush (MSVCRT.@) */ int CDECL fflush(FILE* file) { if(!file) { - _flushall(); + flush_all_buffers(_IOWRT); } else if(file->_flag & _IOWRT) { int res; _lock_file(file); res = flush_buffer(file); + /* FIXME + if(!res && (file->_flag & _IOCOMMIT)) + res = _commit(file->_file) ? EOF : 0; + */ _unlock_file(file); return res; - } + } else if(file->_flag & _IOREAD) { + _lock_file(file); + file->_cnt = 0; + file->_ptr = file->_base; + _unlock_file(file); + + return 0; + } return 0; } @@ -1220,7 +1247,9 @@ static int get_flags(const wchar_t* mode, int *open_flags, int* stream_flags) { int plus = strchrW(mode, '+') != NULL; - + + while(*mode == ' ') mode++; + switch(*mode++) { case 'R': case 'r': @@ -1241,23 +1270,97 @@ return -1; } - while (*mode) + /* FIXME */ + /* *stream_flags |= MSVCRT__commode; */ + + while (*mode && *mode!=',') switch (*mode++) { case 'B': case 'b': *open_flags |= _O_BINARY; *open_flags &= ~_O_TEXT; break; - case 'T': case 't': + case 't': *open_flags |= _O_TEXT; *open_flags &= ~_O_BINARY; break; + case 'D': + *open_flags |= _O_TEMPORARY; + break; + case 'T': + *open_flags |= _O_SHORT_LIVED; + break; + /* FIXME + case 'c': + *stream_flags |= _IOCOMMIT; + break; + case 'n': + *stream_flags &= ~_IOCOMMIT; + break; + */ + case 'N': + *open_flags |= _O_NOINHERIT; + break; case '+': case ' ': + case 'a': + case 'w': + break; + case 'S': + case 'R': + FIXME("ignoring cache optimization flag: %c\n", mode[-1]); break; default: - FIXME(":unknown flag %c not supported\n",mode[-1]); - } + ERR("incorrect mode flag: %c\n", mode[-1]); + break; + } + + if(*mode == ',') + { + static const WCHAR ccs[] = {'c','c','s'}; + static const WCHAR utf8[] = {'u','t','f','-','8'}; + static const WCHAR utf16le[] = {'u','t','f','-','1','6','l','e'}; + static const WCHAR unicode[] = {'u','n','i','c','o','d','e'}; + + mode++; + while(*mode == ' ') mode++; + if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, sizeof(ccs)/sizeof(ccs[0])))) + return -1; + mode += sizeof(ccs)/sizeof(ccs[0]); + while(*mode == ' ') mode++; + if(!MSVCRT_CHECK_PMT(*mode == '=')) + return -1; + mode++; + while(*mode == ' ') mode++; + + if(!strncmpiW(utf8, mode, sizeof(utf8)/sizeof(utf8[0]))) + { + *open_flags |= _O_U8TEXT; + mode += sizeof(utf8)/sizeof(utf8[0]); + } + else if(!strncmpiW(utf16le, mode, sizeof(utf16le)/sizeof(utf16le[0]))) + { + *open_flags |= _O_U16TEXT; + mode += sizeof(utf16le)/sizeof(utf16le[0]); + } + else if(!strncmpiW(unicode, mode, sizeof(unicode)/sizeof(unicode[0]))) + { + *open_flags |= _O_WTEXT; + mode += sizeof(unicode)/sizeof(unicode[0]); + } + else + { + _invalid_parameter(NULL, NULL, NULL, 0, 0); + *_errno() = EINVAL; + return -1; + } + + while(*mode == ' ') mode++; + } + + if(!MSVCRT_CHECK_PMT(*mode == 0)) + return -1; + return 0; } @@ -1446,19 +1549,23 @@ int wxflags = 0; unsigned unsupp; /* until we support everything */ - if (oflags & _O_APPEND) wxflags |= WX_APPEND; - if (oflags & _O_BINARY) {/* Nothing to do */} - else if (oflags & _O_TEXT) wxflags |= WX_TEXT; - else if (*__p__fmode() & _O_BINARY) {/* Nothing to do */} + if (oflags & _O_APPEND) wxflags |= WX_APPEND; + if (oflags & _O_BINARY) {/* Nothing to do */} + else if (oflags & _O_TEXT) wxflags |= WX_TEXT; + else if (oflags & _O_WTEXT) wxflags |= WX_TEXT; + else if (oflags & _O_U16TEXT) wxflags |= WX_TEXT; + else if (oflags & _O_U8TEXT) wxflags |= WX_TEXT; + else if (*__p__fmode() & _O_BINARY) {/* Nothing to do */} else wxflags |= WX_TEXT; /* default to TEXT*/ - if (oflags & _O_NOINHERIT) wxflags |= WX_DONTINHERIT; + if (oflags & _O_NOINHERIT) wxflags |= WX_DONTINHERIT; if ((unsupp = oflags & ~( _O_BINARY|_O_TEXT|_O_APPEND| _O_TRUNC|_O_EXCL|_O_CREAT| _O_RDWR|_O_WRONLY|_O_TEMPORARY| _O_NOINHERIT| - _O_SEQUENTIAL|_O_RANDOM|_O_SHORT_LIVED + _O_SEQUENTIAL|_O_RANDOM|_O_SHORT_LIVED| + _O_WTEXT|_O_U16TEXT|_O_U8TEXT ))) ERR(":unsupported oflags 0x%04x\n",unsupp); @@ -1639,6 +1746,29 @@ return fd; } +static int check_bom(HANDLE h, int oflags, BOOL seek) +{ + char bom[sizeof(utf8_bom)]; + DWORD r; + + oflags &= ~(_O_WTEXT|_O_U16TEXT|_O_U8TEXT); + + if (!ReadFile(h, bom, sizeof(utf8_bom), &r, NULL)) + return oflags; + + if (r==sizeof(utf8_bom) && !memcmp(bom, utf8_bom, sizeof(utf8_bom))) { + oflags |= _O_U8TEXT; + }else if (r>=sizeof(utf16_bom) && !memcmp(bom, utf16_bom, sizeof(utf16_bom))) { + if (seek && r>2) + SetFilePointer(h, 2, NULL, FILE_BEGIN); + oflags |= _O_U16TEXT; + }else if (seek) { + SetFilePointer(h, 0, NULL, FILE_BEGIN); + } + + return oflags; +} + /********************************************************************* * _wsopen_s (MSVCRT.@) */ @@ -1722,6 +1852,21 @@ sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = (oflags & _O_NOINHERIT) ? FALSE : TRUE; + if ((oflags&(_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) + && (creation==OPEN_ALWAYS || creation==OPEN_EXISTING) + && !(access&GENERIC_READ)) + { + hand = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + if (hand != INVALID_HANDLE_VALUE) + { + oflags = check_bom(hand, oflags, FALSE); + CloseHandle(hand); + } + else + oflags &= ~(_O_WTEXT|_O_U16TEXT|_O_U8TEXT); + } + hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); if (hand == INVALID_HANDLE_VALUE) { @@ -1730,7 +1875,56 @@ return *_errno(); } + if (oflags & (_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) + { + if ((access & GENERIC_WRITE) && (creation==CREATE_NEW + || creation==CREATE_ALWAYS || creation==TRUNCATE_EXISTING + || (creation==OPEN_ALWAYS && GetLastError()==ERROR_ALREADY_EXISTS))) + { + if (oflags & _O_U8TEXT) + { + DWORD written = 0, tmp; + + while(written!=sizeof(utf8_bom) && WriteFile(hand, (char*)utf8_bom+written, + sizeof(utf8_bom)-written, &tmp, NULL)) + written += tmp; + if (written != sizeof(utf8_bom)) { + WARN("error writing BOM\n"); + CloseHandle(hand); + *_errno() = GetLastError(); + return *_errno(); + } + } + else + { + DWORD written = 0, tmp; + + while(written!=sizeof(utf16_bom) && WriteFile(hand, (char*)utf16_bom+written, + sizeof(utf16_bom)-written, &tmp, NULL)) + written += tmp; + if (written != sizeof(utf16_bom)) + { + WARN("error writing BOM\n"); + CloseHandle(hand); + *_errno() = GetLastError(); + return *_errno(); + } + } + } + else if (access & GENERIC_READ) + oflags = check_bom(hand, oflags, TRUE); + } + *fd = alloc_fd(hand, wxflag); + if (*fd == -1) + return *_errno(); + + if (oflags & _O_WTEXT) + get_ioinfo(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; + else if (oflags & _O_U16TEXT) + get_ioinfo(*fd)->exflag |= EF_UTF16; + else if (oflags & _O_U8TEXT) + get_ioinfo(*fd)->exflag |= EF_UTF8; TRACE(":fd (%d) handle (%p)\n", *fd, hand); return 0;

1 0

[jgardou] 61884: [WIN32K] - Formatting, no code change.
by jgardou＠svn.reactos.org 29 Jan '14

29 Jan '14

Author: jgardou Date: Wed Jan 29 19:09:15 2014 New Revision: 61884 URL: http://svn.reactos.org/svn/reactos?rev=61884&view=rev Log: [WIN32K] - Formatting, no code change. Modified: trunk/reactos/win32ss/gdi/eng/eng.h trunk/reactos/win32ss/gdi/eng/engwindow.c Modified: trunk/reactos/win32ss/gdi/eng/eng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/eng.h?rev=… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/eng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/eng.h [iso-8859-1] Wed Jan 29 19:09:15 2014 @@ -18,8 +18,8 @@ VOID FASTCALL IntEngWindowChanged( - PWND Window, - FLONG flChanged); + _In_ PWND Window, + _In_ FLONG flChanged); VOID FASTCALL IntGdiAcquireSemaphore ( HSEMAPHORE hsem ); VOID FASTCALL IntGdiReleaseSemaphore ( HSEMAPHORE hsem ); Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engwindow.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] Wed Jan 29 19:09:15 2014 @@ -6,9 +6,6 @@ * PROGRAMER: Gregor Anich */ -/* TODO: Check how the WNDOBJ implementation should behave with a driver on windows. - */ - #include <win32k.h> #define NDEBUG @@ -22,32 +19,32 @@ VOID FASTCALL IntEngWndCallChangeProc( - IN WNDOBJ *pwo, - IN FLONG flChanged) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - - if (WndObjInt->ChangeProc == NULL) - { - return; - } - - /* check flags of the WNDOBJ */ - flChanged &= WndObjInt->Flags; - if (flChanged == 0) - { - return; - } - - /* Call the WNDOBJCHANGEPROC */ - if (flChanged == WOC_CHANGED) - { - pwo = NULL; - } - - DPRINT("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", - WndObjInt->ChangeProc, flChanged); - WndObjInt->ChangeProc(pwo, flChanged); + IN WNDOBJ *pwo, + IN FLONG flChanged) +{ + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + + if (WndObjInt->ChangeProc == NULL) + { + return; + } + + /* check flags of the WNDOBJ */ + flChanged &= WndObjInt->Flags; + if (flChanged == 0) + { + return; + } + + /* Call the WNDOBJCHANGEPROC */ + if (flChanged == WOC_CHANGED) + { + pwo = NULL; + } + + DPRINT("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", + WndObjInt->ChangeProc, flChanged); + WndObjInt->ChangeProc(pwo, flChanged); } /* @@ -56,74 +53,74 @@ BOOLEAN FASTCALL IntEngWndUpdateClipObj( - WNDGDI *WndObjInt, - PWND Window) -{ - HRGN hVisRgn; - PROSRGNDATA visRgn; - CLIPOBJ *ClipObj = NULL; - CLIPOBJ *OldClipObj; - - DPRINT("IntEngWndUpdateClipObj\n"); - - hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); - if (hVisRgn != NULL) - { - NtGdiOffsetRgn(hVisRgn, Window->rcClient.left, Window->rcClient.top); - visRgn = RGNOBJAPI_Lock(hVisRgn, NULL); - if (visRgn != NULL) - { - if (visRgn->rdh.nCount > 0) - { - ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, - &visRgn->rdh.rcBound); - DPRINT("Created visible region with %lu rects\n", visRgn->rdh.nCount); - DPRINT(" BoundingRect: %d, %d %d, %d\n", - visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, - visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); + WNDGDI *WndObjInt, + PWND Window) +{ + HRGN hVisRgn; + PROSRGNDATA visRgn; + CLIPOBJ *ClipObj = NULL; + CLIPOBJ *OldClipObj; + + DPRINT("IntEngWndUpdateClipObj\n"); + + hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); + if (hVisRgn != NULL) + { + NtGdiOffsetRgn(hVisRgn, Window->rcClient.left, Window->rcClient.top); + visRgn = RGNOBJAPI_Lock(hVisRgn, NULL); + if (visRgn != NULL) { - ULONG i; - for (i = 0; i < visRgn->rdh.nCount; i++) - { - DPRINT(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, - visRgn->Buffer[i].left, visRgn->Buffer[i].top, - visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); - } + if (visRgn->rdh.nCount > 0) + { + ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, + &visRgn->rdh.rcBound); + DPRINT("Created visible region with %lu rects\n", visRgn->rdh.nCount); + DPRINT(" BoundingRect: %d, %d %d, %d\n", + visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, + visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); + { + ULONG i; + for (i = 0; i < visRgn->rdh.nCount; i++) + { + DPRINT(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, + visRgn->Buffer[i].left, visRgn->Buffer[i].top, + visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); + } + } + } + RGNOBJAPI_Unlock(visRgn); } - } - RGNOBJAPI_Unlock(visRgn); + else + { + DPRINT1("Warning: Couldn't lock visible region of window DC\n"); + } + GreDeleteObject(hVisRgn); } else { - DPRINT1("Warning: Couldn't lock visible region of window DC\n"); - } - GreDeleteObject(hVisRgn); - } - else - { - DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); - } - - if (ClipObj == NULL) - { - /* Fall back to client rect */ - ClipObj = IntEngCreateClipRegion(1, &Window->rcClient, - &Window->rcClient); - } - - if (ClipObj == NULL) - { - DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); - return FALSE; - } - - RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); - RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->rcClient, sizeof (RECT)); - OldClipObj = InterlockedExchangePointer((PVOID*)&WndObjInt->ClientClipObj, ClipObj); - if (OldClipObj != NULL) - IntEngDeleteClipRegion(OldClipObj); - - return TRUE; + DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); + } + + if (ClipObj == NULL) + { + /* Fall back to client rect */ + ClipObj = IntEngCreateClipRegion(1, &Window->rcClient, + &Window->rcClient); + } + + if (ClipObj == NULL) + { + DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); + return FALSE; + } + + RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); + RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->rcClient, sizeof (RECT)); + OldClipObj = InterlockedExchangePointer((PVOID*)&WndObjInt->ClientClipObj, ClipObj); + if (OldClipObj != NULL) + IntEngDeleteClipRegion(OldClipObj); + + return TRUE; } /* @@ -132,49 +129,49 @@ VOID FASTCALL IntEngWindowChanged( - PWND Window, - FLONG flChanged) -{ - PPROPERTY pprop; - WNDGDI *Current; - HWND hWnd; - - ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); - - hWnd = Window->head.h; - pprop = IntGetProp(Window, AtomWndObj); - if (!pprop) - { - return; - } - Current = (WNDGDI *)pprop->Data; - if ( gcountPWO && - Current && - Current->Hwnd == hWnd && - Current->WndObj.pvConsumer != NULL ) - { - /* Update the WNDOBJ */ - switch (flChanged) - { + _In_ PWND Window, + _In_ FLONG flChanged) +{ + PPROPERTY pprop; + WNDGDI *Current; + HWND hWnd; + + ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); + + hWnd = Window->head.h; + pprop = IntGetProp(Window, AtomWndObj); + if (!pprop) + { + return; + } + Current = (WNDGDI *)pprop->Data; + if ( gcountPWO && + Current && + Current->Hwnd == hWnd && + Current->WndObj.pvConsumer != NULL ) + { + /* Update the WNDOBJ */ + switch (flChanged) + { case WOC_RGN_CLIENT: - /* Update the clipobj and client rect of the WNDOBJ */ - IntEngWndUpdateClipObj(Current, Window); - break; + /* Update the clipobj and client rect of the WNDOBJ */ + IntEngWndUpdateClipObj(Current, Window); + break; case WOC_DELETE: - /* FIXME: Should the WNDOBJs be deleted by win32k or by the driver? */ - break; - } - - /* Call the change proc */ - IntEngWndCallChangeProc(&Current->WndObj, flChanged); - - /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ - if (flChanged == WOC_RGN_CLIENT) - { - IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); - } - } + /* FIXME: Should the WNDOBJs be deleted by win32k or by the driver? */ + break; + } + + /* Call the change proc */ + IntEngWndCallChangeProc(&Current->WndObj, flChanged); + + /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ + if (flChanged == WOC_RGN_CLIENT) + { + IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); + } + } } /* @@ -183,75 +180,75 @@ WNDOBJ* APIENTRY EngCreateWnd( - SURFOBJ *pso, - HWND hWnd, - WNDOBJCHANGEPROC pfn, - FLONG fl, - int iPixelFormat) -{ - WNDGDI *WndObjInt = NULL; - WNDOBJ *WndObjUser = NULL; - PWND Window; - BOOL calledFromUser; - DECLARE_RETURN(WNDOBJ*); - - DPRINT("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", - pso, hWnd, pfn, fl, iPixelFormat); - - calledFromUser = UserIsEntered(); - if (!calledFromUser){ - UserEnterShared(); - } - - /* Get window object */ - Window = UserGetWindowObject(hWnd); - if (Window == NULL) - { - RETURN( NULL); - } - - /* Create WNDOBJ */ - WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); - if (WndObjInt == NULL) - { - DPRINT1("Failed to allocate memory for a WND structure!\n"); - RETURN( NULL); - } - - /* Fill the clipobj */ - WndObjInt->ClientClipObj = NULL; - if (!IntEngWndUpdateClipObj(WndObjInt, Window)) - { - EngFreeMem(WndObjInt); - RETURN( NULL); - } - - /* Fill user object */ - WndObjUser = GDIToObj(WndObjInt, WND); - WndObjUser->psoOwner = pso; - WndObjUser->pvConsumer = NULL; - - /* Fill internal object */ - WndObjInt->Hwnd = hWnd; - WndObjInt->ChangeProc = pfn; - WndObjInt->Flags = fl; - WndObjInt->PixelFormat = iPixelFormat; - - /* associate object with window */ - IntSetProp(Window, AtomWndObj, WndObjInt); - ++gcountPWO; - - DPRINT("EngCreateWnd: SUCCESS!\n"); - - RETURN( WndObjUser); + SURFOBJ *pso, + HWND hWnd, + WNDOBJCHANGEPROC pfn, + FLONG fl, + int iPixelFormat) +{ + WNDGDI *WndObjInt = NULL; + WNDOBJ *WndObjUser = NULL; + PWND Window; + BOOL calledFromUser; + DECLARE_RETURN(WNDOBJ*); + + DPRINT1("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", + pso, hWnd, pfn, fl, iPixelFormat); + + calledFromUser = UserIsEntered(); + if (!calledFromUser) { + UserEnterShared(); + } + + /* Get window object */ + Window = UserGetWindowObject(hWnd); + if (Window == NULL) + { + RETURN( NULL); + } + + /* Create WNDOBJ */ + WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); + if (WndObjInt == NULL) + { + DPRINT1("Failed to allocate memory for a WND structure!\n"); + RETURN( NULL); + } + + /* Fill the clipobj */ + WndObjInt->ClientClipObj = NULL; + if (!IntEngWndUpdateClipObj(WndObjInt, Window)) + { + EngFreeMem(WndObjInt); + RETURN( NULL); + } + + /* Fill user object */ + WndObjUser = GDIToObj(WndObjInt, WND); + WndObjUser->psoOwner = pso; + WndObjUser->pvConsumer = NULL; + + /* Fill internal object */ + WndObjInt->Hwnd = hWnd; + WndObjInt->ChangeProc = pfn; + WndObjInt->Flags = fl; + WndObjInt->PixelFormat = iPixelFormat; + + /* associate object with window */ + IntSetProp(Window, AtomWndObj, WndObjInt); + ++gcountPWO; + + DPRINT("EngCreateWnd: SUCCESS!\n"); + + RETURN( WndObjUser); CLEANUP: - if (!calledFromUser){ - UserLeave(); - } - - END_CLEANUP; + if (!calledFromUser) { + UserLeave(); + } + + END_CLEANUP; } @@ -261,39 +258,39 @@ VOID APIENTRY EngDeleteWnd( - IN WNDOBJ *pwo) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - PWND Window; - BOOL calledFromUser; - - DPRINT("EngDeleteWnd: pwo = 0x%p\n", pwo); - - calledFromUser = UserIsEntered(); - if (!calledFromUser){ - UserEnterExclusive(); - } - - /* Get window object */ - Window = UserGetWindowObject(WndObjInt->Hwnd); - if (Window == NULL) - { - DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); - } - else - { - /* Remove object from window */ - IntRemoveProp(Window, AtomWndObj); - --gcountPWO; - } - - if (!calledFromUser){ - UserLeave(); - } - - /* Free resources */ - IntEngDeleteClipRegion(WndObjInt->ClientClipObj); - EngFreeMem(WndObjInt); + IN WNDOBJ *pwo) +{ + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + PWND Window; + BOOL calledFromUser; + + DPRINT("EngDeleteWnd: pwo = 0x%p\n", pwo); + + calledFromUser = UserIsEntered(); + if (!calledFromUser) { + UserEnterExclusive(); + } + + /* Get window object */ + Window = UserGetWindowObject(WndObjInt->Hwnd); + if (Window == NULL) + { + DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); + } + else + { + /* Remove object from window */ + IntRemoveProp(Window, AtomWndObj); + --gcountPWO; + } + + if (!calledFromUser) { + UserLeave(); + } + + /* Free resources */ + IntEngDeleteClipRegion(WndObjInt->ClientClipObj); + EngFreeMem(WndObjInt); } @@ -303,18 +300,18 @@ BOOL APIENTRY WNDOBJ_bEnum( - IN WNDOBJ *pwo, - IN ULONG cj, - OUT ULONG *pul) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - BOOL Ret; - - DPRINT("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); - Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); - - DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); - return Ret; + IN WNDOBJ *pwo, + IN ULONG cj, + OUT ULONG *pul) +{ + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + BOOL Ret; + + DPRINT("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); + Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); + + DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); + return Ret; } @@ -324,22 +321,22 @@ ULONG APIENTRY WNDOBJ_cEnumStart( - IN WNDOBJ *pwo, - IN ULONG iType, - IN ULONG iDirection, - IN ULONG cLimit) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - ULONG Ret; - - DPRINT("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", - pwo, iType, iDirection, cLimit); - - /* FIXME: Should we enumerate all rectangles or not? */ - Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); - - DPRINT("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); - return Ret; + IN WNDOBJ *pwo, + IN ULONG iType, + IN ULONG iDirection, + IN ULONG cLimit) +{ + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + ULONG Ret; + + DPRINT("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", + pwo, iType, iDirection, cLimit); + + /* FIXME: Should we enumerate all rectangles or not? */ + Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); + + DPRINT("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); + return Ret; } @@ -349,29 +346,29 @@ VOID APIENTRY WNDOBJ_vSetConsumer( - IN WNDOBJ *pwo, - IN PVOID pvConsumer) -{ - BOOL Hack; - - DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); - - Hack = (pwo->pvConsumer == NULL); - pwo->pvConsumer = pvConsumer; - - /* HACKHACKHACK - * - * MSDN says that the WNDOBJCHANGEPROC will be called with the most recent state - * when a WNDOBJ is created - we do it here because most drivers will need pvConsumer - * in the callback to identify the WNDOBJ I think. - * - * - blight - */ - if (Hack) - { - IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); - IntEngWndCallChangeProc(pwo, WOC_CHANGED); - IntEngWndCallChangeProc(pwo, WOC_DRAWN); + IN WNDOBJ *pwo, + IN PVOID pvConsumer) +{ + BOOL Hack; + + DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); + + Hack = (pwo->pvConsumer == NULL); + pwo->pvConsumer = pvConsumer; + + /* HACKHACKHACK + * + * MSDN says that the WNDOBJCHANGEPROC will be called with the most recent state + * when a WNDOBJ is created - we do it here because most drivers will need pvConsumer + * in the callback to identify the WNDOBJ I think. + * + * - blight + */ + if (Hack) + { + IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); + IntEngWndCallChangeProc(pwo, WOC_CHANGED); + IntEngWndCallChangeProc(pwo, WOC_DRAWN); } }

1 0

[jgardou] 61883: [WIN32K] - Implement GDIOBJ_TryLockObject and used it for DRIVEROBJs - Fix EngUnlockDriverObj
by jgardou＠svn.reactos.org 29 Jan '14

29 Jan '14

Author: jgardou Date: Wed Jan 29 18:32:14 2014 New Revision: 61883 URL: http://svn.reactos.org/svn/reactos?rev=61883&view=rev Log: [WIN32K] - Implement GDIOBJ_TryLockObject and used it for DRIVEROBJs - Fix EngUnlockDriverObj Modified: trunk/reactos/win32ss/gdi/eng/driverobj.c trunk/reactos/win32ss/gdi/eng/driverobj.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h trunk/reactos/win32ss/gdi/ntgdi/misc.h Modified: trunk/reactos/win32ss/gdi/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/driverobj.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/driverobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/driverobj.c [iso-8859-1] Wed Jan 29 18:32:14 2014 @@ -80,7 +80,7 @@ PEDRIVEROBJ pedo; /* Lock the object */ - pedo = DRIVEROBJ_LockObject(hdo); + pedo = DRIVEROBJ_TryLockObject(hdo); if (!pedo) { return FALSE; @@ -100,10 +100,11 @@ /* Prevent cleanup callback from being called again */ pedo->drvobj.pFreeProc = NULL; - /* NOTE: We don't care about the bLocked param, as our handle manager - allows freeing the object, while we hold any number of locks. */ + /* Unlock if the caller indicates it is locked */ + if (bLocked) + DRIVEROBJ_UnlockObject(pedo); - /* Delete the object */ + /* Now delete the object */ GDIOBJ_vDeleteObject(&pedo->baseobj); return TRUE; } @@ -117,7 +118,7 @@ PEDRIVEROBJ pedo; /* Lock the object */ - pedo = DRIVEROBJ_LockObject(hdo); + pedo = DRIVEROBJ_TryLockObject(hdo); /* Return pointer to the DRIVEROBJ structure */ return &pedo->drvobj; @@ -133,7 +134,7 @@ ULONG cLocks; /* First lock to get a pointer to the object */ - pedo = DRIVEROBJ_LockObject(hdo); + pedo = DRIVEROBJ_TryLockObject(hdo); if(!pedo) { /* Object could not be locked, fail. */ Modified: trunk/reactos/win32ss/gdi/eng/driverobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/driverobj.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/driverobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/driverobj.h [iso-8859-1] Wed Jan 29 18:32:14 2014 @@ -20,7 +20,7 @@ FORCEINLINE PEDRIVEROBJ -DRIVEROBJ_LockObject(HDRVOBJ hdo) +DRIVEROBJ_TryLockObject(HDRVOBJ hdo) { - return GDIOBJ_LockObject(hdo, GDIObjType_DRVOBJ_TYPE); + return GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE); } Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Wed Jan 29 18:32:14 2014 @@ -52,11 +52,14 @@ #define ASSERT_EXCLUSIVE_OBJECT_TYPE(objt) \ ASSERT((objt) == GDIObjType_DC_TYPE || \ (objt) == GDIObjType_RGN_TYPE) +#define ASSERT_TRYLOCK_OBJECT_TYPE(objt) \ + ASSERT((objt) == GDIObjType_DRVOBJ_TYPE) #else #define DBG_INCREASE_LOCK_COUNT(ppi, hobj) #define DBG_DECREASE_LOCK_COUNT(x, y) #define ASSERT_SHARED_OBJECT_TYPE(objt) #define ASSERT_EXCLUSIVE_OBJECT_TYPE(objt) +#define ASSERT_TRYLOCK_OBJECT_TYPE(objt) #endif #if defined(_M_IX86) || defined(_M_AMD64) @@ -623,6 +626,72 @@ PGDIOBJ NTAPI +GDIOBJ_TryLockObject( + HGDIOBJ hobj, + UCHAR objt) +{ + PENTRY pentry; + POBJ pobj; + DWORD dwThreadId; + + /* Check if the handle type matches */ + ASSERT_TRYLOCK_OBJECT_TYPE(objt); + if ((((ULONG_PTR)hobj >> 16) & 0x1f) != objt) + { + DPRINT("Wrong object type: hobj=0x%p, objt=0x%x\n", hobj, objt); + return NULL; + } + + /* Reference the handle entry */ + pentry = ENTRY_ReferenceEntryByHandle(hobj, 0); + if (!pentry) + { + DPRINT("GDIOBJ: Requested handle 0x%p is not valid.\n", hobj); + return NULL; + } + + /* Get the pointer to the BASEOBJECT */ + pobj = pentry->einfo.pobj; + + /* Check if we already own the lock */ + dwThreadId = PtrToUlong(PsGetCurrentThreadId()); + if (pobj->dwThreadId != dwThreadId) + { + /* Disable APCs and try acquiring the push lock */ + KeEnterCriticalRegion(); + if(!ExTryAcquirePushLockExclusive(&pobj->pushlock)) + { + ULONG cRefs, ulIndex; + /* Already owned. Clean up and leave. */ + KeLeaveCriticalRegion(); + + /* Calculate the index */ + ulIndex = GDI_HANDLE_GET_INDEX(pobj->hHmgr); + + /* Decrement reference count */ + ASSERT((gpaulRefCount[ulIndex] & REF_MASK_COUNT) > 0); + cRefs = InterlockedDecrement((LONG*)&gpaulRefCount[ulIndex]); + ASSERT(cRefs & REF_MASK_VALID); + + return NULL; + } + + /* Set us as lock owner */ + ASSERT(pobj->dwThreadId == 0); + pobj->dwThreadId = dwThreadId; + } + + /* Increase lock count */ + pobj->cExclusiveLock++; + DBG_INCREASE_LOCK_COUNT(PsGetCurrentProcessWin32Process(), hobj); + DBG_LOGEVENT(&pobj->slhLog, EVENT_LOCK, 0); + + /* Return the object */ + return pobj; +} + +PGDIOBJ +NTAPI GDIOBJ_LockObject( HGDIOBJ hobj, UCHAR objt) Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Wed Jan 29 18:32:14 2014 @@ -141,6 +141,12 @@ HGDIOBJ hobj, UCHAR objt); +PGDIOBJ +NTAPI +GDIOBJ_TryLockObject( + HGDIOBJ hobj, + UCHAR objt); + VOID NTAPI GDIOBJ_vUnlockObject( Modified: trunk/reactos/win32ss/gdi/ntgdi/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/misc.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/misc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/misc.h [iso-8859-1] Wed Jan 29 18:32:14 2014 @@ -113,6 +113,14 @@ } FORCEINLINE +BOOLEAN +ExTryAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock) +{ + /* Try acquiring the lock */ + return !InterlockedBitTestAndSet((PLONG)PushLock, EX_PUSH_LOCK_LOCK_V); +} + +FORCEINLINE VOID ExReleasePushLockExclusive(PEX_PUSH_LOCK PushLock) {

1 0

[akhaldi] 61882: [AFD] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 29 Jan '14

29 Jan '14

Author: akhaldi Date: Wed Jan 29 11:00:53 2014 New Revision: 61882 URL: http://svn.reactos.org/svn/reactos?rev=61882&view=rev Log: [AFD] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/event.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/afd/include/tdiconn.h Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -105,4 +105,3 @@ return UnlockAndMaybeComplete( FCB, Status, Irp, (ULONG_PTR)FCB->AddressFile.Handle ); } - Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" NTSTATUS Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" NTSTATUS NTAPI Modified: trunk/reactos/drivers/network/afd/afd/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ev… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/event.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * REVISIONS: * CSH 01/09-2000 Created */ + #include <afd.h> NTSTATUS AfdEventError( @@ -307,5 +308,4 @@ return STATUS_SUCCESS; } - /* EOF */ Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" NTSTATUS NTAPI Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static NTSTATUS SatisfyAccept( PAFD_DEVICE_EXTENSION DeviceExt, Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" PVOID GetLockedData(PIRP Irp, PIO_STACK_LOCATION IrpSp) Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static VOID RefillSocketBuffer( PAFD_FCB FCB ) Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static VOID PrintEvents( ULONG Events ) { Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,11 +7,11 @@ * REVISIONS: * CSH 01/09-2000 Created */ + #include <afd.h> -#include <pseh/pseh2.h> -#include "debug.h" -#include "tdiconn.h" -#include "tdi_proto.h" + +#include <tdikrnl.h> +#include <tdiinfo.h> #if DBG #if 0 Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include <afd.h> UINT TdiAddressSizeFromType( UINT AddressType ) { @@ -261,4 +262,3 @@ return Status; } - Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static IO_COMPLETION_ROUTINE SendComplete; @@ -661,4 +662,3 @@ return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } } - Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -11,16 +11,9 @@ #ifndef _AFD_H #define _AFD_H -#include <ntddk.h> #include <ntifs.h> #include <ndk/obtypes.h> -#include <ndk/obfuncs.h> -#include <ndk/mmtypes.h> -#include <ndk/mmfuncs.h> #include <tdi.h> -#include <tdikrnl.h> -#include <tdiinfo.h> -#include <string.h> #define _WINBASE_ #define _WINDOWS_H #define _INC_WINDOWS @@ -434,4 +427,4 @@ AfdPacketSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); -#endif/*_AFD_H*/ +#endif /* _AFD_H */ Modified: trunk/reactos/drivers/network/afd/include/tdiconn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/tdiconn.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/tdiconn.h [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -1,8 +1,4 @@ #pragma once - -#ifdef _MSC_VER -#include <ntddtdi.h> -#endif typedef VOID *PTDI_CONNECTION_INFO_PAIR;

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