wine-commits May 2006

wine-commits@winehq.org

3 participants
863 discussions

Alexandre Julliard : user: Use winproc callbacks for the remaining 16-bit messaging functions.
by Alexandre Julliard 23 May '06

23 May '06

Module: wine Branch: refs/heads/master Commit: 22a9d18bff755d283e96ee70d0a1944322df1db8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22a9d18bff755d283e96ee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 23 20:15:17 2006 +0200 user: Use winproc callbacks for the remaining 16-bit messaging functions. --- dlls/user/msg16.c | 100 ++++++++++++++++++++++++++------------------------- dlls/user/winproc.c | 9 ++--- dlls/user/winproc.h | 7 ---- 3 files changed, 54 insertions(+), 62 deletions(-) diff --git a/dlls/user/msg16.c b/dlls/user/msg16.c index 89d15ca..3193a60 100644 --- a/dlls/user/msg16.c +++ b/dlls/user/msg16.c @@ -50,6 +50,34 @@ static LRESULT send_message_callback( HW return *result; } +static LRESULT post_message_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + *result = 0; + return PostMessageA( hwnd, msg, wp, lp ); +} + +static LRESULT post_thread_message_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + DWORD_PTR tid = (DWORD_PTR)arg; + *result = 0; + return PostThreadMessageA( tid, msg, wp, lp ); +} + +static LRESULT get_message_callback( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + MSG16 *msg16 = arg; + + msg16->hwnd = hwnd; + msg16->message = msg; + msg16->wParam = wp; + msg16->lParam = lp; + *result = 0; + return 0; +} + /*********************************************************************** * SendMessage (USER.111) @@ -85,22 +113,10 @@ LRESULT WINAPI SendMessage16( HWND16 hwn /*********************************************************************** * PostMessage (USER.110) */ -BOOL16 WINAPI PostMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM lparam ) +BOOL16 WINAPI PostMessage16( HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam ) { - WPARAM wparam32; - UINT msg32; - HWND hwnd = WIN_Handle32( hwnd16 ); - - switch (WINPROC_MapMsg16To32A( hwnd, msg, wparam, &msg32, &wparam32, &lparam )) - { - case 0: - return PostMessageA( hwnd, msg32, wparam32, lparam ); - case 1: - ERR( "16-bit message 0x%04x contains pointer, cannot post\n", msg ); - return FALSE; - default: - return FALSE; - } + LRESULT unused; + return WINPROC_CallProc16To32A( post_message_callback, hwnd, msg, wparam, lparam, &unused, NULL ); } @@ -109,21 +125,12 @@ BOOL16 WINAPI PostMessage16( HWND16 hwnd */ BOOL16 WINAPI PostAppMessage16( HTASK16 hTask, UINT16 msg, WPARAM16 wparam, LPARAM lparam ) { - WPARAM wparam32; - UINT msg32; - DWORD tid = HTASK_32( hTask ); - if (!tid) return FALSE; + LRESULT unused; + DWORD_PTR tid = HTASK_32( hTask ); - switch (WINPROC_MapMsg16To32A( 0, msg, wparam, &msg32, &wparam32, &lparam )) - { - case 0: - return PostThreadMessageA( tid, msg32, wparam32, lparam ); - case 1: - ERR( "16-bit message %x contains pointer, cannot post\n", msg ); - return FALSE; - default: - return FALSE; - } + if (!tid) return FALSE; + return WINPROC_CallProc16To32A( post_thread_message_callback, 0, msg, wparam, lparam, + &unused, (void *)tid ); } @@ -153,22 +160,20 @@ BOOL16 WINAPI PeekMessage32_16( MSG32_16 BOOL16 wHaveParamHigh ) { MSG msg; + LRESULT unused; HWND hwnd = WIN_Handle32( hwnd16 ); if(USER16_AlertableWait) MsgWaitForMultipleObjectsEx( 0, NULL, 1, 0, MWMO_ALERTABLE ); if (!PeekMessageA( &msg, hwnd, first, last, flags )) return FALSE; - msg16->msg.hwnd = HWND_16( msg.hwnd ); - msg16->msg.lParam = msg.lParam; msg16->msg.time = msg.time; msg16->msg.pt.x = (INT16)msg.pt.x; msg16->msg.pt.y = (INT16)msg.pt.y; if (wHaveParamHigh) msg16->wParamHigh = HIWORD(msg.wParam); - - return (WINPROC_MapMsg32ATo16( msg.hwnd, msg.message, msg.wParam, - &msg16->msg.message, &msg16->msg.wParam, - &msg16->msg.lParam ) != -1); + WINPROC_CallProc32ATo16( get_message_callback, msg.hwnd, msg.message, msg.wParam, msg.lParam, + &unused, &msg16->msg ); + return TRUE; } @@ -282,23 +287,18 @@ BOOL16 WINAPI GetMessage32_16( MSG32_16 UINT16 last, BOOL16 wHaveParamHigh ) { MSG msg; + LRESULT unused; HWND hwnd = WIN_Handle32( hwnd16 ); - do - { - if(USER16_AlertableWait) - MsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, 0, MWMO_ALERTABLE ); - GetMessageA( &msg, hwnd, first, last ); - msg16->msg.hwnd = HWND_16( msg.hwnd ); - msg16->msg.lParam = msg.lParam; - msg16->msg.time = msg.time; - msg16->msg.pt.x = (INT16)msg.pt.x; - msg16->msg.pt.y = (INT16)msg.pt.y; - if (wHaveParamHigh) msg16->wParamHigh = HIWORD(msg.wParam); - } - while (WINPROC_MapMsg32ATo16( msg.hwnd, msg.message, msg.wParam, - &msg16->msg.message, &msg16->msg.wParam, - &msg16->msg.lParam ) == -1); + if(USER16_AlertableWait) + MsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, 0, MWMO_ALERTABLE ); + GetMessageA( &msg, hwnd, first, last ); + msg16->msg.time = msg.time; + msg16->msg.pt.x = (INT16)msg.pt.x; + msg16->msg.pt.y = (INT16)msg.pt.y; + if (wHaveParamHigh) msg16->wParamHigh = HIWORD(msg.wParam); + WINPROC_CallProc32ATo16( get_message_callback, msg.hwnd, msg.message, msg.wParam, msg.lParam, + &unused, &msg16->msg ); TRACE( "message %04x, hwnd %p, filter(%04x - %04x)\n", msg16->msg.message, hwnd, first, last ); diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index d92fde0..382c0bd 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -728,8 +728,8 @@ static UINT convert_handle_16_to_32(HAND * Map a message from 16- to 32-bit Ansi. * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. */ -INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, - WPARAM *pwparam32, LPARAM *plparam ) +static INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, + WPARAM *pwparam32, LPARAM *plparam ) { *pmsg32 = (UINT)msg16; *pwparam32 = (WPARAM)wParam16; @@ -1372,9 +1372,8 @@ static HANDLE16 convert_handle_32_to_16( * Map a message from 32-bit Ansi to 16-bit. * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. */ -INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32, - UINT16 *pmsg16, WPARAM16 *pwparam16, - LPARAM *plparam ) +static INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32, + UINT16 *pmsg16, WPARAM16 *pwparam16, LPARAM *plparam ) { *pmsg16 = (UINT16)msg32; *pwparam16 = (WPARAM16)LOWORD(wParam32); diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h index 3eefca6..4821140 100644 --- a/dlls/user/winproc.h +++ b/dlls/user/winproc.h @@ -45,13 +45,6 @@ extern LRESULT WINPROC_CallProc16To32A( extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); -extern INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, - UINT *pmsg32, WPARAM *pwparam32, - LPARAM *plparam ); -extern INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, - WPARAM wParam32, UINT16 *pmsg16, - WPARAM16 *pwparam16, LPARAM *plparam ); - extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ); extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );

