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

Jacek Caban : ieframe: Use proper helpers for iface calls.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 9114827e7ecf7ad6dd35fed92a830aa0f9f63fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9114827e7ecf7ad6dd35fed92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 11:00:34 2012 +0200 ieframe: Use proper helpers for iface calls. --- dlls/ieframe/classinfo.c | 6 +++--- dlls/ieframe/client.c | 2 +- dlls/ieframe/ie.c | 6 +++--- dlls/ieframe/iexplore.c | 4 ++-- dlls/ieframe/intshcut.c | 2 +- dlls/ieframe/oleobject.c | 44 ++++++++++++++++++++++---------------------- dlls/ieframe/persist.c | 18 +++++++++--------- dlls/ieframe/taskbarlist.c | 2 +- dlls/ieframe/urlhist.c | 2 +- dlls/ieframe/webbrowser.c | 20 ++++++++++---------- 10 files changed, 53 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9114827e7ecf7ad6dd35f…

1 0

Jacek Caban : urlmon: Use proper helpers for iface calls.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: d2fe8b70615efb0e16a0942370ed8d2937d81c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fe8b70615efb0e16a094237… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 11:15:05 2012 +0200 urlmon: Use proper helpers for iface calls. --- dlls/urlmon/bindctx.c | 30 +++++++++++++++--------------- dlls/urlmon/binding.c | 8 ++++---- dlls/urlmon/download.c | 2 +- dlls/urlmon/file.c | 2 +- dlls/urlmon/ftp.c | 2 +- dlls/urlmon/http.c | 2 +- dlls/urlmon/mk.c | 2 +- dlls/urlmon/sec_mgr.c | 6 +++--- dlls/urlmon/umon.c | 4 ++-- dlls/urlmon/umstream.c | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2fe8b70615efb0e16a09…

1 0

Jacek Caban : oleaut32: Use proper helpers for iface calls.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 4a5eca88aaca449296dace8946ce6ea1ab14e1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5eca88aaca449296dace894… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 13:15:15 2012 +0200 oleaut32: Use proper helpers for iface calls. --- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/olefont.c | 8 ++++---- dlls/oleaut32/tmarshal.c | 12 ++++++------ dlls/oleaut32/typelib.c | 42 ++++++++++++++++++------------------------ dlls/oleaut32/typelib2.c | 12 ++++++------ 5 files changed, 35 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a5eca88aaca449296dac…

1 0

Piotr Caban : msvcp71: Added basic_string::append(iterator, iterator) implementation.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: d2c936d4affa9880ded35631c6711dbf2c4e1ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c936d4affa9880ded35631c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 26 13:56:01 2012 +0200 msvcp71: Added basic_string::append(iterator, iterator) implementation. --- dlls/msvcp71/msvcp71.c | 17 +++++++++++++++++ dlls/msvcp71/msvcp71.spec | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp71/msvcp71.c b/dlls/msvcp71/msvcp71.c index 2a6846a..0759051 100644 --- a/dlls/msvcp71/msvcp71.c +++ b/dlls/msvcp71/msvcp71.c @@ -187,6 +187,14 @@ basic_string_char* __thiscall basic_string_char_replace_iter_iter(basic_string_c end.pos-beg.pos, rbeg.pos, rend.pos-rbeg.pos); } +/* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)Vconst_iterator@12(a)0@Z */ +DEFINE_THISCALL_WRAPPER(basic_string_char_append_iter, 12) +basic_string_char* __thiscall basic_string_char_append_iter(basic_string_char *this, + basic_string_char_iterator beg, basic_string_char_iterator end) +{ + return pbasic_string_char_replace(this, this->size, 0, beg.pos, end.pos-beg.pos); +} + /* ?begin@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AViterator(a)12@XZ */ /* ?begin@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBE?AVconst_iterator(a)12@XZ */ /* ?begin@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AViterator(a)12@XZ */ @@ -287,6 +295,15 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_iter_iter(basic_string end.pos-beg.pos, rbeg.pos, rend.pos-rbeg.pos); } +/* ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)Vconst_iterator@12(a)0@Z */ +/* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)Vconst_iterator@12(a)0@Z */ +DEFINE_THISCALL_WRAPPER(basic_string_wchar_append_iter, 12) +basic_string_wchar* __thiscall basic_string_wchar_append_iter(basic_string_wchar *this, + basic_string_wchar_iterator beg, basic_string_wchar_iterator end) +{ + return pbasic_string_wchar_replace(this, this->size, 0, beg.pos, end.pos-beg.pos); +} + static BOOL init_funcs(void) { HMODULE hmod = GetModuleHandleA("msvcp90.dll"); diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 325b69e..b7a9bc9 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2481,7 +2481,7 @@ @ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD_K@Z(ptr str long) msvcp90.?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD_K@Z @ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBDI@Z(ptr str long) msvcp90.?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBDI@Z @ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_KD@Z(ptr long long) msvcp90.?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_KD@Z -@ stub -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)Vconst_iterator@12(a)0@Z +@ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)Vconst_iterator@12(a)0@Z(ptr ptr ptr) basic_string_char_append_iter @ thiscall -arch=win32 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) msvcp90.?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)ABV12@@Z @ cdecl -arch=win64 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) msvcp90.?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)AEBV12@@Z @ thiscall -arch=win32 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)ABV12@II(a)Z(ptr ptr long long) msvcp90.?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)ABV12@II(a)Z @@ -2494,7 +2494,7 @@ @ cdecl -arch=win64 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)PEBG_K@Z(ptr wstr long) msvcp90.?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)PEBG_K@Z @ thiscall -arch=win32 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)PBGI@Z(ptr wstr long) msvcp90.?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)PBGI@Z @ cdecl -arch=win64 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)_KG@Z(ptr long long) msvcp90.?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)_KG@Z -@ stub -arch=win32 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)Vconst_iterator@12(a)0@Z +@ thiscall -arch=win32 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)Vconst_iterator@12(a)0@Z(ptr ptr ptr) basic_string_wchar_append_iter @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) msvcp90.?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)ABV12@@Z @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) msvcp90.?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)AEBV12@@Z @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)ABV12@II(a)Z(ptr ptr long long) msvcp90.?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)ABV12@II(a)Z @@ -2507,7 +2507,7 @@ @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W_K@Z(ptr wstr long) msvcp90.?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W_K@Z @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_WI@Z(ptr wstr long) msvcp90.?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_WI@Z @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K_W@Z(ptr long long) msvcp90.?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K_W@Z -@ stub -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)Vconst_iterator@12(a)0@Z +@ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)Vconst_iterator@12(a)0@Z(ptr ptr ptr) basic_string_wchar_append_iter @ thiscall -arch=win32 ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) msvcp90.?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@@Z @ cdecl -arch=win64 ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) msvcp90.?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@@Z @ thiscall -arch=win32 ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@II(a)Z(ptr ptr long long) msvcp90.?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@II(a)Z

