July 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : wineboot: Avoid using getopt_long().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 51bc180c1fde3b425a806ae977a3af4c8169c44d URL: https://source.winehq.org/git/wine.git/?a=commit;h=51bc180c1fde3b425a806ae9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 3 20:58:43 2019 +0200 wineboot: Avoid using getopt_long(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index defd126..b7192fe 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -61,9 +61,6 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_GETOPT_H -# include <getopt.h> -#endif #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif @@ -1226,7 +1223,7 @@ done: return ret; } -static void usage(void) +static void usage( int status ) { WINE_MESSAGE( "Usage: wineboot [options]\n" ); WINE_MESSAGE( "Options;\n" ); @@ -1238,23 +1235,9 @@ static void usage(void) WINE_MESSAGE( " -r,--restart Restart only, don't do normal startup operations\n" ); WINE_MESSAGE( " -s,--shutdown Shutdown only, don't reboot\n" ); WINE_MESSAGE( " -u,--update Update the wineprefix directory\n" ); + exit( status ); } -static const char short_options[] = "efhikrsu"; - -static const struct option long_options[] = -{ - { "help", 0, 0, 'h' }, - { "end-session", 0, 0, 'e' }, - { "force", 0, 0, 'f' }, - { "init" , 0, 0, 'i' }, - { "kill", 0, 0, 'k' }, - { "restart", 0, 0, 'r' }, - { "shutdown", 0, 0, 's' }, - { "update", 0, 0, 'u' }, - { NULL, 0, 0, 0 } -}; - int __cdecl main( int argc, char *argv[] ) { static const WCHAR RunW[] = {'R','u','n',0}; @@ -1264,7 +1247,7 @@ int __cdecl main( int argc, char *argv[] ) static const WCHAR wineboot_eventW[] = {'_','_','w','i','n','e','b','o','o','t','_','e','v','e','n','t',0}; /* First, set the current directory to SystemRoot */ - int optc; + int i, j; BOOL end_session, force, init, kill, restart, shutdown, update; HANDLE event; SECURITY_ATTRIBUTES sa; @@ -1299,19 +1282,36 @@ int __cdecl main( int argc, char *argv[] ) Wow64RevertWow64FsRedirection( redir ); } - while ((optc = getopt_long(argc, argv, short_options, long_options, NULL )) != -1) + for (i = 1; i < argc; i++) { - switch(optc) + if (argv[i][0] != '-') continue; + if (argv[i][1] == '-') { - case 'e': end_session = TRUE; break; - case 'f': force = TRUE; break; - case 'i': init = TRUE; break; - case 'k': kill = TRUE; break; - case 'r': restart = TRUE; break; - case 's': shutdown = TRUE; break; - case 'u': update = TRUE; break; - case 'h': usage(); return 0; - case '?': usage(); return 1; + if (!strcmp( argv[i], "--help" )) usage( 0 ); + else if (!strcmp( argv[i], "--end-session" )) end_session = TRUE; + else if (!strcmp( argv[i], "--force" )) force = TRUE; + else if (!strcmp( argv[i], "--init" )) init = TRUE; + else if (!strcmp( argv[i], "--kill" )) kill = TRUE; + else if (!strcmp( argv[i], "--restart" )) restart = TRUE; + else if (!strcmp( argv[i], "--shutdown" )) shutdown = TRUE; + else if (!strcmp( argv[i], "--update" )) update = TRUE; + else usage( 1 ); + continue; + } + for (j = 1; argv[i][j]; j++) + { + switch (argv[i][j]) + { + case 'e': end_session = TRUE; break; + case 'f': force = TRUE; break; + case 'i': init = TRUE; break; + case 'k': kill = TRUE; break; + case 'r': restart = TRUE; break; + case 's': shutdown = TRUE; break; + case 'u': update = TRUE; break; + case 'h': usage(0); break; + default: usage(1); break; + } } }

1 0

