- wine-devel - winehq.org

[PATCH 1/2] msi: Only mark non-registered features as absent if we haven't done anything with them
by Piotr Caban 19 Apr '18

19 Apr '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/action.c | 2 ++ dlls/msi/tests/package.c | 5 +++++ 2 files changed, 7 insertions(+)

2 1

[PATCH 4/4] wsdapi/tests: Add test for Hello message Any body element.
by Owen Rudge 19 Apr '18

19 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)

2 1

[PATCH 3/4] wsdapi: Create Body and Hello elements in Hello message.
by Owen Rudge 19 Apr '18

19 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 39 ++++++++++++++++++++++++++++++++++----- dlls/wsdapi/tests/discovery.c | 6 ++++-- 2 files changed, 38 insertions(+), 7 deletions(-)

2 1

[PATCH 2/4] wsdapi: Register default namespaces when creating publisher.
by Owen Rudge 19 Apr '18

19 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 20 +++++++++++++++++--- dlls/wsdapi/soap.c | 13 +++++++++++++ dlls/wsdapi/wsdapi_internal.h | 2 ++ 3 files changed, 32 insertions(+), 3 deletions(-)

2 1

[PATCH 1/4] wsdapi: Ensure text node parent is NULL before calling WSDXMLAddChild.
by Owen Rudge 19 Apr '18

19 Apr '18

Huw, this patch should fix the test failure you were seeing previously. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 2/2] riched20: Use ME_GetSelectionType() in ME_ShowContextMenu() for getting type of selection.
by Jactry Zeng 19 Apr '18

19 Apr '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)

2 1

[v4 PATCH] shell32: Implement SHCreateSessionKey.
by Alistair Leslie-Hughes 19 Apr '18

19 Apr '18

This implementation is based on the Geoff Chappell description. Based off patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shellreg.c | 25 ++++++++++++++++++++++--- dlls/shell32/tests/shellole.c | 25 +++++++++++++++++++++---- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 356ec4e..97721af 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -34,6 +34,7 @@ #include "undocshell.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -154,7 +155,25 @@ HRESULT WINAPI SHRegCloseKey (HKEY hkey) */ HRESULT WINAPI SHCreateSessionKey(REGSAM access, HKEY *hkey) { - FIXME("stub: %d %p\n", access, hkey); - *hkey = NULL; - return E_NOTIMPL; + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; + DWORD session; + static WCHAR session_reg_str[ (sizeof(session_format)/sizeof(WCHAR)) + 16]; + + if (hkey) + *hkey = NULL; + + if (!access) + return E_ACCESSDENIED; + + if (!ProcessIdToSessionId(GetCurrentProcessId(), &session)) + return E_INVALIDARG; + + sprintfW(session_reg_str, session_format, session); + + TRACE("using session key %s\n", debugstr_w(session_reg_str)); + return RegCreateKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, NULL, + REG_OPTION_VOLATILE, access, NULL, hkey, NULL); } diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index f611faf..83db596 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -862,8 +862,15 @@ static void test_DragQueryFile(void) static void test_SHCreateSessionKey(void) { + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; HKEY hkey, hkey2; HRESULT hr; + DWORD session; + WCHAR sessionW[(sizeof(session_format)/sizeof(WCHAR)) + 16]; + LONG ret; if (!pSHCreateSessionKey) { @@ -876,18 +883,28 @@ static void test_SHCreateSessionKey(void) hkey = (HKEY)0xdeadbeef; hr = pSHCreateSessionKey(0, &hkey); - todo_wine ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); ok(hkey == NULL, "got %p\n", hkey); hr = pSHCreateSessionKey(KEY_READ, &hkey); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateSessionKey(KEY_READ, &hkey2); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); RegCloseKey(hkey); RegCloseKey(hkey2); + + /* Check the registery */ + ProcessIdToSessionId( GetCurrentProcessId(), &session); + wsprintfW(sessionW, session_format, session); + + trace("key: %016x\n", session); + + ret = RegOpenKeyW(HKEY_CURRENT_USER, sessionW, &hkey); + ok(!ret || broken(ret), "key not found\n"); + RegCloseKey(hkey); } static void test_dragdrophelper(void) -- 1.9.1

2 1

[PATCH] ntdll: Read correct sysfs entry for core information.
by Roderick Colenbrander 19 Apr '18

19 Apr '18

The current core_id related sysfs parsing code does not work on Linux. It looks like we have parsed a non-existing sysfs entry since we introduced this code (around 2012). We should have parsed the cpuX/topology entries, which have been around since 2006. Even on 2.6.32 which is the RedHat 6.x kernel toplogy is around and not the other nodes we attempt to read. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8995c362a9..c3f5df337f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1497,7 +1497,7 @@ static inline BOOL logical_proc_info_add_group(SYSTEM_LOGICAL_PROCESSOR_INFORMAT static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) { - static const char core_info[] = "/sys/devices/system/cpu/cpu%u/%s"; + static const char core_info[] = "/sys/devices/system/cpu/cpu%u/topology/%s"; static const char cache_info[] = "/sys/devices/system/cpu/cpu%u/cache/index%u/%s"; static const char numa_info[] = "/sys/devices/system/node/node%u/cpumap"; -- 2.14.3

1 0

[PATCH v17 1/3] wmp: Add seeking and duration
by Anton Romanov 19 Apr '18

19 Apr '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- Was able to reproduce aj's test failure. Happens if built without gstreamer. This patch was tested both with and without gstreamer. test.mp3 is now 64k cbr 3s file. dlls/wmp/tests/ dlls/wmp/player.c | 65 +++++++++++++++++++++++++++++++++------- dlls/wmp/tests/media.c | 39 +++++++++++++++++++++++- dlls/wmp/tests/rsrc.rc | 2 +- dlls/wmp/tests/test.mp3 | Bin 240333 -> 24494 bytes dlls/wmp/wmp_private.h | 3 ++ 5 files changed, 97 insertions(+), 12 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index f4ce62a447..8448916a80 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1396,8 +1396,21 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); - return E_NOTIMPL; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrItem), pIsAvailable); + if (!This->filter_graph) { + *pIsAvailable = VARIANT_FALSE; + } else if (strcmpW(currentPosition, bstrItem) == 0) { + DWORD capabilities; + IMediaSeeking_GetCapabilities(This->media_seeking, &capabilities); + *pIsAvailable = (capabilities & AM_SEEKING_CanSeekAbsolute) ? + VARIANT_TRUE : VARIANT_FALSE; + } else { + FIXME("%s not implemented\n", debugstr_w(bstrItem)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI WMPControls_play(IWMPControls *iface) @@ -1428,11 +1441,16 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) if (SUCCEEDED(hres)) hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + if (SUCCEEDED(hres)) + update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hres)) - update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaSeeking, + (void**)&This->media_seeking); + if (SUCCEEDED(hres)) + hres = IMediaSeeking_SetTimeFormat(This->media_seeking, &TIME_FORMAT_MEDIA_TIME); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaEvent, (void**)&This->media_event); @@ -1459,7 +1477,10 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) } if (SUCCEEDED(hres)) { + LONGLONG duration; update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsPlaying); + if (SUCCEEDED(IMediaSeeking_GetDuration(This->media_seeking, &duration))) + media->duration = (DOUBLE)duration / 10000000.0f; } else { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsUndefined); } @@ -1482,11 +1503,14 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) if (This->media_event) { IMediaEvent_Release(This->media_event); } - + if (This->media_seeking) { + IMediaSeeking_Release(This->media_seeking); + } IGraphBuilder_Release(This->filter_graph); This->filter_graph = NULL; This->media_control = NULL; This->media_event = NULL; + This->media_seeking = NULL; update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped); @@ -1517,15 +1541,33 @@ static HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%p)\n", This, pdCurrentPosition); - return E_NOTIMPL; + HRESULT hres; + LONGLONG currentPosition; + + TRACE("(%p)->(%p)\n", This, pdCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + hres = IMediaSeeking_GetCurrentPosition(This->media_seeking, &currentPosition); + *pdCurrentPosition = (DOUBLE) currentPosition / 10000000.0f; + TRACE("hres: %d, pos: %f\n", hres, *pdCurrentPosition); + return hres; } static HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) { + LONGLONG Current; + HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%f)\n", This, dCurrentPosition); - return E_NOTIMPL; + TRACE("(%p)->(%f)\n", This, dCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + Current = 10000000 * dCurrentPosition; + hres = IMediaSeeking_SetPositions(This->media_seeking, &Current, + AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + + return hres; } static HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) @@ -1762,9 +1804,12 @@ static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, B static HRESULT WINAPI WMPMedia_get_duration(IWMPMedia *iface, DOUBLE *pDuration) { + /* MSDN: If this property is used with a media item other than the one + * specified in Player.currentMedia, it may not contain a valid value. */ WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, pDuration); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pDuration); + *pDuration = This->duration; + return S_OK; } static HRESULT WINAPI WMPMedia_get_durationString(IWMPMedia *iface, BSTR *pbstrDuration) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index c2cd1cf941..2372763d25 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -303,6 +303,11 @@ static BOOL test_wmp(void) static DWORD dw = 100; IWMPSettings *settings; BOOL test_ran = TRUE; + DOUBLE duration; + VARIANT_BOOL vbool; + IWMPMedia *media; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + BSTR bstrcurrentPosition = SysAllocString(currentPosition); hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -338,6 +343,10 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_FALSE, "unexpected value\n"); + hres = IWMPControls_play(controls); ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); @@ -364,7 +373,7 @@ static BOOL test_wmp(void) SET_EXPECT(OPENSTATE, wmposMediaOpening); hres = IWMPControls_play(controls); ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); - res = pump_messages(5000, 1, &playing_event); + res = pump_messages(1000, 1, &playing_event); ok(res == WAIT_OBJECT_0 || broken(res == WAIT_TIMEOUT), "Timed out while waiting for media to become ready\n"); if (res == WAIT_TIMEOUT) { /* This happens on Vista Ultimate 64 vms @@ -380,6 +389,33 @@ static BOOL test_wmp(void) /* MediaOpening happens only on xp, 2003 */ CLEAR_CALLED(OPENSTATE, wmposMediaOpening); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_TRUE, "unexpected value\n"); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + ok((int)duration == 0, "unexpected value %f\n", duration); + + duration = 1.1; + hres = IWMPControls_put_currentPosition(controls, duration); + ok(hres == S_OK, "IWMPControls_put_currentPosition failed: %08x\n", hres); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + /* builtin quartz does not handle this currently and resets to 0.0, works + * with native quartz */ + todo_wine ok(duration >= 1.05 /* save some fp errors */, "unexpected value %f\n", duration); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres); + hres = IWMPMedia_get_duration(media, &duration); + ok(hres == S_OK, "IWMPMedia_get_duration failed: %08x\n", hres); + ok(round(duration) == 3, "unexpected value: %f\n", duration); + IWMPMedia_Release(media); + SET_EXPECT(PLAYSTATE, wmppsStopped); /* The following happens on wine only since we close media on stop */ SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia); @@ -414,6 +450,7 @@ playback_skip: IOleObject_Release(oleobj); DeleteFileW(filename); SysFreeString(filename); + SysFreeString(bstrcurrentPosition); return test_ran; } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index a92079e798..c781df97a4 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -18,7 +18,7 @@ #include "windef.h" -/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */ +/* ffmpeg -f lavfi -i anullsrc -t 3 -acodec libmp3lame -b:a 64k dlls/wmp/tests/test.mp3 */ /* @makedep: test.mp3 */ test.mp3 RCDATA "test.mp3" /* ffmpeg -ar 48000 -t 1 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 test1s.mp3 */ diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3 index 149a2cd346ee52ae179c46198ce290a5dd4d6251..5328ce2425e41393626cf01a5423d828471f469f 100644 GIT binary patch literal 24494 zcmeI&Z)BBG9Ki8kYcgZ5UPLk(l~gu&w$+$PYU$>dtMx32Rd!t_wHM3GB+Vp|>O~?m zdo$A#y+{)2#f)U8H%T&jkwlWrGIM2}Xa5>^ryQqW?sI(~*L}|Od;EURdCuoN&zqAt zP*W`7vE_JkbCWs8MAjzHc4g}JRMpp1RmbD=cNhNVvZ)nUt2YxDG9BiQDI*s}PWQ^X zlG3u+`VAX5m2a-twtdI0%6RSW`i926`wt#EoIIKePMkc|dM2G|KX<;Pv#Y!3(&fIZ z*RJ2VdHc@Yd;J50L&NtUJbd){$<t@gUyP2ud^JAt`pw&S?<YTe{Pg+D*KbolW@fWL z!=9Kvx0yayuk5dEEt(GRh5cwr?5td9|Nb}QNlWazNV|!Zh?G@`tTDeKb7`8jS44`F z`;IgPK@gtiABSn@?J<`<mTvjWc$PXJnE{P3prtv>!*fWE8Op<nS?&@u6n@2)A4eWG zm?389KeL1!<RItw1Xx3?AwNOR*^q;rGaA1H$U)9ekaITVAm@z6F9C9p^AqHp4LQg; zqw!0C9OV22IcGx-a?WV{5+DaTKS9pfkb|5v8ova{6%e^dY{m*4$VFv9sr1OLKkxrr zT&0m1ki!H;XG0^q%ltkRy4jE`pwAF51>MDBsm>Z=4OwVtg&_wyEnAklkb|6shE^DI zkkhhdsS7#CS!ig5AqP1vTb8<zgPetiRv2=S)3Rl$3pvPHXlR8Y2RSWUmb#FGoP~x~ z7;=!)vSq0YImlUPXoVffMPhdu`~O%%T5H8p*I@~<cggY$b;HaMF9ls;In^Ntxf~R_ d0mwm4S6EJU$U!a#g>JxwoNiD4QT2iw&@UK&&2s<% literal 240333 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 diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 3792e52abd..e8d534803f 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -42,6 +42,8 @@ typedef struct { LONG ref; WCHAR *url; + + DOUBLE duration; } WMPMedia; struct WindowsMediaPlayer { @@ -76,6 +78,7 @@ struct WindowsMediaPlayer { IGraphBuilder* filter_graph; IMediaControl* media_control; IMediaEvent* media_event; + IMediaSeeking* media_seeking; /* Async event notification */ HWND msg_window; -- 2.17.0

1 0

[v3 PATCH] shell32: Implement SHCreateSessionKey.
by Alistair Leslie-Hughes 19 Apr '18

19 Apr '18