1 0

Jacek Caban : mshtml: Properly handle NULL VT_DISPATCH refChild in IHTMLDOMNode::insertBefore.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: 13df042891254c1dfc2b860a2d86b0fb5968d56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13df042891254c1dfc2b860a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 26 17:52:42 2012 +0200 mshtml: Properly handle NULL VT_DISPATCH refChild in IHTMLDOMNode::insertBefore. --- dlls/mshtml/htmlnode.c | 2 ++ dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 7fcff17..b0cf4c3 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -513,6 +513,8 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode case VT_NULL: break; case VT_DISPATCH: { + if(!V_DISPATCH(&refChild)) + break; ref_node = get_node_obj(This->doc, (IUnknown*)V_DISPATCH(&refChild)); if(!ref_node) { ERR("unvalid node\n"); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b0c5335..00c1498 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5920,6 +5920,13 @@ static void test_create_elems(IHTMLDocument2 *doc) test_elem_innertext(body, "insert test"); test_elem_innerhtml((IUnknown*)body, "insert test"); + node = test_create_text(doc, " Test"); + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = NULL; + test_node_insertbefore((IUnknown*)body, node, &var); + test_elem_innertext(body, "insert test Test"); + IHTMLDOMNode_Release(node); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); if(hres == S_OK) {

1 0

Sergey Guralnik : user32: Rearrange ComboBox repositioning code.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: cbf9589ba397ed98d2aa2270a332171019024b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf9589ba397ed98d2aa2270a… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jul 4 23:34:57 2012 +0400 user32: Rearrange ComboBox repositioning code. --- dlls/user32/combo.c | 95 ++++++++++++++++++----------------------------- dlls/user32/tests/msg.c | 2 +- 2 files changed, 37 insertions(+), 60 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 4a839ec..540c64b 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -453,50 +453,6 @@ static void CBGetDroppedControlRect( LPHEADCOMBO lphc, LPRECT lpRect) } /*********************************************************************** - * COMBO_WindowPosChanging - */ -static LRESULT COMBO_WindowPosChanging( - HWND hwnd, - LPHEADCOMBO lphc, - WINDOWPOS* posChanging) -{ - /* - * We need to override the WM_WINDOWPOSCHANGING method to handle all - * the non-simple comboboxes. The problem is that those controls are - * always the same height. We have to make sure they are not resized - * to another value. - */ - if ( ( CB_GETTYPE(lphc) != CBS_SIMPLE ) && - ((posChanging->flags & SWP_NOSIZE) == 0) ) - { - int newComboHeight; - - newComboHeight = CBGetTextAreaHeight(hwnd,lphc) + - 2*COMBO_YBORDERSIZE(); - - /* - * Resizing a combobox has another side effect, it resizes the dropped - * rectangle as well. However, it does it only if the new height for the - * combobox is more than the height it should have. In other words, - * if the application resizing the combobox only had the intention to resize - * the actual control, for example, to do the layout of a dialog that is - * resized, the height of the dropdown is not changed. - */ - if (posChanging->cy > newComboHeight) - { - TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n", - posChanging->cy, newComboHeight, lphc->droppedRect.bottom, - lphc->droppedRect.top); - lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight; - - } - posChanging->cy = newComboHeight; - } - - return 0; -} - -/*********************************************************************** * COMBO_Create */ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG style, @@ -1551,15 +1507,48 @@ static void CBResetPos( /*********************************************************************** * COMBO_Size */ -static void COMBO_Size( LPHEADCOMBO lphc, BOOL bRedraw ) +static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) +{ + /* + * Those controls are always the same height. So we have to make sure + * they are not resized to another value. + */ + if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { + int newComboHeight; + + newComboHeight = CBGetTextAreaHeight(lphc->self, lphc) + 2*COMBO_YBORDERSIZE(); + + /* + * Resizing a combobox has another side effect, it resizes the dropped + * rectangle as well. However, it does it only if the new height for the + * combobox is more than the height it should have. In other words, + * if the application resizing the combobox only had the intention to resize + * the actual control, for example, to do the layout of a dialog that is + * resized, the height of the dropdown is not changed. + */ + if( HIWORD(lParam) > newComboHeight ) + { + TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", + HIWORD(lParam), newComboHeight, lphc->droppedRect.bottom, + lphc->droppedRect.top); + lphc->droppedRect.bottom = lphc->droppedRect.top + HIWORD(lParam) - newComboHeight; + } + /* + * Restore original height + */ + if( HIWORD(lParam) != newComboHeight ) + SetWindowPos(lphc->self, 0, 0, 0, LOWORD(lParam), newComboHeight, + SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); + } + CBCalcPlacement(lphc->self, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, bRedraw ); + CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1871,21 +1860,9 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar } return result; } - case WM_WINDOWPOSCHANGING: - return COMBO_WindowPosChanging(hwnd, lphc, (LPWINDOWPOS)lParam); - case WM_WINDOWPOSCHANGED: - /* SetWindowPos can be called on a Combobox to resize its Listbox. - * In that case, the Combobox itself will not be resized, so we won't - * get a WM_SIZE. Since we still want to update the Listbox, we have to - * do it here. - */ - /* we should not force repainting on WM_WINDOWPOSCHANGED, it breaks - * Z-order based painting. - */ - /* fall through */ case WM_SIZE: if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, message == WM_SIZE ); + !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, lParam ); return TRUE; case WM_SETFONT: COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam ); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3102cf2..11830ad 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5824,7 +5824,7 @@ static void test_combobox_messages(void) flush_sequence(); SetWindowPos(combo, 0, 10, 10, 120, 130, SWP_NOZORDER); - ok_sequence(WmSetPosComboSeq, "repositioning messages on a ComboBox", TRUE); + ok_sequence(WmSetPosComboSeq, "repositioning messages on a ComboBox", FALSE); DestroyWindow(combo); DestroyWindow(parent);

