March 2020 - Wine-Commits - list.winehq.org

Jacek Caban : makedep: Use winebuild to build cross compiled static libraries.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 4ec4988c2eb587c08b7bb7dab6e90ff6014cb6e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ec4988c2eb587c08b7bb7da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 17:15:50 2020 +0100 makedep: Use winebuild to build cross compiled static libraries. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c324802916..c415c5e84f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3382,12 +3382,12 @@ static void output_static_lib( struct makefile *make ) char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); strarray_add( &make->all_targets, name ); - output( "%s:", obj_dir_path( make, name )); + output( "%s: %s", obj_dir_path( make, name ), tools_path( make, "winebuild" )); output_filenames_obj_dir( make, make->crossobj_files ); - output( "\n\trm -f $@\n" ); - output( "\t%s-ar rc $@", crosstarget ); + output( "\n" ); + output( "\t%s -b %s -w --staticlib -o $@", tools_path( make, "winebuild" ), crosstarget ); output_filenames_obj_dir( make, make->crossobj_files ); - output( "\n\t%s-ranlib $@\n", crosstarget ); + output( "\n" ); } }

1 0

Zebediah Figura : amstream: Allow AMMSF_ADDDEFAULTRENDERER only with MSPID_PrimaryAudio.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 3e6eaaa2c565b5c5f6d0d5c25de67603c72e61a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6eaaa2c565b5c5f6d0d5c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:19:15 2020 -0600 amstream: Allow AMMSF_ADDDEFAULTRENDERER only with MSPID_PrimaryAudio. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 25 ++++++++++--------------- dlls/amstream/tests/amstream.c | 3 +++ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 6643d5d141..48abcaf8b4 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -305,26 +305,21 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac if (dwFlags & AMMSF_ADDDEFAULTRENDERER) { - if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) + IBaseFilter *dsound_render; + + if (!IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) { - /* Default renderer not supported by video stream */ + WARN("AMMSF_ADDDEFAULTRENDERER requested with id %s, returning MS_E_PURPOSEID.\n", debugstr_guid(PurposeId)); return MS_E_PURPOSEID; } - else - { - IBaseFilter* dsoundrender_filter; - /* Create the default renderer for audio */ - hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&dsoundrender_filter); - if (SUCCEEDED(hr)) - { - hr = IGraphBuilder_AddFilter(This->pFilterGraph, dsoundrender_filter, NULL); - IBaseFilter_Release(dsoundrender_filter); - } - - /* No media stream created when the default renderer is used */ - return hr; + if (SUCCEEDED(hr = CoCreateInstance(&CLSID_DSoundRender, NULL, + CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&dsound_render))) + { + hr = IGraphBuilder_AddFilter(This->pFilterGraph, dsound_render, NULL); + IBaseFilter_Release(dsound_render); } + return hr; } if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 5c700140e3..16663bf441 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -840,6 +840,9 @@ static void test_add_stream(void) IGraphBuilder_Release(graph); } + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &test_mspid, + AMMSF_ADDDEFAULTRENDERER, NULL); + ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &test_mspid, AMMSF_ADDDEFAULTRENDERER, &audio_stream); todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);

1 0

Jacek Caban : msvcrt/tests: Use __[w]getmainargs declarations from headers.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: b3d13197e3cc789347eb27ecbb75d4cae2da12a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3d13197e3cc789347eb27ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 17:22:20 2020 +0100 msvcrt/tests: Use __[w]getmainargs declarations from headers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/environ.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 43115d86da..6829d80e95 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -20,6 +20,7 @@ #include "wine/test.h" #include <stdlib.h> +#include <process.h> static const char *a_very_long_env_string = "LIBRARY_PATH=" @@ -42,9 +43,6 @@ static const char *a_very_long_env_string = "/usr/lib/mingw32/3.4.2/;" "/usr/lib/"; -void __cdecl __getmainargs(int *, char ***, char ***, int, int *); -void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); - static char ***(__cdecl *p__p__environ)(void); static WCHAR ***(__cdecl *p__p__wenviron)(void); static void (*p_get_environ)(char ***);

