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

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

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

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 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: 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

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

Andrey Gusev : api-ms-win-core-processthreads-l1-1-2: Add forwards.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: efaedba0d7db6fe21f6c51edfe424b734dbb5225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efaedba0d7db6fe21f6c51edf… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 29 12:22:20 2017 +0300 api-ms-win-core-processthreads-l1-1-2: Add forwards. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-2.spec | 8 ++++---- tools/make_specfiles | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index c902274..7bfbe72 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -1,5 +1,5 @@ @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA -@ stub CreateProcessAsUserW +@ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread @ stub CreateRemoteThreadEx @@ -40,9 +40,9 @@ @ stub IsProcessCritical @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stub OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stub OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @@ -58,7 +58,7 @@ @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee -@ stub SetThreadToken +@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken @ stdcall SuspendThread(long) kernel32.SuspendThread @ stdcall SwitchToThread() kernel32.SwitchToThread @ stdcall TerminateProcess(long long) kernel32.TerminateProcess diff --git a/tools/make_specfiles b/tools/make_specfiles index 280954d..e544293 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -224,7 +224,6 @@ my @dll_groups = "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-toolhelp-l1-1-0", "api-ms-win-core-sysinfo-l1-2-1", - "api-ms-win-core-processthreads-l1-1-2", "api-ms-win-core-fibers-l1-1-0", "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-localization-l1-2-1", @@ -252,6 +251,7 @@ my @dll_groups = "api-ms-win-core-namedpipe-l1-2-0", "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", + "api-ms-win-core-processthreads-l1-1-2", ], [ "kernel32",

1 0

Andrey Gusev : api-ms-win-security-activedirectoryclient-l1-1-0: Add dll.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 52afd729752c5d8a0a90d25d6eada6da280ac548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52afd729752c5d8a0a90d25d6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 29 14:04:49 2017 +0300 api-ms-win-security-activedirectoryclient-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in | 1 + .../api-ms-win-security-activedirectoryclient-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 16 insertions(+) diff --git a/configure b/configure index d2d391c..fb22627 100755 --- a/configure +++ b/configure @@ -1026,6 +1026,7 @@ enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +enable_api_ms_win_security_activedirectoryclient_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 @@ -17897,6 +17898,7 @@ wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_d wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +wine_fn_config_dll api-ms-win-security-activedirectoryclient-l1-1-0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 diff --git a/configure.ac b/configure.ac index db4d168..dde867b 100644 --- a/configure.ac +++ b/configure.ac @@ -2843,6 +2843,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-activedirectoryclient-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) diff --git a/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in new file mode 100644 index 0000000..e1e99bd --- /dev/null +++ b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-activedirectoryclient-l1-1-0.dll diff --git a/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec new file mode 100644 index 0000000..eef1c40 --- /dev/null +++ b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stub DsBindWithSpnExW +@ stub DsCrackNamesW +@ stub DsFreeDomainControllerInfoW +@ stub DsFreeNameResultW +@ stub DsFreePasswordCredentials +@ stub DsGetDomainControllerInfoW +@ stub DsMakePasswordCredentialsW +@ stub DsUnBindW diff --git a/tools/make_specfiles b/tools/make_specfiles index e544293..910bd0f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -157,6 +157,10 @@ my @dll_groups = "api-ms-win-power-setting-l1-1-0", ], [ + "ntdsapi", + "api-ms-win-security-activedirectoryclient-l1-1-0", + ], + [ "kernel32", "api-ms-win-appmodel-identity-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1",

1 0

André Hentschel : iphlpapi: Add partial implementation of GetIfTable2Ex.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: ebf5b23ccb2be6a1d44de7c35e7c1df662136a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf5b23ccb2be6a1d44de7c35… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 25 16:15:21 2017 +0200 iphlpapi: Add partial implementation of GetIfTable2Ex. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 21 +++++++++++++++++---- dlls/iphlpapi/tests/iphlpapi.c | 33 +++++++++++++++++++++++++++++++++ include/netioapi.h | 6 ++++++ 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 4e5970c..fee9960 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -92,7 +92,7 @@ #@ stub GetIfStackTable @ stdcall GetIfTable( ptr ptr long ) @ stdcall GetIfTable2( ptr ) -#@ stub GetIfTable2Ex +@ stdcall GetIfTable2Ex( long ptr ) @ stub GetIfTableFromStack @ stub GetIgmpList @ stdcall GetInterfaceInfo( ptr ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c592a90..d0e13e4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1852,17 +1852,21 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) } /****************************************************************** - * GetIfTable2 (IPHLPAPI.@) + * GetIfTable2Ex (IPHLPAPI.@) */ -DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) +DWORD WINAPI GetIfTable2Ex( MIB_IF_TABLE_LEVEL level, MIB_IF_TABLE2 **table ) { DWORD i, nb_interfaces, size = sizeof(MIB_IF_TABLE2); InterfaceIndexTable *index_table; MIB_IF_TABLE2 *ret; - TRACE( "table %p\n", table ); + TRACE( "level %u, table %p\n", level, table ); - if (!table) return ERROR_INVALID_PARAMETER; + if (!table || level > MibIfTableRaw) + return ERROR_INVALID_PARAMETER; + + if (level != MibIfTableNormal) + FIXME("level %u not fully supported\n", level); if ((nb_interfaces = get_interface_indices( FALSE, NULL )) > 1) size += (nb_interfaces - 1) * sizeof(MIB_IF_ROW2); @@ -1890,6 +1894,15 @@ DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) } /****************************************************************** + * GetIfTable2 (IPHLPAPI.@) + */ +DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) +{ + TRACE( "table %p\n", table ); + return GetIfTable2Ex(MibIfTableNormal, table); +} + +/****************************************************************** * GetInterfaceInfo (IPHLPAPI.@) * * Get a list of network interface adapters. diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 3369f78..d8c319e 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -58,6 +58,7 @@ static DWORD (WINAPI *pGetIfEntry2)(PMIB_IF_ROW2); static DWORD (WINAPI *pGetFriendlyIfIndex)(DWORD); static DWORD (WINAPI *pGetIfTable)(PMIB_IFTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetIfTable2)(PMIB_IF_TABLE2*); +static DWORD (WINAPI *pGetIfTable2Ex)(MIB_IF_TABLE_LEVEL,PMIB_IF_TABLE2*); static DWORD (WINAPI *pGetIpForwardTable)(PMIB_IPFORWARDTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetIpNetTable)(PMIB_IPNETTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetInterfaceInfo)(PIP_INTERFACE_INFO,PULONG); @@ -110,6 +111,7 @@ static void loadIPHlpApi(void) pGetFriendlyIfIndex = (void *)GetProcAddress(hLibrary, "GetFriendlyIfIndex"); pGetIfTable = (void *)GetProcAddress(hLibrary, "GetIfTable"); pGetIfTable2 = (void *)GetProcAddress(hLibrary, "GetIfTable2"); + pGetIfTable2Ex = (void *)GetProcAddress(hLibrary, "GetIfTable2Ex"); pGetIpForwardTable = (void *)GetProcAddress(hLibrary, "GetIpForwardTable"); pGetIpNetTable = (void *)GetProcAddress(hLibrary, "GetIpNetTable"); pGetInterfaceInfo = (void *)GetProcAddress(hLibrary, "GetInterfaceInfo"); @@ -2023,6 +2025,36 @@ static void test_GetIfTable2(void) pFreeMibTable( table ); } +static void test_GetIfTable2Ex(void) +{ + DWORD ret; + MIB_IF_TABLE2 *table; + + if (!pGetIfTable2Ex) + { + win_skip( "GetIfTable2Ex not available\n" ); + return; + } + + table = NULL; + ret = pGetIfTable2Ex( MibIfTableNormal, &table ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( table != NULL, "table not set\n" ); + pFreeMibTable( table ); + + table = NULL; + ret = pGetIfTable2Ex( MibIfTableRaw, &table ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( table != NULL, "table not set\n" ); + pFreeMibTable( table ); + + table = NULL; + ret = pGetIfTable2Ex( 2, &table ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( !table, "table should not be set\n" ); + pFreeMibTable( table ); +} + static void test_GetUnicastIpAddressEntry(void) { IP_ADAPTER_ADDRESSES *aa, *ptr; @@ -2208,6 +2240,7 @@ START_TEST(iphlpapi) test_interface_identifier_conversion(); test_GetIfEntry2(); test_GetIfTable2(); + test_GetIfTable2Ex(); test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); freeIPHlpApi(); diff --git a/include/netioapi.h b/include/netioapi.h index cabfe9e..4f5f671 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -21,6 +21,12 @@ #include <ntddndis.h> +typedef enum _MIB_IF_TABLE_LEVEL +{ + MibIfTableNormal, + MibIfTableRaw +} MIB_IF_TABLE_LEVEL, *PMIB_IF_TABLE_LEVEL; + typedef enum _MIB_NOTIFICATION_TYPE { MibParameterNotification,

1 0

Alexandre Julliard : configure: Add Android driver stub.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: e11f2397ac847872fc8e5547c95ad7f0d9ed824b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11f2397ac847872fc8e5547c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 12:58:03 2017 +0200 configure: Add Android driver stub. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 +++++++++++++++- configure.ac | 15 ++++++++++++++- dlls/wineandroid.drv/Makefile.in | 1 + dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/configure b/configure index fb22627..9751fa0 100755 --- a/configure +++ b/configure @@ -1465,6 +1465,7 @@ enable_wimgapi enable_windowscodecs enable_windowscodecsext enable_winealsa_drv +enable_wineandroid_drv enable_winebus_sys enable_winecoreaudio_drv enable_wined3d @@ -8367,6 +8368,7 @@ fi linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" LDEXECFLAGS="-Wl,-pie" + enable_wineandroid_drv=${enable_wineandroid_drv:-yes} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : @@ -8481,6 +8483,16 @@ fi LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so" + + if test "x$exec_prefix" = xNONE + then + case $host_cpu in + *i[3456]86*) exec_prefix='${prefix}/x86' ;; + *x86_64*) exec_prefix='${prefix}/x86_64' ;; + *arm*) exec_prefix='${prefix}/armeabi-v7a' ;; + *aarch64*) exec_prefix='${prefix}/arm64-v8a' ;; + esac + fi ;; *) @@ -8873,6 +8885,7 @@ esac enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no} +enable_wineandroid_drv=${enable_wineandroid_drv:-no} enable_winemac_drv=${enable_winemac_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} @@ -11002,7 +11015,7 @@ else X_LIBS="" fi -if test "$enable_winemac_drv" = "no" +if test "$enable_wineandroid_drv$enable_winemac_drv" = "nono" then if test "x$X_LIBS" = "x"; then : case "x$with_x" in @@ -18562,6 +18575,7 @@ wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test wine_fn_config_dll windowscodecsext enable_windowscodecsext implib wine_fn_config_test dlls/windowscodecsext/tests windowscodecsext_test wine_fn_config_dll winealsa.drv enable_winealsa_drv +wine_fn_config_dll wineandroid.drv enable_wineandroid_drv wine_fn_config_dll winebus.sys enable_winebus_sys wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 diff --git a/configure.ac b/configure.ac index dde867b..74fdf11 100644 --- a/configure.ac +++ b/configure.ac @@ -851,6 +851,7 @@ case $host_os in linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" LDEXECFLAGS="-Wl,-pie" + enable_wineandroid_drv=${enable_wineandroid_drv:-yes} WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], @@ -865,6 +866,16 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so") AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"]) + + if test "x$exec_prefix" = xNONE + then + case $host_cpu in + *i[[3456]]86*) exec_prefix='${prefix}/x86' ;; + *x86_64*) exec_prefix='${prefix}/x86_64' ;; + *arm*) exec_prefix='${prefix}/armeabi-v7a' ;; + *aarch64*) exec_prefix='${prefix}/arm64-v8a' ;; + esac + fi ;; *) @@ -938,6 +949,7 @@ esac enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no} +enable_wineandroid_drv=${enable_wineandroid_drv:-no} enable_winemac_drv=${enable_winemac_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} @@ -1175,7 +1187,7 @@ else X_LIBS="" fi -if test "$enable_winemac_drv" = "no" +if test "$enable_wineandroid_drv$enable_winemac_drv" = "nono" then WINE_ERROR_WITH(x,[test "x$X_LIBS" = "x"], [X ${notice_platform}development files not found. Wine will be built @@ -3507,6 +3519,7 @@ WINE_CONFIG_TEST(dlls/windowscodecs/tests) WINE_CONFIG_DLL(windowscodecsext,,[implib]) WINE_CONFIG_TEST(dlls/windowscodecsext/tests) WINE_CONFIG_DLL(winealsa.drv) +WINE_CONFIG_DLL(wineandroid.drv) WINE_CONFIG_DLL(winebus.sys) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in new file mode 100644 index 0000000..5fd0180 --- /dev/null +++ b/dlls/wineandroid.drv/Makefile.in @@ -0,0 +1 @@ +MODULE = wineandroid.drv diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec new file mode 100644 index 0000000..30fd8e1 --- /dev/null +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -0,0 +1 @@ +# Nothing here yet

1 0