Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[sir_richard] 47592: [NTOS]: Define the POOL_HEADER for x64. [NTOS]: Define POOL_BLOCK_SIZE definition to set the minimum pool block size. In NT, this is equal to a LIST_ENTRY structure, because the Pool Allocator must be able to store a LIST_ENTRY into a freed pool block. This also determines the alignment of pool allocations. So 8 on x86, 16 on x64. [NTOS]: Don't depend on LIST_ENTRY, but use POOL_BLOCK_SIZE instead (on IA64, if we ever want to support this, the pool block size is different fr

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Jun 5 18:53:54 2010 New Revision: 47592 URL: http://svn.reactos.org/svn/reactos?rev=47592&view=rev Log: [NTOS]: Define the POOL_HEADER for x64. [NTOS]: Define POOL_BLOCK_SIZE definition to set the minimum pool block size. In NT, this is equal to a LIST_ENTRY structure, because the Pool Allocator must be able to store a LIST_ENTRY into a freed pool block. This also determines the alignment of pool allocations. So 8 on x86, 16 on x64. [NTOS]: Don't depend on LIST_ENTRY, but use POOL_BLOCK_SIZE instead (on IA64, if we ever want to support this, the pool block size is different from a LIST_ENTRY/POOL_HEADER). [NTOS]: The following ASSERTs must hold: the POOL_HEADER must be as big as the the smallest pool block (POOL_BLOCK_SIZE), which must be at least as big as a LIST_ENTRY structure. 8 == 8 == 8 on x86, 16 == 16 == 16 on x64. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Jun 5 18:53:54 2010 @@ -225,13 +225,18 @@ // Special IRQL value (found in assertions) // #define MM_NOIRQL (KIRQL)0xFFFFFFFF - + // // FIXFIX: These should go in ex.h after the pool merge // -#define POOL_LISTS_PER_PAGE (PAGE_SIZE / sizeof(LIST_ENTRY)) +#ifdef _M_AMD64 +#define POOL_BLOCK_SIZE 16 +#else +#define POOL_BLOCK_SIZE 8 +#endif +#define POOL_LISTS_PER_PAGE (PAGE_SIZE / POOL_BLOCK_SIZE) #define BASE_POOL_TYPE_MASK 1 -#define POOL_MAX_ALLOC (PAGE_SIZE - (sizeof(POOL_HEADER) + sizeof(LIST_ENTRY))) +#define POOL_MAX_ALLOC (PAGE_SIZE - (sizeof(POOL_HEADER) + POOL_BLOCK_SIZE)) typedef struct _POOL_DESCRIPTOR { @@ -256,16 +261,30 @@ { struct { +#ifdef _M_AMD64 + ULONG PreviousSize:8; + ULONG PoolIndex:8; + ULONG BlockSize:8; + ULONG PoolType:8; +#else USHORT PreviousSize:9; USHORT PoolIndex:7; USHORT BlockSize:9; USHORT PoolType:7; +#endif }; ULONG Ulong1; }; +#ifdef _M_AMD64 + ULONG PoolTag; +#endif union { +#ifdef _M_AMD64 + PEPROCESS ProcessBilled; +#else ULONG PoolTag; +#endif struct { USHORT AllocatorBackTraceIndex; @@ -274,11 +293,8 @@ }; } POOL_HEADER, *PPOOL_HEADER; -// -// Everything depends on this -// -C_ASSERT(sizeof(POOL_HEADER) == 8); -C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); +C_ASSERT(sizeof(POOL_HEADER) == POOL_BLOCK_SIZE); +C_ASSERT(POOL_BLOCK_SIZE == sizeof(LIST_ENTRY)); extern ULONG ExpNumberOfPagedPools; extern POOL_DESCRIPTOR NonPagedPoolDescriptor;

14 years, 6 months

[tkreuzer] 47591: [WIN32K] - Simplify the logic of the mapping functions a bit, by using either FILEVIEW or ENGSECTION, not both. - Set FILEVIEW::LastWriteTime

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jun 5 17:58:01 2010 New Revision: 47591 URL: http://svn.reactos.org/svn/reactos?rev=47591&view=rev Log: [WIN32K] - Simplify the logic of the mapping functions a bit, by using either FILEVIEW or ENGSECTION, not both. - Set FILEVIEW::LastWriteTime Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Sat Jun 5 17:58:01 2010 @@ -25,10 +25,10 @@ typedef struct _FILEVIEW { - ULARGE_INTEGER LastWriteTime; + LARGE_INTEGER LastWriteTime; PVOID pvKView; PVOID pvViewFD; - ULONG cjView; + SIZE_T cjView; PVOID pSection; } FILEVIEW, *PFILEVIEW; @@ -60,7 +60,6 @@ EngCreateSection( IN ULONG fl, IN SIZE_T cjSize, - HANDLE hFile, IN ULONG ulTag) { NTSTATUS Status; @@ -79,7 +78,7 @@ &liSize, PAGE_READWRITE, SEC_COMMIT, - hFile, + NULL, NULL); if (!NT_SUCCESS(Status)) { @@ -219,7 +218,7 @@ if (cjSize == 0) return NULL; /* Allocate a section object */ - pSection = EngCreateSection(fl, cjSize, NULL, ulTag); + pSection = EngCreateSection(fl, cjSize, ulTag); /* Map the section in session space */ Status = MmMapViewInSessionSpace(pSection->pvSectionObject, @@ -251,8 +250,10 @@ HANDLE hRootDir; UNICODE_STRING ustrFileName; IO_STATUS_BLOCK IoStatusBlock; + FILE_BASIC_INFORMATION FileInformation; HANDLE hFile; NTSTATUS Status; + LARGE_INTEGER liSize; if (fl & FVF_FONTFILE) { @@ -297,18 +298,41 @@ NULL, 0); - /* Check for auto size */ - if (cjSizeOfModule == 0) - { - } - - /* Allocate a section object */ - pFileView->pSection = EngCreateSection(fl, cjSizeOfModule, hFile, '1234'); + Status = ZwQueryInformationFile(hFile, + &IoStatusBlock, + &FileInformation, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (NT_SUCCESS(Status)) + { + pFileView->LastWriteTime = FileInformation.LastWriteTime; + } + + /* Create a section from the file */ + liSize.QuadPart = cjSizeOfModule; + Status = MmCreateSection(&pFileView->pSection, + SECTION_ALL_ACCESS, + NULL, + cjSizeOfModule ? &liSize : NULL, + fl & FVF_READONLY ? PAGE_EXECUTE_READ : PAGE_EXECUTE_READWRITE, + SEC_COMMIT, + hFile, + NULL); /* Close the file handle */ ZwClose(hFile); - pFileView->cjView = cjSizeOfModule; + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create a section Status=0x%x\n", Status); + EngFreeMem(pFileView); + return NULL; + } + + + pFileView->pvKView = NULL; + pFileView->pvViewFD = NULL; + pFileView->cjView = 0; return pFileView; } @@ -338,26 +362,23 @@ OUT PULONG pulSize) { PFILEVIEW pFileView = (PFILEVIEW)h; - PENGSECTION pSection = pFileView->pSection; - NTSTATUS Status; + NTSTATUS Status; + + pFileView->cjView = 0; /* Map the section in session space */ - Status = MmMapViewInSessionSpace(pSection->pvSectionObject, - &pSection->pvMappedBase, - &pSection->cjViewSize); - if (NT_SUCCESS(Status)) - { - *pulSize = pSection->cjViewSize; - } - else + Status = MmMapViewInSessionSpace(pFileView->pSection, + &pFileView->pvKView, + &pFileView->cjView); + if (!NT_SUCCESS(Status)) { DPRINT1("Failed to map a section Status=0x%x\n", Status); *pulSize = 0; - EngFreeSectionMem(pSection, NULL); return NULL; } - return pSection->pvMappedBase; + *pulSize = pFileView->cjView; + return pFileView->pvKView; } VOID @@ -365,10 +386,18 @@ EngFreeModule(IN HANDLE h) { PFILEVIEW pFileView = (PFILEVIEW)h; - PENGSECTION pSection = pFileView->pSection; - - /* Free the section */ - EngFreeSectionMem(pSection, pSection->pvMappedBase); + NTSTATUS Status; + + /* Unmap the section */ + Status = MmUnmapViewInSessionSpace(pFileView->pvKView); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmUnmapViewInSessionSpace failed: 0x%lx\n", Status); + ASSERT(FALSE); + } + + /* Dereference the section */ + ObDereferenceObject(pFileView->pSection); /* Free the file view memory */ EngFreeMem(pFileView);

14 years, 6 months