1 0

Mikołaj Zalewski : comctl32: header: Don' t try to draw items outside the clipping rect.
by Alexandre Julliard 23 May '06

23 May '06

Module: wine Branch: refs/heads/master Commit: b8da6f27515140810f3c84bd971a365c581be228 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b8da6f27515140810f3c84b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon May 22 22:53:08 2006 +0200 comctl32: header: Don't try to draw items outside the clipping rect. --- dlls/comctl32/header.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 6696e25..81a8b92 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -466,8 +466,10 @@ HEADER_Refresh (HWND hwnd, HDC hdc) x = rect.left; for (i = 0; x <= rect.right && i < infoPtr->uNumItem; i++) { - x = HEADER_DrawItem (hwnd, hdc, HEADER_OrderToIndex(hwnd,i), - infoPtr->iHotItem == i); + int idx = HEADER_OrderToIndex(hwnd,i); + if (RectVisible(hdc, &infoPtr->items[idx].rect)) + HEADER_DrawItem (hwnd, hdc, idx, infoPtr->iHotItem == i); + x = infoPtr->items[idx].rect.right; } if ((x <= rect.right) && (infoPtr->uNumItem > 0)) {

1 0

Mikołaj Zalewski : comctl32: header: Make the column resizing smooth in full drag mode.
by Alexandre Julliard 23 May '06

