August 2015 - Wine-commits - list.winehq.org

Andrew Eikum : xaudio2: Implement IXAudio2::RegisterForCallbacks.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 7f2ebb337d0977c1ae2f34633c34ca1c0b1ae465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2ebb337d0977c1ae2f34633… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 25 14:29:19 2015 -0500 xaudio2: Implement IXAudio2::RegisterForCallbacks. --- dlls/xaudio2_7/xaudio_dll.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 0438fcf..5aa34b5 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -196,6 +196,9 @@ struct _IXAudio2Impl { ALCdevice *al_device; ALCcontext *al_ctx; + + UINT32 ncbs; + IXAudio2EngineCallback **cbs; }; static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) @@ -1260,6 +1263,7 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) for(i = 0; i < This->ndevs; ++i) CoTaskMemFree(This->devids[i]); HeapFree(GetProcessHeap(), 0, This->devids); + HeapFree(GetProcessHeap(), 0, This->cbs); DeleteCriticalSection(&This->lock); @@ -1272,8 +1276,26 @@ static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface, IXAudio2EngineCallback *pCallback) { IXAudio2Impl *This = impl_from_IXAudio2(iface); + int i; + + TRACE("(%p)->(%p)\n", This, pCallback); + + EnterCriticalSection(&This->lock); + + for(i = 0; i < This->ncbs; ++i){ + if(!This->cbs[i] || This->cbs[i] == pCallback){ + This->cbs[i] = pCallback; + LeaveCriticalSection(&This->lock); + return S_OK; + } + } - FIXME("(%p)->(%p): stub!\n", This, pCallback); + This->ncbs *= 2; + This->cbs = HeapReAlloc(GetProcessHeap(), 0, This->cbs, This->ncbs * sizeof(*This->cbs)); + + This->cbs[i] = pCallback; + + LeaveCriticalSection(&This->lock); return E_NOTIMPL; } @@ -1282,8 +1304,24 @@ static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface, IXAudio2EngineCallback *pCallback) { IXAudio2Impl *This = impl_from_IXAudio2(iface); + int i; + + TRACE("(%p)->(%p)\n", This, pCallback); + + EnterCriticalSection(&This->lock); - FIXME("(%p)->(%p): stub!\n", This, pCallback); + for(i = 0; i < This->ncbs; ++i){ + if(This->cbs[i] == pCallback) + break; + } + + for(; i < This->ncbs - 1 && This->cbs[i + 1]; ++i) + This->cbs[i] = This->cbs[i + 1]; + + if(i < This->ncbs) + This->cbs[i] = NULL; + + LeaveCriticalSection(&This->lock); } static WAVEFORMATEX *copy_waveformat(const WAVEFORMATEX *wfex) @@ -2071,6 +2109,9 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p return hr; } + object->ncbs = 4; + object->cbs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->ncbs * sizeof(*object->cbs)); + return hr; }

1 0

Józef Kucia : d3d11: Add ID3D11Texture2D stub interface.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 06ca9e226d2c20ede0a1ebd9cbb77dab2ed8855d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ca9e226d2c20ede0a1ebd9c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 26 00:56:04 2015 +0200 d3d11: Add ID3D11Texture2D stub interface. --- dlls/d3d11/d3d11_private.h | 6 ++ dlls/d3d11/device.c | 7 +- dlls/d3d11/texture.c | 185 ++++++++++++++++++++++++++++++++++++--------- 3 files changed, 159 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06ca9e226d2c20ede0a1e…

1 0

