wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

Felix Nawothnig : comctl32: Implement LVS_EX_DOUBLEBUFFER.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 79d4dfb601a12239a610c6fabcbde988da8dc742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d4dfb601a12239a610c6fab… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Sat Mar 10 18:42:28 2007 +0100 comctl32: Implement LVS_EX_DOUBLEBUFFER. --- dlls/comctl32/listview.c | 84 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 67 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3e8ee59..113845d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4030,31 +4030,68 @@ static void LISTVIEW_RefreshList(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, D * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure * [I] hdc : device context handle + * [I] prcErase : rect to be erased before refresh (may be NULL) * * RETURN: * NoneX */ -static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc) +static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, RECT *prcErase) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; - COLORREF oldTextColor, oldBkColor, oldClrTextBk, oldClrText; + COLORREF oldTextColor = 0, oldBkColor = 0, oldClrTextBk, oldClrText; NMLVCUSTOMDRAW nmlvcd; - HFONT hOldFont; + HFONT hOldFont = 0; DWORD cdmode; - INT oldBkMode; + INT oldBkMode = 0; RECT rcClient; ITERATOR i; + HDC hdcOrig = hdc; + HBITMAP hbmp = NULL; LISTVIEW_DUMP(infoPtr); - + + if (infoPtr->dwLvExStyle & LVS_EX_DOUBLEBUFFER) { + TRACE("double buffering\n"); + + hdc = CreateCompatibleDC(hdcOrig); + if (!hdc) { + ERR("Failed to create DC for backbuffer\n"); + return; + } + hbmp = CreateCompatibleBitmap(hdcOrig, infoPtr->rcList.right, + infoPtr->rcList.bottom); + if (!hbmp) { + ERR("Failed to create bitmap for backbuffer\n"); + DeleteDC(hdc); + return; + } + + SelectObject(hdc, hbmp); + SelectObject(hdc, infoPtr->hFont); + } else { + /* Save dc values we're gonna trash while drawing + * FIXME: Should be done in LISTVIEW_DrawItem() */ + hOldFont = SelectObject(hdc, infoPtr->hFont); + oldBkMode = GetBkMode(hdc); + oldBkColor = GetBkColor(hdc); + oldTextColor = GetTextColor(hdc); + } + infoPtr->bIsDrawing = TRUE; - /* save dc values we're gonna trash while drawing */ - hOldFont = SelectObject(hdc, infoPtr->hFont); - oldBkMode = GetBkMode(hdc); - oldBkColor = GetBkColor(hdc); - oldTextColor = GetTextColor(hdc); + if (prcErase) { + LISTVIEW_FillBkgnd(infoPtr, hdc, prcErase); + } else if (infoPtr->dwLvExStyle & LVS_EX_DOUBLEBUFFER) { + /* If no erasing was done (usually because RedrawWindow was called + * with RDW_INVALIDATE only) we need to copy the old contents into + * the backbuffer before continuing. */ + BitBlt(hdc, infoPtr->rcList.left, infoPtr->rcList.top, + infoPtr->rcList.right - infoPtr->rcList.left, + infoPtr->rcList.bottom - infoPtr->rcList.top, + hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, SRCCOPY); + } + /* FIXME: Shouldn't need to do this */ oldClrTextBk = infoPtr->clrTextBk; oldClrText = infoPtr->clrText; @@ -4110,10 +4147,21 @@ enddraw: infoPtr->clrTextBk = oldClrTextBk; infoPtr->clrText = oldClrText; - SelectObject(hdc, hOldFont); - SetBkMode(hdc, oldBkMode); - SetBkColor(hdc, oldBkColor); - SetTextColor(hdc, oldTextColor); + if(hbmp) { + BitBlt(hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, + infoPtr->rcList.right - infoPtr->rcList.left, + infoPtr->rcList.bottom - infoPtr->rcList.top, + hdc, infoPtr->rcList.left, infoPtr->rcList.top, SRCCOPY); + + DeleteObject(hbmp); + DeleteDC(hdc); + } else { + SelectObject(hdc, hOldFont); + SetBkMode(hdc, oldBkMode); + SetBkColor(hdc, oldBkColor); + SetTextColor(hdc, oldTextColor); + } + infoPtr->bIsDrawing = FALSE; } @@ -7884,6 +7932,9 @@ static inline BOOL LISTVIEW_EraseBkgnd(LISTVIEW_INFO *infoPtr, HDC hdc) if (!GetClipBox(hdc, &rc)) return FALSE; + /* for double buffered controls we need to do this during refresh */ + if (infoPtr->dwLvExStyle & LVS_EX_DOUBLEBUFFER) return FALSE; + return LISTVIEW_FillBkgnd(infoPtr, hdc, &rc); } @@ -8803,15 +8854,14 @@ static LRESULT LISTVIEW_Paint(LISTVIEW_INFO *infoPtr, HDC hdc) UpdateWindow(infoPtr->hwndHeader); if (hdc) - LISTVIEW_Refresh(infoPtr, hdc); + LISTVIEW_Refresh(infoPtr, hdc, NULL); else { PAINTSTRUCT ps; hdc = BeginPaint(infoPtr->hwndSelf, &ps); if (!hdc) return 1; - if (ps.fErase) LISTVIEW_FillBkgnd(infoPtr, hdc, &ps.rcPaint); - LISTVIEW_Refresh(infoPtr, hdc); + LISTVIEW_Refresh(infoPtr, hdc, ps.fErase ? &ps.rcPaint : NULL); EndPaint(infoPtr->hwndSelf, &ps); }

