December 2009 - Wine-Commits

Henri Verbeet : wined3d: Let the context handle the draw buffer in flush_to_framebuffer_drawpixels( ).
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 59db3ecaa09f99b417d827290eef3cd97413070c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59db3ecaa09f99b417d827290… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 13 22:03:59 2009 +0100 wined3d: Let the context handle the draw buffer in flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3d2a337..6c8bb36 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1435,16 +1435,15 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)This, &IID_IWineD3DSwapChain, (void **)&swapchain))) { GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *)swapchain); - TRACE("Unlocking %#x buffer\n", buffer); - glDrawBuffer(buffer); - checkGLcall("glDrawBuffer"); - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); - } else { + TRACE("Unlocking %#x buffer.\n", buffer); + context_set_draw_buffer(context, buffer); + } + else + { /* Primary offscreen render target */ - TRACE("Offscreen render target\n"); - glDrawBuffer(myDevice->offscreenBuffer); - checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); + TRACE("Offscreen render target.\n"); + context_set_draw_buffer(context, myDevice->offscreenBuffer); } glGetIntegerv(GL_PACK_SWAP_BYTES, &prev_store); @@ -1511,20 +1510,8 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm glPixelStorei(GL_UNPACK_ROW_LENGTH, skipBytes); checkGLcall("glPixelStorei(GL_UNPACK_ROW_LENGTH)"); - if(!swapchain) { - glDrawBuffer(myDevice->offscreenBuffer); - checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); - } else if(swapchain->backBuffer) { - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); - } else { - glDrawBuffer(GL_FRONT); - checkGLcall("glDrawBuffer(GL_FRONT)"); - } LEAVE_GL(); context_release(context); - - return; } static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) {

1 0

Henri Verbeet : wined3d: Let the context handle the draw buffer in stretch_rect_fbo().
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 30f5883ef56c3d700ddb5ba7adc60a41cb559ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f5883ef56c3d700ddb5ba7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 13 22:03:58 2009 +0100 wined3d: Let the context handle the draw buffer in stretch_rect_fbo(). --- dlls/wined3d/device.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6529b23..c71d4eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5775,16 +5775,16 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED ENTER_GL(); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); - glDrawBuffer(buffer); - checkGLcall("glDrawBuffer()"); - } else { + context_set_draw_buffer(context, buffer); + } + else + { TRACE("Destination surface %p is offscreen\n", dst_surface); ENTER_GL(); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, &context->dst_fbo); context_attach_surface_fbo(context, GL_DRAW_FRAMEBUFFER, 0, dst_surface); - glDrawBuffer(GL_COLOR_ATTACHMENT0); - checkGLcall("glDrawBuffer()"); + context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); context_attach_depth_stencil_fbo(context, GL_DRAW_FRAMEBUFFER, NULL, FALSE); } glDisable(GL_SCISSOR_TEST); @@ -5800,17 +5800,10 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED checkGLcall("glBlitFramebuffer()"); } - IWineD3DSurface_ModifyLocation(dst_surface, SFLAG_INDRAWABLE, TRUE); - - /* If we switched from GL_BACK to GL_FRONT above, we need to switch back here */ - if (dst_swapchain && dst_surface == ((IWineD3DSwapChainImpl *)dst_swapchain)->frontBuffer - && ((IWineD3DSwapChainImpl *)dst_swapchain)->backBuffer) { - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer()"); - } LEAVE_GL(); - context_release(context); + + IWineD3DSurface_ModifyLocation(dst_surface, SFLAG_INDRAWABLE, TRUE); } static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget,

1 0

Nikolay Sivov : comctl32/treeview: Draw +/- signs with text color, not the lines' one.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 49dabfe31d068bc8a87ef1e551be750dd639d002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dabfe31d068bc8a87ef1e55… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 12 12:32:54 2009 +0300 comctl32/treeview: Draw +/- signs with text color, not the lines' one. +/- aren't affected by customdraw settings, only per control set colors used. --- dlls/comctl32/treeview.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c8524ca..4a8ced3 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2333,7 +2333,7 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE hbr = CreateSolidBrush(clrBk); hbrOld = SelectObject(hdc, hbr); - + centerx = (item->linesOffset + item->stateOffset) / 2; centery = (item->rect.top + item->rect.bottom) / 2; @@ -2414,16 +2414,20 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE LONG rectsize = min(height, width) / 4; /* plussize = ceil(rectsize * 3/4) */ LONG plussize = (rectsize + 1) * 3 / 4; - - HPEN hNewPen = CreatePen(PS_SOLID, 0, GETLINECOLOR(infoPtr->clrLine)); - HPEN hOldPen = SelectObject(hdc, hNewPen); - + + HPEN new_pen = CreatePen(PS_SOLID, 0, GETLINECOLOR(infoPtr->clrLine)); + HPEN old_pen = SelectObject(hdc, new_pen); + Rectangle(hdc, centerx - rectsize - 1, centery - rectsize - 1, centerx + rectsize + 2, centery + rectsize + 2); - - SelectObject(hdc, hOldPen); - DeleteObject(hNewPen); - + + SelectObject(hdc, old_pen); + DeleteObject(new_pen); + + /* draw +/- signs with current text color */ + new_pen = CreatePen(PS_SOLID, 0, GETTXTCOLOR(infoPtr->clrText)); + old_pen = SelectObject(hdc, new_pen); + if (height < 18 || width < 18) { MoveToEx(hdc, centerx - plussize + 1, centery, NULL); @@ -2448,6 +2452,9 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE SetPixel(hdc, centerx + 1, centery, clrBk); } } + + SelectObject(hdc, old_pen); + DeleteObject(new_pen); } } }

1 0

Henri Verbeet : wined3d: Let the context handle the draw buffer in fb_copy_to_texture_hwstretch().
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 82556b613eb1929e4010b4d7d89fb527b9d9ab15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82556b613eb1929e4010b4d7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 13 22:04:00 2009 +0100 wined3d: Let the context handle the draw buffer in fb_copy_to_texture_hwstretch(). --- dlls/wined3d/surface.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6c8bb36..59dda6e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3320,7 +3320,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine glTexParameteri(texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri(texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP); - glDrawBuffer(drawBuffer); + context_set_draw_buffer(context, drawBuffer); glReadBuffer(drawBuffer); glBegin(GL_QUADS); @@ -3397,9 +3397,6 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine glTexCoord2f((float) fbwidth / (float) Src->pow2Width, (float) fbheight / (float) Src->pow2Height); glVertex2i(fbwidth, 0); glEnd(); - } else { - /* Restore the old draw buffer */ - glDrawBuffer(GL_BACK); } glDisable(texture_target); checkGLcall("glDisable(texture_target)");

1 0

Rob Shearman : rpcrt4: Handle [out] -only non-conformant strings in stubless servers.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: d412bcc3aef1ccec410b82fac74e4e55897d9438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d412bcc3aef1ccec410b82fac… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 19:47:55 2009 +0000 rpcrt4: Handle [out]-only non-conformant strings in stubless servers. --- dlls/rpcrt4/ndr_stubless.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 2028fed..5a66c25 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -999,6 +999,18 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) size = ComplexStructSize(pStubMsg, pFormat); size *= pStubMsg->MaxCount; break; + case RPC_FC_C_CSTRING: + case RPC_FC_C_WSTRING: + if (*pFormat == RPC_FC_C_CSTRING) + size = sizeof(CHAR); + else + size = sizeof(WCHAR); + if (pFormat[1] == RPC_FC_STRING_SIZED) + ComputeConformance(pStubMsg, NULL, pFormat + 2, 0); + else + pStubMsg->MaxCount = 0; + size *= pStubMsg->MaxCount; + break; default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */

1 0

Nikolay Sivov : comctl32/treeview: Fix default colors set on creation.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: b65a7a005259512e07265c9a3a9cecbfd55d8e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b65a7a005259512e07265c9a3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 11 22:57:27 2009 +0300 comctl32/treeview: Fix default colors set on creation. --- dlls/comctl32/tests/treeview.c | 36 +++++++++++++++++++++++++++++++++--- dlls/comctl32/treeview.c | 37 +++++++++++++++++-------------------- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index be89b8f..f99da88 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -160,9 +160,9 @@ static const struct message test_get_set_textcolor_seq[] = { { TVM_GETTEXTCOLOR, sent|wparam|lparam, 0, 0 }, { TVM_SETTEXTCOLOR, sent|wparam|lparam, 0, 0 }, { TVM_GETTEXTCOLOR, sent|wparam|lparam, 0, 0 }, - { TVM_SETTEXTCOLOR, sent|wparam|lparam, 0, 0x00ffffff }, + { TVM_SETTEXTCOLOR, sent|wparam|lparam, 0, RGB(255, 255, 255) }, { TVM_GETTEXTCOLOR, sent|wparam|lparam, 0, 0 }, - { TVM_SETTEXTCOLOR, sent|wparam|lparam, 0, -1 }, + { TVM_SETTEXTCOLOR, sent|wparam|lparam, 0, CLR_NONE }, { 0 } }; @@ -728,7 +728,7 @@ static void test_get_set_textcolor(void) ok(crColor == RGB(255,255,255), "White text color reported as 0x%.8x\n", crColor); /* Reset the default text color */ - SendMessage( hTree, TVM_SETTEXTCOLOR, 0, -1 ); + SendMessage( hTree, TVM_SETTEXTCOLOR, 0, CLR_NONE ); ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, test_get_set_textcolor_seq, "test get set text color", FALSE); @@ -990,6 +990,34 @@ static void test_treeview_classinfo(void) expect(0, cls.cbClsExtra); } +static void test_get_linecolor(void) +{ + COLORREF clr; + HWND hTree; + + hTree = create_treeview_control(); + + /* newly created control has default color */ + clr = (COLORREF)SendMessage(hTree, TVM_GETLINECOLOR, 0, 0); + expect(CLR_DEFAULT, clr); + + DestroyWindow(hTree); +} + +static void test_get_insertmarkcolor(void) +{ + COLORREF clr; + HWND hTree; + + hTree = create_treeview_control(); + + /* newly created control has default color */ + clr = (COLORREF)SendMessage(hTree, TVM_GETINSERTMARKCOLOR, 0, 0); + expect(CLR_DEFAULT, clr); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1041,6 +1069,8 @@ START_TEST(treeview) test_get_set_itemheight(); test_get_set_scrolltime(); test_get_set_textcolor(); + test_get_linecolor(); + test_get_insertmarkcolor(); test_get_set_tooltips(); test_get_set_unicodeformat(); test_callback(); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ec1fdbe..c8524ca 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -191,6 +191,10 @@ typedef struct tagTREEVIEW_INFO #define OVERLAYIMAGEINDEX(x) (((x) >> 8) & 0x0f) #define ISVISIBLE(x) ((x)->visibleOrder >= 0) +#define GETLINECOLOR(x) ((x) == CLR_DEFAULT ? comctl32_color.clrGrayText : (x)) +#define GETBKCOLOR(x) ((x) == CLR_NONE ? comctl32_color.clrWindow : (x)) +#define GETTXTCOLOR(x) ((x) == CLR_NONE ? comctl32_color.clrWindowText : (x)) +#define GETINSCOLOR(x) ((x) == CLR_DEFAULT ? comctl32_color.clrBtnText : (x)) static const WCHAR themeClass[] = { 'T','r','e','e','v','i','e','w',0 }; @@ -2322,8 +2326,7 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE & (TVS_LINESATROOT|TVS_HASLINES|TVS_HASBUTTONS)) > TVS_LINESATROOT); HBRUSH hbr, hbrOld; - COLORREF clrBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: - infoPtr->clrBk; + COLORREF clrBk = GETBKCOLOR(infoPtr->clrBk); if (!lar && item->iLevel == 0) return; @@ -2342,7 +2345,7 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE /* Get a dotted grey pen */ lb.lbStyle = BS_SOLID; - lb.lbColor = infoPtr->clrLine; + lb.lbColor = GETLINECOLOR(infoPtr->clrLine); hNewPen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, NULL); hOldPen = SelectObject(hdc, hNewPen); @@ -2412,7 +2415,7 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE /* plussize = ceil(rectsize * 3/4) */ LONG plussize = (rectsize + 1) * 3 / 4; - HPEN hNewPen = CreatePen(PS_SOLID, 0, infoPtr->clrLine); + HPEN hNewPen = CreatePen(PS_SOLID, 0, GETLINECOLOR(infoPtr->clrLine)); HPEN hOldPen = SelectObject(hdc, hNewPen); Rectangle(hdc, centerx - rectsize - 1, centery - rectsize - 1, @@ -2482,22 +2485,16 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem else { nmcdhdr.clrTextBk = comctl32_color.clrBtnFace; - if (infoPtr->clrText == -1) - nmcdhdr.clrText = comctl32_color.clrWindowText; - else - nmcdhdr.clrText = infoPtr->clrText; + nmcdhdr.clrText = GETTXTCOLOR(infoPtr->clrText); } } else { - nmcdhdr.clrTextBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: - infoPtr->clrBk; + nmcdhdr.clrTextBk = GETBKCOLOR(infoPtr->clrBk); if ((infoPtr->dwStyle & TVS_TRACKSELECT) && (wineItem == infoPtr->hotItem)) nmcdhdr.clrText = comctl32_color.clrHighlight; - else if (infoPtr->clrText == -1) - nmcdhdr.clrText = comctl32_color.clrWindowText; else - nmcdhdr.clrText = infoPtr->clrText; + nmcdhdr.clrText = GETTXTCOLOR(infoPtr->clrText); } hOldFont = SelectObject(hdc, TREEVIEW_FontForItem(infoPtr, wineItem)); @@ -2629,7 +2626,7 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem int offset; int left, right; - hNewPen = CreatePen(PS_SOLID, 2, infoPtr->clrInsertMark); + hNewPen = CreatePen(PS_SOLID, 2, GETINSCOLOR(infoPtr->clrInsertMark)); hOldPen = SelectObject(hdc, hNewPen); if (infoPtr->insertBeforeorAfter) @@ -2801,8 +2798,8 @@ static void TREEVIEW_FillBkgnd(const TREEVIEW_INFO *infoPtr, HDC hdc, const RECT *rc) { HBRUSH hBrush; - COLORREF clrBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: - infoPtr->clrBk; + COLORREF clrBk = GETBKCOLOR(infoPtr->clrBk); + hBrush = CreateSolidBrush(clrBk); FillRect(hdc, rc, hBrush); DeleteObject(hBrush); @@ -4998,10 +4995,10 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->scrollX = 0; - infoPtr->clrBk = -1; /* use system color */ - infoPtr->clrText = -1; /* use system color */ - infoPtr->clrLine = RGB(128, 128, 128); - infoPtr->clrInsertMark = comctl32_color.clrBtnText; + infoPtr->clrBk = CLR_NONE; /* use system color */ + infoPtr->clrText = CLR_NONE; /* use system color */ + infoPtr->clrLine = CLR_DEFAULT; + infoPtr->clrInsertMark = CLR_DEFAULT; /* hwndToolTip */

1 0

Huw Davies : riched20: Fix a memory leak.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: d88c47fccb5b40cd5e5e50fb0adf752d272cb5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88c47fccb5b40cd5e5e50fb0… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Dec 13 14:58:43 2009 +0000 riched20: Fix a memory leak. Found by Valgrind. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4bc901e..6790a6a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3283,6 +3283,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, wszText = lParam ? ME_ToUnicode(bUnicode, (void *)lParam) : NULL; len = wszText ? lstrlenW(wszText) : 0; ME_InsertTextFromCursor(editor, 0, wszText, len, style); + ME_EndToUnicode(bUnicode, wszText); } if (bSelection) {

1 0

Francois Gouget : mshtml/tests: Make test_UIActivate() static.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: b8cbde5c19d9f7188857d1f34a9918571c623fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8cbde5c19d9f7188857d1f34… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 12 20:37:46 2009 +0100 mshtml/tests: Make test_UIActivate() static. --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f543dcc..8a36bc1 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4732,7 +4732,7 @@ static void test_editing_mode(BOOL do_load) ok(ref == 0, "ref=%d, expected 0\n", ref); } -void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) +static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) { IUnknown *unk; IOleObject *oleobj;

1 0

Rob Shearman : rpcrt4: Add support for context handles in stubless servers.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: b24aa1c153281d7b25a107b52e8052fdbbca99e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24aa1c153281d7b25a107b52… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 19:47:35 2009 +0000 rpcrt4: Add support for context handles in stubless servers. --- dlls/rpcrt4/ndr_marshall.c | 38 +++++++++++++++++++++++++++++++------- dlls/rpcrt4/ndr_stubless.c | 22 ++++++++++++++++------ 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 4511164..4c9f625 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -39,6 +39,7 @@ #include "ndr_misc.h" #include "rpcndr.h" +#include "ndrtypes.h" #include "wine/unicode.h" #include "wine/rpcfc.h" @@ -113,6 +114,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define NDR_TABLE_SIZE 128 #define NDR_TABLE_MASK 127 +#define NDRSContextFromValue(user_context) (NDR_SCONTEXT)((char *)(user_context) - (char *)NDRSContextValue((NDR_SCONTEXT)NULL)) + static unsigned char *WINAPI NdrBaseTypeMarshall(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); static unsigned char *WINAPI NdrBaseTypeUnmarshall(PMIDL_STUB_MESSAGE, unsigned char **, PFORMAT_STRING, unsigned char); static void WINAPI NdrBaseTypeBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); @@ -6687,10 +6690,19 @@ static unsigned char *WINAPI NdrContextHandleMarshall( } TRACE("flags: 0x%02x\n", pFormat[1]); - if (pFormat[1] & 0x80) - NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); + if (pStubMsg->IsClient) + { + if (pFormat[1] & HANDLE_PARAM_IS_VIA_PTR) + NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); + else + NdrClientContextMarshall(pStubMsg, pMemory, FALSE); + } else - NdrClientContextMarshall(pStubMsg, pMemory, FALSE); + { + NDR_SCONTEXT ctxt = NDRSContextFromValue(pMemory); + NDR_RUNDOWN rundown = pStubMsg->StubDesc->apfnNdrRundownRoutines[pFormat[2]]; + NdrServerContextNewMarshall(pStubMsg, ctxt, rundown, pFormat); + } return NULL; } @@ -6714,10 +6726,22 @@ static unsigned char *WINAPI NdrContextHandleUnmarshall( } TRACE("flags: 0x%02x\n", pFormat[1]); - /* [out]-only or [ret] param */ - if ((pFormat[1] & 0x60) == 0x20) - **(NDR_CCONTEXT **)ppMemory = NULL; - NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + if (pStubMsg->IsClient) + { + /* [out]-only or [ret] param */ + if ((pFormat[1] & (HANDLE_PARAM_IS_IN|HANDLE_PARAM_IS_OUT)) == HANDLE_PARAM_IS_OUT) + **(NDR_CCONTEXT **)ppMemory = NULL; + NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + } + else + { + NDR_SCONTEXT ctxt; + ctxt = NdrServerContextNewUnmarshall(pStubMsg, pFormat); + if (pFormat[1] & HANDLE_PARAM_IS_VIA_PTR) + *(void **)ppMemory = NDRSContextValue(ctxt); + else + *(void **)ppMemory = *NDRSContextValue(ctxt); + } return NULL; } diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index bf6a7be..2028fed 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1128,7 +1128,8 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, !pParam->param_attributes.IsByValue && !pParam->param_attributes.ServerAllocSize) { - pStubMsg->pfnFree(*(void **)pArg); + if (*pTypeFormat != RPC_FC_BIND_CONTEXT) + pStubMsg->pfnFree(*(void **)pArg); } if (pParam->param_attributes.ServerAllocSize) @@ -1140,12 +1141,21 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, !pParam->param_attributes.ServerAllocSize && !pParam->param_attributes.IsByValue) { - DWORD size = calc_arg_size(pStubMsg, pTypeFormat); - - if(size) + if (*pTypeFormat == RPC_FC_BIND_CONTEXT) { - *(void **)pArg = NdrAllocate(pStubMsg, size); - memset(*(void **)pArg, 0, size); + NDR_SCONTEXT ctxt = NdrContextHandleInitialize( + pStubMsg, pTypeFormat); + *(void **)pArg = NDRSContextValue(ctxt); + } + else + { + DWORD size = calc_arg_size(pStubMsg, pTypeFormat); + + if(size) + { + *(void **)pArg = NdrAllocate(pStubMsg, size); + memset(*(void **)pArg, 0, size); + } } } break;

1 0

Rob Shearman : rpcrt4: Fix some memory leaks in the cstub tests.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 15cd36d21d8f8cea09f45b35293e1b02f887c8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=15cd36d21d8f8cea09f45b352… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 19:46:13 2009 +0000 rpcrt4: Fix some memory leaks in the cstub tests. --- dlls/rpcrt4/tests/cstub.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index ca871b7..93a7fe3 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -770,6 +770,8 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf) /* 0xdeadbeef returned from create_stub_test_QI */ ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); ok(cstd_stub->pPSFactory != NULL, "pPSFactory was NULL\n"); + cstd_stub->pvServerObject = NULL; + IRpcStubBuffer_Release(pstub); vtbl = &create_stub_test_fail_vtbl; pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE); @@ -908,6 +910,7 @@ static void test_Disconnect(IPSFactoryBuffer *ppsf) IRpcStubBuffer_Disconnect(pstub); ok(connect_test_orig_release_called == 1, "release called %d\n", connect_test_orig_release_called); ok(cstd_stub->pvServerObject == NULL, "pvServerObject %p\n", cstd_stub->pvServerObject); + IRpcStubBuffer_Release(pstub); }

1 0