Józef Kucia : d3d11: Implement private data methods in ID3D11Texture2D.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 3c74e223179ce80355962cf524c0321dee9fad4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c74e223179ce80355962cf52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 26 00:56:05 2015 +0200 d3d11: Implement private data methods in ID3D11Texture2D. --- dlls/d3d11/texture.c | 90 +++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index d5137e7..940567a 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -115,25 +115,61 @@ static void STDMETHODCALLTYPE d3d11_texture2d_GetDevice(ID3D11Texture2D *iface, static HRESULT STDMETHODCALLTYPE d3d11_texture2d_GetPrivateData(ID3D11Texture2D *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } - return E_NOTIMPL; + return d3d10_get_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateData(ID3D11Texture2D *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_SetPrivateData(dxgi_surface, guid, data_size, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } + + return d3d10_set_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateDataInterface(ID3D11Texture2D *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_SetPrivateDataInterface(dxgi_surface, guid, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } - return E_NOTIMPL; + return d3d10_set_private_data_interface(&texture->private_store, guid, data); } static void STDMETHODCALLTYPE d3d11_texture2d_GetType(ID3D11Texture2D *iface, @@ -234,62 +270,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D REFGUID guid, UINT *data_size, void *data) { struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); - IDXGISurface *dxgi_surface; - HRESULT hr; - TRACE("iface %p, guid %s, data_size %p, data %p.\n", - iface, debugstr_guid(guid), data_size, data); + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_surface - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) - { - hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; - } - - return d3d10_get_private_data(&texture->private_store, guid, data_size, data); + return d3d11_texture2d_GetPrivateData(&texture->ID3D11Texture2D_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateData(ID3D10Texture2D *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); - IDXGISurface *dxgi_surface; - HRESULT hr; - - TRACE("iface %p, guid %s, data_size %u, data %p.\n", - iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_surface - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) - { - hr = IDXGISurface_SetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; - } + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&texture->private_store, guid, data_size, data); + return d3d11_texture2d_SetPrivateData(&texture->ID3D11Texture2D_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateDataInterface(ID3D10Texture2D *iface, REFGUID guid, const IUnknown *data) { struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); - IDXGISurface *dxgi_surface; - HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - if (texture->dxgi_surface - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) - { - hr = IDXGISurface_SetPrivateDataInterface(dxgi_surface, guid, data); - IDXGISurface_Release(dxgi_surface); - return hr; - } - - return d3d10_set_private_data_interface(&texture->private_store, guid, data); + return d3d11_texture2d_SetPrivateDataInterface(&texture->ID3D11Texture2D_iface, guid, data); } /* ID3D10Resource methods */

1 0

Józef Kucia : d3d11: Implement d3d11_texture2d_GetDevice.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: c917a987dc3ae94c4c42047599fee79e64afcc97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c917a987dc3ae94c4c4204759… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 26 00:56:06 2015 +0200 d3d11: Implement d3d11_texture2d_GetDevice. --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/texture.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 93a957c..ebbbec9 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -95,7 +95,7 @@ struct d3d10_texture2d IUnknown *dxgi_surface; struct wined3d_texture *wined3d_texture; D3D10_TEXTURE2D_DESC desc; - ID3D10Device1 *device; + ID3D11Device *device; }; static inline struct d3d10_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 940567a..2fe0c50 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -76,7 +76,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface) if (refcount == 1) { - ID3D10Device1_AddRef(texture->device); + ID3D11Device_AddRef(texture->device); wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); wined3d_mutex_unlock(); @@ -94,14 +94,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) if (!refcount) { - ID3D10Device1 *device = texture->device; + ID3D11Device *device = texture->device; wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D10Device1_Release(device); + ID3D11Device_Release(device); } return refcount; @@ -109,7 +109,12 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) static void STDMETHODCALLTYPE d3d11_texture2d_GetDevice(ID3D11Texture2D *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = texture->device; + ID3D11Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_GetPrivateData(ID3D11Texture2D *iface, @@ -262,8 +267,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)texture->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface, @@ -494,8 +498,8 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device } wined3d_mutex_unlock(); - texture->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(texture->device); + texture->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(texture->device); return S_OK; }

1 0

Henri Verbeet : wined3d: Get rid of some powf() calls.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 9f530b579eeb538b28e38cd223894cd9374b72f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f530b579eeb538b28e38cd22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 26 12:46:46 2015 +0200 wined3d: Get rid of some powf() calls. --- dlls/wined3d/surface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 85ad4a4..fc00823 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1795,21 +1795,21 @@ static inline unsigned short float_32_to_16(const float *in) if (isinf(*in)) return (*in < 0.0f ? 0xfc00 : 0x7c00); - if (tmp < powf(2, 10)) + if (tmp < (float)(1u << 10)) { do { tmp = tmp * 2.0f; exp--; - } while (tmp < powf(2, 10)); + } while (tmp < (float)(1u << 10)); } - else if (tmp >= powf(2, 11)) + else if (tmp >= (float)(1u << 11)) { do { tmp /= 2.0f; exp++; - } while (tmp >= powf(2, 11)); + } while (tmp >= (float)(1u << 11)); } mantissa = (unsigned int)tmp;

