December 2012 - Wine-Commits

Piotr Caban : msvcrt: Added _set_fmode and _get_fmode implementation.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: dfca87db71dcade741ef95dededce37c53479578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfca87db71dcade741ef95ded… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 21 13:37:47 2012 +0100 msvcrt: Added _set_fmode and _get_fmode implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/data.c | 25 +++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8f0ecdb..38ae28a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -868,7 +868,7 @@ @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno -@ stub _get_fmode +@ cdecl _get_fmode(ptr) msvcrt._get_fmode @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @@ -1266,7 +1266,7 @@ @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode -@ stub _set_fmode +@ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b4eaf7b..c9469e7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -523,7 +523,7 @@ @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno -@ stub _get_fmode +@ cdecl _get_fmode(ptr) msvcrt._get_fmode @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @@ -928,7 +928,7 @@ @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode -@ stub _set_fmode +@ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 90b4b04..bf54f0a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -518,7 +518,7 @@ @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno -@ stub _get_fmode +@ cdecl _get_fmode(ptr) msvcrt._get_fmode @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @@ -921,7 +921,7 @@ @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode -@ stub _set_fmode +@ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 94254ab..a9505ed 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -186,6 +186,31 @@ int CDECL _get_wpgmptr(WCHAR** p) unsigned int* CDECL __p__fmode(void) { return &MSVCRT__fmode; } /*********************************************************************** + * _set_fmode (MSVCRT.@) + */ +int CDECL _set_fmode(int mode) +{ + /* TODO: support _O_WTEXT */ + if(!MSVCRT_CHECK_PMT(mode==MSVCRT__O_TEXT || mode==MSVCRT__O_BINARY)) + return MSVCRT_EINVAL; + + MSVCRT__fmode = mode; + return 0; +} + +/*********************************************************************** + * _get_fmode (MSVCRT.@) + */ +int CDECL _get_fmode(int *mode) +{ + if(!MSVCRT_CHECK_PMT(mode)) + return MSVCRT_EINVAL; + + *mode = MSVCRT__fmode; + return 0; +} + +/*********************************************************************** * __p__osver (MSVCRT.@) */ unsigned int* CDECL __p__osver(void) { return &MSVCRT__osver; } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 79f6511..6802104 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -474,7 +474,7 @@ # stub _get_environ(ptr) @ cdecl _get_errno(ptr) # stub _get_fileinfo(ptr) -# stub _get_fmode(ptr) +@ cdecl _get_fmode(ptr) @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform @@ -867,7 +867,7 @@ @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) # stub _set_fileinfo(long) -# stub _set_fmode(long) +@ cdecl _set_fmode(long) # stub _set_output_format(long) @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long)

1 0

