April 2018 - Wine-Devel - list.winehq.org

[PATCH] user32: Fix using DrawTextEx() to calculate rect with flag DT_BOTTOM.
by Zhiyi Zhang April 17, 2018

April 17, 2018

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 | 46 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 48 insertions(+), 10 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..f0a882c343 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -808,7 +808,6 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, return NULL; } - /*********************************************************************** * TEXT_DrawUnderscore * @@ -874,17 +873,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 +967,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 +1003,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 +1097,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 1/2] dinput: The DIK_ key code should match the scan code.
by Dmitry Timoshkov April 17, 2018

April 17, 2018

This patch reverts commit 304ff3c7280a53b7cbadfa83eaeda458ff5959d1, and fixes multiple regressions caused by this change for non-US keyboards. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dinput/keyboard.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 4c3c38e7fc..e1ba15edd1 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -69,26 +69,10 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysKeyboardIm static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) { - static const BYTE asciiCodes[] = - {/*32*/ DIK_SPACE,0,0,0,0,0,0,DIK_APOSTROPHE, - /*40*/ 0,0,0,0,DIK_COMMA,DIK_MINUS,DIK_PERIOD,DIK_SLASH, - /*48*/ DIK_0,DIK_1,DIK_2,DIK_3,DIK_4,DIK_5,DIK_6,DIK_7, - /*56*/ DIK_8,DIK_9,DIK_COLON,DIK_SEMICOLON,0,DIK_EQUALS,0,0, - /*64*/ DIK_AT,DIK_A,DIK_B,DIK_C,DIK_D,DIK_E,DIK_F,DIK_G, - /*72*/ DIK_H,DIK_I,DIK_J,DIK_K,DIK_L,DIK_M,DIK_N,DIK_O, - /*80*/ DIK_P,DIK_Q,DIK_R,DIK_S,DIK_T,DIK_U,DIK_V,DIK_W, - /*88*/ DIK_X,DIK_Y,DIK_Z,DIK_LBRACKET,0,DIK_RBRACKET,DIK_CIRCUMFLEX,DIK_UNDERLINE} /*95*/ ; - - BYTE out_code = 0; - WCHAR c = MapVirtualKeyW(vkCode,MAPVK_VK_TO_CHAR); - - if (c > 31 && c < 96) - out_code = asciiCodes[c - 32]; - - if (out_code == 0) - out_code = scanCode; - - return out_code; + if (!scanCode) + scanCode = MapVirtualKeyW(vkCode, MAPVK_VK_TO_VSC); + + return scanCode; } static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) -- 2.16.3

2 1

[PATCH v14 1/3] wmp: Add seeking and duration
by Anton Romanov April 17, 2018

April 17, 2018

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- Changed test media file that works more consistently across all windows VMs as far as duration goes. Hopefully this'll help different versions of gstreamer as well. dlls/wmp/player.c | 65 +++++++++++++++++++++++++++++++++------- dlls/wmp/tests/media.c | 38 +++++++++++++++++++++++ dlls/wmp/tests/rsrc.rc | 2 +- dlls/wmp/tests/test.mp3 | Bin 240333 -> 240333 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..e327c1c213 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 = 15.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 >= 15.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) == 60 || broken(round(duration) == 57), + "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 +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..7ce8c4b687 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=r=48000:cl=4 -t 60 -acodec libmp3lame -aq 4 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..a8f22ce279cda0861cefe6851dcae0bced1372ad 100644 GIT binary patch literal 240333 zcmeIxVWgdP9Ki9X?nXsMMod)NB697zTaCn0m$o+1ZbrsTx%MKf#3W)&WJV%Il2WE6 ziHzBlD@`Oa#*{=N5s5^ataI*ObidzMn|9cX(a)AKk0|L^mh=YM|Z<D4xI%&r*5$8GaF zcFc`lR}I6|wmth7Hr_qGX?A*M{raW57f$ET%`Yy?3(GD07M>cdM$cV)YMA=q?O|%= zHP>Cg>W0-fuDR*vTi4!x$DPwNvv+N}=ibft&po(x`@@gS?|f|6?mbT|?0s_IGtcgS z?)euE9DMPmLx*2}<<-~Uc=N4y-aYdEhaY|X$+6=nK3)9$)R$j<{mtn!XTSaahaZ3X z`IldR`~8nU|N8r%@h6Xle0((I%<=(;wO4N*-y6?y^t0)mOY8qm=g+PFVwhSSu6l2D z?UrHKa9|i#Y`bs!+|n0)bbPRuE?xX-y#Km`+MkdA(a)BJV0{FizErzbrBYZIRT<b>z{ zZo>1oKY!56YyAJpXSoR1`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8F~F X_;{pC>Wi5FlJ(a)hP+utJWN&EZ(a)Ay;|i 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] imm32: Don't generate context unless the window handle is valid.
by Jimi Huotari April 17, 2018