23 May '06

Module: wine Branch: refs/heads/master Commit: 64e5779c16aa364f1bc293874c00b81b11daf1dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64e5779c16aa364f1bc2938… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon May 22 22:47:37 2006 +0200 comctl32: header: Make the column resizing smooth in full drag mode. Make the column resizing smooth in full drag mode even for listview with lots of elements by redrawing only the resized column and calling UpdateWindow. --- dlls/comctl32/header.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 38d752e..6696e25 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1657,14 +1657,25 @@ HEADER_MouseMove (HWND hwnd, WPARAM wPar if (dwStyle & HDS_FULLDRAG) { if (!HEADER_SendHeaderNotifyT (hwnd, HDN_ITEMCHANGINGW, infoPtr->iMoveItem, HDI_WIDTH, NULL)) { - nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset; - if (nWidth < 0) - nWidth = 0; - infoPtr->items[infoPtr->iMoveItem].cxy = nWidth; - HEADER_SendHeaderNotifyT(hwnd, HDN_ITEMCHANGEDW, infoPtr->iMoveItem, HDI_WIDTH, NULL); + HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; + INT nOldWidth = lpItem->rect.right - lpItem->rect.left; + RECT rcClient; + RECT rcScroll; + + nWidth = pt.x - lpItem->rect.left + infoPtr->xTrackOffset; + if (nWidth < 0) nWidth = 0; + infoPtr->items[infoPtr->iMoveItem].cxy = nWidth; + HEADER_SetItemBounds(hwnd); + + GetClientRect(hwnd, &rcClient); + rcScroll = rcClient; + rcScroll.left = lpItem->rect.left + nOldWidth; + ScrollWindowEx(hwnd, nWidth - nOldWidth, 0, &rcScroll, &rcClient, NULL, NULL, 0); + InvalidateRect(hwnd, &lpItem->rect, FALSE); + UpdateWindow(hwnd); + + HEADER_SendHeaderNotifyT(hwnd, HDN_ITEMCHANGEDW, infoPtr->iMoveItem, HDI_WIDTH, NULL); } - HEADER_SetItemBounds (hwnd); - InvalidateRect(hwnd, NULL, FALSE); } else { hdc = GetDC (hwnd);

1 0

Juan Lang : crypt32: Abstract contexts.
by Alexandre Julliard 23 May '06

23 May '06

Module: wine Branch: refs/heads/master Commit: e48a0a3c238981da3fe680c38948bd3b0ce8fac3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e48a0a3c238981da3fe680c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon May 22 13:59:52 2006 -0700 crypt32: Abstract contexts. - create an abstract interface for contexts, and use it for certificates - create a simple context list, and use it for memory stores --- dlls/crypt32/Makefile.in | 1 dlls/crypt32/context.c | 298 ++++++++++++++++++ dlls/crypt32/crypt32_private.h | 64 ++++ dlls/crypt32/store.c | 677 +++++++++++++++------------------------- 4 files changed, 619 insertions(+), 421 deletions(-) create mode 100644 dlls/crypt32/context.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e48a0a3c238981da3fe…

1 0

Jeff Latimer : usp10: Add stub for ScriptStringOut.
by Alexandre Julliard 23 May '06

23 May '06

Module: wine Branch: refs/heads/master Commit: 42b576e8693790f10b7d6f47884a8a2ba3f7c0da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42b576e8693790f10b7d6f4… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue May 23 22:15:15 2006 +1000 usp10: Add stub for ScriptStringOut. --- dlls/usp10/tests/usp10.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 22 ++++++++++++++++++++++ dlls/usp10/usp10.spec | 2 +- 3 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d38e625..48ded43 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -447,6 +447,41 @@ void test_ScriptTextOut(void) DestroyWindow(hwnd); } +static void test_ScriptString(void) +{ + HRESULT hr; + HDC hdc = 0; + WCHAR teststr[6] = {'T', 'e', 's', 't', '1', '\0'}; + void *pString = (WCHAR *) &teststr; + int cString = 5; + int cGlyphs = cString * 2 + 16; + int iCharset = -1; + DWORD dwFlags = SSA_GLYPHS; + int iReqWidth = 100; + SCRIPT_CONTROL psControl; + SCRIPT_STATE psState; + const int piDx[5] = {10, 10, 10, 10, 10}; + SCRIPT_TABDEF pTabdef; + const BYTE pbInClass = 0; + SCRIPT_STRING_ANALYSIS pssa; + + int iX = 10; + int iY = 100; + UINT uOptions = 0; + const RECT prc = {0, 50, 100, 100}; + int iMinSel = 0; + int iMaxSel = 0; + BOOL fDisabled = FALSE; + hr = ScriptStringAnalyse( hdc, pString, cString, cGlyphs, iCharset, dwFlags, + iReqWidth, &psControl, &psState, piDx, &pTabdef, + pbInClass, &pssa); + ok(hr == E_INVALIDARG, "ScriptStringAnalyse Stub should return E_INVALIDARG not %08x\n", (unsigned int) hr); + hr = ScriptStringOut(pssa, iX, iY, uOptions, &prc, iMinSel, iMaxSel,fDisabled); + ok(hr == E_NOTIMPL, "ScriptStringOut Stub should return E_NOTIMPL not %08x\n", (unsigned int) hr); + hr = ScriptStringFree(&pssa); + ok(hr == S_OK, "ScriptStringFree Stub should return S_OK not %08x\n", (unsigned int) hr); +} + START_TEST(usp10) { unsigned short pwOutGlyphs[256]; @@ -455,4 +490,5 @@ START_TEST(usp10) test_ScriptGetCMap(pwOutGlyphs); test_ScriptGetFontProperties(); test_ScriptTextOut(); + test_ScriptString(); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8fd1ac7..f24a7f0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -295,6 +295,28 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h } /*********************************************************************** + * ScriptStringOut (USP10.@) + * + */ +HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, + int iX, + int iY, + UINT uOptions, + const RECT *prc, + int iMinSel, + int iMaxSel, + BOOL fDisabled) +{ + FIXME("(%p,%d,%d,0x%1x,%p,%d,%d,%d): stub\n", + ssa, iX, iY, uOptions, prc, iMinSel, iMaxSel, fDisabled); + if (!ssa) { + return E_INVALIDARG; + } + + return E_NOTIMPL; +} + +/*********************************************************************** * ScriptStringFree (USP10.@) * */ diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index ea7a50d..518a04e 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -22,7 +22,7 @@ @ stdcall ScriptStringFree(ptr) @ stub ScriptStringGetLogicalWidths @ stub ScriptStringGetOrder -@ stub ScriptStringOut +@ stdcall ScriptStringOut(ptr long long long ptr long long long) @ stub ScriptStringValidate @ stub ScriptStringXtoCP @ stub ScriptString_pLogAttr