Christian Costa : dmusic: Use static variables for instrument header and id instead of using pointer .
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 898c2954e012d1e70b692ddb07f551c4128b6e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=898c2954e012d1e70b692ddb0… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Dec 21 10:27:46 2012 +0100 dmusic: Use static variables for instrument header and id instead of using pointer. --- dlls/dmusic/collection.c | 20 +++++++++----------- dlls/dmusic/dmusic_private.h | 4 ++-- dlls/dmusic/instrument.c | 6 +++--- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 5002c9e..e30f89d 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -662,7 +662,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST LPDMUS_PRIVATE_INSTRUMENTENTRY new_instrument = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_INSTRUMENTENTRY)); TRACE_(dmfile)(": instrument list\n"); /* Only way to create this one... even M$ does it discretely */ - DMUSIC_CreateDirectMusicInstrumentImpl(&IID_IDirectMusicInstrument, (LPVOID*)&new_instrument->pInstrument, NULL); + DMUSIC_CreateDirectMusicInstrumentImpl(&IID_IDirectMusicInstrument, (void**)&new_instrument->pInstrument, NULL); { IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(new_instrument->pInstrument); /* Store offset and length, they will be needed when loading the instrument */ @@ -677,14 +677,12 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST switch (chunk.fccID) { case FOURCC_INSH: { TRACE_(dmfile)(": instrument header chunk\n"); - instrument->pHeader = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, chunk.dwSize); - IStream_Read(stream, instrument->pHeader, chunk.dwSize, NULL); + IStream_Read(stream, &instrument->header, chunk.dwSize, NULL); break; } case FOURCC_DLID: { TRACE_(dmfile)(": DLID (GUID) chunk\n"); - instrument->pInstrumentID = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, chunk.dwSize); - IStream_Read(stream, instrument->pInstrumentID, chunk.dwSize, NULL); + IStream_Read(stream, &instrument->id, chunk.dwSize, NULL); break; } case FOURCC_LIST: { @@ -712,14 +710,14 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST /* DEBUG: dumps whole instrument object tree: */ if (TRACE_ON(dmusic)) { TRACE("*** IDirectMusicInstrument (%p) ***\n", instrument); - if (instrument->pInstrumentID) - TRACE(" - GUID = %s\n", debugstr_dmguid(instrument->pInstrumentID)); + if (!IsEqualGUID(&instrument->id, &GUID_NULL)) + TRACE(" - GUID = %s\n", debugstr_dmguid(&instrument->id)); TRACE(" - Instrument header:\n"); - TRACE(" - cRegions: %d\n", instrument->pHeader->cRegions); + TRACE(" - cRegions: %d\n", instrument->header.cRegions); TRACE(" - Locale:\n"); - TRACE(" - ulBank: %d\n", instrument->pHeader->Locale.ulBank); - TRACE(" - ulInstrument: %d\n", instrument->pHeader->Locale.ulInstrument); - TRACE(" => dwPatch: %d\n", MIDILOCALE2Patch(&instrument->pHeader->Locale)); + TRACE(" - ulBank: %d\n", instrument->header.Locale.ulBank); + TRACE(" - ulInstrument: %d\n", instrument->header.Locale.ulInstrument); + TRACE(" => dwPatch: %d\n", MIDILOCALE2Patch(&instrument->header.Locale)); } list_add_tail(&This->Instruments, &new_instrument->entry); } diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index a37a1c3..3e5c6c2 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -238,8 +238,8 @@ struct IDirectMusicInstrumentImpl { /* IDirectMusicInstrumentImpl fields */ LARGE_INTEGER liInstrumentPosition; /* offset in a stream where instrument chunk can be found */ ULONG length; /* Length of the instrument in the stream */ - LPGUID pInstrumentID; - LPINSTHEADER pHeader; + GUID id; + INSTHEADER header; WCHAR wszName[DMUS_MAX_NAME]; /* instrument data */ BOOL loaded; diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 13d0c2f..d6de0db 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -92,7 +92,7 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_GetPatch(LPDIRECTMUSICINSTRUMEN TRACE("(%p)->(%p)\n", This, pdwPatch); - *pdwPatch = MIDILOCALE2Patch(&This->pHeader->Locale); + *pdwPatch = MIDILOCALE2Patch(&This->header.Locale); return S_OK; } @@ -103,7 +103,7 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_SetPatch(LPDIRECTMUSICINSTRUMEN TRACE("(%p)->(%d): stub\n", This, dwPatch); - Patch2MIDILOCALE(dwPatch, &This->pHeader->Locale); + Patch2MIDILOCALE(dwPatch, &This->header.Locale); return S_OK; } @@ -264,7 +264,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt return DMUS_E_UNSUPPORTED_STREAM; } - This->regions = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->regions) * This->pHeader->cRegions); + This->regions = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->regions) * This->header.cRegions); if (!This->regions) return E_OUTOFMEMORY;

1 0

