May 2009 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/treeview: Use cached colors instead of GetSysColor in TreeView.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: d93aab9c2aac21048653b090fcae8f1ca310edd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93aab9c2aac21048653b090f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 17 23:08:44 2009 +0400 comctl32/treeview: Use cached colors instead of GetSysColor in TreeView. --- dlls/comctl32/treeview.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 4aa5725..d01a127 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2306,7 +2306,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 ? GetSysColor(COLOR_WINDOW): + COLORREF clrBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: infoPtr->clrBk; if (!lar && item->iLevel == 0) @@ -2460,26 +2460,26 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem { if ((wineItem->state & TVIS_DROPHILITED) || inFocus) { - nmcdhdr.clrTextBk = GetSysColor(COLOR_HIGHLIGHT); - nmcdhdr.clrText = GetSysColor(COLOR_HIGHLIGHTTEXT); + nmcdhdr.clrTextBk = comctl32_color.clrHighlight; + nmcdhdr.clrText = comctl32_color.clrHighlightText; } else { - nmcdhdr.clrTextBk = GetSysColor(COLOR_BTNFACE); + nmcdhdr.clrTextBk = comctl32_color.clrBtnFace; if (infoPtr->clrText == -1) - nmcdhdr.clrText = GetSysColor(COLOR_WINDOWTEXT); + nmcdhdr.clrText = comctl32_color.clrWindowText; else nmcdhdr.clrText = infoPtr->clrText; } } else { - nmcdhdr.clrTextBk = infoPtr->clrBk == -1 ? GetSysColor(COLOR_WINDOW): + nmcdhdr.clrTextBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: infoPtr->clrBk; if ((infoPtr->dwStyle & TVS_TRACKSELECT) && (wineItem == infoPtr->hotItem)) nmcdhdr.clrText = comctl32_color.clrHighlight; else if (infoPtr->clrText == -1) - nmcdhdr.clrText = GetSysColor(COLOR_WINDOWTEXT); + nmcdhdr.clrText = comctl32_color.clrWindowText; else nmcdhdr.clrText = infoPtr->clrText; } @@ -2786,7 +2786,7 @@ static LRESULT TREEVIEW_EraseBackground(const TREEVIEW_INFO *infoPtr, HDC hDC) { HBRUSH hBrush; - COLORREF clrBk = infoPtr->clrBk == -1 ? GetSysColor(COLOR_WINDOW): + COLORREF clrBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: infoPtr->clrBk; RECT rect; @@ -4885,7 +4885,7 @@ initialize_checkboxes(TREEVIEW_INFO *infoPtr) SelectObject(hdc, hbmOld); nIndex = ImageList_AddMasked(infoPtr->himlState, hbm, - GetSysColor(COLOR_WINDOW)); + comctl32_color.clrWindow); TRACE("checkbox index %d\n", nIndex); DeleteObject(hbm); @@ -4949,7 +4949,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->clrBk = -1; /* use system color */ infoPtr->clrText = -1; /* use system color */ infoPtr->clrLine = RGB(128, 128, 128); - infoPtr->clrInsertMark = GetSysColor(COLOR_BTNTEXT); + infoPtr->clrInsertMark = comctl32_color.clrBtnText; /* hwndToolTip */ @@ -5705,7 +5705,9 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_STYLECHANGED: return TREEVIEW_StyleChanged(infoPtr, wParam, lParam); - /* WM_SYSCOLORCHANGE */ + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; /* WM_SYSKEYDOWN */

1 0

Nikolay Sivov : comctl32/tests: Don' t use magic numbers for ListView exstyles.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 45b8e6a4f92e9072780ad7202031c0ac9f2ab5f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b8e6a4f92e9072780ad7202… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 17 23:47:38 2009 +0400 comctl32/tests: Don't use magic numbers for ListView exstyles. --- dlls/comctl32/tests/listview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6386655..0c6b139 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -410,7 +410,9 @@ static void test_images(void) 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); - r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, 0x940); + r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, + LVS_EX_UNDERLINEHOT | LVS_EX_FLATSB | LVS_EX_ONECLICKACTIVATE); + ok(r == 0, "should return zero\n"); r = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl);