This implementation is based on the Geoff Chappell description. Based off patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shellreg.c | 25 ++++++++++++++++++++++--- dlls/shell32/tests/shellole.c | 29 +++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 356ec4e..514f994 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -34,6 +34,7 @@ #include "undocshell.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -154,7 +155,25 @@ HRESULT WINAPI SHRegCloseKey (HKEY hkey) */ HRESULT WINAPI SHCreateSessionKey(REGSAM access, HKEY *hkey) { - FIXME("stub: %d %p\n", access, hkey); - *hkey = NULL; - return E_NOTIMPL; + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; + DWORD session; + static WCHAR session_reg_str[sizeof(session_format) + 16]; + + if(hkey) + *hkey = NULL; + + if(!access) + return E_ACCESSDENIED; + + if(!ProcessIdToSessionId( GetCurrentProcessId(), &session)) + return E_INVALIDARG; + + sprintfW(session_reg_str, session_format, session); + + TRACE("using session key %s\n", debugstr_w(session_reg_str)); + return RegCreateKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, NULL, + REG_OPTION_VOLATILE, access, NULL, hkey, NULL); } diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index f611faf..9e3836a 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -862,8 +862,15 @@ static void test_DragQueryFile(void) static void test_SHCreateSessionKey(void) { + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; HKEY hkey, hkey2; HRESULT hr; + DWORD session; + WCHAR sessionW[MAX_PATH]; + LONG ret; if (!pSHCreateSessionKey) { @@ -876,18 +883,32 @@ static void test_SHCreateSessionKey(void) hkey = (HKEY)0xdeadbeef; hr = pSHCreateSessionKey(0, &hkey); - todo_wine ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); ok(hkey == NULL, "got %p\n", hkey); hr = pSHCreateSessionKey(KEY_READ, &hkey); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateSessionKey(KEY_READ, &hkey2); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); RegCloseKey(hkey); RegCloseKey(hkey2); + + /* Check the registery */ + if(ProcessIdToSessionId( GetCurrentProcessId(), &session)) + { + wsprintfW(sessionW, session_format, session); + + trace("key: %016x\n", session); + + ret = RegOpenKeyW(HKEY_CURRENT_USER, sessionW, &hkey); + ok(!ret, "key not found\n"); + RegCloseKey(hkey); + } + else + win_skip("Skipping registry check (%d).\n", GetLastError()); } static void test_dragdrophelper(void) -- 1.9.1

3 2

[PATCH] kernel32: Init TimezoneInformation registry.
by Alistair Leslie-Hughes 19 Apr '18

19 Apr '18

