February 2007 - Wine-commits

Chris Robinson : quartz: Return proper error codes from GraphBuilder_RenderFile.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: c5ae1fc7d8b3b9a23edf1dfbd788db25f97fa394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ae1fc7d8b3b9a23edf1dfbd… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Feb 17 23:55:32 2007 -0800 quartz: Return proper error codes from GraphBuilder_RenderFile. --- dlls/quartz/filtergraph.c | 82 +++++++++++++++++++++++---------------------- 1 files changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8b38a3b..a3db8dd 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -961,9 +961,9 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, IEnumPins* penumpins; ULONG pin; HRESULT hr; - IEnumMoniker* pEnumMoniker; + IEnumMoniker* pEnumMoniker = NULL; GUID tab[2]; - IPin** ppins; + IPin** ppins = NULL; ULONG nb; IMoniker* pMoniker; IFileSourceFilter* pfile = NULL; @@ -972,6 +972,9 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, TRACE("(%p/%p)->(%s, %s)\n", This, iface, debugstr_w(lpcwstrFile), debugstr_w(lpcwstrPlayList)); + if (lpcwstrPlayList != NULL) + return E_INVALIDARG; + hr = IGraphBuilder_AddSourceFilter(iface, lpcwstrFile, string, &preader); /* Retrieve file media type */ @@ -982,6 +985,13 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, IFileSourceFilter_Release(pfile); } + if (SUCCEEDED(hr)) + hr = IBaseFilter_EnumPins(preader, &penumpins); + if (SUCCEEDED(hr)) { + hr = IEnumPins_Next(penumpins, 1, &ppinreader, &pin); + IEnumPins_Release(penumpins); + } + if (SUCCEEDED(hr)) { tab[0] = mt.majortype; tab[1] = mt.subtype; @@ -990,6 +1000,8 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, if (FAILED(hr)) { + if (pEnumMoniker) + IEnumMoniker_Release(pEnumMoniker); if (preader) { IGraphBuilder_RemoveFilter(iface, preader); IBaseFilter_Release(preader); @@ -1019,65 +1031,49 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, hr = IGraphBuilder_AddFilter(iface, psplitter, NULL); if (FAILED(hr)) { ERR("Unable add filter (%x)\n", hr); - return hr; + IBaseFilter_Release(psplitter); + continue; } /* Connect file source and splitter filters together */ /* Make the splitter analyze incoming data */ - hr = IBaseFilter_EnumPins(preader, &penumpins); - if (FAILED(hr)) { - ERR("Enumpins (%x)\n", hr); - return hr; - } - hr = IEnumPins_Next(penumpins, 1, &ppinreader, &pin); - if (FAILED(hr)) { - ERR("Next (%x)\n", hr); - return hr; - } - if (pin == 0) { - ERR("No Pin\n"); - return E_FAIL; - } - IEnumPins_Release(penumpins); hr = IBaseFilter_EnumPins(psplitter, &penumpins); - if (FAILED(hr)) { - ERR("Splitter Enumpins (%x)\n", hr); - return hr; - } - hr = IEnumPins_Next(penumpins, 1, &ppinsplitter, &pin); - if (FAILED(hr)) { - ERR("Next (%x)\n", hr); - return hr; - } - if (pin == 0) { - ERR("No Pin\n"); - return E_FAIL; + if (SUCCEEDED(hr)) { + hr = IEnumPins_Next(penumpins, 1, &ppinsplitter, &pin); + IEnumPins_Release(penumpins); } - IEnumPins_Release(penumpins); - hr = IPin_Connect(ppinreader, ppinsplitter, NULL); + if (SUCCEEDED(hr)) + hr = IPin_Connect(ppinreader, ppinsplitter, NULL); if (SUCCEEDED(hr)) { /* Make sure there's some output pins in the filter */ hr = GetInternalConnections(psplitter, ppinsplitter, &ppins, &nb); - if(SUCCEEDED(hr)) { + if (SUCCEEDED(hr)) { if(nb > 0) { TRACE("Successfully connected to filter\n"); break; } CoTaskMemFree(ppins); ppins = NULL; - TRACE("No output pins found in filter\n"); } - IBaseFilter_Release(ppinsplitter); - ppinsplitter = NULL; + + TRACE("No output pins found in filter\n"); + hr = VFW_E_CANNOT_RENDER; } + + IPin_Release(ppinsplitter); + ppinsplitter = NULL; + IGraphBuilder_RemoveFilter(iface, psplitter); + IBaseFilter_Release(psplitter); + ppinsplitter = NULL; + TRACE("Cannot connect to filter (%x), trying next one\n", hr); - hr = E_FAIL; } /* Render all output pin of the splitter by calling IGraphBuilder_Render on each of them */ if (SUCCEEDED(hr)) { + int partial = 0; int i; TRACE("pins to consider: %d\n", nb); for(i = 0; i < nb; i++) { @@ -1085,13 +1081,19 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, hr = IGraphBuilder_Render(iface, ppins[i]); if (FAILED(hr)) { ERR("Cannot render pin %p (%x)\n", ppins[i], hr); - /* FIXME: We should clean created things properly */ - break; + partial = 1; } + IPin_Release(ppins[i]); } CoTaskMemFree(ppins); + + hr = (partial ? VFW_S_PARTIAL_RENDER : S_OK); } - + + if (psplitter) + IBaseFilter_Release(psplitter); + IBaseFilter_Release(preader); + return hr; }

1 0

Chris Robinson : quartz: Check for the proper ID when querying for the IBasicAudio interface.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: e3061405ca834bdd26cd0f3d1cd9ccb232d14225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3061405ca834bdd26cd0f3d1… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Feb 17 23:16:36 2007 -0800 quartz: Check for the proper ID when querying for the IBasicAudio interface. --- dlls/quartz/dsoundrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index ee19148..32c807c 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -365,7 +365,7 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = (LPVOID)This; else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = (LPVOID)This; - else if (IsEqualIID(riid, &IID_IBaseFilter)) + else if (IsEqualIID(riid, &IID_IBasicAudio)) *ppv = (LPVOID)&(This->IBasicAudio_vtbl); if (*ppv)

1 0

Chris Robinson : quartz: Make sure the splitter has output plugins before trying to render them.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: 763fc7cf3a48709473090f3c53f03217b4e56344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=763fc7cf3a48709473090f3c5… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Feb 17 23:55:20 2007 -0800 quartz: Make sure the splitter has output plugins before trying to render them. --- dlls/quartz/filtergraph.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ebda643..8b38a3b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1057,20 +1057,26 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, IEnumPins_Release(penumpins); hr = IPin_Connect(ppinreader, ppinsplitter, NULL); - if (FAILED(hr)) { + if (SUCCEEDED(hr)) { + /* Make sure there's some output pins in the filter */ + hr = GetInternalConnections(psplitter, ppinsplitter, &ppins, &nb); + if(SUCCEEDED(hr)) { + if(nb > 0) { + TRACE("Successfully connected to filter\n"); + break; + } + CoTaskMemFree(ppins); + ppins = NULL; + TRACE("No output pins found in filter\n"); + } IBaseFilter_Release(ppinsplitter); ppinsplitter = NULL; - TRACE("Cannot connect to filter (%x), trying next one\n", hr); - continue; } - TRACE("Successfully connected to filter\n"); - break; + TRACE("Cannot connect to filter (%x), trying next one\n", hr); + hr = E_FAIL; } /* Render all output pin of the splitter by calling IGraphBuilder_Render on each of them */ - if (SUCCEEDED(hr)) - hr = GetInternalConnections(psplitter, ppinsplitter, &ppins, &nb); - if (SUCCEEDED(hr)) { int i; TRACE("pins to consider: %d\n", nb);

1 0

Hans Leidekker : msxml3: Stub out some more getters and setters of IXMLDOMDocument.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: 78e0f23b68cd25b8e6a8d792c6ca76f3e4c290db URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e0f23b68cd25b8e6a8d792c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Feb 18 19:37:18 2007 +0100 msxml3: Stub out some more getters and setters of IXMLDOMDocument. --- dlls/msxml3/domdoc.c | 50 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index bb7da60..f12c7bd 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -166,6 +166,9 @@ typedef struct _domdoc const struct IXMLDOMDocumentVtbl *lpVtbl; LONG ref; VARIANT_BOOL async; + VARIANT_BOOL validating; + VARIANT_BOOL resolving; + VARIANT_BOOL preserving; IUnknown *node_unk; IXMLDOMNode *node; HRESULT error; @@ -1195,8 +1198,11 @@ static HRESULT WINAPI domdoc_get_validateOnParse( IXMLDOMDocument *iface, VARIANT_BOOL* isValidating ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument( iface ); + + TRACE("%p <- %d\n", isValidating, This->validating); + *isValidating = This->validating; + return S_OK; } @@ -1204,8 +1210,11 @@ static HRESULT WINAPI domdoc_put_validateOnParse( IXMLDOMDocument *iface, VARIANT_BOOL isValidating ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument( iface ); + + TRACE("%d\n", isValidating); + This->validating = isValidating; + return S_OK; } @@ -1213,17 +1222,23 @@ static HRESULT WINAPI domdoc_get_resolveExternals( IXMLDOMDocument *iface, VARIANT_BOOL* isResolving ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument( iface ); + + TRACE("%p <- %d\n", isResolving, This->resolving); + *isResolving = This->resolving; + return S_OK; } static HRESULT WINAPI domdoc_put_resolveExternals( IXMLDOMDocument *iface, - VARIANT_BOOL isValidating ) + VARIANT_BOOL isResolving ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument( iface ); + + TRACE("%d\n", isResolving); + This->resolving = isResolving; + return S_OK; } @@ -1231,8 +1246,11 @@ static HRESULT WINAPI domdoc_get_preserveWhiteSpace( IXMLDOMDocument *iface, VARIANT_BOOL* isPreserving ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument( iface ); + + TRACE("%p <- %d\n", isPreserving, This->preserving); + *isPreserving = This->preserving; + return S_OK; } @@ -1240,8 +1258,11 @@ static HRESULT WINAPI domdoc_put_preserveWhiteSpace( IXMLDOMDocument *iface, VARIANT_BOOL isPreserving ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument( iface ); + + TRACE("%d\n", isPreserving); + This->preserving = isPreserving; + return S_OK; } @@ -1365,6 +1386,9 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->lpVtbl = &domdoc_vtbl; doc->ref = 1; doc->async = 0; + doc->validating = 0; + doc->resolving = 0; + doc->preserving = 0; doc->error = S_OK; xmldoc = xmlNewDoc(NULL);

1 0

Chris Robinson : quartz: Don't use uninitialized memory in ACMWrapper.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: a512b9abb57129ab40f7bb1484d3536699760741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a512b9abb57129ab40f7bb148… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Feb 17 22:17:32 2007 -0800 quartz: Don't use uninitialized memory in ACMWrapper. --- dlls/quartz/acmwrapper.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 62f0020..4b2d143 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -91,7 +91,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte This->current_size += copy_size; offset += copy_size; - if (offset == size) + if (offset >= size) stop = TRUE; if (This->current_size < This->max_size) break; @@ -256,8 +256,8 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) /* Note: This memory is managed by the transform filter once created */ This = CoTaskMemAlloc(sizeof(ACMWrapperImpl)); + ZeroMemory(This, sizeof(ACMWrapperImpl)); - This->has = 0; This->reinit_codec = TRUE; hr = TransformFilter_Create(&(This->tf), &CLSID_ACMWrapper, &ACMWrapper_FuncsTable);

1 0

Hans Leidekker : netapi32: Add a stub implementation for NetShareDel. Improve the stub for NetUserGetLocalGroups.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: ae1fde034393a780f41578ea8e22dc63a033ab07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1fde034393a780f41578ea8… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Feb 18 19:37:37 2007 +0100 netapi32: Add a stub implementation for NetShareDel. Improve the stub for NetUserGetLocalGroups. --- dlls/netapi32/access.c | 16 +++++++++++++++- dlls/netapi32/netapi32.spec | 2 +- dlls/netapi32/share.c | 9 +++++++++ include/lmaccess.h | 1 + include/lmshare.h | 1 + 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index b9155e5..7861140 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -310,10 +310,24 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, DWORD flags, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries) { + NET_API_STATUS status; + FIXME("(%s, %s, %d, %08x, %p %d, %p, %p) stub!\n", debugstr_w(servername), debugstr_w(username), level, flags, bufptr, prefmaxlen, entriesread, totalentries); - return NERR_InternalError; + + status = NETAPI_ValidateServername(servername); + if (status != NERR_Success) + return status; + + if (!NETAPI_IsKnownUser(username)) + return NERR_UserNotFound; + + if (bufptr) *bufptr = NULL; + if (entriesread) *entriesread = 0; + if (totalentries) *totalentries = 0; + + return NERR_Success; } /************************************************************ diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 52be477..65bdba4 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -190,7 +190,7 @@ @ stub NetSessionGetInfo @ stub NetShareAdd @ stub NetShareCheck -@ stub NetShareDel +@ stdcall NetShareDel(wstr wstr long) @ stub NetShareDelSticky @ stdcall NetShareEnum(wstr long ptr long ptr ptr ptr) @ stub NetShareEnumSticky diff --git a/dlls/netapi32/share.c b/dlls/netapi32/share.c index f46c04a..29f4d25 100644 --- a/dlls/netapi32/share.c +++ b/dlls/netapi32/share.c @@ -83,3 +83,12 @@ NET_API_STATUS WINAPI NetShareEnum( LPWSTR servername, DWORD level, LPBYTE* bufp return ERROR_NOT_SUPPORTED; } + +/************************************************************ + * NetShareDel (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetShareDel(LMSTR servername, LMSTR netname, DWORD reserved) +{ + FIXME("Stub (%s %s %d)\n", debugstr_w(servername), debugstr_w(netname), reserved); + return NERR_Success; +} diff --git a/include/lmaccess.h b/include/lmaccess.h index 8e405ce..41e1826 100644 --- a/include/lmaccess.h +++ b/include/lmaccess.h @@ -458,6 +458,7 @@ NET_API_STATUS WINAPI NetLocalGroupSetMembers(LPCWSTR,LPCWSTR,DWORD,LPBYTE,DWORD NET_API_STATUS WINAPI NetQueryDisplayInformation(LPCWSTR,DWORD,DWORD,DWORD,DWORD,LPDWORD,PVOID*); NET_API_STATUS WINAPI NetUserAdd(LPCWSTR,DWORD,LPBYTE,LPDWORD); NET_API_STATUS WINAPI NetUserDel(LPCWSTR,LPCWSTR); +NET_API_STATUS WINAPI NetUserGetLocalGroups(LPCWSTR,LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserEnum(LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserGetInfo(LPCWSTR,LPCWSTR,DWORD,LPBYTE*); NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR,DWORD,LPBYTE*); diff --git a/include/lmshare.h b/include/lmshare.h index 7f98be4..082abf2 100644 --- a/include/lmshare.h +++ b/include/lmshare.h @@ -32,6 +32,7 @@ typedef struct _SHARE_INFO_1 { LMSTR shi1_remark; } SHARE_INFO_1, *PSHARE_INFO_1, *LPSHARE_INFO_1; +NET_API_STATUS WINAPI NetShareDel(LMSTR servername, LMSTR netname, DWORD reserved); NET_API_STATUS WINAPI NetShareEnum(LMSTR servername, DWORD level, LPBYTE *bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle);

1 0

Hans Leidekker : usp10: Implement ScriptGetLogicalWidths.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: df2c8a2551c0fe16965248418e41f871eb3a159b URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2c8a2551c0fe16965248418… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Feb 18 19:38:07 2007 +0100 usp10: Implement ScriptGetLogicalWidths. --- dlls/usp10/usp10.c | 32 ++++++++++++++++++++++++++++++++ dlls/usp10/usp10.spec | 2 +- 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c3b0a17..b2b4b3f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1682,3 +1682,35 @@ HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) return S_OK; } + +/*********************************************************************** + * ScriptGetLogicalWidths (USP10.@) + * + * Convert advance widths to logical widths. + * + * PARAMS + * sa [I] Script analysis. + * nbchars [I] Number of characters. + * nbglyphs [I] Number of glyphs. + * glyph_width [I] Array of glyph widths. + * log_clust [I] Array of logical clusters. + * sva [I] Visual attributes. + * widths [O] Array of logical widths. + * + * RETURNS + * Success: S_OK + * Failure: a non-zero HRESULT. + */ +HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *sa, int nbchars, int nbglyphs, + const int *glyph_width, const WORD *log_clust, + const SCRIPT_VISATTR *sva, int *widths) +{ + int i; + + TRACE("(%p, %d, %d, %p, %p, %p, %p)\n", + sa, nbchars, nbglyphs, glyph_width, log_clust, sva, widths); + + /* FIXME */ + for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; + return S_OK; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index df07f43..ac1506e 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -8,7 +8,7 @@ @ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) @ stdcall ScriptGetFontProperties(long ptr ptr) @ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) -@ stub ScriptGetLogicalWidths +@ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr) @ stdcall ScriptGetProperties(ptr long) @ stdcall ScriptIsComplex(wstr long long) @ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr)