1 0

Felix Nawothnig : comctl32: Fix a typo.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 5cdcfbfaa009731cdff365833891083b7380dde2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdcfbfaa009731cdff365833… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Sat Mar 10 16:27:05 2007 +0100 comctl32: Fix a typo. --- dlls/comctl32/tests/treeview.c | 10 ++++------ dlls/comctl32/treeview.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 458b969..3c7e9f5 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -428,12 +428,10 @@ static void TestGetSetItemHeight(void) ulNewHeight = (int) SendMessage( hTree, TVM_GETITEMHEIGHT, 0, 0 ); ok(ulNewHeight == 2*ulOldHeight, "New height not set properly, reported %d, expected %d\n", ulNewHeight, 2*ulOldHeight); - todo_wine { - /* Assuming tree doesn't have TVS_NONEVENHEIGHT set, so a set of 9 will round down to 8 */ - SendMessage( hTree, TVM_SETITEMHEIGHT, 9, 0 ); - ulNewHeight = (int) SendMessage( hTree, TVM_GETITEMHEIGHT, 0, 0 ); - ok(ulNewHeight == 8, "Uneven height not set properly, reported %d, expected %d\n", ulNewHeight, 8); - } + /* Assuming tree doesn't have TVS_NONEVENHEIGHT set, so a set of 9 will round down to 8 */ + SendMessage( hTree, TVM_SETITEMHEIGHT, 9, 0 ); + ulNewHeight = (int) SendMessage( hTree, TVM_GETITEMHEIGHT, 0, 0 ); + ok(ulNewHeight == 8, "Uneven height not set properly, reported %d, expected %d\n", ulNewHeight, 8); } static void TestGetSetScrollTime(void) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1130daa..676e56a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1825,7 +1825,7 @@ TREEVIEW_SetItemHeight(TREEVIEW_INFO *infoPtr, INT newHeight) } /* Round down, unless we support odd ("non even") heights. */ - if (!(infoPtr->dwStyle) & TVS_NONEVENHEIGHT) + if (!(infoPtr->dwStyle & TVS_NONEVENHEIGHT)) infoPtr->uItemHeight &= ~1; if (infoPtr->uItemHeight != prevHeight)

1 0

