November 2011 - Wine-commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 3abd9354695a69d086ef5bfe7a5b6116a32f169f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abd9354695a69d086ef5bfe7… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Oct 31 20:16:19 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1f6f589..fe3f460 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-31 20:15+0300\n" +"PO-Revision-Date: 2011-11-07 22:04+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2039,73 +2039,71 @@ msgstr "%u MB sunaudota, %u MB laisva" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Vakarų Europos" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Vidurio Europos" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Kirilica" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Tamsiai žalia" +msgstr "Graikų" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Turkų" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Hebrajų" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabų" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Baltų" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamiečių" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Tajų" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "polangis" +msgstr "Japonų" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "CHINESE_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Hangul" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "CHINESE_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Hangul (Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Simboliai" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: f840c7672492c694297a0ab93ddedd346bb461de URL: http://source.winehq.org/git/wine.git/?a=commit;h=f840c7672492c694297a0ab93… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 7 23:19:20 2011 +0100 po: Update French translation. --- po/fr.po | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/po/fr.po b/po/fr.po index 71d7d86..393092e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2043,73 +2043,71 @@ msgstr "%u MB utilisés, %u MB disponibles" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Européen occidental" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Européen central" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Cyrillique" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Vert" +msgstr "Grec" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Turc" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Hébreu" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabe" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Balte" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamien" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Thaï" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "panneau" +msgstr "Japonais" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "Chinois_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Hangeul" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "Chinois_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Hangeul (Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Symbole" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync"

1 0

Alexandre Julliard : setupapi: Add a trace for the install mode value.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 721e73543e31cb62e6b9f8e374425a9eacddc6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=721e73543e31cb62e6b9f8e37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 09:51:31 2011 +0100 setupapi: Add a trace for the install mode value. --- dlls/setupapi/install.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 6ecc288..e73b769 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1248,6 +1248,7 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I /* FIXME: should check the mode and maybe reboot */ /* there isn't much point in doing that since we */ /* don't yet handle deferred file copies anyway. */ + if (mode & 7) TRACE( "should consider reboot, mode %u\n", mode ); }

1 0

Dmitry Timoshkov : ntdll: Use PAGE_EXECUTE_READWRITE protection when allocating stubs.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 26f4ff1a389a7f38fcd29c25cea297efa8315795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f4ff1a389a7f38fcd29c25c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 8 17:09:17 2011 +0800 ntdll: Use PAGE_EXECUTE_READWRITE protection when allocating stubs. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 314813f..311fd38 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -242,7 +242,7 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) { SIZE_T size = MAX_SIZE; if (NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&stubs, 0, &size, - MEM_COMMIT, PAGE_EXECUTE_WRITECOPY ) != STATUS_SUCCESS) + MEM_COMMIT, PAGE_EXECUTE_READWRITE ) != STATUS_SUCCESS) return 0xdeadbeef; } stub = &stubs[nb_stubs++];

1 0

Alexandre Julliard : spoolss: Remove an unused variable.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: deaae1f5624428abf3ed0f8d8069563089be793f URL: http://source.winehq.org/git/wine.git/?a=commit;h=deaae1f5624428abf3ed0f8d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 09:51:59 2011 +0100 spoolss: Remove an unused variable. --- dlls/spoolss/router.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 1fcf628..3d239b4 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -266,13 +266,12 @@ static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) BOOL backend_load_all(void) { static BOOL failed = FALSE; - backend_t * pb; EnterCriticalSection(&backend_cs); /* if we failed before, don't try again */ if (!failed && (used_backends == 0)) { - pb = backend_load(localsplW, NULL, NULL); + backend_load(localsplW, NULL, NULL); /* ToDo: parse the registry and load all other backends */

1 0