1 0

Stefan Dösinger : wined3d: Do not addref a NULL backbuffer in IWineD3DSwapChain::GetBackBuffer.
by Alexandre Julliard 23 May '06

23 May '06

Module: wine Branch: refs/heads/master Commit: a55da88d0bac8054eba781018cd017a801419bb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a55da88d0bac8054eba7810… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 23 15:30:15 2006 +0200 wined3d: Do not addref a NULL backbuffer in IWineD3DSwapChain::GetBackBuffer. --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 5d9a0b3..64a567b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -382,7 +382,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Get } /* Note inc ref on returned surface */ - IWineD3DSurface_AddRef(*ppBackBuffer); + if(*ppBackBuffer) IWineD3DSurface_AddRef(*ppBackBuffer); return WINED3D_OK; }

1 0

Huw Davies : rpcrt4: Uncomment test now that it works correctly.
by Alexandre Julliard 23 May '06

23 May '06

Module: wine Branch: refs/heads/master Commit: 00598e49cfc1bdaf7ad0009b36de8a54bd5a70f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00598e49cfc1bdaf7ad0009… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 12:24:55 2006 +0100 rpcrt4: Uncomment test now that it works correctly. --- dlls/rpcrt4/tests/ndr_marshall.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index f468327..3899867 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -496,13 +496,6 @@ #endif Passing a NULL ptr while we're a client && !must_alloc crashes on Windows, so we won't do that. */ -#if 0 /* This unmarshal doesn't work correctly under Wine with a - pstruct (and worse trashes the buffer, so further tests - fail). When reusing the buffer the ptrs get overwritten with - newly alloc'ed ptrs. In Wine at the moment these get zero'ed - before the call to PointerUnmarshall in - EmbeddedPointerUnmarshall, this zeros the buffer ptrs, so - PointerUnmarshall thinks they're null-ptrs. */ mem = NULL; StubMsg.IsClient = 0; StubMsg.Buffer = StubMsg.BufferStart; @@ -513,7 +506,7 @@ #if 0 /* This unmarshal doesn't work cor ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); -#endif + /*** now must_alloc is true ***/ /* with must_alloc set we always allocate new memory whether or not we're

