July 2011 - Wine-commits - list.winehq.org

Francois Gouget : po: Remove English strings from the Polish translation.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 7d82cdaf966fdb0b2dfd2dfdbd18936602c61664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d82cdaf966fdb0b2dfd2dfdb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 20 16:14:16 2011 +0200 po: Remove English strings from the Polish translation. --- po/pl.po | 88 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 44 insertions(+), 44 deletions(-) diff --git a/po/pl.po b/po/pl.po index f8e9bf3..cd5795a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -992,15 +992,15 @@ msgstr "ID transakcji" #: crypt32.rc:127 msgid "Sender Nonce" -msgstr "Sender Nonce" +msgstr "" #: crypt32.rc:128 msgid "Recipient Nonce" -msgstr "Recipient Nonce" +msgstr "" #: crypt32.rc:129 msgid "Reg Info" -msgstr "Reg Info" +msgstr "" #: crypt32.rc:130 msgid "Get Certificate" @@ -1016,7 +1016,7 @@ msgstr "Cofnij żądanie" #: crypt32.rc:133 msgid "Query Pending" -msgstr "Query Pending" +msgstr "" #: crypt32.rc:134 cryptui.rc:92 msgid "Certificate Trust List" @@ -2456,7 +2456,7 @@ msgstr "Naruszenie współdzielenia\n" #: winerror.mc:191 msgid "Lock violation\n" -msgstr "Lock violation\n" +msgstr "" #: winerror.mc:196 msgid "Wrong disk\n" @@ -2628,7 +2628,7 @@ msgstr "Właściciel semafory umarł\n" #: winerror.mc:406 msgid "Semaphore user limit\n" -msgstr "Semaphore user limit\n" +msgstr "" #: winerror.mc:411 msgid "Insert disk for drive %1\n" @@ -2676,7 +2676,7 @@ msgstr "Wywołanie niezaimplementowane\n" #: winerror.mc:471 msgid "Semaphore timeout\n" -msgstr "Semaphore timeout\n" +msgstr "" #: winerror.mc:476 msgid "Insufficient buffer\n" @@ -2820,7 +2820,7 @@ msgstr "Segment skasowany\n" #: winerror.mc:656 msgid "Segment not locked\n" -msgstr "Segment not locked\n" +msgstr "" #: winerror.mc:661 msgid "Bad thread ID address\n" @@ -2844,7 +2844,7 @@ msgstr "Max syste-mwide thread count reached\n" #: winerror.mc:686 msgid "Lock failed\n" -msgstr "Lock failed\n" +msgstr "" #: winerror.mc:691 msgid "Resource in use\n" @@ -2856,7 +2856,7 @@ msgstr "Anuluj naruszenie\n" #: winerror.mc:701 msgid "Atomic locks not supported\n" -msgstr "Atomic locks not supported\n" +msgstr "" #: winerror.mc:706 msgid "Invalid segment number\n" @@ -2968,7 +2968,7 @@ msgstr "Błąd w ustawieniu procedury obsługi sygnału\n" #: winerror.mc:841 msgid "Segment locked\n" -msgstr "Segment locked\n" +msgstr "" #: winerror.mc:846 msgid "Too many modules\n" @@ -3052,7 +3052,7 @@ msgstr "Mutex nie posiadany przez procedurę wywołującą\n" #: winerror.mc:946 msgid "Too many posts to semaphore\n" -msgstr "Too many posts to semaphore\n" +msgstr "" #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed\n" @@ -3196,7 +3196,7 @@ msgstr "Podklucz musi być typu volatile\n" #: winerror.mc:1126 msgid "Notify change request in progress\n" -msgstr "Notify change request in progress\n" +msgstr "" #: winerror.mc:1131 msgid "Dependent services are running\n" @@ -3216,7 +3216,7 @@ msgstr "Nie można stworzyć wątku usługi\n" #: winerror.mc:1151 msgid "Service database locked\n" -msgstr "Service database locked\n" +msgstr "" #: winerror.mc:1156 msgid "Service already running\n" @@ -3232,7 +3232,7 @@ msgstr "Usługa jest wyłączona\n" #: winerror.mc:1171 msgid "Circular dependency\n" -msgstr "Circular dependency\n" +msgstr "" #: winerror.mc:1176 msgid "Service does not exist\n" @@ -3280,7 +3280,7 @@ msgstr "Start-zawiszenie się usługi\n" #: winerror.mc:1231 msgid "Invalid service lock\n" -msgstr "Invalid service lock\n" +msgstr "" #: winerror.mc:1236 msgid "Service marked for delete\n" @@ -3672,7 +3672,7 @@ msgstr "Niepoprawne przeznaczenie wiadomości\n" #: winerror.mc:1726 msgid "Session credential conflict\n" -msgstr "Session credential conflict\n" +msgstr "" #: winerror.mc:1731 msgid "Remote session limit exceeded\n" @@ -3692,7 +3692,7 @@ msgstr "Operacja anulowana przez użytkownika\n" #: winerror.mc:1751 msgid "File has a user-mapped section\n" -msgstr "File has a user-mapped section\n" +msgstr "" #: winerror.mc:1756 winerror.mc:3741 msgid "Connection refused\n" @@ -3704,11 +3704,11 @@ msgstr "Połączenie zgrabnie zamknięte\n" #: winerror.mc:1766 msgid "Address already associated with transport endpoint\n" -msgstr "Address already associated with transport endpoint\n" +msgstr "" #: winerror.mc:1771 msgid "Address not associated with transport endpoint\n" -msgstr "Address not associated with transport endpoint\n" +msgstr "" #: winerror.mc:1776 msgid "Connection invalid\n" @@ -3852,7 +3852,7 @@ msgstr "Niepoprawna grupa nadrzędna\n" #: winerror.mc:1951 msgid "No impersonation token\n" -msgstr "No impersonation token\n" +msgstr "" #: winerror.mc:1956 msgid "Can't disable mandatory group\n" @@ -3996,7 +3996,7 @@ msgstr "Niepoprawne atrybuty grupy\n" #: winerror.mc:2131 msgid "Bad impersonation level\n" -msgstr "Bad impersonation level\n" +msgstr "" #: winerror.mc:2136 msgid "Can't open anonymous security token\n" @@ -4004,7 +4004,7 @@ msgstr "Nie można otworzyć anonimowego tokena bezpieczeństwa\n" #: winerror.mc:2141 msgid "Bad validation class\n" -msgstr "Bad validation class\n" +msgstr "" #: winerror.mc:2146 msgid "Bad token type\n" @@ -4052,7 +4052,7 @@ msgstr "Błąd wewnętrzny\n" #: winerror.mc:2201 msgid "Generic access types not mapped\n" -msgstr "Generic access types not mapped\n" +msgstr "" #: winerror.mc:2206 msgid "Bad descriptor format\n" @@ -4084,7 +4084,7 @@ msgstr "Niepoprawny typ zalogowania\n" #: winerror.mc:2241 msgid "Cannot impersonate\n" -msgstr "Cannot impersonate\n" +msgstr "" #: winerror.mc:2246 msgid "Invalid transaction state\n" @@ -4092,7 +4092,7 @@ msgstr "Niepoprawny stan transakcji\n" #: winerror.mc:2251 msgid "Security DB commit failure\n" -msgstr "Security DB commit failure\n" +msgstr "" #: winerror.mc:2256 msgid "Account is built-in\n" @@ -4144,7 +4144,7 @@ msgstr "Secret zbyt długi\n" #: winerror.mc:2316 msgid "Internal security DB error\n" -msgstr "Internal security DB error\n" +msgstr "" #: winerror.mc:2321 msgid "Too many context IDs\n" @@ -4216,7 +4216,7 @@ msgstr "Niepoprawny uchwyt kursora\n" #: winerror.mc:2411 msgid "Invalid accelerator table handle\n" -msgstr "Invalid accelerator table handle\n" +msgstr "" #: winerror.mc:2416 msgid "Invalid hook handle\n" @@ -4300,7 +4300,7 @@ msgstr "To nie jest okno combobox\n" #: winerror.mc:2516 msgid "Invalid edit height\n" -msgstr "Invalid edit height\n" +msgstr "" #: winerror.mc:2521 msgid "DC not found\n" @@ -4364,7 +4364,7 @@ msgstr "Niepoprawny parametr SPI\n" #: winerror.mc:2596 msgid "Screen already locked\n" -msgstr "Screen already locked\n" +msgstr "" #: winerror.mc:2601 msgid "Window handles have different parents\n" @@ -4416,7 +4416,7 @@ msgstr "Brak stronicowanych zasobów systemowych\n" #: winerror.mc:2661 msgid "No working set quota\n" -msgstr "No working set quota\n" +msgstr "" #: winerror.mc:2666 msgid "No page file quota\n" @@ -4424,7 +4424,7 @@ msgstr "Brak przydziału pliku stronicowania\n" #: winerror.mc:2671 msgid "Exceeded commitment limit\n" -msgstr "Exceeded commitment limit\n" +msgstr "" #: winerror.mc:2676 msgid "Menu item not found\n" @@ -4632,7 +4632,7 @@ msgstr "Ponowne uruchomienie rozpoczęte po udanej instalacji\n" #: winerror.mc:2931 msgid "Invalid string binding\n" -msgstr "Invalid string binding\n" +msgstr "" #: winerror.mc:2936 msgid "Wrong kind of binding\n" @@ -4944,7 +4944,7 @@ msgstr "Liczba bajtów zbyt mała\n" #: winerror.mc:3326 msgid "Bad stub data\n" -msgstr "Bad stub data\n" +msgstr "" #: winerror.mc:3331 msgid "Invalid user buffer\n" @@ -4956,7 +4956,7 @@ msgstr "Nierozpoznany nośnik\n" #: winerror.mc:3341 msgid "No trust secret\n" -msgstr "No trust secret\n" +msgstr "" #: winerror.mc:3346 msgid "No trust SAM account\n" @@ -5052,7 +5052,7 @@ msgstr "Nie można zalogować z kontem zaufanym serwera\n" #: winerror.mc:3461 msgid "Domain trust information inconsistent\n" -msgstr "Domain trust information inconsistent\n" +msgstr "" #: winerror.mc:3466 msgid "Server has open handles\n" @@ -5124,7 +5124,7 @@ msgstr "Niepoprawna operacja na uchwycie\n" #: winerror.mc:3551 msgid "Wrong serialising package version\n" -msgstr "Wrong serialising package version\n" +msgstr "" #: winerror.mc:3556 msgid "Wrong stub version\n" @@ -5148,7 +5148,7 @@ msgstr "Nie znaleziono członka grupy\n" #: winerror.mc:3581 msgid "Can't create endpoint mapper DB\n" -msgstr "Can't create endpoint mapper DB\n" +msgstr "" #: winerror.mc:3586 msgid "Invalid object\n" @@ -5536,7 +5536,7 @@ msgstr "grupowanie" #: oleacc.rc:48 msgid "separator" -msgstr "separator" +msgstr "" #: oleacc.rc:49 msgid "tool bar" @@ -5664,7 +5664,7 @@ msgstr "pole pokrętła" #: oleacc.rc:80 msgid "diagram" -msgstr "diagram" +msgstr "" #: oleacc.rc:81 msgid "animation" @@ -5823,7 +5823,7 @@ msgstr "program, który go stworzył" #: sane.rc:31 msgctxt "unit: pixels" msgid "px" -msgstr "px" +msgstr "" #: sane.rc:32 msgctxt "unit: bits" @@ -6212,7 +6212,7 @@ msgstr "Przewiń w prawo" #: shdoclc.rc:25 msgid "Wine Internet Explorer" -msgstr "Wine Internet Explorer" +msgstr "" #: shdoclc.rc:30 msgid "&w&bPage &p" @@ -6497,7 +6497,7 @@ msgstr "Historia" #: shell32.rc:203 msgid "SendTo" -msgstr "SendTo" +msgstr "" #: shell32.rc:204 msgid "Start Menu" @@ -10372,7 +10372,7 @@ msgstr "Wybierz plik motywu" #: winecfg.rc:54 msgid "Folder" -msgstr "Folder" +msgstr "" #: winecfg.rc:55 msgid "Links to"