[fireball] 47590: - Sync up to Wine-1.2-rc2.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 5 17:03:58 2010 New Revision: 47590 URL: http://svn.reactos.org/svn/reactos?rev=47590&view=rev Log: - Sync up to Wine-1.2-rc2. Modified: branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/gdi32/bidi.c branches/arwinss/reactos/dll/win32/gdi32/dib.c branches/arwinss/reactos/dll/win32/gdi32/font.c branches/arwinss/reactos/dll/win32/gdi32/freetype.c branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/caret.c branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/exticon.c branches/arwinss/reactos/dll/win32/user32/nonclient.c branches/arwinss/reactos/dll/win32/user32/win.c branches/arwinss/reactos/dll/win32/winex11.drv/brush.c branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/graphics.c branches/arwinss/reactos/dll/win32/winex11.drv/ime.c branches/arwinss/reactos/dll/win32/winex11.drv/settings.c branches/arwinss/reactos/dll/win32/winex11.drv/window.c branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 5 17:03:58 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/gdi32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 -/vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321 +/vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585 Modified: branches/arwinss/reactos/dll/win32/gdi32/bidi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/bidi.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/bidi.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -361,7 +361,8 @@ LPWSTR lpOutString, /* [out] Reordered string */ INT uCountOut, /* [in] Size of output buffer */ UINT *lpOrder, /* [out] Logical -> Visual order map */ - WORD **lpGlyphs /* [out] reordered, mirrored, shaped glyphs to display */ + WORD **lpGlyphs, /* [out] reordered, mirrored, shaped glyphs to display */ + INT *cGlyphs /* [out] number of glyphs generated */ ) { WORD *chartype; @@ -646,6 +647,8 @@ done += i; } + if (cGlyphs) + *cGlyphs = glyph_i; HeapFree(GetProcessHeap(), 0, chartype); HeapFree(GetProcessHeap(), 0, levels); Modified: branches/arwinss/reactos/dll/win32/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/dib.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/dib.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -647,18 +647,24 @@ DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, bmp->bitmap.bmBitsPixel ); - info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; - switch(bmp->bitmap.bmBitsPixel) + if (bmp->dib) { - case 15: - info->bmiHeader.biBitCount = 16; - break; - case 24: - info->bmiHeader.biBitCount = 32; - break; - default: + info->bmiHeader.biBitCount = bmp->dib->dsBm.bmBitsPixel; + switch (bmp->dib->dsBm.bmBitsPixel) + { + case 16: + case 32: + info->bmiHeader.biCompression = BI_BITFIELDS; + break; + default: + info->bmiHeader.biCompression = BI_RGB; + break; + } + } + else + { + info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - break; } info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; @@ -827,9 +833,13 @@ case 16: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - ((PDWORD)info->bmiColors)[0] = 0xf800; - ((PDWORD)info->bmiColors)[1] = 0x07e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; + if (bmp->dib) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + else + { + ((PDWORD)info->bmiColors)[0] = 0xf800; + ((PDWORD)info->bmiColors)[1] = 0x07e0; + ((PDWORD)info->bmiColors)[2] = 0x001f; + } } break; @@ -837,9 +847,13 @@ case 32: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - ((PDWORD)info->bmiColors)[0] = 0xff0000; - ((PDWORD)info->bmiColors)[1] = 0x00ff00; - ((PDWORD)info->bmiColors)[2] = 0x0000ff; + if (bmp->dib) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + else + { + ((PDWORD)info->bmiColors)[0] = 0xff0000; + ((PDWORD)info->bmiColors)[1] = 0x00ff00; + ((PDWORD)info->bmiColors)[2] = 0x0000ff; + } } break; } @@ -1236,10 +1250,22 @@ &planes, &bpp, &compression, &sizeImage )) == -1)) return 0; - if (compression != BI_RGB && compression != BI_BITFIELDS) - { - TRACE("can't create a compressed (%u) dibsection\n", compression); + switch (bpp) + { + case 16: + case 32: + if (compression == BI_BITFIELDS) break; + /* fall through */ + case 1: + case 4: + case 8: + case 24: + if (compression == BI_RGB) break; + WARN( "invalid %u bpp compression %u\n", bpp, compression ); return 0; + default: + FIXME( "should fail %u bpp compression %u\n", bpp, compression ); + break; } if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) return 0; Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -1702,16 +1702,21 @@ if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && count > 0 ) { + INT cGlyphs; reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); BIDI_Reorder( hdc, str, count, GCP_REORDER, ((flags&ETO_RTLREADING)!=0 || (GetTextAlign(hdc)&TA_RTLREADING)!=0)? WINE_GCPW_FORCE_RTL:WINE_GCPW_FORCE_LTR, - reordered_str, count, NULL, &glyphs ); + reordered_str, count, NULL, &glyphs, &cGlyphs); flags |= ETO_IGNORELANGUAGE; if (glyphs) + { flags |= ETO_GLYPH_INDEX; + if (cGlyphs != count) + count = cGlyphs; + } } else if(flags & ETO_GLYPH_INDEX) glyphs = reordered_str; @@ -2874,7 +2879,7 @@ } else { BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, - nSet, lpResults->lpOrder, NULL ); + nSet, lpResults->lpOrder, NULL, NULL ); } /* FIXME: Will use the placement chars */ Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -5107,22 +5107,19 @@ { for ( x = 0; x < src_width / hmul; x++ ) { - unsigned int alpha = (src[hmul * x + rgb_interval * 0] + - src[hmul * x + rgb_interval * 1] + - src[hmul * x + rgb_interval * 2]) / 3; if ( rgb ) { - dst[x] = ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 16) | - ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | - ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 0) | - (alpha << 24); + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 0] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; } else { - dst[x] = ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 16) | - ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | - ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 0) | - (alpha << 24); + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 2] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * 0] << 0) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; } } src += src_pitch * vmul; Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -356,7 +356,7 @@ #define WINE_GCPW_LOOSE_MASK 2 extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags, - LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs ) DECLSPEC_HIDDEN; + LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) DECLSPEC_HIDDEN; /* bitmap.c */ extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 5 17:03:58 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 -/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321 +/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585 Modified: branches/arwinss/reactos/dll/win32/user32/caret.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/caret.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/caret.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -270,7 +270,7 @@ } } SERVER_END_REQ; - if (ret && !hidden) + if (ret && !hidden && (x != r.left || y != r.top)) { if (old_state) CARET_DisplayCaret( hwnd, &r ); r.right += x - r.left; Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -1830,6 +1830,43 @@ return TRUE; } +/* copy an icon bitmap, even when it can't be selected into a DC */ +/* helper for CreateIconIndirect */ +static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, int dst_height, + HBITMAP src, int width, int height ) +{ + HDC hdc = CreateCompatibleDC( 0 ); + + if (!SelectObject( hdc, src )) /* do it the hard way */ + { + BITMAPINFO *info; + void *bits; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = height; + info->bmiHeader.biPlanes = GetDeviceCaps( hdc_dst, PLANES ); + info->bmiHeader.biBitCount = GetDeviceCaps( hdc_dst, BITSPIXEL ); + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = height * get_dib_width_bytes( width, info->bmiHeader.biBitCount ); + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + if (bits && GetDIBits( hdc, src, 0, height, bits, info, DIB_RGB_COLORS )) + StretchDIBits( hdc_dst, dst_x, dst_y, dst_width, dst_height, + 0, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, bits ); + HeapFree( GetProcessHeap(), 0, info ); + } + else StretchBlt( hdc_dst, dst_x, dst_y, dst_width, dst_height, hdc, 0, 0, width, height, SRCCOPY ); + + DeleteDC( hdc ); +} + /********************************************************************** * CreateIconIndirect (USER32.@) */ @@ -1839,7 +1876,7 @@ HICON hObj; HBITMAP color = 0, mask; int width, height; - HDC src, dst; + HDC hdc; TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", iconinfo->hbmColor, iconinfo->hbmMask, @@ -1875,28 +1912,22 @@ mask = CreateBitmap( width, height, 1, 1, NULL ); } - src = CreateCompatibleDC( 0 ); - dst = CreateCompatibleDC( 0 ); - - SelectObject( src, iconinfo->hbmMask ); - SelectObject( dst, mask ); - StretchBlt( dst, 0, 0, width, height, src, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, SRCCOPY ); + hdc = CreateCompatibleDC( 0 ); + SelectObject( hdc, mask ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmMask, bmpAnd.bmWidth, bmpAnd.bmHeight ); if (color) { - SelectObject( src, iconinfo->hbmColor ); - SelectObject( dst, color ); - BitBlt( dst, 0, 0, width, height, src, 0, 0, SRCCOPY ); + SelectObject( hdc, color ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmColor, width, height ); } else if (iconinfo->hbmColor) { - SelectObject( src, iconinfo->hbmColor ); - BitBlt( dst, 0, height, width, height, src, 0, 0, SRCCOPY ); + stretch_blt_icon( hdc, 0, height, width, height, iconinfo->hbmColor, width, height ); } else height /= 2; - DeleteDC( src ); - DeleteDC( dst ); + DeleteDC( hdc ); hObj = alloc_icon_handle(); if (hObj) Modified: branches/arwinss/reactos/dll/win32/user32/exticon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/exticon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/exticon.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -37,7 +37,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "wine/winbase16.h" +#include "winnls.h" #include "user_private.h" #include "wine/debug.h" @@ -64,6 +64,26 @@ WORD idCount; /* How many images */ icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */ } icoICONDIR, *LPicoICONDIR; + +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_GROUP_ICON 0x800e #include "poppack.h" Modified: branches/arwinss/reactos/dll/win32/user32/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/nonclient.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/nonclient.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -1548,19 +1548,19 @@ break; case SC_MINIMIZE: - if (hwnd == GetForegroundWindow()) + if (hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,FALSE); ShowWindow( hwnd, SW_MINIMIZE ); break; case SC_MAXIMIZE: - if (IsIconic(hwnd) && hwnd == GetForegroundWindow()) + if (IsIconic(hwnd) && hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_MAXIMIZE ); break; case SC_RESTORE: - if (IsIconic(hwnd) && hwnd == GetForegroundWindow()) + if (IsIconic(hwnd) && hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_RESTORE ); break; Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -1149,9 +1149,14 @@ if((cs->style & WS_VISIBLE) && IsZoomed(top_child)) { TRACE("Restoring current maximized child %p\n", top_child); - SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - ShowWindow( top_child, SW_SHOWNORMAL ); - SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + if (cs->style & WS_MAXIMIZE) + { + /* if the new window is maximized don't bother repainting */ + SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); + ShowWindow( top_child, SW_SHOWNORMAL ); + SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + } + else ShowWindow( top_child, SW_SHOWNORMAL ); } } } Modified: branches/arwinss/reactos/dll/win32/winex11.drv/brush.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/brush.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/brush.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -309,6 +309,7 @@ DeleteObject( hBitmap ); GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); } + break; } return hbrush; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -523,7 +523,6 @@ if (IsWindowEnabled(hwnd)) { HMENU hSysMenu; - POINT pt; if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; hSysMenu = GetSystemMenu(hwnd, FALSE); @@ -554,10 +553,12 @@ break; } } - /* Simulate clicking the caption Close button */ - GetCursorPos( &pt ); - PostMessageW( hwnd, WM_NCLBUTTONDOWN, HTCLOSE, MAKELPARAM( pt.x, pt.y ) ); - PostMessageW( hwnd, WM_LBUTTONUP, HTCLOSE, MAKELPARAM( pt.x, pt.y ) ); + + /* Simulate pressing Alt+F4 */ + keybd_event(VK_MENU, 0, 0, 0); + keybd_event(VK_F4, 0, 0, 0); + keybd_event(VK_F4, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0); } } else if (protocol == x11drv_atom(WM_TAKE_FOCUS)) @@ -942,6 +943,8 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event, BOOL update_window ) { + DWORD style; + switch(event->state) { case PropertyDelete: @@ -967,25 +970,37 @@ if (!update_window || !data->managed || !data->mapped) return; + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if (data->iconic && data->wm_state == NormalState) /* restore window */ { data->iconic = FALSE; if (is_net_wm_state_maximized( event->display, data )) { - TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); - } - else + if ((style & WS_MAXIMIZEBOX) && !(style & WS_DISABLED)) + { + TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + } + else TRACE( "not restoring to max win %p/%lx style %08x\n", + data->hwnd, data->whole_window, style ); + } + else if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); } + else TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } else if (!data->iconic && data->wm_state == IconicState) { - TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = TRUE; - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + if ((style & WS_MINIMIZEBOX) && !(style & WS_DISABLED)) + { + TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + } + else TRACE( "not minimizing win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } } Modified: branches/arwinss/reactos/dll/win32/winex11.drv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/graphics.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/graphics.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -36,6 +36,7 @@ #define PI M_PI #endif #include <string.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -131,10 +132,10 @@ for (j = data->rdh.nCount-1; j >= 0; j--) { tmp = rect[j]; - xrect[j].x = tmp.left; - xrect[j].y = tmp.top; - xrect[j].width = tmp.right - tmp.left; - xrect[j].height = tmp.bottom - tmp.top; + xrect[j].x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); + xrect[j].y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); + xrect[j].width = max( min( tmp.right - xrect[j].x, USHRT_MAX), 0); + xrect[j].height = max( min( tmp.bottom - xrect[j].y, USHRT_MAX), 0); } } else @@ -142,10 +143,10 @@ for (i = 0; i < data->rdh.nCount; i++) { tmp = rect[i]; - xrect[i].x = tmp.left; - xrect[i].y = tmp.top; - xrect[i].width = tmp.right - tmp.left; - xrect[i].height = tmp.bottom - tmp.top; + xrect[i].x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); + xrect[i].y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); + xrect[i].width = max( min( tmp.right - xrect[i].x, USHRT_MAX), 0); + xrect[i].height = max( min( tmp.bottom - xrect[i].y, USHRT_MAX), 0); } } return data; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/ime.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/ime.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/ime.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -189,7 +189,7 @@ return currentOffset; } -static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len) +static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len) { /* we need to make sure the CompStr, CompClaus and CompAttr fields are all * set and correct */ @@ -923,7 +923,7 @@ if (dwCompLen && lpComp) { - newCompStr = updateCompStr(lpIMC->hCompStr, (LPWSTR)lpComp, dwCompLen / sizeof(WCHAR)); + newCompStr = updateCompStr(lpIMC->hCompStr, (LPCWSTR)lpComp, dwCompLen / sizeof(WCHAR)); ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = newCompStr; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/settings.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/settings.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -245,7 +245,7 @@ return FALSE; #define set_value(name, data) \ - if (RegSetValueExA(hkey, name, 0, REG_DWORD, (LPBYTE)(data), sizeof(DWORD))) \ + if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ ret = FALSE set_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -215,15 +215,12 @@ /*********************************************************************** - * X11DRV_is_window_rect_mapped + * is_window_rect_mapped * * Check if the X whole window should be mapped based on its rectangle */ static BOOL is_window_rect_mapped( const RECT *rect ) { - /* don't map if rect is empty */ - if (IsRectEmpty( rect )) return FALSE; - /* don't map if rect is off-screen */ if (rect->left >= virtual_screen_rect.right || rect->top >= virtual_screen_rect.bottom || @@ -246,19 +243,6 @@ /* Metacity needs the window to be resizable to make it fullscreen */ return (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height); -} - - -/*********************************************************************** - * get_window_owner - */ -static HWND get_window_owner( HWND hwnd ) -{ - RECT rect; - HWND owner = GetWindow( hwnd, GW_OWNER ); - /* ignore the zero-size owners used by Delphi apps */ - if (owner && GetWindowRect( owner, &rect ) && IsRectEmpty( &rect )) owner = 0; - return owner; } @@ -456,6 +440,16 @@ if (!data->whole_window) return; data->shaped = FALSE; + + if (IsRectEmpty( &data->window_rect )) /* set an empty shape */ + { + static XRectangle empty_rect; + wine_tsx11_lock(); + XShapeCombineRectangles( display, data->whole_window, ShapeBounding, 0, 0, + &empty_rect, 1, ShapeSet, YXBanded ); + wine_tsx11_unlock(); + return; + } if (hrgn == (HRGN)1) /* hack: win_region == 1 means retrieve region from server */ { @@ -1019,6 +1013,8 @@ { size_hints->max_width = data->whole_rect.right - data->whole_rect.left; size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; + if (size_hints->max_width <= 0 ||size_hints->max_height <= 0) + size_hints->max_width = size_hints->max_height = 1; size_hints->min_width = size_hints->max_width; size_hints->min_height = size_hints->max_height; size_hints->flags |= PMinSize | PMaxSize; @@ -1121,7 +1117,7 @@ * * Retrieve an owner's window, creating it if necessary. */ -static Window get_owner_whole_window( HWND owner ) +static Window get_owner_whole_window( HWND owner, BOOL force_managed ) { struct x11drv_win_data *data; @@ -1133,7 +1129,7 @@ !(data = X11DRV_create_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); } - else if (!data->managed) /* make it managed */ + else if (!data->managed && force_managed) /* make it managed */ { SetWindowPos( owner, 0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | @@ -1168,8 +1164,8 @@ { style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - owner = get_window_owner( data->hwnd ); - if ((owner_win = get_owner_whole_window( owner ))) group_leader = owner_win; + owner = GetWindow( data->hwnd, GW_OWNER ); + if ((owner_win = get_owner_whole_window( owner, data->managed ))) group_leader = owner_win; } wine_tsx11_lock(); @@ -1182,6 +1178,7 @@ /* set the WM_WINDOW_TYPE */ if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (ex_style & WS_EX_APPWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + else if (style & WS_MINIMIZEBOX) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); @@ -1258,7 +1255,7 @@ new_state |= (1 << NET_WM_STATE_ABOVE); if (ex_style & WS_EX_TOOLWINDOW) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (!(ex_style & WS_EX_APPWINDOW) && get_window_owner( data->hwnd )) + if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); if (!data->mapped) /* set the _NET_WM_STATE atom directly */ @@ -1501,6 +1498,8 @@ XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes ); #ifdef HAVE_LIBXSHAPE + if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) + sync_window_region( display, data, (HRGN)1 ); if (data->shaped) { int old_x_offset = old_window_rect->left - old_whole_rect->left; @@ -1688,7 +1687,7 @@ sync_window_text( display, data->whole_window, text ); /* set the window region */ - if (win_rgn) sync_window_region( display, data, win_rgn ); + if (win_rgn || IsRectEmpty( &data->window_rect )) sync_window_region( display, data, win_rgn ); /* set the window opacity */ if (!GetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0; @@ -2331,7 +2330,8 @@ if (data->mapped) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || - (!event_type && !is_window_rect_mapped( rectWindow ))) + (event_type != ConfigureNotify && + !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) unmap_window( display, data ); } Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -193,6 +193,7 @@ MAKE_FUNCPTR(FcPatternDestroy) MAKE_FUNCPTR(FcPatternAddInteger) MAKE_FUNCPTR(FcPatternAddString) +MAKE_FUNCPTR(FcPatternGetBool) MAKE_FUNCPTR(FcPatternGetInteger) MAKE_FUNCPTR(FcPatternGetString) static void *fontconfig_handle; @@ -408,6 +409,7 @@ LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternAddInteger); LOAD_FUNCPTR(FcPatternAddString); + LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetString); #undef LOAD_FUNCPTR @@ -936,14 +938,17 @@ if ((match = pFcFontMatch( NULL, pattern, &result ))) { int rgba; - + FcBool antialias; + + if (pFcPatternGetBool( match, FC_ANTIALIAS, 0, &antialias ) != FcResultMatch) + antialias = TRUE; if (pFcPatternGetInteger( match, FC_RGBA, 0, &rgba ) == FcResultMatch) { FcChar8 *file; if (pFcPatternGetString( match, FC_FILE, 0, &file ) != FcResultMatch) file = NULL; - TRACE( "fontconfig returned rgba %u for font %s file %s\n", - rgba, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); + TRACE( "fontconfig returned rgba %u antialias %u for font %s file %s\n", + rgba, antialias, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); switch (rgba) { @@ -951,7 +956,7 @@ case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; - case FC_RGBA_NONE: entry->aa_default = AA_None; break; + case FC_RGBA_NONE: entry->aa_default = antialias ? AA_Grey : AA_None; break; } } pFcPatternDestroy( match ); @@ -959,6 +964,30 @@ pFcPatternDestroy( pattern ); } #endif /* SONAME_LIBFONTCONFIG */ + + /* now check Xft resources */ + { + char *value; + BOOL antialias = TRUE; + + wine_tsx11_lock(); + if ((value = XGetDefault( gdi_display, "Xft", "antialias" ))) + { + if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || + value[0] == '0' || !strcasecmp( value, "off" )) + antialias = FALSE; + } + if ((value = XGetDefault( gdi_display, "Xft", "rgba" ))) + { + TRACE( "Xft resource returned rgba '%s' antialias %u\n", value, antialias ); + if (!strcmp( value, "rgb" )) entry->aa_default = AA_RGB; + else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR; + else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB; + else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR; + else if (!strcmp( value, "none" )) entry->aa_default = antialias ? AA_Grey : AA_None; + } + wine_tsx11_unlock(); + } } else entry->aa_default = AA_None;