1 0

Huw Davies : ole32: Implement TYMED_ISTORAGE marshalling.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: c36826705c99f9700b9d6b5e6453656c0f17390f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36826705c99f9700b9d6b5e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 14:50:12 2009 +0100 ole32: Implement TYMED_ISTORAGE marshalling. --- dlls/ole32/usrmarshal.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index f3e87c4..1337a39 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1786,7 +1786,10 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM TRACE("TYMED_ISTORAGE\n"); if (pStgMedium->u.pstg) { - FIXME("not implemented for IStorage %p\n", pStgMedium->u.pstg); + IUnknown *unk; + IStorage_QueryInterface(pStgMedium->u.pstg, &IID_IUnknown, (void**)&unk); + size = WdtpInterfacePointer_UserSize(pFlags, LOWORD(*pFlags), size, unk, &IID_IStorage); + IUnknown_Release(unk); } break; case TYMED_GDI: @@ -1895,7 +1898,10 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p TRACE("TYMED_ISTORAGE\n"); if (pStgMedium->u.pstg) { - FIXME("not implemented for IStorage %p\n", pStgMedium->u.pstg); + IUnknown *unk; + IStorage_QueryInterface(pStgMedium->u.pstg, &IID_IUnknown, (void**)&unk); + pBuffer = WdtpInterfacePointer_UserMarshal(pFlags, LOWORD(*pFlags), pBuffer, unk, &IID_IStorage); + IUnknown_Release(unk); } break; case TYMED_GDI: @@ -2025,7 +2031,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char TRACE("TYMED_ISTORAGE\n"); if (content) { - FIXME("not implemented for IStorage\n"); + pBuffer = WdtpInterfacePointer_UserUnmarshal(pFlags, pBuffer, (IUnknown**)&pStgMedium->u.pstg, &IID_IStorage); } else pStgMedium->u.pstg = NULL;

1 0

Stefan Dösinger : wined3d: Use local constants for bump parameters.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 3372846aa64bdda484d5b5496db40aa1773eb65e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3372846aa64bdda484d5b5496… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 12 20:22:23 2009 +0200 wined3d: Use local constants for bump parameters. This simplifies the loading code a bit. The constants were never designed to be at the same location in all shaders, so there's no point in using program.env. This way we don't collide with the d3d shader constants and its easier to work together with NP2 fixups and other shaders. --- dlls/wined3d/arb_program_shader.c | 192 +++++++++++++------------------------ 1 files changed, 68 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3372846aa64bdda484d5b…

1 0

Huw Davies : msctf/tests: Fix a compiler warning.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: fcf86b618a13ac1550e26df34bef919c2bfc3977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf86b618a13ac1550e26df34… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 12:43:55 2009 +0100 msctf/tests: Fix a compiler warning. --- dlls/msctf/tests/inputprocessor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index a3070fc..3728711 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -823,7 +823,9 @@ static void test_ThreadMgrAdviseSinks(void) if (!source) return; - ThreadMgrEventSink_Constructor(&sink); + hr = ThreadMgrEventSink_Constructor(&sink); + ok(hr == S_OK, "got %08x\n", hr); + if(FAILED(hr)) return; tmSinkRefCount = 1; tmSinkCookie = 0;

1 0