1 0

Huw Davies : rpcrt4: Add another static.
by Alexandre Julliard 23 May '06

23 May '06

Module: wine Branch: refs/heads/master Commit: 69d18c48b1fa83e38355affa61fb6d738aa2cebf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69d18c48b1fa83e38355aff… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 12:06:23 2006 +0100 rpcrt4: Add another static. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 075b84e..113f0bf 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -320,7 +320,7 @@ static inline BOOL IsConformanceOrVarian return (*(const ULONG *)pFormat != -1); } -PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) +static PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) { ALIGN_POINTER(pStubMsg->Buffer, 4); pStubMsg->MaxCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer);

1 0

Huw Davies : rpcrt4: Fix some comments and move the NdrSimpleType* functions out from amongst the NdrSimpleStruct* ones .
by Alexandre Julliard 23 May '06

23 May '06

Module: wine Branch: refs/heads/master Commit: 9ba57efc18e335d8c6b986ef76134ce8cbc5b18e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9ba57efc18e335d8c6b986e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 11:54:17 2006 +0100 rpcrt4: Fix some comments and move the NdrSimpleType* functions out from amongst the NdrSimpleStruct* ones. --- dlls/rpcrt4/ndr_marshall.c | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index ba8f053..075b84e 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1403,6 +1403,24 @@ void WINAPI NdrPointerFree(PMIDL_STUB_ME } /*********************************************************************** + * NdrSimpleTypeMarshall [RPCRT4.@] + */ +void WINAPI NdrSimpleTypeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, + unsigned char FormatChar ) +{ + FIXME("stub\n"); +} + +/*********************************************************************** + * NdrSimpleTypeUnmarshall [RPCRT4.@] + */ +void WINAPI NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, + unsigned char FormatChar ) +{ + FIXME("stub\n"); +} + +/*********************************************************************** * NdrSimpleStructMarshall [RPCRT4.@] */ unsigned char * WINAPI NdrSimpleStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, @@ -1460,27 +1478,6 @@ unsigned char * WINAPI NdrSimpleStructUn return NULL; } - -/*********************************************************************** - * NdrSimpleStructUnmarshall [RPCRT4.@] - */ -void WINAPI NdrSimpleTypeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, - unsigned char FormatChar ) -{ - FIXME("stub\n"); -} - - -/*********************************************************************** - * NdrSimpleStructUnmarshall [RPCRT4.@] - */ -void WINAPI NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, - unsigned char FormatChar ) -{ - FIXME("stub\n"); -} - - /*********************************************************************** * NdrSimpleStructBufferSize [RPCRT4.@] */

1 0

Alexandre Julliard : winspool: Renamed the directory to winspool.drv.
by Alexandre Julliard 23 May '06

23 May '06

