October 2014 - Wine-Commits

Iván Matellanes : msvcrt: _filbuf should not lock any file.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: f896cd3dc9fc16586dd7ada2e95b66c677aad1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f896cd3dc9fc16586dd7ada2e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:35 2014 +0100 msvcrt: _filbuf should not lock any file. --- dlls/msvcr90/tests/msvcr90.c | 7 +++++++ dlls/msvcrt/file.c | 13 ++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 9bb29da..184ce76 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -118,6 +118,7 @@ static int (__cdecl *p_fileno)(FILE*); static int (__cdecl *p_feof)(FILE*); static int (__cdecl *p_ferror)(FILE*); static int (__cdecl *p_flsbuf)(int, FILE*); +static int (__cdecl *p_filbuf)(FILE*); static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); static void* (__cdecl *p__AdjustPointer)(void*, const void*); @@ -377,6 +378,7 @@ static BOOL init(void) SET(p_feof, "feof"); SET(p_ferror, "ferror"); SET(p_flsbuf, "_flsbuf"); + SET(p_filbuf, "_filbuf"); SET(p_byteswap_ulong, "_byteswap_ulong"); SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); SET(p__AdjustPointer, "__AdjustPointer"); @@ -1285,6 +1287,11 @@ static void test_nonblocking_file_access(void) ret = p_flsbuf('a', filew); ok(ret=='a', "_flsbuf(filew) returned %d\n", ret); + ret = p_filbuf(filer); + ok(ret==-1, "_filbuf(filer) returned %d\n", ret); + ret = p_filbuf(filew); + ok(ret==-1, "_filbuf(filew) returned %d\n", ret); + ret = p_fflush_nolock(filer); ok(ret==0, "_fflush_nolock(filer) returned %d\n", ret); ret = p_fflush_nolock(filew); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2e07342..d191953 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3460,12 +3460,9 @@ int CDECL MSVCRT_ferror(MSVCRT_FILE* file) int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) { unsigned char c; - MSVCRT__lock_file(file); - if(file->_flag & MSVCRT__IOSTRG) { - MSVCRT__unlock_file(file); + if(file->_flag & MSVCRT__IOSTRG) return MSVCRT_EOF; - } /* Allocate buffer if needed */ if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) @@ -3474,35 +3471,29 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) if(!(file->_flag & MSVCRT__IOREAD)) { if(file->_flag & MSVCRT__IORW) file->_flag |= MSVCRT__IOREAD; - else { - MSVCRT__unlock_file(file); + else return MSVCRT_EOF; - } } if(!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { int r; if ((r = read_i(file->_file,&c,1)) != 1) { file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; - MSVCRT__unlock_file(file); return MSVCRT_EOF; } - MSVCRT__unlock_file(file); return c; } else { file->_cnt = read_i(file->_file, file->_base, file->_bufsiz); if(file->_cnt<=0) { file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_cnt = 0; - MSVCRT__unlock_file(file); return MSVCRT_EOF; } file->_cnt--; file->_ptr = file->_base+1; c = *(unsigned char *)file->_base; - MSVCRT__unlock_file(file); return c; } }

1 0