From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel_main.c | 3 +++ dlls/kernel32/kernel_private.h | 3 +++ dlls/kernel32/time.c | 48 ++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index e24100b30c..d3420ece06 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -88,6 +88,9 @@ static BOOL process_attach( HMODULE module ) /* Setup registry locale information */ LOCALE_InitRegistry(); + /* Setup registry timezone information */ + TIMEZONE_InitRegistry(); + /* Setup computer name */ COMPUTERNAME_Init(); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 848ba95bbc..9073e18489 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -104,6 +104,9 @@ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; extern void LOCALE_Init(void) DECLSPEC_HIDDEN; extern void LOCALE_InitRegistry(void) DECLSPEC_HIDDEN; +/* time.c */ +extern void TIMEZONE_InitRegistry(void) DECLSPEC_HIDDEN; + /* oldconfig.c */ extern void convert_old_config(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index b0b866967c..a63bfe8ac7 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -778,6 +778,54 @@ static void TIME_ClockTimeToFileTime(clock_t unix_time, LPFILETIME filetime) filetime->dwHighDateTime = (DWORD)(secs >> 32); } +/*********************************************************************** + * TIMEZONE_InitRegistry + * + * Update registry contents on startup if the user timezone has changed. + * This simulates the action of the Windows control panel. + */ +void TIMEZONE_InitRegistry(void) +{ + static const WCHAR szTimezoneInformation[] = { + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'T','i','m','e','Z','o','n','e','I','n','f','o','r','m','a','t','i','o','n','\0' + }; + WCHAR standardnameW[] = {'S','t','a','n','d','a','r','d','N','a','m','e','\0'}; + WCHAR timezonekeynameW[] = {'T','i','m','e','Z','o','n','e','K','e','y','N','a','m','e','\0'}; + DYNAMIC_TIME_ZONE_INFORMATION tzinfo; + UNICODE_STRING keyName; + OBJECT_ATTRIBUTES attr; + HANDLE hkey; + DWORD tzid; + + tzid = GetDynamicTimeZoneInformation(&tzinfo); + if (tzid == TIME_ZONE_ID_INVALID) + { + ERR("fail to get timezone information.\n"); + return; + } + + RtlInitUnicodeString(&keyName, szTimezoneInformation); + InitializeObjectAttributes(&attr, &keyName, 0, 0, NULL); + if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) + { + ERR("fail to create timezone information key.\n"); + return; + } + + RtlInitUnicodeString(&keyName, standardnameW); + NtSetValueKey(hkey, &keyName, 0, REG_SZ, tzinfo.StandardName, + (strlenW(tzinfo.StandardName) + 1) * sizeof(WCHAR)); + + RtlInitUnicodeString(&keyName, timezonekeynameW); + NtSetValueKey(hkey, &keyName, 0, REG_SZ, tzinfo.TimeZoneKeyName, + (strlenW(tzinfo.TimeZoneKeyName) + 1) * sizeof(WCHAR)); + + NtClose( hkey ); +} + /********************************************************************* * GetProcessTimes (KERNEL32.@) * -- 2.17.0

2 1

[PATCH] testbot: Standardize the packages inheritance and exports.
by Francois Gouget 19 Apr '18

19 Apr '18

Use "our" instead of the antiquated 'use vars'. Use "use Exporter 'import'" as this form avoid exporting the whole Exporter interface from each of our package. This means we can also drop @ISA in those cases where we don't need to inherit from another package. Also we don't need the Exporter module just to inherit an interface so remove unneeded uses of Exporter. Defining the package inheritance and public interface does not depend on the rest of the package so move these statements first, even before all the other imports. Remove the ampersands from the exported functions names: they are unnecessary (and reportedly slower). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Last time it did not apply cleanly which is a bit strange. This time I made sure it was the first patch in the stack so it should really apply fine (if not I guess it means it's getting munged by my email client). testbot/lib/ObjectModel/BackEnd.pm | 7 ++----- .../ObjectModel/BasicPropertyDescriptor.pm | 8 +++---- .../lib/ObjectModel/CGI/CollectionBlock.pm | 9 +++----- .../ObjectModel/CGI/CollectionBlockForPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 ++----- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/FreeFormPage.pm | 6 +----- testbot/lib/ObjectModel/CGI/ItemPage.pm | 7 ++----- testbot/lib/ObjectModel/CGI/Page.pm | 8 +++---- testbot/lib/ObjectModel/Collection.pm | 7 ++----- testbot/lib/ObjectModel/DBIBackEnd.pm | 12 +++++------ .../DetailrefPropertyDescriptor.pm | 8 +++---- .../lib/ObjectModel/EnumPropertyDescriptor.pm | 8 +++---- testbot/lib/ObjectModel/Item.pm | 8 +++---- .../ObjectModel/ItemrefPropertyDescriptor.pm | 9 ++++---- testbot/lib/ObjectModel/PropertyDescriptor.pm | 4 ---- testbot/lib/WineTestBot/Activity.pm | 9 +++----- testbot/lib/WineTestBot/Branches.pm | 16 +++++++------- testbot/lib/WineTestBot/CGI/PageBase.pm | 9 +++----- testbot/lib/WineTestBot/CGI/Sessions.pm | 18 +++++++--------- testbot/lib/WineTestBot/Engine/Events.pm | 6 ++---- testbot/lib/WineTestBot/Engine/Notify.pm | 16 +++++++------- testbot/lib/WineTestBot/Jobs.pm | 20 +++++++----------- testbot/lib/WineTestBot/LibvirtDomain.pm | 8 +++---- testbot/lib/WineTestBot/Log.pm | 9 +++----- testbot/lib/WineTestBot/Patches.pm | 21 ++++++++----------- testbot/lib/WineTestBot/PendingPatchSets.pm | 20 +++++++----------- testbot/lib/WineTestBot/PendingPatches.pm | 17 ++++++--------- testbot/lib/WineTestBot/RecordGroups.pm | 18 ++++++---------- testbot/lib/WineTestBot/Records.pm | 18 +++++++--------- testbot/lib/WineTestBot/Roles.pm | 16 +++++--------- testbot/lib/WineTestBot/Steps.pm | 20 +++++++----------- testbot/lib/WineTestBot/StepsTasks.pm | 19 +++++++---------- testbot/lib/WineTestBot/Tasks.pm | 21 +++++++------------ testbot/lib/WineTestBot/TestAgent.pm | 17 +++++++-------- testbot/lib/WineTestBot/UserRoles.pm | 17 ++++++--------- testbot/lib/WineTestBot/Users.pm | 21 ++++++++----------- testbot/lib/WineTestBot/Utils.pm | 12 +++++------ testbot/lib/WineTestBot/VMs.pm | 20 +++++++----------- testbot/lib/WineTestBot/WineTestBotObjects.pm | 18 +++++++--------- testbot/web/index.pl | 17 ++++++++------- 41 files changed, 199 insertions(+), 322 deletions(-) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index 0bb48cf7c..ae209a4c1 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -30,11 +30,8 @@ should provide. =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); +use Exporter 'import'; +our @EXPORT = qw(AddDBBackEnd GetDBBackEnd RemoveDBBackEnd CloseAllDBBackEnds); sub new($@) { diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 4c3382cb0..766a34230 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -30,13 +30,11 @@ This handles the boolean, a number and string columns. =cut +use Exporter 'import'; use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateBasicPropertyDescriptor); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateBasicPropertyDescriptor); sub _initialize($$$) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index ca2c6d3e1..155717aee 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -27,15 +27,12 @@ ObjectModel::CGI::CollectionBlock - Base class for list blocks package ObjectModel::CGI::CollectionBlock; +use Exporter 'import'; +our @EXPORT = qw(new); + use POSIX qw(strftime); use URI::Escape; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); - -@EXPORT = qw(new); sub new($$$@) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index 3dd8154a7..ff8247ec9 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -28,11 +28,8 @@ ObjectModel::CGI::CollectionBlockForPage - Collection block for list pages =cut use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::CollectionBlock Exporter); sub CallGenerateFormStart($) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index e45b2a4a7..6593afcd2 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -27,13 +27,10 @@ ObjectModel::CGI::CollectionPage - Base class for list pages =cut -use ObjectModel::CGI::CollectionBlockForPage; use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::Page Exporter); +use ObjectModel::CGI::CollectionBlockForPage; sub _initialize($$$$) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 1745ec87b..b3861dd2a 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -29,11 +29,8 @@ ObjectModel::CGI::FormPage - Base class for web forms =cut use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::Page Exporter); sub _initialize($$$$) { diff --git a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm index 7af04c498..c4f00101b 100644 --- a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm @@ -28,10 +28,6 @@ ObjectModel::CGI::FreeFormPage - Base class for unbound web forms =cut use ObjectModel::CGI::FormPage; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::FormPage Exporter); +our @ISA = qw(ObjectModel::CGI::FormPage); 1; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index b44e5b2d3..c208aea31 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -28,13 +28,10 @@ ObjectModel::CGI::ItemPage - Base class for bound web forms =cut -use URI::Escape; use ObjectModel::CGI::FormPage; +our @ISA = qw(ObjectModel::CGI::FormPage); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::CGI::FormPage Exporter); +use URI::Escape; sub _initialize($$$$) { diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index ff7e8487a..b91022832 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -27,13 +27,13 @@ ObjectModel::CGI::Page - Base class for web pages =cut +use Exporter 'import'; +our @EXPORT = qw(new SetPageBaseCreator); + use CGI; -use vars qw(@ISA @EXPORT $PageBaseCreator); -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(new SetPageBaseCreator); +my $PageBaseCreator; sub new($$$@) { diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 032c7386d..712172bca 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -37,11 +37,8 @@ criteria. =cut -use vars qw(@ISA @EXPORT_OK); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(&new &ComputeMasterKey); +use Exporter 'import'; +our @EXPORT_OK = qw(new ComputeMasterKey); use Scalar::Util qw(weaken); use ObjectModel::BackEnd; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 0016e19c6..40bfe85f7 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -30,16 +30,14 @@ ObjectModel::BackEnd =cut -use DBI; -use Time::Local; - +use Exporter 'import'; use ObjectModel::BackEnd; +our @ISA = qw(ObjectModel::BackEnd); +our @EXPORT = qw(UseDBIBackEnd); -use vars qw(@ISA @EXPORT); +use DBI; +use Time::Local; -require Exporter; -@ISA = qw(ObjectModel::BackEnd Exporter); -@EXPORT = qw(&UseDBIBackEnd); sub GetDb($) { diff --git a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm index d60fe6395..25144d08c 100644 --- a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm @@ -25,11 +25,11 @@ ObjectModel::DetailrefPropertyDescriptor - A reference to a collection of relate =cut -use vars qw(@ISA @EXPORT); +use Exporter 'import'; +use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateDetailrefPropertyDescriptor SetDetailrefKeyPrefix); -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateDetailrefPropertyDescriptor &SetDetailrefKeyPrefix); sub _initialize($$) { diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index 3e116ba72..d5850698e 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -30,13 +30,11 @@ new value is allowed. =cut +use Exporter 'import'; use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateEnumPropertyDescriptor); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateEnumPropertyDescriptor); sub _initialize($$) { diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 201577c98..fb125f015 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -26,15 +26,13 @@ ObjectModel::Item - Base class for items =cut +use Exporter 'import'; +our @EXPORT_OK = qw(new); + use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Collection; -use vars qw(@ISA @EXPORT_OK); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(&new); =pod diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index 21806a269..cba4f9af1 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -25,11 +25,10 @@ ObjectModel::ItemrefPropertyDescriptor - A property referencing an ObjectModel:: =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::PropertyDescriptor Exporter); -@EXPORT = qw(&CreateItemrefPropertyDescriptor); +use Exporter 'import'; +use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateItemrefPropertyDescriptor); sub _initialize($$$) { diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index 583082e81..f13a4b248 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -32,10 +32,6 @@ required or not. =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); sub new($$$$$@) { diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index acec6064c..b3e576a19 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -25,18 +25,15 @@ WineTestBot::Activity - reconstruct the TestBot's activity from its history rec =cut +use Exporter 'import'; +our @EXPORT = qw(GetActivity GetStatistics); + use Scalar::Util qw(weaken); use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; use WineTestBot::Records; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&GetActivity &GetStatistics); - sub _UpdateMin($$) { diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index a67832590..a18fafcbd 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -27,12 +27,10 @@ WineTestBot::Branch - Describes a Wine branch =cut use WineTestBot::WineTestBotObjects; -use WineTestBot::Config; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -42,6 +40,7 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } + package WineTestBot::Branches; =head1 NAME @@ -50,14 +49,13 @@ WineTestBot::Branches - A collection of WineTestBot::Branch objects =cut -use ObjectModel::BasicPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateBranches); -use vars qw (@ISA @EXPORT); +use ObjectModel::BasicPropertyDescriptor; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateBranches); sub GetDefaultBranch($) { diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index fa383c512..67e8fc86f 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -28,6 +28,9 @@ WineTestBot::CGI::PageBase - Base class for web pages =cut +use Exporter 'import'; +our @EXPORT = qw(CreatePageBase); + use Apache2::Const -compile => qw(REDIRECT); use Apache2::ServerRec; use CGI::Cookie; @@ -36,12 +39,6 @@ use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Utils; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&CreatePageBase); - sub new($$$$@) { my $class = shift; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 87fd15fb2..af30fbb85 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -28,12 +28,10 @@ WineTestBot::CGI::Session - A web user's session =cut -use WineTestBot::Utils; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -require Exporter; -use vars qw(@ISA @EXPORT); -@ISA = qw(WineTestBot::WineTestBotItem Exporter); +use WineTestBot::Utils; sub InitializeNew($$) { @@ -53,19 +51,17 @@ WineTestBot::CGI::Sessions - A Session collection =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateSessions DeleteSessions NewSession); + use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::Users; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateSessions &DeleteSessions &NewSession); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index c3ebe9baf..677debfbf 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -27,11 +27,9 @@ WineTestBot::Engine::Events - Engine events =cut -use vars qw (@ISA @EXPORT); +use Exporter 'import'; +our @EXPORT = qw(AddEvent DeleteEvent EventScheduled RunEvents); -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&AddEvent &DeleteEvent &EventScheduled &RunEvents); my %Events; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index c277f7aa9..ddb14d2fa 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -27,18 +27,16 @@ WineTestBot::Engine::Notify - Engine notification =cut +use Exporter 'import'; +our $RunningInEngine; +our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobCancel + JobRestart RescheduleJobs VMStatusChange + WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); +our @EXPORT_OK = qw($RunningInEngine); + use Socket; use WineTestBot::Config; -use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&Shutdown &PingEngine &JobStatusChange &JobCancel - &JobRestart &RescheduleJobs &VMStatusChange - &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); -@EXPORT_OK = qw($RunningInEngine); - sub SendCmdReceiveReply($) { diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index f810b4f12..29f7860cb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -51,17 +51,15 @@ A Job is composed of multiple WineTestBot::Step objects. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Path; use WineTestBot::Config; use WineTestBot::Branches; use WineTestBot::Engine::Notify; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub _initialize($$) { @@ -391,11 +389,15 @@ those that are yet to be run. =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateJobs ScheduleJobs CheckJobs); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use WineTestBot::WineTestBotObjects; use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Patches; @@ -404,12 +406,6 @@ use WineTestBot::Steps; use WineTestBot::Users; use WineTestBot::VMs; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateJobs &ScheduleJobs &CheckJobs); - sub CreateItem($) { diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 9ca98eb91..bab5d7e36 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -32,14 +32,12 @@ technologies. =cut +use Exporter 'import'; +our @EXPORT_OK = qw(new); + use Sys::Virt; use Image::Magick; -use vars qw (@ISA @EXPORT_OK); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(new); my %_Hypervisors; my %_Domains; diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 65782c514..36efb48a2 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -25,14 +25,11 @@ WineTestBot::Log - Logging =cut -use WineTestBot::Config; -use WineTestBot::Utils; +use Exporter 'import'; +our @EXPORT = qw(LogMsg OpenLog Time Elapsed PrettyElapsed); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed &PrettyElapsed); my $logfile; my $logprefix; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 7906f1cb6..e4b9b0089 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -33,6 +33,9 @@ linked to this patch through a WineTestBot::PendingPatch object. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use Encode qw/decode/; use File::Basename; @@ -42,13 +45,8 @@ use WineTestBot::Jobs; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; use WineTestBot::Engine::Notify; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -357,6 +355,7 @@ sub GetEMailRecipient($) return BuildEMailRecipient($self->FromEMail, $self->FromName); } + package WineTestBot::Patches; =head1 NAME @@ -365,15 +364,13 @@ WineTestBot::Patches - A collection of WineTestBot::Patch objects =cut -use ObjectModel::BasicPropertyDescriptor; -use WineTestBot::Config; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePatches); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreatePatches); +use ObjectModel::BasicPropertyDescriptor; +use WineTestBot::Config; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index d51652221..88dc73677 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -38,15 +38,13 @@ The WineTestBot::PendingPatchSet class is where this tracking is implemented. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use WineTestBot::Config; use WineTestBot::Patches; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); =pod =over 12 @@ -153,19 +151,17 @@ WineTestBot::PendingPatchSets - A collection of WineTestBot::PendingPatchSet obj =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePendingPatchSets); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::PendingPatches; use WineTestBot::Patches; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreatePendingPatchSets); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 281db60ef..4de599dac 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -32,11 +32,8 @@ identifying the patch series it belongs to. =cut use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); package WineTestBot::PendingPatches; @@ -46,16 +43,14 @@ WineTestBot::PendingPatches - A collection of WineTestBot::PendingPatch objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePendingPatches); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Patches; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreatePendingPatches); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 1e5dbbdd4..9f0f52036 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -31,12 +31,8 @@ or the state of the TestBot at at a given time. =cut use WineTestBot::WineTestBotObjects; -use WineTestBot::Config; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -56,17 +52,15 @@ WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRecordGroups CompareRecordGroups SaveRecord); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use WineTestBot::WineTestBotObjects; use WineTestBot::Records; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateRecordGroups &CompareRecordGroups &SaveRecord); - sub CreateItem($) { diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index 98d5ee7d9..990ae421e 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -38,13 +38,11 @@ only limited by the amount of data dumped into the Records table. =cut -use WineTestBot::Config; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -62,15 +60,13 @@ WineTestBot::Records - A collection of WineTestBot::Record objects =cut -use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::EnumPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRecords); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateRecords); +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index a617ac14e..45f370f1d 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -30,11 +30,7 @@ A Role is a class of users and defines what they can do. =cut use WineTestBot::WineTestBotObjects; - -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); +our @ISA = qw(WineTestBot::WineTestBotItem); package WineTestBot::Roles; @@ -45,14 +41,12 @@ WineTestBot::Roles - A collection of WineTestBot::Role objects =cut -use ObjectModel::BasicPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRoles); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateRoles); +use ObjectModel::BasicPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index ef2b3872b..237347347 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -36,16 +36,14 @@ or to reset their PreviousNo fields beforehand. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Copy; use File::Path; use WineTestBot::Config; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -184,17 +182,15 @@ WineTestBot::Steps - A collection of Job Steps =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateSteps); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Tasks; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateSteps); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 3610492ba..9dec8060a 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -26,13 +26,11 @@ WineTestBot::StepTask - Merged Step + Task object =cut -use WineTestBot::Config; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub GetStepDir($) { @@ -82,6 +80,7 @@ sub GetTitle($) return $Title; } + package WineTestBot::StepsTasks; =head1 NAME @@ -97,18 +96,16 @@ a specific database table. =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateStepsTasks); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Steps; use WineTestBot::Tasks; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateStepsTasks); sub _initialize($$) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index f16dfe201..4473df217 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -33,18 +33,15 @@ virtual machine that the test must be performed in. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use POSIX qw(:errno_h); use File::Path; use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Steps; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -203,17 +200,15 @@ WineTestBot::Tasks - A collection of WineTestBot::Task objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateTasks); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateTasks); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 2f7ec4def..8957b9f82 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -22,11 +22,8 @@ package TestAgent; use strict; -use vars qw (@ISA @EXPORT_OK $SENDFILE_EXE $RUN_DNT $RUN_DNTRUNC_OUT $RUN_DNTRUNC_ERR $RUN_DNTRUNC); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT_OK = qw(new); +use Exporter 'import'; +our @EXPORT_OK = qw(new); my $BLOCK_SIZE = 65536; @@ -1097,7 +1094,7 @@ sub GetVersion($) return $self->{agentversion}; } -$SENDFILE_EXE = 1; +our $SENDFILE_EXE = 1; sub _SendStringOrFile($$$$$$) { @@ -1173,10 +1170,10 @@ sub GetFileToString($$) return $self->_GetStringOrFile($ServerPathName, undef, undef); } -$RUN_DNT = 1; -$RUN_DNTRUNC_OUT = 2; -$RUN_DNTRUNC_ERR = 4; -$RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; +our $RUN_DNT = 1; +our $RUN_DNTRUNC_OUT = 2; +our $RUN_DNTRUNC_ERR = 4; +our $RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; sub Run($$$;$$$) { diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 972bdc0e9..585537ae8 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -26,11 +26,8 @@ WineTestBot::UserRole - A UserRole item =cut use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); package WineTestBot::UserRoles; @@ -40,16 +37,14 @@ WineTestBot::UserRoles - A collection of WineTestBot::UserRole objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateUserRoles); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Roles; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateUserRoles); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 178b377b9..4752006ab 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -26,18 +26,16 @@ WineTestBot::User - A User =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use Digest::SHA qw(sha1_hex); use URI::Escape; use WineTestBot::Config; use WineTestBot::Roles; use WineTestBot::UserRoles; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -287,6 +285,7 @@ sub HasRole($$) return defined($self->Roles->GetItem($RoleName)); } + package WineTestBot::Users; =head1 NAME @@ -295,19 +294,17 @@ WineTestBot::Users - A collection of WineTestBot::User objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateUsers GetBatchUser Authenticate); + use Net::LDAP; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::UserRoles; -use WineTestBot::WineTestBotObjects; - -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateUsers &GetBatchUser &Authenticate); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 63b906242..81a2eda39 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -25,17 +25,15 @@ WineTestBot::Utils - Utility functions =cut +use Exporter 'import'; +our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString + OpenNewFile CreateNewFile CreateNewLink CreateNewDir + DurationToString BuildEMailRecipient); + use Fcntl; use WineTestBot::Config; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString - &OpenNewFile &CreateNewFile &CreateNewLink &CreateNewDir - &DurationToString &BuildEMailRecipient); sub MakeSecureURL($) { diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e74640bf2..b6305e83e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -142,6 +142,9 @@ are undergoing maintenance. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Basename; use ObjectModel::BackEnd; @@ -150,12 +153,7 @@ use WineTestBot::Engine::Notify; use WineTestBot::LibvirtDomain; use WineTestBot::RecordGroups; use WineTestBot::TestAgent; -use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotItem Exporter); sub _initialize($$) { @@ -637,15 +635,13 @@ role or status. =cut -use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::EnumPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateVMs); -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(WineTestBot::WineTestBotCollection Exporter); -@EXPORT = qw(&CreateVMs); +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index 20ff6b1e3..bc34b74c8 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -25,14 +25,12 @@ WineTestBot::WineTestBotItem - Base item class for WineTestBot =cut -use ObjectModel::BackEnd; use ObjectModel::Item; -use WineTestBot::Config; +our @ISA = qw(ObjectModel::Item); -use vars qw (@ISA @EXPORT); +use ObjectModel::BackEnd; +use WineTestBot::Config; -require Exporter; -@ISA = qw(ObjectModel::Item Exporter); sub GetBackEnd($) { @@ -49,15 +47,13 @@ WineTestBot::WineTestBotCollection - Base collection class for WineTestBot =cut +use ObjectModel::Collection; +our @ISA = qw(ObjectModel::Collection); + use ObjectModel::BackEnd; -use ObjectModel::Item; +use WineTestBot::Item; use WineTestBot::Config; -use vars qw (@ISA @EXPORT); - -require Exporter; -@ISA = qw(ObjectModel::Collection Exporter); - sub GetBackEnd($) { #my ($self) = @_; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 427d7f6b9..72bd307d5 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -21,13 +21,12 @@ use strict; package JobStatusBlock; -use URI::Escape; use ObjectModel::CGI::CollectionBlock; -use WineTestBot::Branches; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA); +use URI::Escape; +use WineTestBot::Branches; -@ISA = qw(ObjectModel::CGI::CollectionBlock); sub SortKeys($$) { @@ -140,13 +139,12 @@ sub GenerateDataCell($$$$) } } + package VMStatusBlock; use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA); - -@ISA = qw(ObjectModel::CGI::CollectionBlock); sub SortKeys($$) { @@ -183,16 +181,18 @@ sub GetDetailsPage($) return undef; } + package StatusPage; use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); + use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::VMs; -@StatusPage::ISA = qw(ObjectModel::CGI::Page); sub _initialize($$$) { @@ -303,6 +303,7 @@ EOF print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } + package main; my $Request = shift; -- 2.17.0

1 0

[PATCH] testbot/build: Update the source before the native build!
by Francois Gouget 19 Apr '18

19 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 96cf74140..c0a9a059c 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -138,16 +138,7 @@ sub ApplyPatch($$$) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); - } - - if ($NeedBuildNative) - { - InfoMsg "Building tools\n"; - if (!BuildNative()) - { - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); - } + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure, $NeedBuildNative); } if ($NeedMakeMakefiles) @@ -159,7 +150,7 @@ sub ApplyPatch($$$) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure, $NeedBuildNative); } } @@ -173,7 +164,7 @@ sub ApplyPatch($$$) { LogMsg "Autoconf failed\n"; return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure); + $NeedConfigure, $NeedBuildNative); } $NeedConfigure = 1; } @@ -193,7 +184,7 @@ sub ApplyPatch($$$) } return ($NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure); + $NeedConfigure, $NeedBuildNative); } my $ncpus; @@ -418,7 +409,7 @@ else } my ($NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure) = ApplyPatch($PatchFile, $PatchType, $BaseName); + $NeedConfigure, $NeedBuildNative) = ApplyPatch($PatchFile, $PatchType, $BaseName); if ($NeedMakefile < 0) { exit(1); @@ -426,6 +417,15 @@ if ($NeedMakefile < 0) CountCPUs(); +if ($NeedBuildNative) +{ + InfoMsg "Building tools\n"; + if (!BuildNative()) + { + exit(1); + } +} + if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32, $NeedConfigure, 0 < $NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, -- 2.17.0

1 0

[PATCH] testbot/build: Also re-run autoconf if aclocal.m4 is modified.
by Francois Gouget 19 Apr '18

19 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index c0a9a059c..7291ff046 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -105,7 +105,7 @@ sub ApplyPatch($$$) { $NeedImplib = 1; } - elsif ($Line =~ m=^diff.*configure\.ac=) + elsif ($Line =~ m=^diff.*(?:aclocal\.m4|configure\.ac)=) { $NeedAutoconf = 1; } -- 2.17.0

1 0

[PATCH] testbot/build: Escape dots in regular expressions.
by Francois Gouget 19 Apr '18

19 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 7291ff046..19f220b64 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -118,7 +118,7 @@ sub ApplyPatch($$$) { $NeedMakeMakefiles = $NeedConfigure = 1; } - elsif ($Line =~ m=^diff.*tools/makedep.c=) + elsif ($Line =~ m=^diff.*tools/makedep\.c=) { $NeedBuildNative = $NeedMakeMakefiles = $NeedConfigure = 1; } -- 2.17.0

1 0

[PATCH] dmime: Add a trailing '\n' to a FIXME().
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dmime/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index cbc2b3cf0af..77c94f173d7 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -924,7 +924,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea return hr; break; case FOURCC_RIFF: - FIXME("Loading of embedded RIFF form %s", debugstr_fourcc(chunk.type)); + FIXME("Loading of embedded RIFF form %s\n", debugstr_fourcc(chunk.type)); break; } } -- 2.17.0

2 1

[PATCH] dmime: Make IDirectMusicUtils_IPersistStream_ParseDescGeneric() static.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dmime/dmutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 9bb8df366b6..c51d5798498 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmfile); -HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { +static HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { switch (pChunk->fccID) { case DMUS_FOURCC_GUID_CHUNK: { -- 2.17.0

2 1

[PATCH 1/3] wined3d: Add support for returning multiple viewports.
by Nikolay Sivov 18 Apr '18

18 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 4 ++-- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/device.c | 2 +- dlls/wined3d/device.c | 15 +++++++++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 248cac69f8..0ee756dfa2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2107,7 +2107,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11Devic return; wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, &wined3d_vp); + wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_vp); wined3d_mutex_unlock(); viewports[0].TopLeftX = wined3d_vp.x; @@ -4909,7 +4909,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device1 *iface, return; wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, &wined3d_vp); + wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_vp); wined3d_mutex_unlock(); viewports[0].TopLeftX = wined3d_vp.x; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3bdb278ec5..616886bcaf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1664,7 +1664,7 @@ static HRESULT WINAPI d3d8_device_GetViewport(IDirect3DDevice8 *iface, D3DVIEWPO TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, &wined3d_viewport); + wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); wined3d_mutex_unlock(); viewport->X = wined3d_viewport.x; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5c0d6779c5..0a77b3e316 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2082,7 +2082,7 @@ static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEW TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, &wined3d_viewport); + wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); wined3d_mutex_unlock(); viewport->X = wined3d_viewport.x; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 23c61c5d80..5db0b81a81 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5367,7 +5367,7 @@ static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, &wined3d_viewport); + wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); wined3d_mutex_unlock(); viewport->dwX = wined3d_viewport.x; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ee948019b..8d4f4cde0e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1940,11 +1940,18 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports); } -void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport) +void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, + struct wined3d_viewport *viewports) { - TRACE("device %p, viewport %p.\n", device, viewport); + unsigned int count; - *viewport = device->state.viewports[0]; + TRACE("device %p, viewport_count %p, viewports %p.\n", device, viewport_count, viewports); + + count = viewport_count ? min(*viewport_count, device->state.viewport_count) : 1; + if (count && viewports) + memcpy(viewports, device->state.viewports, count * sizeof(*viewports)); + if (viewport_count) + *viewport_count = device->state.viewport_count; } static void resolve_depth_buffer(struct wined3d_device *device) @@ -3139,7 +3146,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO TRACE("%.8e %.8e %.8e %.8e\n", world_mat._41, world_mat._42, world_mat._43, world_mat._44); /* Get the viewport */ - wined3d_device_get_viewport(device, &vp); + wined3d_device_get_viewports(device, NULL, &vp); TRACE("viewport x %.8e, y %.8e, width %.8e, height %.8e, min_z %.8e, max_z %.8e.\n", vp.x, vp.y, vp.width, vp.height, vp.min_z, vp.max_z); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b4c41cc59a..1b59178296 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -114,7 +114,7 @@ @ cdecl wined3d_device_get_unordered_access_view(ptr long) @ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) -@ cdecl wined3d_device_get_viewport(ptr ptr) +@ cdecl wined3d_device_get_viewports(ptr ptr ptr) @ cdecl wined3d_device_get_vs_cb(ptr long) @ cdecl wined3d_device_get_vs_consts_b(ptr long long ptr) @ cdecl wined3d_device_get_vs_consts_f(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3539b4eb06..ccda987405 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2324,7 +2324,8 @@ struct wined3d_unordered_access_view * __cdecl wined3d_device_get_unordered_acce const struct wined3d_device *device, unsigned int idx); struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); -void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); +void __cdecl wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, + struct wined3d_viewport *viewports); struct wined3d_buffer * __cdecl wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, BOOL *constants); -- 2.17.0