Jacek Caban : msxml3: Fix string length handling in I[VB]SAXContentHandler ::characters.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 73af53c4bca6cc56b4fccc8139cc564715c08e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73af53c4bca6cc56b4fccc81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 18 16:55:40 2019 +0200 msxml3: Fix string length handling in I[VB]SAXContentHandler::characters. Windows crashes when -1 length is passed. Escaping should just copy embedded null bytes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 10 +++--- dlls/msxml3/tests/saxreader.c | 72 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 10be250..a5bfdf1 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -498,10 +498,10 @@ static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) WCHAR *ptr, *ret; /* default buffer size to something if length is unknown */ - conv_len = *len == -1 ? default_alloc : max(2**len, default_alloc); + conv_len = max(2**len, default_alloc); ptr = ret = heap_alloc(conv_len*sizeof(WCHAR)); - while (*str && p) + while (p) { if (ptr - ret > conv_len - grow_thresh) { @@ -539,10 +539,10 @@ static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) } str++; - if (*len != -1) p--; + p--; } - if (*len != -1) *len = ptr-ret; + *len = ptr-ret; *++ptr = 0; return ret; @@ -2206,7 +2206,7 @@ static HRESULT WINAPI VBSAXContentHandler_characters(IVBSAXContentHandler *iface if (!chars) return E_POINTER; - return ISAXContentHandler_characters(&This->ISAXContentHandler_iface, *chars, -1); + return ISAXContentHandler_characters(&This->ISAXContentHandler_iface, *chars, SysStringLen(*chars)); } static HRESULT WINAPI VBSAXContentHandler_ignorableWhitespace(IVBSAXContentHandler *iface, BSTR *chars) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index eeef5b6..d1076f5 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3950,10 +3950,13 @@ static const struct writer_characters_t writer_characters[] = { static void test_mxwriter_characters(void) { static const WCHAR chardataW[] = {'T','E','S','T','C','H','A','R','D','A','T','A',' ','.',0}; + static const WCHAR embedded_nullbytes[] = {'a',0,'b',0,0,0,'c',0}; const struct writer_characters_t *table = writer_characters; + IVBSAXContentHandler *vb_content; ISAXContentHandler *content; IMXWriter *writer; VARIANT dest; + BSTR str; HRESULT hr; int i = 0; @@ -3964,6 +3967,9 @@ static void test_mxwriter_characters(void) hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); EXPECT_HR(hr, S_OK); + hr = IMXWriter_QueryInterface(writer, &IID_IVBSAXContentHandler, (void**)&vb_content); + EXPECT_HR(hr, S_OK); + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); EXPECT_HR(hr, S_OK); @@ -3976,6 +3982,10 @@ static void test_mxwriter_characters(void) hr = ISAXContentHandler_characters(content, chardataW, 0); EXPECT_HR(hr, S_OK); + str = _bstr_("VbChars"); + hr = IVBSAXContentHandler_characters(vb_content, &str); + EXPECT_HR(hr, S_OK); + hr = ISAXContentHandler_characters(content, chardataW, ARRAY_SIZE(chardataW) - 1); EXPECT_HR(hr, S_OK); @@ -3983,13 +3993,14 @@ static void test_mxwriter_characters(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("TESTCHARDATA ."), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("VbCharsTESTCHARDATA ."), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_endDocument(content); EXPECT_HR(hr, S_OK); ISAXContentHandler_Release(content); + IVBSAXContentHandler_Release(vb_content); IMXWriter_Release(writer); /* try empty characters data to see if element is closed */ @@ -4025,6 +4036,65 @@ static void test_mxwriter_characters(void) ISAXContentHandler_Release(content); IMXWriter_Release(writer); + /* test embedded null bytes */ + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_characters(content, embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(SysStringLen(V_BSTR(&dest)) == ARRAY_SIZE(embedded_nullbytes), "unexpected len %d\n", SysStringLen(V_BSTR(&dest))); + ok(!memcmp(V_BSTR(&dest), embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)), + "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_IVBSAXContentHandler, (void**)&vb_content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = IVBSAXContentHandler_startDocument(vb_content); + EXPECT_HR(hr, S_OK); + + str = SysAllocStringLen(embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)); + hr = IVBSAXContentHandler_characters(vb_content, &str); + EXPECT_HR(hr, S_OK); + SysFreeString(str); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(SysStringLen(V_BSTR(&dest)) == ARRAY_SIZE(embedded_nullbytes), "unexpected len %d\n", SysStringLen(V_BSTR(&dest))); + ok(!memcmp(V_BSTR(&dest), embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)), + "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + IVBSAXContentHandler_Release(vb_content); + IMXWriter_Release(writer); + /* batch tests */ while (table->clsid) {

1 0

Ethan Lee : xaudio2: Add TRACE functions to CreateAudioReverb/ CreateAudioVolumeMeter.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 6103b8173b119fb8c80a107f0284a83399438066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6103b8173b119fb8c80a107f… Author: Ethan Lee <elee(a)codeweavers.com> Date: Mon Jul 1 13:53:54 2019 -0400 xaudio2: Add TRACE functions to CreateAudioReverb/CreateAudioVolumeMeter. Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index da0b0aa..a87e012 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2075,6 +2075,8 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) IClassFactory *cf; HRESULT hr; + TRACE("%p\n", out); + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); if(FAILED(hr)) return hr; @@ -2091,6 +2093,8 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) IClassFactory *cf; HRESULT hr; + TRACE("%p\n", out); + hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf); if(FAILED(hr)) return hr;

