wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Zebediah Figura : ntoskrnl.exe/tests: Add some tests for file names.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: f53c2df6dbfdeaf22bd4cc7a1471e0127431dea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f53c2df6dbfdeaf22bd4cc7a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 30 18:04:20 2020 -0500 ntoskrnl.exe/tests: Add some tests for file names. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 120 ++++++++++++++++++++++++++++++++++--- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 114 +++++++++++++++++++++++++++++++++++ 2 files changed, 226 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f53c2df6dbfdeaf22bd4…

1 0

Gijs Vermeulen : amstream: Return correct media type info when enumerating AMAudioStream media types.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: 218409c2d63ac171229471231d210471af98f068 URL: https://source.winehq.org/git/wine.git/?a=commit;h=218409c2d63ac17122947123… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jul 30 18:08:52 2020 +0200 amstream: Return correct media type info when enumerating AMAudioStream media types. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 21 ++++++++++++++++++++- dlls/amstream/tests/amstream.c | 11 ++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 072850aae7..dc6c810d19 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -837,6 +837,17 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface); + static const WAVEFORMATEX wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .nAvgBytesPerSec = 11025 * 2, + .nBlockAlign = 2, + .wBitsPerSample = 16, + .cbSize = 0, + }; + TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count); if (!ret_count) @@ -847,7 +858,15 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, mts[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); memset(mts[0], 0, sizeof(AM_MEDIA_TYPE)); mts[0]->majortype = MEDIATYPE_Audio; - mts[0]->subtype = MEDIASUBTYPE_PCM; + mts[0]->subtype = GUID_NULL; + mts[0]->bFixedSizeSamples = TRUE; + mts[0]->bTemporalCompression = FALSE; + mts[0]->lSampleSize = 2; + mts[0]->formattype = FORMAT_WaveFormatEx; + mts[0]->cbFormat = sizeof(WAVEFORMATEX); + mts[0]->pbFormat = CoTaskMemAlloc(sizeof(WAVEFORMATEX)); + memcpy(mts[0]->pbFormat, &wfx, sizeof(WAVEFORMATEX)); + ++enum_media_types->index; *ret_count = 1; return count == 1 ? S_OK : S_FALSE; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 130f9f0e0e..cf66538a7a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2515,20 +2515,21 @@ static void test_media_types(void) ok(count == 1, "Got count %u.\n", count); ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s\n", wine_dbgstr_guid(&pmt->majortype)); - todo_wine ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", + ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", wine_dbgstr_guid(&pmt->subtype)); - todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); - todo_wine ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); - todo_wine ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", wine_dbgstr_guid(&pmt->formattype)); ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); - todo_wine ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); + ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); ok(!memcmp(pmt->pbFormat, &expect_wfx, pmt->cbFormat), "Format blocks didn't match.\n"); hr = IPin_QueryAccept(pin, pmt); ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + CoTaskMemFree(pmt->pbFormat); CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count);

1 0

Rémi Bernon : dbghelp: Ignore missing debug info in SymInitializeW.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: 774ee4734a7d6c02f648fdf1747df837c964583d URL: https://source.winehq.org/git/wine.git/?a=commit;h=774ee4734a7d6c02f648fdf1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 31 14:22:34 2020 +0200 dbghelp: Ignore missing debug info in SymInitializeW. When fInvadeProcess is used, we return an error if the target process is found but its debug info is not. We should only return an error if the process is not found. This fixes a SymInitializeW popup error on Hard Reset Redux startup. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index a2dba4cfe3..9d33bc67f2 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -354,7 +354,9 @@ static BOOL check_live_target(struct process* pcs) if (!base) return FALSE; TRACE("got debug info address %#lx from PEB %p\n", base, pbi.PebBaseAddress); - return elf_read_wine_loader_dbg_info(pcs, base) || macho_read_wine_loader_dbg_info(pcs, base); + if (!elf_read_wine_loader_dbg_info(pcs, base) && !macho_read_wine_loader_dbg_info(pcs, base)) + WARN("couldn't load process debug info at %#lx\n", base); + return TRUE; } /****************************************************************** @@ -456,7 +458,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP { if (fInvadeProcess) EnumerateLoadedModulesW64(hProcess, process_invade_cb, hProcess); - pcs->loader->synchronize_module_list(pcs); + if (pcs->loader) pcs->loader->synchronize_module_list(pcs); } else if (fInvadeProcess) {

