September 2009 - Wine-commits

Nikolay Sivov : comctl32/trackbar: Drop initial parent creation tests, they are nothing to do with control testing.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 77729e23f22ee102c6672f30ffc146dfec252189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77729e23f22ee102c6672f30f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 2 21:19:24 2009 +0400 comctl32/trackbar: Drop initial parent creation tests, they are nothing to do with control testing. --- dlls/comctl32/tests/trackbar.c | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index cd4772b..d790206 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -34,29 +34,6 @@ HWND hWndParent; static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; -static const struct message create_parent_wnd_seq[] = { - { WM_GETMINMAXINFO, sent }, - { WM_NCCREATE, sent }, - { WM_NCCALCSIZE, sent|wparam, 0 }, - { WM_CREATE, sent }, - { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_QUERYNEWPALETTE, sent|optional }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent }, - { WM_ACTIVATE, sent|wparam, 1 }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|defwinproc|optional }, - { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, - /* Win9x adds SWP_NOZORDER below */ - { WM_WINDOWPOSCHANGED, sent, /*|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ }, - { WM_NCCALCSIZE, sent|wparam|optional, 1 }, - { WM_SIZE, sent }, - { WM_MOVE, sent }, - { 0 } -}; - static const struct message create_trackbar_wnd_seq[] = { {0} }; @@ -993,8 +970,6 @@ START_TEST(trackbar) init_msg_sequences(sequences, NUM_MSG_SEQUENCE); InitCommonControls(); - flush_sequences(sequences, NUM_MSG_SEQUENCE); - /* create parent window */ hWndParent = create_parent_window(); ok(hWndParent != NULL, "Failed to create parent Window!\n"); @@ -1004,7 +979,6 @@ START_TEST(trackbar) return; } - ok_sequence(sequences, PARENT_SEQ_INDEX, create_parent_wnd_seq, "create Parent Window", TRUE); flush_sequences(sequences, NUM_MSG_SEQUENCE); /* create trackbar with set styles */

1 0

Nikolay Sivov : comctl32/trackbar: TBM_SETTIC processing shouldn' t be affected by TBS_AUTOTICKS style.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 629eb23a11df48fadbfb5a8033e0edd633a5c36b URL: http://source.winehq.org/git/wine.git/?a=commit;h=629eb23a11df48fadbfb5a803… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 2 21:06:08 2009 +0400 comctl32/trackbar: TBM_SETTIC processing shouldn't be affected by TBS_AUTOTICKS style. --- dlls/comctl32/tests/trackbar.c | 16 ++++++++++------ dlls/comctl32/trackbar.c | 3 --- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index a200b91..cd4772b 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -786,18 +786,22 @@ static void test_thumb_length(HWND hWndTrackbar){ static void test_tic_settings(HWND hWndTrackbar){ int r; - flush_sequences(sequences, NUM_MSG_SEQUENCE); /* testing TBM_SETTIC */ /* Set tics at 5 and 10 */ /* 0 and 20 are out of range and should not be set */ + r = SendMessage(hWndTrackbar, TBM_GETRANGEMAX, 0, 0); + expect(10, r); + r = SendMessage(hWndTrackbar, TBM_GETRANGEMIN, 0, 0); + expect(5, r); + + flush_sequences(sequences, NUM_MSG_SEQUENCE); r = SendMessage(hWndTrackbar, TBM_SETTIC, 0, 0); ok(r == FALSE, "Expected FALSE, got %d\n", r); r = SendMessage(hWndTrackbar, TBM_SETTIC, 0, 5); - todo_wine{ - ok(r == TRUE, "Expected TRUE, got %d\n", r); - r = SendMessage(hWndTrackbar, TBM_SETTIC, 0, 10); - ok(r == TRUE, "Expected TRUE, got %d\n", r); - } + ok(r == TRUE, "Expected TRUE, got %d\n", r); + r = SendMessage(hWndTrackbar, TBM_SETTIC, 0, 10); + ok(r == TRUE, "Expected TRUE, got %d\n", r); + r = SendMessage(hWndTrackbar, TBM_SETTIC, 0, 20); ok(r == FALSE, "Expected False, got %d\n", r); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 5b0b87d..88f1df1 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1294,9 +1294,6 @@ TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength) static inline LRESULT TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos) { - if (infoPtr->dwStyle & TBS_AUTOTICKS) - return FALSE; - if ((lPos < infoPtr->lRangeMin) || (lPos> infoPtr->lRangeMax)) return FALSE;

1 0

Nikolay Sivov : comctl32/trackbar: Default to TBTS_TOP position on creation .
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 5594a5f960722927e5985eb1115b0abfbfc8740f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5594a5f960722927e5985eb11… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 2 20:35:15 2009 +0400 comctl32/trackbar: Default to TBTS_TOP position on creation. --- dlls/comctl32/tests/trackbar.c | 10 ++++------ dlls/comctl32/trackbar.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 68fdb96..a200b91 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -868,15 +868,13 @@ static void test_tool_tips(HWND hWndTrackbar){ flush_sequences(sequences, NUM_MSG_SEQUENCE); /* testing TBM_SETTIPSIDE */ r = SendMessage(hWndTrackbar, TBM_SETTIPSIDE, TBTS_TOP, 0); - todo_wine{ - expect(0, r); - } + expect(TBTS_TOP, r); r = SendMessage(hWndTrackbar, TBM_SETTIPSIDE, TBTS_LEFT, 0); - expect(0, r); + expect(TBTS_TOP, r); r = SendMessage(hWndTrackbar, TBM_SETTIPSIDE, TBTS_BOTTOM, 0); - expect(1, r); + expect(TBTS_LEFT, r); r = SendMessage(hWndTrackbar, TBM_SETTIPSIDE, TBTS_RIGHT, 0); - expect(2, r); + expect(TBTS_BOTTOM, r); /* testing TBM_SETTOOLTIPS */ hWndTooltip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, 0, diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 979be11..5b0b87d 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1408,7 +1408,7 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->lSelMin = 0; infoPtr->lSelMax = 0; infoPtr->lPos = 0; - infoPtr->fLocation = -1; + infoPtr->fLocation = TBTS_TOP; infoPtr->uNumTics = 0; /* start and end tic are not included in count*/ infoPtr->uTicFreq = 1; infoPtr->tics = NULL;

1 0

André Hentschel : jscript: Update German translation.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 8385fe4f17ea8a757efcdf45dd118ffabfe8a4ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8385fe4f17ea8a757efcdf45d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 2 17:57:14 2009 +0200 jscript: Update German translation. --- dlls/jscript/jscript_De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index 123cf57..39a229b 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -36,6 +36,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_FUNC "Funktion erwartet" IDS_NOT_DATE "'[Objekt]' ist kein Datums-Objekt" IDS_NOT_NUM "Nummer erwartet" + IDS_OBJECT_EXPECTED "Objekt erwartet" IDS_ILLEGAL_ASSIGN "Unzulässige Zuweisung" IDS_UNDEFINED "'|' nicht definiert" IDS_NOT_BOOL "Boolisches Objekt erwartet"

1 0

Andrew Eikum : ole32: Don't fail when constants are 'incorrect'.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 968126c2312378dd44cb28d4a9aac527668e53fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=968126c2312378dd44cb28d4a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 2 11:41:57 2009 -0500 ole32: Don't fail when constants are 'incorrect'. --- dlls/ole32/filemoniker.c | 49 ++++++++++++++++++++---------- dlls/ole32/tests/moniker.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index e9fd4ca..9decfaf 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -198,9 +198,9 @@ FileMonikerImpl_Load(IMoniker* iface, IStream* pStm) TRACE("(%p,%p)\n",iface,pStm); - /* first WORD must be 0 */ + /* first WORD */ res=IStream_Read(pStm,&wbuffer,sizeof(WORD),&bread); - if (bread!=sizeof(WORD) || wbuffer!=0) + if (bread!=sizeof(WORD)) { WARN("Couldn't read 0 word\n"); goto fail; @@ -229,18 +229,26 @@ FileMonikerImpl_Load(IMoniker* iface, IStream* pStm) goto fail; } - /* read the first constant */ - IStream_Read(pStm,&dwbuffer,sizeof(DWORD),&bread); - if (bread != sizeof(DWORD) || dwbuffer != 0xDEADFFFF) + /* read the unknown value */ + IStream_Read(pStm,&wbuffer,sizeof(WORD),&bread); + if (bread != sizeof(WORD)) { - WARN("Couldn't read 0xDEADFFFF constant\n"); + WARN("Couldn't read unknown value\n"); + goto fail; + } + + /* read the DEAD constant */ + IStream_Read(pStm,&wbuffer,sizeof(WORD),&bread); + if (bread != sizeof(WORD)) + { + WARN("Couldn't read DEAD constant\n"); goto fail; } for(i=0;i<5;i++) { res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),&bread); - if (bread!=sizeof(DWORD) || dwbuffer!=0) + if (bread!=sizeof(DWORD)) { WARN("Couldn't read 0 padding\n"); goto fail; @@ -320,18 +328,20 @@ FileMonikerImpl_Load(IMoniker* iface, IStream* pStm) * of Windows have minor variations. * * Data which must be written on stream is: - * 1) WORD constant:zero + * 1) WORD constant: zero (not validated by Windows) * 2) length of the path string ("\0" included) * 3) path string type A - * 4) DWORD constant : 0xDEADFFFF - * 5) five DWORD constant: zero - * 6) If we're only writing the multibyte version, + * 4) Unknown WORD value: Frequently 0xFFFF, but not always. If set very large, + * Windows returns E_OUTOFMEMORY + * 5) WORD Constant: 0xDEAD (not validated by Windows) + * 6) five DWORD constant: zero (not validated by Windows) + * 7) If we're only writing the multibyte version, * write a zero DWORD and finish. * - * 7) DWORD: double-length of the path string type W ("\0" not + * 8) DWORD: double-length of the path string type W ("\0" not * included) - * 8) WORD constant: 0x3 - * 9) filePath unicode string. + * 9) WORD constant: 0x3 + * 10) filePath unicode string. * */ static HRESULT WINAPI @@ -344,7 +354,8 @@ FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) CHAR* filePathA; DWORD bytesA, bytesW, len; - static const DWORD DEADFFFF = 0xDEADFFFF; /* Constants */ + static const WORD FFFF = 0xFFFF; /* Constants */ + static const WORD DEAD = 0xDEAD; static const DWORD ZERO = 0; static const WORD THREE = 0x3; @@ -374,8 +385,12 @@ FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) HeapFree(GetProcessHeap(),0,filePathA); if (FAILED(res)) return res; - /* write a DWORD 0xDEADFFFF */ - res=IStream_Write(pStm,&DEADFFFF,sizeof(DWORD),NULL); + /* write a WORD 0xFFFF */ + res=IStream_Write(pStm,&FFFF,sizeof(WORD),NULL); + if (FAILED(res)) return res; + + /* write a WORD 0xDEAD */ + res=IStream_Write(pStm,&DEAD,sizeof(WORD),NULL); if (FAILED(res)) return res; /* write 5 zero DWORDs */ diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b172377..d27f766 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1867,6 +1867,75 @@ static void test_bind_context(void) ok(!refs, "bound object should have been destroyed, instead of having %d refs\n", refs); } +static void test_save_load_filemoniker(void) +{ + IMoniker* pMk; + IStream* pStm; + HRESULT hr; + ULARGE_INTEGER size; + LARGE_INTEGER zero_pos, dead_pos, nulls_pos; + DWORD some_val = 0xFEDCBA98; + int i; + + /* see FileMonikerImpl_Save docs */ + zero_pos.u.LowPart = 0; + dead_pos.u.LowPart = sizeof(WORD) + sizeof(DWORD) + (lstrlenW(wszFileName1) + 1) + sizeof(WORD); + nulls_pos.u.LowPart = dead_pos.u.LowPart + sizeof(WORD); + + /* create the stream we're going to write to */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStm); + ok_ole_success(hr, "CreateStreamOnHGlobal"); + + size.u.LowPart = 128; + hr = IStream_SetSize(pStm, size); + ok_ole_success(hr, "IStream_SetSize"); + + /* create and save a moniker */ + hr = CreateFileMoniker(wszFileName1, &pMk); + ok_ole_success(hr, "CreateFileMoniker"); + + hr = IMoniker_Save(pMk, pStm, TRUE); + ok_ole_success(hr, "IMoniker_Save"); + + hr = IMoniker_Release(pMk); + ok_ole_success(hr, "IMoniker_Release"); + + /* overwrite the constants with various values */ + hr = IStream_Seek(pStm, zero_pos, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, "IStream_Seek"); + hr = IStream_Write(pStm, &some_val, sizeof(WORD), NULL); + ok_ole_success(hr, "IStream_Write"); + + hr = IStream_Seek(pStm, dead_pos, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, "IStream_Seek"); + hr = IStream_Write(pStm, &some_val, sizeof(WORD), NULL); + ok_ole_success(hr, "IStream_Write"); + + hr = IStream_Seek(pStm, nulls_pos, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, "IStream_Seek"); + for(i = 0; i < 5; ++i){ + hr = IStream_Write(pStm, &some_val, sizeof(DWORD), NULL); + ok_ole_success(hr, "IStream_Write"); + } + + /* go back to the start of the stream */ + hr = IStream_Seek(pStm, zero_pos, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, "IStream_Seek"); + + /* create a new moniker and load into it */ + hr = CreateFileMoniker(wszFileName1, &pMk); + ok_ole_success(hr, "CreateFileMoniker"); + + hr = IMoniker_Load(pMk, pStm); + ok_ole_success(hr, "IMoniker_Load"); + + hr = IMoniker_Release(pMk); + ok_ole_success(hr, "IMoniker_Release"); + + hr = IStream_Release(pStm); + ok_ole_success(hr, "IStream_Release"); +} + START_TEST(moniker) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1880,6 +1949,7 @@ START_TEST(moniker) test_anti_moniker(); test_generic_composite_moniker(); test_pointer_moniker(); + test_save_load_filemoniker(); /* FIXME: test moniker creation funcs and parsing other moniker formats */

