October 2020 - Wine-Commits

Huw Davies : riched20: Use a helper to find the next run.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: f9a82574c906129bdc4269a4972c4ef3dafd67d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9a82574c906129bdc4269a4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:51 2020 +0000 riched20: Use a helper to find the next run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 9e79eda274d..98ae352ab7b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1148,7 +1148,8 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, nChars -= nLen; cursor.nOffset = 0; - cursor.pRun = ME_FindItemFwd(cursor.pRun, diRun); + cursor.pRun = run_next_all_paras( &cursor.pRun->member.run ) ? + run_get_di( run_next_all_paras( &cursor.pRun->member.run ) ) : NULL; } heap_free(buffer);

1 0

Huw Davies : riched20: Use the paragraph from the cursor.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 6b9b7b2d0bed6c2dc022238084fb35815c3722c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b9b7b2d0bed6c2dc0222380… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:52 2020 +0000 riched20: Use the paragraph from the cursor. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/undo.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 72e3b74f4c8..d9c5d28d6dc 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -335,13 +335,11 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_set_para_fmt: { ME_Cursor tmp; - ME_DisplayItem *para; cursor_from_char_ofs( editor, undo->u.set_para_fmt.pos, &tmp ); - para = ME_FindItemBack(tmp.pRun, diParagraph); - add_undo_set_para_fmt( editor, &para->member.para ); - para->member.para.fmt = undo->u.set_para_fmt.fmt; - para->member.para.border = undo->u.set_para_fmt.border; - para_mark_rewrap( editor, &para->member.para ); + add_undo_set_para_fmt( editor, &tmp.pPara->member.para ); + tmp.pPara->member.para.fmt = undo->u.set_para_fmt.fmt; + tmp.pPara->member.para.border = undo->u.set_para_fmt.border; + para_mark_rewrap( editor, &tmp.pPara->member.para ); break; } case undo_set_char_fmt:

1 0