1 0

Francois Gouget : po: Remove English strings from the Bulgarian translation .
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 23647c3347bca771051d1960ca65fc8ca1f72ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23647c3347bca771051d1960c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 20 16:14:25 2011 +0200 po: Remove English strings from the Bulgarian translation. --- po/bg.po | 186 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 78 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23647c3347bca771051d1…

1 0

Nikolay Sivov : comctl32/listview: Don' t invalidate list on LVM_SETTEXTBKCOLOR.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 4fc8c44bf1197eb6d4913a040a0238fb389abc09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc8c44bf1197eb6d4913a040… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 20 16:01:21 2011 +0400 comctl32/listview: Don't invalidate list on LVM_SETTEXTBKCOLOR. --- dlls/comctl32/listview.c | 15 ++++--------- dlls/comctl32/tests/listview.c | 42 ++++++++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 033472c..f6eebe8 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8894,23 +8894,18 @@ static INT LISTVIEW_SetSelectionMark(LISTVIEW_INFO *infoPtr, INT nIndex) * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure - * [I] clrTextBk : text background color + * [I] color : text background color * * RETURN: * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_SetTextBkColor(LISTVIEW_INFO *infoPtr, COLORREF clrTextBk) +static BOOL LISTVIEW_SetTextBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) { - TRACE("(clrTextBk=%x)\n", clrTextBk); + TRACE("(color=%x)\n", color); - if (infoPtr->clrTextBk != clrTextBk) - { - infoPtr->clrTextBk = clrTextBk; - LISTVIEW_InvalidateList(infoPtr); - } - - return TRUE; + infoPtr->clrTextBk = color; + return TRUE; } /*** diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a848575..e33e334 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1748,8 +1748,7 @@ static void test_icon_spacing(void) static void test_color(void) { - /* SETBKCOLOR/GETBKCOLOR, SETTEXTCOLOR/GETTEXTCOLOR, SETTEXTBKCOLOR/GETTEXTBKCOLOR */ - + RECT rect; HWND hwnd; DWORD r; int i; @@ -1768,23 +1767,54 @@ static void test_color(void) r = SendMessage(hwnd, LVM_SETBKCOLOR, 0, color); expect(TRUE, r); - r = SendMessage(hwnd, LVM_GETBKCOLOR, 0, color); + r = SendMessage(hwnd, LVM_GETBKCOLOR, 0, 0); expect(color, r); r = SendMessage(hwnd, LVM_SETTEXTCOLOR, 0, color); expect (TRUE, r); - r = SendMessage(hwnd, LVM_GETTEXTCOLOR, 0, color); + r = SendMessage(hwnd, LVM_GETTEXTCOLOR, 0, 0); expect(color, r); r = SendMessage(hwnd, LVM_SETTEXTBKCOLOR, 0, color); expect(TRUE, r); - r = SendMessage(hwnd, LVM_GETTEXTBKCOLOR, 0, color); + r = SendMessage(hwnd, LVM_GETTEXTBKCOLOR, 0, 0); expect(color, r); } ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_color_seq, "test color seq", FALSE); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* invalidation test done separately to avoid a message chain mess */ + r = ValidateRect(hwnd, NULL); + expect(TRUE, r); + r = SendMessage(hwnd, LVM_SETBKCOLOR, 0, colors[0]); + expect(TRUE, r); + + rect.right = rect.bottom = 1; + r = GetUpdateRect(hwnd, &rect, TRUE); + todo_wine expect(FALSE, r); + todo_wine ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + + r = ValidateRect(hwnd, NULL); + expect(TRUE, r); + r = SendMessage(hwnd, LVM_SETTEXTCOLOR, 0, colors[0]); + expect(TRUE, r); + + rect.right = rect.bottom = 1; + r = GetUpdateRect(hwnd, &rect, TRUE); + todo_wine expect(FALSE, r); + todo_wine ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + + r = ValidateRect(hwnd, NULL); + expect(TRUE, r); + r = SendMessage(hwnd, LVM_SETTEXTBKCOLOR, 0, colors[0]); + expect(TRUE, r); + + rect.right = rect.bottom = 1; + r = GetUpdateRect(hwnd, &rect, TRUE); + todo_wine expect(FALSE, r); + ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Don' t invalidate list on LVM_SETTEXTCOLOR.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 43a199d54dceeee5a872d333fd25cd0c879b9e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a199d54dceeee5a872d333f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 20 16:04:08 2011 +0400 comctl32/listview: Don't invalidate list on LVM_SETTEXTCOLOR. --- dlls/comctl32/listview.c | 13 ++++--------- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f6eebe8..cbc6b24 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8914,22 +8914,17 @@ static BOOL LISTVIEW_SetTextBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure - * [I] clrText : text color + * [I] color : text color * * RETURN: * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_SetTextColor (LISTVIEW_INFO *infoPtr, COLORREF clrText) +static BOOL LISTVIEW_SetTextColor (LISTVIEW_INFO *infoPtr, COLORREF color) { - TRACE("(clrText=%x)\n", clrText); - - if (infoPtr->clrText != clrText) - { - infoPtr->clrText = clrText; - LISTVIEW_InvalidateList(infoPtr); - } + TRACE("(color=%x)\n", color); + infoPtr->clrText = color; return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e33e334..6617798 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1803,7 +1803,7 @@ static void test_color(void) rect.right = rect.bottom = 1; r = GetUpdateRect(hwnd, &rect, TRUE); todo_wine expect(FALSE, r); - todo_wine ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); r = ValidateRect(hwnd, NULL); expect(TRUE, r);

