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

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

Aug. 26, 2015

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 d3d11_texture2d_GetDevice.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

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

Andrew Eikum : xaudio2: Implement IXAudio2::RegisterForCallbacks.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

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

Erich E. Hoover : winspool.drv: Allow spooling directly to a postscript file.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: 126f0601e2e5e19dd7bff7af7b4ddb8dc3cb711f URL: http://source.winehq.org/git/wine.git/?a=commit;h=126f0601e2e5e19dd7bff7af7… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Tue Aug 25 16:44:18 2015 -0600 winspool.drv: Allow spooling directly to a postscript file. Required for PDF printing in OrCAD 16.6. --- dlls/winspool.drv/info.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4549034..ca2c34d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8432,6 +8432,11 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) { ret = schedule_file(job->filename); } + else if(isalpha(portname[0]) && portname[1] == ':') + { + TRACE("copying to %s\n", debugstr_w(portname)); + ret = CopyFileW(job->filename, portname, FALSE); + } else { FIXME("can't schedule to port %s\n", debugstr_w(portname));

1 0

Hans Leidekker : winhttp: Add support for retrieving the URL codepage.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: 58bf3ca17ffd469823063b8e9ff8a0366a81edb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bf3ca17ffd469823063b8e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 26 08:45:07 2015 +0200 winhttp: Add support for retrieving the URL codepage. --- dlls/winhttp/request.c | 21 +++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 6ca3727..d3f4d91 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3999,8 +3999,25 @@ static HRESULT WINAPI winhttp_request_get_Option( WinHttpRequestOption option, VARIANT *value ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + HRESULT hr = S_OK; + + TRACE("%p, %u, %p\n", request, option, value); + + EnterCriticalSection( &request->cs ); + switch (option) + { + case WinHttpRequestOption_URLCodePage: + V_VT( value ) = VT_I4; + V_I4( value ) = request->url_codepage; + break; + default: + FIXME("unimplemented option %u\n", option); + hr = E_NOTIMPL; + break; + } + LeaveCriticalSection( &request->cs ); + return hr; } static HRESULT WINAPI winhttp_request_put_Option( diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index d2f7671..9bda2af 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3043,11 +3043,12 @@ static void test_IWinHttpRequest(void) static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n',0}; static const WCHAR dateW[] = {'D','a','t','e',0}; static const WCHAR test_dataW[] = {'t','e','s','t','d','a','t','a',128,0}; + static const WCHAR utf8W[] = {'u','t','f','-','8',0}; HRESULT hr; IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; BSTR date, today, connection, value = NULL; - VARIANT async, empty, timeout, body, body2, proxy_server, bypass_list, data; + VARIANT async, empty, timeout, body, body2, proxy_server, bypass_list, data, cp; VARIANT_BOOL succeeded; LONG status; WCHAR todayW[WINHTTP_TIME_FORMAT_BUFSIZE]; @@ -3131,6 +3132,39 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_Open( req, method, url, async ); ok( hr == S_OK, "got %08x\n", hr ); + V_VT( &cp ) = VT_ERROR; + V_ERROR( &cp ) = 0xdeadbeef; + hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_UTF8, "got %u\n", V_I4( &cp ) ); + + V_VT( &cp ) = VT_UI4; + V_UI4( &cp ) = CP_ACP; + hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp ); + ok( hr == S_OK, "got %08x\n", hr ); + + V_VT( &cp ) = VT_ERROR; + V_ERROR( &cp ) = 0xdeadbeef; + hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_ACP, "got %u\n", V_I4( &cp ) ); + + value = SysAllocString( utf8W ); + V_VT( &cp ) = VT_BSTR; + V_BSTR( &cp ) = value; + hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( value ); + + V_VT( &cp ) = VT_ERROR; + V_ERROR( &cp ) = 0xdeadbeef; + hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_UTF8, "got %u\n", V_I4( &cp ) ); + hr = IWinHttpRequest_Abort( req ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Martin Storsjo : api-ms-win-crt-stdio-l1-1-0: Add stub dll.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: 7c5190e90e7780eb9abbc753c32ed8176afa9b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5190e90e7780eb9abbc753c… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:53 2015 +0300 api-ms-win-crt-stdio-l1-1-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-crt-stdio-l1-1-0/Makefile.in | 1 + .../api-ms-win-crt-stdio-l1-1-0.spec | 159 +++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 164 insertions(+) diff --git a/configure b/configure index 33e9e90..163c458 100755 --- a/configure +++ b/configure @@ -926,6 +926,7 @@ enable_api_ms_win_crt_multibyte_l1_1_0 enable_api_ms_win_crt_private_l1_1_0 enable_api_ms_win_crt_process_l1_1_0 enable_api_ms_win_crt_runtime_l1_1_0 +enable_api_ms_win_crt_stdio_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 @@ -17177,6 +17178,7 @@ wine_fn_config_dll api-ms-win-crt-multibyte-l1-1-0 enable_api_ms_win_crt_multiby wine_fn_config_dll api-ms-win-crt-private-l1-1-0 enable_api_ms_win_crt_private_l1_1_0 wine_fn_config_dll api-ms-win-crt-process-l1-1-0 enable_api_ms_win_crt_process_l1_1_0 wine_fn_config_dll api-ms-win-crt-runtime-l1-1-0 enable_api_ms_win_crt_runtime_l1_1_0 +wine_fn_config_dll api-ms-win-crt-stdio-l1-1-0 enable_api_ms_win_crt_stdio_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 ef86b17..ba023ce 100644 --- a/configure.ac +++ b/configure.ac @@ -2766,6 +2766,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-multibyte-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-process-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-runtime-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-crt-stdio-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-stdio-l1-1-0/Makefile.in b/dlls/api-ms-win-crt-stdio-l1-1-0/Makefile.in new file mode 100644 index 0000000..19ca3c4 --- /dev/null +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-crt-stdio-l1-1-0.dll diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec new file mode 100644 index 0000000..5516364 --- /dev/null +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -0,0 +1,159 @@ +@ stub __acrt_iob_func +@ cdecl __p__commode() ucrtbase.__p__commode +@ cdecl __p__fmode() ucrtbase.__p__fmode +@ stub __stdio_common_vfprintf +@ stub __stdio_common_vfprintf_p +@ stub __stdio_common_vfprintf_s +@ stub __stdio_common_vfscanf +@ stub __stdio_common_vfwprintf +@ stub __stdio_common_vfwprintf_p +@ stub __stdio_common_vfwprintf_s +@ stub __stdio_common_vfwscanf +@ stub __stdio_common_vsnprintf_s +@ stub __stdio_common_vsnwprintf_s +@ stub __stdio_common_vsprintf +@ stub __stdio_common_vsprintf_p +@ stub __stdio_common_vsprintf_s +@ stub __stdio_common_vsscanf +@ stub __stdio_common_vswprintf +@ stub __stdio_common_vswprintf_p +@ stub __stdio_common_vswprintf_s +@ stub __stdio_common_vswscanf +@ cdecl _chsize(long long) ucrtbase._chsize +@ cdecl _chsize_s(long int64) ucrtbase._chsize_s +@ cdecl _close(long) ucrtbase._close +@ cdecl _commit(long) ucrtbase._commit +@ cdecl _creat(str long) ucrtbase._creat +@ cdecl _dup(long) ucrtbase._dup +@ cdecl _dup2(long long) ucrtbase._dup2 +@ cdecl _eof(long) ucrtbase._eof +@ cdecl _fclose_nolock(ptr) ucrtbase._fclose_nolock +@ cdecl _fcloseall() ucrtbase._fcloseall +@ cdecl _fflush_nolock(ptr) ucrtbase._fflush_nolock +@ cdecl _fgetc_nolock(ptr) ucrtbase._fgetc_nolock +@ cdecl _fgetchar() ucrtbase._fgetchar +@ cdecl _fgetwc_nolock(ptr) ucrtbase._fgetwc_nolock +@ cdecl _fgetwchar() ucrtbase._fgetwchar +@ cdecl _filelength(long) ucrtbase._filelength +@ cdecl -ret64 _filelengthi64(long) ucrtbase._filelengthi64 +@ cdecl _fileno(ptr) ucrtbase._fileno +@ cdecl _flushall() ucrtbase._flushall +@ cdecl _fputc_nolock(long ptr) ucrtbase._fputc_nolock +@ cdecl _fputchar(long) ucrtbase._fputchar +@ cdecl _fputwc_nolock(long ptr) ucrtbase._fputwc_nolock +@ cdecl _fputwchar(long) ucrtbase._fputwchar +@ cdecl _fread_nolock(ptr long long ptr) ucrtbase._fread_nolock +@ cdecl _fread_nolock_s(ptr long long long ptr) ucrtbase._fread_nolock_s +@ cdecl _fseek_nolock(ptr long long) ucrtbase._fseek_nolock +@ cdecl _fseeki64(ptr int64 long) ucrtbase._fseeki64 +@ cdecl _fseeki64_nolock(ptr int64 long) ucrtbase._fseeki64_nolock +@ cdecl _fsopen(str str long) ucrtbase._fsopen +@ cdecl _ftell_nolock(ptr) ucrtbase._ftell_nolock +@ cdecl -ret64 _ftelli64(ptr) ucrtbase._ftelli64 +@ cdecl -ret64 _ftelli64_nolock(ptr) ucrtbase._ftelli64_nolock +@ cdecl _fwrite_nolock(ptr long long ptr) ucrtbase._fwrite_nolock +@ cdecl _get_fmode(ptr) ucrtbase._get_fmode +@ cdecl _get_osfhandle(long) ucrtbase._get_osfhandle +@ cdecl _get_printf_count_output() ucrtbase._get_printf_count_output +@ stub _get_stream_buffer_pointers +@ cdecl _getc_nolock(ptr) ucrtbase._getc_nolock +@ cdecl _getcwd(str long) ucrtbase._getcwd +@ cdecl _getdcwd(long str long) ucrtbase._getdcwd +@ cdecl _getmaxstdio() ucrtbase._getmaxstdio +@ cdecl _getw(ptr) ucrtbase._getw +@ cdecl _getwc_nolock(ptr) ucrtbase._getwc_nolock +@ cdecl _getws(ptr) ucrtbase._getws +@ stub _getws_s +@ cdecl _isatty(long) ucrtbase._isatty +@ cdecl _kbhit() ucrtbase._kbhit +@ cdecl _locking(long long long) ucrtbase._locking +@ cdecl _lseek(long long long) ucrtbase._lseek +@ cdecl -ret64 _lseeki64(long int64 long) ucrtbase._lseeki64 +@ cdecl _mktemp(str) ucrtbase._mktemp +@ cdecl _mktemp_s(str long) ucrtbase._mktemp_s +@ varargs _open(str long) ucrtbase._open +@ cdecl _open_osfhandle(long long) ucrtbase._open_osfhandle +@ cdecl _pclose(ptr) ucrtbase._pclose +@ cdecl _pipe(ptr long long) ucrtbase._pipe +@ cdecl _popen(str str) ucrtbase._popen +@ cdecl _putc_nolock(long ptr) ucrtbase._putc_nolock +@ cdecl _putw(long ptr) ucrtbase._putw +@ cdecl _putwc_nolock(long ptr) ucrtbase._putwc_nolock +@ cdecl _putws(wstr) ucrtbase._putws +@ cdecl _read(long ptr long) ucrtbase._read +@ cdecl _rmtmp() ucrtbase._rmtmp +@ cdecl _set_fmode(long) ucrtbase._set_fmode +@ cdecl _set_printf_count_output(long) ucrtbase._set_printf_count_output +@ cdecl _setmaxstdio(long) ucrtbase._setmaxstdio +@ cdecl _setmode(long long) ucrtbase._setmode +@ varargs _sopen(str long long) ucrtbase._sopen +@ stub _sopen_dispatch +@ cdecl _sopen_s(ptr str long long long) ucrtbase._sopen_s +@ cdecl _tell(long) ucrtbase._tell +@ cdecl -ret64 _telli64(long) ucrtbase._telli64 +@ cdecl _tempnam(str str) ucrtbase._tempnam +@ cdecl _ungetc_nolock(long ptr) ucrtbase._ungetc_nolock +@ cdecl _ungetwc_nolock(long ptr) ucrtbase._ungetwc_nolock +@ cdecl _wcreat(wstr long) ucrtbase._wcreat +@ cdecl _wfdopen(long wstr) ucrtbase._wfdopen +@ cdecl _wfopen(wstr wstr) ucrtbase._wfopen +@ cdecl _wfopen_s(ptr wstr wstr) ucrtbase._wfopen_s +@ cdecl _wfreopen(wstr wstr ptr) ucrtbase._wfreopen +@ cdecl _wfreopen_s(ptr wstr wstr ptr) ucrtbase._wfreopen_s +@ cdecl _wfsopen(wstr wstr long) ucrtbase._wfsopen +@ cdecl _wmktemp(wstr) ucrtbase._wmktemp +@ cdecl _wmktemp_s(wstr long) ucrtbase._wmktemp_s +@ varargs _wopen(wstr long) ucrtbase._wopen +@ cdecl _wpopen(wstr wstr) ucrtbase._wpopen +@ cdecl _write(long ptr long) ucrtbase._write +@ varargs _wsopen(wstr long long) ucrtbase._wsopen +@ stub _wsopen_dispatch +@ cdecl _wsopen_s(ptr wstr long long long) ucrtbase._wsopen_s +@ cdecl _wtempnam(wstr wstr) ucrtbase._wtempnam +@ cdecl _wtmpnam(ptr) ucrtbase._wtmpnam +@ stub _wtmpnam_s +@ cdecl clearerr(ptr) ucrtbase.clearerr +@ stub clearerr_s +@ cdecl fclose(ptr) ucrtbase.fclose +@ cdecl feof(ptr) ucrtbase.feof +@ cdecl ferror(ptr) ucrtbase.ferror +@ cdecl fflush(ptr) ucrtbase.fflush +@ cdecl fgetc(ptr) ucrtbase.fgetc +@ cdecl fgetpos(ptr ptr) ucrtbase.fgetpos +@ cdecl fgets(ptr long ptr) ucrtbase.fgets +@ cdecl fgetwc(ptr) ucrtbase.fgetwc +@ cdecl fgetws(ptr long ptr) ucrtbase.fgetws +@ cdecl fopen(str str) ucrtbase.fopen +@ cdecl fopen_s(ptr str str) ucrtbase.fopen_s +@ cdecl fputc(long ptr) ucrtbase.fputc +@ cdecl fputs(str ptr) ucrtbase.fputs +@ cdecl fputwc(long ptr) ucrtbase.fputwc +@ cdecl fputws(wstr ptr) ucrtbase.fputws +@ cdecl fread(ptr long long ptr) ucrtbase.fread +@ cdecl fread_s(ptr long long long ptr) ucrtbase.fread_s +@ cdecl freopen(str str ptr) ucrtbase.freopen +@ cdecl freopen_s(ptr str str ptr) ucrtbase.freopen_s +@ cdecl fseek(ptr long long) ucrtbase.fseek +@ cdecl fsetpos(ptr ptr) ucrtbase.fsetpos +@ cdecl ftell(ptr) ucrtbase.ftell +@ cdecl fwrite(ptr long long ptr) ucrtbase.fwrite +@ cdecl getc(ptr) ucrtbase.getc +@ cdecl getchar() ucrtbase.getchar +@ cdecl gets(str) ucrtbase.gets +@ stub gets_s +@ cdecl getwc(ptr) ucrtbase.getwc +@ cdecl getwchar() ucrtbase.getwchar +@ cdecl putc(long ptr) ucrtbase.putc +@ cdecl putchar(long) ucrtbase.putchar +@ cdecl puts(str) ucrtbase.puts +@ cdecl putwc(long ptr) ucrtbase.putwc +@ cdecl putwchar(long) ucrtbase.putwchar +@ cdecl rewind(ptr) ucrtbase.rewind +@ cdecl setbuf(ptr ptr) ucrtbase.setbuf +@ cdecl setvbuf(ptr str long long) ucrtbase.setvbuf +@ cdecl tmpfile() ucrtbase.tmpfile +@ cdecl tmpfile_s(ptr) ucrtbase.tmpfile_s +@ cdecl tmpnam(ptr) ucrtbase.tmpnam +@ stub tmpnam_s +@ cdecl ungetc(long ptr) ucrtbase.ungetc +@ cdecl ungetwc(long ptr) ucrtbase.ungetwc diff --git a/tools/make_specfiles b/tools/make_specfiles index bc6c48d..e1c5c7f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -62,6 +62,7 @@ my @dll_groups = "api-ms-win-crt-private-l1-1-0", "api-ms-win-crt-process-l1-1-0", "api-ms-win-crt-runtime-l1-1-0", + "api-ms-win-crt-stdio-l1-1-0", ], [ "msvcp120",

1 0

Martin Storsjo : api-ms-win-crt-time-l1-1-0: Add stub dll.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: 199278b4303faa88eda62b2d89a96de72cbbb673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199278b4303faa88eda62b2d8… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:55 2015 +0300 api-ms-win-crt-time-l1-1-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-crt-time-l1-1-0/Makefile.in | 1 + .../api-ms-win-crt-time-l1-1-0.spec | 72 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 77 insertions(+) diff --git a/configure b/configure index b1bd452..212c592 100755 --- a/configure +++ b/configure @@ -928,6 +928,7 @@ enable_api_ms_win_crt_process_l1_1_0 enable_api_ms_win_crt_runtime_l1_1_0 enable_api_ms_win_crt_stdio_l1_1_0 enable_api_ms_win_crt_string_l1_1_0 +enable_api_ms_win_crt_time_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 @@ -17181,6 +17182,7 @@ wine_fn_config_dll api-ms-win-crt-process-l1-1-0 enable_api_ms_win_crt_process_l wine_fn_config_dll api-ms-win-crt-runtime-l1-1-0 enable_api_ms_win_crt_runtime_l1_1_0 wine_fn_config_dll api-ms-win-crt-stdio-l1-1-0 enable_api_ms_win_crt_stdio_l1_1_0 wine_fn_config_dll api-ms-win-crt-string-l1-1-0 enable_api_ms_win_crt_string_l1_1_0 +wine_fn_config_dll api-ms-win-crt-time-l1-1-0 enable_api_ms_win_crt_time_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 d1b0494..dc6e852 100644 --- a/configure.ac +++ b/configure.ac @@ -2768,6 +2768,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-process-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-runtime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-stdio-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-crt-time-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-time-l1-1-0/Makefile.in b/dlls/api-ms-win-crt-time-l1-1-0/Makefile.in new file mode 100644 index 0000000..1887a90 --- /dev/null +++ b/dlls/api-ms-win-crt-time-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-crt-time-l1-1-0.dll diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec new file mode 100644 index 0000000..b619703 --- /dev/null +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -0,0 +1,72 @@ +@ cdecl _Getdays() ucrtbase._Getdays +@ cdecl _Getmonths() ucrtbase._Getmonths +@ cdecl _Gettnames() ucrtbase._Gettnames +@ cdecl _Strftime(str long str ptr ptr) ucrtbase._Strftime +@ cdecl _W_Getdays() ucrtbase._W_Getdays +@ cdecl _W_Getmonths() ucrtbase._W_Getmonths +@ stub _W_Gettnames +@ stub _Wcsftime +@ cdecl __daylight() ucrtbase.__daylight +@ cdecl __dstbias() ucrtbase.__dstbias +@ cdecl __timezone() ucrtbase.__timezone +@ cdecl __tzname() ucrtbase.__tzname +@ cdecl _ctime32(ptr) ucrtbase._ctime32 +@ cdecl _ctime32_s(str long ptr) ucrtbase._ctime32_s +@ cdecl _ctime64(ptr) ucrtbase._ctime64 +@ cdecl _ctime64_s(str long ptr) ucrtbase._ctime64_s +@ cdecl _difftime32(long long) ucrtbase._difftime32 +@ cdecl _difftime64(long long) ucrtbase._difftime64 +@ cdecl _ftime32(ptr) ucrtbase._ftime32 +@ cdecl _ftime32_s(ptr) ucrtbase._ftime32_s +@ cdecl _ftime64(ptr) ucrtbase._ftime64 +@ cdecl _ftime64_s(ptr) ucrtbase._ftime64_s +@ cdecl _futime32(long ptr) ucrtbase._futime32 +@ cdecl _futime64(long ptr) ucrtbase._futime64 +@ cdecl _get_daylight(ptr) ucrtbase._get_daylight +@ stub _get_dstbias +@ cdecl _get_timezone(ptr) ucrtbase._get_timezone +@ cdecl _get_tzname(ptr str long long) ucrtbase._get_tzname +@ cdecl _getsystime(ptr) ucrtbase._getsystime +@ cdecl _gmtime32(ptr) ucrtbase._gmtime32 +@ cdecl _gmtime32_s(ptr ptr) ucrtbase._gmtime32_s +@ cdecl _gmtime64(ptr) ucrtbase._gmtime64 +@ cdecl _gmtime64_s(ptr ptr) ucrtbase._gmtime64_s +@ cdecl _localtime32(ptr) ucrtbase._localtime32 +@ cdecl _localtime32_s(ptr ptr) ucrtbase._localtime32_s +@ cdecl _localtime64(ptr) ucrtbase._localtime64 +@ cdecl _localtime64_s(ptr ptr) ucrtbase._localtime64_s +@ cdecl _mkgmtime32(ptr) ucrtbase._mkgmtime32 +@ cdecl _mkgmtime64(ptr) ucrtbase._mkgmtime64 +@ cdecl _mktime32(ptr) ucrtbase._mktime32 +@ cdecl _mktime64(ptr) ucrtbase._mktime64 +@ cdecl _setsystime(ptr long) ucrtbase._setsystime +@ cdecl _strdate(ptr) ucrtbase._strdate +@ cdecl _strdate_s(ptr long) ucrtbase._strdate_s +@ stub _strftime_l +@ cdecl _strtime(ptr) ucrtbase._strtime +@ cdecl _strtime_s(ptr long) ucrtbase._strtime_s +@ cdecl _time32(ptr) ucrtbase._time32 +@ cdecl _time64(ptr) ucrtbase._time64 +@ stub _timespec32_get +@ stub _timespec64_get +@ cdecl _tzset() ucrtbase._tzset +@ cdecl _utime32(str ptr) ucrtbase._utime32 +@ cdecl _utime64(str ptr) ucrtbase._utime64 +@ cdecl _wasctime(ptr) ucrtbase._wasctime +@ cdecl _wasctime_s(ptr long ptr) ucrtbase._wasctime_s +@ stub _wcsftime_l +@ cdecl _wctime32(ptr) ucrtbase._wctime32 +@ stub _wctime32_s +@ cdecl _wctime64(ptr) ucrtbase._wctime64 +@ stub _wctime64_s +@ cdecl _wstrdate(ptr) ucrtbase._wstrdate +@ cdecl _wstrdate_s(ptr long) ucrtbase._wstrdate_s +@ cdecl _wstrtime(ptr) ucrtbase._wstrtime +@ cdecl _wstrtime_s(ptr long) ucrtbase._wstrtime_s +@ cdecl _wutime32(wstr ptr) ucrtbase._wutime32 +@ cdecl _wutime64(wstr ptr) ucrtbase._wutime64 +@ cdecl asctime(ptr) ucrtbase.asctime +@ cdecl asctime_s(ptr long ptr) ucrtbase.asctime_s +@ cdecl clock() ucrtbase.clock +@ cdecl strftime(str long str ptr) ucrtbase.strftime +@ cdecl wcsftime(ptr long wstr ptr) ucrtbase.wcsftime diff --git a/tools/make_specfiles b/tools/make_specfiles index bab4f4c..f62be3c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -64,6 +64,7 @@ my @dll_groups = "api-ms-win-crt-runtime-l1-1-0", "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-string-l1-1-0", + "api-ms-win-crt-time-l1-1-0", ], [ "msvcp120",

1 0

Hans Leidekker : advapi32: Add well-known SID WinBuiltinAnyPackageSid.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: 3a771b60668f891e61e440321bfa12994eb1cf52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a771b60668f891e61e440321… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 26 08:44:45 2015 +0200 advapi32: Add well-known SID WinBuiltinAnyPackageSid. --- dlls/advapi32/security.c | 6 +++++- dlls/advapi32/tests/security.c | 17 ++++++++--------- include/winnt.h | 12 ++++++++++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a40e639..e8f64d5 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -133,6 +133,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {'M','E'}, WinMediumLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_MEDIUM_RID } } }, { {'H','I'}, WinHighLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } } }, { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, + { {0,0}, WinBuiltinAnyPackageSid, { SID_REVISION, 2, { SECURITY_APP_PACKAGE_AUTHORITY }, { SECURITY_APP_PACKAGE_BASE_RID, SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE } } }, }; /* these SIDs must be constructed as relative to some domain - only the RID is well-known */ @@ -173,7 +174,9 @@ typedef struct _AccountSid { static const WCHAR Account_Operators[] = { 'A','c','c','o','u','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; static const WCHAR Administrator[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r',0 }; static const WCHAR Administrators[] = { 'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0 }; +static const WCHAR ALL_APPLICATION_PACKAGES[] = { 'A','L','L',' ','A','P','P','L','I','C','A','T','I','O','N',' ','P','A','C','K','A','G','E','S',0 }; static const WCHAR ANONYMOUS_LOGON[] = { 'A','N','O','N','Y','M','O','U','S',' ','L','O','G','O','N',0 }; +static const WCHAR APPLICATION_PACKAGE_AUTHORITY[] = { 'A','P','P','L','I','C','A','T','I','O','N',' ','P','A','C','K','A','G','E',' ','A','U','T','H','O','R','I','T','Y',0 }; static const WCHAR Authenticated_Users[] = { 'A','u','t','h','e','n','t','i','c','a','t','e','d',' ','U','s','e','r','s',0 }; static const WCHAR Backup_Operators[] = { 'B','a','c','k','u','p',' ','O','p','e','r','a','t','o','r','s',0 }; static const WCHAR BATCH[] = { 'B','A','T','C','H',0 }; @@ -277,6 +280,7 @@ static const AccountSid ACCOUNT_SIDS[] = { { WinOtherOrganizationSid, Other_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, { WinBuiltinPerfMonitoringUsersSid, Performance_Monitor_Users, BUILTIN, SidTypeAlias }, { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, + { WinBuiltinAnyPackageSid, ALL_APPLICATION_PACKAGES, APPLICATION_PACKAGE_AUTHORITY, SidTypeWellKnownGroup }, }; /* * ACE access rights @@ -2208,7 +2212,7 @@ LookupAccountSidW( } /* check the well known SIDs first */ - for (i = 0; i <= 60; i++) { + for (i = 0; i <= WinAccountProtectedUsersSid; i++) { if (IsWellKnownSid(sid, i)) { for (j = 0; j < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); j++) { if (ACCOUNT_SIDS[j].type == i) { diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 5d52fab..46db49c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1731,7 +1731,9 @@ static const struct well_known_sid_value /* 69 */ {TRUE, "S-1-16-16384"}, {TRUE, "S-1-5-33"}, {TRUE, "S-1-3-4"}, /* 72 */ {FALSE, "S-1-5-21-12-23-34-45-56-571"}, {FALSE, "S-1-5-21-12-23-34-45-56-572"}, /* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"}, -/* 77 */ {FALSE, "S-1-5-21-12-23-34-45-56-498"}, {TRUE, "S-1-5-32-574"}, {TRUE, "S-1-16-8448"} +/* 77 */ {FALSE, "S-1-5-21-12-23-34-45-56-498"}, {TRUE, "S-1-5-32-574"}, {TRUE, "S-1-16-8448"}, +/* 80 */ {FALSE, NULL}, {TRUE, "S-1-2-1"}, {TRUE, "S-1-5-65-1"}, {FALSE, NULL}, +/* 84 */ {TRUE, "S-1-15-2-1"}, }; static void test_CreateWellKnownSid(void) @@ -1780,15 +1782,12 @@ static void test_CreateWellKnownSid(void) if (value->sid_string == NULL) continue; - if (i > WinAccountRasAndIasServersSid) + /* some SIDs aren't implemented by all Windows versions - detect it */ + cb = sizeof(sid_buffer); + if (!pCreateWellKnownSid(i, NULL, sid_buffer, &cb)) { - /* These SIDs aren't implemented by all Windows versions - detect it and break the loop */ - cb = sizeof(sid_buffer); - if (!pCreateWellKnownSid(i, domainsid, sid_buffer, &cb)) - { - skip("Well known SIDs starting from %u are not implemented\n", i); - break; - } + skip("Well known SID %u not implemented\n", i); + continue; } cb = sizeof(sid_buffer); diff --git a/include/winnt.h b/include/winnt.h index 93e216f..ded01f6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4181,6 +4181,18 @@ typedef struct _SID_AND_ATTRIBUTES { #define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS __MSABI_LONG(0x00000207) #define DOMAIN_GROUP_RID_POLICY_ADMINS __MSABI_LONG(0x00000208) +#define SECURITY_APP_PACKAGE_AUTHORITY {0,0,0,0,0,15} +#define SECURITY_APP_PACKAGE_BASE_RID __MSABI_LONG(0x000000002) +#define SECURITY_BUILTIN_APP_PACKAGE_RID_COUNT __MSABI_LONG(0x000000002) +#define SECURITY_APP_PACKAGE_RID_COUNT __MSABI_LONG(0x000000008) +#define SECURITY_CAPABILITY_BASE_RID __MSABI_LONG(0x000000003) +#define SECURITY_CAPABILITY_APP_RID __MSABI_LONG(0x000000400) +#define SECURITY_BUILTIN_CAPABILITY_RID_COUNT __MSABI_LONG(0x000000002) +#define SECURITY_CAPABILITY_RID_COUNT __MSABI_LONG(0x000000005) +#define SECURITY_PARENT_PACKAGE_RID_COUNT SECURITY_APP_PACKAGE_RID_COUNT +#define SECURITY_CHILD_PACKAGE_RID_COUNT __MSABI_LONG(0x00000000c) +#define SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE __MSABI_LONG(0x000000001) + #define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} #define SECURITY_MANDATORY_UNTRUSTED_RID __MSABI_LONG(0x00000000) #define SECURITY_MANDATORY_LOW_RID __MSABI_LONG(0x00001000)

1 0

Martin Storsjo : api-ms-win-crt-utility-l1-1-0: Add stub dll.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: 8741cba354506d348cbfe4683e1c3a168a110bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8741cba354506d348cbfe4683… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:56 2015 +0300 api-ms-win-crt-utility-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-crt-utility-l1-1-0/Makefile.in | 1 + .../api-ms-win-crt-utility-l1-1-0.spec | 30 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 35 insertions(+) diff --git a/configure b/configure index 212c592..4f71ac3 100755 --- a/configure +++ b/configure @@ -929,6 +929,7 @@ enable_api_ms_win_crt_runtime_l1_1_0 enable_api_ms_win_crt_stdio_l1_1_0 enable_api_ms_win_crt_string_l1_1_0 enable_api_ms_win_crt_time_l1_1_0 +enable_api_ms_win_crt_utility_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 @@ -17183,6 +17184,7 @@ wine_fn_config_dll api-ms-win-crt-runtime-l1-1-0 enable_api_ms_win_crt_runtime_l wine_fn_config_dll api-ms-win-crt-stdio-l1-1-0 enable_api_ms_win_crt_stdio_l1_1_0 wine_fn_config_dll api-ms-win-crt-string-l1-1-0 enable_api_ms_win_crt_string_l1_1_0 wine_fn_config_dll api-ms-win-crt-time-l1-1-0 enable_api_ms_win_crt_time_l1_1_0 +wine_fn_config_dll api-ms-win-crt-utility-l1-1-0 enable_api_ms_win_crt_utility_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 dc6e852..e037688 100644 --- a/configure.ac +++ b/configure.ac @@ -2769,6 +2769,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-runtime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-stdio-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-time-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-crt-utility-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-utility-l1-1-0/Makefile.in b/dlls/api-ms-win-crt-utility-l1-1-0/Makefile.in new file mode 100644 index 0000000..cf2b940 --- /dev/null +++ b/dlls/api-ms-win-crt-utility-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-crt-utility-l1-1-0.dll diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec new file mode 100644 index 0000000..b335cf8 --- /dev/null +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -0,0 +1,30 @@ +@ cdecl -ret64 _abs64(int64) ucrtbase._abs64 +@ cdecl _byteswap_uint64(int64) ucrtbase._byteswap_uint64 +@ cdecl _byteswap_ulong(long) ucrtbase._byteswap_ulong +@ cdecl _byteswap_ushort(long) ucrtbase._byteswap_ushort +@ cdecl _lfind(ptr ptr ptr long ptr) ucrtbase._lfind +@ stub _lfind_s +@ cdecl _lrotl(long long) ucrtbase._lrotl +@ cdecl _lrotr(long long) ucrtbase._lrotr +@ cdecl _lsearch(ptr ptr ptr long ptr) ucrtbase._lsearch +@ stub _lsearch_s +@ cdecl _rotl(long long) ucrtbase._rotl +@ cdecl -ret64 _rotl64(int64 long) ucrtbase._rotl64 +@ cdecl _rotr(long long) ucrtbase._rotr +@ cdecl -ret64 _rotr64(int64 long) ucrtbase._rotr64 +@ cdecl _swab(str str long) ucrtbase._swab +@ cdecl abs(long) ucrtbase.abs +@ cdecl bsearch(ptr ptr long long ptr) ucrtbase.bsearch +@ cdecl bsearch_s(ptr ptr long long ptr ptr) ucrtbase.bsearch_s +@ cdecl -ret64 div(long long) ucrtbase.div +@ stub imaxabs +@ stub imaxdiv +@ cdecl labs(long) ucrtbase.labs +@ cdecl ldiv(long long) ucrtbase.ldiv +@ cdecl -ret64 llabs(int64) ucrtbase.llabs +@ stub lldiv +@ cdecl qsort(ptr long long ptr) ucrtbase.qsort +@ cdecl qsort_s(ptr long long ptr ptr) ucrtbase.qsort_s +@ cdecl rand() ucrtbase.rand +@ cdecl rand_s(ptr) ucrtbase.rand_s +@ cdecl srand(long) ucrtbase.srand diff --git a/tools/make_specfiles b/tools/make_specfiles index f62be3c..5d31939 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -65,6 +65,7 @@ my @dll_groups = "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-string-l1-1-0", "api-ms-win-crt-time-l1-1-0", + "api-ms-win-crt-utility-l1-1-0", ], [ "msvcp120",

1 0

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

Aug. 26, 2015

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