14 years, 6 months

[sir_richard] 47589: [NTOS]: Don't assume that ANY fault in the system address range, not associated to a memory area, might be ARM3. Instead, since this hack only exists for early boot page pool support, make only treat this as an ARM3 fault when it happens in the paged pool area or higher. Leads to more direct Mm crashes when invalid page access happens, instead of infinite "PAGE FAULT ON PAGE TABLES".

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Jun 5 16:59:50 2010 New Revision: 47589 URL: http://svn.reactos.org/svn/reactos?rev=47589&view=rev Log: [NTOS]: Don't assume that ANY fault in the system address range, not associated to a memory area, might be ARM3. Instead, since this hack only exists for early boot page pool support, make only treat this as an ARM3 fault when it happens in the paged pool area or higher. Leads to more direct Mm crashes when invalid page access happens, instead of infinite "PAGE FAULT ON PAGE TABLES". Modified: trunk/reactos/ntoskrnl/mm/mmfault.c Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Sat Jun 5 16:59:50 2010 @@ -284,13 +284,13 @@ * can go away. */ MemoryArea = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), Address); - if ((!(MemoryArea) && ((ULONG_PTR)Address >= (ULONG_PTR)MmSystemRangeStart)) || + if ((!(MemoryArea) && ((ULONG_PTR)Address >= (ULONG_PTR)MmPagedPoolStart)) || ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3))) { // // Hand it off to more competent hands... // - DPRINT1("ARM3 fault\n"); + DPRINT1("ARM3 fault %p\n", MemoryArea); return MmArmAccessFault(StoreInstruction, Address, Mode, TrapInformation); }

14 years, 6 months

[sir_richard] 47588: [NTOS]: In MiInitializePfnForOtherProcess, should increment the sharecount of the page table PFN entry, not the PFN entry of the PTE itself. Spotted by Stefan100.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Jun 5 16:55:17 2010 New Revision: 47588 URL: http://svn.reactos.org/svn/reactos?rev=47588&view=rev Log: [NTOS]: In MiInitializePfnForOtherProcess, should increment the sharecount of the page table PFN entry, not the PFN entry of the PTE itself. Spotted by Stefan100. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sat Jun 5 16:55:17 2010 @@ -791,7 +791,7 @@ Pfn1->u4.PteFrame = PteFrame; /* Increase its share count so we don't get rid of it */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MiGetPfnEntry(PteFrame); Pfn1->u2.ShareCount++; } }

14 years, 6 months