1 0

Hans Leidekker : snmpapi: Add a missing memcpy.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: 4270d13b18c67149723a0aa6b4e58aeb42b61dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4270d13b18c67149723a0aa6b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Feb 18 19:38:01 2007 +0100 snmpapi: Add a missing memcpy. --- dlls/snmpapi/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index b929ca3..b512d41 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -54,6 +54,7 @@ static INT asn_any_copy(AsnAny *dst, AsnAny *src) UINT length = src->asnValue.string.length; if (!(stream = HeapAlloc(GetProcessHeap(), 0, length))) return SNMPAPI_ERROR; + memcpy(stream, src->asnValue.string.stream, length); dst->asnValue.string.stream = stream; dst->asnValue.string.length = length;

1 0

Hans Leidekker : kernel32: Add a stub implementation for FindFirstVolumeMountPoint{A, W}.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: c56eafcb80ee6541c3218c4ac8c4cf8ade9e81cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56eafcb80ee6541c3218c4ac… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Feb 18 19:37:29 2007 +0100 kernel32: Add a stub implementation for FindFirstVolumeMountPoint{A, W}. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/volume.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ac340ff..99ec3a5 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -372,8 +372,8 @@ @ stdcall FindFirstFileExW(wstr long ptr long ptr long) @ stdcall FindFirstFileW(wstr ptr) @ stub FindFirstVolumeA -@ stub FindFirstVolumeMountPointA -@ stub FindFirstVolumeMountPointW +@ stdcall FindFirstVolumeMountPointA(str ptr long) +@ stdcall FindFirstVolumeMountPointW(wstr ptr long) @ stub FindFirstVolumeW @ stdcall FindNextChangeNotification(long) @ stdcall FindNextFileA(long ptr) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index d73e603..536fcfa 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1387,3 +1387,23 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * FindFirstVolumeMountPointA (KERNEL32.@) + */ +HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR root, LPSTR mount_point, DWORD len) +{ + FIXME("(%s, %p, %d), stub!\n", debugstr_a(root), mount_point, len); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** + * FindFirstVolumeMountPointW (KERNEL32.@) + */ +HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR root, LPWSTR mount_point, DWORD len) +{ + FIXME("(%s, %p, %d), stub!\n", debugstr_w(root), mount_point, len); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return INVALID_HANDLE_VALUE; +}