2 5

[PATCH] d3d8/tests: Fix a typo in a comment.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3d8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 8dbd4646254..5fa0d59e60d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8615,7 +8615,7 @@ static void test_device_caps(void) | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_RESERVED)), "Caps2 field has unexpected flags %#x.\n", caps.Caps2); - /* Nvidia returns that 0x400 flag, which is is probably Vista+ + /* Nvidia returns that 0x400 flag, which is probably Vista+ * D3DCAPS3_DXVAHD from d3d9caps.h */ /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior * broken. */ -- 2.17.0

2 1

[PATCH 1/7] d3dx9: Allow passes argument to Begin() to be NULL.
by Matteo Bruni 18 Apr '18

18 Apr '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Inspired by a patch by Rafał Mużyło. I'm surprised that this didn't come up earlier. dlls/d3dx9_36/effect.c | 5 +++-- dlls/d3dx9_36/tests/effect.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a909d66a92f..94f7b072117 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4202,7 +4202,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); - if (passes && technique) + if (technique) { if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) WARN("Invalid flags (%#x) specified.\n", flags); @@ -4234,7 +4234,8 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW ERR("StateBlock Capture failed, hr %#x.\n", hr); } - *passes = technique->pass_count; + if (passes) + *passes = technique->pass_count; effect->started = TRUE; effect->begin_flags = flags; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9a8a9b65fbc..a75b67c7f62 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3081,7 +3081,7 @@ static void test_effect_states(IDirect3DDevice9 *device) ok(!bval, "Got result %u, expected 0.\n", bval); hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(1), &test_mat); - hr = effect->lpVtbl->Begin(effect, &npasses, 0); + hr = effect->lpVtbl->Begin(effect, NULL, 0); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); -- 2.13.6

4 11

[PATCH v2] ucrtbase: Add _timespec{32,64}_get implementation
by Piotr Caban 18 Apr '18

18 Apr '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-time-l1-1-0.spec | 4 +- dlls/msvcrt/time.c | 53 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- 3 files changed, 57 insertions(+), 4 deletions(-)

1 0

[PATCH] ucrtbase: Add _timespec{32,64}_get implementation
by Piotr Caban 18 Apr '18

18 Apr '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 53 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 55 insertions(+), 2 deletions(-)

1 0

[PATCH v16 1/3] wmp: Add seeking and duration
by Anton Romanov 18 Apr '18

18 Apr '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- Changed test.mp3 to be 10s cbr stereo. Looks like when gstreamer reports duration as half is because it gets confused by 1 channel mp3 dlls/wmp/player.c | 65 +++++++++++++++++++++++++++++++++------- dlls/wmp/tests/media.c | 37 +++++++++++++++++++++++ dlls/wmp/tests/rsrc.rc | 2 +- dlls/wmp/tests/test.mp3 | Bin 240333 -> 40377 bytes dlls/wmp/wmp_private.h | 3 ++ 5 files changed, 96 insertions(+), 11 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index f4ce62a447..8448916a80 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1396,8 +1396,21 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); - return E_NOTIMPL; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrItem), pIsAvailable); + if (!This->filter_graph) { + *pIsAvailable = VARIANT_FALSE; + } else if (strcmpW(currentPosition, bstrItem) == 0) { + DWORD capabilities; + IMediaSeeking_GetCapabilities(This->media_seeking, &capabilities); + *pIsAvailable = (capabilities & AM_SEEKING_CanSeekAbsolute) ? + VARIANT_TRUE : VARIANT_FALSE; + } else { + FIXME("%s not implemented\n", debugstr_w(bstrItem)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI WMPControls_play(IWMPControls *iface) @@ -1428,11 +1441,16 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) if (SUCCEEDED(hres)) hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + if (SUCCEEDED(hres)) + update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hres)) - update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaSeeking, + (void**)&This->media_seeking); + if (SUCCEEDED(hres)) + hres = IMediaSeeking_SetTimeFormat(This->media_seeking, &TIME_FORMAT_MEDIA_TIME); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaEvent, (void**)&This->media_event); @@ -1459,7 +1477,10 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) } if (SUCCEEDED(hres)) { + LONGLONG duration; update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsPlaying); + if (SUCCEEDED(IMediaSeeking_GetDuration(This->media_seeking, &duration))) + media->duration = (DOUBLE)duration / 10000000.0f; } else { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsUndefined); } @@ -1482,11 +1503,14 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) if (This->media_event) { IMediaEvent_Release(This->media_event); } - + if (This->media_seeking) { + IMediaSeeking_Release(This->media_seeking); + } IGraphBuilder_Release(This->filter_graph); This->filter_graph = NULL; This->media_control = NULL; This->media_event = NULL; + This->media_seeking = NULL; update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped); @@ -1517,15 +1541,33 @@ static HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%p)\n", This, pdCurrentPosition); - return E_NOTIMPL; + HRESULT hres; + LONGLONG currentPosition; + + TRACE("(%p)->(%p)\n", This, pdCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + hres = IMediaSeeking_GetCurrentPosition(This->media_seeking, &currentPosition); + *pdCurrentPosition = (DOUBLE) currentPosition / 10000000.0f; + TRACE("hres: %d, pos: %f\n", hres, *pdCurrentPosition); + return hres; } static HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) { + LONGLONG Current; + HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%f)\n", This, dCurrentPosition); - return E_NOTIMPL; + TRACE("(%p)->(%f)\n", This, dCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + Current = 10000000 * dCurrentPosition; + hres = IMediaSeeking_SetPositions(This->media_seeking, &Current, + AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + + return hres; } static HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) @@ -1762,9 +1804,12 @@ static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, B static HRESULT WINAPI WMPMedia_get_duration(IWMPMedia *iface, DOUBLE *pDuration) { + /* MSDN: If this property is used with a media item other than the one + * specified in Player.currentMedia, it may not contain a valid value. */ WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, pDuration); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pDuration); + *pDuration = This->duration; + return S_OK; } static HRESULT WINAPI WMPMedia_get_durationString(IWMPMedia *iface, BSTR *pbstrDuration) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index c2cd1cf941..6192f8f313 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -303,6 +303,11 @@ static BOOL test_wmp(void) static DWORD dw = 100; IWMPSettings *settings; BOOL test_ran = TRUE; + DOUBLE duration; + VARIANT_BOOL vbool; + IWMPMedia *media; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + BSTR bstrcurrentPosition = SysAllocString(currentPosition); hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -338,6 +343,10 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_FALSE, "unexpected value\n"); + hres = IWMPControls_play(controls); ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); @@ -380,6 +389,33 @@ static BOOL test_wmp(void) /* MediaOpening happens only on xp, 2003 */ CLEAR_CALLED(OPENSTATE, wmposMediaOpening); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_TRUE, "unexpected value\n"); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + ok((int)duration == 0, "unexpected value %f\n", duration); + + duration = 5.0; + hres = IWMPControls_put_currentPosition(controls, duration); + ok(hres == S_OK, "IWMPControls_put_currentPosition failed: %08x\n", hres); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + /* builtin quartz does not handle this currently and resets to 0.0, works + * with native quartz */ + todo_wine ok((int)duration >= 5.0, "unexpected value %f\n", duration); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres); + hres = IWMPMedia_get_duration(media, &duration); + ok(hres == S_OK, "IWMPMedia_get_duration failed: %08x\n", hres); + ok(round(duration) == 10, "unexpected value: %f\n", duration); + IWMPMedia_Release(media); + SET_EXPECT(PLAYSTATE, wmppsStopped); /* The following happens on wine only since we close media on stop */ SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia); @@ -414,6 +450,7 @@ playback_skip: IOleObject_Release(oleobj); DeleteFileW(filename); SysFreeString(filename); + SysFreeString(bstrcurrentPosition); return test_ran; } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index a92079e798..715399d524 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -18,7 +18,7 @@ #include "windef.h" -/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */ +/* ffmpeg -f lavfi -i anullsrc -t 10 -acodec libmp3lame -b:a 8k dlls/wmp/tests/test.mp3 */ /* @makedep: test.mp3 */ test.mp3 RCDATA "test.mp3" /* ffmpeg -ar 48000 -t 1 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 test1s.mp3 */ diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3 index 149a2cd346ee52ae179c46198ce290a5dd4d6251..b599b2dd3ba7befc42717f96e7ba629c658378b9 100644 GIT binary patch literal 40377 zcmeI30c2HC7{^cEq@=b=jKr)G(b{ZT5t+7XTA9{MBC0(vCC$i)WJ#1ti9}3dBt;UD z$V4PY5|Jj6h-5_K(d*u~d+)jD+;iT4p8Kxe^`GpX@7#Ikp5Og_-#hobUT=4Mop66v z?j0EDagOyuWcm(|<TrG-Y;137Yi%u^o%vNP^oJsIv-f0v$T{P@%$!jn#;%CW-1!R@ zEnd2;arug-=GAM~u3O*M(Ya~!maeVacI@2UzbCu@z`;XDaz~G!7#cn`a{A2KbLTHy zynOZgjhnY_kKMUDe((OnM~|O8efIpt#LHK&-%P%J_x{7jPoKYh{r3IG&*@*k{}leZ zSK?grpmWV_;p-KvGL7yz_d2!@Pwbm%%iqO9Lr&CB3vtZpn<vD=Cg-Z1f8$Q*G&@Fx zsO#(6)l=e-E%O8Zs90E%YX;+#d3AXTjFWXI)P1e|gygH0X@P;<3FQ+Qr!=8U36OIq z^dNz8N)wt)fSfy_siY<}#R(a5X%;!eJ7nON1>j0KMCB?V$D&|@=JruJ!_vnFOX&yX zsGLG86aa9nav@e~6Of~FDlQoTa8ypB(prEVmD6|yApl3^0#bSdkgGZ6z<eANYV3)X z6ROghF}9+B?@&XI50ZM}abrNP=5m!2`rmVvcZhe$t3;sq#P;?;<)|E$6V{JDJvQYJ zAX&Lmu;ByXSmkWsShiWVJvW#`RZ@Xv+g5$3T!qSEaNPehONYtDvyFwvN!=Za2OL)< z71jg<j*DP(MR0mSvhoewMh<|ZayD>Oj#bWcgE>?s6<D@y)rZPax!F}8<`8qpBjA1? zivPjGqys3Y%pnsrw-12h<3r`(Qn$Or37KU`Du<F92NeZYQ?m!GrpB+F+h8gEz-=n0 z&<X_r9N)l0tkfnTN99ypG6LYJoJ6Iy068kB@d`o!j>-k3^adbD<#b?v48T!2A5`QB z$WgfnF|PxFqjENId}6KArzup<rX0>yZkL(aVRG?&%7Mp8-5rVt9IGj-DOV(dUnEoN zHz=oE)ho0@0RYD(R*03_1mvikic3ZS9F>!(v=$&o<uqPF2*6RffRx?<<fxnu%#Q&$ zD(8cW9055h7a`_#0B}^!1}=4b3fP3y?JjXbX1lQp@$AbbHBRbsl@sEICf~rhp{bT{ zP)@lBR&mJ)fa4-qqS9J`9F@~}1t9=O<pNTA1CXO~Ixs&5;HaDrDslwms9c1Y*8#v$ zIU6`W;PC-3;T*!b%Iz|9x?*xkZI`9)4#fkG)s)pV;c80ds2r8!4z0Rk04oJPNUFGG z1i<k@QlipYfE<<6cm*K<N96)idION7ayl?S2H>ci4=Qp5<fvSPnAZWoQ8^p9)IH!~ z6H>Rk#0i=0#wx_KFPGFfsmoPPh`URC1Ly9NTE0O!<sw+cB_jZii(rXLYXNdpPU97X z034MINa+ngj>_r4{1||vaz3cY5s;&D5n^5k02iNfwhQq3W4l9O98L%UvYk)e9r_0> CCH<lR literal 240333 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 diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 3792e52abd..e8d534803f 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -42,6 +42,8 @@ typedef struct { LONG ref; WCHAR *url; + + DOUBLE duration; } WMPMedia; struct WindowsMediaPlayer { @@ -76,6 +78,7 @@ struct WindowsMediaPlayer { IGraphBuilder* filter_graph; IMediaControl* media_control; IMediaEvent* media_event; + IMediaSeeking* media_seeking; /* Async event notification */ HWND msg_window; -- 2.17.0