1 0

Ethan Lee : xaudio2: Export functions by ordinal.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 92a5299b1d0a0775e1158f334c0348a3ffe8f063 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92a5299b1d0a0775e1158f33… Author: Ethan Lee <elee(a)codeweavers.com> Date: Tue Jul 2 11:01:06 2019 -0400 xaudio2: Export functions by ordinal. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47437 Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_8/xaudio2_8.spec | 12 ++++++------ dlls/xaudio2_9/xaudio2_9.spec | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/xaudio2_8/xaudio2_8.spec b/dlls/xaudio2_8/xaudio2_8.spec index 0b9f238..78bf05b 100644 --- a/dlls/xaudio2_8/xaudio2_8.spec +++ b/dlls/xaudio2_8/xaudio2_8.spec @@ -1,6 +1,6 @@ -@ stdcall XAudio2Create(ptr long long) -@ stdcall CreateAudioVolumeMeter(ptr) -@ stdcall CreateAudioReverb(ptr) -@ cdecl CreateFX(ptr ptr ptr long) -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) +1 stdcall -ordinal XAudio2Create(ptr long long) +2 stdcall -ordinal CreateAudioReverb(ptr) +3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +4 cdecl -ordinal CreateFX(ptr ptr ptr long) +5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +6 cdecl -ordinal X3DAudioInitialize(long float ptr) diff --git a/dlls/xaudio2_9/xaudio2_9.spec b/dlls/xaudio2_9/xaudio2_9.spec index 0b9f238..78bf05b 100644 --- a/dlls/xaudio2_9/xaudio2_9.spec +++ b/dlls/xaudio2_9/xaudio2_9.spec @@ -1,6 +1,6 @@ -@ stdcall XAudio2Create(ptr long long) -@ stdcall CreateAudioVolumeMeter(ptr) -@ stdcall CreateAudioReverb(ptr) -@ cdecl CreateFX(ptr ptr ptr long) -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) +1 stdcall -ordinal XAudio2Create(ptr long long) +2 stdcall -ordinal CreateAudioReverb(ptr) +3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +4 cdecl -ordinal CreateFX(ptr ptr ptr long) +5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +6 cdecl -ordinal X3DAudioInitialize(long float ptr)

1 0

Dmitry Timoshkov : msvcrt: Fix handling of dst == src in wcscpy_s.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 9ade30d0ce7f107e775c72e628ff6e4444b9bdf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ade30d0ce7f107e775c72e6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 24 11:49:34 2019 +0800 msvcrt: Fix handling of dst == src in wcscpy_s. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 5 +++++ dlls/msvcrt/wcs.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0f1ee47..59f9e1d 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1020,6 +1020,11 @@ static void test_wcscpy_s(void) ok(ret == 0, "expected 0 got %d\n", ret); ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + /* dest == source */ + ret = p_wcscpy_s(szDest, 18, szDest); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + /* Copy smaller buffer size */ errno = EBADF; szDest[0] = 'A'; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e62ac25..6b8c7bb 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2041,16 +2041,21 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con if(!MSVCRT_CHECK_PMT(wcDest)) return MSVCRT_EINVAL; if(!MSVCRT_CHECK_PMT(numElement)) return MSVCRT_EINVAL; - wcDest[0] = 0; - - if(!MSVCRT_CHECK_PMT(wcSrc)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(wcSrc)) + { + wcDest[0] = 0; + return MSVCRT_EINVAL; + } size = strlenW(wcSrc) + 1; if(!MSVCRT_CHECK_PMT_ERR(size <= numElement, MSVCRT_ERANGE)) + { + wcDest[0] = 0; return MSVCRT_ERANGE; + } - memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); + memmove( wcDest, wcSrc, size*sizeof(WCHAR) ); return 0; }

1 0