[sir_richard] 47587: [NTOS]: In MiDeleteSystemPageableVm, should also handle the case where the PTE is demand-zero. This can happen if the caller allocated, say, 12KB (3 pages) of paged pool, only touched 4KB (1 page), and then frees the allocation -- the other 2 pages will still be demand-zero at this point.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Jun 5 16:54:26 2010 New Revision: 47587 URL: http://svn.reactos.org/svn/reactos?rev=47587&view=rev Log: [NTOS]: In MiDeleteSystemPageableVm, should also handle the case where the PTE is demand-zero. This can happen if the caller allocated, say, 12KB (3 pages) of paged pool, only touched 4KB (1 page), and then frees the allocation -- the other 2 pages will still be demand-zero at this point. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Jun 5 16:54:26 2010 @@ -64,7 +64,6 @@ /* As always, only handle current ARM3 scenarios */ ASSERT(PointerPte->u.Soft.Prototype == 0); ASSERT(PointerPte->u.Soft.Transition == 0); - ASSERT(PointerPte->u.Hard.Valid == 1); /* Normally this is one possibility -- freeing a valid page */ if (PointerPte->u.Hard.Valid) @@ -106,6 +105,20 @@ /* Actual legitimate pages */ ActualPages++; } + else + { + /* + * The only other ARM3 possibility is a demand zero page, which would + * mean freeing some of the paged pool pages that haven't even been + * touched yet, as part of a larger allocation. + * + * Right now, we shouldn't expect any page file information in the PTE + */ + ASSERT(PointerPte->u.Soft.PageFileHigh == 0); + + /* Destroy the PTE */ + PointerPte->u.Long = 0; + } /* Keep going */ PointerPte++;

14 years, 6 months

[ekohl] 47586: [NTOSKRNL] NtDuplicateToken: Fail, if a primary token is to be created from an impersonation token and and the impersonation level of the impersonation token is below SecurityImpersonation.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 5 14:20:53 2010 New Revision: 47586 URL: http://svn.reactos.org/svn/reactos?rev=47586&view=rev Log: [NTOSKRNL] NtDuplicateToken: Fail, if a primary token is to be created from an impersonation token and and the impersonation level of the impersonation token is below SecurityImpersonation. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=47… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Sat Jun 5 14:20:53 2010 @@ -1871,6 +1871,21 @@ } } + /* + * Fail, if a primary token is to be created from an impersonation token + * and and the impersonation level of the impersonation token is below SecurityImpersonation. + */ + if (Token->TokenType == TokenImpersonation && + TokenType == TokenPrimary && + Token->ImpersonationLevel < SecurityImpersonation) + { + ObDereferenceObject(Token); + SepReleaseSecurityQualityOfService(CapturedSecurityQualityOfService, + PreviousMode, + FALSE); + return STATUS_BAD_IMPERSONATION_LEVEL; + } + Status = SepDuplicateToken(Token, ObjectAttributes, EffectiveOnly,

14 years, 6 months