1 0

Nikolay Sivov : comctl32/listview: Don't invalidate list on LVM_SETBKCOLOR.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 0a92c01a57531c6cb4ad24a6cee9ae9cc9961049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a92c01a57531c6cb4ad24a6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 20 16:06:39 2011 +0400 comctl32/listview: Don't invalidate list on LVM_SETBKCOLOR. --- dlls/comctl32/listview.c | 17 ++++++++--------- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cbc6b24..8eec25b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7913,30 +7913,29 @@ static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *infoPtr, INT dx, INT dy) * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure - * [I] clrBk : background color + * [I] color : background color * * RETURN: * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF clrBk) +static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) { - TRACE("(clrBk=%x)\n", clrBk); + TRACE("(color=%x)\n", color); - if(infoPtr->clrBk != clrBk) { + if(infoPtr->clrBk != color) { if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); - infoPtr->clrBk = clrBk; - if (clrBk == CLR_NONE) + infoPtr->clrBk = color; + if (color == CLR_NONE) infoPtr->hBkBrush = (HBRUSH)GetClassLongPtrW(infoPtr->hwndSelf, GCLP_HBRBACKGROUND); else { - infoPtr->hBkBrush = CreateSolidBrush(clrBk); + infoPtr->hBkBrush = CreateSolidBrush(color); infoPtr->dwLvExStyle &= ~LVS_EX_TRANSPARENTBKGND; } - LISTVIEW_InvalidateList(infoPtr); } - return TRUE; + return TRUE; } /* LISTVIEW_SetBkImage */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6617798..850c717 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1793,7 +1793,7 @@ static void test_color(void) rect.right = rect.bottom = 1; r = GetUpdateRect(hwnd, &rect, TRUE); todo_wine expect(FALSE, r); - todo_wine ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); r = ValidateRect(hwnd, NULL); expect(TRUE, r);