2 2

[PATCH] windowscodecs: Make get_metadata_container() static.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windowscodecs/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 6652ee3eed9..21e661025f9 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1514,7 +1514,7 @@ typedef struct UINT container_count; } MetadataReaderInfo; -struct metadata_container *get_metadata_container(MetadataReaderInfo *info, const GUID *guid) +static struct metadata_container *get_metadata_container(MetadataReaderInfo *info, const GUID *guid) { unsigned i; -- 2.17.0

2 1

[PATCH v2] comctl32: Fix GroupBox can't have multiline text.
by Zhiyi Zhang 18 Apr '18

18 Apr '18

Supersede 144846. Sorry, it also got mangled by Thunderbird. GroupBox may have multiline text. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1b187e3834..1feb07ae64 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -282,9 +282,6 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) default: dtStyle |= DT_VCENTER; break; } } - else - /* GroupBox's text is always single line and is top aligned. */ - dtStyle |= DT_SINGLELINE; return dtStyle; } -- 2.16.3

2 2

[PATCH 2/2] secur32: Return a handle from LsaRegisterLogonProcess.
by Hans Leidekker 18 Apr '18

18 Apr '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/lsa.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 779d67a3a0..5fe6f3a8f2 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -88,18 +88,34 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id return STATUS_INVALID_PARAMETER; } +struct lsa_connection *alloc_lsa_connection(void) +{ + struct lsa_connection *ret; + if (!(ret = heap_alloc(sizeof(*ret)))) return NULL; + ret->magic = LSA_MAGIC; + return ret; +} + NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) { struct lsa_connection *lsa_conn; TRACE("%p\n", LsaHandle); - lsa_conn = heap_alloc(sizeof(*lsa_conn)); - if (!lsa_conn) return STATUS_NO_MEMORY; - - lsa_conn->magic = LSA_MAGIC; + if (!(lsa_conn = alloc_lsa_connection())) return STATUS_NO_MEMORY; *LsaHandle = lsa_conn; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LogonProcessName, + PHANDLE LsaHandle, PLSA_OPERATIONAL_MODE SecurityMode) +{ + struct lsa_connection *lsa_conn; + + FIXME("%s %p %p stub\n", debugstr_as(LogonProcessName), LsaHandle, SecurityMode); + if (!(lsa_conn = alloc_lsa_connection())) return STATUS_NO_MEMORY; + *LsaHandle = lsa_conn; return STATUS_SUCCESS; } @@ -923,10 +939,3 @@ NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, return STATUS_UNSUCCESSFUL; /* FIXME */ } - -NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LogonProcessName, - PHANDLE LsaHandle, PLSA_OPERATIONAL_MODE SecurityMode) -{ - FIXME("%p %p %p stub\n", LogonProcessName, LsaHandle, SecurityMode); - return STATUS_SUCCESS; -} -- 2.11.0

1 0

[PATCH 1/2] secur32: Implement LsaDeregisterLogonProcess.
by Hans Leidekker 18 Apr '18

18 Apr '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/lsa.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 23b380cd58..779d67a3a0 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -105,7 +105,14 @@ NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE LsaHandle) { - FIXME("%p stub\n", LsaHandle); + struct lsa_connection *lsa_conn = (struct lsa_connection *)LsaHandle; + + TRACE("%p\n", LsaHandle); + + if (!lsa_conn || lsa_conn->magic != LSA_MAGIC) return STATUS_INVALID_HANDLE; + lsa_conn->magic = 0; + heap_free(lsa_conn); + return STATUS_SUCCESS; } -- 2.11.0

1 0

[PATCH] kerberos: Consistently use NTSTATUS return values.
by Hans Leidekker 18 Apr '18

18 Apr '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index e51f7ea4f8..d40ec04dd5 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -691,7 +691,7 @@ static inline void ctxthandle_gss_to_sspi( gss_ctx_id_t handle, LSA_SEC_HANDLE * *ctxt = (LSA_SEC_HANDLE)handle; } -static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) +static NTSTATUS status_gss_to_sspi( OM_uint32 status ) { switch (status) { @@ -712,7 +712,7 @@ static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) case GSS_S_GAP_TOKEN: return SEC_E_OUT_OF_SEQUENCE; default: - FIXME( "couldn't convert status 0x%08x to SECURITY_STATUS\n", status ); + FIXME( "couldn't convert status 0x%08x to NTSTATUS\n", status ); return SEC_E_INTERNAL_ERROR; } } @@ -761,7 +761,7 @@ static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) timestamp->HighPart = tmp.QuadPart >> 32; } -static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_name_t *name ) +static NTSTATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_name_t *name ) { OM_uint32 ret, minor_status; gss_OID type = GSS_C_NO_OID; /* FIXME: detect the appropriate value for this ourselves? */ @@ -925,8 +925,9 @@ static NTSTATUS acquire_credentials_handle( UNICODE_STRING *principal_us, gss_cr OM_uint32 ret, minor_status, expiry_time; gss_name_t principal = GSS_C_NO_NAME; gss_cred_id_t cred_handle; + NTSTATUS status; - if (principal_us && ((ret = name_sspi_to_gss( principal_us, &principal )) != SEC_E_OK)) return ret; + if (principal_us && ((status = name_sspi_to_gss( principal_us, &principal )) != SEC_E_OK)) return status; ret = pgss_acquire_cred( &minor_status, principal, GSS_C_INDEFINITE, GSS_C_NULL_OID_SET, cred_usage, &cred_handle, NULL, &expiry_time ); @@ -1018,6 +1019,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, gss_ctx_id_t ctxt_handle; gss_buffer_desc input_token, output_token; gss_name_t target = GSS_C_NO_NAME; + NTSTATUS status; int idx; TRACE( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), @@ -1041,7 +1043,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, output_token.length = 0; output_token.value = NULL; - if (target_name && ((ret = name_sspi_to_gss( target_name, &target )) != SEC_E_OK)) return ret; + if (target_name && ((status = name_sspi_to_gss( target_name, &target )) != SEC_E_OK)) return status; ret = pgss_init_sec_context( &minor_status, cred_handle, &ctxt_handle, target, GSS_C_NO_OID, req_flags, 0, GSS_C_NO_CHANNEL_BINDINGS, &input_token, NULL, &output_token, &ret_flags, @@ -1369,7 +1371,7 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON #endif } -static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, +static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection ) { #ifdef SONAME_LIBGSSAPI_KRB5 -- 2.11.0

1 0

[PATCH] include: Fix a couple of LSA typedefs.
by Hans Leidekker 18 Apr '18

18 Apr '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/ntsecpkg.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 7f64d06134..08373a2635 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -308,14 +308,15 @@ typedef struct _LSA_SECPKG_FUNCTION_TABLE { /* LSA-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PLSA_DISPATCH_TABLE, PLSA_STRING, PLSA_STRING, PLSA_STRING *); -typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER)(LPWSTR, LPWSTR, LPWSTR, LPWSTR, - DWORD, DWORD, PHANDLE); -typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE)(PUNICODE_STRING, PVOID, ULONG, +typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER)(PLSA_CLIENT_REQUEST, SECURITY_LOGON_TYPE, + PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID LogonId, PNTSTATUS, PLSA_TOKEN_INFORMATION_TYPE, + PVOID *, PLSA_UNICODE_STRING *, PLSA_UNICODE_STRING *); +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); typedef VOID (NTAPI *PLSA_AP_LOGON_TERMINATED)(PLUID); typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_UNTRUSTED)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); -typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_PASSTHROUGH)(PUNICODE_STRING, +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_PASSTHROUGH)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX)(PLSA_CLIENT_REQUEST, SECURITY_LOGON_TYPE, PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID, PNTSTATUS, @@ -327,7 +328,7 @@ typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX2)(PLSA_CLIENT_REQUEST, PUNICODE_STRING *, PSECPKG_PRIMARY_CRED, PSECPKG_SUPPLEMENTAL_CRED_ARRAY *); typedef NTSTATUS (NTAPI SpInitializeFn)(ULONG_PTR, PSECPKG_PARAMETERS, PLSA_SECPKG_FUNCTION_TABLE); -typedef NTSTATUS (NTAPI SpShutDownFn)(void); +typedef NTSTATUS (NTAPI SpShutdownFn)(void); typedef NTSTATUS (NTAPI SpGetInfoFn)(PSecPkgInfoW); typedef NTSTATUS (NTAPI SpAcceptCredentialsFn)(SECURITY_LOGON_TYPE, PUNICODE_STRING, PSECPKG_PRIMARY_CRED, PSECPKG_SUPPLEMENTAL_CRED); @@ -411,7 +412,7 @@ typedef struct SECPKG_FUNCTION_TABLE { PLSA_AP_LOGON_USER_EX LogonUserEx; PLSA_AP_LOGON_USER_EX2 LogonUserEx2; SpInitializeFn *Initialize; - SpShutDownFn *Shutdown; + SpShutdownFn *Shutdown; SpGetInfoFn *GetInfo; SpAcceptCredentialsFn *AcceptCredentials; SpAcquireCredentialsHandleFn *SpAcquireCredentialsHandle; -- 2.11.0

1 0

[PATCH] webservices: Properly restore the reader position when the next element doesn't match.
by Hans Leidekker 18 Apr '18

18 Apr '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 113 +++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 51 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a56bb7eb9f..79a1af63bf 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4346,6 +4346,24 @@ static HRESULT read_next_node( struct reader *reader ) return WS_E_INVALID_FORMAT; } +struct reader_pos +{ + struct node *node; + ULONG attr; +}; + +static void save_reader_position( const struct reader *reader, struct reader_pos *pos ) +{ + pos->node = reader->current; + pos->attr = reader->current_attr; +} + +static void restore_reader_position( struct reader *reader, const struct reader_pos *pos ) +{ + reader->current = pos->node; + reader->current_attr = pos->attr; +} + static HRESULT get_text( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_XML_TEXT **ret, BOOL *found ) { @@ -4364,16 +4382,19 @@ static HRESULT get_text( struct reader *reader, WS_TYPE_MAPPING mapping, const W *found = TRUE; if (localname) { + struct reader_pos pos; HRESULT hr; + if (!match_element( reader->current, localname, ns )) { *found = FALSE; return S_OK; } + save_reader_position( reader, &pos ); if ((hr = read_next_node( reader )) != S_OK) return hr; if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) { - if (!move_to_parent_element( &reader->current )) return WS_E_INVALID_FORMAT; + restore_reader_position( reader, &pos ); *found = FALSE; return S_OK; } @@ -6021,8 +6042,7 @@ static HRESULT read_type_next_node( struct reader *reader ) static HRESULT read_type_next_element_node( struct reader *reader, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - struct node *node; - ULONG attr; + struct reader_pos pos; HRESULT hr; if (!localname) return S_OK; /* assume reader is already correctly positioned */ @@ -6034,14 +6054,10 @@ static HRESULT read_type_next_element_node( struct reader *reader, const WS_XML_ } if (match_element( reader->current, localname, ns )) return S_OK; - node = reader->current; - attr = reader->current_attr; - + save_reader_position( reader, &pos ); if ((hr = read_type_next_node( reader )) != S_OK) return hr; if (match_element( reader->current, localname, ns )) return S_OK; - - reader->current = node; - reader->current_attr = attr; + restore_reader_position( reader, &pos ); return WS_E_INVALID_FORMAT; } @@ -6166,55 +6182,37 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) static HRESULT read_type_field( struct reader *, const WS_FIELD_DESCRIPTION *, WS_HEAP *, char *, ULONG ); -static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) +static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTION *desc, WS_HEAP *heap, void *ret, + ULONG size, BOOL *found ) { - BOOL found = FALSE; + struct reader_pos pos; HRESULT hr; ULONG i; - switch (option) - { - case WS_READ_REQUIRED_VALUE: - case WS_READ_NILLABLE_VALUE: - if (size != desc->size) return E_INVALIDARG; - break; - - default: - return E_INVALIDARG; - } + if (size != desc->size) return E_INVALIDARG; + save_reader_position( reader, &pos ); if ((hr = read_type_next_node( reader )) != S_OK) return hr; - if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) return WS_E_INVALID_FORMAT; + for (i = 0; i < desc->fieldCount; i++) { - if ((found = match_element( reader->current, desc->fields[i]->field.localName, desc->fields[i]->field.ns ))) + if ((*found = match_element( reader->current, desc->fields[i]->field.localName, desc->fields[i]->field.ns ))) break; } - if (!found) *(int *)((char *)ret + desc->enumOffset) = desc->noneEnumValue; - else + if (!*found) { - ULONG offset = desc->fields[i]->field.offset; - if ((hr = read_type_field( reader, &desc->fields[i]->field, heap, ret, offset )) == S_OK) - *(int *)((char *)ret + desc->enumOffset) = desc->fields[i]->value; + *(int *)((char *)ret + desc->enumOffset) = desc->noneEnumValue; + restore_reader_position( reader, &pos ); } - - switch (option) + else { - case WS_READ_NILLABLE_VALUE: - if (!found) move_to_parent_element( &reader->current ); - break; - - case WS_READ_REQUIRED_VALUE: - if (!found) hr = WS_E_INVALID_FORMAT; - break; - - default: - return E_INVALIDARG; + ULONG offset = desc->fields[i]->field.offset; + if ((hr = read_type_field( reader, &desc->fields[i]->field, heap, ret, offset )) != S_OK) return hr; + *(int *)((char *)ret + desc->enumOffset) = desc->fields[i]->value; } - return hr; + return S_OK; } static HRESULT read_type( struct reader *, WS_TYPE_MAPPING, WS_TYPE, const WS_XML_STRING *, @@ -6251,17 +6249,28 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO } if (desc->type == WS_UNION_TYPE) - hr = read_type_union( reader, desc->typeDescription, option, heap, buf + offset, item_size ); + { + BOOL found; + hr = read_type_union( reader, desc->typeDescription, heap, buf + offset, item_size, &found ); + if (hr != S_OK) + { + ws_free( heap, buf, nb_allocated * item_size ); + return hr; + } + if (!found) break; + } else + { hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->itemLocalName, desc->itemNs, desc->typeDescription, option, heap, buf + offset, item_size ); - - if (hr == WS_E_INVALID_FORMAT) break; - if (hr != S_OK) - { - ws_free( heap, buf, nb_allocated * item_size ); - return hr; + if (hr == WS_E_INVALID_FORMAT) break; + if (hr != S_OK) + { + ws_free( heap, buf, nb_allocated * item_size ); + return hr; + } } + offset += item_size; nb_items++; } @@ -6338,11 +6347,13 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO break; case WS_ELEMENT_CHOICE_FIELD_MAPPING: + { + BOOL found; if (desc->type != WS_UNION_TYPE || !desc->typeDescription || (desc->options & (WS_FIELD_POINTER|WS_FIELD_NILLABLE))) return E_INVALIDARG; - hr = read_type_union( reader, desc->typeDescription, option, heap, ptr, size ); + hr = read_type_union( reader, desc->typeDescription, heap, ptr, size, &found ); break; - + } case WS_REPEATING_ELEMENT_FIELD_MAPPING: case WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING: { -- 2.11.0