Christian Costa : dmusic: Implement instrument regions loading.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: bf0605c08abd990ebb584cdc18e32bccdf9b94ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0605c08abd990ebb584cdc1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Dec 21 10:27:38 2012 +0100 dmusic: Implement instrument regions loading. --- dlls/dmusic/dmusic_private.h | 29 +++++--- dlls/dmusic/instrument.c | 157 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 173 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 3c05ceb..a37a1c3 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -77,6 +77,13 @@ typedef struct port_info { ULONG device; } port_info; +typedef struct instrument_region { + RGNHEADER header; + WAVELINK wave_link; + WSMPL wave_sample; + WLOOP wave_loop; + BOOL loop_present; +} instrument_region; /***************************************************************************** * ClassFactory @@ -224,17 +231,19 @@ struct IDirectMusicCollectionImpl { * IDirectMusicInstrumentImpl implementation structure */ struct IDirectMusicInstrumentImpl { - /* IUnknown fields */ - IDirectMusicInstrument IDirectMusicInstrument_iface; - LONG ref; + /* IUnknown fields */ + IDirectMusicInstrument IDirectMusicInstrument_iface; + LONG ref; - /* IDirectMusicInstrumentImpl fields */ - LARGE_INTEGER liInstrumentPosition; /* offset in a stream where instrument chunk can be found */ - ULONG length; /* Length of the instrument in the stream */ - LPGUID pInstrumentID; - LPINSTHEADER pHeader; - WCHAR wszName[DMUS_MAX_NAME]; - /* instrument data */ + /* IDirectMusicInstrumentImpl fields */ + LARGE_INTEGER liInstrumentPosition; /* offset in a stream where instrument chunk can be found */ + ULONG length; /* Length of the instrument in the stream */ + LPGUID pInstrumentID; + LPINSTHEADER pHeader; + WCHAR wszName[DMUS_MAX_NAME]; + /* instrument data */ + BOOL loaded; + instrument_region *regions; }; static inline IDirectMusicInstrumentImpl *impl_from_IDirectMusicInstrument(IDirectMusicInstrument *iface) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index cc57313..13d0c2f 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -75,7 +75,10 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) + { + HeapFree(GetProcessHeap(), 0, This->regions); HeapFree(GetProcessHeap(), 0, This); + } DMUSIC_UnlockModule(); @@ -170,16 +173,90 @@ static inline HRESULT advance_stream(IStream *stream, ULONG bytes) return ret; } +static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, instrument_region *region, ULONG length) +{ + HRESULT ret; + DMUS_PRIVATE_CHUNK chunk; + + TRACE("(%p, %p, %p, %u)\n", This, stream, region, length); + + while (length) + { + ret = read_from_stream(stream, &chunk, sizeof(chunk)); + if (FAILED(ret)) + return ret; + + length = subtract_bytes(length, sizeof(chunk)); + + switch (chunk.fccID) + { + case FOURCC_RGNH: + TRACE("RGNH chunk (region header): %u bytes\n", chunk.dwSize); + + ret = read_from_stream(stream, &region->header, sizeof(region->header)); + if (FAILED(ret)) + return ret; + + length = subtract_bytes(length, sizeof(region->header)); + break; + + case FOURCC_WSMP: + TRACE("WSMP chunk (wave sample): %u bytes\n", chunk.dwSize); + + ret = read_from_stream(stream, &region->wave_sample, sizeof(region->wave_sample)); + if (FAILED(ret)) + return ret; + length = subtract_bytes(length, sizeof(region->wave_sample)); + + if (!(region->loop_present = (chunk.dwSize != sizeof(region->wave_sample)))) + break; + + ret = read_from_stream(stream, &region->wave_loop, sizeof(region->wave_loop)); + if (FAILED(ret)) + return ret; + + length = subtract_bytes(length, sizeof(region->wave_loop)); + break; + + case FOURCC_WLNK: + TRACE("WLNK chunk (wave link): %u bytes\n", chunk.dwSize); + + ret = read_from_stream(stream, &region->wave_link, sizeof(region->wave_link)); + if (FAILED(ret)) + return ret; + + length = subtract_bytes(length, sizeof(region->wave_link)); + break; + + default: + TRACE("Unknown chunk %s (skipping): %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + + ret = advance_stream(stream, chunk.dwSize); + if (FAILED(ret)) + return ret; + + length = subtract_bytes(length, chunk.dwSize); + break; + } + } + + return S_OK; +} + /* Function that loads all instrument data and which is called from IDirectMusicCollection_GetInstrument as in native */ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream) { IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); HRESULT hr; DMUS_PRIVATE_CHUNK chunk; + ULONG i = 0; ULONG length = This->length; TRACE("(%p, %p): offset = 0x%s, length = %u)\n", This, stream, wine_dbgstr_longlong(This->liInstrumentPosition.QuadPart), This->length); + if (This->loaded) + return S_OK; + hr = IStream_Seek(stream, This->liInstrumentPosition, STREAM_SEEK_SET, NULL); if (FAILED(hr)) { @@ -187,11 +264,15 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt return DMUS_E_UNSUPPORTED_STREAM; } + This->regions = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->regions) * This->pHeader->cRegions); + if (!This->regions) + return E_OUTOFMEMORY; + while (length) { hr = read_from_stream(stream, &chunk, sizeof(chunk)); if (FAILED(hr)) - return DMUS_E_UNSUPPORTED_STREAM; + goto error; length = subtract_bytes(length, sizeof(chunk) + chunk.dwSize); @@ -204,20 +285,90 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt /* Instrument header and id are already set so just skip */ hr = advance_stream(stream, chunk.dwSize); if (FAILED(hr)) - return DMUS_E_UNSUPPORTED_STREAM; + goto error; + + break; + case FOURCC_LIST: { + DWORD size = chunk.dwSize; + + TRACE("LIST chunk: %u bytes\n", chunk.dwSize); + + hr = read_from_stream(stream, &chunk.fccID, sizeof(chunk.fccID)); + if (FAILED(hr)) + goto error; + + size = subtract_bytes(size, sizeof(chunk.fccID)); + + switch (chunk.fccID) + { + case FOURCC_LRGN: + TRACE("LRGN chunk (regions list): %u bytes\n", size); + + while (size) + { + hr = read_from_stream(stream, &chunk, sizeof(chunk)); + if (FAILED(hr)) + goto error; + + if (chunk.fccID != FOURCC_LIST) + { + TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + goto error; + } + + hr = read_from_stream(stream, &chunk.fccID, sizeof(chunk.fccID)); + if (FAILED(hr)) + goto error; + + if (chunk.fccID == FOURCC_RGN) + { + TRACE("RGN chunk (region list): %u bytes\n", chunk.dwSize); + hr = load_region(This, stream, &This->regions[i++], chunk.dwSize - sizeof(chunk.fccID)); + } + else + { + TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + hr = advance_stream(stream, chunk.dwSize - sizeof(chunk.fccID)); + } + if (FAILED(hr)) + goto error; + + size = subtract_bytes(size, chunk.dwSize + sizeof(chunk)); + } + break; + + default: + TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + + hr = advance_stream(stream, chunk.dwSize - sizeof(chunk.fccID)); + if (FAILED(hr)) + goto error; + + size = subtract_bytes(size, chunk.dwSize - sizeof(chunk.fccID)); + break; + } break; + } default: TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); hr = advance_stream(stream, chunk.dwSize); if (FAILED(hr)) - return DMUS_E_UNSUPPORTED_STREAM; + goto error; break; } } + This->loaded = TRUE; + return S_OK; + +error: + HeapFree(GetProcessHeap(), 0, This->regions); + This->regions = NULL; + + return DMUS_E_UNSUPPORTED_STREAM; }

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::SetText and IWbemPath:: GetText.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: c092d825000bb2b9e887a621ce7bf4908b434b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c092d825000bb2b9e887a621c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 21 13:58:58 2012 +0100 wmiutils: Implement IWbemPath::SetText and IWbemPath::GetText. --- dlls/wmiutils/path.c | 39 +++++++++++++++++++++++++++++++++++---- include/wmiutils.idl | 18 ++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index d67849b..b8c0f3e 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "wbemcli.h" #include "wmiutils.h" #include "wine/debug.h" @@ -36,6 +37,8 @@ struct path { IWbemPath IWbemPath_iface; LONG refs; + WCHAR *text; + int len; }; static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) @@ -58,6 +61,7 @@ static ULONG WINAPI path_Release( if (!refs) { TRACE("destroying %p\n", path); + HeapFree( GetProcessHeap(), 0, path->text ); HeapFree( GetProcessHeap(), 0, path ); } return refs; @@ -91,8 +95,20 @@ static HRESULT WINAPI path_SetText( ULONG uMode, LPCWSTR pszPath) { - FIXME("%p, %u, %s\n", iface, uMode, debugstr_w(pszPath)); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + int len; + + TRACE("%p, %u, %s\n", iface, uMode, debugstr_w(pszPath)); + + if (uMode) FIXME("igoring mode %u\n", uMode); + + len = strlenW( pszPath ); + if (!(path->text = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + return E_OUTOFMEMORY; + + strcpyW( path->text, pszPath ); + path->len = len; + return S_OK; } static HRESULT WINAPI path_GetText( @@ -101,8 +117,23 @@ static HRESULT WINAPI path_GetText( ULONG *puBufferLength, LPWSTR pszText) { - FIXME("%p, 0x%x, %p, %p\n", iface, lFlags, puBufferLength, pszText); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, 0x%x, %p, %p\n", iface, lFlags, puBufferLength, pszText); + + if (lFlags != WBEMPATH_GET_ORIGINAL) + { + FIXME("flags 0x%x not supported\n", lFlags); + return WBEM_E_INVALID_PARAMETER; + } + if (*puBufferLength < path->len + 1) + { + *puBufferLength = path->len + 1; + return S_OK; + } + if (pszText) strcpyW( pszText, path->text ); + *puBufferLength = path->len + 1; + return S_OK; } static HRESULT WINAPI path_GetInfo( diff --git a/include/wmiutils.idl b/include/wmiutils.idl index 81834ec..82f64d1 100644 --- a/include/wmiutils.idl +++ b/include/wmiutils.idl @@ -21,6 +21,24 @@ import "oaidl.idl"; interface IWbemPath; interface IWbemPathKeyList; +typedef [v1_enum] enum tag_WBEM_PATH_CREATE_FLAG +{ + WBEMPATH_CREATE_ACCEPT_RELATIVE = 0x1, + WBEMPATH_CREATE_ACCEPT_ABSOLUTE = 0x2, + WBEMPATH_CREATE_ACCEPT_ALL = 0x4, + WBEMPATH_TREAT_SINGLE_IDENT_AS_NS = 0x8 +} tag_WBEM_PATH_CREATE_FLAG; + +typedef [v1_enum] enum tag_WBEM_GET_TEXT_FLAGS +{ + WBEMPATH_COMPRESSED = 0x1, + WBEMPATH_GET_RELATIVE_ONLY = 0x2, + WBEMPATH_GET_SERVER_TOO = 0x4, + WBEMPATH_GET_SERVER_AND_NAMESPACE_ONLY = 0x8, + WBEMPATH_GET_NAMESPACE_ONLY = 0x10, + WBEMPATH_GET_ORIGINAL = 0x20 +} tag_WBEM_GET_TEXT_FLAGS; + [ local, object,

1 0

Hans Leidekker : wmiutils: Add a stub implementation of IWbemPath.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 633a5741b54a5d1438ca57a4ac581902bc20a271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=633a5741b54a5d1438ca57a4a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 21 13:58:09 2012 +0100 wmiutils: Add a stub implementation of IWbemPath. --- .gitignore | 1 + dlls/wmiutils/Makefile.in | 1 + dlls/wmiutils/main.c | 7 + dlls/wmiutils/path.c | 363 ++++++++++++++++++++++++++++++++++++++ dlls/wmiutils/statuscode.c | 2 - dlls/wmiutils/wmiutils_private.h | 1 + include/Makefile.in | 1 + include/wmiutils.idl | 196 ++++++++++++++++++++ 8 files changed, 570 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=633a5741b54a5d1438ca5…

1 0

Jason Edmeades : cmd: Convert the set /a tests to validate better.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 836f3e4c2945c318ed93bfbe0ef3e0e8309c6416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836f3e4c2945c318ed93bfbe0… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Wed Dec 12 00:30:45 2012 +0000 cmd: Convert the set /a tests to validate better. --- programs/cmd/tests/test_builtins.cmd | 167 +++++++++++++++++------------- programs/cmd/tests/test_builtins.cmd.exp | 147 ++++++++++++++------------ 2 files changed, 176 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=836f3e4c2945c318ed93b…

1 0

Ann and Jason Edmeades : cmd: Add set /a support.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

1 0

Detlef Riekenberg : api-ms-win-downlevel-shlwapi-l2-1-0: Add dll.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 38a69f0c1d3e9c8204dc928f236268162fc95d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a69f0c1d3e9c8204dc928f2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 21 00:27:17 2012 +0100 api-ms-win-downlevel-shlwapi-l2-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-downlevel-shlwapi-l2-1-0.spec | 56 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 62 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3c5dccd..fe74262 100755 --- a/configure +++ b/configure @@ -15354,6 +15354,7 @@ wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downle wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-ole32-l1-1-0 enable_api_ms_win_downlevel_ole32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-shlwapi-l2-1-0 enable_api_ms_win_downlevel_shlwapi_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 wine_fn_config_dll apphelp enable_apphelp diff --git a/configure.ac b/configure.ac index 4c2c45f..8d4dfb1 100644 --- a/configure.ac +++ b/configure.ac @@ -2533,6 +2533,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-ole32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) WINE_CONFIG_DLL(apphelp) diff --git a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/Makefile.in b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/Makefile.in new file mode 100644 index 0000000..7737522 --- /dev/null +++ b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-shlwapi-l2-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec new file mode 100644 index 0000000..cf3cc61 --- /dev/null +++ b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec @@ -0,0 +1,56 @@ +@ stub IStream_Copy +@ stdcall IStream_Read(ptr ptr long) shlwapi.IStream_Read +@ stub IStream_ReadStr +@ stdcall IStream_Reset(ptr) shlwapi.IStream_Reset +@ stdcall IStream_Size(ptr ptr) shlwapi.IStream_Size +@ stdcall IStream_Write(ptr ptr long) shlwapi.IStream_Write +@ stub IStream_WriteStr +@ stdcall IUnknown_AtomicRelease(long) shlwapi.IUnknown_AtomicRelease +@ stdcall IUnknown_GetSite(ptr ptr ptr) shlwapi.IUnknown_GetSite +@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shlwapi.IUnknown_QueryService +@ stdcall IUnknown_Set(ptr ptr) shlwapi.IUnknown_Set +@ stdcall IUnknown_SetSite(ptr ptr) shlwapi.IUnknown_SetSite +@ stdcall SHAnsiToAnsi(str ptr long) shlwapi.SHAnsiToAnsi +@ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode +@ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA +@ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW +@ stdcall SHCreateMemStream(ptr long) shlwapi.SHCreateMemStream +@ stdcall SHCreateStreamOnFileA(str long ptr) shlwapi.SHCreateStreamOnFileA +@ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shlwapi.SHCreateStreamOnFileEx +@ stdcall SHCreateStreamOnFileW(wstr long ptr) shlwapi.SHCreateStreamOnFileW +@ stdcall SHCreateThreadRef(ptr ptr) shlwapi.SHCreateThreadRef +@ stdcall SHDeleteEmptyKeyA(long ptr) shlwapi.SHDeleteEmptyKeyA +@ stdcall SHDeleteEmptyKeyW(long ptr) shlwapi.SHDeleteEmptyKeyW +@ stdcall SHDeleteKeyA(long str) shlwapi.SHDeleteKeyA +@ stdcall SHDeleteKeyW(long wstr) shlwapi.SHDeleteKeyW +@ stdcall SHDeleteValueA(long str str) shlwapi.SHDeleteValueA +@ stdcall SHDeleteValueW(long wstr wstr) shlwapi.SHDeleteValueW +@ stdcall SHEnumKeyExA(long long str ptr) shlwapi.SHEnumKeyExA +@ stdcall SHEnumKeyExW(long long wstr ptr) shlwapi.SHEnumKeyExW +@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shlwapi.SHEnumValueA +@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shlwapi.SHEnumValueW +@ stdcall SHGetThreadRef(ptr) shlwapi.SHGetThreadRef +@ stdcall SHGetValueA( long str str ptr ptr ptr ) shlwapi.SHGetValueA +@ stdcall SHGetValueW( long wstr wstr ptr ptr ptr ) shlwapi.SHGetValueW +@ stdcall SHOpenRegStream2A(long str str long) shlwapi.SHOpenRegStream2A +@ stdcall SHOpenRegStream2W(long wstr wstr long) shlwapi.SHOpenRegStream2W +@ stdcall SHOpenRegStreamA(long str str long) shlwapi.SHOpenRegStreamA +@ stdcall SHOpenRegStreamW(long wstr wstr long) shlwapi.SHOpenRegStreamW +@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyA +@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyW +@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shlwapi.SHQueryValueExA +@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shlwapi.SHQueryValueExW +@ stdcall SHRegDuplicateHKey(long) shlwapi.SHRegDuplicateHKey +@ stdcall SHRegGetPathA(long str str ptr long) shlwapi.SHRegGetPathA +@ stdcall SHRegGetPathW(long wstr wstr ptr long) shlwapi.SHRegGetPathW +@ stdcall SHRegGetValueA( long str str long ptr ptr ptr ) shlwapi.SHRegGetValueA +@ stdcall SHRegGetValueW( long wstr wstr long ptr ptr ptr ) shlwapi.SHRegGetValueW +@ stdcall SHRegSetPathA(long str str str long) shlwapi.SHRegSetPathA +@ stdcall SHRegSetPathW(long wstr wstr wstr long) shlwapi.SHRegSetPathW +@ stdcall SHReleaseThreadRef() shlwapi.SHReleaseThreadRef +@ stdcall SHSetThreadRef(ptr) shlwapi.SHSetThreadRef +@ stdcall SHSetValueA(long str str long ptr long) shlwapi.SHSetValueA +@ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW +@ stdcall SHStrDupW(wstr ptr) shlwapi.SHStrDupW +@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi +@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode diff --git a/tools/make_specfiles b/tools/make_specfiles index b24280e..80c132d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -131,6 +131,7 @@ my @dll_groups = [ "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", + "api-ms-win-downlevel-shlwapi-l2-1-0", ], [ "user32",

1 0

Detlef Riekenberg : api-ms-win-core-winrt-string-l1-1-0: Add dll.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 98d0d621e7235a1b2ec1a4ae9f5e7975395818ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d0d621e7235a1b2ec1a4ae9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 21 00:27:20 2012 +0100 api-ms-win-core-winrt-string-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 ++ .../api-ms-win-core-winrt-string-l1-1-0.spec | 27 ++++++++++++++++++++ 4 files changed, 32 insertions(+), 0 deletions(-) diff --git a/configure b/configure index aeffaf0..60a0185 100755 --- a/configure +++ b/configure @@ -15350,6 +15350,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 diff --git a/configure.ac b/configure.ac index 48bb522..a295a7b 100644 --- a/configure.ac +++ b/configure.ac @@ -2529,6 +2529,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-string-l1-1-0/Makefile.in new file mode 100644 index 0000000..028378c --- /dev/null +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-core-winrt-string-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec new file mode 100644 index 0000000..9fb5c10 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -0,0 +1,27 @@ +@ stub HSTRING_UserFree +@ stub HSTRING_UserFree64 +@ stub HSTRING_UserMarshal +@ stub HSTRING_UserMarshal64 +@ stub HSTRING_UserSize +@ stub HSTRING_UserSize64 +@ stub HSTRING_UserUnmarshal +@ stub HSTRING_UserUnmarshal64 +@ stub WindowsCompareStringOrdinal +@ stub WindowsConcatString +@ stub WindowsCreateString +@ stub WindowsCreateStringReference +@ stub WindowsDeleteString +@ stub WindowsDeleteStringBuffer +@ stub WindowsDuplicateString +@ stub WindowsGetStringLen +@ stub WindowsGetStringRawBuffer +@ stub WindowsInspectString +@ stub WindowsIsStringEmpty +@ stub WindowsPreallocateStringBuffer +@ stub WindowsPromoteStringBuffer +@ stub WindowsReplaceString +@ stub WindowsStringHasEmbeddedNull +@ stub WindowsSubstring +@ stub WindowsSubstringwithSpecifiedLength +@ stub WindowsTrimStringEnd +@ stub WindowsTrimStringStart

1 0

Detlef Riekenberg : api-ms-win-core-winrt-error-l1-1-0: Add dll.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 828882745a1db3c67422f33a14195685f24eb8fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=828882745a1db3c67422f33a1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 21 00:27:21 2012 +0100 api-ms-win-core-winrt-error-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../api-ms-win-core-winrt-error-l1-1-0/Makefile.in | 3 +++ .../api-ms-win-core-winrt-error-l1-1-0.spec | 11 +++++++++++ 4 files changed, 16 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 60a0185..976bd9b 100755 --- a/configure +++ b/configure @@ -15350,6 +15350,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 diff --git a/configure.ac b/configure.ac index a295a7b..5e59e90 100644 --- a/configure.ac +++ b/configure.ac @@ -2529,6 +2529,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-error-l1-1-0/Makefile.in new file mode 100644 index 0000000..5b02097 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-core-winrt-error-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec new file mode 100644 index 0000000..de0a6d8 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stub GetRestrictedErrorInfo +@ stub RoCaptureErrorContext +@ stub RoFailFastWithErrorContext +@ stub RoGetErrorReportingFlags +@ stub RoOriginateError +@ stub RoOriginateErrorW +@ stub RoResolveRestrictedErrorInfoReference +@ stub RoSetErrorReportingFlags +@ stub RoTransformError +@ stub RoTransformErrorW +@ stub SetRestrictedErrorInfo

1 0