Dmitry Timoshkov : kernel32: Add a bunch of tests for protections accepted by VirtualAlloc, make it pass under Wine.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: a93f86716f6a20de66c4c1bc3ef1fc513f3539c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93f86716f6a20de66c4c1bc3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 8 17:10:05 2011 +0800 kernel32: Add a bunch of tests for protections accepted by VirtualAlloc, make it pass under Wine. --- dlls/kernel32/tests/virtual.c | 80 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/virtual.c | 1 + 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d0b9f4f..aefa9d0 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1523,6 +1523,85 @@ static void test_VirtualProtect(void) VirtualFree(base, 0, MEM_FREE); } +static void test_VirtualAlloc_protection(void) +{ + static const struct test_data + { + DWORD prot; + BOOL success; + } td[] = + { + { 0, FALSE }, /* 0x00 */ + { PAGE_NOACCESS, TRUE }, /* 0x01 */ + { PAGE_READONLY, TRUE }, /* 0x02 */ + { PAGE_READONLY | PAGE_NOACCESS, FALSE }, /* 0x03 */ + { PAGE_READWRITE, TRUE }, /* 0x04 */ + { PAGE_READWRITE | PAGE_NOACCESS, FALSE }, /* 0x05 */ + { PAGE_READWRITE | PAGE_READONLY, FALSE }, /* 0x06 */ + { PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, FALSE }, /* 0x07 */ + { PAGE_WRITECOPY, FALSE }, /* 0x08 */ + { PAGE_WRITECOPY | PAGE_NOACCESS, FALSE }, /* 0x09 */ + { PAGE_WRITECOPY | PAGE_READONLY, FALSE }, /* 0x0a */ + { PAGE_WRITECOPY | PAGE_NOACCESS | PAGE_READONLY, FALSE }, /* 0x0b */ + { PAGE_WRITECOPY | PAGE_READWRITE, FALSE }, /* 0x0c */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_NOACCESS, FALSE }, /* 0x0d */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY, FALSE }, /* 0x0e */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, FALSE }, /* 0x0f */ + + { PAGE_EXECUTE, TRUE }, /* 0x10 */ + { PAGE_EXECUTE_READ, TRUE }, /* 0x20 */ + { PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE }, /* 0x30 */ + { PAGE_EXECUTE_READWRITE, TRUE }, /* 0x40 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, FALSE }, /* 0x50 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE }, /* 0x60 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE }, /* 0x70 */ + { PAGE_EXECUTE_WRITECOPY, FALSE }, /* 0x80 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE, FALSE }, /* 0x90 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ, FALSE }, /* 0xa0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE }, /* 0xb0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE, FALSE }, /* 0xc0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, FALSE }, /* 0xd0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE }, /* 0xe0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE } /* 0xf0 */ + }; + char *base; + DWORD ret, i; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + base = VirtualAlloc(0, si.dwPageSize, MEM_RESERVE | MEM_COMMIT, td[i].prot); + + if (td[i].success) + { + ok(base != NULL, "%d: VirtualAlloc failed %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == td[i].prot, "%d: %#x != %#x\n", i, info.AllocationProtect, td[i].prot); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == MEM_PRIVATE, "%d: %#x != MEM_PRIVATE\n", i, info.Type); + + VirtualFree(base, 0, MEM_FREE); + } + else + { + ok(!base, "%d: VirtualAlloc should fail\n", i); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + } +} + START_TEST(virtual) { int argc; @@ -1558,6 +1637,7 @@ START_TEST(virtual) pResetWriteWatch = (void *) GetProcAddress(hkernel32, "ResetWriteWatch"); pNtAreMappedFilesTheSame = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtAreMappedFilesTheSame" ); + test_VirtualAlloc_protection(); test_VirtualProtect(); test_VirtualAllocEx(); test_VirtualAlloc(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 8c5e773..fb8786f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1870,6 +1870,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; if ((status = get_vprot_flags( protect, &vprot ))) return status; + if (vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; vprot |= VPROT_VALLOC; if (type & MEM_COMMIT) vprot |= VPROT_COMMITTED;

1 0

Alexandre Julliard : wineps: Use the brush information passed in SelectBrush for pattern brushes.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 0a189ffaf06db8e3b3d235bf872093ec2330e6a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a189ffaf06db8e3b3d235bf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 19:56:48 2011 +0100 wineps: Use the brush information passed in SelectBrush for pattern brushes. --- dlls/wineps.drv/brush.c | 48 ++++++++++------------------------------ dlls/wineps.drv/ps.c | 55 ++-------------------------------------------- dlls/wineps.drv/psdrv.h | 6 +++- 3 files changed, 19 insertions(+), 90 deletions(-) diff --git a/dlls/wineps.drv/brush.c b/dlls/wineps.drv/brush.c index 624e1b1..706af2f 100644 --- a/dlls/wineps.drv/brush.c +++ b/dlls/wineps.drv/brush.c @@ -55,6 +55,9 @@ HBRUSH PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, case BS_PATTERN: case BS_DIBPATTERN: + physDev->brush.info = info; + physDev->brush.bits = bits; + physDev->brush.usage = usage; break; default: @@ -232,43 +235,16 @@ BOOL PSDRV_Brush(PHYSDEV dev, BOOL EO) break; case BS_PATTERN: - { - BITMAP bm; - BYTE *bits; - GetObjectA( (HBITMAP)logbrush.lbHatch, sizeof(BITMAP), &bm); - TRACE("BS_PATTERN %dx%d %d bpp\n", bm.bmWidth, bm.bmHeight, - bm.bmBitsPixel); - bits = HeapAlloc(PSDRV_Heap, 0, bm.bmWidthBytes * bm.bmHeight); - GetBitmapBits( (HBITMAP)logbrush.lbHatch, bm.bmWidthBytes * bm.bmHeight, bits); - - if(physDev->pi->ppd->LanguageLevel > 1) { - PSDRV_WriteGSave(dev); - PSDRV_WritePatternDict(dev, &bm, bits); - PSDRV_Fill(dev, EO); - PSDRV_WriteGRestore(dev); - } else { - FIXME("Trying to set a pattern brush on a level 1 printer\n"); - ret = FALSE; - } - HeapFree(PSDRV_Heap, 0, bits); - } - break; - case BS_DIBPATTERN: - { - BITMAPINFO *bmi = (BITMAPINFO *)logbrush.lbHatch; - UINT usage = logbrush.lbColor; - TRACE("size %dx%dx%d\n", bmi->bmiHeader.biWidth, - bmi->bmiHeader.biHeight, bmi->bmiHeader.biBitCount); - if(physDev->pi->ppd->LanguageLevel > 1) { - PSDRV_WriteGSave(dev); - ret = PSDRV_WriteDIBPatternDict(dev, bmi, usage); - PSDRV_Fill(dev, EO); - PSDRV_WriteGRestore(dev); - } else { - FIXME("Trying to set a pattern brush on a level 1 printer\n"); - ret = FALSE; - } + if(physDev->pi->ppd->LanguageLevel > 1) { + PSDRV_WriteGSave(dev); + ret = PSDRV_WriteDIBPatternDict(dev, physDev->brush.info, + physDev->brush.bits, physDev->brush.usage ); + PSDRV_Fill(dev, EO); + PSDRV_WriteGRestore(dev); + } else { + FIXME("Trying to set a pattern brush on a level 1 printer\n"); + ret = FALSE; } break; diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index a456253..19784f3 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -843,74 +843,25 @@ BOOL PSDRV_WriteRectClip2(PHYSDEV dev, CHAR *pszArrayName) return PSDRV_WriteSpool(dev, buf, strlen(buf)); } -BOOL PSDRV_WritePatternDict(PHYSDEV dev, BITMAP *bm, BYTE *bits) +BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, UINT usage) { static const char mypat[] = "/mypat\n"; static const char do_pattern[] = "<<\n /PaintType 1\n /PatternType 1\n /TilingType 1\n " "/BBox [0 0 %d %d]\n /XStep %d\n /YStep %d\n /PaintProc {\n begin\n 0 0 translate\n" " %d %d scale\n mypat image\n end\n }\n>>\n matrix makepattern setpattern\n"; - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char *buf, *ptr; INT w, h, x, y, w_mult, h_mult; COLORREF map[2]; - w = bm->bmWidth & ~0x7; - h = bm->bmHeight & ~0x7; - - buf = HeapAlloc(PSDRV_Heap, 0, sizeof(do_pattern) + 100); - ptr = buf; - for(y = h-1; y >= 0; y--) { - for(x = 0; x < w/8; x++) { - sprintf(ptr, "%02x", *(bits + x/8 + y * bm->bmWidthBytes)); - ptr += 2; - } - } - PSDRV_WriteSpool(dev, mypat, sizeof(mypat) - 1); - PSDRV_WriteImageDict(dev, 1, 8, 8, buf, FALSE); - PSDRV_WriteSpool(dev, "def\n", 4); - - PSDRV_WriteIndexColorSpaceBegin(dev, 1); - map[0] = GetTextColor( dev->hdc ); - map[1] = GetBkColor( dev->hdc ); - PSDRV_WriteRGB(dev, map, 2); - PSDRV_WriteIndexColorSpaceEnd(dev); - - /* Windows seems to scale patterns so that a one pixel corresponds to 1/300" */ - w_mult = (physDev->logPixelsX + 150) / 300; - h_mult = (physDev->logPixelsY + 150) / 300; - sprintf(buf, do_pattern, w * w_mult, h * h_mult, w * w_mult, h * h_mult, w * w_mult, h * h_mult); - PSDRV_WriteSpool(dev, buf, strlen(buf)); - - HeapFree(PSDRV_Heap, 0, buf); - return TRUE; -} - -BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, BITMAPINFO *bmi, UINT usage) -{ - static const char mypat[] = "/mypat\n"; - static const char do_pattern[] = "<<\n /PaintType 1\n /PatternType 1\n /TilingType 1\n " - "/BBox [0 0 %d %d]\n /XStep %d\n /YStep %d\n /PaintProc {\n begin\n 0 0 translate\n" - " %d %d scale\n mypat image\n end\n }\n>>\n matrix makepattern setpattern\n"; - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - char *buf, *ptr; - BYTE *bits; - INT w, h, x, y, colours, w_mult, h_mult; - COLORREF map[2]; + TRACE( "size %dx%dx%d\n", + bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, bmi->bmiHeader.biBitCount); if(bmi->bmiHeader.biBitCount != 1) { FIXME("dib depth %d not supported\n", bmi->bmiHeader.biBitCount); return FALSE; } - bits = (LPBYTE)bmi + bmi->bmiHeader.biSize; - colours = bmi->bmiHeader.biClrUsed; - if (colours > 256) colours = 256; - if(!colours && bmi->bmiHeader.biBitCount <= 8) - colours = 1 << bmi->bmiHeader.biBitCount; - bits += colours * ((usage == DIB_RGB_COLORS) ? - sizeof(RGBQUAD) : sizeof(WORD)); - w = bmi->bmiHeader.biWidth & ~0x7; h = bmi->bmiHeader.biHeight & ~0x7; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 1b3bb61..b86f527 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -327,6 +327,9 @@ typedef struct { typedef struct { PSCOLOR color; BOOL set; + const BITMAPINFO *info; + void *bits; + UINT usage; } PSBRUSH; #define MAX_DASHLEN 16 @@ -531,8 +534,7 @@ extern BOOL PSDRV_WriteImage(PHYSDEV dev, WORD depth, INT xDst, INT yDst, extern BOOL PSDRV_WriteBytes(PHYSDEV dev, const BYTE *bytes, DWORD number) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteData(PHYSDEV dev, const BYTE *byte, DWORD number) DECLSPEC_HIDDEN; extern DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WritePatternDict(PHYSDEV dev, BITMAP *bm, BYTE *bits) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, BITMAPINFO *bmi, UINT usage) DECLSPEC_HIDDEN; +extern BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, UINT usage) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteArrayPut(PHYSDEV dev, CHAR *pszArrayName, INT nIndex, LONG lCoord) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteArrayDef(PHYSDEV dev, CHAR *pszArrayName, INT nSize) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Use the brush information passed in SelectBrush for pattern brushes.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 265068974d26bd2bf6e36a5f47329695f250cf00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=265068974d26bd2bf6e36a5f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 12:03:19 2011 +0100 winex11: Use the brush information passed in SelectBrush for pattern brushes. --- dlls/winex11.drv/brush.c | 67 +++++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 7b7f8cf..c628d7e 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -209,15 +209,21 @@ static void BRUSH_SelectSolidBrush( X11DRV_PDEVICE *physDev, COLORREF color ) /*********************************************************************** * BRUSH_SelectPatternBrush */ -static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) +static void BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, X_PHYSBITMAP *physBitmap ) { BITMAP bitmap; - X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); - if (!physBitmap || !GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; + GetObjectW( hbitmap, sizeof(bitmap), &bitmap ); X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod ); + if (physDev->brush.pixmap) + { + wine_tsx11_lock(); + XFreePixmap( gdi_display, physDev->brush.pixmap ); + wine_tsx11_unlock(); + } + if ((physDev->depth == 1) && (physBitmap->depth != 1)) { wine_tsx11_lock(); @@ -247,33 +253,26 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) physDev->brush.fillStyle = FillOpaqueStippled; physDev->brush.pixel = -1; /* Special case (see DC_SetupGCForBrush) */ } - return TRUE; } - -/*********************************************************************** - * BRUSH_SelectDIBPatternBrush - */ -static BOOL BRUSH_SelectDIBPatternBrush( X11DRV_PDEVICE *physDev, const BITMAPINFO *info ) +/* create a bitmap appropriate for the given DIB pattern brush */ +HBITMAP create_brush_bitmap( X11DRV_PDEVICE *physDev, const BITMAPINFO *info, void *bits, UINT usage ) { - BOOL ret; HDC memdc; - HBITMAP bitmap = CreateDIBitmap( physDev->dev.hdc, &info->bmiHeader, CBM_INIT, - (LPBYTE)info + bitmap_info_size( info, DIB_RGB_COLORS ), - info, DIB_RGB_COLORS ); + int bpp = screen_bpp; + HBITMAP bitmap; + + if (physDev->depth == 1 || info->bmiHeader.biBitCount == 1) bpp = 1; + bitmap = CreateBitmap( info->bmiHeader.biWidth, abs(info->bmiHeader.biHeight), 1, bpp, NULL ); + if (!bitmap) return 0; /* make sure it's owned by x11drv */ memdc = CreateCompatibleDC( physDev->dev.hdc ); SelectObject( memdc, bitmap ); DeleteDC( memdc ); - if ((ret = BRUSH_SelectPatternBrush( physDev, bitmap ))) - { - X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( bitmap ); - physBitmap->pixmap = 0; /* so it doesn't get freed */ - } - DeleteObject( bitmap ); - return ret; + SetDIBits( physDev->dev.hdc, bitmap, 0, abs(info->bmiHeader.biHeight), bits, info, usage ); + return bitmap; } @@ -286,6 +285,24 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); LOGBRUSH logbrush; + if (bitmap || info) /* pattern brush */ + { + X_PHYSBITMAP *physbitmap; + BOOL delete_bitmap = FALSE; + + if (!bitmap || !(physbitmap = X11DRV_get_phys_bitmap( bitmap ))) + { + if (!(bitmap = create_brush_bitmap( physDev, info, bits, usage ))) return 0; + physbitmap = X11DRV_get_phys_bitmap( bitmap ); + delete_bitmap = TRUE; + } + BRUSH_SelectPatternBrush( physDev, bitmap, physbitmap ); + TRACE("BS_PATTERN\n"); + physDev->brush.style = BS_PATTERN; + if (delete_bitmap) DeleteObject( bitmap ); + return hbrush; + } + if (!GetObjectA( hbrush, sizeof(logbrush), &logbrush )) return 0; TRACE("hdc=%p hbrush=%p\n", dev->hdc, hbrush); @@ -321,16 +338,6 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, wine_tsx11_unlock(); physDev->brush.fillStyle = FillStippled; break; - - case BS_PATTERN: - TRACE("BS_PATTERN\n"); - if (!BRUSH_SelectPatternBrush( physDev, (HBITMAP)logbrush.lbHatch )) return 0; - break; - - case BS_DIBPATTERN: - TRACE("BS_DIBPATTERN\n"); - if (!BRUSH_SelectDIBPatternBrush( physDev, (BITMAPINFO *)logbrush.lbHatch )) return 0; - break; } return hbrush; }

1 0

Alexandre Julliard : winex11: Implement a SelectBrush entry point in the XRender driver.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: a16dbbe3d8f74012b53c2bdcb1a136554a5c357e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16dbbe3d8f74012b53c2bdcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 17:40:47 2011 +0100 winex11: Implement a SelectBrush entry point in the XRender driver. --- dlls/winex11.drv/brush.c | 18 +++---- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xrender.c | 123 +++++++++++++++++++++++++++----------------- 3 files changed, 85 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a16dbbe3d8f74012b53c2…

1 0

Alexandre Julliard : gdi32: Return the original brush data in GetObject.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: b47debddf533db275d19dbad9b230a283cef1cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47debddf533db275d19dbad9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 20:18:59 2011 +0100 gdi32: Return the original brush data in GetObject. --- dlls/gdi32/brush.c | 5 ++--- dlls/gdi32/tests/brush.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 19372d1..5cbae61 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -161,7 +161,6 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) case BS_PATTERN: ptr->bitmap = BITMAP_CopyBitmap( (HBITMAP)ptr->logbrush.lbHatch ); if (!ptr->bitmap) goto error; - ptr->logbrush.lbHatch = (ULONG_PTR)ptr->bitmap; ptr->logbrush.lbColor = 0; break; @@ -176,7 +175,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) if (!ptr->info) goto error; ptr->bits.ptr = (char *)ptr->info + bitmap_info_size( ptr->info, ptr->usage ); ptr->logbrush.lbStyle = BS_DIBPATTERN; - ptr->logbrush.lbHatch = (ULONG_PTR)ptr->info; + ptr->logbrush.lbColor = 0; break; case BS_DIBPATTERN8X8: @@ -446,7 +445,7 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) if(pattern_dev == dc->dibdrv) pattern_dev = GET_NEXT_PHYSDEV( physdev, pSelectBrush ); - BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, pattern_dev ); + BITMAP_SetOwnerDC( bitmap, pattern_dev ); } info = brush->info; diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index a02209f..f0ef2df 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -100,7 +100,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); DeleteObject( brush ); br.lbStyle = BS_PATTERN8X8; @@ -113,7 +113,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); ret = GetObjectW( bitmap, sizeof(dib), &dib ); ok( ret == sizeof(dib.dsBm), "wrong size %u\n", ret ); DeleteObject( bitmap ); @@ -139,7 +139,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); ret = GetObjectW( bitmap, sizeof(dib), &dib ); ok( ret == sizeof(dib), "wrong size %u\n", ret ); DeleteObject( brush ); @@ -152,7 +152,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ + ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ "wrong handle %p/%p\n", (BITMAPINFO *)br.lbHatch, info ); DeleteObject( brush ); @@ -165,8 +165,8 @@ static void test_pattern_brush(void) ret = GetObjectW( brush, sizeof(br), &br ); ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); - todo_wine ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ "wrong handle %p/%p\n", (BITMAPINFO *)br.lbHatch, info ); mem = GlobalAlloc( GMEM_MOVEABLE, sizeof(buffer) ); @@ -181,10 +181,10 @@ static void test_pattern_brush(void) ret = GetObjectW( brush, sizeof(br), &br ); ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); - todo_wine ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); ok( (HGLOBAL)br.lbHatch != mem, "wrong handle %p/%p\n", (HGLOBAL)br.lbHatch, mem ); bits = GlobalLock( mem ); - todo_wine ok( (HGLOBAL)br.lbHatch == bits || broken(!br.lbHatch), /* nt4 */ + ok( (HGLOBAL)br.lbHatch == bits || broken(!br.lbHatch), /* nt4 */ "wrong handle %p/%p\n", (HGLOBAL)br.lbHatch, bits ); ret = GlobalFlags( mem ); ok( ret == 2, "wrong flags %x\n", ret );

1 0