1 0

Maik Schulz : Website: German translation of 1.1.29 release news item
by Maik Schulz 04 Sep '09

04 Sep '09

Module: website Branch: master Commit: 35d2d1b190cbd096bac85af7bc8fc341a2786598 URL: http://source.winehq.org/git/website.git/?a=commit;h=35d2d1b190cbd096bac85a… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Fri Sep 4 11:14:31 2009 +0200 Website: German translation of 1.1.29 release news item --- news/de/2009090201.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2009090201.xml b/news/de/2009090201.xml new file mode 100644 index 0000000..8235a17 --- /dev/null +++ b/news/de/2009090201.xml @@ -0,0 +1,16 @@ +<news> +<date>2. September 2009</date> +<title>Wine 1.1.29 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.29 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.29">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Integration von Gecko durch die Verwendung von Wines Netzwerkschicht.</li> + <li>Verwendung der externen libmpg123 zum Dekodieren von mp3s.</li> + <li>Unterstützung für JPEG und PNG Formate in den WindowsCodecs.</li> + <li>Viele Behebungen von Regressionsfehlern unter Win64 und Windows 7.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.29.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.29
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: website Branch: master Commit: 93bd973990c1a4a46f3b1c0abcea99c2ba12772a URL: http://source.winehq.org/git/website.git/?a=commit;h=93bd973990c1a4a46f3b1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 20:24:59 2009 +0200 Wine release 1.1.29 --- news/en/2009090201.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2009090201.xml b/news/en/2009090201.xml new file mode 100644 index 0000000..4b22e4e --- /dev/null +++ b/news/en/2009090201.xml @@ -0,0 +1,16 @@ +<news> +<date>September 2, 2009</date> +<title>Wine 1.1.29 Released</title> +<body> + The Wine development release 1.1.29 is now available. + <a href="{$root}/announce/1.1.29">What's new</a> in this release: +<ul> + <li>Improved Gecko integration by using Wine's network layers.</li> + <li>Use of external libmpg123 for mp3 decoding.</li> + <li>Support for JPEG and PNG formats in WindowsCodecs.</li> + <li>Many regression test fixes for Win64 and Windows 7.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.29.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.29.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 95105c015a18838985b8f1a3d6353b0e83a9c498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95105c015a18838985b8f1a3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 20:16:20 2009 +0200 Release 1.1.29. --- ANNOUNCE | 1154 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 560 insertions(+), 614 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95105c015a18838985b8f…