Michael Stefaniuc : sapi: Zero terminate some WCHAR strings.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: cc32682130b88decf506df6dceef426c51bd3c27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc32682130b88decf506df6d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:09 2020 +0100 sapi: Zero terminate some WCHAR strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/token.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b4a318b4ade..04fa3a25d6a 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -372,28 +372,28 @@ static HRESULT WINAPI token_category_EnumValues( ISpObjectTokenCategory *iface, static HRESULT parse_cat_id( const WCHAR *str, HKEY *root, const WCHAR **sub_key ) { - static const WCHAR HKLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\'}; - static const WCHAR HKCU[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\'}; struct table { const WCHAR *name; - int size; + unsigned int len; HKEY key; } table[] = { - { HKLM, sizeof(HKLM), HKEY_LOCAL_MACHINE }, - { HKCU, sizeof(HKCU), HKEY_CURRENT_USER }, +#define X(s) s, ARRAY_SIZE(s) - 1 + { X(L"HKEY_LOCAL_MACHINE\\"), HKEY_LOCAL_MACHINE }, + { X(L"HKEY_CURRENT_USER\\"), HKEY_CURRENT_USER }, { NULL } +#undef X }; struct table *ptr; int len = lstrlenW( str ); for (ptr = table; ptr->name; ptr++) { - if (len >= ptr->size / sizeof(ptr->name[0]) && !memcmp( str, ptr->name, ptr->size )) + if (len >= ptr->len && !wcsncmp( str, ptr->name, ptr->len )) { *root = ptr->key; - *sub_key = str + ptr->size / sizeof(ptr->name[0]); + *sub_key = str + ptr->len; return S_OK; } }

1 0

Huw Davies : riched20: Use a helper function to find the first row.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: b3b3624079da3efe24beb90ef88435042c79df9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3b3624079da3efe24beb90e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:50 2020 +0000 riched20: Use a helper function to find the first row. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d3bbbc9d672..d15c47b72aa 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -846,7 +846,7 @@ static void draw_table_borders( ME_Context *c, ME_Paragraph *para ) rowY = c->pt.y + para->pt.y; if (para->fmt.dwMask & PFM_SPACEBEFORE) rowY += ME_twips2pointsY(c, para->fmt.dySpaceBefore); - nHeight = ME_FindItemFwd( para_get_di( para ), diStartRow )->member.row.nHeight; + nHeight = para_first_row( para )->nHeight; rowBottom = rowY + nHeight; /* Draw horizontal lines */

1 0

Huw Davies : riched20: Pass para ptrs to the various para selection functions.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: da5082912816a346a89cc84de42f77426135f451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5082912816a346a89cc84d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:49 2020 +0000 riched20: Pass para ptrs to the various para selection functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 14 +++---- dlls/riched20/editor.h | 8 ++-- dlls/riched20/editstr.h | 2 +- dlls/riched20/paint.c | 48 +++++++++++++---------- dlls/riched20/para.c | 100 ++++++++++++++++++++++++------------------------ dlls/riched20/reader.c | 2 +- 7 files changed, 90 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da5082912816a346a89c…

1 0

Austin English : d3d8thk: Add stub dll.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: f242f0ef1d6a601959f6769b44fe554b5751c97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f242f0ef1d6a601959f6769b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 24 03:38:32 2020 -0500 d3d8thk: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/d3d8thk/Makefile.in | 8 +++++++ dlls/d3d8thk/d3d8thk.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8thk/d3d8thk_main.c | 42 ++++++++++++++++++++++++++++++++++ dlls/d3d8thk/version.rc | 26 +++++++++++++++++++++ 6 files changed, 135 insertions(+) diff --git a/configure b/configure index 2686af02232..6e1290b0cf0 100755 --- a/configure +++ b/configure @@ -1189,6 +1189,7 @@ enable_d3d10core enable_d3d11 enable_d3d12 enable_d3d8 +enable_d3d8thk enable_d3d9 enable_d3dcompiler_33 enable_d3dcompiler_34 @@ -20392,6 +20393,7 @@ wine_fn_config_makefile dlls/d3d12 enable_d3d12 wine_fn_config_makefile dlls/d3d12/tests enable_tests wine_fn_config_makefile dlls/d3d8 enable_d3d8 wine_fn_config_makefile dlls/d3d8/tests enable_tests +wine_fn_config_makefile dlls/d3d8thk enable_d3d8thk wine_fn_config_makefile dlls/d3d9 enable_d3d9 wine_fn_config_makefile dlls/d3d9/tests enable_tests wine_fn_config_makefile dlls/d3dcompiler_33 enable_d3dcompiler_33 diff --git a/configure.ac b/configure.ac index 372785ee0fd..331ae064bdc 100644 --- a/configure.ac +++ b/configure.ac @@ -3137,6 +3137,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d12) WINE_CONFIG_MAKEFILE(dlls/d3d12/tests) WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) +WINE_CONFIG_MAKEFILE(dlls/d3d8thk) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_33) diff --git a/dlls/d3d8thk/Makefile.in b/dlls/d3d8thk/Makefile.in new file mode 100644 index 00000000000..b84c8d171f1 --- /dev/null +++ b/dlls/d3d8thk/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3d8thk.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3d8thk_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3d8thk/d3d8thk.spec b/dlls/d3d8thk/d3d8thk.spec new file mode 100644 index 00000000000..30b01e4c672 --- /dev/null +++ b/dlls/d3d8thk/d3d8thk.spec @@ -0,0 +1,56 @@ +@ stub OsThunkD3dContextCreate +@ stub OsThunkD3dContextDestroy +@ stub OsThunkD3dContextDestroyAll +@ stub OsThunkD3dDrawPrimitives2 +@ stub OsThunkD3dValidateTextureStageState +@ stub OsThunkDdAddAttachedSurface +@ stub OsThunkDdAlphaBlt +@ stub OsThunkDdAttachSurface +@ stub OsThunkDdBeginMoCompFrame +@ stub OsThunkDdBlt +@ stub OsThunkDdCanCreateD3DBuffer +@ stub OsThunkDdCanCreateSurface +@ stub OsThunkDdColorControl +@ stub OsThunkDdCreateD3DBuffer +@ stub OsThunkDdCreateDirectDrawObject +@ stub OsThunkDdCreateMoComp +@ stub OsThunkDdCreateSurface +@ stub OsThunkDdCreateSurfaceEx +@ stub OsThunkDdCreateSurfaceObject +@ stub OsThunkDdDeleteDirectDrawObject +@ stub OsThunkDdDeleteSurfaceObject +@ stub OsThunkDdDestroyD3DBuffer +@ stub OsThunkDdDestroyMoComp +@ stub OsThunkDdDestroySurface +@ stub OsThunkDdEndMoCompFrame +@ stub OsThunkDdFlip +@ stub OsThunkDdFlipToGDISurface +@ stub OsThunkDdGetAvailDriverMemory +@ stub OsThunkDdGetBltStatus +@ stub OsThunkDdGetDC +@ stub OsThunkDdGetDriverInfo +@ stub OsThunkDdGetDriverState +@ stub OsThunkDdGetDxHandle +@ stub OsThunkDdGetFlipStatus +@ stub OsThunkDdGetInternalMoCompInfo +@ stub OsThunkDdGetMoCompBuffInfo +@ stub OsThunkDdGetMoCompFormats +@ stub OsThunkDdGetMoCompGuids +@ stub OsThunkDdGetScanLine +@ stub OsThunkDdLock +@ stub OsThunkDdLockD3D +@ stub OsThunkDdQueryDirectDrawObject +@ stub OsThunkDdQueryMoCompStatus +@ stub OsThunkDdReenableDirectDrawObject +@ stub OsThunkDdReleaseDC +@ stub OsThunkDdRenderMoComp +@ stub OsThunkDdResetVisrgn +@ stub OsThunkDdSetColorKey +@ stub OsThunkDdSetExclusiveMode +@ stub OsThunkDdSetGammaRamp +@ stub OsThunkDdSetOverlayPosition +@ stub OsThunkDdUnattachSurface +@ stub OsThunkDdUnlock +@ stub OsThunkDdUnlockD3D +@ stub OsThunkDdUpdateOverlay +@ stub OsThunkDdWaitForVerticalBlank diff --git a/dlls/d3d8thk/d3d8thk_main.c b/dlls/d3d8thk/d3d8thk_main.c new file mode 100644 index 00000000000..1d89cb48720 --- /dev/null +++ b/dlls/d3d8thk/d3d8thk_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d8thk); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3d8thk/version.rc b/dlls/d3d8thk/version.rc new file mode 100644 index 00000000000..444630a7745 --- /dev/null +++ b/dlls/d3d8thk/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3d8thk" +#define WINE_FILENAME_STR "d3d8thk.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : d3dim700: Add stub dll.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: edd00eb538259d85e5a1c58d857e7f2ec4700c41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edd00eb538259d85e5a1c58d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 25 01:22:14 2020 -0500 d3dim700: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/d3dim700/Makefile.in | 8 ++++++++ dlls/d3dim700/d3dim700.spec | 18 ++++++++++++++++++ dlls/d3dim700/d3dim700_main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dim700/version.rc | 26 ++++++++++++++++++++++++++ 6 files changed, 97 insertions(+) diff --git a/configure b/configure index 6e1290b0cf0..ac6a7985cc7 100755 --- a/configure +++ b/configure @@ -1205,6 +1205,7 @@ enable_d3dcompiler_43 enable_d3dcompiler_46 enable_d3dcompiler_47 enable_d3dim +enable_d3dim700 enable_d3drm enable_d3dx10_33 enable_d3dx10_34 @@ -20412,6 +20413,7 @@ wine_fn_config_makefile dlls/d3dcompiler_46 enable_d3dcompiler_46 wine_fn_config_makefile dlls/d3dcompiler_47 enable_d3dcompiler_47 wine_fn_config_makefile dlls/d3dcompiler_47/tests enable_tests wine_fn_config_makefile dlls/d3dim enable_d3dim +wine_fn_config_makefile dlls/d3dim700 enable_d3dim700 wine_fn_config_makefile dlls/d3drm enable_d3drm wine_fn_config_makefile dlls/d3drm/tests enable_tests wine_fn_config_makefile dlls/d3dx10_33 enable_d3dx10_33 diff --git a/configure.ac b/configure.ac index 331ae064bdc..2f81fd22610 100644 --- a/configure.ac +++ b/configure.ac @@ -3156,6 +3156,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests) WINE_CONFIG_MAKEFILE(dlls/d3dim) +WINE_CONFIG_MAKEFILE(dlls/d3dim700) WINE_CONFIG_MAKEFILE(dlls/d3drm) WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) diff --git a/dlls/d3dim700/Makefile.in b/dlls/d3dim700/Makefile.in new file mode 100644 index 00000000000..12a28ae475a --- /dev/null +++ b/dlls/d3dim700/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3dim700.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3dim700_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dim700/d3dim700.spec b/dlls/d3dim700/d3dim700.spec new file mode 100644 index 00000000000..3fe16bb86ed --- /dev/null +++ b/dlls/d3dim700/d3dim700.spec @@ -0,0 +1,18 @@ +@ stub D3DFree +@ stub D3DMalloc +@ stub D3DRealloc +@ stub Direct3DCreateDevice +@ stub CreateTexture +@ stub D3DBreakVBLock +@ stub D3DTextureUpdate +@ stub DestroyTexture +@ stub Direct3DCreate +@ stub Direct3D_HALCleanUp +@ stub FlushD3DDevices +@ stub GetLOD +@ stub GetPriority +@ stub PaletteAssociateNotify +@ stub PaletteUpdateNotify +@ stub SetLOD +@ stub SetPriority +@ stub SurfaceFlipNotify diff --git a/dlls/d3dim700/d3dim700_main.c b/dlls/d3dim700/d3dim700_main.c new file mode 100644 index 00000000000..18a211ccc74 --- /dev/null +++ b/dlls/d3dim700/d3dim700_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dim700); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3dim700/version.rc b/dlls/d3dim700/version.rc new file mode 100644 index 00000000000..cff97677690 --- /dev/null +++ b/dlls/d3dim700/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3dim700" +#define WINE_FILENAME_STR "d3dim700.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Aaron Hill : qmgr/tests: Fix issues with handling of transient errors.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 2538077463e3be922fc6de576409bee09a9d5de1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2538077463e3be922fc6de57… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Sun Oct 25 23:51:25 2020 -0400 qmgr/tests: Fix issues with handling of transient errors. When a BITS job is being transferred, it may enter into the state BG_JOB_STATE_TRANSIENT_ERROR (for example, if the hostname fails to resolve). Currently, entering this state causes qmgr job tests to fail, even though it may occur due to temporary network issues out of our control. If a job enters BG_JOB_STATE_TRANSIENT_ERROR before the timeout has elapsed, attempt to resume the job using IBackgroundCopyJob_Resume. If the job is still in BG_JOB_STATE_TRANSIENT_ERROR, query BITS for detailed error information, and print it out. Additionally, ensure that we are able to transfer files on Windows 10 with a metered connection. By default, BITS will not attempt to transfer a job on a metered connection, instead failing with BG_JOB_STATE_TRANSIENT_ERROR. On newer versions of Windows, we can use IBackgroundCopyJob5 to set the transfer policy, forcing the job to run even on a metered connection. This allows qmgr job tests to pass on the testbot Windows 10 VMs, which have metered connections enabled in order to disable Windows Update. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50048 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/qmgr_local.idl | 1 + dlls/qmgr/tests/job.c | 116 +++++++++++++++++++++++++++++++++++++++++++++-- include/Makefile.in | 1 + include/bits5_0.idl | 59 ++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2538077463e3be922fc6…