1 0

Hans Leidekker : setupapi: Add stub implementations for SetupDiGetINFClass and SetupSetSourceList.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: 275dbeb74e525c52ee0ae384d8e11068b6c949f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275dbeb74e525c52ee0ae384d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Feb 18 19:37:51 2007 +0100 setupapi: Add stub implementations for SetupDiGetINFClass and SetupSetSourceList. --- dlls/setupapi/setupapi.spec | 8 ++++---- dlls/setupapi/stubs.c | 38 ++++++++++++++++++++++++++++++++++++++ include/setupapi.h | 6 ++++++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index ed91774..92261d5 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -342,8 +342,8 @@ @ stub SetupDiGetHwProfileList @ stub SetupDiGetHwProfileListExA @ stub SetupDiGetHwProfileListExW -@ stub SetupDiGetINFClassA -@ stub SetupDiGetINFClassW +@ stdcall SetupDiGetINFClassA(str ptr ptr long ptr) +@ stdcall SetupDiGetINFClassW(wstr ptr ptr long ptr) @ stub SetupDiGetSelectedDevice @ stub SetupDiGetSelectedDriverA @ stub SetupDiGetSelectedDriverW @@ -509,8 +509,8 @@ @ stdcall SetupSetFileQueueFlags(long long long) @ stub SetupSetPlatformPathOverrideA @ stub SetupSetPlatformPathOverrideW -@ stub SetupSetSourceListA -@ stub SetupSetSourceListW +@ stdcall SetupSetSourceListA(long ptr long) +@ stdcall SetupSetSourceListW(long ptr long) @ stdcall SetupTermDefaultQueueCallback(ptr) @ stdcall SetupTerminateFileLog(long) @ stub ShouldDeviceBeExcluded diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 1ab79da..dbde71c 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -209,3 +209,41 @@ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) FIXME("%p, %p, %d\n", file_queue, owner, scan_only); return 0; } + +/*********************************************************************** + * SetupSetSourceListA (SETUPAPI.@) + */ +BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count) +{ + FIXME("0x%08x %p %d\n", flags, list, count); + return FALSE; +} + +/*********************************************************************** + * SetupSetSourceListW (SETUPAPI.@) + */ +BOOL WINAPI SetupSetSourceListW(DWORD flags, PCWSTR *list, UINT count) +{ + FIXME("0x%08x %p %d\n", flags, list, count); + return FALSE; +} + +/*********************************************************************** + * SetupDiGetINFClassA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetINFClassA(PCSTR inf, LPGUID class_guid, PSTR class_name, + DWORD size, PDWORD required_size) +{ + FIXME("%s %p %p %d %p\n", debugstr_a(inf), class_guid, class_name, size, required_size); + return FALSE; +} + +/*********************************************************************** + * SetupDiGetINFClassW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, + DWORD size, PDWORD required_size) +{ + FIXME("%s %p %p %d %p\n", debugstr_w(inf), class_guid, class_name, size, required_size); + return FALSE; +} diff --git a/include/setupapi.h b/include/setupapi.h index 7fd1099..1815324 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -777,6 +777,9 @@ BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO, PSP_DEVINFO_DATA, PSP_D BOOL WINAPI SetupDiGetDeviceInstallParamsW(HDEVINFO, PSP_DEVINFO_DATA, PSP_DEVINSTALL_PARAMS_W); #define SetupDiGetDeviceInstallParams WINELIB_NAME_AW(SetupDiGetDeviceInstallParams) BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); +BOOL WINAPI SetupDiGetINFClassA(PCSTR, LPGUID, PSTR, DWORD, PDWORD); +BOOL WINAPI SetupDiGetINFClassW(PCWSTR, LPGUID, PWSTR, DWORD, PDWORD); +#define SetupDiGetINFClass WINELIB_NAME_AW(SetupDiGetINFClass) BOOL WINAPI SetupDiInstallClassA(HWND, PCSTR, DWORD, HSPFILEQ); BOOL WINAPI SetupDiInstallClassW(HWND, PCWSTR, DWORD, HSPFILEQ); #define SetupDiInstallClass WINELIB_NAME_AW(SetupDiInstallClass) @@ -892,6 +895,9 @@ BOOL WINAPI SetupSetFileQueueAlternatePlatformA( HSPFILEQ, PSP_ALTPLATFORM_I BOOL WINAPI SetupSetFileQueueAlternatePlatformW( HSPFILEQ, PSP_ALTPLATFORM_INFO, PCWSTR ); #define SetupSetFileQueueAlternatePlatform WINELIB_NAME_AW(SetupSetFileQueueAlternatePlatform) BOOL WINAPI SetupSetFileQueueFlags( HSPFILEQ, DWORD, DWORD ); +BOOL WINAPI SetupSetSourceListA(DWORD, PCSTR *, UINT); +BOOL WINAPI SetupSetSourceListW(DWORD, PCWSTR *, UINT); +#define SetupSetSourceList WINELIB_NAME_AW(SetupSetSourceList) void WINAPI SetupTermDefaultQueueCallback( PVOID ); DWORD WINAPI StampFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR); DWORD WINAPI TakeOwnershipOfFile(PCWSTR);

1 0