1 0

Tag wine-1.1.29 : Alexandre Julliard : Release 1.1.29
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: refs/tags/wine-1.1.29 Tag: ce549a644af60681ecbd83d1ee8023edc90f2d4e URL: http://source.winehq.org/git/wine.git/?a=tag;h=ce549a644af60681ecbd83d1ee80… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 20:16:25 2009 +0200 Release 1.1.29

1 0

Roderick Colenbrander : winex11: Use ColorShifts data in X11DRV_PALETTE_ToLogical.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 5db05dfea95a7e45269b8ae9a490adefeba02d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db05dfea95a7e45269b8ae9a… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Sep 1 22:05:40 2009 +0200 winex11: Use ColorShifts data in X11DRV_PALETTE_ToLogical. --- dlls/winex11.drv/dib.c | 20 ++++++++++---------- dlls/winex11.drv/graphics.c | 4 ++-- dlls/winex11.drv/palette.c | 5 ++++- dlls/winex11.drv/x11drv.h | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 8a61332..0bf2548 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -2201,7 +2201,7 @@ static void X11DRV_DIB_SetImageBits_16( int lines, const BYTE *srcbits, * * GetDIBits for an 16-bit deep DIB. */ -static void X11DRV_DIB_GetImageBits_16( int lines, BYTE *dstbits, +static void X11DRV_DIB_GetImageBits_16( X11DRV_PDEVICE *physDev, int lines, BYTE *dstbits, DWORD dstwidth, DWORD srcwidth, PALETTEENTRY *srccolors, DWORD rDst, DWORD gDst, DWORD bDst, @@ -2509,7 +2509,7 @@ static void X11DRV_DIB_GetImageBits_16( int lines, BYTE *dstbits, for (x = 0; x < width; x++) { COLORREF srcval; DWORD dstval; - srcval=X11DRV_PALETTE_ToLogical(XGetPixel(bmpImage, x, h)); + srcval=X11DRV_PALETTE_ToLogical(physDev, XGetPixel(bmpImage, x, h)); dstval=((GetRValue(srcval) << rShift) & rDst) | ((GetGValue(srcval) << gShift) & gDst) | ((GetBValue(srcval) << bShift) & bDst); @@ -2694,7 +2694,7 @@ static void X11DRV_DIB_SetImageBits_24( int lines, const BYTE *srcbits, * * GetDIBits for an 24-bit deep DIB. */ -static void X11DRV_DIB_GetImageBits_24( int lines, BYTE *dstbits, +static void X11DRV_DIB_GetImageBits_24( X11DRV_PDEVICE *physDev, int lines, BYTE *dstbits, DWORD dstwidth, DWORD srcwidth, PALETTEENTRY *srccolors, DWORD rDst, DWORD gDst, DWORD bDst, @@ -2891,7 +2891,7 @@ static void X11DRV_DIB_GetImageBits_24( int lines, BYTE *dstbits, dstbyte=dstbits; for (x = 0; x < width; x++) { COLORREF srcval=X11DRV_PALETTE_ToLogical - (XGetPixel( bmpImage, x, h )); + (physDev, XGetPixel( bmpImage, x, h )); dstbyte[0]=GetBValue(srcval); dstbyte[1]=GetGValue(srcval); dstbyte[2]=GetRValue(srcval); @@ -3176,7 +3176,7 @@ static void X11DRV_DIB_SetImageBits_32(int lines, const BYTE *srcbits, * * GetDIBits for an 32-bit deep DIB. */ -static void X11DRV_DIB_GetImageBits_32( int lines, BYTE *dstbits, +static void X11DRV_DIB_GetImageBits_32( X11DRV_PDEVICE *physDev, int lines, BYTE *dstbits, DWORD dstwidth, DWORD srcwidth, PALETTEENTRY *srccolors, DWORD rDst, DWORD gDst, DWORD bDst, @@ -3475,7 +3475,7 @@ static void X11DRV_DIB_GetImageBits_32( int lines, BYTE *dstbits, dstpixel=(DWORD*)dstbits; for (x = 0; x < width; x++) { COLORREF srcval; - srcval=X11DRV_PALETTE_ToLogical(XGetPixel(bmpImage, x, h)); + srcval=X11DRV_PALETTE_ToLogical(physDev, XGetPixel(bmpImage, x, h)); *dstpixel++=(GetRValue(srcval) << rShift) | (GetGValue(srcval) << gShift) | (GetBValue(srcval) << bShift); @@ -3798,7 +3798,7 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) break; case 15: case 16: - X11DRV_DIB_GetImageBits_16( descr->lines, (LPVOID)descr->bits, + X11DRV_DIB_GetImageBits_16( descr->physDev, descr->lines, (LPVOID)descr->bits, descr->infoWidth,descr->width, descr->palentry, descr->rMask, descr->gMask, descr->bMask, @@ -3806,7 +3806,7 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) break; case 24: - X11DRV_DIB_GetImageBits_24( descr->lines, (LPVOID)descr->bits, + X11DRV_DIB_GetImageBits_24( descr->physDev, descr->lines, (LPVOID)descr->bits, descr->infoWidth,descr->width, descr->palentry, descr->rMask, descr->gMask, descr->bMask, @@ -3814,7 +3814,7 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) break; case 32: - X11DRV_DIB_GetImageBits_32( descr->lines, (LPVOID)descr->bits, + X11DRV_DIB_GetImageBits_32( descr->physDev, descr->lines, (LPVOID)descr->bits, descr->infoWidth, descr->width, descr->palentry, descr->rMask, descr->gMask, descr->bMask, @@ -4151,7 +4151,7 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start WORD *index = colorPtr; descr.colorMap = rgb = HeapAlloc(GetProcessHeap(), 0, num_colors * sizeof(RGBQUAD)); for(i = 0; i < num_colors; i++, rgb++, index++) { - colref = X11DRV_PALETTE_ToLogical(X11DRV_PALETTE_ToPhysical(physDev, PALETTEINDEX(*index))); + colref = X11DRV_PALETTE_ToLogical(physDev, X11DRV_PALETTE_ToPhysical(physDev, PALETTEINDEX(*index))); rgb->rgbRed = GetRValue(colref); rgb->rgbGreen = GetGValue(colref); rgb->rgbBlue = GetBValue(colref); diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 7a64022..af1e74c 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1036,7 +1036,7 @@ X11DRV_SetPixel( X11DRV_PDEVICE *physDev, INT x, INT y, COLORREF color ) /* Update the DIBSection from the pixmap */ X11DRV_UnlockDIBSection(physDev, TRUE); - return X11DRV_PALETTE_ToLogical(pixel); + return X11DRV_PALETTE_ToLogical(physDev, pixel); } @@ -1083,7 +1083,7 @@ X11DRV_GetPixel( X11DRV_PDEVICE *physDev, INT x, INT y ) /* Update the DIBSection from the pixmap */ X11DRV_UnlockDIBSection(physDev, FALSE); if( physDev->depth > 1) - pixel = X11DRV_PALETTE_ToLogical(pixel); + pixel = X11DRV_PALETTE_ToLogical(physDev, pixel); else /* monochrome bitmaps return black or white */ if( pixel) pixel = 0xffffff; diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index bf2cee8..57174a7 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -779,11 +779,14 @@ BOOL X11DRV_IsSolidColor( COLORREF color ) * * Return RGB color for given X pixel. */ -COLORREF X11DRV_PALETTE_ToLogical(int pixel) +COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) { XColor color; ColorShifts *shifts = &X11DRV_PALETTE_default_shifts; + if(physDev->color_shifts) + shifts = physDev->color_shifts; + #if 0 /* truecolor visual */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 828eebe..404be34 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -490,7 +490,7 @@ extern int X11DRV_PALETTE_Init(void); extern void X11DRV_PALETTE_Cleanup(void); extern BOOL X11DRV_IsSolidColor(COLORREF color); -extern COLORREF X11DRV_PALETTE_ToLogical(int pixel); +extern COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel); extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color); extern int X11DRV_PALETTE_LookupPixel(COLORREF color);

1 0