April 17, 2018

Fixes https://bugs.winehq.org/show_bug.cgi?id=28861 If a context does not exist in the local storage already, it is automatically generated and returned to the application. If the handle is not owned by the process however, 'ImmGetContext()' should return 'NULL'. Thanks to: Mike Tedder Signed-off-by: Jimi Huotari <chiitoo(a)gentoo.org> --- dlls/imm32/imm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 685eb018c4..46bf5b45c8 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1509,7 +1509,7 @@ HIMC WINAPI ImmGetContext(HWND hWnd) rc = GetPropW(hWnd,szwWineIMCProperty); if (rc == (HIMC)-1) rc = NULL; - else if (rc == NULL) + else if (rc == NULL && IMM_IsCrossThreadAccess(hWnd, rc)) rc = get_default_context( hWnd ); if (rc) -- 2.17.0

2 2

[PATCH 7/7] schedsvc: Implement NetrJobAdd.
by Dmitry Timoshkov April 17, 2018

April 17, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 230 ++++++++++++++++++++++++++++++++++++++++- dlls/schedsvc/tests/atsvcapi.c | 1 - 2 files changed, 228 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index c4a4e9f421..6aa4ae0594 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -327,6 +327,180 @@ void add_job(const WCHAR *name) } } +static BOOL write_signature(HANDLE hfile) +{ + struct + { + USHORT SignatureVersion; + USHORT ClientVersion; + BYTE md5[64]; + } signature; + DWORD size; + + signature.SignatureVersion = 0x0001; + signature.ClientVersion = 0x0001; + memset(&signature.md5, 0, sizeof(signature.md5)); + + return WriteFile(hfile, &signature, sizeof(signature), &size, NULL); +} + +static BOOL write_reserved_data(HANDLE hfile) +{ + static const struct + { + USHORT size; + BYTE data[8]; + } user = { 8, { 0xff,0x0f,0x1d,0,0,0,0,0 } }; + DWORD size; + + return WriteFile(hfile, &user, sizeof(user), &size, NULL); +} + +static BOOL write_trigger(HANDLE hfile, const AT_INFO *info) +{ + USHORT count; + DWORD size; + SYSTEMTIME st; + TASK_TRIGGER trigger; + + count = 1; + if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) + return FALSE; + + GetSystemTime(&st); + if (!(info->Flags & JOB_ADD_CURRENT_DATE)) + { + /* FIXME: parse AT_INFO */ + } + + trigger.cbTriggerSize = sizeof(trigger); + trigger.Reserved1 = 0; + trigger.wBeginYear = st.wYear; + trigger.wBeginMonth = st.wMonth; + trigger.wBeginDay = st.wDay; + trigger.wEndYear = st.wYear; + trigger.wEndMonth = st.wMonth; + trigger.wEndDay = st.wDay; + trigger.wStartHour = st.wHour; + trigger.wStartMinute = st.wMinute; + trigger.MinutesDuration = 0; + trigger.MinutesInterval = 0; + /* FIXME */ + trigger.rgFlags = TASK_TRIGGER_FLAG_HAS_END_DATE; + trigger.TriggerType = TASK_TIME_TRIGGER_MONTHLYDATE; + trigger.Type.MonthlyDate.rgfDays = 0; + trigger.Type.MonthlyDate.rgfMonths = 0xffff; + trigger.Reserved2 = 0; + trigger.wRandomMinutesInterval = 0; + + return WriteFile(hfile, &trigger, sizeof(trigger), &size, NULL); +} + +static BOOL write_unicode_string(HANDLE hfile, const WCHAR *str) +{ + USHORT count; + DWORD size; + + count = str ? (lstrlenW(str) + 1) : 0; + if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) + return FALSE; + + if (!str) return TRUE; + + count *= sizeof(WCHAR); + return WriteFile(hfile, str, count, &size, NULL); +} + +static BOOL create_job(const WCHAR *job_name, const AT_INFO *info) +{ + static WCHAR authorW[] = { 'W','i','n','e',0 }; + static WCHAR commentW[] = { 'C','r','e','a','t','e','d',' ','b','y',' ','W','i','n','e',0 }; + FIXDLEN_DATA fixed; + USHORT word; + HANDLE hfile; + DWORD size, ver; + BOOL ret = FALSE; + + TRACE("trying to create job %s\n", debugstr_w(job_name)); + hfile = CreateFileW(job_name, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + return FALSE; + + ver = GetVersion(); + fixed.product_version = MAKEWORD(ver >> 8, ver); + fixed.file_version = 0x0001; + UuidCreate(&fixed.uuid); + fixed.name_size_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ + fixed.trigger_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ + fixed.trigger_offset += sizeof(USHORT) + (lstrlenW(info->Command) + 1) * sizeof(WCHAR); /* Application Name */ + fixed.trigger_offset += sizeof(USHORT); /* Parameters */ + fixed.trigger_offset += sizeof(USHORT); /* Working Directory */ + fixed.trigger_offset += sizeof(USHORT) + (lstrlenW(authorW) + 1) * sizeof(WCHAR); /* Author */ + fixed.trigger_offset += sizeof(USHORT) + (lstrlenW(commentW) + 1) * sizeof(WCHAR); /* Comment */ + fixed.trigger_offset += sizeof(USHORT); /* User Data */ + fixed.trigger_offset += 10; /* Reserved Data */ + fixed.error_retry_count = 0; + fixed.error_retry_interval = 0; + fixed.idle_deadline = 60; + fixed.idle_wait = 10; + fixed.priority = NORMAL_PRIORITY_CLASS; + fixed.maximum_runtime = 259200000; + fixed.exit_code = 0; + fixed.status = SCHED_S_TASK_HAS_NOT_RUN; + fixed.flags = TASK_FLAG_DELETE_WHEN_DONE; + if (!(info->Flags & JOB_NONINTERACTIVE)) + fixed.flags |= TASK_FLAG_INTERACTIVE; + /* FIXME: add other flags */ + memset(&fixed.last_runtime, 0, sizeof(fixed.last_runtime)); + + if (!WriteFile(hfile, &fixed, sizeof(fixed), &size, NULL)) + goto failed; + + /* Instance Count */ + word = 0; + if (!WriteFile(hfile, &word, sizeof(word), &size, NULL)) + goto failed; + /* Application Name */ + if (!write_unicode_string(hfile, info->Command)) + goto failed; + /* Parameters */ + if (!write_unicode_string(hfile, NULL)) + goto failed; + /* Working Directory */ + if (!write_unicode_string(hfile, NULL)) + goto failed; + /* Author */ + if (!write_unicode_string(hfile, authorW)) + goto failed; + /* Comment */ + if (!write_unicode_string(hfile, commentW)) + goto failed; + + /* User Data */ + word = 0; + if (!WriteFile(hfile, &word, sizeof(word), &size, NULL)) + goto failed; + + /* Reserved Data */ + if (!write_reserved_data(hfile)) + goto failed; + + /* Trigegrs */ + if (!write_trigger(hfile, info)) + goto failed; + + /* Signature */ + if (!write_signature(hfile)) + goto failed; + + ret = TRUE; + +failed: + CloseHandle(hfile); + if (!ret) DeleteFileW(job_name); + return ret; +} + static struct job_t *find_job(DWORD jobid, const WCHAR *name) { struct job_t *job; @@ -357,8 +531,60 @@ void remove_job(const WCHAR *name) DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) { - FIXME("%s,%p,%p: stub\n", debugstr_w(server_name), info, jobid); - return ERROR_NOT_SUPPORTED; + WCHAR windir[MAX_PATH]; + + TRACE("%s,%p,%p\n", debugstr_w(server_name), info, jobid); + + GetWindowsDirectoryW(windir, MAX_PATH); + + for (;;) + { + static const WCHAR fmtW[] = { '\\','T','a','s','k','s','\\','A','t','%','u','.','j','o','b',0 }; + WCHAR task_name[MAX_PATH], name[32]; + + strcpyW(task_name, windir); + sprintfW(name, fmtW, current_jobid); + strcatW(task_name, name); + if (create_job(task_name, info)) + { + struct job_t *job; + int i; + + for (i = 0; i < 5; i++) + { + EnterCriticalSection(&at_job_list_section); + job = find_job(0, task_name); + LeaveCriticalSection(&at_job_list_section); + + if (job) + { + *jobid = job->info.JobId; + break; + } + + Sleep(50); + } + + if (!job) + { + ERR("couldn't find just created job %s\n", debugstr_w(task_name)); + return ERROR_FILE_NOT_FOUND; + } + + break; + } + + if (GetLastError() != ERROR_FILE_EXISTS) + { + + TRACE("create_job error %u\n", GetLastError()); + return GetLastError(); + } + + InterlockedIncrement(&current_jobid); + } + + return ERROR_SUCCESS; } DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index d429232913..2226480a35 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -91,7 +91,6 @@ START_TEST(atsvcapi) win_skip("NetrJobAdd: Access denied, skipping the tests\n"); goto skip_tests; } -todo_wine ok(ret == ERROR_SUCCESS || broken(ret == ERROR_NOT_SUPPORTED) /* Win8+ */, "NetrJobAdd error %u\n", ret); if (ret == ERROR_NOT_SUPPORTED) { -- 2.16.3

1 0

[PATCH 6/7] schedsvc: Implement NetrJobDel.
by Dmitry Timoshkov April 17, 2018

April 17, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 140911d46f..c4a4e9f421 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -363,8 +363,35 @@ DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) { - FIXME("%s,%u,%u: stub\n", debugstr_w(server_name), min_jobid, max_jobid); - return ERROR_NOT_SUPPORTED; + DWORD jobid, ret = ERROR_FILE_NOT_FOUND; + + TRACE("%s,%u,%u\n", debugstr_w(server_name), min_jobid, max_jobid); + + EnterCriticalSection(&at_job_list_section); + + for (jobid = min_jobid; jobid <= max_jobid; jobid++) + { + struct job_t *job = find_job(jobid, NULL); + + if (!job) + { + TRACE("job %u not found\n", jobid); + ret = ERROR_FILE_NOT_FOUND; + break; + } + + TRACE("deleting job %s\n", debugstr_w(job->name)); + if (!DeleteFileW(job->name)) + { + ret = GetLastError(); + break; + } + + ret = ERROR_SUCCESS; + } + + LeaveCriticalSection(&at_job_list_section); + return ret; } static void free_container(AT_ENUM_CONTAINER *container) -- 2.16.3