1 0

Jacek Caban : mshtml: Moved style tests to separated file.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 2507d6e581ae2d77a224a79184f6363a5fceb8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2507d6e581ae2d77a224a7918… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 20 15:34:43 2011 +0200 mshtml: Moved style tests to separated file. --- dlls/mshtml/tests/Makefile.in | 3 +- dlls/mshtml/tests/dom.c | 2268 ++++------------------------------------- dlls/mshtml/tests/style.c | 2187 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 2369 insertions(+), 2089 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2507d6e581ae2d77a224a…

1 0

Michael Stefaniuc : qmgr: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 3de56aa9a7a3eb1706b222fc6c0c6e347fce36bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de56aa9a7a3eb1706b222fc6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 20 15:43:49 2011 +0200 qmgr: COM cleanup for the IClassFactory iface. --- dlls/qmgr/factory.c | 23 ++++++++++------------- dlls/qmgr/qmgr.h | 2 +- dlls/qmgr/service.c | 5 ++--- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/qmgr/factory.c b/dlls/qmgr/factory.c index 34c5ac0..222f5df 100644 --- a/dlls/qmgr/factory.c +++ b/dlls/qmgr/factory.c @@ -26,20 +26,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); static ULONG WINAPI -BITS_IClassFactory_AddRef(LPCLASSFACTORY iface) +BITS_IClassFactory_AddRef(IClassFactory *iface) { - return 2; + return 2; /* non-heap based object */ } static HRESULT WINAPI -BITS_IClassFactory_QueryInterface(LPCLASSFACTORY iface, REFIID riid, - LPVOID *ppvObj) +BITS_IClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppvObj) { - ClassFactoryImpl *This = (ClassFactoryImpl *) iface; - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = &This->lpVtbl; + *ppvObj = &BITS_ClassFactory.IClassFactory_iface; return S_OK; } @@ -48,14 +45,14 @@ BITS_IClassFactory_QueryInterface(LPCLASSFACTORY iface, REFIID riid, } static ULONG WINAPI -BITS_IClassFactory_Release(LPCLASSFACTORY iface) +BITS_IClassFactory_Release(IClassFactory *iface) { - return 1; + return 1; /* non-heap based object */ } static HRESULT WINAPI -BITS_IClassFactory_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, - REFIID riid, LPVOID *ppvObj) +BITS_IClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, + void **ppvObj) { HRESULT res; IUnknown *punk = NULL; @@ -75,7 +72,7 @@ BITS_IClassFactory_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, } static HRESULT WINAPI -BITS_IClassFactory_LockServer(LPCLASSFACTORY iface, BOOL fLock) +BITS_IClassFactory_LockServer(IClassFactory *iface, BOOL fLock) { FIXME("Not implemented\n"); return E_NOTIMPL; @@ -92,5 +89,5 @@ static const IClassFactoryVtbl BITS_IClassFactory_Vtbl = ClassFactoryImpl BITS_ClassFactory = { - &BITS_IClassFactory_Vtbl + { &BITS_IClassFactory_Vtbl } }; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index d0255d6..c504396 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -90,7 +90,7 @@ typedef struct typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } ClassFactoryImpl; extern HANDLE stop_event DECLSPEC_HIDDEN; diff --git a/dlls/qmgr/service.c b/dlls/qmgr/service.c index b7dc7c3..6abb804 100644 --- a/dlls/qmgr/service.c +++ b/dlls/qmgr/service.c @@ -95,9 +95,8 @@ StartCount(void) return FALSE; hr = CoRegisterClassObject(&CLSID_BackgroundCopyManager, - (IUnknown *) &BITS_ClassFactory, - CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, - &dwReg); + (IUnknown *) &BITS_ClassFactory.IClassFactory_iface, + CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &dwReg); if (FAILED(hr)) return FALSE;