1 0

Eric Kohl : widl: Add the [allocate] acf attribute.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: ba72ef6c22b26ef9addc8c9af6c2e9ab88529ca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba72ef6c22b26ef9addc8c9a… Author: Eric Kohl <eric.kohl(a)reactos.org> Date: Wed Oct 14 23:24:34 2020 +0200 widl: Add the [allocate] acf attribute. Signed-off-by: Eric Kohl <eric.kohl(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 3 +++ tools/widl/parser.y | 33 +++++++++++++++++++++++++++++---- tools/widl/typegen.c | 7 +++++++ tools/widl/widltypes.h | 1 + 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 925265d00db..f2c09cd8051 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -318,6 +318,7 @@ static const struct keyword keywords[] = { static const struct keyword attr_keywords[] = { {"aggregatable", tAGGREGATABLE}, + {"all_nodes", tALLNODES}, {"allocate", tALLOCATE}, {"annotation", tANNOTATION}, {"apartment", tAPARTMENT}, @@ -345,6 +346,7 @@ static const struct keyword attr_keywords[] = {"disable_consistency_check", tDISABLECONSISTENCYCHECK}, {"displaybind", tDISPLAYBIND}, {"dllname", tDLLNAME}, + {"dont_free", tDONTFREE}, {"dual", tDUAL}, {"enable_allocate", tENABLEALLOCATE}, {"encode", tENCODE}, @@ -406,6 +408,7 @@ static const struct keyword attr_keywords[] = {"restricted", tRESTRICTED}, {"retval", tRETVAL}, {"single", tSINGLE}, + {"single_node", tSINGLENODE}, {"size_is", tSIZEIS}, {"source", tSOURCE}, {"strict_context_handle", tSTRICTCONTEXTHANDLE}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5bc0d82703e..686aa6b58a8 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -172,7 +172,7 @@ static typelib_t *current_typelib; %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND %token ELLIPSIS -%token tAGGREGATABLE tALLOCATE tANNOTATION tAPPOBJECT tASYNC tASYNCUUID +%token tAGGREGATABLE tALLNODES tALLOCATE tANNOTATION tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE @@ -183,7 +183,7 @@ static typelib_t *current_typelib; %token tDEFAULTVTABLE %token tDISABLECONSISTENCYCHECK tDISPLAYBIND %token tDISPINTERFACE -%token tDLLNAME tDOUBLE tDUAL +%token tDLLNAME tDONTFREE tDOUBLE tDUAL %token tENABLEALLOCATE tENCODE tENDPOINT %token tENTRY tENUM tERRORSTATUST %token tEXPLICITHANDLE tEXTERN @@ -235,7 +235,7 @@ static typelib_t *current_typelib; %token tRETVAL %token tSAFEARRAY %token tSHORT -%token tSIGNED +%token tSIGNED tSINGLENODE %token tSIZEIS tSIZEOF %token tSMALL %token tSOURCE @@ -296,6 +296,7 @@ static typelib_t *current_typelib; %type <statement> statement typedef pragma_warning %type <stmt_list> gbl_statements imp_statements int_statements %type <warning_list> warnings +%type <num> allocate_option_list allocate_option %left ',' %right '?' ':' @@ -1150,16 +1151,20 @@ version: acf_statements : /* empty */ | acf_interface acf_statements + ; acf_int_statements : /* empty */ | acf_int_statement acf_int_statements + ; acf_int_statement : tTYPEDEF acf_attributes aKNOWNTYPE ';' { type_t *type = find_type_or_error($3, 0); type->attrs = append_attr_list(type->attrs, $2); } + ; + acf_interface : acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}' { type_t *iface = find_type_or_error2($3, 0); @@ -1167,19 +1172,38 @@ acf_interface error_loc("%s is not an interface\n", iface->name); iface->attrs = append_attr_list(iface->attrs, $1); } + ; acf_attributes : /* empty */ { $$ = NULL; }; | '[' acf_attribute_list ']' { $$ = $2; }; + ; acf_attribute_list : acf_attribute { $$ = append_attr(NULL, $1); } | acf_attribute_list ',' acf_attribute { $$ = append_attr($1, $3); } + ; acf_attribute - : tENCODE { $$ = make_attr(ATTR_ENCODE); } + : tALLOCATE '(' allocate_option_list ')' + { $$ = make_attrv(ATTR_ALLOCATE, $3); } + | tENCODE { $$ = make_attr(ATTR_ENCODE); } | tDECODE { $$ = make_attr(ATTR_DECODE); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } + ; + +allocate_option_list + : allocate_option { $$ = $1; } + | allocate_option_list ',' allocate_option + { $$ = $1 | $3; } + ; + +allocate_option + : tDONTFREE { $$ = FC_DONT_FREE; } + | tFREE { $$ = 0; } + | tALLNODES { $$ = FC_ALLOCATE_ALL_NODES; } + | tSINGLENODE { $$ = 0; } + ; %% @@ -2122,6 +2146,7 @@ struct allowed_attr allowed_attr[] = { /* attr { D ACF I Fn ARG T En Enm St Un Fi L DI M C <display name> } */ /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "aggregatable" }, + /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "appobject" }, /* ATTR_ASYNC */ { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 04280cbb722..4874dfd6c24 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2153,6 +2153,9 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs type_t *ref = type_pointer_get_ref_type(type); if(is_declptr(ref) && !is_user_type(ref)) flags |= FC_POINTER_DEREF; + if (pointer_type != FC_RP) { + flags |= get_attrv(type->attrs, ATTR_ALLOCATE); + } } print_file(file, 2, "0x%x, 0x%x,\t\t/* %s", @@ -2165,6 +2168,10 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs fprintf(file, " [allocated_on_stack]"); if (flags & FC_POINTER_DEREF) fprintf(file, " [pointer_deref]"); + if (flags & FC_DONT_FREE) + fprintf(file, " [dont_free]"); + if (flags & FC_ALLOCATE_ALL_NODES) + fprintf(file, " [all_nodes]"); fprintf(file, " */\n"); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 085a0ff55f5..2e2ee7a206b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -69,6 +69,7 @@ typedef struct list warning_list_t; enum attr_type { ATTR_AGGREGATABLE, + ATTR_ALLOCATE, ATTR_ANNOTATION, ATTR_APPOBJECT, ATTR_ASYNC,

1 0

Biswapriyo Nath : mf/evr: Initialize variables which are checked conditionally.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 8c51bcb8a1d4db65fa1df9d436dc31d4c2ed890d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c51bcb8a1d4db65fa1df9d4… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Oct 24 18:27:27 2020 +0530 mf/evr: Initialize variables which are checked conditionally. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index e408b204304..4dca8515c94 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -2057,8 +2057,8 @@ static const IMFAttributesVtbl video_renderer_attributes_vtbl = static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; - IMFVideoPresenter *presenter; - IMFTransform *mixer; + IMFVideoPresenter *presenter = NULL; + IMFTransform *mixer = NULL; HRESULT hr; TRACE("%p, %p, %p.\n", attributes, user_context, obj);

1 0