1 0

Jacek Caban : winegcc: Try using msvc file align syntax if mingw-style is not supported.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: fd71ffb44a325d249f27fc3df34936f2ecb33ee2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd71ffb44a325d249f27fc3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 16:22:43 2020 +0200 winegcc: Try using msvc file align syntax if mingw-style is not supported. Allows setting file alignment on LLD 10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 52ab034b3a..bbb44ff614 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -525,6 +525,11 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment,0x1000" )) strarray_add( link_args, strmake( "-Wl,--file-alignment,%s", opts->file_align ? opts->file_align : "0x1000" )); + else if (!try_link( opts->prefix, link_args, "-Wl,-Xlink=-filealign:0x1000" )) + /* lld from llvm 10 does not support mingw style --file-alignment, + * but it's possible to use msvc syntax */ + strarray_add( link_args, strmake( "-Wl,-Xlink=-filealign:%s", + opts->file_align ? opts->file_align : "0x1000" )); strarray_addall( link_args, flags ); return link_args;

1 0

Jacek Caban : winegcc: Support file alignment on msvc target.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: 5e4ca097be8c2d67a22fccd3bfc9c33dec5f1dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e4ca097be8c2d67a22fccd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 16:20:19 2020 +0200 winegcc: Support file alignment on msvc target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 90ef16aa1f..52ab034b3a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -551,6 +551,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) } else if (!opts->strip) strarray_add(link_args, "-Wl,-debug:dwarf"); + strarray_add( link_args, strmake( "-Wl,-filealign:%s", opts->file_align ? opts->file_align : "0x1000" )); strarray_addall( link_args, flags ); return link_args;

1 0