Bruno Jesus : comctl32: Avoid magic numbers.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: f70167df587a4af9954d0733fdd3e8d0b24e0289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70167df587a4af9954d0733f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:12:23 2014 -0200 comctl32: Avoid magic numbers. --- dlls/comctl32/string.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index a9544fa..4c52f18 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -855,16 +855,15 @@ int WINAPI StrCSpnW(LPCWSTR lpszStr, LPCWSTR lpszMatch) BOOL WINAPI IntlStrEqWorkerA(BOOL bCase, LPCSTR lpszStr, LPCSTR lpszComp, int iLen) { - DWORD dwFlags = LOCALE_USE_CP_ACP; + DWORD dwFlags; int iRet; TRACE("(%d,%s,%s,%d)\n", bCase, debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); /* FIXME: This flag is undocumented and unknown by our CompareString. - * We need a define for it. */ - dwFlags = 0x10000000; + dwFlags = LOCALE_RETURN_GENITIVE_NAMES; if (!bCase) dwFlags |= NORM_IGNORECASE; iRet = CompareStringA(GetThreadLocale(), @@ -891,9 +890,8 @@ BOOL WINAPI IntlStrEqWorkerW(BOOL bCase, LPCWSTR lpszStr, LPCWSTR lpszComp, debugstr_w(lpszStr),debugstr_w(lpszComp), iLen); /* FIXME: This flag is undocumented and unknown by our CompareString. - * We need a define for it. */ - dwFlags = 0x10000000; + dwFlags = LOCALE_RETURN_GENITIVE_NAMES; if (!bCase) dwFlags |= NORM_IGNORECASE; iRet = CompareStringW(GetThreadLocale(),

1 0

Alistair Leslie-Hughes : dplayx: Fix some crashes and wine_todo's.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 60db3a4a86ad3a19682dfb483a4c4f37dff1ea29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60db3a4a86ad3a19682dfb483… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 25 15:05:40 2014 +1000 dplayx: Fix some crashes and wine_todo's. --- dlls/dplayx/tests/dplayx.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 7b6c0c0..fb6646d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -685,7 +685,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W } hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); HeapFree( GetProcessHeap(), 0, pAddress ); @@ -743,7 +743,7 @@ static void test_DirectPlayCreate(void) if ( hr == DP_OK ) IDirectPlayX_Release( pDP ); hr = DirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, &pDP, NULL ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); if ( hr == DP_OK ) IDirectPlayX_Release( pDP ); @@ -915,9 +915,9 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, if( IsEqualGUID(lpguidSP, &DPSPGUID_TCPIP) ) { hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); - todo_wine checkHR( DPERR_ALREADYINITIALIZED, hr ); + checkHR( DPERR_ALREADYINITIALIZED, hr ); } return TRUE; @@ -976,7 +976,7 @@ static void test_GetCaps(void) { hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); if ( hr == DP_OK ) @@ -1085,7 +1085,7 @@ static void test_Open(void) /* Uninitialized dpsd */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpsd_server.dwSize = sizeof(DPSESSIONDESC2); @@ -1095,7 +1095,7 @@ static void test_Open(void) /* Regular operation */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); /* Opening twice */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); @@ -1698,12 +1698,16 @@ static void test_SessionDesc(void) checkHR( DPERR_INVALIDPARAMS, hr ); hr = IDirectPlayX_GetSessionDesc( pDP[0], NULL, NULL ); checkHR( DPERR_INVALIDPARAM, hr ); +if(0) +{ + /* Crashes under Win7 */ hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); checkHR( DPERR_INVALIDPARAM, hr ); dwDataSize=-1; hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); checkHR( DPERR_INVALIDPARAMS, hr ); check( -1, dwDataSize ); +} /* Get: Insufficient buffer size */ dwDataSize=0; @@ -2498,10 +2502,14 @@ static void test_PlayerName(void) checkHR( DPERR_INVALIDPLAYER, hr ); check( 1024, dwDataSize ); +if(0) +{ + /* Crashes under Win7 */ dwDataSize = -1; hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); checkHR( DPERR_INVALIDPARAMS, hr ); check( -1, dwDataSize ); +} hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, NULL ); checkHR( DPERR_INVALIDPARAMS, hr ); @@ -5789,6 +5797,9 @@ static void test_GetMessageQueue(void) check( -1, dwNumBytes ); /* - Remote players */ +if(0) +{ + /* Crash under Win7 */ dwNumMsgs = dwNumBytes = -1; hr = IDirectPlayX_GetMessageQueue( pDP[0], 0, dpid[3], DPMESSAGEQUEUE_RECEIVE, @@ -5796,6 +5807,7 @@ static void test_GetMessageQueue(void) checkHR( DPERR_INVALIDPLAYER, hr ); /* Player 3 is remote */ check( -1, dwNumMsgs ); check( -1, dwNumBytes ); +} dwNumMsgs = dwNumBytes = -1; hr = IDirectPlayX_GetMessageQueue( pDP[0], dpid[3], 0,

1 0

Michael Stefaniuc : wininet: Simplify while loop conditions (PVS-Studio).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 06afdda61777d43f6c7d5b78157b465172b0174b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06afdda61777d43f6c7d5b781… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:38:20 2014 +0100 wininet: Simplify while loop conditions (PVS-Studio). --- dlls/wininet/http.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a98ed53..cb30b26 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -809,7 +809,7 @@ static void strip_spaces(LPWSTR start) LPWSTR str = start; LPWSTR end; - while (*str == ' ' && *str != '\0') + while (*str == ' ') str++; if (str != start) @@ -841,13 +841,13 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) if (!token) return TRUE; realm = ptr; - while (*realm == ' ' && *realm != '\0') + while (*realm == ' ') realm++; if(!strncmpiW(realm, szRealm, ARRAYSIZE(szRealm)) && (realm[ARRAYSIZE(szRealm)] == ' ' || realm[ARRAYSIZE(szRealm)] == '=')) { token++; - while (*token == ' ' && *token != '\0') + while (*token == ' ') token++; if (*token == '\0') return TRUE;

1 0

Michael Stefaniuc : riched20: SUCCEEDED() is already a BOOL (PVS-Studio).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 7f295effbd20301a7a63dc4e8e95c54ceb6189eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f295effbd20301a7a63dc4e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:28:44 2014 +0100 riched20: SUCCEEDED() is already a BOOL (PVS-Studio). --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1e62fc1..8fdaa53 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2118,7 +2118,7 @@ static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) hr = OleSetClipboard(dataObj); IDataObject_Release(dataObj); } - return SUCCEEDED(hr) != 0; + return SUCCEEDED(hr); } /* helper to send a msg filter notification */