Jeff Smith : d3drm: Fix reference leak in d3drm_viewport2_Clear().
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 8fb032916d6bfc1d0006392904b9dc5344b8e1a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fb032916d6bfc1d00063929… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 1 12:17:29 2019 -0500 d3drm: Fix reference leak in d3drm_viewport2_Clear(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++++ dlls/d3drm/viewport.c | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a7cd594..8667819 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6739,10 +6739,12 @@ static void test_viewport_clear1(void) ret_color = IDirect3DRMFrame_GetSceneBackground(camera1); ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color); + CHECK_REFCOUNT(frame1, 1); hr = IDirect3DRMViewport_Clear(viewport1); ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); ret_color = get_surface_color(surface, 320, 240); ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color); + CHECK_REFCOUNT(frame1, 1); hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 0.0f, 0.0f, 1.0f); ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr); @@ -6942,10 +6944,12 @@ static void test_viewport_clear2(void) ret_color = IDirect3DRMFrame3_GetSceneBackground(camera3); ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color); + CHECK_REFCOUNT(frame3, 1); hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL); ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); ret_color = get_surface_color(surface, 320, 240); ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color); + CHECK_REFCOUNT(frame3, 1); hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 81d3af4..51174cd 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -50,6 +50,7 @@ static HRESULT d3drm_update_background_material(struct d3drm_viewport *viewport) if (FAILED(hr = IDirect3DRMFrame_GetScene(viewport->camera, &root_frame))) return hr; color = IDirect3DRMFrame_GetSceneBackground(root_frame); + IDirect3DRMFrame_Release(root_frame); memset(&mat, 0, sizeof(mat)); mat.dwSize = sizeof(mat);

1 0

Nikolay Sivov : shlwapi: Remove unused function.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: f7392a30ecb64d8165346200a912f0993bb84819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7392a30ecb64d8165346200… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 2 20:44:24 2019 +0300 shlwapi: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/path.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index a8d1c97..e7b56a7 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -54,21 +54,6 @@ static fnpIsNetDrive pIsNetDrive; HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR,LPWSTR,DWORD); -static inline WCHAR* heap_strdupAtoW(LPCSTR str) -{ - WCHAR *ret = NULL; - - if (str) - { - DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - if (ret) - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - } - - return ret; -} - /************************************************************************* * PathBuildRootA [SHLWAPI.@] *

1 0

Nikolay Sivov : d2d1: Remove unused function.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 436fb03a87ae6dcbbbe149e401942b7eb8369f51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=436fb03a87ae6dcbbbe149e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 2 20:42:19 2019 +0300 d2d1: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 9e4acb6..98f06a2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -207,11 +207,6 @@ static inline struct d2d_device_context *impl_from_ID2D1DeviceContext(ID2D1Devic return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); } -static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) -{ - return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); -} - static HRESULT STDMETHODCALLTYPE d2d_device_context_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) { struct d2d_device_context *context = impl_from_IUnknown(iface);

1 0

Dmitry Timoshkov : msvcrt: Add '-norelay' flag for _vsnprintf().
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: c28af247e98a9eeb9b43e951772b14d410ff6790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c28af247e98a9eeb9b43e951… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 2 14:26:10 2019 +0800 msvcrt: Add '-norelay' flag for _vsnprintf(). Otherwise for instance +relay,+msi log has msi: traces completely messed up. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3dddf8a..ed1e72c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1062,7 +1062,7 @@ @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index f9d36a9..b3bea65 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1188,7 +1188,7 @@ @ cdecl _unlink(str) msvcrt._unlink @ cdecl _unloaddll(long) msvcrt._unloaddll @ cdecl _utime(str ptr) msvcrt._utime -@ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl _waccess(wstr long) msvcrt._waccess @ cdecl _wasctime(ptr) msvcrt._wasctime diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index f0269e7..a8ca862 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1253,7 +1253,7 @@ @ cdecl _unlink(str) msvcrt._unlink @ cdecl _unloaddll(long) msvcrt._unloaddll @ cdecl _utime(str ptr) msvcrt._utime -@ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl _waccess(wstr long) msvcrt._waccess @ cdecl _wasctime(ptr) msvcrt._wasctime

1 0

Alexandre Julliard : include: Avoid depending on wine/port.h.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 629f2709f13641ea72cc5d980a96af885514842d URL: https://source.winehq.org/git/wine.git/?a=commit;h=629f2709f13641ea72cc5d98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 09:55:08 2019 +0200 include: Avoid depending on wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wined3d.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abef3f0..9a698bc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -26,10 +26,6 @@ #ifndef __WINE_WINED3D_H #define __WINE_WINED3D_H -#ifndef __WINE_WINE_PORT_H -# error You must include wine/port.h to use this header -#endif - #include "wine/list.h" #define WINED3D_OK S_OK @@ -2761,7 +2757,7 @@ HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_ /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) { -#ifdef HAVE___BUILTIN_CLZ +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) return __builtin_clz(x) ^ 0x1f; #else static const unsigned int l[] = @@ -2791,7 +2787,13 @@ static inline unsigned int wined3d_log2i(unsigned int x) static inline int wined3d_bit_scan(unsigned int *x) { - int bit_offset = ffs(*x) - 1; + int bit_offset; +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) + bit_offset = __builtin_ffs(*x) - 1; +#else + for (bit_offset = 0; bit_offset < 32; bit_offset++) + if (*x & (1u << bit_offset)) break; +#endif *x ^= 1u << bit_offset; return bit_offset; }

1 0