Dmitry Timoshkov : fonts: Add initial version of Webdings font.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: afe2d73db6fe38d8b3f12b266420f96a85bc1880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe2d73db6fe38d8b3f12b26… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 27 19:55:24 2020 +0800 fonts: Add initial version of Webdings font. Some applications confusingly use Webdings instead of Marlett to draw non-client areas of their custom controls, this initial version of Webdings contains just a few glyphs copied from Marlett to make these apps happy. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/Makefile.in | 1 + fonts/webdings.sfd | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/webdings.ttf | Bin 0 -> 4300 bytes 3 files changed, 199 insertions(+) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 08c82646de..b802185198 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -10,4 +10,5 @@ FONT_SRCS = \ system.sfd \ tahoma.sfd \ tahomabd.sfd \ + webdings.sfd \ wingding.sfd diff --git a/fonts/webdings.sfd b/fonts/webdings.sfd new file mode 100644 index 0000000000..8f464f4c16 --- /dev/null +++ b/fonts/webdings.sfd @@ -0,0 +1,198 @@ +SplineFontDB: 3.0 +FontName: WineWebdings +FullName: Webdings +FamilyName: Webdings +Weight: Regular +Copyright: Copyright (C) 2020 Dmitry Timoshkov +UComments: "#pragma makedep install" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: 0 +UnderlineWidth: 0 +Ascent: 2048 +Descent: 0 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +FSType: 0 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 0 +PfmFamily: 81 +TTFWeight: 500 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 0 0 0 0 0 0 0 0 0 0 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'Wine' +DEI: 91125 +ShortTable: cvt 2 + 68 + 1297 +EndShort +LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "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.+AAoACgAA-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.+AAoACgAA-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+AAoA" "http://www.gnu.org/licenses/lgpl.html" +Encoding: Symbol +Compacted: 1 +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -72 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 26 10 +TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 +BeginChars: 257 8 + +StartChar: .notdef +Encoding: 0 61472 0 +AltUni2: 000000.ffffffff.0 +Width: 1024 +Flags: W +LayerCount: 2 +Fore +SplineSet +41 41 m 1,0,-1 + 819 41 l 1,1,-1 + 819 1324 l 1,2,-1 + 41 1324 l 1,3,-1 + 41 41 l 1,0,-1 +0 0 m 1,4,-1 + 0 1365 l 1,5,-1 + 860 1365 l 1,6,-1 + 860 0 l 1,7,-1 + 0 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: UIminimize +Encoding: 48 48 1 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +256 256 m 1,0,-1 + 256 512 l 1,1,-1 + 1280 512 l 1,2,-1 + 1280 256 l 1,3,-1 + 256 256 l 1,0,-1 +EndSplineSet +EndChar + +StartChar: UImaximize +Encoding: 49 49 2 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +256 384 m 1,0,-1 + 1536 384 l 1,1,-1 + 1536 1408 l 1,2,-1 + 256 1408 l 1,3,-1 + 256 384 l 1,0,-1 +128 256 m 1,4,-1 + 128 1664 l 1,5,-1 + 1664 1664 l 1,6,-1 + 1664 256 l 1,7,-1 + 128 256 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: UItile +Encoding: 50 50 3 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +128 256 m 1,0,-1 + 128 1152 l 1,1,-1 + 512 1152 l 1,2,-1 + 512 1664 l 1,3,-1 + 1664 1664 l 1,4,-1 + 1664 768 l 1,5,-1 + 1280 768 l 1,6,-1 + 1280 256 l 1,7,-1 + 128 256 l 1,0,-1 +256 384 m 1,8,-1 + 1152 384 l 1,9,-1 + 1152 896 l 1,10,-1 + 256 896 l 1,11,-1 + 256 384 l 1,8,-1 +640 1152 m 1,12,-1 + 1280 1152 l 1,13,-1 + 1280 896 l 1,14,-1 + 1536 896 l 1,15,-1 + 1536 1408 l 1,16,-1 + 640 1408 l 1,17,-1 + 640 1152 l 1,12,-1 +EndSplineSet +EndChar + +StartChar: UIback +Encoding: 51 51 4 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1150 1726 m 25,0,-1 + 1150 446 l 25,1,-1 + 510 1086 l 25,2,-1 + 1150 1726 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: UIforward +Encoding: 52 52 5 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +842 1732 m 25,0,-1 + 842 452 l 25,1,-1 + 1482 1092 l 25,2,-1 + 842 1732 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: UIup +Encoding: 53 53 6 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +320 768 m 25,0,-1 + 1600 768 l 25,1,-1 + 960 1408 l 25,2,-1 + 320 768 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: UIdown +Encoding: 54 54 7 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +320 1282 m 25,0,-1 + 1600 1282 l 25,1,-1 + 960 642 l 25,2,-1 + 320 1282 l 25,0,-1 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/fonts/webdings.ttf b/fonts/webdings.ttf new file mode 100644 index 0000000000..c9c47f439b Binary files /dev/null and b/fonts/webdings.ttf differ

1 0