1 0

Bruno Jesus : comctl32/tests: Remove dead assignment in comboex.c ( Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 2ccd55e56f9c0d8482ca8fe5d820b95f67647b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ccd55e56f9c0d8482ca8fe5d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:24:38 2014 -0200 comctl32/tests: Remove dead assignment in comboex.c (Cppcheck). --- dlls/comctl32/tests/comboex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index af01839..faa32a3 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -127,7 +127,7 @@ static HWND subclass_editbox(HWND hwndComboEx) static void test_comboboxex(void) { HWND myHwnd = 0; - LONG res = -1; + LONG res; COMBOBOXEXITEMA cbexItem; static const char *first_item = "First Item", *second_item = "Second Item",

1 0

Austin English : ndis.sys: Add a stub dll.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 779f7e527d1fd844f1c471f0ef40da69bf479a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=779f7e527d1fd844f1c471f0e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 29 12:30:39 2014 -0500 ndis.sys: Add a stub dll. --- configure | 2 + configure.ac | 1 + dlls/ndis.sys/Makefile.in | 4 + dlls/ndis.sys/main.c | 40 +++++++ dlls/ndis.sys/ndis.sys.spec | 276 ++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + 6 files changed, 325 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=779f7e527d1fd844f1c47…

1 0

Huw Davies : comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 433df0d5d8763e24772e60168bb8f1a664bd9ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=433df0d5d8763e24772e60168… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 28 15:01:18 2014 +0000 comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID. --- dlls/comctl32/propsheet.c | 21 +++++---------------- dlls/comctl32/tests/propsheet.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 0dd1ca7..5de0deb 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2430,15 +2430,16 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON); HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON); HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); + BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); TRACE("%d\n", dwFlags); - EnableWindow(hwndBack, FALSE); - EnableWindow(hwndNext, FALSE); - EnableWindow(hwndFinish, FALSE); + EnableWindow(hwndBack, dwFlags & PSWIZB_BACK); + EnableWindow(hwndNext, dwFlags & PSWIZB_NEXT); + EnableWindow(hwndFinish, enable_finish); /* set the default pushbutton to an enabled button */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + if (enable_finish) SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); else if (dwFlags & PSWIZB_NEXT) SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); @@ -2447,13 +2448,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) else SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); - - if (dwFlags & PSWIZB_BACK) - EnableWindow(hwndBack, TRUE); - - if (dwFlags & PSWIZB_NEXT) - EnableWindow(hwndNext, TRUE); - if (!psInfo->hasFinish) { if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH)) @@ -2463,9 +2457,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) /* Show the Finish button */ ShowWindow(hwndFinish, SW_SHOW); - - if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); } else { @@ -2475,8 +2466,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) ShowWindow(hwndNext, SW_SHOW); } } - else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); } /****************************************************************************** diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index d3112d5..2797e94 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -279,6 +279,37 @@ static INT_PTR CALLBACK nav_page_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM return FALSE; } +static WNDPROC old_nav_dialog_proc; + +static LRESULT CALLBACK new_nav_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case DM_SETDEFID: + ok( IsWindowEnabled( GetDlgItem(hwnd, wp) ), "button is not enabled\n" ); + break; + } + return CallWindowProcW( old_nav_dialog_proc, hwnd, msg, wp, lp ); +} + +static LRESULT CALLBACK hook_proc( int code, WPARAM wp, LPARAM lp ) +{ + static BOOL done; + if (code == HCBT_CREATEWND) + { + CBT_CREATEWNDW *c = (CBT_CREATEWNDW *)lp; + + /* The first dialog created will be the parent dialog */ + if (!done && c->lpcs->lpszClass == MAKEINTRESOURCEW(WC_DIALOG)) + { + old_nav_dialog_proc = (WNDPROC)SetWindowLongPtrW( (HWND)wp, GWLP_WNDPROC, (LONG_PTR)new_nav_dialog_proc ); + done = TRUE; + } + } + + return CallNextHookEx( NULL, code, wp, lp ); +} + static void test_wiznavigation(void) { HPROPSHEETPAGE hpsp[4]; @@ -291,6 +322,10 @@ static void test_wiznavigation(void) BOOL hwndtoindex_supported = TRUE; const INT nextID = 12324; const INT backID = 12323; + HHOOK hook; + + /* set up a hook proc in order to subclass the main dialog early on */ + hook = SetWindowsHookExW( WH_CBT, hook_proc, NULL, GetCurrentThreadId() ); /* create the property sheet pages */ memset(psp, 0, sizeof(PROPSHEETPAGEA) * 4); @@ -400,6 +435,7 @@ static void test_wiznavigation(void) ok(defidres == MAKELRESULT(nextID, DC_HASDEFID), "Expected default button ID to be %d, is %d\n", nextID, LOWORD(defidres)); DestroyWindow(hdlg); + UnhookWindowsHookEx( hook ); } static void test_buttons(void)