1 0

Michael Stefaniuc : cabinet: Avoid TRUE-FALSE conditional expressions.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: f631780da4356943e91477fb7a393c10024b528a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f631780da4356943e91477fb7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 26 11:26:28 2012 +0200 cabinet: Avoid TRUE-FALSE conditional expressions. --- dlls/cabinet/fdi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 7fcf4cb..3d1aec9 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -703,9 +703,9 @@ static BOOL FDI_read_entries( pfdici->cFiles = num_files; pfdici->setID = setid; pfdici->iCabinet = cabidx; - pfdici->fReserve = (flags & cfheadRESERVE_PRESENT) ? TRUE : FALSE; - pfdici->hasprev = (flags & cfheadPREV_CABINET) ? TRUE : FALSE; - pfdici->hasnext = (flags & cfheadNEXT_CABINET) ? TRUE : FALSE; + pfdici->fReserve = (flags & cfheadRESERVE_PRESENT) != 0; + pfdici->hasprev = (flags & cfheadPREV_CABINET) != 0; + pfdici->hasnext = (flags & cfheadNEXT_CABINET) != 0; return TRUE; } @@ -2815,7 +2815,7 @@ BOOL __cdecl FDICopy( fdin.pv = pvUser; fdin.psz1 = (char *)file->filename; fdin.hf = filehf; - fdin.cb = (file->attribs & cffile_A_EXEC) ? TRUE : FALSE; /* FIXME: is that right? */ + fdin.cb = (file->attribs & cffile_A_EXEC) != 0; /* FIXME: is that right? */ fdin.date = file->date; fdin.time = file->time; fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */

1 0

Michael Stefaniuc : wined3d: Avoid TRUE-FALSE conditional expressions.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: 4ddfcc2cf15aeb5ba466c4727c8edc5529797ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ddfcc2cf15aeb5ba466c4727… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 26 11:28:32 2012 +0200 wined3d: Avoid TRUE-FALSE conditional expressions. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6dfee32..744b6af 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6999,7 +6999,7 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; - BOOL colorkey = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) ? TRUE : FALSE; + BOOL colorkey = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) != 0; d3dfmt_p8_init_palette(surface, table, colorkey); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 38795c7..07b3d3a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4146,7 +4146,7 @@ void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB /* TODO: Use already acquired context when possible. */ context = context_acquire(device, NULL); - surface_load(surface, srgb == SRGB_SRGB ? TRUE : FALSE); + surface_load(surface, srgb == SRGB_SRGB); if (surface->resource.pool == WINED3D_POOL_DEFAULT) { @@ -6352,7 +6352,7 @@ static void ffp_blit_free(struct wined3d_device *device) { } static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { BYTE table[256][4]; - BOOL colorkey_active = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) ? TRUE : FALSE; + BOOL colorkey_active = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) != 0; GLenum target; if (surface->container.type == WINED3D_CONTAINER_TEXTURE)