1 0

[PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll
by Guillaume Gill 18 Apr '18

18 Apr '18

>From b5332ae42d5dade2d114dc3c9ff9180215d8021b Mon Sep 17 00:00:00 2001 From: Guillaume GILL <gillg02(a)petitchinois.net> Date: Mon, 9 Apr 2018 21:28:03 +0200 Subject: [PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll Fixes https://bugs.winehq.org/show_bug.cgi?id=44866 Signed-off-by: Guillaume GILL <gillg02(a)petitchinois.net> --- dlls/shell32/shelllink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6dca9ac..07c83d1 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2664,14 +2664,14 @@ static HRESULT WINAPI propertystore_SetValue(IPropertyStore *iface, REFPROPERTYK { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p)->(%p %p): stub\n", This, key, value); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI propertystore_Commit(IPropertyStore *iface) { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p): stub\n", This); - return E_NOTIMPL; + return S_OK; } static const IPropertyStoreVtbl propertystorevtbl = { -- 2.7.4

1 0

[PATCH] comctl32: Fix GroupBox can't have multiline text.
by Zhiyi Zhang 18 Apr '18

18 Apr '18

GroupBox may have multiline text. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1b187e3834..1feb07ae64 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -282,9 +282,6 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) default: dtStyle |= DT_VCENTER; break; } } - else - /* GroupBox's text is always single line and is top aligned. */ - dtStyle |= DT_SINGLELINE; return dtStyle; } -- 2.16.3

2 1

[v2 PATCH] shell32: Implement SHCreateSessionKey.
by Alistair Leslie-Hughes 18 Apr '18

18 Apr '18

This implementation is based on the Geoff Chappell description. Based off patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shellreg.c | 35 ++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellole.c | 26 ++++++++++++++++++++++---- 2 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 356ec4e8bd..cacf3ac19f 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -34,6 +34,7 @@ #include "undocshell.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -148,13 +149,41 @@ HRESULT WINAPI SHRegCloseKey (HKEY hkey) return RegCloseKey( hkey ); } +static BOOL WINAPI create_session_key(INIT_ONCE *once, void *param, void **context) +{ + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; + DWORD session; + HKEY hkey_session; + LPWSTR session_reg_str = param; + + if(!ProcessIdToSessionId( GetCurrentProcessId(), &session)) + return FALSE; + + sprintfW(session_reg_str, session_format, session); + + if (RegCreateKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, NULL, + REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey_session, NULL)) + return FALSE; + + RegCloseKey(hkey_session); + TRACE("session key %s\n", debugstr_w(session_reg_str)); + return TRUE; +} + /************************************************************************* * SHCreateSessionKey [SHELL32.723] * */ HRESULT WINAPI SHCreateSessionKey(REGSAM access, HKEY *hkey) { - FIXME("stub: %d %p\n", access, hkey); - *hkey = NULL; - return E_NOTIMPL; + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + static WCHAR session_reg_str[MAX_PATH]; + + InitOnceExecuteOnce(&init_once, create_session_key, session_reg_str, NULL); + + TRACE("using session key %s\n", debugstr_w(session_reg_str)); + return RegOpenKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, access, hkey); } diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index f611faf908..1f61bef0f0 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -76,6 +76,7 @@ static HRESULT (WINAPI *pSHPropStgWriteMultiple)(IPropertyStorage*, UINT*, ULONG, const PROPSPEC*, PROPVARIANT*, PROPID); static HRESULT (WINAPI *pSHCreateQueryCancelAutoPlayMoniker)(IMoniker**); static HRESULT (WINAPI *pSHCreateSessionKey)(REGSAM, HKEY*); +static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static void init(void) { @@ -86,6 +87,7 @@ static void init(void) pSHPropStgWriteMultiple = (void*)GetProcAddress(hmod, "SHPropStgWriteMultiple"); pSHCreateQueryCancelAutoPlayMoniker = (void*)GetProcAddress(hmod, "SHCreateQueryCancelAutoPlayMoniker"); pSHCreateSessionKey = (void*)GetProcAddress(hmod, (char*)723); + pSHGetPathFromIDListEx = (void*)GetProcAddress(hmod, "SHGetPathFromIDListEx"); } static HRESULT WINAPI PropertyStorage_QueryInterface(IPropertyStorage *This, @@ -862,8 +864,15 @@ static void test_DragQueryFile(void) static void test_SHCreateSessionKey(void) { + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; HKEY hkey, hkey2; HRESULT hr; + DWORD session; + WCHAR sessionW[MAX_PATH]; + LONG ret; if (!pSHCreateSessionKey) { @@ -877,17 +886,26 @@ static void test_SHCreateSessionKey(void) hkey = (HKEY)0xdeadbeef; hr = pSHCreateSessionKey(0, &hkey); todo_wine ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); - ok(hkey == NULL, "got %p\n", hkey); + todo_wine ok(hkey == NULL, "got %p\n", hkey); hr = pSHCreateSessionKey(KEY_READ, &hkey); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateSessionKey(KEY_READ, &hkey2); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); RegCloseKey(hkey); RegCloseKey(hkey2); + + /* Check the registery */ + ProcessIdToSessionId( GetCurrentProcessId(), &session); + wsprintfW(sessionW, session_format, session); + + ret = RegOpenKeyW(HKEY_CURRENT_USER, sessionW, &hkey); + /* Fails on XP and w2k3, SHGetPathFromIDListEx available for Vista+ */ + ok(!ret || (ret && !pSHGetPathFromIDListEx), "key not found\n"); + RegCloseKey(hkey); } static void test_dragdrophelper(void) -- 2.17.0

2 1

[PATCH 1/2] msi: Store a record's associated query privately.
by Zebediah Figura 18 Apr '18