1 0

Nikolay Sivov : msxml3: Return S_FALSE in getNamedItem() of PI node.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 04305134486cadfb78643a8796ab6a13fec6c202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04305134486cadfb78643a879… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 30 11:06:27 2014 +0300 msxml3: Return S_FALSE in getNamedItem() of PI node. --- dlls/msxml3/pi.c | 4 +++- dlls/msxml3/tests/domdoc.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 6b8fc12..96fb118 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -685,7 +685,9 @@ static HRESULT dom_pi_get_qualified_item(const xmlNodePtr node, BSTR name, BSTR static HRESULT dom_pi_get_named_item(const xmlNodePtr node, BSTR name, IXMLDOMNode **item) { FIXME("(%p)->(%s %p): stub\n", node, debugstr_w(name), item ); - return E_NOTIMPL; + if (item) + *item = NULL; + return S_FALSE; } static HRESULT dom_pi_set_named_item(xmlNodePtr node, IXMLDOMNode *newItem, IXMLDOMNode **namedItem) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 038df04..b768260 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9152,6 +9152,11 @@ static void test_get_attributes(void) hr = IXMLDOMNode_get_attributes(node, &map); ok(hr == S_OK, "got %08x\n", hr); + node2 = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getNamedItem(map, _bstr_("attr"), &node2); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(node2 == NULL, "got %p\n", node2); + length = -1; hr = IXMLDOMNamedNodeMap_get_length(map, &length); EXPECT_HR(hr, S_OK);

1 0

Austin English : ntoskrnl.exe: Add ObQueryNameString stub.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 9c5f23121a4c93106142ec602da28698d128682e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5f23121a4c93106142ec602… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 29 12:32:36 2014 -0500 ntoskrnl.exe: Add ObQueryNameString stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7bb96fb..23379b8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1927,3 +1927,12 @@ VOID WINAPI IoStartNextPacket(PDEVICE_OBJECT deviceobject, BOOLEAN cancelable) { FIXME("(%p %d) stub\n", deviceobject, cancelable); } + +/***************************************************** + * ObQueryNameString (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObQueryNameString(PVOID object, POBJECT_NAME_INFORMATION name, ULONG maxlength, PULONG returnlength) +{ + FIXME("(%p %p %u %p) stub\n", object, name, maxlength, returnlength); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 11aaa2b..1512cf8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -807,7 +807,7 @@ @ stub ObMakeTemporaryObject @ stub ObOpenObjectByName @ stub ObOpenObjectByPointer -@ stub ObQueryNameString +@ stdcall ObQueryNameString(ptr ptr long ptr) @ stub ObQueryObjectAuditingByHandle @ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) @ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 37ec637..a8d90a1 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -28,4 +28,6 @@ typedef struct _KQUEUE LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; +NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); + #endif

1 0