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

Andrey Gusev : mfplat: Add MFTEnumEx stub.
by Alexandre Julliard Aug. 16, 2017

Aug. 16, 2017

Module: wine Branch: master Commit: 67bc1db56b2d8db57414190b13ceb41ae1986318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67bc1db56b2d8db57414190b1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Aug 14 15:12:23 2017 +0300 mfplat: Add MFTEnumEx stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 14 ++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 3 +++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f71a595..e6616c8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -348,6 +348,20 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu } /*********************************************************************** + * MFTEnumEx (mfplat.@) + */ +HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, + UINT32 *pcount) +{ + FIXME("(%s, %x, %p, %p, %p, %p): stub\n", debugstr_guid(&category), flags, input_type, + output_type, activate, pcount); + + *pcount = 0; + return S_OK; +} + +/*********************************************************************** * MFTUnregister (mfplat.@) */ HRESULT WINAPI MFTUnregister(CLSID clsid) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 22b7254..efcb143 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -135,7 +135,7 @@ @ stdcall MFStartup(long long) @ stub MFStreamDescriptorProtectMediaType @ stdcall MFTEnum(int128 long ptr ptr ptr ptr ptr) -@ stub MFTEnumEx +@ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) @ stub MFTRegisterLocal diff --git a/include/mfapi.h b/include/mfapi.h index ccea990..2be0638 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -70,6 +70,9 @@ HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, CLSID **pclsids, UINT32 *pcount); +HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, + UINT32 *pcount); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput,

1 0

Robert Xiao : wined3d: Reduce timeout to avoid GL_TIMEOUT_EXPIRED on macOS.
by Alexandre Julliard Aug. 16, 2017

Aug. 16, 2017

Module: wine Branch: master Commit: b2303d90af34da3427d27302f40055c548cc657a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2303d90af34da3427d27302f… Author: Robert Xiao <brx(a)cs.cmu.edu> Date: Sat Aug 12 12:09:06 2017 -0400 wined3d: Reduce timeout to avoid GL_TIMEOUT_EXPIRED on macOS. Signed-off-by: Robert Xiao <brx(a)cs.cmu.edu> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index f1e7803..88f64bd 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -198,11 +198,12 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, if (gl_info->supported[ARB_SYNC]) { - /* Apple seems to be into arbitrary limits, and timeouts larger than - * 0xfffffffffffffbff immediately return GL_TIMEOUT_EXPIRED. We don't - * really care and can live with waiting a few μs less. (OS X 10.7.4). */ + /* Timeouts near 0xffffffffffffffff may immediately return GL_TIMEOUT_EXPIRED, + * possibly because macOS internally adds some slop to the timer. To avoid this, + * we use a large number that isn't near the point of overflow (macOS 10.12.5). + */ GLenum gl_ret = GL_EXTCALL(glClientWaitSync(fence->object.sync, - GL_SYNC_FLUSH_COMMANDS_BIT, ~(GLuint64)0xffff)); + GL_SYNC_FLUSH_COMMANDS_BIT, ~(GLuint64)0 >> 1)); checkGLcall("glClientWaitSync"); switch (gl_ret) @@ -212,7 +213,7 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, ret = WINED3D_FENCE_OK; break; - /* We don't expect a timeout for a ~584 year wait */ + /* We don't expect a timeout for a ~292 year wait */ default: ERR("glClientWaitSync returned %#x.\n", gl_ret); ret = WINED3D_FENCE_ERROR;

1 0

Rosanne DiMesio : Use bootstrap alert for test report error messages.
by Jeremy Newman Aug. 14, 2017

Aug. 14, 2017