1 0

[PATCH 5/7] schedsvc: Implement NetrJobEnum.
by Dmitry Timoshkov April 17, 2018

April 17, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index a602e4d070..140911d46f 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -367,11 +367,67 @@ DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jo return ERROR_NOT_SUPPORTED; } +static void free_container(AT_ENUM_CONTAINER *container) +{ + DWORD i; + + for (i = 0; i < container->EntriesRead; i++) + heap_free(container->Buffer[i].Command); + + heap_free(container->Buffer); +} + DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container, DWORD max_length, DWORD *total, DWORD *resume) { - FIXME("%s,%p,%u,%p,%p: stub\n", debugstr_w(server_name), container, max_length, total, resume); - return ERROR_NOT_SUPPORTED; + DWORD allocated; + struct job_t *job; + + TRACE("%s,%p,%u,%p,%p\n", debugstr_w(server_name), container, max_length, total, resume); + + *total = 0; + *resume = 0; + container->EntriesRead = 0; + + allocated = 64; + container->Buffer = heap_alloc(allocated * sizeof(AT_ENUM)); + if (!container->Buffer) return ERROR_NOT_ENOUGH_MEMORY; + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if (container->EntriesRead >= max_length) + { + *resume = container->EntriesRead; + break; + } + + if (allocated <= container->EntriesRead) + { + AT_ENUM *new_buffer; + + allocated *= 2; + new_buffer = heap_realloc(container->Buffer, allocated * sizeof(AT_ENUM)); + if (!new_buffer) + { + free_container(container); + LeaveCriticalSection(&at_job_list_section); + return ERROR_NOT_ENOUGH_MEMORY; + } + container->Buffer = new_buffer; + } + + container->Buffer[container->EntriesRead] = job->info; + container->Buffer[container->EntriesRead].Command = heap_strdupW(job->info.Command); + container->EntriesRead++; + } + + LeaveCriticalSection(&at_job_list_section); + + *total = container->EntriesRead; + + return ERROR_SUCCESS; } DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **info) -- 2.16.3