1 0

Daniel Lehman : msvcrt: Use msvcrt free instead of HeapFree on tls data.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: e26131fea3e45623145f105282a51b87f38a15be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26131fea3e45623145f10528… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 25 10:08:50 2015 -0700 msvcrt: Use msvcrt free instead of HeapFree on tls data. --- dlls/msvcrt/main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 1deb080..6973dca 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -68,14 +68,14 @@ static inline void msvcrt_free_tls_mem(void) if (tls) { CloseHandle(tls->handle); - HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); - HeapFree(GetProcessHeap(),0,tls->asctime_buffer); - HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); - HeapFree(GetProcessHeap(),0,tls->strerror_buffer); - HeapFree(GetProcessHeap(),0,tls->wcserror_buffer); - HeapFree(GetProcessHeap(),0,tls->time_buffer); - HeapFree(GetProcessHeap(),0,tls->tmpnam_buffer); - HeapFree(GetProcessHeap(),0,tls->wtmpnam_buffer); + MSVCRT_free(tls->efcvt_buffer); + MSVCRT_free(tls->asctime_buffer); + MSVCRT_free(tls->wasctime_buffer); + MSVCRT_free(tls->strerror_buffer); + MSVCRT_free(tls->wcserror_buffer); + MSVCRT_free(tls->time_buffer); + MSVCRT_free(tls->tmpnam_buffer); + MSVCRT_free(tls->wtmpnam_buffer); if(tls->have_locale) { free_locinfo(tls->locinfo); free_mbcinfo(tls->mbcinfo);

1 0

Martin Storsjo : make_specfiles: Use cdecl for stub redirects to ucrtbase, just like to msvcr*.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: b256c55d08fb8147ba791ec001f6cd00caea26a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b256c55d08fb8147ba791ec00… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:41 2015 +0300 make_specfiles: Use cdecl for stub redirects to ucrtbase, just like to msvcr*. --- tools/make_specfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 00e609c..54495cf 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -359,7 +359,7 @@ sub update_spec_file($) if ($parent{callconv} ne "stub" || $parent{args}) { my $callconv = $parent{callconv} ne "stub" ? $parent{callconv} : - $parent{spec} =~ /msvc/ ? "cdecl" : "stdcall"; # hack + $parent{spec} =~ /(msvc|ucrtbase)/ ? "cdecl" : "stdcall"; # hack $_ = sprintf "$descr{ordinal} %s %s%s", $callconv, $flags, $func; if ($parent{target} =~ /$group_head\./) # use the same forward as parent if possible

1 0

Martin Storsjo : api-ms-win-crt-conio-l1-1-0: Add stub dll.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: bf960922443ef99335777b742f2715a41a5d7bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf960922443ef99335777b742… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:42 2015 +0300 api-ms-win-crt-conio-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-crt-conio-l1-1-0/Makefile.in | 1 + .../api-ms-win-crt-conio-l1-1-0.spec | 30 ++++++++++++++++++++++ tools/make_specfiles | 4 +++ 5 files changed, 38 insertions(+) diff --git a/configure b/configure index 6627f16..59688c7 100755 --- a/configure +++ b/configure @@ -915,6 +915,7 @@ enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_core_xstate_l2_1_0 +enable_api_ms_win_crt_conio_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 enable_api_ms_win_downlevel_normaliz_l1_1_0 @@ -17155,6 +17156,7 @@ wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_win wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_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-core-xstate-l2-1-0 enable_api_ms_win_core_xstate_l2_1_0 +wine_fn_config_dll api-ms-win-crt-conio-l1-1-0 enable_api_ms_win_crt_conio_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 ed1052c..53faa35 100644 --- a/configure.ac +++ b/configure.ac @@ -2755,6 +2755,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) +WINE_CONFIG_DLL(api-ms-win-crt-conio-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-crt-conio-l1-1-0/Makefile.in b/dlls/api-ms-win-crt-conio-l1-1-0/Makefile.in new file mode 100644 index 0000000..3abc188 --- /dev/null +++ b/dlls/api-ms-win-crt-conio-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-crt-conio-l1-1-0.dll diff --git a/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec b/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec new file mode 100644 index 0000000..3b7f637 --- /dev/null +++ b/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec @@ -0,0 +1,30 @@ +@ stub __conio_common_vcprintf +@ stub __conio_common_vcprintf_p +@ stub __conio_common_vcprintf_s +@ stub __conio_common_vcscanf +@ stub __conio_common_vcwprintf +@ stub __conio_common_vcwprintf_p +@ stub __conio_common_vcwprintf_s +@ stub __conio_common_vcwscanf +@ cdecl _cgets(ptr) ucrtbase._cgets +@ stub _cgets_s +@ stub _cgetws +@ stub _cgetws_s +@ cdecl _cputs(str) ucrtbase._cputs +@ cdecl _cputws(wstr) ucrtbase._cputws +@ cdecl _getch() ucrtbase._getch +@ cdecl _getch_nolock() ucrtbase._getch_nolock +@ cdecl _getche() ucrtbase._getche +@ cdecl _getche_nolock() ucrtbase._getche_nolock +@ cdecl _getwch() ucrtbase._getwch +@ cdecl _getwch_nolock() ucrtbase._getwch_nolock +@ cdecl _getwche() ucrtbase._getwche +@ cdecl _getwche_nolock() ucrtbase._getwche_nolock +@ cdecl _putch(long) ucrtbase._putch +@ cdecl _putch_nolock(long) ucrtbase._putch_nolock +@ cdecl _putwch(long) ucrtbase._putwch +@ cdecl _putwch_nolock(long) ucrtbase._putwch_nolock +@ cdecl _ungetch(long) ucrtbase._ungetch +@ cdecl _ungetch_nolock(long) ucrtbase._ungetch_nolock +@ cdecl _ungetwch(long) ucrtbase._ungetwch +@ cdecl _ungetwch_nolock(long) ucrtbase._ungetwch_nolock diff --git a/tools/make_specfiles b/tools/make_specfiles index 54495cf..3a70c21 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -50,6 +50,10 @@ my @dll_groups = "msvcr120_app", ], [ + "ucrtbase", + "api-ms-win-crt-conio-l1-1-0", + ], + [ "msvcp120", "msvcp120_app", ],

1 0

Martin Storsjo : api-ms-win-crt-convert-l1-1-0: Add stub dll.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: efb4b2cae52389ad54f24bcd4816e1c8de4c2c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb4b2cae52389ad54f24bcd4… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:43 2015 +0300 api-ms-win-crt-convert-l1-1-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-crt-convert-l1-1-0/Makefile.in | 1 + .../api-ms-win-crt-convert-l1-1-0.spec | 122 +++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 127 insertions(+) diff --git a/configure b/configure index 59688c7..cb6d096 100755 --- a/configure +++ b/configure @@ -916,6 +916,7 @@ enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_core_xstate_l2_1_0 enable_api_ms_win_crt_conio_l1_1_0 +enable_api_ms_win_crt_convert_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 enable_api_ms_win_downlevel_normaliz_l1_1_0 @@ -17157,6 +17158,7 @@ wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_ 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-core-xstate-l2-1-0 enable_api_ms_win_core_xstate_l2_1_0 wine_fn_config_dll api-ms-win-crt-conio-l1-1-0 enable_api_ms_win_crt_conio_l1_1_0 +wine_fn_config_dll api-ms-win-crt-convert-l1-1-0 enable_api_ms_win_crt_convert_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 53faa35..dccb024 100644 --- a/configure.ac +++ b/configure.ac @@ -2756,6 +2756,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) WINE_CONFIG_DLL(api-ms-win-crt-conio-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-crt-convert-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-crt-convert-l1-1-0/Makefile.in b/dlls/api-ms-win-crt-convert-l1-1-0/Makefile.in new file mode 100644 index 0000000..2e35b1c --- /dev/null +++ b/dlls/api-ms-win-crt-convert-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-crt-convert-l1-1-0.dll diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec new file mode 100644 index 0000000..40b131a --- /dev/null +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -0,0 +1,122 @@ +@ cdecl __toascii(long) ucrtbase.__toascii +@ cdecl _atodbl(ptr str) ucrtbase._atodbl +@ cdecl _atodbl_l(ptr str ptr) ucrtbase._atodbl_l +@ cdecl _atof_l(str ptr) ucrtbase._atof_l +@ cdecl _atoflt(ptr str) ucrtbase._atoflt +@ cdecl _atoflt_l(ptr str ptr) ucrtbase._atoflt_l +@ cdecl -ret64 _atoi64(str) ucrtbase._atoi64 +@ stub _atoi64_l +@ cdecl _atoi_l(str ptr) ucrtbase._atoi_l +@ stub _atol_l +@ cdecl _atoldbl(ptr str) ucrtbase._atoldbl +@ stub _atoldbl_l +@ stub _atoll_l +@ cdecl _ecvt(double long ptr ptr) ucrtbase._ecvt +@ cdecl _ecvt_s(str long double long ptr ptr) ucrtbase._ecvt_s +@ cdecl _fcvt(double long ptr ptr) ucrtbase._fcvt +@ cdecl _fcvt_s(ptr long double long ptr ptr) ucrtbase._fcvt_s +@ cdecl _gcvt(double long str) ucrtbase._gcvt +@ cdecl _gcvt_s(ptr long double long) ucrtbase._gcvt_s +@ cdecl _i64toa(int64 ptr long) ucrtbase._i64toa +@ cdecl _i64toa_s(int64 ptr long long) ucrtbase._i64toa_s +@ cdecl _i64tow(int64 ptr long) ucrtbase._i64tow +@ cdecl _i64tow_s(int64 ptr long long) ucrtbase._i64tow_s +@ cdecl _itoa(long ptr long) ucrtbase._itoa +@ cdecl _itoa_s(long ptr long long) ucrtbase._itoa_s +@ cdecl _itow(long ptr long) ucrtbase._itow +@ cdecl _itow_s(long ptr long long) ucrtbase._itow_s +@ cdecl _ltoa(long ptr long) ucrtbase._ltoa +@ cdecl _ltoa_s(long ptr long long) ucrtbase._ltoa_s +@ cdecl _ltow(long ptr long) ucrtbase._ltow +@ cdecl _ltow_s(long ptr long long) ucrtbase._ltow_s +@ cdecl _strtod_l(str ptr ptr) ucrtbase._strtod_l +@ stub _strtof_l +@ cdecl -ret64 _strtoi64(str ptr long) ucrtbase._strtoi64 +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) ucrtbase._strtoi64_l +@ stub _strtoimax_l +@ stub _strtol_l +@ stub _strtold_l +@ cdecl -ret64 _strtoll_l(str ptr long ptr) ucrtbase._strtoll_l +@ cdecl -ret64 _strtoui64(str ptr long) ucrtbase._strtoui64 +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) ucrtbase._strtoui64_l +@ cdecl _strtoul_l(str ptr long ptr) ucrtbase._strtoul_l +@ cdecl -ret64 _strtoull_l(str ptr long ptr) ucrtbase._strtoull_l +@ stub _strtoumax_l +@ cdecl _ui64toa(int64 ptr long) ucrtbase._ui64toa +@ cdecl _ui64toa_s(int64 ptr long long) ucrtbase._ui64toa_s +@ cdecl _ui64tow(int64 ptr long) ucrtbase._ui64tow +@ cdecl _ui64tow_s(int64 ptr long long) ucrtbase._ui64tow_s +@ cdecl _ultoa(long ptr long) ucrtbase._ultoa +@ cdecl _ultoa_s(long ptr long long) ucrtbase._ultoa_s +@ cdecl _ultow(long ptr long) ucrtbase._ultow +@ cdecl _ultow_s(long ptr long long) ucrtbase._ultow_s +@ cdecl _wcstod_l(wstr ptr) ucrtbase._wcstod_l +@ stub _wcstof_l +@ cdecl -ret64 _wcstoi64(wstr ptr long) ucrtbase._wcstoi64 +@ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) ucrtbase._wcstoi64_l +@ stub _wcstoimax_l +@ cdecl _wcstol_l(wstr ptr long ptr) ucrtbase._wcstol_l +@ stub _wcstold_l +@ stub _wcstoll_l +@ cdecl _wcstombs_l(ptr ptr long ptr) ucrtbase._wcstombs_l +@ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._wcstombs_s_l +@ cdecl -ret64 _wcstoui64(wstr ptr long) ucrtbase._wcstoui64 +@ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) ucrtbase._wcstoui64_l +@ cdecl _wcstoul_l(wstr ptr long ptr) ucrtbase._wcstoul_l +@ stub _wcstoull_l +@ stub _wcstoumax_l +@ cdecl _wctomb_l(ptr long ptr) ucrtbase._wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) ucrtbase._wctomb_s_l +@ cdecl _wtof(wstr) ucrtbase._wtof +@ cdecl _wtof_l(wstr ptr) ucrtbase._wtof_l +@ cdecl _wtoi(wstr) ucrtbase._wtoi +@ cdecl -ret64 _wtoi64(wstr) ucrtbase._wtoi64 +@ cdecl -ret64 _wtoi64_l(wstr ptr) ucrtbase._wtoi64_l +@ cdecl _wtoi_l(wstr ptr) ucrtbase._wtoi_l +@ cdecl _wtol(wstr) ucrtbase._wtol +@ cdecl _wtol_l(wstr ptr) ucrtbase._wtol_l +@ stub _wtoll +@ stub _wtoll_l +@ cdecl atof(str) ucrtbase.atof +@ cdecl atoi(str) ucrtbase.atoi +@ cdecl atol(str) ucrtbase.atol +@ stub atoll +@ cdecl btowc(long) ucrtbase.btowc +@ stub c16rtomb +@ stub c32rtomb +@ stub mbrtoc16 +@ stub mbrtoc32 +@ cdecl mbrtowc(ptr str long ptr) ucrtbase.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) ucrtbase.mbsrtowcs +@ stub mbsrtowcs_s +@ cdecl mbstowcs(ptr str long) ucrtbase.mbstowcs +@ cdecl mbstowcs_s(ptr ptr long str long) ucrtbase.mbstowcs_s +@ cdecl mbtowc(ptr str long) ucrtbase.mbtowc +@ cdecl strtod(str ptr) ucrtbase.strtod +@ stub strtof +@ stub strtoimax +@ cdecl strtol(str ptr long) ucrtbase.strtol +@ stub strtold +@ cdecl -ret64 strtoll(str ptr long) ucrtbase.strtoll +@ cdecl strtoul(str ptr long) ucrtbase.strtoul +@ cdecl -ret64 strtoull(str ptr long) ucrtbase.strtoull +@ stub strtoumax +@ cdecl wcrtomb(ptr long ptr) ucrtbase.wcrtomb +@ stub wcrtomb_s +@ cdecl wcsrtombs(ptr ptr long ptr) ucrtbase.wcsrtombs +@ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) ucrtbase.wcsrtombs_s +@ cdecl wcstod(wstr ptr) ucrtbase.wcstod +@ stub wcstof +@ stub wcstoimax +@ cdecl wcstol(wstr ptr long) ucrtbase.wcstol +@ stub wcstold +@ stub wcstoll +@ cdecl wcstombs(ptr ptr long) ucrtbase.wcstombs +@ cdecl wcstombs_s(ptr ptr long wstr long) ucrtbase.wcstombs_s +@ cdecl wcstoul(wstr ptr long) ucrtbase.wcstoul +@ stub wcstoull +@ stub wcstoumax +@ cdecl wctob(long) ucrtbase.wctob +@ cdecl wctomb(ptr long) ucrtbase.wctomb +@ cdecl wctomb_s(ptr ptr long long) ucrtbase.wctomb_s +@ stub wctrans diff --git a/tools/make_specfiles b/tools/make_specfiles index 3a70c21..63e885e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -52,6 +52,7 @@ my @dll_groups = [ "ucrtbase", "api-ms-win-crt-conio-l1-1-0", + "api-ms-win-crt-convert-l1-1-0", ], [ "msvcp120",

1 0

Martin Storsjo : api-ms-win-crt-environment-l1-1-0: Add stub dll.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: e4527602f492ef7f903c8c4339144777be802155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4527602f492ef7f903c8c433… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:44 2015 +0300 api-ms-win-crt-environment-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-crt-environment-l1-1-0/Makefile.in | 1 + .../api-ms-win-crt-environment-l1-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 23 insertions(+) diff --git a/configure b/configure index cb6d096..52409fe 100755 --- a/configure +++ b/configure @@ -917,6 +917,7 @@ enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_core_xstate_l2_1_0 enable_api_ms_win_crt_conio_l1_1_0 enable_api_ms_win_crt_convert_l1_1_0 +enable_api_ms_win_crt_environment_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 enable_api_ms_win_downlevel_normaliz_l1_1_0 @@ -17159,6 +17160,7 @@ wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_wi wine_fn_config_dll api-ms-win-core-xstate-l2-1-0 enable_api_ms_win_core_xstate_l2_1_0 wine_fn_config_dll api-ms-win-crt-conio-l1-1-0 enable_api_ms_win_crt_conio_l1_1_0 wine_fn_config_dll api-ms-win-crt-convert-l1-1-0 enable_api_ms_win_crt_convert_l1_1_0 +wine_fn_config_dll api-ms-win-crt-environment-l1-1-0 enable_api_ms_win_crt_environment_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 dccb024..7e96248 100644 --- a/configure.ac +++ b/configure.ac @@ -2757,6 +2757,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) WINE_CONFIG_DLL(api-ms-win-crt-conio-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-convert-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-crt-environment-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-crt-environment-l1-1-0/Makefile.in b/dlls/api-ms-win-crt-environment-l1-1-0/Makefile.in new file mode 100644 index 0000000..fe9df1f --- /dev/null +++ b/dlls/api-ms-win-crt-environment-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-crt-environment-l1-1-0.dll diff --git a/dlls/api-ms-win-crt-environment-l1-1-0/api-ms-win-crt-environment-l1-1-0.spec b/dlls/api-ms-win-crt-environment-l1-1-0/api-ms-win-crt-environment-l1-1-0.spec new file mode 100644 index 0000000..7cbaf56 --- /dev/null +++ b/dlls/api-ms-win-crt-environment-l1-1-0/api-ms-win-crt-environment-l1-1-0.spec @@ -0,0 +1,18 @@ +@ cdecl __p__environ() ucrtbase.__p__environ +@ cdecl __p__wenviron() ucrtbase.__p__wenviron +@ cdecl _dupenv_s(ptr ptr str) ucrtbase._dupenv_s +@ cdecl _putenv(str) ucrtbase._putenv +@ cdecl _putenv_s(str str) ucrtbase._putenv_s +@ cdecl _searchenv(str str ptr) ucrtbase._searchenv +@ cdecl _searchenv_s(str str ptr long) ucrtbase._searchenv_s +@ cdecl _wdupenv_s(ptr ptr wstr) ucrtbase._wdupenv_s +@ cdecl _wgetcwd(wstr long) ucrtbase._wgetcwd +@ cdecl _wgetdcwd(long wstr long) ucrtbase._wgetdcwd +@ cdecl _wgetenv(wstr) ucrtbase._wgetenv +@ cdecl _wgetenv_s(ptr ptr long wstr) ucrtbase._wgetenv_s +@ cdecl _wputenv(wstr) ucrtbase._wputenv +@ cdecl _wputenv_s(wstr wstr) ucrtbase._wputenv_s +@ cdecl _wsearchenv(wstr wstr ptr) ucrtbase._wsearchenv +@ cdecl _wsearchenv_s(wstr wstr ptr long) ucrtbase._wsearchenv_s +@ cdecl getenv(str) ucrtbase.getenv +@ cdecl getenv_s(ptr ptr long str) ucrtbase.getenv_s diff --git a/tools/make_specfiles b/tools/make_specfiles index 63e885e..8a05826 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -53,6 +53,7 @@ my @dll_groups = "ucrtbase", "api-ms-win-crt-conio-l1-1-0", "api-ms-win-crt-convert-l1-1-0", + "api-ms-win-crt-environment-l1-1-0", ], [ "msvcp120",

1 0