Module: appdb Branch: master Commit: 8a2e0cacfeb6621d739a6531d2e8c6c0082431b8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8a2e0cacfeb6621d739a6531… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Aug 11 15:14:49 2017 -0500 Use bootstrap alert for test report error messages. Makes the error message(s) more noticeable. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/objectManager.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 2f19b64..50f5bf3 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1795,10 +1795,11 @@ class ObjectManager if($sErrors == PREVIEW_ENTRY) return TRUE; + echo "<div class='alert alert-danger' role='alert'>"; echo "<p class=\"error\">\n"; - echo "The following errors were found:\n"; + echo "<b>The following errors were found:</b>\n"; echo "<ul>$sErrors</ul>\n"; - echo "</p>"; + echo "</p></div>"; return TRUE; } else {

1 0

Rosanne DiMesio : Test report form formatting changes
by Jeremy Newman Aug. 14, 2017

Aug. 14, 2017

Module: appdb Branch: master Commit: cae08624a90f98493b4a3d765a922680eb990064 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=cae08624a90f98493b4a3d76… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Aug 11 15:14:00 2017 -0500 Test report form formatting changes Moves the Installs? and Runs? questions to the top of the form. Uses CSS to control the table stripes instead of setting each row's color manually. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- css/styles.css | 7 ++++++ include/testData.php | 66 ++++++++++++++++++++++++++++------------------------ 2 files changed, 43 insertions(+), 30 deletions(-) diff --git a/css/styles.css b/css/styles.css index 0ff3e35..adfd3b4 100644 --- a/css/styles.css +++ b/css/styles.css @@ -663,6 +663,13 @@ table.whq-table tbody tr td { table.whq-table tbody tr:nth-child(odd) td { background-color: #ddd; } +/* used for the test report form */ +table.whq-table-striped tbody tr:nth-child(odd) td { + background-color: #E0E0E0; +} +table.whq-table-striped tbody tr:nth-child(even) td { + background-color: #C0C0C0; +} /* box */ .box-title { diff --git a/include/testData.php b/include/testData.php index d1af688..38763c2 100644 --- a/include/testData.php +++ b/include/testData.php @@ -789,27 +789,41 @@ class testData{ $sName = version::fullName($this->iVersionId); echo html_frame_start("Test Form - $sName", "90%", "", 0); - echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; + + echo '<table class="whq-table whq-table-striped table-bordered" width="100%" border=0 cellpadding=2 cellspacing=0>'; + + // Installs + echo '<tr><td><b>Installs?</b></td><td>',"\n"; + testData::make_Installs_list("sInstalls", $this->sInstalls); + echo '  Installing is an important part of testing under Wine. Select N/A if there is no installer.</td></tr>',"\n"; + + // Runs + echo '<tr><td><b>Runs?</b></td><td>',"\n"; + testData::make_Runs_list("sRuns", $this->sRuns); + echo '</td></tr>',"\n"; // What works - echo '<tr valign=top><td class="color0"><b>What works</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks" class="wysiwyg">'; + echo '<tr valign=top><td><b>What works</b></td>',"\n"; + echo '<td><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks" class="wysiwyg">'; echo $this->shWhatWorks.'</textarea></p></td></tr>',"\n"; + // What Does not work - echo '<tr valign=top><td class=color1><b>What does not work</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt" class="wysiwyg">'; + echo '<tr valign=top><td><b>What does not work</b></td>',"\n"; + echo '<td><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt" class="wysiwyg">'; echo $this->shWhatDoesnt.'</textarea></p></td></tr>',"\n"; + // What was not tested - echo '<tr valign=top><td class=color0><b>What was not tested</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested" class="wysiwyg">'; + echo '<tr valign=top><td><b>What was not tested</b></td>',"\n"; + echo '<td><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested" class="wysiwyg">'; echo $this->shWhatNotTested.'</textarea></p></td></tr>',"\n"; + // Date Tested - echo '<tr valign=top><td class="color1"><b>Date tested </b></td>',"\n"; - echo '<td class="color0"><input type=text name="sTestedDate" value="'.$this->sTestedDate.'" size="20"></td></tr>',"\n"; - echo '<tr valign=top><td class="color1"></td><td class="color0"><p/>YYYY-MM-DD HH:MM:SS</td></tr>',"\n"; + echo '<tr valign=top><td><b>Date tested </b></td>',"\n"; + echo '<td><input type=text name="sTestedDate" value="'.$this->sTestedDate.'" size="20"><br>'; + echo 'YYYY-MM-DD HH:MM:SS</td></tr>',"\n"; // Version List - echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n"; + echo '<tr><td><b>Tested release</b></td><td>',"\n"; echo make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); // Give the user some information about our available versions echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span><br>"; @@ -822,28 +836,16 @@ class testData{ echo ' Wine-staging'; echo '</label>'; echo '</td></tr>',"\n"; - - // Installs - echo '<tr><td class=color0><b>Installs?</b></td><td class=color0>',"\n"; - testData::make_Installs_list("sInstalls", $this->sInstalls); - echo '  Installing is an important part of testing under Wine. Select N/A if there is no installer.</td></tr>',"\n"; - // Runs - echo '<tr><td class=color1><b>Runs?</b></td><td class=color0>',"\n"; - testData::make_Runs_list("sRuns", $this->sRuns); - echo '</td></tr>',"\n"; + // Rating - echo '<tr><td class="color0"><b>Rating</b></td><td class="color0">',"\n"; + echo '<tr><td><b>Rating</b></td><td>',"\n"; echo make_maintainer_rating_list("sTestedRating", $this->sTestedRating); echo '<a href="https://wiki.winehq.org/AppDB_Maintainer_Rating_Definitions" target="_blank">Rating definitions</a></td></tr>',"\n"; // extra comments - echo '<tr valign=top><td class="color1"><b>Extra comments</b></td>',"\n"; - echo '<td class="color0"><textarea name="sComments" id="extra_comments" rows=10 cols=65>'; + echo '<tr valign=top><td><b>Extra comments</b></td>',"\n"; + echo '<td><textarea name="sComments" id="extra_comments" rows=10 cols=65>'; echo $this->sComments.'</textarea></td></tr>',"\n"; - echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" >'; - echo '<input type="hidden" name="iTestingId" value="'.$this->iTestingId.'" >'; - echo '<input type="hidden" name="iTestDataId" value="'.$this->iTestingId.'" >'; - // Distribution $oDistribution = new distribution($this->iDistributionId); $sDistributionHelp = ""; @@ -859,9 +861,9 @@ class testData{ } } - echo '<tr valign=top><td class="color0"><b>Operating system</b></td class="color0">',"\n"; + echo '<tr valign=top><td><b>Operating system</b></td>',"\n"; - echo '<td class=color0>',"\n"; + echo '<td>',"\n"; echo $sDistributionHelp; distribution::make_distribution_list("iTestDistributionId", $this->iDistributionId); echo '</td></tr>',"\n"; @@ -873,7 +875,7 @@ class testData{ { if(getInput('bConfirmTestedVersionChange', $aClean) != 'true') { - echo '<tr><td class="color1"> </td><td class="color0">'; + echo '<tr><td> </td><td>'; echo 'You have changed the Wine version of the report. Are you sure you want to do this? Please submit a new test report for every Wine version you test; this is useful for tracking Wine\'s progress.<br>'; echo '<input type="checkbox" name="bConfirmTestedVersionChange" value="true"> '; echo 'Yes, I want to change the Wine version'; @@ -884,6 +886,10 @@ class testData{ } } + echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" >'; + echo '<input type="hidden" name="iTestingId" value="'.$this->iTestingId.'" >'; + echo '<input type="hidden" name="iTestDataId" value="'.$this->iTestingId.'" >'; + echo "</table>\n"; echo html_frame_end();

1 0

Austin English : user32: Add GetGestureInfo stub.
by Alexandre Julliard Aug. 12, 2017

Aug. 12, 2017

Module: wine Branch: master Commit: 797a746fc2a1b17d67b7423293e081e3e7171033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=797a746fc2a1b17d67b742329… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 7 14:04:09 2017 -0500 user32: Add GetGestureInfo stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 10 ++++++++++ include/winuser.h | 17 +++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 668a4a5..9407c34 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -295,6 +295,7 @@ @ stdcall GetFocus() @ stdcall GetForegroundWindow() @ stdcall GetGestureConfig(long long long ptr ptr long) +@ stdcall GetGestureInfo(long ptr) @ stdcall GetGUIThreadInfo(long ptr) @ stdcall GetGuiResources(long long) @ stdcall GetIconInfo(long ptr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ffb670c..382ca10 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4016,3 +4016,13 @@ BOOL WINAPI GetTouchInputInfo(HTOUCHINPUT handle, UINT count, TOUCHINPUT *ptr, i SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/***************************************************************************** + * GetGestureInfo (USER32.@) + */ +BOOL WINAPI GetGestureInfo(HGESTUREINFO handle, PGESTUREINFO ptr) +{ + FIXME("(%p %p): stub\n", handle, ptr); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/winuser.h b/include/winuser.h index e5b81d5..75bfe2b 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3321,6 +3321,22 @@ typedef struct tagTOUCHINPUT { } TOUCHINPUT, *PTOUCHINPUT; typedef TOUCHINPUT const * PCTOUCHINPUT; +/* Gesture definitions */ +DECLARE_HANDLE(HGESTUREINFO); + +typedef struct tagGESTUREINFO { + UINT cbSize; + DWORD dwFlags; + DWORD dwID; + HWND hwndTarget; + POINTS ptsLocation; + DWORD dwInstanceID; + DWORD dwSequenceID; + ULONGLONG ullArguments; + UINT cbExtraArgs; +} GESTUREINFO, *PGESTUREINFO; +typedef GESTUREINFO const * PCGESTUREINFO; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); @@ -3658,6 +3674,7 @@ WINUSERAPI UINT WINAPI GetDoubleClickTime(void); WINUSERAPI HWND WINAPI GetFocus(void); WINUSERAPI HWND WINAPI GetForegroundWindow(void); WINUSERAPI BOOL WINAPI GetGestureConfig(HWND,DWORD,DWORD,UINT*,GESTURECONFIG*,UINT); +WINUSERAPI BOOL WINAPI GetGestureInfo(HGESTUREINFO,PGESTUREINFO); WINUSERAPI BOOL WINAPI GetGUIThreadInfo(DWORD,GUITHREADINFO*); WINUSERAPI DWORD WINAPI GetGuiResources(HANDLE,DWORD); WINUSERAPI BOOL WINAPI GetIconInfo(HICON,PICONINFO);

1 0

Austin English : user32: Add UnregisterTouchWindow stub.
by Alexandre Julliard Aug. 12, 2017

Aug. 12, 2017

Module: wine Branch: master Commit: 9d6bcf3c8c1070903d331d4a2c7a05a797399430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6bcf3c8c1070903d331d4a2… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 7 14:04:07 2017 -0500 user32: Add UnregisterTouchWindow stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 10 ++++++++++ include/winuser.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4514877..e5ab049 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -751,6 +751,7 @@ @ stdcall UnregisterHotKey(long long) # @ stub UnregisterMessagePumpHook @ stdcall UnregisterPowerSettingNotification(ptr) +@ stdcall UnregisterTouchWindow(long) # @ stub UnregisterUserApiHook @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cbf2237..03d9ece 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3986,3 +3986,13 @@ BOOL WINAPI RegisterTouchWindow(HWND hwnd, ULONG flags) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/***************************************************************************** + * UnregisterTouchWindow (USER32.@) + */ +BOOL WINAPI UnregisterTouchWindow(HWND hwnd) +{ + FIXME("(%p): stub\n", hwnd); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/winuser.h b/include/winuser.h index ad786f3..6ef4c77 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4103,6 +4103,7 @@ WINUSERAPI BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE); WINUSERAPI BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY); WINUSERAPI BOOL WINAPI UnregisterHotKey(HWND,INT); WINUSERAPI BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY); +WINUSERAPI BOOL WINAPI UnregisterTouchWindow(HWND); WINUSERAPI BOOL WINAPI UpdateWindow(HWND); WINUSERAPI BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL); WINUSERAPI UINT WINAPI UserRealizePalette(HDC);

1 0

Austin English : user32: Add CloseTouchInputHandle/ GetTouchInputInfo stubs.
by Alexandre Julliard Aug. 12, 2017

Aug. 12, 2017

Module: wine Branch: master Commit: 24cea1b77baadf0d220618859cf37f0f46d5dd47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24cea1b77baadf0d220618859… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 7 14:04:08 2017 -0500 user32: Add CloseTouchInputHandle/GetTouchInputInfo stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 ++ dlls/user32/win.c | 20 ++++++++++++++++++++ include/winuser.h | 19 +++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index e5ab049..668a4a5 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -73,6 +73,7 @@ @ stdcall ClipCursor(ptr) @ stdcall CloseClipboard() @ stdcall CloseDesktop(long) +@ stdcall CloseTouchInputHandle(long) @ stdcall CloseWindow(long) @ stdcall CloseWindowStation(long) @ stdcall CopyAcceleratorTableA(long ptr long) @@ -375,6 +376,7 @@ @ stdcall GetThreadDesktop(long) @ stdcall GetTitleBarInfo(long ptr) @ stdcall GetTopWindow(long) +@ stdcall GetTouchInputInfo(long long ptr long) @ stdcall GetUpdateRect(long ptr long) @ stdcall GetUpdateRgn(long long long) @ stdcall GetUpdatedClipboardFormats(ptr long ptr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 03d9ece..ffb670c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3996,3 +3996,23 @@ BOOL WINAPI UnregisterTouchWindow(HWND hwnd) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/***************************************************************************** + * CloseTouchInputHandle (USER32.@) + */ +BOOL WINAPI CloseTouchInputHandle(HTOUCHINPUT handle) +{ + FIXME("(%p): stub\n", handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/***************************************************************************** + * GetTouchInputInfo (USER32.@) + */ +BOOL WINAPI GetTouchInputInfo(HTOUCHINPUT handle, UINT count, TOUCHINPUT *ptr, int size) +{ + FIXME("(%p %u %p %u): stub\n", handle, count, ptr, size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/winuser.h b/include/winuser.h index 6ef4c77..e5b81d5 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3304,6 +3304,23 @@ typedef enum ORIENTATION_PREFERENCE { ORIENTATION_PREFERENCE_PORTRAIT_FLIPPED = 0x8 } ORIENTATION_PREFERENCE; +/* Touch input definitions */ +DECLARE_HANDLE(HTOUCHINPUT); + +typedef struct tagTOUCHINPUT { + LONG x; + LONG y; + HANDLE hSource; + DWORD dwID; + DWORD dwFlags; + DWORD dwMask; + DWORD dwTime; + ULONG_PTR dwExtraInfo; + DWORD cxContact; + DWORD cyContact; +} TOUCHINPUT, *PTOUCHINPUT; +typedef TOUCHINPUT const * PCTOUCHINPUT; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); @@ -3422,6 +3439,7 @@ WINUSERAPI BOOL WINAPI ClientToScreen(HWND,LPPOINT); WINUSERAPI BOOL WINAPI ClipCursor(const RECT*); WINUSERAPI BOOL WINAPI CloseClipboard(void); WINUSERAPI BOOL WINAPI CloseDesktop(HDESK); +WINUSERAPI BOOL WINAPI CloseTouchInputHandle(HTOUCHINPUT); WINUSERAPI BOOL WINAPI CloseWindow(HWND); WINUSERAPI BOOL WINAPI CloseWindowStation(HWINSTA); WINUSERAPI INT WINAPI CopyAcceleratorTableA(HACCEL,LPACCEL,INT); @@ -3724,6 +3742,7 @@ WINUSERAPI DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,INT,INT,const INT WINUSERAPI BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO); WINUSERAPI HDESK WINAPI GetThreadDesktop(DWORD); WINUSERAPI HWND WINAPI GetTopWindow(HWND); +WINUSERAPI BOOL WINAPI GetTouchInputInfo(HTOUCHINPUT,UINT,TOUCHINPUT*,int); WINUSERAPI BOOL WINAPI GetUpdateRect(HWND,LPRECT,BOOL); WINUSERAPI INT WINAPI GetUpdateRgn(HWND,HRGN,BOOL); WINUSERAPI BOOL WINAPI GetUpdatedClipboardFormats(UINT*,UINT,UINT*);

1 0

Zebediah Figura : ieproxy: Add proxy/stub for IInternetExplorerManager.
by Alexandre Julliard Aug. 12, 2017

Aug. 12, 2017

Module: wine Branch: master Commit: 448ac0e9c439c5a8095e2e8a150997caebcb32ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=448ac0e9c439c5a8095e2e8a1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 10 13:52:31 2017 -0500 ieproxy: Add proxy/stub for IInternetExplorerManager. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/ieframe/ieframe.rgs | 7 +++++++ dlls/ieproxy/Makefile.in | 6 ++++++ dlls/ieproxy/ieproxy.spec | 10 +++++----- dlls/ieproxy/ieproxy_ieautomation.idl | 31 +++++++++++++++++++++++++++++++ 6 files changed, 51 insertions(+), 7 deletions(-) diff --git a/configure b/configure index b7b69c6..fd8d393 100755 --- a/configure +++ b/configure @@ -18388,7 +18388,7 @@ wine_fn_config_dll iccvid enable_iccvid clean wine_fn_config_dll icmp enable_icmp wine_fn_config_dll ieframe enable_ieframe clean,implib wine_fn_config_test dlls/ieframe/tests ieframe_test -wine_fn_config_dll ieproxy enable_ieproxy +wine_fn_config_dll ieproxy enable_ieproxy clean wine_fn_config_dll ifsmgr.vxd enable_win16 wine_fn_config_dll imaadp32.acm enable_imaadp32_acm wine_fn_config_dll imagehlp enable_imagehlp implib diff --git a/configure.ac b/configure.ac index 32215f2..7d52b24 100644 --- a/configure.ac +++ b/configure.ac @@ -3170,7 +3170,7 @@ WINE_CONFIG_DLL(iccvid,,[clean]) WINE_CONFIG_DLL(icmp) WINE_CONFIG_DLL(ieframe,,[clean,implib]) WINE_CONFIG_TEST(dlls/ieframe/tests) -WINE_CONFIG_DLL(ieproxy) +WINE_CONFIG_DLL(ieproxy,,[clean]) WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16) WINE_CONFIG_DLL(imaadp32.acm) WINE_CONFIG_DLL(imagehlp,,[implib]) diff --git a/dlls/ieframe/ieframe.rgs b/dlls/ieframe/ieframe.rgs index f99e6b6..0b48600 100644 --- a/dlls/ieframe/ieframe.rgs +++ b/dlls/ieframe/ieframe.rgs @@ -42,6 +42,13 @@ HKCR Control } } + NoRemove Interface + { + '{acc84351-04ff-44f9-b23f-655ed168c6d5}' + { + ProxyStubClsid32 = s '{a4a1a128-768f-41e0-bf75-e4fddd701cba}' + } + } 'InternetShortcut' { val 'EditFlags' = s '2' diff --git a/dlls/ieproxy/Makefile.in b/dlls/ieproxy/Makefile.in index b1722cd..c36a7f6 100644 --- a/dlls/ieproxy/Makefile.in +++ b/dlls/ieproxy/Makefile.in @@ -1 +1,7 @@ MODULE = ieproxy.dll +IMPORTS = uuid rpcrt4 + +IDL_SRCS = \ + ieproxy_ieautomation.idl + +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer diff --git a/dlls/ieproxy/ieproxy.spec b/dlls/ieproxy/ieproxy.spec index 98b0132..a1096f1 100644 --- a/dlls/ieproxy/ieproxy.spec +++ b/dlls/ieproxy/ieproxy.spec @@ -1,5 +1,5 @@ -3 stub GetProxyDllInfo -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +3 stdcall -private GetProxyDllInfo(ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/ieproxy/ieproxy_ieautomation.idl b/dlls/ieproxy/ieproxy_ieautomation.idl new file mode 100644 index 0000000..b53bcd7 --- /dev/null +++ b/dlls/ieproxy/ieproxy_ieautomation.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2017 Zebediah Figura for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for ieautomation.idl */ + +#pragma makedep ident +#pragma makedep proxy +#pragma makedep register + +#include "ieautomation.idl" + +[ + threading(both), + uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) /* IInternetExplorerManager */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Huw Davies : ws2_32: Don' t return synchronously if the connection is refused.
by Alexandre Julliard Aug. 12, 2017

Aug. 12, 2017

Module: wine Branch: master Commit: 2910dcea8997e51900055e44544ea7cfa5ad9c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2910dcea8997e51900055e445… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 8 08:34:30 2017 +0100 ws2_32: Don't return synchronously if the connection is refused. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 +++++++- dlls/ws2_32/tests/sock.c | 20 ++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9cae18f..06f1c26 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3586,7 +3586,13 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n /* If the connect already failed */ if (status == STATUS_PIPE_DISCONNECTED) - status = _get_sock_error(s, FD_CONNECT_BIT); + { + ov->Internal = _get_sock_error(s, FD_CONNECT_BIT); + ov->InternalHigh = 0; + if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh ); + if (ov->hEvent) NtSetEvent( ov->hEvent, NULL ); + status = STATUS_PENDING; + } SetLastError( NtStatusToWSAError(status) ); } } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 43008cf..897839a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7915,22 +7915,14 @@ static void test_ConnectEx(void) address.sin_port = htons(1); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); - ok(bret == FALSE && GetLastError(), "ConnectEx to bad destination failed: " + ok(bret == FALSE && GetLastError() == ERROR_IO_PENDING, "ConnectEx to bad destination failed: " "returned %d + errno %d\n", bret, GetLastError()); + dwret = WaitForSingleObject(overlapped.hEvent, 15000); + ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); - if (GetLastError() == ERROR_IO_PENDING) - { - dwret = WaitForSingleObject(overlapped.hEvent, 15000); - ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); - - bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); - ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, - "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); - } - else { - ok(GetLastError() == WSAECONNREFUSED, - "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); - } + bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); + ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, + "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); end: if (overlapped.hEvent)

1 0

Piotr Caban : gdiplus: Support GdipSetClipRegion in metafiles.
by Alexandre Julliard Aug. 12, 2017

Aug. 12, 2017

Module: wine Branch: master Commit: 14bb8df8a58ee3d3880f8a8c67aa53e38022a1de URL: http://source.winehq.org/git/wine.git/?a=commit;h=14bb8df8a58ee3d3880f8a8c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 10 20:56:19 2017 +0200 gdiplus: Support GdipSetClipRegion in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 7 ++++++ dlls/gdiplus/metafile.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/region.c | 2 +- dlls/gdiplus/tests/metafile.c | 12 +++++++++ 5 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 762aa13..3396676 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -93,6 +93,7 @@ extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetClipRect(GpMetafile* metafile, REAL x, REAL y, REAL width, REAL height, CombineMode mode) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_SetClipRegion(GpMetafile* metafile, GpRegion* region, CombineMode mode) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* transform) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) DECLSPEC_HIDDEN; @@ -124,6 +125,7 @@ extern void free_installed_fonts(void) DECLSPEC_HIDDEN; extern BOOL lengthen_path(GpPath *path, INT len) DECLSPEC_HIDDEN; +extern DWORD write_region_data(const GpRegion *region, void *data) DECLSPEC_HIDDEN; extern DWORD write_path_data(GpPath *path, void *data) DECLSPEC_HIDDEN; extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4b2ae49..e45618e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6269,6 +6269,13 @@ GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics *graphics, GpRegion *region, if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + status = METAFILE_SetClipRegion((GpMetafile*)graphics->image, region, mode); + if (status != Ok) + return status; + } + status = GdipCloneRegion(region, &clip); if (status == Ok) { diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 99e5483..41355bc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -239,6 +239,13 @@ typedef struct EmfPlusPath BYTE data[1]; } EmfPlusPath; +typedef struct EmfPlusRegion +{ + DWORD Version; + DWORD RegionNodeCount; + BYTE RegionNode[1]; +} EmfPlusRegion; + typedef enum { BitmapDataTypePixel, @@ -312,6 +319,7 @@ typedef struct EmfPlusObject EmfPlusBrush brush; EmfPlusPen pen; EmfPlusPath path; + EmfPlusRegion region; EmfPlusImage image; EmfPlusImageAttributes image_attributes; } ObjectData; @@ -847,6 +855,53 @@ GpStatus METAFILE_SetClipRect(GpMetafile* metafile, REAL x, REAL y, REAL width, return Ok; } +static GpStatus METAFILE_AddRegionObject(GpMetafile *metafile, GpRegion *region, DWORD *id) +{ + EmfPlusObject *object_record; + DWORD size; + GpStatus stat; + + *id = -1; + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + size = write_region_data(region, NULL); + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.region) + size, (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypeRegion << 8; + write_region_data(region, &object_record->ObjectData.region); + return Ok; +} + +GpStatus METAFILE_SetClipRegion(GpMetafile* metafile, GpRegion* region, CombineMode mode) +{ + EmfPlusRecordHeader *record; + DWORD region_id; + GpStatus stat; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + stat = METAFILE_AddRegionObject(metafile, region, &region_id); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, sizeof(*record), (void**)&record); + if (stat != Ok) return stat; + + record->Type = EmfPlusRecordTypeSetClipRegion; + record->Flags = region_id | mode << 8; + + METAFILE_WriteRecords(metafile); + return Ok; +} + GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) { if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index d133afa..015b677 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -699,7 +699,7 @@ static void write_element(const region_element* element, DWORD *buffer, } } -static DWORD write_region_data(const GpRegion *region, void *data) +DWORD write_region_data(const GpRegion *region, void *data) { struct region_header *header = data; INT filled = 0; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 26716c4..1d36d9e 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2154,6 +2154,8 @@ static const emfplus_record clipping_records[] = { {0, EmfPlusRecordTypeRestore}, {0, EmfPlusRecordTypeSetClipRect}, {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeObject, 1}, + {0, EmfPlusRecordTypeSetClipRegion, 1}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, {0} @@ -2165,6 +2167,7 @@ static void test_clipping(void) GpMetafile *metafile; GpGraphics *graphics; GpBitmap *bitmap; + GpRegion *region; GpBrush *brush; GpRectF rect; ARGB color; @@ -2231,6 +2234,15 @@ static void test_clipping(void) stat = GdipDeleteBrush(brush); expect(Ok, stat); + stat = GdipCreateRegionRect(&rect, &region); + expect(Ok, stat); + + stat = GdipSetClipRegion(graphics, region, CombineModeIntersect); + expect(Ok, stat); + + stat = GdipDeleteRegion(region); + expect(Ok, stat); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0