[fireball] 47585: [VENDOR/WINE] - Import Wine-1.2-rc2 gdi32, user32, winex11.drv, wineserver.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 5 11:03:08 2010 New Revision: 47585 URL: http://svn.reactos.org/svn/reactos?rev=47585&view=rev Log: [VENDOR/WINE] - Import Wine-1.2-rc2 gdi32, user32, winex11.drv, wineserver. Modified: vendor/wine/dlls/gdi32/current/bidi.c vendor/wine/dlls/gdi32/current/dib.c vendor/wine/dlls/gdi32/current/font.c vendor/wine/dlls/gdi32/current/freetype.c vendor/wine/dlls/gdi32/current/gdi_private.h vendor/wine/dlls/gdi32/current/tests/bitmap.c vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/user32/current/caret.c vendor/wine/dlls/user32/current/cursoricon.c vendor/wine/dlls/user32/current/exticon.c vendor/wine/dlls/user32/current/nonclient.c vendor/wine/dlls/user32/current/tests/combo.c vendor/wine/dlls/user32/current/tests/dde.c vendor/wine/dlls/user32/current/tests/msg.c vendor/wine/dlls/user32/current/tests/win.c vendor/wine/dlls/user32/current/win.c vendor/wine/dlls/winex11.drv/current/event.c vendor/wine/dlls/winex11.drv/current/window.c vendor/wine/dlls/winex11.drv/current/xrender.c vendor/wine/server/current/named_pipe.c vendor/wine/server/current/sock.c Modified: vendor/wine/dlls/gdi32/current/bidi.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/bidi.c?re… ============================================================================== --- vendor/wine/dlls/gdi32/current/bidi.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/bidi.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -352,7 +352,8 @@ LPWSTR lpOutString, /* [out] Reordered string */ INT uCountOut, /* [in] Size of output buffer */ UINT *lpOrder, /* [out] Logical -> Visual order map */ - WORD **lpGlyphs /* [out] reordered, mirrored, shaped glyphs to display */ + WORD **lpGlyphs, /* [out] reordered, mirrored, shaped glyphs to display */ + INT *cGlyphs /* [out] number of glyphs generated */ ) { WORD *chartype; @@ -637,6 +638,8 @@ done += i; } + if (cGlyphs) + *cGlyphs = glyph_i; HeapFree(GetProcessHeap(), 0, chartype); HeapFree(GetProcessHeap(), 0, levels); Modified: vendor/wine/dlls/gdi32/current/dib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/dib.c?rev… ============================================================================== --- vendor/wine/dlls/gdi32/current/dib.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/dib.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -647,18 +647,24 @@ DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, bmp->bitmap.bmBitsPixel ); - info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; - switch(bmp->bitmap.bmBitsPixel) + if (bmp->dib) { - case 15: - info->bmiHeader.biBitCount = 16; - break; - case 24: - info->bmiHeader.biBitCount = 32; - break; - default: + info->bmiHeader.biBitCount = bmp->dib->dsBm.bmBitsPixel; + switch (bmp->dib->dsBm.bmBitsPixel) + { + case 16: + case 32: + info->bmiHeader.biCompression = BI_BITFIELDS; + break; + default: + info->bmiHeader.biCompression = BI_RGB; + break; + } + } + else + { + info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - break; } info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; @@ -827,9 +833,13 @@ case 16: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - ((PDWORD)info->bmiColors)[0] = 0xf800; - ((PDWORD)info->bmiColors)[1] = 0x07e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; + if (bmp->dib) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + else + { + ((PDWORD)info->bmiColors)[0] = 0xf800; + ((PDWORD)info->bmiColors)[1] = 0x07e0; + ((PDWORD)info->bmiColors)[2] = 0x001f; + } } break; @@ -837,9 +847,13 @@ case 32: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - ((PDWORD)info->bmiColors)[0] = 0xff0000; - ((PDWORD)info->bmiColors)[1] = 0x00ff00; - ((PDWORD)info->bmiColors)[2] = 0x0000ff; + if (bmp->dib) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + else + { + ((PDWORD)info->bmiColors)[0] = 0xff0000; + ((PDWORD)info->bmiColors)[1] = 0x00ff00; + ((PDWORD)info->bmiColors)[2] = 0x0000ff; + } } break; } @@ -1236,10 +1250,22 @@ &planes, &bpp, &compression, &sizeImage )) == -1)) return 0; - if (compression != BI_RGB && compression != BI_BITFIELDS) - { - TRACE("can't create a compressed (%u) dibsection\n", compression); + switch (bpp) + { + case 16: + case 32: + if (compression == BI_BITFIELDS) break; + /* fall through */ + case 1: + case 4: + case 8: + case 24: + if (compression == BI_RGB) break; + WARN( "invalid %u bpp compression %u\n", bpp, compression ); return 0; + default: + FIXME( "should fail %u bpp compression %u\n", bpp, compression ); + break; } if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) return 0; Modified: vendor/wine/dlls/gdi32/current/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/font.c?re… ============================================================================== --- vendor/wine/dlls/gdi32/current/font.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/font.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -1702,16 +1702,21 @@ if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && count > 0 ) { + INT cGlyphs; reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); BIDI_Reorder( hdc, str, count, GCP_REORDER, ((flags&ETO_RTLREADING)!=0 || (GetTextAlign(hdc)&TA_RTLREADING)!=0)? WINE_GCPW_FORCE_RTL:WINE_GCPW_FORCE_LTR, - reordered_str, count, NULL, &glyphs ); + reordered_str, count, NULL, &glyphs, &cGlyphs); flags |= ETO_IGNORELANGUAGE; if (glyphs) + { flags |= ETO_GLYPH_INDEX; + if (cGlyphs != count) + count = cGlyphs; + } } else if(flags & ETO_GLYPH_INDEX) glyphs = reordered_str; @@ -2874,7 +2879,7 @@ } else { BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, - nSet, lpResults->lpOrder, NULL ); + nSet, lpResults->lpOrder, NULL, NULL ); } /* FIXME: Will use the placement chars */ Modified: vendor/wine/dlls/gdi32/current/freetype.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/freetype.… ============================================================================== --- vendor/wine/dlls/gdi32/current/freetype.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/freetype.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -5025,22 +5025,19 @@ { for ( x = 0; x < src_width / hmul; x++ ) { - unsigned int alpha = (src[hmul * x + rgb_interval * 0] + - src[hmul * x + rgb_interval * 1] + - src[hmul * x + rgb_interval * 2]) / 3; if ( rgb ) { - dst[x] = ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 16) | - ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | - ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 0) | - (alpha << 24); + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 0] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; } else { - dst[x] = ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 16) | - ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | - ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 0) | - (alpha << 24); + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 2] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * 0] << 0) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; } } src += src_pitch * vmul; Modified: vendor/wine/dlls/gdi32/current/gdi_private.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdi_priva… ============================================================================== --- vendor/wine/dlls/gdi32/current/gdi_private.h [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/gdi_private.h [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -356,7 +356,7 @@ #define WINE_GCPW_LOOSE_MASK 2 extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags, - LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs ) DECLSPEC_HIDDEN; + LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) DECLSPEC_HIDDEN; /* bitmap.c */ extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; Modified: vendor/wine/dlls/gdi32/current/tests/bitmap.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/bit… ============================================================================== --- vendor/wine/dlls/gdi32/current/tests/bitmap.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/tests/bitmap.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -545,6 +545,18 @@ hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hdib == NULL, "CreateDIBSection should fail when asked to create a compressed DIB section\n"); ok(GetLastError() == 0xdeadbeef, "wrong error %d\n", GetLastError()); + + for (i = 0; i < 128; i++) + { + pbmi->bmiHeader.biBitCount = i; + pbmi->bmiHeader.biCompression = BI_RGB; + hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + if (i == 1 || i == 4 || i == 8 || i == 16 || i == 24 || i == 32) + ok(hdib != NULL, "CreateDIBSection bpp %u\n", i); + else + todo_wine ok(hdib == NULL, "CreateDIBSection bpp %u succeeded\n", i); + if (hdib) DeleteObject( hdib ); + } pbmi->bmiHeader.biBitCount = 16; pbmi->bmiHeader.biCompression = BI_BITFIELDS; @@ -1809,9 +1821,11 @@ char dibinfo_buf[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; DWORD bits[32]; LPBITMAPINFO dibinfo = (LPBITMAPINFO) dibinfo_buf; + DWORD *bitmasks = (DWORD *)dibinfo->bmiColors; HDC hdc; HBITMAP hbm; int ret; + void *ptr; memset(dibinfo, 0, sizeof(dibinfo_buf)); dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -1826,8 +1840,6 @@ ok(ret == 1, "GetDIBits failed\n"); if (dibinfo->bmiHeader.biBitCount > 8) { - DWORD *bitmasks = (DWORD *)dibinfo->bmiColors; - ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, "compression is %u\n", dibinfo->bmiHeader.biCompression ); @@ -1890,6 +1902,135 @@ } } else skip("not in 16 bpp BI_BITFIELDS mode, skipping that test\n"); + + DeleteObject(hbm); + + /* same thing now with a 32-bpp DIB section */ + + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + dibinfo->bmiHeader.biWidth = 1; + dibinfo->bmiHeader.biHeight = 1; + dibinfo->bmiHeader.biPlanes = 1; + dibinfo->bmiHeader.biBitCount = 32; + dibinfo->bmiHeader.biCompression = BI_RGB; + dibinfo->bmiHeader.biSizeImage = 0; + dibinfo->bmiHeader.biXPelsPerMeter = 0; + dibinfo->bmiHeader.biYPelsPerMeter = 0; + dibinfo->bmiHeader.biClrUsed = 0; + dibinfo->bmiHeader.biClrImportant = 0; + bitmasks[0] = 0x0000ff; + bitmasks[1] = 0x00ff00; + bitmasks[2] = 0xff0000; + hbm = CreateDIBSection( hdc, dibinfo, DIB_RGB_COLORS, &ptr, NULL, 0 ); + ok( hbm != 0, "failed to create bitmap\n" ); + + memset(dibinfo, 0, sizeof(dibinfo_buf)); + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ret = GetDIBits(hdc, hbm, 0, 0, NULL, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + ok( dibinfo->bmiHeader.biBitCount == 32, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount ); + + ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, + "compression is %u\n", dibinfo->bmiHeader.biCompression ); + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + ret = GetDIBits(hdc, hbm, 0, 1, bits, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + ok( dibinfo->bmiHeader.biBitCount == 32, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount ); + ok( bitmasks[0] == 0xff0000, "wrong red mask %08x\n", bitmasks[0] ); + ok( bitmasks[1] == 0x00ff00, "wrong green mask %08x\n", bitmasks[1] ); + ok( bitmasks[2] == 0x0000ff, "wrong blue mask %08x\n", bitmasks[2] ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef || + broken(dibinfo->bmiHeader.biSizeImage == 0xdeadbeef), /* win9x */ + "size image not set\n" ); + + DeleteObject(hbm); + + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + dibinfo->bmiHeader.biWidth = 1; + dibinfo->bmiHeader.biHeight = 1; + dibinfo->bmiHeader.biPlanes = 1; + dibinfo->bmiHeader.biBitCount = 32; + dibinfo->bmiHeader.biCompression = BI_BITFIELDS; + dibinfo->bmiHeader.biSizeImage = 0; + dibinfo->bmiHeader.biXPelsPerMeter = 0; + dibinfo->bmiHeader.biYPelsPerMeter = 0; + dibinfo->bmiHeader.biClrUsed = 0; + dibinfo->bmiHeader.biClrImportant = 0; + bitmasks[0] = 0x0000ff; + bitmasks[1] = 0x00ff00; + bitmasks[2] = 0xff0000; + hbm = CreateDIBSection( hdc, dibinfo, DIB_RGB_COLORS, &ptr, NULL, 0 ); + ok( hbm != 0 || broken(!hbm), /* win9x */ "failed to create bitmap\n" ); + + if (hbm) + { + memset(dibinfo, 0, sizeof(dibinfo_buf)); + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ret = GetDIBits(hdc, hbm, 0, 0, NULL, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + + ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, + "compression is %u\n", dibinfo->bmiHeader.biCompression ); + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + ret = GetDIBits(hdc, hbm, 0, 1, bits, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + ok( bitmasks[0] == 0x0000ff, "wrong red mask %08x\n", bitmasks[0] ); + ok( bitmasks[1] == 0x00ff00, "wrong green mask %08x\n", bitmasks[1] ); + ok( bitmasks[2] == 0xff0000, "wrong blue mask %08x\n", bitmasks[2] ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + + DeleteObject(hbm); + } + + /* 24-bpp DIB sections don't have bitfields */ + + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + dibinfo->bmiHeader.biWidth = 1; + dibinfo->bmiHeader.biHeight = 1; + dibinfo->bmiHeader.biPlanes = 1; + dibinfo->bmiHeader.biBitCount = 24; + dibinfo->bmiHeader.biCompression = BI_BITFIELDS; + dibinfo->bmiHeader.biSizeImage = 0; + dibinfo->bmiHeader.biXPelsPerMeter = 0; + dibinfo->bmiHeader.biYPelsPerMeter = 0; + dibinfo->bmiHeader.biClrUsed = 0; + dibinfo->bmiHeader.biClrImportant = 0; + hbm = CreateDIBSection( hdc, dibinfo, DIB_RGB_COLORS, &ptr, NULL, 0 ); + ok( hbm == 0, "creating 24-bpp BI_BITFIELDS dibsection should fail\n" ); + dibinfo->bmiHeader.biCompression = BI_RGB; + hbm = CreateDIBSection( hdc, dibinfo, DIB_RGB_COLORS, &ptr, NULL, 0 ); + ok( hbm != 0, "failed to create bitmap\n" ); + + memset(dibinfo, 0, sizeof(dibinfo_buf)); + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ret = GetDIBits(hdc, hbm, 0, 0, NULL, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + ok( dibinfo->bmiHeader.biBitCount == 24, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount ); + + ok( dibinfo->bmiHeader.biCompression == BI_RGB, + "compression is %u\n", dibinfo->bmiHeader.biCompression ); + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + ret = GetDIBits(hdc, hbm, 0, 1, bits, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + ok( dibinfo->bmiHeader.biBitCount == 24, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount ); + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef || + broken(dibinfo->bmiHeader.biSizeImage == 0xdeadbeef), /* win9x */ + "size image not set\n" ); DeleteObject(hbm); ReleaseDC(NULL, hdc); Modified: vendor/wine/dlls/gdi32/current/tests/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/fon… ============================================================================== --- vendor/wine/dlls/gdi32/current/tests/font.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/tests/font.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -3095,7 +3095,9 @@ lstrcpyA(lf.lfFaceName, TestName[i]); hfont = CreateFontIndirectA(&lf); ok(hfont != 0, "CreateFontIndirectA failed\n"); + SetLastError(0xdeadbeef); ret = GetObject(hfont, sizeof(getobj_lf), &getobj_lf); + ok(ret, "GetObject failed: %d\n", GetLastError()); ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); ok(lf.lfWeight == getobj_lf.lfWeight || broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */ Modified: vendor/wine/dlls/user32/current/caret.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/caret.c?… ============================================================================== --- vendor/wine/dlls/user32/current/caret.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/caret.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -269,7 +269,7 @@ } } SERVER_END_REQ; - if (ret && !hidden) + if (ret && !hidden && (x != r.left || y != r.top)) { if (old_state) CARET_DisplayCaret( hwnd, &r ); r.right += x - r.left; Modified: vendor/wine/dlls/user32/current/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/cursoric… ============================================================================== --- vendor/wine/dlls/user32/current/cursoricon.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/cursoricon.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -1830,6 +1830,43 @@ return TRUE; } +/* copy an icon bitmap, even when it can't be selected into a DC */ +/* helper for CreateIconIndirect */ +static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, int dst_height, + HBITMAP src, int width, int height ) +{ + HDC hdc = CreateCompatibleDC( 0 ); + + if (!SelectObject( hdc, src )) /* do it the hard way */ + { + BITMAPINFO *info; + void *bits; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = height; + info->bmiHeader.biPlanes = GetDeviceCaps( hdc_dst, PLANES ); + info->bmiHeader.biBitCount = GetDeviceCaps( hdc_dst, BITSPIXEL ); + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = height * get_dib_width_bytes( width, info->bmiHeader.biBitCount ); + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + if (bits && GetDIBits( hdc, src, 0, height, bits, info, DIB_RGB_COLORS )) + StretchDIBits( hdc_dst, dst_x, dst_y, dst_width, dst_height, + 0, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, bits ); + HeapFree( GetProcessHeap(), 0, info ); + } + else StretchBlt( hdc_dst, dst_x, dst_y, dst_width, dst_height, hdc, 0, 0, width, height, SRCCOPY ); + + DeleteDC( hdc ); +} + /********************************************************************** * CreateIconIndirect (USER32.@) */ @@ -1839,7 +1876,7 @@ HICON hObj; HBITMAP color = 0, mask; int width, height; - HDC src, dst; + HDC hdc; TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", iconinfo->hbmColor, iconinfo->hbmMask, @@ -1875,28 +1912,22 @@ mask = CreateBitmap( width, height, 1, 1, NULL ); } - src = CreateCompatibleDC( 0 ); - dst = CreateCompatibleDC( 0 ); - - SelectObject( src, iconinfo->hbmMask ); - SelectObject( dst, mask ); - StretchBlt( dst, 0, 0, width, height, src, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, SRCCOPY ); + hdc = CreateCompatibleDC( 0 ); + SelectObject( hdc, mask ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmMask, bmpAnd.bmWidth, bmpAnd.bmHeight ); if (color) { - SelectObject( src, iconinfo->hbmColor ); - SelectObject( dst, color ); - BitBlt( dst, 0, 0, width, height, src, 0, 0, SRCCOPY ); + SelectObject( hdc, color ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmColor, width, height ); } else if (iconinfo->hbmColor) { - SelectObject( src, iconinfo->hbmColor ); - BitBlt( dst, 0, height, width, height, src, 0, 0, SRCCOPY ); + stretch_blt_icon( hdc, 0, height, width, height, iconinfo->hbmColor, width, height ); } else height /= 2; - DeleteDC( src ); - DeleteDC( dst ); + DeleteDC( hdc ); hObj = alloc_icon_handle(); if (hObj) Modified: vendor/wine/dlls/user32/current/exticon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/exticon.… ============================================================================== --- vendor/wine/dlls/user32/current/exticon.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/exticon.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -37,7 +37,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "wine/winbase16.h" +#include "winnls.h" #include "user_private.h" #include "wine/debug.h" @@ -64,6 +64,26 @@ WORD idCount; /* How many images */ icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */ } icoICONDIR, *LPicoICONDIR; + +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_GROUP_ICON 0x800e #include "poppack.h" Modified: vendor/wine/dlls/user32/current/nonclient.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/nonclien… ============================================================================== --- vendor/wine/dlls/user32/current/nonclient.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/nonclient.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -1548,19 +1548,19 @@ break; case SC_MINIMIZE: - if (hwnd == GetForegroundWindow()) + if (hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,FALSE); ShowWindow( hwnd, SW_MINIMIZE ); break; case SC_MAXIMIZE: - if (IsIconic(hwnd) && hwnd == GetForegroundWindow()) + if (IsIconic(hwnd) && hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_MAXIMIZE ); break; case SC_RESTORE: - if (IsIconic(hwnd) && hwnd == GetForegroundWindow()) + if (IsIconic(hwnd) && hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_RESTORE ); break; Modified: vendor/wine/dlls/user32/current/tests/combo.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/co… ============================================================================== --- vendor/wine/dlls/user32/current/tests/combo.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/combo.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -384,6 +384,8 @@ rc.right - rc.left, clwidth - 2); ok( rc.bottom - rc.top == ddheight, "drop-down rect height is %d vs %d\n", rc.bottom - rc.top, ddheight); + ok( rc.right - rc.left == ddwidth -2, "drop-down rect width is %d vs %d\n", + rc.right - rc.left, ddwidth - 2); /* new cx, cy is slightly bigger than the initial values */ MoveWindow( hCombo, 10, 10, clwidth + 2, clheight + 2, TRUE); GetClientRect( hCombo, &rc); Modified: vendor/wine/dlls/user32/current/tests/dde.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/dd… ============================================================================== --- vendor/wine/dlls/user32/current/tests/dde.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/dde.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -1447,6 +1447,7 @@ res = 0xdeadbeef; DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); + ok(hdata == NULL, "Expected NULL, got %p\n", hdata); ret = DdeGetLastError(client_pid); todo_wine ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); Modified: vendor/wine/dlls/user32/current/tests/msg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ms… ============================================================================== --- vendor/wine/dlls/user32/current/tests/msg.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/msg.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -185,7 +185,7 @@ { WM_GETTITLEBARINFOEX, sent|optional }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, - { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } }; Modified: vendor/wine/dlls/user32/current/tests/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/wi… ============================================================================== --- vendor/wine/dlls/user32/current/tests/win.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/win.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -3213,10 +3213,12 @@ GetWindowRect( child, &rc); MapWindowPoints( NULL, hwnd, (POINT*) &rc, 2); ret = GetUpdateRect( child, &rc2, 0); + ok( ret == 1, "Expected GetUpdateRect to return non-zero, got %d\n", ret); ok( rc2.right > rc2.left && rc2.bottom > rc2.top, "Update rectangle is empty!\n"); ValidateRect( hwnd, &rc); ret = GetUpdateRect( child, &rc2, 0); + ok( !ret, "Expected GetUpdateRect to return zero, got %d\n", ret); ok( rc2.left == 0 && rc2.top == 0 && rc2.right == 0 && rc2.bottom == 0, "Update rectangle %d,%d-%d,%d is not empty!\n", rc2.left, rc2.top, rc2.right, rc2.bottom); @@ -3228,6 +3230,7 @@ rgn = CreateRectRgnIndirect( &rc); ValidateRgn( hwnd, rgn); ret = GetUpdateRect( child, &rc2, 0); + ok( !ret, "Expected GetUpdateRect to return zero, got %d\n", ret); ok( rc2.left == 0 && rc2.top == 0 && rc2.right == 0 && rc2.bottom == 0, "Update rectangle %d,%d-%d,%d is not empty!\n", rc2.left, rc2.top, rc2.right, rc2.bottom); Modified: vendor/wine/dlls/user32/current/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/win.c?re… ============================================================================== --- vendor/wine/dlls/user32/current/win.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/win.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -1148,9 +1148,14 @@ if((cs->style & WS_VISIBLE) && IsZoomed(top_child)) { TRACE("Restoring current maximized child %p\n", top_child); - SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - ShowWindow( top_child, SW_SHOWNORMAL ); - SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + if (cs->style & WS_MAXIMIZE) + { + /* if the new window is maximized don't bother repainting */ + SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); + ShowWindow( top_child, SW_SHOWNORMAL ); + SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + } + else ShowWindow( top_child, SW_SHOWNORMAL ); } } } Modified: vendor/wine/dlls/winex11.drv/current/event.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/eve… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/event.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/event.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -522,7 +522,6 @@ if (IsWindowEnabled(hwnd)) { HMENU hSysMenu; - POINT pt; if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; hSysMenu = GetSystemMenu(hwnd, FALSE); @@ -553,10 +552,12 @@ break; } } - /* Simulate clicking the caption Close button */ - GetCursorPos( &pt ); - PostMessageW( hwnd, WM_NCLBUTTONDOWN, HTCLOSE, MAKELPARAM( pt.x, pt.y ) ); - PostMessageW( hwnd, WM_LBUTTONUP, HTCLOSE, MAKELPARAM( pt.x, pt.y ) ); + + /* Simulate pressing Alt+F4 */ + keybd_event(VK_MENU, 0, 0, 0); + keybd_event(VK_F4, 0, 0, 0); + keybd_event(VK_F4, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0); } } else if (protocol == x11drv_atom(WM_TAKE_FOCUS)) @@ -941,6 +942,8 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event, BOOL update_window ) { + DWORD style; + switch(event->state) { case PropertyDelete: @@ -966,25 +969,37 @@ if (!update_window || !data->managed || !data->mapped) return; + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if (data->iconic && data->wm_state == NormalState) /* restore window */ { data->iconic = FALSE; if (is_net_wm_state_maximized( event->display, data )) { - TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); - } - else + if ((style & WS_MAXIMIZEBOX) && !(style & WS_DISABLED)) + { + TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + } + else TRACE( "not restoring to max win %p/%lx style %08x\n", + data->hwnd, data->whole_window, style ); + } + else if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); } + else TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } else if (!data->iconic && data->wm_state == IconicState) { - TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = TRUE; - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + if ((style & WS_MINIMIZEBOX) && !(style & WS_DISABLED)) + { + TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + } + else TRACE( "not minimizing win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } } Modified: vendor/wine/dlls/winex11.drv/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/window.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/window.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -214,15 +214,12 @@ /*********************************************************************** - * X11DRV_is_window_rect_mapped + * is_window_rect_mapped * * Check if the X whole window should be mapped based on its rectangle */ static BOOL is_window_rect_mapped( const RECT *rect ) { - /* don't map if rect is empty */ - if (IsRectEmpty( rect )) return FALSE; - /* don't map if rect is off-screen */ if (rect->left >= virtual_screen_rect.right || rect->top >= virtual_screen_rect.bottom || @@ -245,19 +242,6 @@ /* Metacity needs the window to be resizable to make it fullscreen */ return (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height); -} - - -/*********************************************************************** - * get_window_owner - */ -static HWND get_window_owner( HWND hwnd ) -{ - RECT rect; - HWND owner = GetWindow( hwnd, GW_OWNER ); - /* ignore the zero-size owners used by Delphi apps */ - if (owner && GetWindowRect( owner, &rect ) && IsRectEmpty( &rect )) owner = 0; - return owner; } @@ -455,6 +439,16 @@ if (!data->whole_window) return; data->shaped = FALSE; + + if (IsRectEmpty( &data->window_rect )) /* set an empty shape */ + { + static XRectangle empty_rect; + wine_tsx11_lock(); + XShapeCombineRectangles( display, data->whole_window, ShapeBounding, 0, 0, + &empty_rect, 1, ShapeSet, YXBanded ); + wine_tsx11_unlock(); + return; + } if (hrgn == (HRGN)1) /* hack: win_region == 1 means retrieve region from server */ { @@ -1018,6 +1012,8 @@ { size_hints->max_width = data->whole_rect.right - data->whole_rect.left; size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; + if (size_hints->max_width <= 0 ||size_hints->max_height <= 0) + size_hints->max_width = size_hints->max_height = 1; size_hints->min_width = size_hints->max_width; size_hints->min_height = size_hints->max_height; size_hints->flags |= PMinSize | PMaxSize; @@ -1167,7 +1163,7 @@ { style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - owner = get_window_owner( data->hwnd ); + owner = GetWindow( data->hwnd, GW_OWNER ); if ((owner_win = get_owner_whole_window( owner, data->managed ))) group_leader = owner_win; } @@ -1181,6 +1177,7 @@ /* set the WM_WINDOW_TYPE */ if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (ex_style & WS_EX_APPWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + else if (style & WS_MINIMIZEBOX) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); @@ -1257,7 +1254,7 @@ new_state |= (1 << NET_WM_STATE_ABOVE); if (ex_style & WS_EX_TOOLWINDOW) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (!(ex_style & WS_EX_APPWINDOW) && get_window_owner( data->hwnd )) + if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); if (!data->mapped) /* set the _NET_WM_STATE atom directly */ @@ -1500,6 +1497,8 @@ XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes ); #ifdef HAVE_LIBXSHAPE + if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) + sync_window_region( display, data, (HRGN)1 ); if (data->shaped) { int old_x_offset = old_window_rect->left - old_whole_rect->left; @@ -1687,7 +1686,7 @@ sync_window_text( display, data->whole_window, text ); /* set the window region */ - if (win_rgn) sync_window_region( display, data, win_rgn ); + if (win_rgn || IsRectEmpty( &data->window_rect )) sync_window_region( display, data, win_rgn ); /* set the window opacity */ if (!GetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0; @@ -2330,7 +2329,8 @@ if (data->mapped) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || - (!event_type && !is_window_rect_mapped( rectWindow ))) + (event_type != ConfigureNotify && + !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) unmap_window( display, data ); } Modified: vendor/wine/dlls/winex11.drv/current/xrender.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xre… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/xrender.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/xrender.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -193,6 +193,7 @@ MAKE_FUNCPTR(FcPatternDestroy) MAKE_FUNCPTR(FcPatternAddInteger) MAKE_FUNCPTR(FcPatternAddString) +MAKE_FUNCPTR(FcPatternGetBool) MAKE_FUNCPTR(FcPatternGetInteger) MAKE_FUNCPTR(FcPatternGetString) static void *fontconfig_handle; @@ -408,6 +409,7 @@ LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternAddInteger); LOAD_FUNCPTR(FcPatternAddString); + LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetString); #undef LOAD_FUNCPTR @@ -936,14 +938,17 @@ if ((match = pFcFontMatch( NULL, pattern, &result ))) { int rgba; - + FcBool antialias; + + if (pFcPatternGetBool( match, FC_ANTIALIAS, 0, &antialias ) != FcResultMatch) + antialias = TRUE; if (pFcPatternGetInteger( match, FC_RGBA, 0, &rgba ) == FcResultMatch) { FcChar8 *file; if (pFcPatternGetString( match, FC_FILE, 0, &file ) != FcResultMatch) file = NULL; - TRACE( "fontconfig returned rgba %u for font %s file %s\n", - rgba, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); + TRACE( "fontconfig returned rgba %u antialias %u for font %s file %s\n", + rgba, antialias, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); switch (rgba) { @@ -951,7 +956,7 @@ case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; - case FC_RGBA_NONE: entry->aa_default = AA_None; break; + case FC_RGBA_NONE: entry->aa_default = antialias ? AA_Grey : AA_None; break; } } pFcPatternDestroy( match ); @@ -959,6 +964,30 @@ pFcPatternDestroy( pattern ); } #endif /* SONAME_LIBFONTCONFIG */ + + /* now check Xft resources */ + { + char *value; + BOOL antialias = TRUE; + + wine_tsx11_lock(); + if ((value = XGetDefault( gdi_display, "Xft", "antialias" ))) + { + if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || + value[0] == '0' || !strcasecmp( value, "off" )) + antialias = FALSE; + } + if ((value = XGetDefault( gdi_display, "Xft", "rgba" ))) + { + TRACE( "Xft resource returned rgba '%s' antialias %u\n", value, antialias ); + if (!strcmp( value, "rgb" )) entry->aa_default = AA_RGB; + else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR; + else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB; + else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR; + else if (!strcmp( value, "none" )) entry->aa_default = antialias ? AA_Grey : AA_None; + } + wine_tsx11_unlock(); + } } else entry->aa_default = AA_None; Modified: vendor/wine/server/current/named_pipe.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/named_pipe.c?… ============================================================================== --- vendor/wine/server/current/named_pipe.c [iso-8859-1] (original) +++ vendor/wine/server/current/named_pipe.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -613,7 +613,7 @@ { case ps_idle_server: case ps_wait_connect: - if (blocking && !is_overlapped( get_fd_options(fd) )) + if (blocking) { async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) break; Modified: vendor/wine/server/current/sock.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/sock.c?rev=47… ============================================================================== --- vendor/wine/server/current/sock.c [iso-8859-1] (original) +++ vendor/wine/server/current/sock.c [iso-8859-1] Sat Jun 5 11:03:08 2010 @@ -817,6 +817,7 @@ case ENOTCONN: return STATUS_CONNECTION_DISCONNECTED; case ETIMEDOUT: return STATUS_IO_TIMEOUT; case ENETUNREACH: return STATUS_NETWORK_UNREACHABLE; + case EHOSTUNREACH: return STATUS_HOST_UNREACHABLE; case ENETDOWN: return STATUS_NETWORK_BUSY; case EPIPE: case ECONNRESET: return STATUS_CONNECTION_RESET;