1 0

[PATCH 4/7] schedsvc: Implement NetrJobGetInfo.
by Dmitry Timoshkov April 17, 2018

April 17, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 97ca75e21d..a602e4d070 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -376,6 +376,30 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **info) { - FIXME("%s,%u,%p: stub\n", debugstr_w(server_name), jobid, info); - return ERROR_NOT_SUPPORTED; + struct job_t *job; + DWORD ret = ERROR_SUCCESS; + + TRACE("%s,%u,%p\n", debugstr_w(server_name), jobid, info); + + EnterCriticalSection(&at_job_list_section); + + job = find_job(jobid, NULL); + if (job) + { + AT_INFO *info_ret = heap_alloc(sizeof(*info_ret)); + if (!info_ret) + ret = ERROR_NOT_ENOUGH_MEMORY; + else + { + info_ret->JobTime = job->info.JobTime; + info_ret->DaysOfMonth = job->info.DaysOfMonth; + info_ret->DaysOfWeek = job->info.DaysOfWeek; + info_ret->Flags = job->info.Flags; + info_ret->Command = heap_strdupW(job->info.Command); + *info = info_ret; + } + } + + LeaveCriticalSection(&at_job_list_section); + return ret; } -- 2.16.3

1 0

[PATCH 3/7] schedsvc: Remove job from the list when job file is deleted.
by Dmitry Timoshkov April 17, 2018

