April 2014 - Wine-Commits - list.winehq.org

Piotr Caban : ole32: Try to open 1Ole stream before trying to create it in SetConvertStg function.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 046d7c6d4281f66e060b9da46b9f35d4bec3d8b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046d7c6d4281f66e060b9da46… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:55:41 2014 +0200 ole32: Try to open 1Ole stream before trying to create it in SetConvertStg function. --- dlls/ole32/storage32.c | 59 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a6d30ab..8ad3ff9 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9510,51 +9510,52 @@ HRESULT WINAPI GetConvertStg(IStorage *stg) */ HRESULT WINAPI SetConvertStg(IStorage *storage, BOOL convert) { + static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; DWORD flags = convert ? OleStream_Convert : 0; + IStream *stream; + DWORD header[2]; HRESULT hr; TRACE("(%p, %d)\n", storage, convert); - hr = STORAGE_CreateOleStream(storage, flags); - if (hr == STG_E_FILEALREADYEXISTS) + hr = IStorage_OpenStream(storage, stream_1oleW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); + if (FAILED(hr)) { - static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; - IStream *stream; - DWORD header[2]; + if (hr != STG_E_FILENOTFOUND) + return hr; + + return STORAGE_CreateOleStream(storage, flags); + } - hr = IStorage_OpenStream(storage, stream_1oleW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); - if (FAILED(hr)) return hr; + hr = IStream_Read(stream, header, sizeof(header), NULL); + if (FAILED(hr)) + { + IStream_Release(stream); + return hr; + } - hr = IStream_Read(stream, header, sizeof(header), NULL); + /* update flag if differs */ + if ((header[1] ^ flags) & OleStream_Convert) + { + LARGE_INTEGER pos = {{0}}; + + if (header[1] & OleStream_Convert) + flags = header[1] & ~OleStream_Convert; + else + flags = header[1] | OleStream_Convert; + + pos.QuadPart = sizeof(DWORD); + hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); if (FAILED(hr)) { IStream_Release(stream); return hr; } - /* update flag if differs */ - if ((header[1] ^ flags) & OleStream_Convert) - { - LARGE_INTEGER pos; - - if (header[1] & OleStream_Convert) - flags = header[1] & ~OleStream_Convert; - else - flags = header[1] | OleStream_Convert; - - pos.QuadPart = sizeof(DWORD); - hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - { - IStream_Release(stream); - return hr; - } - - hr = IStream_Write(stream, &flags, sizeof(flags), NULL); - } - IStream_Release(stream); + hr = IStream_Write(stream, &flags, sizeof(flags), NULL); } + IStream_Release(stream); return hr; }

1 0