Felix Nawothnig : comctl32: Fix my last patch.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 7b99592975f12b300f55a546dcc014698c354d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b99592975f12b300f55a546d… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Sat Mar 10 14:29:07 2007 +0100 comctl32: Fix my last patch. My last patch was wrong and caused some nasty regressions. Mapping CLR_DEFAULT to the global defaults seem to be what native does. --- dlls/comctl32/listview.c | 10 +++++++--- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ae02cd6..3e8ee59 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -946,6 +946,11 @@ static inline DWORD notify_customdraw (LISTVIEW_INFO *infoPtr, DWORD dwDrawStage static void prepaint_setup (LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd) { + if (lpnmlvcd->clrTextBk == CLR_DEFAULT) + lpnmlvcd->clrTextBk = comctl32_color.clrWindow; + if (lpnmlvcd->clrText == CLR_DEFAULT) + lpnmlvcd->clrText = comctl32_color.clrWindowText; + /* apprently, for selected items, we have to override the returned values */ if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) { @@ -965,8 +970,7 @@ static void prepaint_setup (LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpn if (lpnmlvcd->clrTextBk != CLR_NONE) { SetBkMode(hdc, OPAQUE); - if (lpnmlvcd->clrTextBk != CLR_DEFAULT) - SetBkColor(hdc,lpnmlvcd->clrTextBk); + SetBkColor(hdc,lpnmlvcd->clrTextBk); } else SetBkMode(hdc, TRANSPARENT); @@ -7717,7 +7721,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) /* initialize color information */ infoPtr->clrBk = CLR_NONE; - infoPtr->clrText = comctl32_color.clrWindowText; + infoPtr->clrText = CLR_DEFAULT; infoPtr->clrTextBk = CLR_DEFAULT; LISTVIEW_SetBkColor(infoPtr, comctl32_color.clrWindow); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 32b9646..0468237 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -624,11 +624,11 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) return CDRF_NOTIFYSUBITEMDRAW; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - ok(clr == c0ffee, "clr=%.8x\n", clr); + todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - ok(clr == c0ffee, "clr=%.8x\n", clr); + todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_DODEFAULT; } return CDRF_DODEFAULT;

1 0

Stefan Dösinger : wined3d: Account for offscreen rendering when setting up the clearing scissor rectangle .
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: eba060463d2f4964abd8f7d81d8b433e6577fb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba060463d2f4964abd8f7d81… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 7 01:43:53 2007 +0100 wined3d: Account for offscreen rendering when setting up the clearing scissor rectangle. --- dlls/wined3d/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1c2080b..13d0fa5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4221,8 +4221,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun continue; } - glScissor(curRect[i].x1, target->currentDesc.Height - curRect[i].y2, - curRect[i].x2 - curRect[i].x1, curRect[i].y2 - curRect[i].y1); + if(This->render_offscreen) { + glScissor(curRect[i].x1, curRect[i].y1, + curRect[i].x2 - curRect[i].x1, curRect[i].y2 - curRect[i].y1); + } else { + glScissor(curRect[i].x1, target->currentDesc.Height - curRect[i].y2, + curRect[i].x2 - curRect[i].x1, curRect[i].y2 - curRect[i].y1); + } checkGLcall("glScissor"); glClear(glMask);

1 0

Stefan Dösinger : wined3d: Blit the offscreen texture into the drawable if needed.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 603e7933ea780de8980db9275d0770bd2828cb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=603e7933ea780de8980db9275… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 10 00:55:08 2007 +0100 wined3d: Blit the offscreen texture into the drawable if needed. When using pbuffer or back buffer offscreen rendering the content of the drawable will have been overwritten. Thus the texture has to be written into the drawable. An exception is the (pretty common) case that the whole render target is cleared before rendering to it. --- dlls/wined3d/context.c | 3 + dlls/wined3d/device.c | 26 ++++++-- dlls/wined3d/drawprim.c | 128 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 + 4 files changed, 153 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=603e7933ea780de8980db…

1 0