April 17, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 28 ++++++++++++++++++++++++++++ dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 8 ++++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 1482dfdf8c..97ca75e21d 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -327,6 +327,34 @@ void add_job(const WCHAR *name) } } +static struct job_t *find_job(DWORD jobid, const WCHAR *name) +{ + struct job_t *job; + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if ((name && !lstrcmpiW(job->name, name)) || job->info.JobId == jobid) + return job; + } + + return NULL; +} + +void remove_job(const WCHAR *name) +{ + struct job_t *job; + + EnterCriticalSection(&at_job_list_section); + job = find_job(0, name); + if (job) + { + list_remove(&job->entry); + heap_free(job->name); + heap_free(job); + } + LeaveCriticalSection(&at_job_list_section); +} + DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) { FIXME("%s,%p,%p: stub\n", debugstr_w(server_name), info, jobid); diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 1e5d575d70..215bba003e 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -24,6 +24,7 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; void add_job(const WCHAR *name) DECLSPEC_HIDDEN; +void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 0835d71b42..1ccc34529b 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -91,6 +91,14 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) add_job(path); break; + case FILE_ACTION_REMOVED: + TRACE("FILE_ACTION_REMOVED %s\n", debugstr_w(info.data.FileName)); + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, tasksW); + lstrcatW(path, info.data.FileName); + remove_job(path); + break; + default: FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); break; -- 2.16.3

1 0

[PATCH 2/7] schedsvc: Add support for reading .job files.
by Dmitry Timoshkov April 17, 2018