1 0

Jacek Caban : activdbg.idl: Undef GetCurrentThread macro to avoid collision with interface function declaration .
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: b06e8103f783584dfc9e306c441e469c8e9b8991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06e8103f783584dfc9e306c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 26 11:34:46 2012 +0200 activdbg.idl: Undef GetCurrentThread macro to avoid collision with interface function declaration. --- include/activdbg.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/activdbg.idl b/include/activdbg.idl index f3cdff1..e10066c 100644 --- a/include/activdbg.idl +++ b/include/activdbg.idl @@ -368,6 +368,7 @@ interface IDebugApplication32 : IRemoteDebugApplication [out] APPBREAKFLAGS *pabf, [out] IRemoteDebugApplicationThread **pprdatSteppingThread); + cpp_quote("#undef GetCurrentThread") HRESULT GetCurrentThread( [out] IDebugApplicationThread **pat);

1 0

Jacek Caban : widl: Added an extension that uses inline functions instead of macros for C interface calls .
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: 6b34eea6fcab318153993a3a08345b5d1eab5c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b34eea6fcab318153993a3a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 26 11:35:43 2012 +0200 widl: Added an extension that uses inline functions instead of macros for C interface calls. --- tools/widl/header.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 0b2b9d5..454b523 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -902,6 +902,43 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) } } +static void write_inline_wrappers(FILE *header, const type_t *iface, const char *name) +{ + const statement_t *stmt; + int first_iface = 1; + + if (type_iface_get_inherit(iface)) + write_inline_wrappers(header, type_iface_get_inherit(iface), name); + + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + const var_t *func = stmt->u.var; + + if (first_iface) + { + fprintf(header, "/*** %s methods ***/\n", iface->name); + first_iface = 0; + } + + if (!is_callas(func->attrs)) { + const var_t *arg; + + fprintf(header, "static FORCEINLINE "); + write_type_decl_left(header, type_function_get_rettype(func->type)); + fprintf(header, " %s_%s(", name, get_name(func)); + write_args(header, type_get_function_args(func->type), name, 1, FALSE); + fprintf(header, ") {\n"); + fprintf(header, " %s", is_void(type_function_get_rettype(func->type)) ? "" : "return "); + fprintf(header, "This->lpVtbl->%s(This", get_name(func)); + if (type_get_function_args(func->type)) + LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) + fprintf(header, ",%s", arg->name); + fprintf(header, ");\n"); + fprintf(header, "}\n"); + } + } +} + static void do_write_c_method_def(FILE *header, const type_t *iface, const char *name) { const statement_t *stmt; @@ -1150,7 +1187,11 @@ static void write_com_interface_end(FILE *header, type_t *iface) fprintf(header, "#ifdef COBJMACROS\n"); /* dispinterfaces don't have real functions, so don't write macros for them, * only for the interface this interface inherits from, i.e. IDispatch */ + fprintf(header, "#ifndef WIDL_C_INLINE_WRAPPERS\n"); write_method_macro(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); + fprintf(header, "#else\n"); + write_inline_wrappers(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); + fprintf(header, "#endif\n"); fprintf(header, "#endif\n"); fprintf(header, "\n"); fprintf(header, "#endif\n");

1 0