14 years, 6 months

[jmorlan] 47584: [WIN32CSR] Implement some basic line editing capability

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sat Jun 5 08:10:53 2010 New Revision: 47584 URL: http://svn.reactos.org/svn/reactos?rev=47584&view=rev Log: [WIN32CSR] Implement some basic line editing capability Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] Sat Jun 5 08:10:53 2010 @@ -23,24 +23,142 @@ /* FUNCTIONS *****************************************************************/ static VOID +ConioLineInputSetPos(PCSRSS_CONSOLE Console, UINT Pos) +{ + if (Pos != Console->LinePos && Console->Mode & ENABLE_ECHO_INPUT) + { + PCSRSS_SCREEN_BUFFER Buffer = Console->ActiveBuffer; + UINT OldCursorX = Buffer->CurrentX; + UINT OldCursorY = Buffer->CurrentY; + INT XY = OldCursorY * Buffer->MaxX + OldCursorX; + + XY += (Pos - Console->LinePos); + if (XY < 0) + XY = 0; + else if (XY >= Buffer->MaxY * Buffer->MaxX) + XY = Buffer->MaxY * Buffer->MaxX - 1; + + Buffer->CurrentX = XY % Buffer->MaxX; + Buffer->CurrentY = XY / Buffer->MaxX; + ConioSetScreenInfo(Console, Buffer, OldCursorX, OldCursorY); + } + + Console->LinePos = Pos; +} + +static VOID +ConioLineInputEdit(PCSRSS_CONSOLE Console, UINT NumToDelete, UINT NumToInsert, WCHAR *Insertion) +{ + UINT Pos = Console->LinePos; + UINT NewSize = Console->LineSize - NumToDelete + NumToInsert; + INT i; + + /* Make sure there's always enough room for ending \r\n */ + if (NewSize + 2 > Console->LineMaxSize) + return; + + memmove(&Console->LineBuffer[Pos + NumToInsert], + &Console->LineBuffer[Pos + NumToDelete], + (Console->LineSize - (Pos + NumToDelete)) * sizeof(WCHAR)); + memcpy(&Console->LineBuffer[Pos], Insertion, NumToInsert * sizeof(WCHAR)); + + if (Console->Mode & ENABLE_ECHO_INPUT) + { + for (i = Pos; i < NewSize; i++) + { + CHAR AsciiChar; + WideCharToMultiByte(Console->OutputCodePage, 0, + &Console->LineBuffer[i], 1, + &AsciiChar, 1, NULL, NULL); + ConioWriteConsole(Console, Console->ActiveBuffer, &AsciiChar, 1, TRUE); + } + for (; i < Console->LineSize; i++) + { + ConioWriteConsole(Console, Console->ActiveBuffer, " ", 1, TRUE); + } + Console->LinePos = i; + } + + Console->LineSize = NewSize; + ConioLineInputSetPos(Console, Pos + NumToInsert); +} + +static VOID ConioLineInputKeyDown(PCSRSS_CONSOLE Console, KEY_EVENT_RECORD *KeyEvent) { + UINT Pos = Console->LinePos; + switch (KeyEvent->wVirtualKeyCode) + { + case VK_ESCAPE: + /* Clear entire line */ + ConioLineInputSetPos(Console, 0); + ConioLineInputEdit(Console, Console->LineSize, 0, NULL); + return; + case VK_HOME: + /* Move to start of line. With ctrl, erase everything left of cursor */ + ConioLineInputSetPos(Console, 0); + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + ConioLineInputEdit(Console, Pos, 0, NULL); + return; + case VK_END: + /* Move to end of line. With ctrl, erase everything right of cursor */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + ConioLineInputEdit(Console, Console->LineSize - Pos, 0, NULL); + else + ConioLineInputSetPos(Console, Console->LineSize); + return; + case VK_LEFT: + /* Move left. With ctrl, move to beginning of previous word */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + { + while (Pos > 0 && Console->LineBuffer[Pos - 1] == L' ') Pos--; + while (Pos > 0 && Console->LineBuffer[Pos - 1] != L' ') Pos--; + } + else + { + Pos -= (Pos > 0); + } + ConioLineInputSetPos(Console, Pos); + return; + case VK_RIGHT: + /* Move right. With ctrl, move to beginning of next word */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + { + while (Pos < Console->LineSize && Console->LineBuffer[Pos] != L' ') Pos++; + while (Pos < Console->LineSize && Console->LineBuffer[Pos] == L' ') Pos++; + } + else + { + Pos += (Pos < Console->LineSize); + } + ConioLineInputSetPos(Console, Pos); + return; + case VK_DELETE: + /* Remove character to right of cursor */ + if (Pos != Console->LineSize) + ConioLineInputEdit(Console, 1, 0, NULL); + return; + case VK_F6: + /* Insert a ^Z character */ + KeyEvent->uChar.UnicodeChar = 26; + break; + } + if (KeyEvent->uChar.UnicodeChar == L'\b' && Console->Mode & ENABLE_PROCESSED_INPUT) { - /* backspace handling - if we are in charge of echoing it then we handle it here - * otherwise we treat it like a normal char. - */ - if (Console->LineSize > 0) - { - Console->LineSize--; - if (Console->Mode & ENABLE_ECHO_INPUT) - ConioWriteConsole(Console, Console->ActiveBuffer, "\b", 1, TRUE); + /* backspace handling - if processed input enabled then we handle it here + * otherwise we treat it like a normal char. */ + if (Pos > 0) + { + ConioLineInputSetPos(Console, Pos - 1); + ConioLineInputEdit(Console, 1, 0, NULL); } } else if (KeyEvent->uChar.UnicodeChar == L'\r') { HistoryAddEntry(Console); + ConioLineInputSetPos(Console, Console->LineSize); Console->LineBuffer[Console->LineSize++] = L'\r'; if (Console->Mode & ENABLE_ECHO_INPUT) ConioWriteConsole(Console, Console->ActiveBuffer, "\r", 1, TRUE); @@ -55,19 +173,8 @@ } else if (KeyEvent->uChar.UnicodeChar != L'\0') { - if (Console->LineSize + 2 < Console->LineMaxSize) - { - Console->LineBuffer[Console->LineSize++] = KeyEvent->uChar.UnicodeChar; - /* echo to screen if enabled */ - if (Console->Mode & ENABLE_ECHO_INPUT) - { - CHAR AsciiChar; - WideCharToMultiByte(Console->OutputCodePage, 0, - &KeyEvent->uChar.UnicodeChar, 1, - &AsciiChar, 1, NULL, NULL); - ConioWriteConsole(Console, Console->ActiveBuffer, &AsciiChar, 1, TRUE); - } - } + /* Normal character */ + ConioLineInputEdit(Console, 0, 1, &KeyEvent->uChar.UnicodeChar); } } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Sat Jun 5 08:10:53 2010 @@ -26,7 +26,7 @@ <file>guiconsole.c</file> <file>handle.c</file> <file>harderror.c</file> - <file>history.c</file> + <file>history.c</file> <file>tuiconsole.c</file> <file>appswitch.c</file> <file>win32csr.rc</file>