Stefan Dösinger : wined3d: Restore the index buffer when switching from UP to buffer drawing.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 850bd7b4140e448dabce0385d5b695ff6ec3b531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850bd7b4140e448dabce0385d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 10 00:44:46 2007 +0100 wined3d: Restore the index buffer when switching from UP to buffer drawing. The state handler binds index buffer 0 when a user pointer is used. Likewise the real index buffer has to be restored when switching back to drawing from index buffers. --- dlls/wined3d/device.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0998eec..c7eda3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4250,12 +4250,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitive(IWineD3DDevice *iface, WI UINT PrimitiveCount) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - This->stateBlock->streamIsUP = FALSE; TRACE("(%p) : Type=(%d,%s), Start=%d, Count=%d\n", This, PrimitiveType, debug_d3dprimitivetype(PrimitiveType), StartVertex, PrimitiveCount); + /* The index buffer is not needed here, but restore it, otherwise it is hell to keep track of */ + if(This->stateBlock->streamIsUP) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); + This->stateBlock->streamIsUP = FALSE; + } + if(This->stateBlock->loadBaseVertexIndex != 0) { This->stateBlock->loadBaseVertexIndex = 0; IWineD3DDeviceImpl_MarkStateDirty(This, STATE_STREAMSRC); @@ -4277,8 +4282,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * WINED3DINDEXBUFFER_DESC IdxBufDsc; GLuint vbo; + if(This->stateBlock->streamIsUP) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); + This->stateBlock->streamIsUP = FALSE; + } pIB = This->stateBlock->pIndexData; - This->stateBlock->streamIsUP = FALSE; vbo = ((IWineD3DIndexBufferImpl *) pIB)->vbo; TRACE("(%p) : Type=(%d,%s), min=%d, CountV=%d, startIdx=%d, countP=%d\n", This,

1 0

Andrew Talbot : advapi32: Constify some variables.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 39fb7839a70d1b06073e429f457e6271c2bc7ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fb7839a70d1b06073e429f4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 10 12:18:40 2007 +0000 advapi32: Constify some variables. --- dlls/advapi32/service.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 1cd643f..e962455 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -276,7 +276,7 @@ static inline void service_set_multi_string( struct reg_value *val, } static inline LONG service_write_values( HKEY hKey, - struct reg_value *val, int n ) + const struct reg_value *val, int n ) { LONG r = ERROR_SUCCESS; int i; @@ -294,7 +294,7 @@ static inline LONG service_write_values( HKEY hKey, /****************************************************************************** * Service IPC functions */ -static LPWSTR service_get_pipe_name(LPWSTR service) +static LPWSTR service_get_pipe_name(LPCWSTR service) { static const WCHAR prefix[] = { '\\','\\','.','\\','p','i','p','e','\\', '_','_','w','i','n','e','s','e','r','v','i','c','e','_',0}; @@ -308,7 +308,7 @@ static LPWSTR service_get_pipe_name(LPWSTR service) return name; } -static HANDLE service_open_pipe(LPWSTR service) +static HANDLE service_open_pipe(LPCWSTR service) { LPWSTR szPipe = service_get_pipe_name( service ); HANDLE handle = INVALID_HANDLE_VALUE; @@ -329,7 +329,7 @@ static HANDLE service_open_pipe(LPWSTR service) /****************************************************************************** * service_get_event_handle */ -static HANDLE service_get_event_handle(LPWSTR service) +static HANDLE service_get_event_handle(LPCWSTR service) { static const WCHAR prefix[] = { '_','_','w','i','n','e','s','e','r','v','i','c','e','_',0};

1 0

Andrew Talbot : advapi32: Constify some variables.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 3b695ae33a210c78dc75006578d40650a8bfda8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b695ae33a210c78dc7500657… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 10 12:17:57 2007 +0000 advapi32: Constify some variables. --- dlls/advapi32/lsa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 01818cf..5a136b6 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); return FailureCode; \ } -static void dumpLsaAttributes(PLSA_OBJECT_ATTRIBUTES oa) +static void dumpLsaAttributes(const LSA_OBJECT_ATTRIBUTES *oa) { if (oa) {

1 0

Andrew Talbot : advapi32: Constify some variables.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 1a71294ad3bfa9e3dcf01c5160015ef1d47c8ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a71294ad3bfa9e3dcf01c516… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 10 12:17:20 2007 +0000 advapi32: Constify some variables. --- dlls/advapi32/crypt_md4.c | 6 +++--- dlls/advapi32/tests/crypt_md4.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt_md4.c b/dlls/advapi32/crypt_md4.c index 066f1d5..5f4e709 100644 --- a/dlls/advapi32/crypt_md4.c +++ b/dlls/advapi32/crypt_md4.c @@ -285,12 +285,12 @@ static void MD4Transform( unsigned int buf[4], const unsigned int in[16] ) * Failure: STATUS_UNSUCCESSFUL * */ -NTSTATUS WINAPI SystemFunction007(PUNICODE_STRING string, LPBYTE hash) +NTSTATUS WINAPI SystemFunction007(const UNICODE_STRING *string, LPBYTE hash) { MD4_CTX ctx; MD4Init( &ctx ); - MD4Update( &ctx, (BYTE*) string->Buffer, string->Length ); + MD4Update( &ctx, (const BYTE *)string->Buffer, string->Length ); MD4Final( &ctx ); memcpy( hash, ctx.digest, 0x10 ); @@ -313,7 +313,7 @@ NTSTATUS WINAPI SystemFunction007(PUNICODE_STRING string, LPBYTE hash) * Failure: STATUS_UNSUCCESSFUL * */ -NTSTATUS WINAPI SystemFunction010(LPVOID unknown, LPBYTE data, LPBYTE hash) +NTSTATUS WINAPI SystemFunction010(LPVOID unknown, const BYTE *data, LPBYTE hash) { MD4_CTX ctx; diff --git a/dlls/advapi32/tests/crypt_md4.c b/dlls/advapi32/tests/crypt_md4.c index a114089..48ee0b9 100644 --- a/dlls/advapi32/tests/crypt_md4.c +++ b/dlls/advapi32/tests/crypt_md4.c @@ -39,7 +39,7 @@ typedef struct typedef VOID (WINAPI *fnMD4Init)( MD4_CTX *ctx ); typedef VOID (WINAPI *fnMD4Update)( MD4_CTX *ctx, const unsigned char *src, const int len ); typedef VOID (WINAPI *fnMD4Final)( MD4_CTX *ctx ); -typedef int (WINAPI *fnSystemFunction007)(PUNICODE_STRING,LPBYTE); +typedef int (WINAPI *fnSystemFunction007)(const UNICODE_STRING *, LPBYTE); typedef int (WINAPI *md4hashfunc)(LPVOID, const LPBYTE, LPBYTE); fnMD4Init pMD4Init;

1 0

Andrew Talbot : winex11.drv: Replace const pointer parameters with correct non-const pointers.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 4b515b6adf761900a65a40b8213bb44a6a45a971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b515b6adf761900a65a40b82… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 9 22:24:16 2007 +0000 winex11.drv: Replace const pointer parameters with correct non-const pointers. --- dlls/winex11.drv/xfont.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 8eebd7c..34ed2f1 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -400,14 +400,14 @@ static void FONT_LogFontWTo16( const LOGFONTW* font32, LPLOGFONT16 font16 ) /*********************************************************************** * Checksums */ -static UINT16 __lfCheckSum( LPLOGFONT16 plf ) +static UINT16 __lfCheckSum( const LOGFONT16 *plf ) { CHAR font[LF_FACESIZE]; UINT16 checksum = 0; - UINT16 *ptr; + const UINT16 *ptr; int i; - ptr = (UINT16 *)plf; + ptr = (const UINT16 *)plf; for (i = 0; i < 9; i++) checksum ^= *ptr++; for (i = 0; i < LF_FACESIZE; i++) { @@ -1033,7 +1033,7 @@ static BOOL LFD_ComposeLFD( const fontObject* fo, * font info - http://www.microsoft.com/kb/articles/q65/1/23.htm * Windows font metrics - http://www.microsoft.com/kb/articles/q32/6/67.htm */ -static void XFONT_GetLeading( const LPIFONTINFO16 pFI, const XFontStruct* x_fs, +static void XFONT_GetLeading( const IFONTINFO16 *pFI, const XFontStruct* x_fs, INT16* pIL, INT16* pEL, const XFONTTRANS *XFT ) { unsigned long height; @@ -2727,7 +2727,7 @@ static void XFONT_GrowFreeList(int start, int end) } } -static fontObject* XFONT_LookupCachedFont( const LPLOGFONT16 plf, UINT16* checksum ) +static fontObject* XFONT_LookupCachedFont( const LOGFONT16 *plf, UINT16* checksum ) { UINT16 cs = __lfCheckSum( plf ); int i = fontMRU, prev = -1; @@ -3017,7 +3017,7 @@ static BOOL XFONT_SetX11Trans( fontObject *pfo ) /*********************************************************************** * X Device Font Objects */ -static X_PHYSFONT XFONT_RealizeFont( const LPLOGFONT16 plf, +static X_PHYSFONT XFONT_RealizeFont( LPLOGFONT16 plf, LPCSTR* faceMatched, BOOL bSubFont, WORD internal_charset, WORD* pcharsetMatched )

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
85
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 March 2007