18 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/msipriv.h | 4 +--- dlls/msi/msiquery.c | 5 +++-- dlls/msi/record.c | 48 ------------------------------------------------ 3 files changed, 4 insertions(+), 53 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b2b3e7c..9bc6413 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -131,7 +131,6 @@ typedef struct tagMSIFIELD union { INT iVal; - INT_PTR pVal; LPWSTR szwVal; IStream *stream; } u; @@ -141,6 +140,7 @@ typedef struct tagMSIFIELD typedef struct tagMSIRECORD { MSIOBJECTHDR hdr; + MSIQUERY *query; UINT count; /* as passed to MsiCreateRecord */ MSIFIELD fields[1]; /* nb. array size is count+1 */ } MSIRECORD; @@ -813,13 +813,11 @@ extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **) DECLSPEC_HIDDEN extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT ) DECLSPEC_HIDDEN; extern MSIRECORD *MSI_CreateRecord( UINT ) DECLSPEC_HIDDEN; extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int ) DECLSPEC_HIDDEN; -extern UINT MSI_RecordSetIntPtr( MSIRECORD *, UINT, INT_PTR ) DECLSPEC_HIDDEN; extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR ) DECLSPEC_HIDDEN; extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT ) DECLSPEC_HIDDEN; extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD) DECLSPEC_HIDDEN; extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD) DECLSPEC_HIDDEN; extern int MSI_RecordGetInteger( MSIRECORD *, UINT ) DECLSPEC_HIDDEN; -extern INT_PTR MSI_RecordGetIntPtr( MSIRECORD *, UINT ) DECLSPEC_HIDDEN; extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD) DECLSPEC_HIDDEN; extern UINT MSI_RecordSetStream(MSIRECORD *, UINT, IStream *) DECLSPEC_HIDDEN; extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index f8ed4ce..1ba3076 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -374,7 +374,8 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) if (r == ERROR_SUCCESS) { query->row ++; - MSI_RecordSetIntPtr(*prec, 0, (INT_PTR)query); + (*prec)->query = query; + MSI_RecordSetInteger(*prec, 0, 1); } return r; @@ -608,7 +609,7 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) if ( !view || !view->ops->modify) return ERROR_FUNCTION_FAILED; - if ( mode == MSIMODIFY_UPDATE && MSI_RecordGetIntPtr( rec, 0 ) != (INT_PTR)query ) + if ( mode == MSIMODIFY_UPDATE && rec->query != query ) return ERROR_FUNCTION_FAILED; r = view->ops->modify( view, mode, rec, query->row ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index de45191..8254b17 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -46,7 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define MSIFIELD_INT 1 #define MSIFIELD_WSTR 3 #define MSIFIELD_STREAM 4 -#define MSIFIELD_INTPTR 5 static void MSI_FreeField( MSIFIELD *field ) { @@ -54,7 +53,6 @@ static void MSI_FreeField( MSIFIELD *field ) { case MSIFIELD_NULL: case MSIFIELD_INT: - case MSIFIELD_INTPTR: break; case MSIFIELD_WSTR: msi_free( field->u.szwVal); @@ -190,9 +188,6 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, case MSIFIELD_INT: out->u.iVal = in->u.iVal; break; - case MSIFIELD_INTPTR: - out->u.pVal = in->u.pVal; - break; case MSIFIELD_WSTR: if ((str = msi_strdupW( in->u.szwVal, in->len ))) { @@ -216,32 +211,6 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, return r; } -INT_PTR MSI_RecordGetIntPtr( MSIRECORD *rec, UINT iField ) -{ - int ret; - - TRACE( "%p %d\n", rec, iField ); - - if( iField > rec->count ) - return MININT_PTR; - - switch( rec->fields[iField].type ) - { - case MSIFIELD_INT: - return rec->fields[iField].u.iVal; - case MSIFIELD_INTPTR: - return rec->fields[iField].u.pVal; - case MSIFIELD_WSTR: - if( string2intW( rec->fields[iField].u.szwVal, &ret ) ) - return ret; - return MININT_PTR; - default: - break; - } - - return MININT_PTR; -} - int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField) { int ret = 0; @@ -255,8 +224,6 @@ int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField) { case MSIFIELD_INT: return rec->fields[iField].u.iVal; - case MSIFIELD_INTPTR: - return rec->fields[iField].u.pVal; case MSIFIELD_WSTR: if( string2intW( rec->fields[iField].u.szwVal, &ret ) ) return ret; @@ -311,20 +278,6 @@ UINT WINAPI MsiRecordClearData( MSIHANDLE handle ) return ERROR_SUCCESS; } -UINT MSI_RecordSetIntPtr( MSIRECORD *rec, UINT iField, INT_PTR pVal ) -{ - TRACE("%p %u %ld\n", rec, iField, pVal); - - if( iField > rec->count ) - return ERROR_INVALID_PARAMETER; - - MSI_FreeField( &rec->fields[iField] ); - rec->fields[iField].type = MSIFIELD_INTPTR; - rec->fields[iField].u.pVal = pVal; - - return ERROR_SUCCESS; -} - UINT MSI_RecordSetInteger( MSIRECORD *rec, UINT iField, int iVal ) { TRACE("%p %u %d\n", rec, iField, iVal); @@ -1095,7 +1048,6 @@ void dump_record(MSIRECORD *rec) case MSIFIELD_NULL: TRACE("(null)"); break; case MSIFIELD_INT: TRACE("%d", rec->fields[i].u.iVal); break; case MSIFIELD_WSTR: TRACE("%s", debugstr_w(rec->fields[i].u.szwVal)); break; - case MSIFIELD_INTPTR: TRACE("%ld", rec->fields[i].u.pVal); break; case MSIFIELD_STREAM: TRACE("%p", rec->fields[i].u.stream); break; } if (i < rec->count) TRACE(", "); -- 2.7.4

2 3

[PATCH] msi: Don't cache the base URL.
by Hans Leidekker 18 Apr '18

18 Apr '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/dialog.c | 2 +- dlls/msi/media.c | 40 ++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 3 +-- dlls/msi/package.c | 25 +++---------------------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ec3258129a..61c6ab07e3 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4113,7 +4113,7 @@ static MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE *db ) MSIPREVIEW *preview = NULL; MSIPACKAGE *package; - package = MSI_CreatePackage( db, NULL ); + package = MSI_CreatePackage( db ); if (package) { preview = alloc_msiobject( MSIHANDLETYPE_PREVIEW, sizeof(MSIPREVIEW), MSI_ClosePreview ); diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 0bb883b34a..3d4a8c09eb 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -678,6 +678,14 @@ static UINT get_drive_type(const WCHAR *path) return GetDriveTypeW(root); } +static WCHAR *get_base_url( MSIDATABASE *db ) +{ + WCHAR *p, *ret = NULL, *orig_db = msi_dup_property( db, szOriginalDatabase ); + if (UrlIsW( orig_db, URLIS_URL ) && (ret = strdupW( orig_db )) && (p = strrchrW( ret, '/'))) p[1] = 0; + msi_free( orig_db ); + return ret; +} + UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) { static const WCHAR query[] = { @@ -685,7 +693,7 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) 'W','H','E','R','E',' ','`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ', '>','=',' ','%','i',' ','O','R','D','E','R',' ','B','Y',' ','`','D','i','s','k','I','d','`',0}; MSIRECORD *row; - LPWSTR source_dir, source; + WCHAR *source_dir, *source, *base_url = NULL; DWORD options; if (Sequence <= mi->last_sequence) /* already loaded */ @@ -721,9 +729,9 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) source = source_dir; options |= MSISOURCETYPE_MEDIA; } - else if (package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) + else if ((base_url = get_base_url(package->db))) { - source = package->BaseURL; + source = base_url; options |= MSISOURCETYPE_URL; } else @@ -739,8 +747,10 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) msi_package_add_info(package, package->Context, options, INSTALLPROPERTY_LASTUSEDSOURCEW, source); - msi_free(source_dir); TRACE("sequence %u -> cabinet %s disk id %u\n", Sequence, debugstr_w(mi->cabinet), mi->disk_id); + + msi_free(base_url); + msi_free(source_dir); return ERROR_SUCCESS; } @@ -851,6 +861,8 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) if (mi->cabinet) { + WCHAR *base_url; + /* cabinet is internal, no checks needed */ if (mi->cabinet[0] == '#') return ERROR_SUCCESS; @@ -858,14 +870,21 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) /* package should be downloaded */ if (compressed && GetFileAttributesW( cabinet_file ) == INVALID_FILE_ATTRIBUTES && - package->BaseURL && UrlIsW( package->BaseURL, URLIS_URL )) + (base_url = get_base_url( package->db ))) { - WCHAR temppath[MAX_PATH], *p; + WCHAR temppath[MAX_PATH], *p, *url; - if ((rc = msi_download_file( cabinet_file, temppath )) != ERROR_SUCCESS) + msi_free( cabinet_file ); + if (!(url = msi_alloc( (strlenW( base_url ) + strlenW( mi->cabinet ) + 1) * sizeof(WCHAR) ))) { - ERR("failed to download %s (%u)\n", debugstr_w(cabinet_file), rc); - msi_free( cabinet_file ); + return ERROR_OUTOFMEMORY; + } + strcpyW( url, base_url ); + strcatW( url, mi->cabinet ); + if ((rc = msi_download_file( url, temppath )) != ERROR_SUCCESS) + { + ERR("failed to download %s (%u)\n", debugstr_w(url), rc); + msi_free( url ); return rc; } if ((p = strrchrW( temppath, '\\' ))) *p = 0; @@ -873,7 +892,8 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) PathAddBackslashW( mi->sourcedir ); msi_free( mi->cabinet ); mi->cabinet = strdupW( p + 1 ); - msi_free( cabinet_file ); + + msi_free( url ); return ERROR_SUCCESS; } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b2b3e7ce6b..f47cd1265b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -423,7 +423,6 @@ typedef struct tagMSIPACKAGE struct list RunningActions; - LPWSTR BaseURL; LPWSTR PackagePath; LPWSTR ProductCode; LPWSTR localfile; @@ -861,7 +860,7 @@ extern UINT msi_view_get_row(MSIDATABASE *, MSIVIEW *, UINT, MSIRECORD **) DECLS extern UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ) DECLSPEC_HIDDEN; /* package internals */ -extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *, LPCWSTR ) DECLSPEC_HIDDEN; +extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE * ) DECLSPEC_HIDDEN; extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE **pPackage ) DECLSPEC_HIDDEN; extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN; extern INT MSI_ProcessMessageVerbatim( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b154423be7..d741a349b4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -321,7 +321,6 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free_patchinfo( patch ); } - msi_free( package->BaseURL ); msi_free( package->PackagePath ); msi_free( package->ProductCode ); msi_free( package->ActionFormat ); @@ -1056,7 +1055,7 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) msi_set_property( package->db, szAdminUser, szOne, -1 ); } -MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) +MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) { static const WCHAR fmtW[] = {'%','u',0}; MSIPACKAGE *package; @@ -1077,7 +1076,6 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) package->LastActionResult = MSI_NULL_INTEGER; package->WordCount = 0; package->PackagePath = strdupW( db->path ); - package->BaseURL = strdupW( base_url ); create_temp_property_table( package ); msi_clone_properties( package->db ); @@ -1447,15 +1445,13 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) MSIPACKAGE *package; MSIHANDLE handle; MSIRECORD *data_row, *info_row; - LPWSTR ptr, base_url = NULL; UINT r; WCHAR localfile[MAX_PATH], cachefile[MAX_PATH]; LPCWSTR file = szPackage; DWORD index = 0; MSISUMMARYINFO *si; BOOL delete_on_close = FALSE; - LPWSTR productname; - WCHAR *info_template; + WCHAR *info_template, *productname; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -1487,30 +1483,19 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return r; file = cachefile; - - base_url = strdupW( szPackage ); - if (!base_url) - return ERROR_OUTOFMEMORY; - - ptr = strrchrW( base_url, '/' ); - if (ptr) *(ptr + 1) = '\0'; } r = get_local_package( file, localfile ); if (r != ERROR_SUCCESS || GetFileAttributesW( localfile ) == INVALID_FILE_ATTRIBUTES) { r = msi_create_empty_local_file( localfile, dotmsi ); if (r != ERROR_SUCCESS) - { - msi_free ( base_url ); return r; - } if (!CopyFileW( file, localfile, FALSE )) { r = GetLastError(); WARN("unable to copy package %s to %s (%u)\n", debugstr_w(file), debugstr_w(localfile), r); DeleteFileW( localfile ); - msi_free ( base_url ); return r; } delete_on_close = TRUE; @@ -1518,13 +1503,9 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) TRACE("opening package %s\n", debugstr_w( localfile )); r = MSI_OpenDatabaseW( localfile, MSIDBOPEN_TRANSACT, &db ); if (r != ERROR_SUCCESS) - { - msi_free ( base_url ); return r; - } } - package = MSI_CreatePackage( db, base_url ); - msi_free( base_url ); + package = MSI_CreatePackage( db ); msiobj_release( &db->hdr ); if (!package) return ERROR_INSTALL_PACKAGE_INVALID; package->localfile = strdupW( localfile ); -- 2.11.0

1 0

[PATCH v3] user32: Fix using DrawTextEx() to calculate rect with flag DT_BOTTOM.
by Zhiyi Zhang 18 Apr '18

18 Apr '18

Supersede 144852. Thunderbird likes to mangle text :( Fix using DrawTextEx to calculate text rect with DT_BOTTOM flag set returns zero for text height. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/text.c | 12 ++++++++++++ dlls/user32/text.c | 45 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 3cc9571521..e07bb2f168 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -28,6 +28,8 @@ #include "winerror.h" #include "winnls.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + #define MODIFIED(rect) (rect.left == 10 && rect.right != 100 && rect.top == 10 && rect.bottom != 100) #define EMPTY(rect) (rect.left == rect.right && rect.bottom == rect.top) @@ -46,11 +48,13 @@ static void test_DrawTextCalcRect(void) static CHAR wordbreak_text[] = "line1 line2"; static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; static char tabstring[] = "one\ttwo"; + static DWORD alignments[] = {DT_TOP, DT_LEFT, DT_CENTER, DT_RIGHT, DT_VCENTER, DT_BOTTOM}; INT textlen, textheight, heightcheck; RECT rect = { 0, 0, 100, 0 }, rect2; BOOL ret; DRAWTEXTPARAMS dtp; BOOL conform_xp = TRUE; + INT i; /* Initialization */ hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, @@ -586,6 +590,14 @@ static void test_DrawTextCalcRect(void) ok(rect.top == rect2.top, "unexpected value %d, got %d\n", rect.top, rect2.top); ok(rect.bottom == rect2.bottom , "unexpected value %d, got %d\n", rect.bottom, rect2.bottom); + for (i = 0; i < ARRAY_SIZE(alignments); i++) + { + SetRectEmpty(&rect); + textheight = DrawTextA(hdc, tabstring, -1, &rect, DT_NOCLIP | DT_CALCRECT | DT_SINGLELINE | alignments[i]); + ok(textheight > 0, "Alignment 0x%08x got unexpected textheight %d\n", alignments[i], textheight); + ok(rect.right - rect.left > 0, "Alignment 0x%08x got unexpected rect width %d\n", alignments[i], + rect.right - rect.left); + } SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 0b5bd47461..6843386e22 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -874,17 +874,17 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, WCHAR *retstr, *p_retstr; size_t size_retstr; WCHAR line[MAX_BUFFER]; - int len, lh, count=i_count; + int len, lh, count = i_count, old_count, line_count = 0; TEXTMETRICW tm; int lmargin = 0, rmargin = 0; int x = rect->left, y = rect->top; int width = rect->right - rect->left; - int max_width = 0; + int max_width = 0, max_height = 0; int last_line; int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; - BOOL invert_y=FALSE; + BOOL invert_y = FALSE, is_fist_line = TRUE; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -968,6 +968,29 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, } p_retstr = retstr; + old_count = count; + do + { + len = ARRAY_SIZE(line); + if (invert_y) + last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2 * lh - 1 : lh) < rect->bottom; + else + last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2 * lh - 1 : lh) > rect->bottom; + strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, + &prefix_offset, &ellip); + + if (invert_y) + y -= lh; + else + y += lh; + + line_count++; + } while (strPtr && !last_line); + max_height = line_count * lh; + + strPtr = str; + count = old_count; + y = rect->top; do { len = ARRAY_SIZE(line); @@ -981,11 +1004,15 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, size.cx) / 2; else if (flags & DT_RIGHT) x = rect->right - size.cx; - if (flags & DT_SINGLELINE) - { - if (flags & DT_VCENTER) y = rect->top + - (rect->bottom - rect->top) / 2 - size.cy / 2; - else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; + if (is_fist_line) + { + if (flags & DT_VCENTER) + y = invert_y ? rect->top - (rect->bottom - rect->top) / 2 + max_height / 2 + : rect->top + (rect->bottom - rect->top) / 2 - max_height / 2; + else if (flags & DT_BOTTOM) + y = invert_y ? rect->bottom + max_height : rect->bottom - max_height; + + is_fist_line = FALSE; } if (!(flags & DT_CALCRECT)) @@ -1071,7 +1098,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, memcpy (str, retstr, size_retstr); HeapFree (GetProcessHeap(), 0, retstr); } - return y - rect->top; + return invert_y ? -max_height : max_height; } /*********************************************************************** -- 2.16.3

2 1

[PATCH v15 1/3] wmp: Add seeking and duration
by Anton Romanov 18 Apr '18

18 Apr '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- Changed test.mp3 to be 10s cbr stereo. Looks like when gstreamer reports duration as half is because it gets confused by 1 channel mp3 dlls/wmp/player.c | 65 +++++++++++++++++++++++++++++++++------- dlls/wmp/tests/media.c | 38 +++++++++++++++++++++++ dlls/wmp/tests/rsrc.rc | 2 +- dlls/wmp/tests/test.mp3 | Bin 240333 -> 40377 bytes dlls/wmp/wmp_private.h | 3 ++ 5 files changed, 97 insertions(+), 11 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index f4ce62a447..8448916a80 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1396,8 +1396,21 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); - return E_NOTIMPL; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrItem), pIsAvailable); + if (!This->filter_graph) { + *pIsAvailable = VARIANT_FALSE; + } else if (strcmpW(currentPosition, bstrItem) == 0) { + DWORD capabilities; + IMediaSeeking_GetCapabilities(This->media_seeking, &capabilities); + *pIsAvailable = (capabilities & AM_SEEKING_CanSeekAbsolute) ? + VARIANT_TRUE : VARIANT_FALSE; + } else { + FIXME("%s not implemented\n", debugstr_w(bstrItem)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI WMPControls_play(IWMPControls *iface) @@ -1428,11 +1441,16 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) if (SUCCEEDED(hres)) hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + if (SUCCEEDED(hres)) + update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hres)) - update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaSeeking, + (void**)&This->media_seeking); + if (SUCCEEDED(hres)) + hres = IMediaSeeking_SetTimeFormat(This->media_seeking, &TIME_FORMAT_MEDIA_TIME); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaEvent, (void**)&This->media_event); @@ -1459,7 +1477,10 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) } if (SUCCEEDED(hres)) { + LONGLONG duration; update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsPlaying); + if (SUCCEEDED(IMediaSeeking_GetDuration(This->media_seeking, &duration))) + media->duration = (DOUBLE)duration / 10000000.0f; } else { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsUndefined); } @@ -1482,11 +1503,14 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) if (This->media_event) { IMediaEvent_Release(This->media_event); } - + if (This->media_seeking) { + IMediaSeeking_Release(This->media_seeking); + } IGraphBuilder_Release(This->filter_graph); This->filter_graph = NULL; This->media_control = NULL; This->media_event = NULL; + This->media_seeking = NULL; update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped); @@ -1517,15 +1541,33 @@ static HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%p)\n", This, pdCurrentPosition); - return E_NOTIMPL; + HRESULT hres; + LONGLONG currentPosition; + + TRACE("(%p)->(%p)\n", This, pdCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + hres = IMediaSeeking_GetCurrentPosition(This->media_seeking, &currentPosition); + *pdCurrentPosition = (DOUBLE) currentPosition / 10000000.0f; + TRACE("hres: %d, pos: %f\n", hres, *pdCurrentPosition); + return hres; } static HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) { + LONGLONG Current; + HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%f)\n", This, dCurrentPosition); - return E_NOTIMPL; + TRACE("(%p)->(%f)\n", This, dCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + Current = 10000000 * dCurrentPosition; + hres = IMediaSeeking_SetPositions(This->media_seeking, &Current, + AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + + return hres; } static HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) @@ -1762,9 +1804,12 @@ static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, B static HRESULT WINAPI WMPMedia_get_duration(IWMPMedia *iface, DOUBLE *pDuration) { + /* MSDN: If this property is used with a media item other than the one + * specified in Player.currentMedia, it may not contain a valid value. */ WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, pDuration); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pDuration); + *pDuration = This->duration; + return S_OK; } static HRESULT WINAPI WMPMedia_get_durationString(IWMPMedia *iface, BSTR *pbstrDuration) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index c2cd1cf941..a74cccd714 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -303,6 +303,11 @@ static BOOL test_wmp(void) static DWORD dw = 100; IWMPSettings *settings; BOOL test_ran = TRUE; + DOUBLE duration; + VARIANT_BOOL vbool; + IWMPMedia *media; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + BSTR bstrcurrentPosition = SysAllocString(currentPosition); hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -338,6 +343,10 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_FALSE, "unexpected value\n"); + hres = IWMPControls_play(controls); ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); @@ -380,6 +389,34 @@ static BOOL test_wmp(void) /* MediaOpening happens only on xp, 2003 */ CLEAR_CALLED(OPENSTATE, wmposMediaOpening); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_TRUE, "unexpected value\n"); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + ok((int)duration == 0, "unexpected value %f\n", duration); + + duration = 5.0; + hres = IWMPControls_put_currentPosition(controls, duration); + ok(hres == S_OK, "IWMPControls_put_currentPosition failed: %08x\n", hres); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + /* builtin quartz does not handle this currently and resets to 0.0, works + * with native quartz */ + todo_wine ok((int)duration >= 5.0, "unexpected value %f\n", duration); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres); + hres = IWMPMedia_get_duration(media, &duration); + ok(hres == S_OK, "IWMPMedia_get_duration failed: %08x\n", hres); + ok(round(duration) == 10, "unexpected value: %f\n", duration); + trace("AAAA %f\n", duration); + IWMPMedia_Release(media); + SET_EXPECT(PLAYSTATE, wmppsStopped); /* The following happens on wine only since we close media on stop */ SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia); @@ -414,6 +451,7 @@ playback_skip: IOleObject_Release(oleobj); DeleteFileW(filename); SysFreeString(filename); + SysFreeString(bstrcurrentPosition); return test_ran; } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index a92079e798..715399d524 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -18,7 +18,7 @@ #include "windef.h" -/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */ +/* ffmpeg -f lavfi -i anullsrc -t 10 -acodec libmp3lame -b:a 8k dlls/wmp/tests/test.mp3 */ /* @makedep: test.mp3 */ test.mp3 RCDATA "test.mp3" /* ffmpeg -ar 48000 -t 1 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 test1s.mp3 */ diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3 index 149a2cd346ee52ae179c46198ce290a5dd4d6251..b599b2dd3ba7befc42717f96e7ba629c658378b9 100644 GIT binary patch literal 40377 zcmeI30c2HC7{^cEq@=b=jKr)G(b{ZT5t+7XTA9{MBC0(vCC$i)WJ#1ti9}3dBt;UD z$V4PY5|Jj6h-5_K(d*u~d+)jD+;iT4p8Kxe^`GpX@7#Ikp5Og_-#hobUT=4Mop66v z?j0EDagOyuWcm(|<TrG-Y;137Yi%u^o%vNP^oJsIv-f0v$T{P@%$!jn#;%CW-1!R@ zEnd2;arug-=GAM~u3O*M(Ya~!maeVacI@2UzbCu@z`;XDaz~G!7#cn`a{A2KbLTHy zynOZgjhnY_kKMUDe((OnM~|O8efIpt#LHK&-%P%J_x{7jPoKYh{r3IG&*@*k{}leZ zSK?grpmWV_;p-KvGL7yz_d2!@Pwbm%%iqO9Lr&CB3vtZpn<vD=Cg-Z1f8$Q*G&@Fx zsO#(6)l=e-E%O8Zs90E%YX;+#d3AXTjFWXI)P1e|gygH0X@P;<3FQ+Qr!=8U36OIq z^dNz8N)wt)fSfy_siY<}#R(a5X%;!eJ7nON1>j0KMCB?V$D&|@=JruJ!_vnFOX&yX zsGLG86aa9nav@e~6Of~FDlQoTa8ypB(prEVmD6|yApl3^0#bSdkgGZ6z<eANYV3)X z6ROghF}9+B?@&XI50ZM}abrNP=5m!2`rmVvcZhe$t3;sq#P;?;<)|E$6V{JDJvQYJ zAX&Lmu;ByXSmkWsShiWVJvW#`RZ@Xv+g5$3T!qSEaNPehONYtDvyFwvN!=Za2OL)< z71jg<j*DP(MR0mSvhoewMh<|ZayD>Oj#bWcgE>?s6<D@y)rZPax!F}8<`8qpBjA1? zivPjGqys3Y%pnsrw-12h<3r`(Qn$Or37KU`Du<F92NeZYQ?m!GrpB+F+h8gEz-=n0 z&<X_r9N)l0tkfnTN99ypG6LYJoJ6Iy068kB@d`o!j>-k3^adbD<#b?v48T!2A5`QB z$WgfnF|PxFqjENId}6KArzup<rX0>yZkL(aVRG?&%7Mp8-5rVt9IGj-DOV(dUnEoN zHz=oE)ho0@0RYD(R*03_1mvikic3ZS9F>!(v=$&o<uqPF2*6RffRx?<<fxnu%#Q&$ zD(8cW9055h7a`_#0B}^!1}=4b3fP3y?JjXbX1lQp@$AbbHBRbsl@sEICf~rhp{bT{ zP)@lBR&mJ)fa4-qqS9J`9F@~}1t9=O<pNTA1CXO~Ixs&5;HaDrDslwms9c1Y*8#v$ zIU6`W;PC-3;T*!b%Iz|9x?*xkZI`9)4#fkG)s)pV;c80ds2r8!4z0Rk04oJPNUFGG z1i<k@QlipYfE<<6cm*K<N96)idION7ayl?S2H>ci4=Qp5<fvSPnAZWoQ8^p9)IH!~ z6H>Rk#0i=0#wx_KFPGFfsmoPPh`URC1Ly9NTE0O!<sw+cB_jZii(rXLYXNdpPU97X z034MINa+ngj>_r4{1||vaz3cY5s;&D5n^5k02iNfwhQq3W4l9O98L%UvYk)e9r_0> CCH<lR literal 240333 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 diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 3792e52abd..e8d534803f 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -42,6 +42,8 @@ typedef struct { LONG ref; WCHAR *url; + + DOUBLE duration; } WMPMedia; struct WindowsMediaPlayer { @@ -76,6 +78,7 @@ struct WindowsMediaPlayer { IGraphBuilder* filter_graph; IMediaControl* media_control; IMediaEvent* media_event; + IMediaSeeking* media_seeking; /* Async event notification */ HWND msg_window; -- 2.17.0

1 0

[PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll
by Guillaume Gill 18 Apr '18

18 Apr '18

>From b5332ae42d5dade2d114dc3c9ff9180215d8021b Mon Sep 17 00:00:00 2001 From: Guillaume GILL <gillg02(a)petitchinois.net> Date: Mon, 9 Apr 2018 21:28:03 +0200 Subject: [PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll Fixes https://bugs.winehq.org/show_bug.cgi?id=44866 Signed-off-by: Guillaume GILL <gillg02(a)petitchinois.net> --- dlls/shell32/shelllink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6dca9ac..07c83d1 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2664,14 +2664,14 @@ static HRESULT WINAPI propertystore_SetValue(IPropertyStore *iface, REFPROPERTYK { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p)->(%p %p): stub\n", This, key, value); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI propertystore_Commit(IPropertyStore *iface) { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p): stub\n", This); - return E_NOTIMPL; + return S_OK; } static const IPropertyStoreVtbl propertystorevtbl = { -- 2.7.4

1 0

[PATCH] wintrust: Add parameter check in WTHelperGetProvCertFromChain
by Alistair Leslie-Hughes 18 Apr '18

18 Apr '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wintrust/tests/softpub.c | 9 +++++++++ dlls/wintrust/wintrust_main.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 6e7913f710..eb72512ddc 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -929,6 +929,14 @@ static void test_get_known_usages(void) "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } +static void test_WTHelperGetProvCertFromChain(void) +{ + CRYPT_PROVIDER_CERT *cert; + + cert = WTHelperGetProvCertFromChain(NULL, 0); + ok(!cert, "got certificate\n"); +} + START_TEST(softpub) { InitFunctionPtrs(); @@ -936,4 +944,5 @@ START_TEST(softpub) test_sip_create_indirect_data(); test_wintrust(); test_get_known_usages(); + test_WTHelperGetProvCertFromChain(); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 58e3ac39c0..bb5228286f 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -787,7 +787,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( TRACE("(%p %d)\n", pSgnr, idxCert); - if (idxCert >= pSgnr->csCertChain || !pSgnr->pasCertChain) + if (!pSgnr || idxCert >= pSgnr->csCertChain || !pSgnr->pasCertChain) return NULL; cert = &pSgnr->pasCertChain[idxCert]; TRACE("returning %p\n", cert); -- 2.17.0

1 0

[PATCH] dxgi: Return S_OK in GetMaximumFrameLatency
by Alistair Leslie-Hughes 18 Apr '18

18 Apr '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dxgi/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index c266caea2f..ee5f3e6434 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -262,7 +262,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_SetMaximumFrameLatency(IWineDXGIDev if (max_latency > DXGI_FRAME_LATENCY_MAX) return DXGI_ERROR_INVALID_CALL; - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDevice *iface, UINT *max_latency) -- 2.17.0

1 0

[PATCH] kernel32: Implement GetCurrencyFormatEx
by Alistair Leslie-Hughes 18 Apr '18

18 Apr '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 13 +++++++++++++ include/winnls.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7470d2b60b..e78c1ca8ab 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -621,7 +621,7 @@ @ stdcall GetConsoleTitleW(ptr long) @ stdcall GetConsoleWindow() @ stdcall GetCurrencyFormatA(long long str ptr str long) -# @ stub GetCurrencyFormatEx +@ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) @ stdcall GetCurrencyFormatW(long long str ptr str long) @ stdcall GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index ecadd435d4..aeb48c6ea0 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1756,6 +1756,19 @@ error: return 0; } +/*********************************************************************** + * GetCurrencyFormatEx (KERNEL32.@) + */ +int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value, + const CURRENCYFMTW *format, LPWSTR str, int len) +{ + TRACE("(%s,0x%08x,%s,%p,%p,%d)\n", debugstr_w(localename), flags, + debugstr_w(value), format, str, len); + + return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len); +} + + /* FIXME: Everything below here needs to move somewhere else along with the * other EnumXXX functions, when a method for storing resources for * alternate calendars is determined. diff --git a/include/winnls.h b/include/winnls.h index 99a30e4677..7475f97051 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -896,6 +896,7 @@ WINBASEAPI INT WINAPI GetCalendarInfoA(LCID,DWORD,DWORD,LPSTR,INT,LPDWOR WINBASEAPI INT WINAPI GetCalendarInfoW(LCID,DWORD,DWORD,LPWSTR,INT,LPDWORD); #define GetCalendarInfo WINELIB_NAME_AW(GetCalendarInfo) WINBASEAPI INT WINAPI GetCurrencyFormatA(LCID,DWORD,LPCSTR,const CURRENCYFMTA*,LPSTR,INT); +WINBASEAPI INT WINAPI GetCurrencyFormatEx(LPCWSTR,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,int); WINBASEAPI INT WINAPI GetCurrencyFormatW(LCID,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,INT); #define GetCurrencyFormat WINELIB_NAME_AW(GetCurrencyFormat) WINBASEAPI INT WINAPI GetDateFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT); -- 2.17.0

1 0

[PATCH] winebus.sys: Fix a typo in a comment.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/bus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 0b378015584..bf93c04259f 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -18,7 +18,7 @@ typedef int(*enum_func)(DEVICE_OBJECT *device, void *context); -/* Busses */ +/* Buses */ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; -- 2.17.0

2 1

[PATCH] kernel32/tests: Add a trailing '\n' to an ok() call.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b9b36d8a132..91a870362c3 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5612,7 +5612,7 @@ static void test_NormalizeString(void) todo_wine { dstlen = pNormalizeString( NormalizationD, ptest->str, -1, dst, 1 ); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER\n"); } /* -- 2.17.0

1 0

[PATCH] wsdapi: Make send_udp_multicast_of_type() static.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsdapi/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index bea63fb67e3..f86b3b4a3e0 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -98,7 +98,7 @@ static DWORD WINAPI sending_thread(LPVOID lpParam) return 0; } -BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, ULONG family) +static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, ULONG family) { IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_addr; static const struct in6_addr i_addr_zero; -- 2.17.0

1 0

[PATCH] bthprops.cpl: Remove an unused NONAMELESSUNION directive.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/bthprops.cpl/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 02ee371f1d7..d670f2e358a 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -19,8 +19,6 @@ * */ -#define NONAMELESSUNION - #include <stdarg.h> #include <windef.h> #include <winbase.h> -- 2.17.0

1 0

[PATCH] amstream: Remove an unused NONAMELESSSTRUCT directive.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/amstream/mediastream.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 58f9f204b32..787690d9bc7 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -19,7 +19,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include <stdarg.h> -- 2.17.0

1 0

[PATCH] user32: Fix the name of an unused debugging function.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/exticon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index a16ae522c7e..a03cc6071bb 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -89,7 +89,7 @@ typedef struct #include "poppack.h" #if 0 -static void dumpIcoDirEnty ( LPicoICONDIRENTRY entry ) +static void dumpIcoDirEntry ( LPicoICONDIRENTRY entry ) { TRACE("width = 0x%08x height = 0x%08x\n", entry->bWidth, entry->bHeight); TRACE("colors = 0x%08x planes = 0x%08x\n", entry->bColorCount, entry->wPlanes); -- 2.17.0

1 0

[PATCH] winevulkan: Tweak the wording of a comment.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7d84cfb375d..f0583b40038 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -576,7 +576,7 @@ class VkFunction(object): Args prefix (str, optional): prefix to prepend to entry point name. - symbol (str, optional): allows to override function name implementing entry point. + symbol (str, optional): allows overriding the name of the function implementing the entry point. """ spec = "" -- 2.17.0

1 0

[PATCH] makefiles: Make it possible to only build the tests.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This can be used by the TestBot to simplify how we build the Windows test executables while avoiding to build all the Windows dlls. Makefile.in | 3 ++- tools/makedep.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6b65fdfb8c0..07cbcd8e49d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,8 @@ # all (default): build wine # clean: remove all intermediate files # distclean: also remove all files created by configure -# test: run tests +# buildtests: build tests +# test: build and run tests # testclean: clean test results to force running all tests again # crosstest: build tests as native windows applications (requires MinGW) # install-lib: install libraries needed to run applications diff --git a/tools/makedep.c b/tools/makedep.c index c9ab24da790..eff039e8518 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3578,9 +3578,10 @@ static void output_subdirs( struct makefile *make ) } if (winetest_deps.count) { - output( "programs/winetest:" ); + output( "buildtests:" ); output_filenames( winetest_deps ); output( "\n" ); + output( "programs/winetest: buildtests\n" ); output( "check test:" ); for (i = 0; i < winetest_deps.count; i++) { -- 2.17.0

1 0

[v2 PATCH 2/2] advapi32/tests: Add basic tests for BuildSecurityDescriptor.
by Alistair Leslie-Hughes 18 Apr '18

18 Apr '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Removed an invalid test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/tests/security.c | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6ef6c41650..35fd032a84 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7316,6 +7316,42 @@ static void test_GetExplicitEntriesFromAclW(void) HeapFree(GetProcessHeap(), 0, old_acl); } +static void test_BuildSecurityDescriptorW(void) +{ + SECURITY_DESCRIPTOR old_sd, *new_sd, *rel_sd; + ULONG new_sd_size; + DWORD buf_size; + char buf[1024]; + BOOL success; + DWORD ret; + + InitializeSecurityDescriptor(&old_sd, SECURITY_DESCRIPTOR_REVISION); + + buf_size = sizeof(buf); + rel_sd = (SECURITY_DESCRIPTOR *)buf; + success = MakeSelfRelativeSD(&old_sd, rel_sd, &buf_size); + ok(success, "MakeSelfRelativeSD failed with %u\n", GetLastError()); + + new_sd = NULL; + new_sd_size = 0; + ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, NULL, &new_sd_size, (void **)&new_sd); + ok(ret == ERROR_SUCCESS, "BuildSecurityDescriptor failed with %u\n", ret); + ok(new_sd != NULL, "expected new_sd != NULL\n"); + LocalFree(new_sd); + + new_sd = (void *)0xdeadbeef; + ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, &old_sd, &new_sd_size, (void **)&new_sd); + ok(ret == ERROR_INVALID_SECURITY_DESCR, "expected ERROR_INVALID_SECURITY_DESCR, got %u\n", ret); + ok(new_sd == (void *)0xdeadbeef, "expected new_sd == 0xdeadbeef, got %p\n", new_sd); + + new_sd = NULL; + new_sd_size = 0; + ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, rel_sd, &new_sd_size, (void **)&new_sd); + ok(ret == ERROR_SUCCESS, "BuildSecurityDescriptor failed with %u\n", ret); + ok(new_sd != NULL, "expected new_sd != NULL\n"); + LocalFree(new_sd); +} + START_TEST(security) { init(); @@ -7370,6 +7406,7 @@ START_TEST(security) test_maximum_allowed(); test_token_label(); test_GetExplicitEntriesFromAclW(); + test_BuildSecurityDescriptorW(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.17.0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel