wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Daniel Lehman : include: Add sqlucode.h.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 211803c16161b785bee6bb16c32fcc926d8131a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211803c16161b785bee6bb16c… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 25 09:27:18 2017 -0700 include: Add sqlucode.h. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/sqlucode.h | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7846d67..20160c5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -602,6 +602,7 @@ HEADER_SRCS = \ sql.h \ sqlext.h \ sqltypes.h \ + sqlucode.h \ srrestoreptapi.h \ sspi.h \ sti.h \ diff --git a/include/sqlucode.h b/include/sqlucode.h new file mode 100644 index 0000000..c87348c --- /dev/null +++ b/include/sqlucode.h @@ -0,0 +1,64 @@ +/* + * MS SQL Unicode Definitions + * + * Copyright (C) 2017 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __SQLUCODE_H +#define __SQLUCODE_H + +#include <sqlext.h> + +#ifdef __cplusplus +extern "C" { +#endif + +SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, + SQLWCHAR *ServerName, SQLSMALLINT NameLength1, + SQLWCHAR *UserName, SQLSMALLINT NameLength2, + SQLWCHAR *Authentication, SQLSMALLINT NameLength3); + +SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLWCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, + SQLSMALLINT *DataType, SQLULEN *ColumnSize, + SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable); + +SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle, + SQLWCHAR *StatementText, SQLINTEGER TextLength); + +SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, + SQLSMALLINT RecNumber, SQLWCHAR *Sqlstate, + SQLINTEGER *NativeError, SQLWCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength); + +SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, + SQLUSMALLINT InfoType, SQLPOINTER InfoValue, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength); + +SQLRETURN WINAPI SQLPrepareW(SQLHSTMT StatementHandle, + SQLWCHAR *StatementText, SQLINTEGER TextLength); + +SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Hans Leidekker : webservices: Implement WsGetDictionary.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 419604e15babda4fdbc326da6952f4c9486a3292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419604e15babda4fdbc326da6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 30 10:09:08 2017 +0200 webservices: Implement WsGetDictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 18 +++++++++++++++++ dlls/webservices/tests/reader.c | 41 ++++++++++++++++++++++++++++++++++++++- dlls/webservices/webservices.spec | 2 +- 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 01b464f..d59de3b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -86,6 +86,24 @@ static WS_XML_DICTIONARY dict_builtin = {0x82704485,0x222a,0x4f7c,{0xb9,0x7b,0xe9,0xa4,0x62,0xa9,0x66,0x2b}} }; +/************************************************************************** + * WsGetDictionary [webservices.@] + */ +HRESULT WINAPI WsGetDictionary( WS_ENCODING encoding, WS_XML_DICTIONARY **dict, WS_ERROR *error ) +{ + TRACE( "%u %p %p\n", encoding, dict, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!dict) return E_INVALIDARG; + + if (encoding == WS_ENCODING_XML_BINARY_1 || encoding == WS_ENCODING_XML_BINARY_SESSION_1) + *dict = &dict_builtin; + else + *dict = NULL; + + return S_OK; +} + static inline int cmp_string( const unsigned char *str, ULONG len, const unsigned char *str2, ULONG len2 ) { if (len < len2) return -1; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 0e21e86..87f593f 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1183,6 +1183,7 @@ static void test_WsReadNode(void) static const char str17[] = ""; HRESULT hr; WS_XML_READER *reader; + WS_XML_DICTIONARY *dict; const WS_XML_NODE *node; unsigned int i; int found; @@ -1334,6 +1335,21 @@ static void test_WsReadNode(void) ok( !memcmp( comment->value.bytes, " comment ", 9 ), "wrong data\n" ); } + dict = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_UTF8, &dict, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict == NULL, "got %p\n", dict ); + + dict = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict != NULL, "dict not set\n" ); + + dict = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_BINARY_SESSION_1, &dict, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict != NULL, "dict not set\n" ); + WsFreeReader( reader ); } @@ -4898,7 +4914,7 @@ static void test_dictionary(void) const WS_XML_ATTRIBUTE *attr; const WS_XML_UTF8_TEXT *utf8; WS_XML_STRING strings[6]; - WS_XML_DICTIONARY dict; + WS_XML_DICTIONARY dict, *dict2; WS_XML_READER *reader; HRESULT hr; @@ -5163,6 +5179,29 @@ static void test_dictionary(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + hr = WsGetDictionary( 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetDictionary( WS_ENCODING_XML_UTF8, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + dict2 = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_UTF8, &dict2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict2 == NULL, "got %p\n", dict2 ); + + dict2 = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict2 != NULL, "dict2 not set\n" ); + ok( dict2 != &dict, "got %p\n", dict2 ); + + dict2 = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_BINARY_SESSION_1, &dict2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict2 != NULL, "dict2 not set\n" ); + ok( dict2 != &dict, "got %p\n", dict2 ); + WsFreeReader( reader ); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 1f98aa3..c88935a 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -61,7 +61,7 @@ @ stdcall WsFreeWriter(ptr) @ stdcall WsGetChannelProperty(ptr long ptr long ptr) @ stub WsGetCustomHeader -@ stub WsGetDictionary +@ stdcall WsGetDictionary(long ptr ptr) @ stdcall WsGetErrorProperty(ptr long ptr long) @ stdcall WsGetErrorString(ptr long ptr) @ stub WsGetFaultErrorDetail