Huw Davies : ole32/tests: Show that it' s the loword of the separate flag parameter that determines the marshalling context .
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: affe9a1e6e17fa16c9098ecc71a673c2765c3be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=affe9a1e6e17fa16c9098ecc7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 12:15:49 2009 +0100 ole32/tests: Show that it's the loword of the separate flag parameter that determines the marshalling context. --- dlls/ole32/tests/usrmarshal.c | 65 +++++++++++++++++++++++++++++------------ 1 files changed, 46 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index b6e37fa..e597b21 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -502,7 +502,7 @@ unsigned char * __RPC_USER WdtpInterfacePointer_UserMarshal(ULONG *, ULONG, unsi unsigned char * __RPC_USER WdtpInterfacePointer_UserUnmarshal(ULONG *, unsigned char *, IUnknown **, REFIID); void __RPC_USER WdtpInterfacePointer_UserFree(IUnknown *); -static void test_marshal_WdtpInterfacePointer(void) +static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) { USER_MARSHAL_CB umcb; MIDL_STUB_MESSAGE stub_msg; @@ -512,52 +512,60 @@ static void test_marshal_WdtpInterfacePointer(void) IUnknown *unk; IUnknown *unk2; unsigned char *wireip; + DWORD expected_size; + + /* The marshalled data depends on the LOWORD of the ctx */ + + expected_size = (LOWORD(ctx) == MSHCTX_INPROC) ? 0x4c : 0xb4; /* shows that the WdtpInterfacePointer functions don't marshal anything for * NULL pointers, so code using these functions must handle that case * itself */ + unk = NULL; - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); - size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, umcb_ctx); + size = WdtpInterfacePointer_UserSize(&umcb.Flags, ctx, 0, unk, &IID_IUnknown); ok(size == 0, "size should be 0 bytes, not %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); - buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown); + buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); wireip = buffer; HeapFree(GetProcessHeap(), 0, buffer); unk = &Test_Unknown; - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); - size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, umcb_ctx); + size = WdtpInterfacePointer_UserSize(&umcb.Flags, ctx, 0, unk, &IID_IUnknown); todo_wine - ok(size >= 0x4c, "size should be >= 0x4c bytes, not %d\n", size); + ok(size >= expected_size, "size should be >= %x bytes, not %x\n", expected_size, size); trace("WdtpInterfacePointer_UserSize returned %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC); - buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); + buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); wireip = buffer; - if (size >= 0x4c) + if(size) { HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, 0); IStream *stm; void *ptr; LARGE_INTEGER pos; - DWORD h_size; + DWORD h_size, marshal_size; - ok(buffer_end == buffer + 0x4c, "buffer_end %p buffer %p\n", buffer_end, buffer); - ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + ok(buffer_end == buffer + expected_size, "buffer_end %p buffer %p (diff %x)\n", buffer_end, buffer, buffer_end - buffer); + + marshal_size = buffer_end - buffer - 2 * sizeof(DWORD); + ok(*(DWORD *)wireip == marshal_size, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 0x44, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == marshal_size, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); - /* The remaining 0x44 bytes are the result of CoMarshalInterface */ + /* The remaining 0x44/0xac bytes are the result of CoMarshalInterface */ CreateStreamOnHGlobal(h, TRUE, &stm); - CoMarshalInterface(stm, &IID_IUnknown, unk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + CoMarshalInterface(stm, &IID_IUnknown, unk, LOWORD(ctx), NULL, MSHLFLAGS_NORMAL); h_size = GlobalSize(h); - ok(h_size == 0x44, "size %x\n", h_size); + ok(h_size == marshal_size, "size %x\n", h_size); ptr = GlobalLock(h); - ok(!memcmp(ptr, wireip, 0x44), "buffer mismatch\n"); + ok(!memcmp(ptr, wireip, h_size), "buffer mismatch\n"); GlobalUnlock(h); pos.QuadPart = 0; IStream_Seek(stm, pos, STREAM_SEEK_SET, NULL); @@ -566,7 +574,7 @@ static void test_marshal_WdtpInterfacePointer(void) } unk2 = NULL; - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); WdtpInterfacePointer_UserUnmarshal(&umcb.Flags, buffer, &unk2, &IID_IUnknown); todo_wine ok(unk2 != NULL, "IUnknown object didn't unmarshal properly\n"); @@ -575,6 +583,25 @@ static void test_marshal_WdtpInterfacePointer(void) WdtpInterfacePointer_UserFree(unk2); } +static void test_marshal_WdtpInterfacePointer(void) +{ + /* + * There are two places where we can pass the marshalling ctx: as + * part of the umcb and as a separate flag. The loword of that + * separate flag field is what matters. + */ + + /* All three are marshalled as inproc */ + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_INPROC); + marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_INPROC); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_INPROC, 0xffff)); + + /* All three are marshalled as remote */ + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE); + marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_DIFFERENTMACHINE); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_DIFFERENTMACHINE, 0xffff)); +} + START_TEST(usrmarshal) { CoInitialize(NULL);

1 0

Huw Davies : ole32: Implement the WdtpInterfacePointer marshal functions.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 5b6312f24cab6dbf2dd0cd67c21f5423ddc5cd32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b6312f24cab6dbf2dd0cd67c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 12:23:37 2009 +0100 ole32: Implement the WdtpInterfacePointer marshal functions. --- dlls/ole32/tests/usrmarshal.c | 63 ++++++++++++-------------- dlls/ole32/usrmarshal.c | 98 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 118 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index e597b21..f1c0e34 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -512,7 +512,11 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) IUnknown *unk; IUnknown *unk2; unsigned char *wireip; - DWORD expected_size; + HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, 0); + IStream *stm; + void *ptr; + LARGE_INTEGER pos; + DWORD h_size, marshal_size, expected_size; /* The marshalled data depends on the LOWORD of the ctx */ @@ -541,42 +545,35 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); wireip = buffer; - if(size) - { - HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, 0); - IStream *stm; - void *ptr; - LARGE_INTEGER pos; - DWORD h_size, marshal_size; - - ok(buffer_end == buffer + expected_size, "buffer_end %p buffer %p (diff %x)\n", buffer_end, buffer, buffer_end - buffer); - - marshal_size = buffer_end - buffer - 2 * sizeof(DWORD); - ok(*(DWORD *)wireip == marshal_size, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == marshal_size, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - - /* The remaining 0x44/0xac bytes are the result of CoMarshalInterface */ - - CreateStreamOnHGlobal(h, TRUE, &stm); - CoMarshalInterface(stm, &IID_IUnknown, unk, LOWORD(ctx), NULL, MSHLFLAGS_NORMAL); - h_size = GlobalSize(h); - ok(h_size == marshal_size, "size %x\n", h_size); - - ptr = GlobalLock(h); - ok(!memcmp(ptr, wireip, h_size), "buffer mismatch\n"); - GlobalUnlock(h); - pos.QuadPart = 0; - IStream_Seek(stm, pos, STREAM_SEEK_SET, NULL); - CoReleaseMarshalData(stm); - IStream_Release(stm); - } + + /* Wine's standard marshalling appears to be a DWORD short */ + todo_wine + ok(buffer_end == buffer + expected_size, "buffer_end %p buffer %p (diff %x)\n", buffer_end, buffer, buffer_end - buffer); + + marshal_size = buffer_end - buffer - 2 * sizeof(DWORD); + ok(*(DWORD *)wireip == marshal_size, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == marshal_size, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + + /* The remaining 0x44/0xac bytes are the result of CoMarshalInterface */ + + CreateStreamOnHGlobal(h, TRUE, &stm); + CoMarshalInterface(stm, &IID_IUnknown, unk, LOWORD(ctx), NULL, MSHLFLAGS_NORMAL); + h_size = GlobalSize(h); + ok(h_size == marshal_size, "size %x\n", h_size); + + ptr = GlobalLock(h); + ok(!memcmp(ptr, wireip, h_size), "buffer mismatch\n"); + GlobalUnlock(h); + pos.QuadPart = 0; + IStream_Seek(stm, pos, STREAM_SEEK_SET, NULL); + CoReleaseMarshalData(stm); + IStream_Release(stm); unk2 = NULL; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); WdtpInterfacePointer_UserUnmarshal(&umcb.Flags, buffer, &unk2, &IID_IUnknown); - todo_wine ok(unk2 != NULL, "IUnknown object didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 57a048e..07a4aed 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1570,10 +1570,19 @@ void __RPC_USER HMETAFILEPICT_UserFree(ULONG *pFlags, HMETAFILEPICT *phMfp) * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which * the first parameter is a ULONG. */ -ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, IUnknown *punk, ULONG StartingSize, REFIID riid) +ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, ULONG StartingSize, IUnknown *punk, REFIID riid) { - FIXME("(%s, 0%x, %p, %d, %s): stub\n", debugstr_user_flags(pFlags), RealFlags, punk, StartingSize, debugstr_guid(riid)); - return 0; + DWORD marshal_size = 0; + HRESULT hr; + + TRACE("(%s, 0%x, %d, %p, %s)\n", debugstr_user_flags(pFlags), RealFlags, StartingSize, punk, debugstr_guid(riid)); + + hr = CoGetMarshalSizeMax(&marshal_size, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL); + if(FAILED(hr)) return StartingSize; + + ALIGN_LENGTH(StartingSize, 3); + StartingSize += 2 * sizeof(DWORD); + return StartingSize + marshal_size; } /****************************************************************************** @@ -1598,8 +1607,40 @@ ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, I */ unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG RealFlags, unsigned char *pBuffer, IUnknown *punk, REFIID riid) { - FIXME("(%s, 0x%x, %p, &%p, %s): stub\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid)); - return NULL; + HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, 0); + IStream *stm; + DWORD size; + void *ptr; + + TRACE("(%s, 0x%x, %p, &%p, %s)\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid)); + + if(!h) return NULL; + if(CreateStreamOnHGlobal(h, TRUE, &stm) != S_OK) + { + GlobalFree(h); + return NULL; + } + + if(CoMarshalInterface(stm, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL) != S_OK) + { + IStream_Release(stm); + return NULL; + } + + ALIGN_POINTER(pBuffer, 3); + size = GlobalSize(h); + + *(DWORD *)pBuffer = size; + pBuffer += sizeof(DWORD); + *(DWORD *)pBuffer = size; + pBuffer += sizeof(DWORD); + + ptr = GlobalLock(h); + memcpy(pBuffer, ptr, size); + GlobalUnlock(h); + + IStream_Release(stm); + return pBuffer + size; } /****************************************************************************** @@ -1623,24 +1664,61 @@ unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG Rea */ unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, IUnknown **ppunk, REFIID riid) { - FIXME("(%s, %p, %p, %s): stub\n", debugstr_user_flags(pFlags), pBuffer, ppunk, debugstr_guid(riid)); - return NULL; + HRESULT hr; + HGLOBAL h; + IStream *stm; + DWORD size; + void *ptr; + + TRACE("(%s, %p, %p, %s)\n", debugstr_user_flags(pFlags), pBuffer, ppunk, debugstr_guid(riid)); + + ALIGN_POINTER(pBuffer, 3); + + size = *(DWORD *)pBuffer; + pBuffer += sizeof(DWORD); + if(size != *(DWORD *)pBuffer) + RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); + + pBuffer += sizeof(DWORD); + + /* FIXME: sanity check on size */ + + h = GlobalAlloc(GMEM_MOVEABLE, size); + if(!h) RaiseException(RPC_X_NO_MEMORY, 0, 0, NULL); + + if(CreateStreamOnHGlobal(h, TRUE, &stm) != S_OK) + { + GlobalFree(h); + RaiseException(RPC_X_NO_MEMORY, 0, 0, NULL); + } + + ptr = GlobalLock(h); + memcpy(ptr, pBuffer, size); + GlobalUnlock(h); + + hr = CoUnmarshalInterface(stm, riid, (void**)ppunk); + IStream_Release(stm); + + if(hr != S_OK) RaiseException(hr, 0, 0, NULL); + + return pBuffer + size; } /****************************************************************************** * WdtpInterfacePointer_UserFree [OLE32.@] * - * Frees an unmarshaled interface pointer. + * Releases an unmarshaled interface pointer. * * PARAMS - * punk [I] Interface pointer to free. + * punk [I] Interface pointer to release. * * RETURNS * Nothing. */ void WINAPI WdtpInterfacePointer_UserFree(IUnknown *punk) { - FIXME("(%p): stub\n", punk); + TRACE("(%p)\n", punk); + if(punk) IUnknown_Release(punk); } /******************************************************************************

1 0

Huw Davies : ole32/tests: Add tests for STGMEDIUM marshalling with a non-NULL pUnkForRelease.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 4581af5863daad7ed9213196e59fee15d2d10e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4581af5863daad7ed9213196e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 12:30:16 2009 +0100 ole32/tests: Add tests for STGMEDIUM marshalling with a non-NULL pUnkForRelease. --- dlls/ole32/tests/usrmarshal.c | 53 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index f1c0e34..e9592ed 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -599,6 +599,58 @@ static void test_marshal_WdtpInterfacePointer(void) marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_DIFFERENTMACHINE, 0xffff)); } +static void test_marshal_STGMEDIUM(void) +{ + USER_MARSHAL_CB umcb; + MIDL_STUB_MESSAGE stub_msg; + RPC_MESSAGE rpc_msg; + unsigned char *buffer, *buffer_end, *unk_buffer, *unk_buffer_end; + ULONG size, unk_size; + STGMEDIUM med, med2; + IUnknown *unk = &Test_Unknown; + + /* TYMED_NULL with pUnkForRelease */ + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + unk_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); + unk_buffer = HeapAlloc(GetProcessHeap(), 0, unk_size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, unk_buffer, unk_size, MSHCTX_DIFFERENTMACHINE); + unk_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, unk_buffer, unk, &IID_IUnknown); + + med.tymed = TYMED_NULL; + U(med).pstg = NULL; + med.pUnkForRelease = unk; + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + size = STGMEDIUM_UserSize(&umcb.Flags, 0, &med); + todo_wine ok(size == unk_size + 2 * sizeof(DWORD), "size %d should be %d bytes\n", size, unk_size + 8); + + buffer = HeapAlloc(GetProcessHeap(), 0, size * 2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); + buffer_end = STGMEDIUM_UserMarshal(&umcb.Flags, buffer, &med); + todo_wine ok(buffer_end - buffer - 2 * sizeof(DWORD) == unk_buffer_end - unk_buffer, "buffer size mismatch\n"); + ok(*(DWORD*)buffer == TYMED_NULL, "got %08x\n", *(DWORD*)buffer); + ok(*((DWORD*)buffer+1) != 0, "got %08x\n", *((DWORD*)buffer+1)); + todo_wine ok(!memcmp(buffer+8, unk_buffer, unk_buffer_end - unk_buffer), "buffer mismatch\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); + + /* native crashes if this is uninitialised, presumably because it + tries to release it */ + med2.pUnkForRelease = NULL; + + STGMEDIUM_UserUnmarshal(&umcb.Flags, buffer, &med2); + + ok(med2.tymed == TYMED_NULL, "got tymed %x\n", med2.tymed); + todo_wine ok(med2.pUnkForRelease != NULL, "Incorrectly unmarshalled\n"); + + HeapFree(GetProcessHeap(), 0, buffer); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + STGMEDIUM_UserFree(&umcb.Flags, &med2); + + HeapFree(GetProcessHeap(), 0, unk_buffer); +} + START_TEST(usrmarshal) { CoInitialize(NULL); @@ -610,6 +662,7 @@ START_TEST(usrmarshal) test_marshal_HMETAFILE(); test_marshal_HMETAFILEPICT(); test_marshal_WdtpInterfacePointer(); + test_marshal_STGMEDIUM(); CoUninitialize(); }

1 0

Huw Davies : ole32: Add support for marshalling pUnkForRelease.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: cc68fc44671959d8be5fc6fd77e5da52d590566a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc68fc44671959d8be5fc6fd7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 12:33:18 2009 +0100 ole32: Add support for marshalling pUnkForRelease. --- dlls/ole32/tests/usrmarshal.c | 8 ++++---- dlls/ole32/usrmarshal.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index e9592ed..0f998d0 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -623,15 +623,15 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = STGMEDIUM_UserSize(&umcb.Flags, 0, &med); - todo_wine ok(size == unk_size + 2 * sizeof(DWORD), "size %d should be %d bytes\n", size, unk_size + 8); + ok(size == unk_size + 2 * sizeof(DWORD), "size %d should be %d bytes\n", size, unk_size + 8); buffer = HeapAlloc(GetProcessHeap(), 0, size * 2); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); buffer_end = STGMEDIUM_UserMarshal(&umcb.Flags, buffer, &med); - todo_wine ok(buffer_end - buffer - 2 * sizeof(DWORD) == unk_buffer_end - unk_buffer, "buffer size mismatch\n"); + ok(buffer_end - buffer - 2 * sizeof(DWORD) == unk_buffer_end - unk_buffer, "buffer size mismatch\n"); ok(*(DWORD*)buffer == TYMED_NULL, "got %08x\n", *(DWORD*)buffer); ok(*((DWORD*)buffer+1) != 0, "got %08x\n", *((DWORD*)buffer+1)); - todo_wine ok(!memcmp(buffer+8, unk_buffer, unk_buffer_end - unk_buffer), "buffer mismatch\n"); + ok(!memcmp(buffer+8, unk_buffer, unk_buffer_end - unk_buffer), "buffer mismatch\n"); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); @@ -642,7 +642,7 @@ static void test_marshal_STGMEDIUM(void) STGMEDIUM_UserUnmarshal(&umcb.Flags, buffer, &med2); ok(med2.tymed == TYMED_NULL, "got tymed %x\n", med2.tymed); - todo_wine ok(med2.pUnkForRelease != NULL, "Incorrectly unmarshalled\n"); + ok(med2.pUnkForRelease != NULL, "Incorrectly unmarshalled\n"); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 07a4aed..e2fb870 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1808,7 +1808,7 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM } if (pStgMedium->pUnkForRelease) - FIXME("buffer size pUnkForRelease\n"); + size = WdtpInterfacePointer_UserSize(pFlags, LOWORD(*pFlags), size, pStgMedium->pUnkForRelease, &IID_IUnknown); return size; } @@ -1914,7 +1914,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p } if (pStgMedium->pUnkForRelease) - FIXME("marshal pUnkForRelease\n"); + pBuffer = WdtpInterfacePointer_UserMarshal(pFlags, LOWORD(*pFlags), pBuffer, pStgMedium->pUnkForRelease, &IID_IUnknown); return pBuffer; } @@ -2053,7 +2053,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char pStgMedium->pUnkForRelease = NULL; if (releaseunk) - FIXME("unmarshal pUnkForRelease\n"); + pBuffer = WdtpInterfacePointer_UserUnmarshal(pFlags, pBuffer, &pStgMedium->pUnkForRelease, &IID_IUnknown); return pBuffer; }