1 0

Sven Baars : d3dx9: Implement ID3DXFont_PreloadText.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: cc03400e322edea97f0e425c04cd9069f77b4c9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc03400e322edea97f0e425c… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Mar 3 09:38:27 2020 +0100 d3dx9: Implement ID3DXFont_PreloadText. Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 56 ++++++++++++++++++++++++++++++++++++++++++---- dlls/d3dx9_36/tests/core.c | 2 -- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 9196295637..81ba1e4fa0 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -420,14 +420,62 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(ID3DXFont *iface, const char *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_a(string), count); - return E_NOTIMPL; + WCHAR *wstr; + HRESULT hr; + int countW; + + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_an(string, count), count); + + if (!string && !count) + return D3D_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + countW = MultiByteToWideChar(CP_ACP, 0, string, count < 0 ? -1 : count, NULL, 0); + + wstr = heap_alloc(countW * sizeof(*wstr)); + if (!wstr) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, string, count < 0 ? -1 : count, wstr, countW); + + hr = ID3DXFont_PreloadTextW(iface, wstr, count < 0 ? countW - 1 : countW); + + heap_free(wstr); + + return hr; } static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_w(string), count); - return E_NOTIMPL; + struct d3dx_font *font = impl_from_ID3DXFont(iface); + WORD *indices; + int i; + + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_wn(string, count), count); + + if (!string && !count) + return D3D_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + if (count < 0) + count = lstrlenW(string); + + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + GetGlyphIndicesW(font->hdc, string, count, indices, 0); + + for (i = 0; i < count; ++i) + ID3DXFont_PreloadGlyphs(iface, indices[i], indices[i]); + + heap_free(indices); + + return D3D_OK; } static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index b8e680d1c5..662483b687 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -504,7 +504,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine { hr = ID3DXFont_PreloadTextA(font, NULL, -1); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadTextA(font, NULL, 0); @@ -530,7 +529,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadTextW(font, L"", -1); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - } check_release((IUnknown*)font, 0);

1 0

