April 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : oleaut32: Fix some pointer conversion warnings on 64-bit.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: e851556f6b109b72379d28e35949806a2ef56552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e851556f6b109b72379d28e35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 14:25:02 2010 +0200 oleaut32: Fix some pointer conversion warnings on 64-bit. --- dlls/oleaut32/typelib.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fd7d761..be0c221 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1908,7 +1908,7 @@ MSFT_DoFuncs(TLBContext* pcx, { if (!IS_INTRESOURCE(pFuncRec->OptAttr[2])) ERR("ordinal 0x%08x invalid, IS_INTRESOURCE is false\n", pFuncRec->OptAttr[2]); - (*pptfd)->Entry = (BSTR)pFuncRec->OptAttr[2]; + (*pptfd)->Entry = (BSTR)(DWORD_PTR)LOWORD(pFuncRec->OptAttr[2]); } else { @@ -2934,7 +2934,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) else if(td[0] == VT_CARRAY) { /* array descr table here */ - pTypeLibImpl->pTypeDesc[i].u.lpadesc = (void *)((int) td[2]); /* temp store offset in*/ + pTypeLibImpl->pTypeDesc[i].u.lpadesc = (void *)(INT_PTR)td[2]; /* temp store offset in*/ } else if(td[0] == VT_USERDEFINED) { @@ -2949,7 +2949,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) if(pTypeLibImpl->pTypeDesc[i].vt != VT_CARRAY) continue; if(tlbSegDir.pArrayDescriptions.offset>0) { - MSFT_ReadLEWords(td, sizeof(td), &cx, tlbSegDir.pArrayDescriptions.offset + (int) pTypeLibImpl->pTypeDesc[i].u.lpadesc); + MSFT_ReadLEWords(td, sizeof(td), &cx, tlbSegDir.pArrayDescriptions.offset + (INT_PTR)pTypeLibImpl->pTypeDesc[i].u.lpadesc); pTypeLibImpl->pTypeDesc[i].u.lpadesc = TLB_Alloc(sizeof(ARRAYDESC)+sizeof(SAFEARRAYBOUND)*(td[3]-1)); if(td[1]<0) @@ -4786,13 +4786,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( &subtypeinfo, &subdesckind, &subbindptr); if (SUCCEEDED(hr) && (subdesckind != DESCKIND_NONE)) { - TYPEDESC tdesc_appobject = - { - { - (TYPEDESC *)pTypeInfo->hreftype - }, - VT_USERDEFINED - }; + TYPEDESC tdesc_appobject; const VARDESC vardesc_appobject = { -2, /* memid */ @@ -4814,6 +4808,9 @@ static HRESULT WINAPI ITypeLibComp_fnBind( VAR_STATIC /* varkind */ }; + tdesc_appobject.u.hreftype = pTypeInfo->hreftype; + tdesc_appobject.vt = VT_USERDEFINED; + TRACE("found in implicit app object: %s\n", debugstr_w(szName)); /* cleanup things filled in by Bind call so we can put our @@ -6606,7 +6603,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid if (pBstrName) *pBstrName = NULL; if (pwOrdinal) - *pwOrdinal = (DWORD)pFDesc->Entry; + *pwOrdinal = LOWORD(pFDesc->Entry); return S_OK; } return TYPE_E_ELEMENTNOTFOUND;

1 0

Dmitry Timoshkov : gdi32: Fix some DC leaks in gdi32 bitmap tests.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: fb9bca41e57582abde20f0e679767d9e4df7cca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9bca41e57582abde20f0e67… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 7 12:44:39 2010 +0900 gdi32: Fix some DC leaks in gdi32 bitmap tests. --- dlls/gdi32/tests/bitmap.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f6a4434..df658ff 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -411,7 +411,7 @@ static void test_dib_bits_access( HBITMAP hdib, void *bits ) char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; DWORD data[256]; BITMAPINFO *pbmi = (BITMAPINFO *)bmibuf; - HDC hdc = GetDC(0); + HDC hdc; char filename[MAX_PATH]; HANDLE file; DWORD written; @@ -435,11 +435,15 @@ static void test_dib_bits_access( HBITMAP hdib, void *bits ) pbmi->bmiHeader.biPlanes = 1; pbmi->bmiHeader.biCompression = BI_RGB; + hdc = GetDC(0); + ret = SetDIBits( hdc, hdib, 0, 16, data, pbmi, DIB_RGB_COLORS ); ok(ret == 16 || broken(ret == 0), /* win9x */ "SetDIBits failed: expected 16 got %d\n", ret); + ReleaseDC(0, hdc); + ok(VirtualQuery(bits, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); ok(info.BaseAddress == bits, "%p != %p\n", info.BaseAddress, bits); @@ -864,8 +868,8 @@ static void test_dibsections(void) DeleteObject(hdib); DeleteObject(hpal); - DeleteDC(hdcmem); + DeleteDC(hdcmem2); ReleaseDC(0, hdc); }

1 0

Dmitry Timoshkov : winex11.drv: Do not allow WM actions for windows with WS_DISABLED style set.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: e35e75b4bf5db54cd6cda0c95dc8c9e14c1fccfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e75b4bf5db54cd6cda0c95… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 7 15:41:01 2010 +0900 winex11.drv: Do not allow WM actions for windows with WS_DISABLED style set. Some applications do not expect and could have undefined behaviour (or even crash) when a not active (and disabled) main window under a dialog popup is being closed or minimized/maximazed. Most of Window Managers allow that, but Windows doesn't. --- dlls/winex11.drv/window.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 09820d3..ef197ca 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1073,9 +1073,12 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) mwm_hints.decorations = get_mwm_decorations( data, style, ex_style ); mwm_hints.functions = MWM_FUNC_MOVE; if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; - if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; - if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; - if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + if (!(style & WS_DISABLED)) + { + if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; + if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; + if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + } XChangeProperty( display, data->whole_window, x11drv_atom(_MOTIF_WM_HINTS), x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, @@ -1660,13 +1663,8 @@ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) if (offset == GWL_STYLE && (changed & WS_DISABLED)) { data = X11DRV_get_win_data( hwnd ); - if (data && data->wm_hints) - { - wine_tsx11_lock(); - data->wm_hints->input = !(style->styleNew & WS_DISABLED); - XSetWMHints( thread_display(), data->whole_window, data->wm_hints ); - wine_tsx11_unlock(); - } + if (data && data->whole_window) + set_wm_hints( thread_display(), data ); } if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED))

1 0

Eric Pouech : ntdll: On x86_64 systems (as on i386 ones), hw breakpoints must generate a EXCEPTION_SINGLE_STEP exception.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 2bebb68a0b0a520a3152e6909ab2d09c98b10e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bebb68a0b0a520a3152e6909… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 6 22:28:37 2010 +0200 ntdll: On x86_64 systems (as on i386 ones), hw breakpoints must generate a EXCEPTION_SINGLE_STEP exception. --- dlls/ntdll/signal_x86_64.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 45cdb32..59d1d6c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2096,6 +2096,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) switch (siginfo->si_code) { case TRAP_TRACE: /* Single-step exception */ + case 4 /* TRAP_HWBKPT */: /* Hardware breakpoint exception */ rec->ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_BRKPT: /* Breakpoint exception */

1 0

Eric Pouech : dbghelp: Added support for DW_CFA_GNU_args_size.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 196f8f070d039a703dc080aa7e4173ecf59476aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=196f8f070d039a703dc080aa7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 6 22:28:24 2010 +0200 dbghelp: Added support for DW_CFA_GNU_args_size. --- dlls/dbghelp/dwarf.c | 8 ++++++++ dlls/dbghelp/dwarf.h | 5 +++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 41e2397..4be0f6a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2672,6 +2672,14 @@ static void execute_cfa_instructions(dwarf2_traverse_context_t* ctx, ctx->data += len; break; } + case DW_CFA_GNU_args_size: + /* FIXME: should check that GCC is the compiler for this CU */ + { + ULONG_PTR args = dwarf2_leb128_as_unsigned(ctx); + TRACE("%lx: DW_CFA_GNU_args_size %lu\n", info->ip, args); + /* ignored */ + break; + } default: FIXME("%lx: unknown CFA opcode %02x\n", info->ip, op); break; diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 2a01c1b..23493d6 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -449,6 +449,11 @@ enum dwarf_call_frame_info DW_CFA_val_offset = 0x14, DW_CFA_val_offset_sf = 0x15, DW_CFA_val_expression = 0x16, + /* GNU extensions */ + DW_CFA_GNU_window_save = 0x2d, + DW_CFA_GNU_args_size = 0x2e, + DW_CFA_GNU_negative_offset_extended = 0x2f, + }; #define DW_EH_PE_native 0x00

1 0

Henri Verbeet : wined3d: Pass the correct window to Present() in IWineGDISurfaceImpl_Flip().
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: be9e077a4d35590d06df24fb98f18ca8f34b26be URL: http://source.winehq.org/git/wine.git/?a=commit;h=be9e077a4d35590d06df24fb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 6 20:05:18 2010 +0200 wined3d: Pass the correct window to Present() in IWineGDISurfaceImpl_Flip(). --- dlls/wined3d/surface_gdi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 6062a1a..a648cde 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -240,7 +240,8 @@ IWineGDISurfaceImpl_Flip(IWineD3DSurface *iface, return WINEDDERR_NOTFLIPPABLE; } - hr = IWineD3DSwapChain_Present((IWineD3DSwapChain *) swapchain, NULL, NULL, 0, NULL, 0); + hr = IWineD3DSwapChain_Present((IWineD3DSwapChain *)swapchain, + NULL, NULL, swapchain->win_handle, NULL, 0); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); return hr; }

1 0

Henri Verbeet : wined3d: Pass the correct window to Present() in IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 3b7774b37bd0fcced3b8310571d8583d6250b1dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7774b37bd0fcced3b831057… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 6 20:05:16 2010 +0200 wined3d: Pass the correct window to Present() in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f0bd431..40fdff3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3856,7 +3856,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const dstSwapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_IMMEDIATE; TRACE("Full screen back buffer -> front buffer blt, performing a flip instead\n"); - IWineD3DSwapChain_Present((IWineD3DSwapChain *) dstSwapchain, NULL, NULL, 0, NULL, 0); + IWineD3DSwapChain_Present((IWineD3DSwapChain *)dstSwapchain, + NULL, NULL, dstSwapchain->win_handle, NULL, 0); dstSwapchain->presentParms.SwapEffect = orig_swap;

1 0

Henri Verbeet : wined3d: Pass the correct window to Present() in IWineD3DSurfaceImpl_Flip().
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 83443273c1caabec39ccf66fb36424ce23251105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83443273c1caabec39ccf66fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 6 20:05:17 2010 +0200 wined3d: Pass the correct window to Present() in IWineD3DSurfaceImpl_Flip(). --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 40fdff3..a6d64dc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3343,7 +3343,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS } /* Flipping a OpenGL surface -> Use WineD3DDevice::Present */ - hr = IWineD3DSwapChain_Present((IWineD3DSwapChain *) swapchain, NULL, NULL, 0, NULL, 0); + hr = IWineD3DSwapChain_Present((IWineD3DSwapChain *)swapchain, + NULL, NULL, swapchain->win_handle, NULL, 0); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); return hr; }

1 0

Henri Verbeet : wined3d: Add a separate function for adding declaration elements in ConvertFvfToDeclaration ().
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 55a96174c847a807ed5672a20ea8ed0c4d70a35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a96174c847a807ed5672a20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 6 20:05:19 2010 +0200 wined3d: Add a separate function for adding declaration elements in ConvertFvfToDeclaration(). --- dlls/wined3d/device.c | 183 ++++++++++++++++++++++++------------------------- 1 files changed, 91 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55a96174c847a807ed567…

1 0

Vincent Povirk : oleaut32: Limit the number of arguments traced.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: d9c01dcc40f77ce7ac52a5fa2154107455af3447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c01dcc40f77ce7ac52a5fa2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 6 14:37:57 2010 -0500 oleaut32: Limit the number of arguments traced. --- dlls/oleaut32/typelib.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 468f001..fd7d761 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5703,7 +5703,8 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { if (TRACE_ON(ole)) { int i; TRACE("Calling %p(",func); - for (i=0;i<nrargs;i++) TRACE("%08x,",args[i]); + for (i=0;i<min(nrargs,30);i++) TRACE("%08x,",args[i]); + if (nrargs > 30) TRACE("..."); TRACE(")\n"); }

1 0