1 0

Huw Davies : ole32/tests: Add tests for TYMED_ISTREAM marshalling.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 10919f7fb903e1bc5e51e050420b2af8a28562cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=10919f7fb903e1bc5e51e0504… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 14:25:40 2009 +0100 ole32/tests: Add tests for TYMED_ISTREAM marshalling. --- dlls/ole32/tests/usrmarshal.c | 100 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 95 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 0f998d0..73cac9b 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -495,7 +495,43 @@ static const IUnknownVtbl TestUnknown_Vtbl = Test_IUnknown_Release, }; +static HRESULT WINAPI Test_IStream_QueryInterface(IStream *iface, + REFIID riid, LPVOID *ppvObj) +{ + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IStream)) + { + *ppvObj = iface; + IStream_AddRef(iface); + return S_OK; + } + + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Test_IStream_AddRef(IStream *iface) +{ + return 2; /* non-heap-based object */ +} + +static ULONG WINAPI Test_IStream_Release(IStream *iface) +{ + return 1; /* non-heap-based object */ +} + +static const IStreamVtbl TestStream_Vtbl = +{ + Test_IStream_QueryInterface, + Test_IStream_AddRef, + Test_IStream_Release + /* the rest can be NULLs */ +}; + static IUnknown Test_Unknown = { &TestUnknown_Vtbl }; +static IStream Test_Stream = { &TestStream_Vtbl }; ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *, ULONG, ULONG, IUnknown *, REFIID); unsigned char * __RPC_USER WdtpInterfacePointer_UserMarshal(ULONG *, ULONG, unsigned char *, IUnknown *, REFIID); @@ -604,12 +640,11 @@ static void test_marshal_STGMEDIUM(void) USER_MARSHAL_CB umcb; MIDL_STUB_MESSAGE stub_msg; RPC_MESSAGE rpc_msg; - unsigned char *buffer, *buffer_end, *unk_buffer, *unk_buffer_end; - ULONG size, unk_size; + unsigned char *buffer, *buffer_end, *unk_buffer, *unk_buffer_end, *stm_buffer, *stm_buffer_end; + ULONG size, unk_size, stm_size; STGMEDIUM med, med2; IUnknown *unk = &Test_Unknown; - - /* TYMED_NULL with pUnkForRelease */ + IStream *stm = &Test_Stream; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); unk_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); @@ -617,6 +652,14 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, unk_buffer, unk_size, MSHCTX_DIFFERENTMACHINE); unk_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, unk_buffer, unk, &IID_IUnknown); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + stm_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, (IUnknown*)stm, &IID_IStream); + stm_buffer = HeapAlloc(GetProcessHeap(), 0, stm_size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, stm_buffer, stm_size, MSHCTX_DIFFERENTMACHINE); + stm_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, stm_buffer, (IUnknown*)stm, &IID_IStream); + + /* TYMED_NULL with pUnkForRelease */ + med.tymed = TYMED_NULL; U(med).pstg = NULL; med.pUnkForRelease = unk; @@ -625,7 +668,7 @@ static void test_marshal_STGMEDIUM(void) size = STGMEDIUM_UserSize(&umcb.Flags, 0, &med); ok(size == unk_size + 2 * sizeof(DWORD), "size %d should be %d bytes\n", size, unk_size + 8); - buffer = HeapAlloc(GetProcessHeap(), 0, size * 2); + buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); buffer_end = STGMEDIUM_UserMarshal(&umcb.Flags, buffer, &med); ok(buffer_end - buffer - 2 * sizeof(DWORD) == unk_buffer_end - unk_buffer, "buffer size mismatch\n"); @@ -637,6 +680,8 @@ static void test_marshal_STGMEDIUM(void) /* native crashes if this is uninitialised, presumably because it tries to release it */ + med2.tymed = TYMED_NULL; + U(med2).pstm = NULL; med2.pUnkForRelease = NULL; STGMEDIUM_UserUnmarshal(&umcb.Flags, buffer, &med2); @@ -648,6 +693,51 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); STGMEDIUM_UserFree(&umcb.Flags, &med2); + /* TYMED_ISTREAM with pUnkForRelease */ + + med.tymed = TYMED_ISTREAM; + U(med).pstm = stm; + med.pUnkForRelease = unk; + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + size = STGMEDIUM_UserSize(&umcb.Flags, 0, &med); + todo_wine + ok(size == stm_size + unk_size + 3 * sizeof(DWORD), "size %d should be %d bytes\n", size, stm_size + unk_size + 3 * sizeof(DWORD)); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); + buffer_end = STGMEDIUM_UserMarshal(&umcb.Flags, buffer, &med); + todo_wine + ok(buffer_end - buffer - 3 * sizeof(DWORD) == (unk_buffer_end - unk_buffer) + (stm_buffer_end - stm_buffer), "buffer size mismatch\n"); + ok(*(DWORD*)buffer == TYMED_ISTREAM, "got %08x\n", *(DWORD*)buffer); + ok(*((DWORD*)buffer+1) != 0, "got %08x\n", *((DWORD*)buffer+1)); + ok(*((DWORD*)buffer+2) != 0, "got %08x\n", *((DWORD*)buffer+2)); + todo_wine + ok(!memcmp(buffer + 12, stm_buffer, stm_buffer_end - stm_buffer), "buffer mismatch\n"); + todo_wine + ok(!memcmp(buffer + 12 + (stm_buffer_end - stm_buffer), unk_buffer, unk_buffer_end - unk_buffer), "buffer mismatch\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); + + /* native crashes if this is uninitialised, presumably because it + tries to release it */ + med2.tymed = TYMED_NULL; + U(med2).pstm = NULL; + med2.pUnkForRelease = NULL; + + STGMEDIUM_UserUnmarshal(&umcb.Flags, buffer, &med2); + + ok(med2.tymed == TYMED_ISTREAM, "got tymed %x\n", med2.tymed); + todo_wine + ok(U(med2).pstm != NULL, "Incorrectly unmarshalled\n"); + ok(med2.pUnkForRelease != NULL, "Incorrectly unmarshalled\n"); + + HeapFree(GetProcessHeap(), 0, buffer); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + STGMEDIUM_UserFree(&umcb.Flags, &med2); + + + HeapFree(GetProcessHeap(), 0, stm_buffer); HeapFree(GetProcessHeap(), 0, unk_buffer); }

1 0