Zebediah Figura : amstream: Implement IMediaStreamFilter::EnumMediaStreams().
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: c6d436f7fde6534489e7a1a4c83aaf9e986e78b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6d436f7fde6534489e7a1a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:19:14 2020 -0600 amstream: Implement IMediaStreamFilter::EnumMediaStreams(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 15 ++++++++++++--- dlls/amstream/tests/amstream.c | 23 +++++++++++------------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 4b0951cb6a..80a885de24 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -474,11 +474,20 @@ static HRESULT WINAPI filter_GetMediaStream(IMediaStreamFilter *iface, REFMSPID return MS_E_NOSTREAM; } -static HRESULT WINAPI filter_EnumMediaStreams(IMediaStreamFilter *iface, LONG Index, IMediaStream **ppMediaStream) +static HRESULT WINAPI filter_EnumMediaStreams(IMediaStreamFilter *iface, LONG index, IMediaStream **stream) { - FIXME("(%p)->(%d,%p): Stub!\n", iface, Index, ppMediaStream); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p, index %d, stream %p.\n", filter, index, stream); + + if (index >= filter->nb_streams) + return S_FALSE; + + if (!stream) + return E_POINTER; + + IMediaStream_AddRef(*stream = (IMediaStream *)filter->streams[index]); + return S_OK; } static HRESULT WINAPI filter_SupportSeeking(IMediaStreamFilter *iface, BOOL bRenderer) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 0a344f412e..5c700140e3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -573,19 +573,18 @@ static void check_enum_stream_(int line, IAMMultiMediaStream *mmstream, HRESULT hr; hr = IAMMultiMediaStream_EnumMediaStreams(mmstream, index, &stream); - todo_wine ok_(__FILE__, line)(hr == (expect ? S_OK : S_FALSE), + ok_(__FILE__, line)(hr == (expect ? S_OK : S_FALSE), "IAMMultiMediaStream::EnumMediaStreams() returned %#x.\n", hr); hr = IMediaStreamFilter_EnumMediaStreams(filter, index, &stream2); - todo_wine ok_(__FILE__, line)(hr == (expect ? S_OK : S_FALSE), + ok_(__FILE__, line)(hr == (expect ? S_OK : S_FALSE), "IMediaStreamFilter::EnumMediaStreams() returned %#x.\n", hr); if (hr == S_OK) { ok_(__FILE__, line)(stream == expect, "Expected stream %p, got %p.\n", expect, stream); ok_(__FILE__, line)(stream2 == expect, "Expected stream %p, got %p.\n", expect, stream2); + IMediaStream_Release(stream); + IMediaStream_Release(stream2); } - - if (stream) IMediaStream_Release(stream); - if (stream2) IMediaStream_Release(stream2); } #define check_get_stream(a,b,c,d) check_get_stream_(__LINE__,a,b,c,d) @@ -629,9 +628,9 @@ static void test_add_stream(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_EnumMediaStreams(mmstream, 0, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EnumMediaStreams(stream_filter, 0, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryAudio, NULL); todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -655,13 +654,13 @@ static void test_add_stream(void) ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_EnumMediaStreams(mmstream, 0, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EnumMediaStreams(stream_filter, 0, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_EnumMediaStreams(mmstream, 1, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EnumMediaStreams(stream_filter, 1, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); check_enum_stream(mmstream, stream_filter, 0, video_stream); check_enum_stream(mmstream, stream_filter, 1, NULL); @@ -694,7 +693,7 @@ static void test_add_stream(void) check_enum_stream(mmstream, stream_filter, 0, video_stream); check_enum_stream(mmstream, stream_filter, 1, audio_stream); - check_enum_stream(mmstream, stream_filter, 2, (IMediaStream *)&teststream); + todo_wine check_enum_stream(mmstream, stream_filter, 2, (IMediaStream *)&teststream); check_enum_stream(mmstream, stream_filter, 3, NULL); check_get_stream(mmstream, stream_filter, &MSPID_PrimaryVideo, video_stream);

1 0

Jacek Caban : msvcrt20: Use __[w]getmainargs declarations from headers.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: b648c9281192b24b6dbfd739e37a4860adcb3c9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b648c9281192b24b6dbfd739… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 17:22:28 2020 +0100 msvcrt20: Use __[w]getmainargs declarations from headers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt20/msvcrt20.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.c b/dlls/msvcrt20/msvcrt20.c index 3cb1e678c1..21a3027423 100644 --- a/dlls/msvcrt20/msvcrt20.c +++ b/dlls/msvcrt20/msvcrt20.c @@ -20,14 +20,10 @@ #include <stdarg.h> #include <math.h> +#include <process.h> #include "windef.h" -extern void CDECL __getmainargs(int *argc, char** *argv, char** *envp, - int expand_wildcards, int *new_mode); -extern void CDECL __wgetmainargs(int *argc, WCHAR** *wargv, WCHAR** *wenvp, - int expand_wildcards, int *new_mode); - /********************************************************************* * __getmainargs (MSVCRT20.@) *

1 0

Zebediah Figura : kernel32/tests: Add some tests for hard links.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: ee31a622b83d32a9edc454252da7b419d86c0b84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee31a622b83d32a9edc45425… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 23:20:36 2020 -0600 kernel32/tests: Add some tests for hard links. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 110082a9c4..1f70433787 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -117,6 +117,13 @@ static void InitFunctionPointers(void) pFindFirstStreamW = (void *)GetProcAddress(hkernel32, "FindFirstStreamW"); } +static void create_file( const char *path ) +{ + FILE *f = fopen( path, "wb" ); + fputs( path, f ); + fclose( f ); +} + static void test__hread( void ) { HFILE filehandle; @@ -5510,6 +5517,80 @@ static void test_SetFileTime(void) CloseHandle(hfile); } +static void test_hard_link(void) +{ + char cwd[MAX_PATH], temp_dir[MAX_PATH], name_buffer[200], buffer[20]; + FILE_NAME_INFORMATION *name_info = (FILE_NAME_INFORMATION *)name_buffer; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + DWORD size; + BOOL ret; + + GetCurrentDirectoryA( sizeof(cwd), cwd ); + GetTempPathA( sizeof(temp_dir), temp_dir ); + SetCurrentDirectoryA( temp_dir ); + + ret = CreateDirectoryA( "winetest_dir1", NULL ); + ok(ret, "failed to create directory, error %u\n", GetLastError()); + ret = CreateDirectoryA( "winetest_dir2", NULL ); + ok(ret, "failed to create directory, error %u\n", GetLastError()); + create_file( "winetest_file1" ); + create_file( "winetest_file2" ); + + ret = CreateHardLinkA( "winetest_file3", "winetest_file1", NULL ); + ok(ret, "got error %u\n", GetLastError()); + + file = CreateFileA( "winetest_file3", FILE_READ_DATA, 0, NULL, OPEN_EXISTING, 0, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, name_buffer, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(!wcsncmp(name_info->FileName + (name_info->FileNameLength / sizeof(WCHAR)) - wcslen(L"\\winetest_file3"), + L"\\winetest_file3", wcslen(L"\\winetest_file3")), "got name %s\n", + debugstr_wn(name_info->FileName, name_info->FileNameLength / sizeof(WCHAR))); + + ret = ReadFile( file, buffer, sizeof(buffer), &size, NULL ); + ok(ret, "got error %u\n", GetLastError()); + ok(!memcmp( buffer, "winetest_file1", size ), "got file contents %s\n", debugstr_an( buffer, size )); + + CloseHandle( file ); + + ret = DeleteFileA( "winetest_file3" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_file2", "winetest_file1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_file3", "winetest_dir1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_dir2", "winetest_dir1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED + || GetLastError() == ERROR_ALREADY_EXISTS /* XP */, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_dir1", "winetest_file1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + + ret = RemoveDirectoryA( "winetest_dir1" ); + ok(ret, "failed to remove directory, error %u\n", GetLastError()); + ret = RemoveDirectoryA( "winetest_dir2" ); + ok(ret, "failed to remove directory, error %u\n", GetLastError()); + ret = DeleteFileA( "winetest_file1" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + ret = DeleteFileA( "winetest_file2" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + SetCurrentDirectoryA( cwd ); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5584,4 +5665,5 @@ START_TEST(file) test_find_file_stream(); test_SetFileTime(); test_ReOpenFile(); + test_hard_link(); }

1 0

Giovanni Mascellani : d2d1: Implement ellipse and rounded rectangle stroking with arcs.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 873e3d0691d8a5fb2012d541369ae7ed3e39cfc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=873e3d0691d8a5fb2012d541… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Mar 3 18:59:47 2020 +0100 d2d1: Implement ellipse and rounded rectangle stroking with arcs. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 13 +- dlls/d2d1/device.c | 313 ++++++++++++++++++++++++++++++++++++++++------- dlls/d2d1/geometry.c | 82 ++++++++++--- 3 files changed, 345 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=873e3d0691d8a5fb2012…

1 0

Zebediah Figura : wined3d: Stop setting the device state in wined3d_stateblock_apply().
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 70b3a2624ae188ff4f015d7d526aa0b04cbfbc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70b3a2624ae188ff4f015d7d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:50:02 2020 -0600 wined3d: Stop setting the device state in wined3d_stateblock_apply(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 215 ++++++++++------------------------------------ 1 file changed, 45 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70b3a2624ae188ff4f01…

1 0

Zebediah Figura : wined3d: Remove no longer used device state functions.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 027e2b01fa871c5347d4f1ab95d78820669b20e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=027e2b01fa871c5347d4f1ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:50:03 2020 -0600 wined3d: Remove no longer used device state functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 250 ---------------------------------------------- dlls/wined3d/wined3d.spec | 16 --- include/wine/wined3d.h | 28 ------ 3 files changed, 294 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=027e2b01fa871c5347d4…

1 0