14 years, 6 months

[tkreuzer] 47583: [WIN32K] Implement EngCreateSection, EngMapSection, EngFreeSectionMem, EngAllocSectionMem, EngLoadModuleEx, EngLoadModule, EngLoadModuleForWrite, EngMapModule, EngFreeModule, EngMapFile, EngUnmapFile. Unused & untested.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jun 5 06:34:12 2010 New Revision: 47583 URL: http://svn.reactos.org/svn/reactos?rev=47583&view=rev Log: [WIN32K] Implement EngCreateSection, EngMapSection, EngFreeSectionMem, EngAllocSectionMem, EngLoadModuleEx, EngLoadModule, EngLoadModuleForWrite, EngMapModule, EngFreeModule, EngMapFile, EngUnmapFile. Unused & untested. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Sat Jun 5 06:34:12 2010 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * PURPOSE: Functions for mapping files and sections * FILE: subsys/win32k/eng/device.c - * PROGRAMER: + * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ #include <win32k.h> @@ -11,12 +11,314 @@ #define NDEBUG #include <debug.h> +// HACK!!! +#define MmMapViewInSessionSpace MmMapViewInSystemSpace +#define MmUnmapViewInSessionSpace MmUnmapViewInSystemSpace + +typedef struct _ENGSECTION +{ + PVOID pvSectionObject; + PVOID pvMappedBase; + SIZE_T cjViewSize; + ULONG ulTag; +} ENGSECTION, *PENGSECTION; + +typedef struct _FILEVIEW +{ + ULARGE_INTEGER LastWriteTime; + PVOID pvKView; + PVOID pvViewFD; + ULONG cjView; + PVOID pSection; +} FILEVIEW, *PFILEVIEW; + +typedef struct _FONTFILEVIEW +{ + FILEVIEW; + DWORD reserved[2]; + PWSTR pwszPath; + SIZE_T ulRegionSize; + ULONG cKRefCount; + ULONG cRefCountFD; + PVOID pvSpoolerBase; + DWORD dwSpoolerPid; +} FONTFILEVIEW, *PFONTFILEVIEW; + +enum +{ + FVF_SYSTEMROOT = 1, + FVF_READONLY = 2, + FVF_FONTFILE = 4, +}; + +HANDLE ghSystem32Directory; +HANDLE ghRootDirectory; + + +PVOID +NTAPI +EngCreateSection( + IN ULONG fl, + IN SIZE_T cjSize, + HANDLE hFile, + IN ULONG ulTag) +{ + NTSTATUS Status; + PENGSECTION pSection; + PVOID pvSectionObject; + LARGE_INTEGER liSize; + + /* Allocate a section object */ + pSection = EngAllocMem(0, sizeof(ENGSECTION), 'stsU'); + if (!pSection) return NULL; + + liSize.QuadPart = cjSize; + Status = MmCreateSection(&pvSectionObject, + SECTION_ALL_ACCESS, + NULL, + &liSize, + PAGE_READWRITE, + SEC_COMMIT, + hFile, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create a section Status=0x%x\n", Status); + EngFreeMem(pSection); + return NULL; + } + + /* Set the fields of the section */ + pSection->ulTag = ulTag; + pSection->pvSectionObject = pvSectionObject; + pSection->pvMappedBase = NULL; + pSection->cjViewSize = cjSize; + + return pSection; +} + + +BOOL +APIENTRY +EngMapSection( + IN PVOID pvSection, + IN BOOL bMap, + IN HANDLE hProcess, + OUT PVOID* pvBaseAddress) +{ + NTSTATUS Status; + PENGSECTION pSection = pvSection; + PEPROCESS pepProcess; + + /* Get a pointer to the process */ + Status = ObReferenceObjectByHandle(hProcess, + PROCESS_VM_OPERATION, + NULL, + KernelMode, + (PVOID*)&pepProcess, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not access process %p, Status=0x%lx\n", hProcess, Status); + return FALSE; + } + + if (bMap) + { + /* Make sure the section isn't already mapped */ + ASSERT(pSection->pvMappedBase == NULL); + + /* Map the section into the process address space */ + Status = MmMapViewOfSection(pSection->pvSectionObject, + pepProcess, + &pSection->pvMappedBase, + 0, + pSection->cjViewSize, + NULL, + &pSection->cjViewSize, + 0, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to map a section Status=0x%x\n", Status); + } + } + else + { + /* Make sure the section is mapped */ + ASSERT(pSection->pvMappedBase); + + /* Unmap the section from the process address space */ + Status = MmUnmapViewOfSection(pepProcess, pSection->pvMappedBase); + if (NT_SUCCESS(Status)) + { + pSection->pvMappedBase = NULL; + } + else + { + DPRINT1("Failed to unmap a section @ &p Status=0x%x\n", + pSection->pvMappedBase, Status); + } + } + + /* Dereference the process */ + ObDereferenceObject(pepProcess); + + /* Set the new mapping base and return bool status */ + *pvBaseAddress = pSection->pvMappedBase; + return NT_SUCCESS(Status); +} + +BOOL +APIENTRY +EngFreeSectionMem( + IN PVOID pvSection OPTIONAL, + IN PVOID pvMappedBase OPTIONAL) +{ + NTSTATUS Status; + PENGSECTION pSection = pvSection; + BOOL bResult = TRUE; + + /* Did the caller give us a mapping base? */ + if (pvMappedBase) + { + Status = MmUnmapViewInSessionSpace(pvMappedBase); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmUnmapViewInSessionSpace failed: 0x%lx\n", Status); + bResult = FALSE; + } + } + + /* Check if we should free the section as well */ + if (pSection) + { + /* Dereference the kernel section */ + ObDereferenceObject(pSection->pvSectionObject); + + /* Finally free the section memory itself */ + EngFreeMem(pSection); + } + + return bResult; +} + +PVOID +APIENTRY +EngAllocSectionMem( + OUT PVOID *ppvSection, + IN ULONG fl, + IN SIZE_T cjSize, + IN ULONG ulTag) +{ + NTSTATUS Status; + PENGSECTION pSection; + + /* Check parameter */ + if (cjSize == 0) return NULL; + + /* Allocate a section object */ + pSection = EngCreateSection(fl, cjSize, NULL, ulTag); + + /* Map the section in session space */ + Status = MmMapViewInSessionSpace(pSection->pvSectionObject, + &pSection->pvMappedBase, + &pSection->cjViewSize); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to map a section Status=0x%x\n", Status); + *ppvSection = NULL; + EngFreeSectionMem(pSection, NULL); + return NULL; + } + + /* Set section pointer and return base address */ + *ppvSection = pSection; + return pSection->pvMappedBase; +} + + +PFILEVIEW +NTAPI +EngLoadModuleEx( + LPWSTR pwsz, + ULONG cjSizeOfModule, + FLONG fl) +{ + PFILEVIEW pFileView = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hRootDir; + UNICODE_STRING ustrFileName; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE hFile; + NTSTATUS Status; + + if (fl & FVF_FONTFILE) + { + pFileView = EngAllocMem(0, sizeof(FONTFILEVIEW), 'vffG'); + } + else + { + pFileView = EngAllocMem(0, sizeof(FILEVIEW), 'liFg'); + } + + /* Check for success */ + if (!pFileView) return NULL; + + /* Check if the file is relative to system32 */ + if (fl & FVF_SYSTEMROOT) + { + hRootDir = ghSystem32Directory; + } + else + { + hRootDir = ghRootDirectory; + } + + /* Initialize unicode string and object attributes */ + RtlInitUnicodeString(&ustrFileName, pwsz); + InitializeObjectAttributes(&ObjectAttributes, + &ustrFileName, + OBJ_CASE_INSENSITIVE|OBJ_KERNEL_HANDLE, + hRootDir, + NULL); + + /* Now open the file */ + Status = ZwCreateFile(&hFile, + FILE_READ_DATA, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OPEN, + FILE_NON_DIRECTORY_FILE, + NULL, + 0); + + /* Check for auto size */ + if (cjSizeOfModule == 0) + { + } + + /* Allocate a section object */ + pFileView->pSection = EngCreateSection(fl, cjSizeOfModule, hFile, '1234'); + + /* Close the file handle */ + ZwClose(hFile); + + pFileView->cjView = cjSizeOfModule; + + return pFileView; +} + HANDLE APIENTRY EngLoadModule(LPWSTR pwsz) { - UNIMPLEMENTED; - return NULL; + /* Forward to EngLoadModuleEx */ + return (HANDLE)EngLoadModuleEx(pwsz, 0, FVF_READONLY | FVF_SYSTEMROOT); } HANDLE @@ -25,9 +327,8 @@ IN LPWSTR pwsz, IN ULONG cjSizeOfModule) { - // www.osr.com/ddk/graphics/gdifncs_98rr.htm - UNIMPLEMENTED; - return NULL; + /* Forward to EngLoadModuleEx */ + return (HANDLE)EngLoadModuleEx(pwsz, cjSizeOfModule, FVF_SYSTEMROOT); } PVOID @@ -36,17 +337,41 @@ IN HANDLE h, OUT PULONG pulSize) { - // www.osr.com/ddk/graphics/gdifncs_9b1j.htm - UNIMPLEMENTED; - return NULL; + PFILEVIEW pFileView = (PFILEVIEW)h; + PENGSECTION pSection = pFileView->pSection; + NTSTATUS Status; + + /* Map the section in session space */ + Status = MmMapViewInSessionSpace(pSection->pvSectionObject, + &pSection->pvMappedBase, + &pSection->cjViewSize); + if (NT_SUCCESS(Status)) + { + *pulSize = pSection->cjViewSize; + } + else + { + DPRINT1("Failed to map a section Status=0x%x\n", Status); + *pulSize = 0; + EngFreeSectionMem(pSection, NULL); + return NULL; + } + + return pSection->pvMappedBase; } VOID APIENTRY -EngFreeModule (IN HANDLE h) -{ - // www.osr.com/ddk/graphics/gdifncs_9fzb.htm - UNIMPLEMENTED; +EngFreeModule(IN HANDLE h) +{ + PFILEVIEW pFileView = (PFILEVIEW)h; + PENGSECTION pSection = pFileView->pSection; + + /* Free the section */ + EngFreeSectionMem(pSection, pSection->pvMappedBase); + + /* Free the file view memory */ + EngFreeMem(pFileView); } PVOID @@ -56,8 +381,28 @@ IN ULONG cjSize, OUT ULONG_PTR *piFile) { - UNIMPLEMENTED; - return NULL; + HANDLE hModule; + PVOID pvBase; + + /* Load the file */ + hModule = EngLoadModuleEx(pwsz, 0, 0); + if (!hModule) + { + *piFile = 0; + return NULL; + } + + /* Map the file */ + pvBase = EngMapModule(hModule, &cjSize); + if (!pvBase) + { + EngFreeModule(hModule); + hModule = NULL; + } + + /* Set iFile and return mapped base */ + *piFile = (ULONG_PTR)hModule; + return pvBase; } BOOL @@ -65,8 +410,11 @@ EngUnmapFile( IN ULONG_PTR iFile) { - UNIMPLEMENTED; - return FALSE; + HANDLE hModule = (HANDLE)iFile; + + EngFreeModule(hModule); + + return TRUE; } @@ -110,36 +458,3 @@ // www.osr.com/ddk/graphics/gdifncs_09wn.htm EngUnmapFontFileFD(iFile); } - - -BOOLEAN -APIENTRY -EngMapSection(IN PVOID Section, - IN BOOLEAN Map, - IN HANDLE Process, - IN PVOID* BaseAddress) -{ - UNIMPLEMENTED; - return FALSE; -} - -PVOID -APIENTRY -EngAllocSectionMem(IN PVOID SectionObject, - IN ULONG Flags, - IN SIZE_T MemSize, - IN ULONG Tag) -{ - UNIMPLEMENTED; - return NULL; -} - - -BOOLEAN -APIENTRY -EngFreeSectionMem(IN PVOID SectionObject OPTIONAL, - IN PVOID MappedBase) -{ - UNIMPLEMENTED; - return FALSE; -}

14 years, 6 months

← Newer
1
...
30
31
32
33
34
35
36
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010