1 0

Bellengé Maxime : comctl32: Don' t reset trackbar thumb on a WM_SIZE message.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 8a947065dc6cee4f53371346c5a49c63187c62ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a947065dc6cee4f53371346c… Author: Bellengé Maxime <maxime.bellenge(a)gmail.com> Date: Wed Jul 20 14:58:29 2011 +0200 comctl32: Don't reset trackbar thumb on a WM_SIZE message. --- dlls/comctl32/trackbar.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 91f8176..788e21f 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1555,7 +1555,8 @@ TRACKBAR_SetFocus (TRACKBAR_INFO *infoPtr) static LRESULT TRACKBAR_Size (TRACKBAR_INFO *infoPtr) { - TRACKBAR_InitializeThumb (infoPtr); + TRACKBAR_CalcChannel (infoPtr); + TRACKBAR_UpdateThumb (infoPtr); TRACKBAR_AlignBuddies (infoPtr); return 0;

1 0

Huw Davies : winex11: Sync the dib-section bits before writing to the image .
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 8679d0b1382335db29997fb35bd03474157ec58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8679d0b1382335db29997fb35… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 20 16:45:21 2011 +0100 winex11: Sync the dib-section bits before writing to the image. --- dlls/winex11.drv/bitblt.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 92765c5..6ee5909 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1916,10 +1916,12 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str image->data = dst_bits.ptr; if (bitmap) { + X11DRV_DIB_Lock( bitmap, DIB_Status_GdiMod ); wine_tsx11_lock(); XPutImage( gdi_display, bitmap->pixmap, get_bitmap_gc(depth), image, dst_bits.offset, 0, rect->left, rect->top, width, height ); wine_tsx11_unlock(); + X11DRV_DIB_Unlock( bitmap, TRUE ); } else {

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetTexture().
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: b0f2a49f42d2e4feafd659e497a2ab4f751aadaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f2a49f42d2e4feafd659e49… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 20 08:57:09 2011 +0200 d3dx9: Implement ID3DXBaseEffect::SetTexture(). --- dlls/d3dx9_36/effect.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0b0c436..88c6a16 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1988,10 +1988,30 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetString(ID3DXBaseEffect *iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_SetTexture(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, texture %p stub\n", This, parameter, texture); + TRACE("iface %p, parameter %p, texture %p\n", This, parameter, texture); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (texture && param && !param->element_count && + (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE)) + { + LPDIRECT3DBASETEXTURE9 oltexture = *(LPDIRECT3DBASETEXTURE9 *)param->data; + + if (texture) IDirect3DBaseTexture9_AddRef(texture); + if (oltexture) IDirect3DBaseTexture9_Release(oltexture); + + *(LPDIRECT3DBASETEXTURE9 *)param->data = texture; + + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetTexture(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 *texture)

1 0