Piotr Caban : ole32: Get CLSID from IStorage object in WriteFmtUserTypeStg.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 2db5418e02d190282dd11c16574553bd8d3add27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db5418e02d190282dd11c165… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:55:50 2014 +0200 ole32: Get CLSID from IStorage object in WriteFmtUserTypeStg. --- dlls/ole32/storage32.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8ad3ff9..864a5ec 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8760,9 +8760,10 @@ static HRESULT STORAGE_WriteCompObj( LPSTORAGE pstg, CLSID *clsid, HRESULT WINAPI WriteFmtUserTypeStg( LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR lpszUserType) { + STATSTG stat; HRESULT r; WCHAR szwClipName[0x40]; - CLSID clsid = CLSID_NULL; + CLSID clsid; LPWSTR wstrProgID = NULL; DWORD n; @@ -8778,12 +8779,12 @@ HRESULT WINAPI WriteFmtUserTypeStg( TRACE("Clipboard name is %s\n", debugstr_w(szwClipName)); - /* FIXME: There's room to save a CLSID and its ProgID, but - the CLSID is not looked up in the registry and in all the - tests I wrote it was CLSID_NULL. Where does it come from? - */ + r = IStorage_Stat(pstg, &stat, STATFLAG_NONAME); + if(SUCCEEDED(r)) + clsid = stat.clsid; + else + clsid = CLSID_NULL; - /* get the real program ID. This may fail, but that's fine */ ProgIDFromCLSID(&clsid, &wstrProgID); TRACE("progid is %s\n",debugstr_w(wstrProgID));

1 0

Piotr Caban : ole32: Add more SetConvertStg amd WriteFmtUserTypeStg tests.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 2fbbe143beaf6720398e686267973ac9e01969d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fbbe143beaf6720398e68626… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:56:10 2014 +0200 ole32: Add more SetConvertStg amd WriteFmtUserTypeStg tests. --- dlls/ole32/tests/ole2.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 9761614..05e8c4f 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2301,8 +2301,6 @@ static void test_OleDoAutoConvert(void) ok(!comp_obj_data.unicode_user_type_len, "unicode_user_type_len = %d\n", comp_obj_data.unicode_user_type_len); ok(!comp_obj_data.unicode_clipboard_format_len, "unicode_clipboard_format_len = %d\n", comp_obj_data.unicode_clipboard_format_len); ok(!comp_obj_data.reserved4, "reserved4 %d\n", comp_obj_data.reserved4); - ret = IStream_Release(comp_obj_stream); - ok(!ret, "comp_obj_stream was not freed\n"); hr = IStream_Seek(ole_stream, pos, STREAM_SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek returned %x\n", hr); @@ -2312,6 +2310,38 @@ static void test_OleDoAutoConvert(void) ok(ole_data.flags == 4, "flags = %x\n", ole_data.flags); for(i=2; i<sizeof(ole_data)/sizeof(DWORD); i++) ok(((DWORD*)&ole_data)[i] == 0, "ole_data[%d] = %x\n", i, ((DWORD*)&ole_data)[i]); + + SET_EXPECT(Storage_OpenStream_Ole); + hr = SetConvertStg(&Storage, TRUE); + ok(hr == S_OK, "SetConvertStg returned %x\n", hr); + CHECK_CALLED(Storage_OpenStream_Ole); + + SET_EXPECT(Storage_OpenStream_CompObj); + SET_EXPECT(Storage_Stat); + SET_EXPECT(Storage_CreateStream_CompObj); + hr = WriteFmtUserTypeStg(&Storage, 0, NULL); + ok(hr == S_OK, "WriteFmtUserTypeStg returned %x\n", hr); + todo_wine CHECK_CALLED(Storage_OpenStream_CompObj); + CHECK_CALLED(Storage_Stat); + CHECK_CALLED(Storage_CreateStream_CompObj); + hr = IStream_Seek(comp_obj_stream, pos, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek returned %x\n", hr); + hr = IStream_Read(comp_obj_stream, &comp_obj_data, sizeof(comp_obj_data), NULL); + ok(hr == S_OK, "IStream_Read returned %x\n", hr); + ok(comp_obj_data.reserved1 == 0xfffe0001, "reserved1 = %x\n", comp_obj_data.reserved1); + ok(comp_obj_data.version == 0xa03, "version = %x\n", comp_obj_data.version); + ok(comp_obj_data.reserved2[0] == -1, "reserved2[0] = %x\n", comp_obj_data.reserved2[0]); + ok(IsEqualIID(comp_obj_data.reserved2+1, &CLSID_WineTestOld), "reserved2 = %s\n", wine_dbgstr_guid((CLSID*)(comp_obj_data.reserved2+1))); + ok(!comp_obj_data.ansi_user_type_len, "ansi_user_type_len = %d\n", comp_obj_data.ansi_user_type_len); + ok(!comp_obj_data.ansi_clipboard_format_len, "ansi_clipboard_format_len = %d\n", comp_obj_data.ansi_clipboard_format_len); + ok(!comp_obj_data.reserved3, "reserved3 = %x\n", comp_obj_data.reserved3); + ok(comp_obj_data.unicode_marker == 0x71b239f4, "unicode_marker = %x\n", comp_obj_data.unicode_marker); + ok(!comp_obj_data.unicode_user_type_len, "unicode_user_type_len = %d\n", comp_obj_data.unicode_user_type_len); + ok(!comp_obj_data.unicode_clipboard_format_len, "unicode_clipboard_format_len = %d\n", comp_obj_data.unicode_clipboard_format_len); + ok(!comp_obj_data.reserved4, "reserved4 %d\n", comp_obj_data.reserved4); + + ret = IStream_Release(comp_obj_stream); + ok(!ret, "comp_obj_stream was not freed\n"); ret = IStream_Release(ole_stream); ok(!ret, "ole_stream was not freed\n");

1 0

Piotr Caban : ole32: Don't write empty CLIPFORMAT in WriteFmtUserTypeStg.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: f83d24d4f7eb19df21d60458a48243dd6b5c44d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83d24d4f7eb19df21d60458a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:55:31 2014 +0200 ole32: Don't write empty CLIPFORMAT in WriteFmtUserTypeStg. --- dlls/ole32/storage32.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b859ad1..a6d30ab 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8769,8 +8769,12 @@ HRESULT WINAPI WriteFmtUserTypeStg( TRACE("(%p,%x,%s)\n",pstg,cf,debugstr_w(lpszUserType)); /* get the clipboard format name */ - n = GetClipboardFormatNameW( cf, szwClipName, sizeof(szwClipName)/sizeof(szwClipName[0]) ); - szwClipName[n]=0; + if( cf ) + { + n = GetClipboardFormatNameW( cf, szwClipName, + sizeof(szwClipName)/sizeof(szwClipName[0]) ); + szwClipName[n]=0; + } TRACE("Clipboard name is %s\n", debugstr_w(szwClipName)); @@ -8784,8 +8788,8 @@ HRESULT WINAPI WriteFmtUserTypeStg( TRACE("progid is %s\n",debugstr_w(wstrProgID)); - r = STORAGE_WriteCompObj( pstg, &clsid, - lpszUserType, szwClipName, wstrProgID ); + r = STORAGE_WriteCompObj( pstg, &clsid, lpszUserType, + cf ? szwClipName : NULL, wstrProgID ); CoTaskMemFree(wstrProgID);

1 0

Piotr Caban : ole32: Add OleDoAutoConvert implementation.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 0d4c693a7bce3255d896208a58d5094762090339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4c693a7bce3255d896208a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:55:59 2014 +0200 ole32: Add OleDoAutoConvert implementation. --- dlls/ole32/ole2.c | 55 ++++++- dlls/ole32/tests/ole2.c | 366 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 419 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d4c693a7bce3255d8962…

1 0

Hans Leidekker : netprofm: Add a couple of tests for INetworkListManager.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 3b63733bcbad751763d6f7a067d96aa2bb789152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b63733bcbad751763d6f7a06… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 7 14:58:48 2014 +0200 netprofm: Add a couple of tests for INetworkListManager. --- configure | 1 + configure.ac | 1 + dlls/netprofm/tests/Makefile.in | 5 +++ dlls/netprofm/tests/list.c | 66 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/configure b/configure index ceae545..fae5c0a 100755 --- a/configure +++ b/configure @@ -17054,6 +17054,7 @@ wine_fn_config_test dlls/netapi32/tests netapi32_test wine_fn_config_dll netcfgx enable_netcfgx clean wine_fn_config_test dlls/netcfgx/tests netcfgx_test wine_fn_config_dll netprofm enable_netprofm clean +wine_fn_config_test dlls/netprofm/tests netprofm_test wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml diff --git a/configure.ac b/configure.ac index 3a70159..7e463b9 100644 --- a/configure.ac +++ b/configure.ac @@ -3032,6 +3032,7 @@ WINE_CONFIG_TEST(dlls/netapi32/tests) WINE_CONFIG_DLL(netcfgx,,[clean]) WINE_CONFIG_TEST(dlls/netcfgx/tests) WINE_CONFIG_DLL(netprofm,,[clean]) +WINE_CONFIG_TEST(dlls/netprofm/tests) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) diff --git a/dlls/netprofm/tests/Makefile.in b/dlls/netprofm/tests/Makefile.in new file mode 100644 index 0000000..45b8809 --- /dev/null +++ b/dlls/netprofm/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = netprofm.dll +IMPORTS = ole32 + +C_SRCS = \ + list.c diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c new file mode 100644 index 0000000..9ac427e --- /dev/null +++ b/dlls/netprofm/tests/list.c @@ -0,0 +1,66 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#include <stdio.h> +#include "windows.h" +#define COBJMACROS +#include "initguid.h" +#include "objbase.h" +#include "netlistmgr.h" +#include "wine/test.h" + +static void test_INetworkListManager( void ) +{ + INetworkListManager *mgr; + NLM_CONNECTIVITY connectivity; + VARIANT_BOOL connected; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_NetworkListManager, NULL, CLSCTX_INPROC_SERVER, + &IID_INetworkListManager, (void **)&mgr ); + if (hr != S_OK) + { + win_skip( "can't create instance of NetworkListManager\n" ); + return; + } + + connectivity = 0xdeadbeef; + hr = INetworkListManager_GetConnectivity( mgr, &connectivity ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connectivity != 0xdeadbeef, "unchanged value\n" ); + trace( "GetConnectivity: %08x\n", connectivity ); + + connected = 0xdead; + hr = INetworkListManager_IsConnected( mgr, &connected ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); + + connected = 0xdead; + hr = INetworkListManager_IsConnectedToInternet( mgr, &connected ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); + + INetworkListManager_Release( mgr ); +} + +START_TEST( list ) +{ + CoInitialize( NULL ); + test_INetworkListManager(); + CoUninitialize(); +}

1 0

Huw Davies : ntdll: For Android look in /proc/ mounts for mounted file systems.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: ac79e160e7a11ad6b822e4b3d1854138190de488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac79e160e7a11ad6b822e4b3d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 7 13:22:11 2014 +0100 ntdll: For Android look in /proc/mounts for mounted file systems. --- dlls/ntdll/directory.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 641f642..890fb71 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -685,6 +685,13 @@ static char *get_default_drive_device( const char *root ) RtlEnterCriticalSection( &dir_section ); +#ifdef __ANDROID__ + if ((f = fopen( "/proc/mounts", "r" ))) + { + device = parse_mount_entries( f, st.st_dev, st.st_ino ); + fclose( f ); + } +#else if ((f = fopen( "/etc/mtab", "r" ))) { device = parse_mount_entries( f, st.st_dev, st.st_ino ); @@ -696,6 +703,7 @@ static char *get_default_drive_device( const char *root ) device = parse_mount_entries( f, st.st_dev, st.st_ino ); fclose( f ); } +#endif if (device) { ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(device) + 1 ); @@ -827,7 +835,11 @@ static char *get_device_mount_point( dev_t dev ) RtlEnterCriticalSection( &dir_section ); +#ifdef __ANDROID__ + if ((f = fopen( "/proc/mounts", "r" ))) +#else if ((f = fopen( "/etc/mtab", "r" ))) +#endif { struct mntent *entry; struct stat st;

1 0

Huw Davies : ntdll: Add a replacement getmntent for Android.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 2139df003f8c33fc5306345efbbcea7f54bfa907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2139df003f8c33fc5306345ef… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 7 13:22:10 2014 +0100 ntdll: Add a replacement getmntent for Android. Bionic has a stub function named getmntent which outputs an unimplemented message. --- dlls/ntdll/directory.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 78b3ea7..641f642 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -365,6 +365,107 @@ static char *get_default_lpt_device( int num ) return ret; } +#ifdef __ANDROID__ + +static char *unescape_field( char *str ) +{ + char *in, *out; + + for (in = out = str; *in; in++, out++) + { + *out = *in; + if (in[0] == '\\') + { + if (in[1] == '\\') + { + out[0] = '\\'; + in++; + } + else if (in[1] == '0' && in[2] == '4' && in[3] == '0') + { + out[0] = ' '; + in += 3; + } + else if (in[1] == '0' && in[2] == '1' && in[3] == '1') + { + out[0] = '\t'; + in += 3; + } + else if (in[1] == '0' && in[2] == '1' && in[3] == '2') + { + out[0] = '\n'; + in += 3; + } + else if (in[1] == '1' && in[2] == '3' && in[3] == '4') + { + out[0] = '\\'; + in += 3; + } + } + } + *out = '\0'; + + return str; +} + +static inline char *get_field( char **str ) +{ + char *ret; + + ret = strsep( str, " \t" ); + if (*str) *str += strspn( *str, " \t" ); + + return ret; +} +/************************************************************************ + * getmntent_replacement + * + * getmntent replacement for Android. + * + * NB returned static buffer is not thread safe; protect with dir_section. + */ +static struct mntent *getmntent_replacement( FILE *f ) +{ + static struct mntent entry; + static char buf[4096]; + char *p, *start; + + do + { + if (!fgets( buf, sizeof(buf), f )) return NULL; + p = strchr( buf, '\n' ); + if (p) *p = '\0'; + else /* Partially unread line, move file ptr to end */ + { + char tmp[1024]; + while (fgets( tmp, sizeof(tmp), f )) + if (strchr( tmp, '\n' )) break; + } + start = buf + strspn( buf, " \t" ); + } while (start[0] == '\0' || start[0] == '#'); + + p = get_field( &start ); + entry.mnt_fsname = p ? unescape_field( p ) : (char *)""; + + p = get_field( &start ); + entry.mnt_dir = p ? unescape_field( p ) : (char *)""; + + p = get_field( &start ); + entry.mnt_type = p ? unescape_field( p ) : (char *)""; + + p = get_field( &start ); + entry.mnt_opts = p ? unescape_field( p ) : (char *)""; + + p = get_field( &start ); + entry.mnt_freq = p ? atoi(p) : 0; + + p = get_field( &start ); + entry.mnt_passno = p ? atoi(p) : 0; + + return &entry; +} +#define getmntent getmntent_replacement +#endif /*********************************************************************** * DIR_get_drives_info

1 0

Nikolay Sivov : msxml3/tests: Protect from invalid array access (Coverity) .
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 6ed7d9dd1c1d009d760cead40cc8599c3f71620a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed7d9dd1c1d009d760cead40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 7 09:24:19 2014 +0400 msxml3/tests: Protect from invalid array access (Coverity). --- dlls/msxml3/tests/saxreader.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5b78e9a..1032b8c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1515,8 +1515,13 @@ static HRESULT WINAPI isaxattributes_getQName( ok(index >= 0 && index <= 2, "invalid index received %d\n", index); - *QName = attrqnamesW[index]; - *QNameLength = attrqnamelen[index]; + if (index >= 0 && index <= 2) { + *QName = attrqnamesW[index]; + *QNameLength = attrqnamelen[index]; + } else { + *QName = NULL; + *QNameLength = 0; + } return S_OK; } @@ -1601,8 +1606,13 @@ static HRESULT WINAPI isaxattributes_getValue(ISAXAttributes* iface, int index, ok(index >= 0 && index <= 2, "invalid index received %d\n", index); - *value = attrvaluesW[index]; - *nValue = attrvalueslen[index]; + if (index >= 0 && index <= 2) { + *value = attrvaluesW[index]; + *nValue = attrvalueslen[index]; + } else { + *value = NULL; + *nValue = 0; + } return S_OK; }

1 0

Hans Leidekker : netprofm: Register interfaces.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 14ab04ab0524552b8dad473957f6b90ccebc1881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ab04ab0524552b8dad47395… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 7 14:58:26 2014 +0200 netprofm: Register interfaces. --- configure | 2 +- configure.ac | 2 +- dlls/netprofm/Makefile.in | 2 ++ dlls/netprofm/main.c | 16 ++++++++++++++++ dlls/netprofm/netprofm.idl | 23 +++++++++++++++++++++++ dlls/netprofm/netprofm.spec | 4 ++-- include/netlistmgr.idl | 5 +++++ 7 files changed, 50 insertions(+), 4 deletions(-) diff --git a/configure b/configure index d65c398..ceae545 100755 --- a/configure +++ b/configure @@ -17053,7 +17053,7 @@ wine_fn_config_dll netapi32 enable_netapi32 implib wine_fn_config_test dlls/netapi32/tests netapi32_test wine_fn_config_dll netcfgx enable_netcfgx clean wine_fn_config_test dlls/netcfgx/tests netcfgx_test -wine_fn_config_dll netprofm enable_netprofm +wine_fn_config_dll netprofm enable_netprofm clean wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml diff --git a/configure.ac b/configure.ac index fbdc269..3a70159 100644 --- a/configure.ac +++ b/configure.ac @@ -3031,7 +3031,7 @@ WINE_CONFIG_DLL(netapi32,,[implib]) WINE_CONFIG_TEST(dlls/netapi32/tests) WINE_CONFIG_DLL(netcfgx,,[clean]) WINE_CONFIG_TEST(dlls/netcfgx/tests) -WINE_CONFIG_DLL(netprofm) +WINE_CONFIG_DLL(netprofm,,[clean]) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index 133b82a..4dadfb0 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -3,3 +3,5 @@ MODULE = netprofm.dll C_SRCS = \ list.c \ main.c + +IDL_SRCS = netprofm.idl diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index ff694d9..4ba3cd5 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -144,3 +144,19 @@ HRESULT WINAPI DllCanUnloadNow( void ) { return S_FALSE; } + +/*********************************************************************** + * DllRegisterServer (NETPROFM.@) + */ +HRESULT WINAPI DllRegisterServer( void ) +{ + return __wine_register_resources( instance ); +} + +/*********************************************************************** + * DllUnregisterServer (NETPROFM.@) + */ +HRESULT WINAPI DllUnregisterServer( void ) +{ + return __wine_unregister_resources( instance ); +} diff --git a/dlls/netprofm/netprofm.idl b/dlls/netprofm/netprofm.idl new file mode 100644 index 0000000..31a4565 --- /dev/null +++ b/dlls/netprofm/netprofm.idl @@ -0,0 +1,23 @@ +/* + * COM Classes for netprofm + * + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#pragma makedep register + +#include "netlistmgr.idl" diff --git a/dlls/netprofm/netprofm.spec b/dlls/netprofm/netprofm.spec index c534b4f..b16365d 100644 --- a/dlls/netprofm/netprofm.spec +++ b/dlls/netprofm/netprofm.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index 51393b9..6adca14 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -19,6 +19,10 @@ import "oaidl.idl"; import "objidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#endif + interface IEnumNetworks; interface IEnumNetworkConnections; interface INetwork; @@ -80,6 +84,7 @@ interface INetworkListManager : IDispatch } [ + threading(both), uuid(dcb00c01-570f-4a9b-8d69-199fdba5723b) ] coclass NetworkListManager { interface INetworkListManager; }

1 0