April 17, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 301 +++++++++++++++++++++++++++++++++++++++ dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 9 ++ include/mstask.idl | 14 ++ 4 files changed, 325 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 6bb8d4c707..1482dfdf8c 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -22,10 +22,311 @@ #include "windef.h" #include "atsvc.h" +#include "mstask.h" +#include "wine/list.h" #include "wine/debug.h" +#include "schedsvc_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); +/* lmat.h defines those, but other types in that file conflict + * with generated atsvc.h typedefs. + */ +#define JOB_ADD_CURRENT_DATE 0x08 +#define JOB_NONINTERACTIVE 0x10 + +typedef struct +{ + USHORT product_version; + USHORT file_version; + UUID uuid; + USHORT name_size_offset; + USHORT trigger_offset; + USHORT error_retry_count; + USHORT error_retry_interval; + USHORT idle_deadline; + USHORT idle_wait; + UINT priority; + UINT maximum_runtime; + UINT exit_code; + UINT status; + UINT flags; + SYSTEMTIME last_runtime; +} FIXDLEN_DATA; + +struct job_t +{ + struct list entry; + WCHAR *name; + AT_ENUM info; +}; + +static LONG current_jobid = 1; + +static struct list at_job_list = LIST_INIT(at_job_list); +static CRITICAL_SECTION at_job_list_section; +static CRITICAL_SECTION_DEBUG cs_debug = +{ + 0, 0, &at_job_list_section, + { &cs_debug.ProcessLocksList, &cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": at_job_list_section") } +}; +static CRITICAL_SECTION at_job_list_section = { &cs_debug, -1, 0, 0, 0, 0 }; + +static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) +{ + DWORD i, data_size = 0; + USHORT len; + + for (i = 0; i < 5; i++) + { + if (limit < sizeof(USHORT)) + { + TRACE("invalid string %u offset\n", i); + break; + } + + len = *(USHORT *)data; + data += sizeof(USHORT); + data_size += sizeof(USHORT); + limit -= sizeof(USHORT); + if (limit < len * sizeof(WCHAR)) + { + TRACE("invalid string %u size\n", i); + break; + } + + TRACE("string %u: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); + + if (i == 0) + info->Command = heap_strdupW((const WCHAR *)data); + + data += len * sizeof(WCHAR); + data_size += len * sizeof(WCHAR); + } + + return data_size; +} + +/* FIXME: read more data, currently only Command is handled */ +static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) +{ + const FIXDLEN_DATA *fixed; + const SYSTEMTIME *st; + DWORD unicode_strings_size, data_size, triggers_size; + USHORT instance_count, triggers_count, i; + const USHORT *signature; + const TASK_TRIGGER *trigger; + + memset(info, 0, sizeof(*info)); + + if (size < sizeof(*fixed)) + { + TRACE("no space for FIXDLEN_DATA\n"); + return FALSE; + } + + fixed = (const FIXDLEN_DATA *)data; + + TRACE("product_version %04x\n", fixed->product_version); + TRACE("file_version %04x\n", fixed->file_version); + TRACE("uuid %s\n", wine_dbgstr_guid(&fixed->uuid)); + + TRACE("name_size_offset %04x\n", fixed->name_size_offset); + TRACE("trigger_offset %04x\n", fixed->trigger_offset); + TRACE("error_retry_count %u\n", fixed->error_retry_count); + TRACE("error_retry_interval %u\n", fixed->error_retry_interval); + TRACE("idle_deadline %u\n", fixed->idle_deadline); + TRACE("idle_wait %u\n", fixed->idle_wait); + TRACE("priority %08x\n", fixed->priority); + TRACE("maximum_runtime %u\n", fixed->maximum_runtime); + TRACE("exit_code %#x\n", fixed->exit_code); + TRACE("status %08x\n", fixed->status); + TRACE("flags %08x\n", fixed->flags); + st = &fixed->last_runtime; + TRACE("last_runtime %d/%d/%d wday %d %d:%d:%d.%03d\n", + st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, + st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); + + /* Instance Count */ + if (size < sizeof(*fixed) + sizeof(USHORT)) + { + TRACE("no space for instance count\n"); + return FALSE; + } + + instance_count = *(const USHORT *)(data + sizeof(*fixed)); + TRACE("instance count %u\n", instance_count); + + if (fixed->name_size_offset + sizeof(USHORT) < size) + unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, info); + else + { + TRACE("invalid name_size_offset\n"); + return FALSE; + } + TRACE("unicode strings end at %#x\n", fixed->name_size_offset + unicode_strings_size); + + if (size < fixed->trigger_offset + sizeof(USHORT)) + { + TRACE("no space for triggers count\n"); + return FALSE; + } + triggers_count = *(const USHORT *)(data + fixed->trigger_offset); + TRACE("triggers_count %u\n", triggers_count); + triggers_size = size - fixed->trigger_offset - sizeof(USHORT); + TRACE("triggers_size %u\n", triggers_size); + trigger = (const TASK_TRIGGER *)(data + fixed->trigger_offset + sizeof(USHORT)); + + data += fixed->name_size_offset + unicode_strings_size; + size -= fixed->name_size_offset + unicode_strings_size; + + /* User Data */ + if (size < sizeof(USHORT)) + { + TRACE("no space for user data size\n"); + return FALSE; + } + + data_size = *(const USHORT *)data; + if (size < sizeof(USHORT) + data_size) + { + TRACE("no space for user data\n"); + return FALSE; + } + TRACE("User Data size %#x\n", data_size); + + size -= sizeof(USHORT) + data_size; + data += sizeof(USHORT) + data_size; + + /* Reserved Data */ + if (size < sizeof(USHORT)) + { + TRACE("no space for reserved data size\n"); + return FALSE; + } + + data_size = *(const USHORT *)data; + if (size < sizeof(USHORT) + data_size) + { + TRACE("no space for reserved data\n"); + return FALSE; + } + TRACE("Reserved Data size %#x\n", data_size); + + size -= sizeof(USHORT) + data_size; + data += sizeof(USHORT) + data_size; + + /* Trigges Data */ + TRACE("trigger_offset %04x, triggers end at %04x\n", fixed->trigger_offset, + (DWORD)(fixed->trigger_offset + sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER))); + + triggers_count = *(const USHORT *)data; + TRACE("triggers_count %u\n", triggers_count); + trigger = (const TASK_TRIGGER *)(data + sizeof(USHORT)); + + if (triggers_count * sizeof(TASK_TRIGGER) > triggers_size) + { + TRACE("no space for triggers data\n"); + return FALSE; + } + + for (i = 0; i < triggers_count; i++) + { + TRACE("%u: cbTriggerSize = %#x\n", i, trigger[i].cbTriggerSize); + if (trigger[i].cbTriggerSize != sizeof(TASK_TRIGGER)) + TRACE("invalid cbTriggerSize\n"); + TRACE("Reserved1 = %#x\n", trigger[i].Reserved1); + TRACE("wBeginYear = %u\n", trigger->wBeginYear); + TRACE("wBeginMonth = %u\n", trigger->wBeginMonth); + TRACE("wBeginDay = %u\n", trigger->wBeginDay); + TRACE("wEndYear = %u\n", trigger->wEndYear); + TRACE("wEndMonth = %u\n", trigger->wEndMonth); + TRACE("wEndDay = %u\n", trigger->wEndDay); + TRACE("wStartHour = %u\n", trigger->wStartHour); + TRACE("wStartMinute = %u\n", trigger->wStartMinute); + TRACE("MinutesDuration = %u\n", trigger->MinutesDuration); + TRACE("MinutesInterval = %u\n", trigger->MinutesInterval); + TRACE("rgFlags = %u\n", trigger->rgFlags); + TRACE("TriggerType = %u\n", trigger->TriggerType); + TRACE("Reserved2 = %u\n", trigger->Reserved2); + TRACE("wRandomMinutesInterval = %u\n", trigger->wRandomMinutesInterval); + } + + size -= sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER); + data += sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER); + + if (size < 2 * sizeof(USHORT) + 64) + { + TRACE("no space for signature\n"); + return TRUE; /* signature is optional */ + } + + signature = (const USHORT *)data; + TRACE("signature version %04x, client version %04x\n", signature[0], signature[1]); + + return TRUE; +} + +void add_job(const WCHAR *name) +{ + HANDLE file, mapping; + DWORD size, try; + void *data; + struct job_t *job; + + job = heap_alloc_zero(sizeof(*job)); + if (!job) return; + + try = 1; + for (;;) + { + file = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + TRACE("Failed to open %s, error %u\n", debugstr_w(name), GetLastError()); + if (try++ >= 3) break; + Sleep(100); + continue; + } + + size = GetFileSize(file, NULL); + + mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, 0); + if (!mapping) + { + TRACE("Failed to create file mapping %s, error %u\n", debugstr_w(name), GetLastError()); + CloseHandle(file); + break; + } + + data = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + if (data) + { + if (load_job_data(data, size, &job->info)) + { + EnterCriticalSection(&at_job_list_section); + job->name = heap_strdupW(name); + job->info.JobId = current_jobid++; + list_add_tail(&at_job_list, &job->entry); + LeaveCriticalSection(&at_job_list_section); + } + UnmapViewOfFile(data); + } + + CloseHandle(mapping); + CloseHandle(file); + break; + } + + if (!job->info.JobId) + { + heap_free(job->info.Command); + heap_free(job); + } +} + DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) { FIXME("%s,%p,%p: stub\n", debugstr_w(server_name), info, jobid); diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 4404486998..1e5d575d70 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -23,6 +23,7 @@ #include "wine/unicode.h" void schedsvc_auto_start(void) DECLSPEC_HIDDEN; +void add_job(const WCHAR *name) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 3de025335c..0835d71b42 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -82,6 +82,15 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) switch (info.data.Action) { + case FILE_ACTION_ADDED: + TRACE("FILE_ACTION_ADDED %s\n", debugstr_w(info.data.FileName)); + + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, tasksW); + lstrcatW(path, info.data.FileName); + add_job(path); + break; + default: FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); break; diff --git a/include/mstask.idl b/include/mstask.idl index 0a79b79118..703ae01c27 100644 --- a/include/mstask.idl +++ b/include/mstask.idl @@ -55,6 +55,20 @@ cpp_quote("#define TASK_OCTOBER 0x200") cpp_quote("#define TASK_NOVEMBER 0x400") cpp_quote("#define TASK_DECEMBER 0x800") +cpp_quote("#define TASK_FLAG_INTERACTIVE 0x0001") +cpp_quote("#define TASK_FLAG_DELETE_WHEN_DONE 0x0002") +cpp_quote("#define TASK_FLAG_DISABLED 0x0004") +cpp_quote("#define TASK_FLAG_START_ONLY_IF_IDLE 0x0010") +cpp_quote("#define TASK_FLAG_KILL_ON_IDLE_END 0x0020") +cpp_quote("#define TASK_FLAG_DONT_START_IF_ON_BATTERIES 0x0040") +cpp_quote("#define TASK_FLAG_KILL_IF_GOING_ON_BATTERIES 0x0080") +cpp_quote("#define TASK_FLAG_RUN_ONLY_IF_DOCKED 0x0100") +cpp_quote("#define TASK_FLAG_HIDDEN 0x0200") +cpp_quote("#define TASK_FLAG_RUN_IF_CONNECTED_TO_INTERNET 0x0400") +cpp_quote("#define TASK_FLAG_RESTART_ON_IDLE_RESUME 0x0800") +cpp_quote("#define TASK_FLAG_SYSTEM_REQUIRED 0x1000") +cpp_quote("#define TASK_FLAG_RUN_ONLY_IF_LOGGED_ON 0x2000") + cpp_quote("#define TASK_TRIGGER_FLAG_HAS_END_DATE 0x1") cpp_quote("#define TASK_TRIGGER_FLAG_KILL_AT_DURATION_END 0x2") cpp_quote("#define TASK_TRIGGER_FLAG_DISABLED 0x4") -- 2.16.3

1 0