Module: wine Branch: refs/heads/master Commit: 3098199e0bde6ee0040e1db77f41fea8ab9812b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3098199e0bde6ee0040e1db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 23 17:10:52 2006 +0200 winspool: Renamed the directory to winspool.drv. --- configure | 6 configure.ac | 4 dlls/.gitignore | 1 dlls/Makefile.in | 21 dlls/winspool.drv/.gitignore | 3 dlls/winspool.drv/Bg.rc | 39 dlls/winspool.drv/De.rc | 39 dlls/winspool.drv/En.rc | 39 dlls/winspool.drv/Eo.rc | 39 dlls/winspool.drv/Fi.rc | 39 dlls/winspool.drv/It.rc | 39 dlls/winspool.drv/Ko.rc | 39 dlls/winspool.drv/Makefile.in | 27 dlls/winspool.drv/Nl.rc | 39 dlls/winspool.drv/Ru.rc | 39 dlls/winspool.drv/Tr.rc | 39 dlls/winspool.drv/info.c | 6314 +++++++++++++++++++++++++++++++++++ dlls/winspool.drv/tests/.gitignore | 3 dlls/winspool.drv/tests/Makefile.in | 13 dlls/winspool.drv/tests/info.c | 1193 +++++++ dlls/winspool.drv/winspool.drv.spec | 176 + dlls/winspool.drv/winspool.rc | 51 dlls/winspool.drv/wspool.c | 57 dlls/winspool.drv/wspool.h | 31 dlls/winspool/.gitignore | 4 dlls/winspool/Bg.rc | 39 dlls/winspool/De.rc | 39 dlls/winspool/En.rc | 39 dlls/winspool/Eo.rc | 39 dlls/winspool/Fi.rc | 39 dlls/winspool/It.rc | 39 dlls/winspool/Ko.rc | 39 dlls/winspool/Makefile.in | 27 dlls/winspool/Nl.rc | 39 dlls/winspool/Ru.rc | 39 dlls/winspool/Tr.rc | 39 dlls/winspool/info.c | 6314 ----------------------------------- dlls/winspool/tests/.gitignore | 3 dlls/winspool/tests/Makefile.in | 13 dlls/winspool/tests/info.c | 1193 ------- dlls/winspool/winspool.drv.spec | 176 - dlls/winspool/winspool.rc | 51 dlls/winspool/wspool.c | 57 dlls/winspool/wspool.h | 31 programs/winetest/Makefile.in | 4 45 files changed, 8276 insertions(+), 8277 deletions(-) create mode 100644 dlls/winspool.drv/.gitignore create mode 100644 dlls/winspool.drv/Bg.rc create mode 100644 dlls/winspool.drv/De.rc create mode 100644 dlls/winspool.drv/En.rc create mode 100644 dlls/winspool.drv/Eo.rc create mode 100644 dlls/winspool.drv/Fi.rc create mode 100644 dlls/winspool.drv/It.rc create mode 100644 dlls/winspool.drv/Ko.rc create mode 100644 dlls/winspool.drv/Makefile.in create mode 100644 dlls/winspool.drv/Nl.rc create mode 100644 dlls/winspool.drv/Ru.rc create mode 100644 dlls/winspool.drv/Tr.rc create mode 100644 dlls/winspool.drv/info.c create mode 100644 dlls/winspool.drv/tests/.gitignore create mode 100644 dlls/winspool.drv/tests/Makefile.in create mode 100644 dlls/winspool.drv/tests/info.c create mode 100644 dlls/winspool.drv/winspool.drv.spec create mode 100644 dlls/winspool.drv/winspool.rc create mode 100644 dlls/winspool.drv/wspool.c create mode 100644 dlls/winspool.drv/wspool.h delete mode 100644 dlls/winspool/.gitignore delete mode 100644 dlls/winspool/Bg.rc delete mode 100644 dlls/winspool/De.rc delete mode 100644 dlls/winspool/En.rc delete mode 100644 dlls/winspool/Eo.rc delete mode 100644 dlls/winspool/Fi.rc delete mode 100644 dlls/winspool/It.rc delete mode 100644 dlls/winspool/Ko.rc delete mode 100644 dlls/winspool/Makefile.in delete mode 100644 dlls/winspool/Nl.rc delete mode 100644 dlls/winspool/Ru.rc delete mode 100644 dlls/winspool/Tr.rc delete mode 100644 dlls/winspool/info.c delete mode 100644 dlls/winspool/tests/.gitignore delete mode 100644 dlls/winspool/tests/Makefile.in delete mode 100644 dlls/winspool/tests/info.c delete mode 100644 dlls/winspool/winspool.drv.spec delete mode 100644 dlls/winspool/winspool.rc delete mode 100644 dlls/winspool/wspool.c delete mode 100644 dlls/winspool/wspool.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3098199e0bde6ee0040…

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2006