Nikolay Sivov : combase: Move HICON marshalling functions.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: e29b5309212190e41df407bd2438dbd1d280a0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e29b5309212190e41df407bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 28 13:42:26 2020 +0300 combase: Move HICON marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 4 ++++ dlls/combase/usrmarshal.c | 1 + dlls/ole32/ole32.spec | 8 ++++---- dlls/ole32/usrmarshal.c | 1 - 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9d4888d005..c2342cc9f8 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -185,6 +185,10 @@ @ stdcall HDC_UserMarshal(ptr ptr ptr) @ stdcall HDC_UserSize(ptr long ptr) @ stdcall HDC_UserUnmarshal(ptr ptr ptr) +@ stdcall HICON_UserFree(ptr ptr) +@ stdcall HICON_UserMarshal(ptr ptr ptr) +@ stdcall HICON_UserSize(ptr long ptr) +@ stdcall HICON_UserUnmarshal(ptr ptr ptr) @ stdcall HMENU_UserFree(ptr ptr) @ stdcall HMENU_UserMarshal(ptr ptr ptr) @ stdcall HMENU_UserSize(ptr long ptr) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 6934e588a2..08328cc673 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -135,6 +135,7 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) } IMPL_WIREM_HANDLE(HDC) +IMPL_WIREM_HANDLE(HICON) IMPL_WIREM_HANDLE(HMENU) IMPL_WIREM_HANDLE(HWND) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b0489cb0ce..03697c3e8d 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -147,10 +147,10 @@ @ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) @ stdcall HGLOBAL_UserSize(ptr long ptr) @ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) -@ stdcall HICON_UserFree(ptr ptr) -@ stdcall HICON_UserMarshal(ptr ptr ptr) -@ stdcall HICON_UserSize(ptr long ptr) -@ stdcall HICON_UserUnmarshal(ptr ptr ptr) +@ stdcall HICON_UserFree(ptr ptr) combase.HICON_UserFree +@ stdcall HICON_UserMarshal(ptr ptr ptr) combase.HICON_UserMarshal +@ stdcall HICON_UserSize(ptr long ptr) combase.HICON_UserSize +@ stdcall HICON_UserUnmarshal(ptr ptr ptr) combase.HICON_UserUnmarshal @ stdcall HMENU_UserFree(ptr ptr) combase.HMENU_UserFree @ stdcall HMENU_UserMarshal(ptr ptr ptr) combase.HMENU_UserMarshal @ stdcall HMENU_UserSize(ptr long ptr) combase.HMENU_UserSize diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 86793a8996..6898517568 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -355,7 +355,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) } IMPL_WIREM_HANDLE(HACCEL) -IMPL_WIREM_HANDLE(HICON) IMPL_WIREM_HANDLE(HBRUSH) /******************************************************************************

1 0

Nikolay Sivov : combase: Move HMENU marshalling functions.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: 8ba5df9a569be4c454c6be62c043ce1a7acda6a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ba5df9a569be4c454c6be62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 28 13:42:25 2020 +0300 combase: Move HMENU marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 4 ++++ dlls/combase/usrmarshal.c | 1 + dlls/ole32/ole32.spec | 8 ++++---- dlls/ole32/usrmarshal.c | 1 - 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 6c6441b307..9d4888d005 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -185,6 +185,10 @@ @ stdcall HDC_UserMarshal(ptr ptr ptr) @ stdcall HDC_UserSize(ptr long ptr) @ stdcall HDC_UserUnmarshal(ptr ptr ptr) +@ stdcall HMENU_UserFree(ptr ptr) +@ stdcall HMENU_UserMarshal(ptr ptr ptr) +@ stdcall HMENU_UserSize(ptr long ptr) +@ stdcall HMENU_UserUnmarshal(ptr ptr ptr) @ stub HSTRING_UserFree @ stub HSTRING_UserFree64 @ stub HSTRING_UserMarshal diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 632c06a5b2..6934e588a2 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -135,6 +135,7 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) } IMPL_WIREM_HANDLE(HDC) +IMPL_WIREM_HANDLE(HMENU) IMPL_WIREM_HANDLE(HWND) /****************************************************************************** diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 31be1c3e13..b0489cb0ce 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -151,10 +151,10 @@ @ stdcall HICON_UserMarshal(ptr ptr ptr) @ stdcall HICON_UserSize(ptr long ptr) @ stdcall HICON_UserUnmarshal(ptr ptr ptr) -@ stdcall HMENU_UserFree(ptr ptr) -@ stdcall HMENU_UserMarshal(ptr ptr ptr) -@ stdcall HMENU_UserSize(ptr long ptr) -@ stdcall HMENU_UserUnmarshal(ptr ptr ptr) +@ stdcall HMENU_UserFree(ptr ptr) combase.HMENU_UserFree +@ stdcall HMENU_UserMarshal(ptr ptr ptr) combase.HMENU_UserMarshal +@ stdcall HMENU_UserSize(ptr long ptr) combase.HMENU_UserSize +@ stdcall HMENU_UserUnmarshal(ptr ptr ptr) combase.HMENU_UserUnmarshal @ stdcall HMETAFILEPICT_UserFree(ptr ptr) @ stdcall HMETAFILEPICT_UserMarshal(ptr ptr ptr) @ stdcall HMETAFILEPICT_UserSize(ptr long ptr) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 826c9b7cf7..86793a8996 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -355,7 +355,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) } IMPL_WIREM_HANDLE(HACCEL) -IMPL_WIREM_HANDLE(HMENU) IMPL_WIREM_HANDLE(HICON) IMPL_WIREM_HANDLE(HBRUSH)

1 0

Nikolay Sivov : combase: Move HDC marshalling functions.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: 63ee3fd52d8f580bd0a10466278ca57137d88e6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ee3fd52d8f580bd0a10466… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 28 13:42:24 2020 +0300 combase: Move HDC marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 4 ++++ dlls/combase/usrmarshal.c | 1 + dlls/ole32/ole32.spec | 8 ++++---- dlls/ole32/usrmarshal.c | 1 - 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 480f29d1d2..6c6441b307 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -181,6 +181,10 @@ @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface @ stdcall GetRestrictedErrorInfo(ptr) +@ stdcall HDC_UserFree(ptr ptr) +@ stdcall HDC_UserMarshal(ptr ptr ptr) +@ stdcall HDC_UserSize(ptr long ptr) +@ stdcall HDC_UserUnmarshal(ptr ptr ptr) @ stub HSTRING_UserFree @ stub HSTRING_UserFree64 @ stub HSTRING_UserMarshal diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 91f389916f..632c06a5b2 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -134,6 +134,7 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) handle_UserFree(pFlags, (HANDLE *)handle); \ } +IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HWND) /****************************************************************************** diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index f41f010fdd..31be1c3e13 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -135,10 +135,10 @@ @ stdcall HBRUSH_UserMarshal(ptr ptr ptr) @ stdcall HBRUSH_UserSize(ptr long ptr) @ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr) -@ stdcall HDC_UserFree(ptr ptr) -@ stdcall HDC_UserMarshal(ptr ptr ptr) -@ stdcall HDC_UserSize(ptr long ptr) -@ stdcall HDC_UserUnmarshal(ptr ptr ptr) +@ stdcall HDC_UserFree(ptr ptr) combase.HDC_UserFree +@ stdcall HDC_UserMarshal(ptr ptr ptr) combase.HDC_UserMarshal +@ stdcall HDC_UserSize(ptr long ptr) combase.HDC_UserSize +@ stdcall HDC_UserUnmarshal(ptr ptr ptr) combase.HDC_UserUnmarshal @ stdcall HENHMETAFILE_UserFree(ptr ptr) @ stdcall HENHMETAFILE_UserMarshal(ptr ptr ptr) @ stdcall HENHMETAFILE_UserSize(ptr long ptr) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index add6ba759e..826c9b7cf7 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -356,7 +356,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) IMPL_WIREM_HANDLE(HACCEL) IMPL_WIREM_HANDLE(HMENU) -IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HICON) IMPL_WIREM_HANDLE(HBRUSH)

1 0

Nikolay Sivov : combase: Move HWND marshalling functions.
by Alexandre Julliard 01 Aug '20

01 Aug '20

Module: wine Branch: master Commit: e14055ca846b1403e4c34d1c0c17385aa9ad21bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e14055ca846b1403e4c34d1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 28 13:42:23 2020 +0300 combase: Move HWND marshalling functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 4 +++ dlls/combase/usrmarshal.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 ++--- dlls/ole32/usrmarshal.c | 1 - 4 files changed, 82 insertions(+), 5 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index b5ca117717..480f29d1d2 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -189,6 +189,10 @@ @ stub HSTRING_UserSize64 @ stub HSTRING_UserUnmarshal @ stub HSTRING_UserUnmarshal64 +@ stdcall HWND_UserFree(ptr ptr) +@ stdcall HWND_UserMarshal(ptr ptr ptr) +@ stdcall HWND_UserSize(ptr long ptr) +@ stdcall HWND_UserUnmarshal(ptr ptr ptr) @ stub HkOleRegisterObject @ stdcall IIDFromString(wstr ptr) ole32.IIDFromString @ stub InternalAppInvokeExceptionFilter diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 3fc7c2743a..91f389916f 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -62,6 +62,80 @@ static const char* debugstr_user_flags(ULONG *pFlags) return wine_dbg_sprintf("MAKELONG(%s, 0x%04x)", loword, HIWORD(*pFlags)); } +static ULONG handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDLE *handle) +{ + if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) + { + ERR("can't remote a local handle\n"); + RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); + return StartingSize; + } + + ALIGN_LENGTH(StartingSize, 3); + return StartingSize + sizeof(RemotableHandle); +} + +static unsigned char * handle_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) +{ + RemotableHandle *remhandle; + if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) + { + ERR("can't remote a local handle\n"); + RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); + return pBuffer; + } + + ALIGN_POINTER(pBuffer, 3); + remhandle = (RemotableHandle *)pBuffer; + remhandle->fContext = WDT_INPROC_CALL; + remhandle->u.hInproc = (LONG_PTR)*handle; + return pBuffer + sizeof(RemotableHandle); +} + +static unsigned char * handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) +{ + RemotableHandle *remhandle; + + ALIGN_POINTER(pBuffer, 3); + remhandle = (RemotableHandle *)pBuffer; + if (remhandle->fContext != WDT_INPROC_CALL) + RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); + *handle = (HANDLE)(LONG_PTR)remhandle->u.hInproc; + return pBuffer + sizeof(RemotableHandle); +} + +static void handle_UserFree(ULONG *pFlags, HANDLE *handle) +{ + /* nothing to do */ +} + +#define IMPL_WIREM_HANDLE(type) \ + ULONG __RPC_USER type##_UserSize(ULONG *pFlags, ULONG StartingSize, type *handle) \ + { \ + TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, handle); \ + return handle_UserSize(pFlags, StartingSize, (HANDLE *)handle); \ + } \ + \ + unsigned char * __RPC_USER type##_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \ + { \ + TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *handle); \ + return handle_UserMarshal(pFlags, pBuffer, (HANDLE *)handle); \ + } \ + \ + unsigned char * __RPC_USER type##_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \ + { \ + TRACE("(%s, %p, %p\n", debugstr_user_flags(pFlags), pBuffer, handle); \ + return handle_UserUnmarshal(pFlags, pBuffer, (HANDLE *)handle); \ + } \ + \ + void __RPC_USER type##_UserFree(ULONG *pFlags, type *handle) \ + { \ + TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *handle); \ + handle_UserFree(pFlags, (HANDLE *)handle); \ + } + +IMPL_WIREM_HANDLE(HWND) + /****************************************************************************** * WdtpInterfacePointer_UserSize (combase.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e8466c2049..f41f010fdd 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -167,10 +167,10 @@ @ stdcall HPALETTE_UserMarshal(ptr ptr ptr) @ stdcall HPALETTE_UserSize(ptr long ptr) @ stdcall HPALETTE_UserUnmarshal(ptr ptr ptr) -@ stdcall HWND_UserFree(ptr ptr) -@ stdcall HWND_UserMarshal(ptr ptr ptr) -@ stdcall HWND_UserSize(ptr long ptr) -@ stdcall HWND_UserUnmarshal(ptr ptr ptr) +@ stdcall HWND_UserFree(ptr ptr) combase.HWND_UserFree +@ stdcall HWND_UserMarshal(ptr ptr ptr) combase.HWND_UserMarshal +@ stdcall HWND_UserSize(ptr long ptr) combase.HWND_UserSize +@ stdcall HWND_UserUnmarshal(ptr ptr ptr) combase.HWND_UserUnmarshal @ stdcall IIDFromString(wstr ptr) @ stub I_RemoteMain @ stdcall IsAccelerator(long long ptr ptr) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index cf07ae3ccc..add6ba759e 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -356,7 +356,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) IMPL_WIREM_HANDLE(HACCEL) IMPL_WIREM_HANDLE(HMENU) -IMPL_WIREM_HANDLE(HWND) IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HICON) IMPL_WIREM_HANDLE(HBRUSH)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020