1 0

Hans Leidekker : webservices: Add a builtin dictionary.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 8214fcfa5d22f112e7d05de5a2b046014d92d1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8214fcfa5d22f112e7d05de5a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 30 10:09:07 2017 +0200 webservices: Add a builtin dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- dlls/webservices/reader.c | 301 +++++++++++++++++++++++++-------- dlls/webservices/tests/reader.c | 2 +- dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 41 +++-- 5 files changed, 261 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8214fcfa5d22f112e7d05…

1 0

Hans Leidekker : webservices: Add support for dictionary strings in the reader.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 0e942e5021f3411598ee4e813bd3e9cb59fc6c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e942e5021f3411598ee4e813… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 30 10:09:06 2017 +0200 webservices: Add support for dictionary strings in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 88 ++++++++++- dlls/webservices/tests/reader.c | 314 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 389 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e942e5021f3411598ee4…

1 0

Hans Leidekker : webservices: Add support for dictionary strings in the writer.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 51d934abbc5d483794bc5d1377093ca3d060dd1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d934abbc5d483794bc5d137… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 30 10:09:05 2017 +0200 webservices: Add support for dictionary strings in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 18 +++-- dlls/webservices/reader.c | 26 ++++-- dlls/webservices/tests/Makefile.in | 2 +- dlls/webservices/tests/writer.c | 140 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 114 +++++++++++++++++++++------ 6 files changed, 263 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51d934abbc5d483794bc5…

1 0

Nikolay Sivov : comctl32: Change some overly exciting tracing messages.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: e558858d0fc1b04693cafc18317d9b93d5ac0bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e558858d0fc1b04693cafc183… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 28 16:05:25 2017 +0300 comctl32: Change some overly exciting tracing messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/animate.c | 8 ++++---- dlls/comctl32/dpa.c | 6 +++--- dlls/comctl32/header.c | 12 ++++++------ dlls/comctl32/toolbar.c | 30 +++++++++++++++--------------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 68b2bb6..12c4f65 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -704,7 +704,7 @@ static BOOL ANIMATE_OpenW(ANIMATE_INFO *infoPtr, HINSTANCE hInstance, LPWSTR lps if (!lpszName) { - TRACE("Closing avi!\n"); + TRACE("Closing avi.\n"); /* installer of thebat! v1.62 requires FALSE here */ return (infoPtr->hMMio != 0); } @@ -718,10 +718,10 @@ static BOOL ANIMATE_OpenW(ANIMATE_INFO *infoPtr, HINSTANCE hInstance, LPWSTR lps { if (!ANIMATE_LoadResW(infoPtr, hInstance, lpszName)) { - TRACE("No AVI resource found!\n"); + TRACE("No AVI resource found.\n"); if (!ANIMATE_LoadFileW(infoPtr, lpszName)) { - WARN("No AVI file found!\n"); + WARN("No AVI file found.\n"); return FALSE; } } @@ -730,7 +730,7 @@ static BOOL ANIMATE_OpenW(ANIMATE_INFO *infoPtr, HINSTANCE hInstance, LPWSTR lps { if (!ANIMATE_LoadResW(infoPtr, hInstance, lpszName)) { - WARN("No AVI resource found!\n"); + WARN("No AVI resource found.\n"); return FALSE; } } diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index b5b7ff8..36b3a42 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -287,13 +287,13 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, return FALSE; if (!(dwFlags & DPAM_SORTED)) { - TRACE("sorting dpa's!\n"); + TRACE("sorting dpa's.\n"); if (hdpa1->nItemCount > 0) DPA_Sort (hdpa1, pfnCompare, lParam); - TRACE ("dpa 1 sorted!\n"); + TRACE ("dpa 1 sorted.\n"); if (hdpa2->nItemCount > 0) DPA_Sort (hdpa2, pfnCompare, lParam); - TRACE ("dpa 2 sorted!\n"); + TRACE ("dpa 2 sorted.\n"); } if (hdpa2->nItemCount < 1) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 705c6c4..fcba262 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1712,7 +1712,7 @@ HEADER_LButtonDown (HEADER_INFO *infoPtr, INT x, INT y) HEADER_RefreshItem (infoPtr, nItem); ReleaseDC (infoPtr->hwndSelf, hdc); - TRACE("Pressed item %d!\n", nItem); + TRACE("Pressed item %d.\n", nItem); } else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN)) { INT iCurrWidth = infoPtr->items[nItem].cxy; @@ -1731,7 +1731,7 @@ HEADER_LButtonDown (HEADER_INFO *infoPtr, INT x, INT y) ReleaseDC (infoPtr->hwndSelf, hdc); } - TRACE("Begin tracking item %d!\n", nItem); + TRACE("Begin tracking item %d.\n", nItem); } } @@ -1797,14 +1797,14 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCLICKW, infoPtr->iMoveItem, NULL); } - TRACE("Released item %d!\n", infoPtr->iMoveItem); + TRACE("Released item %d.\n", infoPtr->iMoveItem); infoPtr->bPressed = FALSE; } else if (infoPtr->bTracking) { INT iNewWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset; if (iNewWidth < 0) iNewWidth = 0; - TRACE("End tracking item %d!\n", infoPtr->iMoveItem); + TRACE("End tracking item %d.\n", infoPtr->iMoveItem); infoPtr->bTracking = FALSE; HEADER_SendNotifyWithIntFieldT(infoPtr, HDN_ENDTRACKW, infoPtr->iMoveItem, HDI_WIDTH, iNewWidth); @@ -1934,7 +1934,7 @@ HEADER_MouseMove (HEADER_INFO *infoPtr, LPARAM lParam) ReleaseDC (infoPtr->hwndSelf, hdc); } - TRACE("Moving pressed item %d!\n", infoPtr->iMoveItem); + TRACE("Moving pressed item %d.\n", infoPtr->iMoveItem); } else if (infoPtr->bTracking) { if (infoPtr->dwStyle & HDS_FULLDRAG) { @@ -1974,7 +1974,7 @@ HEADER_MouseMove (HEADER_INFO *infoPtr, LPARAM lParam) HEADER_SendNotifyWithIntFieldT(infoPtr, HDN_TRACKW, infoPtr->iMoveItem, HDI_WIDTH, iTrackWidth); } - TRACE("Tracking item %d!\n", infoPtr->iMoveItem); + TRACE("Tracking item %d.\n", infoPtr->iMoveItem); } } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d908e41..c57707b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1293,7 +1293,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize) SelectObject (hdc, hOldFont); ReleaseDC (infoPtr->hwndSelf, hdc); - TRACE("max string size %d x %d!\n", lpSize->cx, lpSize->cy); + TRACE("max string size %d x %d\n", lpSize->cx, lpSize->cy); } /*********************************************************************** @@ -1808,13 +1808,13 @@ TOOLBAR_InternalHitTest (const TOOLBAR_INFO *infoPtr, const POINT *lpPt, BOOL *b if (btnPtr->fsStyle & BTNS_SEP) { if (PtInRect (&btnPtr->rect, *lpPt)) { - TRACE(" ON SEPARATOR %d!\n", i); + TRACE(" ON SEPARATOR %d\n", i); return -i; } } else { if (PtInRect (&btnPtr->rect, *lpPt)) { - TRACE(" ON BUTTON %d!\n", i); + TRACE(" ON BUTTON %d\n", i); if (button) *button = TRUE; return i; @@ -1822,7 +1822,7 @@ TOOLBAR_InternalHitTest (const TOOLBAR_INFO *infoPtr, const POINT *lpPt, BOOL *b } } - TRACE(" NOWHERE!\n"); + TRACE(" NOWHERE\n"); return TOOLBAR_NOWHERE; } @@ -2628,7 +2628,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageW (hwnd, wParam, LB_GETITEMDATA, lpdis->itemID, 0); if (btnInfo == NULL) { - FIXME("btnInfo invalid!\n"); + FIXME("btnInfo invalid\n"); return TRUE; } @@ -2837,7 +2837,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp return -1; } - TRACE ("adding %d internal bitmaps!\n", info.nButtons); + TRACE ("adding %d internal bitmaps\n", info.nButtons); /* Windows resize all the buttons to the size of a newly added standard image */ if (lpAddBmp->nID & 1) @@ -2858,7 +2858,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp info.nButtons = count; info.hInst = lpAddBmp->hInst; info.nID = lpAddBmp->nID; - TRACE("adding %d bitmaps!\n", info.nButtons); + TRACE("adding %d bitmaps\n", info.nButtons); } /* check if the bitmap is already loaded and compute iSumButtons */ @@ -2873,7 +2873,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp if (!infoPtr->cimlDef) { /* create new default image list */ - TRACE ("creating default image list!\n"); + TRACE ("creating default image list\n"); himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, ILC_COLOR32 | ILC_MASK, info.nButtons, 2); @@ -2906,7 +2906,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp static LRESULT TOOLBAR_AddButtonsT(TOOLBAR_INFO *infoPtr, INT nAddButtons, const TBBUTTON* lpTbb, BOOL fUnicode) { - TRACE("adding %d buttons (unicode=%d)!\n", nAddButtons, fUnicode); + TRACE("adding %d buttons (unicode=%d)\n", nAddButtons, fUnicode); return TOOLBAR_InternalInsertButtonsT(infoPtr, -1, nAddButtons, lpTbb, fUnicode); } @@ -3032,7 +3032,7 @@ TOOLBAR_AddStringA (TOOLBAR_INFO *infoPtr, HINSTANCE hInstance, LPARAM lParam) static LRESULT TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) { - TRACE("auto sizing, style=%x!\n", infoPtr->dwStyle); + TRACE("auto sizing, style=%#x\n", infoPtr->dwStyle); TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight); if (!(infoPtr->dwStyle & CCS_NORESIZE)) @@ -3229,7 +3229,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[nIndex]); if (infoPtr->nNumButtons == 1) { - TRACE(" simple delete!\n"); + TRACE(" simple delete\n"); free_string( infoPtr->buttons ); Free (infoPtr->buttons); infoPtr->buttons = NULL; @@ -3237,7 +3237,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) } else { TBUTTON_INFO *oldButtons = infoPtr->buttons; - TRACE("complex delete! [nIndex=%d]\n", nIndex); + TRACE("complex delete [nIndex=%d]\n", nIndex); infoPtr->nNumButtons--; infoPtr->buttons = Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons); @@ -4520,7 +4520,7 @@ TOOLBAR_SetCmdId (TOOLBAR_INFO *infoPtr, INT nIndex, INT nId) if (infoPtr->hwndToolTip) { - FIXME("change tool tip!\n"); + FIXME("change tool tip\n"); } @@ -5155,7 +5155,7 @@ TOOLBAR_GetStringW (const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPWSTR str) static LRESULT TOOLBAR_SetBoundingSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { SIZE * pSize = (SIZE*)lParam; - FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub!\n", hwnd, wParam, pSize->cx, pSize->cy); + FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub\n", hwnd, wParam, pSize->cx, pSize->cy); return 0; } @@ -6387,7 +6387,7 @@ TOOLBAR_SetRedraw (TOOLBAR_INFO *infoPtr, WPARAM wParam) static LRESULT TOOLBAR_Size (TOOLBAR_INFO *infoPtr) { - TRACE("sizing toolbar!\n"); + TRACE("sizing toolbar\n"); if (infoPtr->dwExStyle & TBSTYLE_EX_HIDECLIPPEDBUTTONS) {

1 0

Nikolay Sivov : dwrite: Grab font data reference when adding replacement.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 7524db8937ec6ae94e690dda41cd363d4c37925a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7524db8937ec6ae94e690dda4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 30 10:10:59 2017 +0300 dwrite: Grab font data reference when adding replacement. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a877ad0..0332587 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -405,6 +405,11 @@ static inline void* get_fontface_colr(struct dwrite_fontface *fontface) return get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_COLR_TAG, &fontface->colr); } +static void addref_font_data(struct dwrite_font_data *data) +{ + InterlockedIncrement(&data->ref); +} + static void release_font_data(struct dwrite_font_data *data) { int i; @@ -1762,7 +1767,7 @@ static HRESULT create_font(struct dwrite_fontfamily *family, UINT32 index, IDWri IDWriteFontFamily1_AddRef(&family->IDWriteFontFamily1_iface); This->data = family->data->fonts[index]; This->style = This->data->style; - InterlockedIncrement(&This->data->ref); + addref_font_data(This->data); *font = &This->IDWriteFont3_iface; @@ -2135,7 +2140,7 @@ static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily1 *ifac for (i = 0; i < This->data->font_count; i++) { if (!func || func(This->data->fonts[i])) { fonts->fonts[fonts->font_count] = This->data->fonts[i]; - InterlockedIncrement(&This->data->fonts[i]->ref); + addref_font_data(This->data->fonts[i]); fonts->font_count++; } } @@ -3554,8 +3559,10 @@ static BOOL fontcollection_add_replacement(struct dwrite_fontcollection *collect struct dwrite_fontfamily_data *replacement = collection->family_data[i]; WCHAR nameW[255]; - for (i = 0; i < replacement->font_count; i++) + for (i = 0; i < replacement->font_count; i++) { fontfamily_add_font(target, replacement->fonts[i]); + addref_font_data(replacement->fonts[i]); + } fontcollection_add_family(collection, target); fontstrings_get_en_string(replacement->familyname, nameW, sizeof(nameW)/sizeof(WCHAR));

1 0

Sebastian Lackner : kernel32: Add missing WINAPI to SetThreadIdealProcessorEx implementation.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: dc43ed435f7f0dc9713f4c7e62f78832cc56bda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc43ed435f7f0dc9713f4c7e6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon May 29 21:51:24 2017 +0200 kernel32: Add missing WINAPI to SetThreadIdealProcessorEx implementation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index ac2c368..a30428f 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -474,7 +474,7 @@ DWORD WINAPI SetThreadIdealProcessor( /*********************************************************************** * SetThreadIdealProcessorEx (KERNEL32.@) */ -BOOL SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous ) +BOOL WINAPI SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous ) { FIXME("(%p %p %p): stub\n", thread, ideal, previous); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0

Sebastian Lackner : winex11.drv: Fix compilation when XFixes is not present.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 136a438daad40e5b601fff2b1ad3fbcc207e5b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=136a438daad40e5b601fff2b1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon May 29 21:45:35 2017 +0200 winex11.drv: Fix compilation when XFixes is not present. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 3da4081..8e6e05b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1954,21 +1954,21 @@ static BOOL wait_clipboard_mutex(void) /************************************************************************** - * handle_selection_notify_event + * selection_notify_event * * Called when x11 clipboard content changes */ +#ifdef SONAME_LIBXFIXES static BOOL selection_notify_event( HWND hwnd, XEvent *event ) { -#ifdef SONAME_LIBXFIXES XFixesSelectionNotifyEvent *req = (XFixesSelectionNotifyEvent*)event; if (!is_clipboard_owner) return FALSE; if (req->owner == selection_window) return FALSE; request_selection_contents( req->display, TRUE ); return FALSE; -#endif } +#endif /************************************************************************** * xfixes_init

1 0

Paul Gofman : d3dx9: Get rid of table lookup for converting between register indexes and offsets.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 2f72e9669f6b429528620b1c6659300501ca5e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f72e9669f6b429528620b1c6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 24 12:46:51 2017 +0300 d3dx9: Get rid of table lookup for converting between register indexes and offsets. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 58 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 40a86fa..29a2346 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -199,18 +199,17 @@ enum pres_value_type static const struct { unsigned int component_size; - unsigned int reg_component_count; enum pres_value_type type; } table_info[] = { - {sizeof(double), 4, PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ - {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_REGTAB_CONST */ - {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_REGTAB_OCONST */ - {sizeof(BOOL), 1, PRES_VT_BOOL }, /* PRES_REGTAB_OBCONST */ - {sizeof(int), 4, PRES_VT_INT, }, /* PRES_REGTAB_OICONST */ + {sizeof(double), PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ + {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_CONST */ + {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_OCONST */ + {sizeof(BOOL), PRES_VT_BOOL }, /* PRES_REGTAB_OBCONST */ + {sizeof(int), PRES_VT_INT, }, /* PRES_REGTAB_OICONST */ /* TODO: use double precision for 64 bit */ - {sizeof(float), 4, PRES_VT_FLOAT } /* PRES_REGTAB_TEMP */ + {sizeof(float), PRES_VT_FLOAT } /* PRES_REGTAB_TEMP */ }; static const char *table_symbol[] = @@ -263,7 +262,12 @@ struct d3dx_pres_ins static unsigned int get_reg_offset(unsigned int table, unsigned int offset) { - return offset / table_info[table].reg_component_count; + return table == PRES_REGTAB_OBCONST ? offset : offset >> 2; +} + +static unsigned int get_offset_reg(unsigned int table, unsigned int reg_idx) +{ + return table == PRES_REGTAB_OBCONST ? reg_idx : reg_idx << 2; } #define PRES_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) @@ -274,7 +278,7 @@ static HRESULT regstore_alloc_table(struct d3dx_regstore *rs, unsigned int table { unsigned int size; - size = rs->table_sizes[table] * table_info[table].reg_component_count * table_info[table].component_size; + size = get_offset_reg(table, rs->table_sizes[table]) * table_info[table].component_size; if (size) { rs->tables[table] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); @@ -674,8 +678,7 @@ static void dump_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *a index_reg = get_reg_offset(arg->index_reg.table, arg->index_reg.offset); TRACE("%s[%u + %s%u.%c].", table_symbol[table], get_reg_offset(table, arg->reg.offset), table_symbol[arg->index_reg.table], index_reg, - xyzw_str[arg->index_reg.offset - - index_reg * table_info[arg->index_reg.table].reg_component_count]); + xyzw_str[arg->index_reg.offset - get_offset_reg(arg->index_reg.table, index_reg)]); } for (i = 0; i < component_count; ++i) TRACE("%c", xyzw_str[(arg->reg.offset + i) % 4]); @@ -804,14 +807,13 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u if (FAILED(hr)) return hr; - if (const_count % table_info[PRES_REGTAB_IMMED].reg_component_count) + if (const_count % get_offset_reg(PRES_REGTAB_IMMED, 1)) { FIXME("const_count %u is not a multiple of %u.\n", const_count, - table_info[PRES_REGTAB_IMMED].reg_component_count); + get_offset_reg(PRES_REGTAB_IMMED, 1)); return D3DXERR_INVALIDDATA; } - pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count - / table_info[PRES_REGTAB_IMMED].reg_component_count; + pres->regs.table_sizes[PRES_REGTAB_IMMED] = get_reg_offset(PRES_REGTAB_IMMED, const_count); update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); for (i = 0; i < pres->ins_count; ++i) @@ -1008,16 +1010,16 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const major = param->rows; minor = param->columns; } - start_offset = const_set->register_index * table_info[table].reg_component_count; - major_stride = max(minor, table_info[table].reg_component_count); + start_offset = get_offset_reg(table, const_set->register_index); + major_stride = max(minor, get_offset_reg(table, 1)); n = min(major * major_stride, - const_set->register_count * table_info[table].reg_component_count + major_stride - 1) / major_stride; + get_offset_reg(table, const_set->register_count) + major_stride - 1) / major_stride; count = n * minor; if (((param->type == D3DXPT_FLOAT && table_type == PRES_VT_FLOAT) || (param->type == D3DXPT_INT && table_type == PRES_VT_INT) || (param->type == D3DXPT_BOOL && table_type == PRES_VT_BOOL)) && !transpose && minor == major_stride - && count == table_info[table].reg_component_count * const_set->register_count + && count == get_offset_reg(table, const_set->register_count) && count * sizeof(unsigned int) <= param->bytes) { regstore_set_values(rs, table, param->data, start_offset, count); @@ -1033,9 +1035,9 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int offset; offset = start_offset + i * major_stride + j; - if (offset / table_info[table].reg_component_count >= rs->table_sizes[table]) + if (get_reg_offset(table, offset) >= rs->table_sizes[table]) { - if (table_info[table].reg_component_count != 1) + if (table != PRES_REGTAB_OBCONST) FIXME("Output offset exceeds table size, name %s, component %u.\n", debugstr_a(param->name), i); break; @@ -1234,7 +1236,7 @@ static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstan static double exec_get_reg_value(struct d3dx_regstore *rs, enum pres_reg_tables table, unsigned int offset) { - if (!regstore_is_val_set_reg(rs, table, offset / table_info[table].reg_component_count)) + if (!regstore_is_val_set_reg(rs, table, get_reg_offset(table, offset))) WARN("Using uninitialized input, table %u, offset %u.\n", table, offset); return regstore_get_double(rs, table, offset); @@ -1251,8 +1253,8 @@ static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_oper else base_index = lrint(exec_get_reg_value(rs, opr->index_reg.table, opr->index_reg.offset)); - offset = base_index * table_info[table].reg_component_count + opr->reg.offset + comp; - reg_index = offset / table_info[table].reg_component_count; + offset = get_offset_reg(table, base_index) + opr->reg.offset + comp; + reg_index = get_reg_offset(table, offset); if (reg_index >= rs->table_sizes[table]) { @@ -1276,8 +1278,7 @@ static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_oper if (reg_index >= rs->table_sizes[table]) return 0.0; - offset = reg_index * table_info[table].reg_component_count - + offset % table_info[table].reg_component_count; + offset = get_offset_reg(table, reg_index) + offset % get_offset_reg(table, 1); } return exec_get_reg_value(rs, table, offset); @@ -1390,8 +1391,7 @@ HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, const struct d3dx return hr; } - elements_table = table_info[PRES_REGTAB_OCONST].reg_component_count - * peval->pres.regs.table_sizes[PRES_REGTAB_OCONST]; + elements_table = get_offset_reg(PRES_REGTAB_OCONST, peval->pres.regs.table_sizes[PRES_REGTAB_OCONST]); elements_param = param->bytes / sizeof(unsigned int); elements = min(elements_table, elements_param); oc = (float *)peval->pres.regs.tables[PRES_REGTAB_OCONST]; @@ -1419,7 +1419,7 @@ static HRESULT set_shader_constants_device(ID3DXEffectStateManager *manager, str if (!count) break; TRACE("Setting %u constants at %u.\n", count, start); - ptr = (BYTE *)rs->tables[table] + start * table_info[table].reg_component_count + ptr = (BYTE *)rs->tables[table] + get_offset_reg(table, start) * table_info[table].component_size; if (type == D3DXPT_VERTEXSHADER) {

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
64
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 2017