February 2022 - Wine-Commits

André Zwing : ntdll: Fix some spec file entries.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 8cfe529a59107d5dc671a76f21aa3522dc3bde87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfe529a59107d5dc671a76f… Author: André Zwing <nerv(a)dawncrow.de> Date: Wed Feb 2 18:32:34 2022 +0100 ntdll: Fix some spec file entries. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index afb945d4665..29174965394 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -52,7 +52,7 @@ @ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64) @ stdcall EtwEventWrite(int64 ptr long ptr) -@ stdcall EtwEventWriteString(int64 long int64 ptr) +@ stdcall EtwEventWriteString(int64 long int64 wstr) @ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr) @ stdcall EtwGetTraceEnableFlags(int64) @ stdcall EtwGetTraceEnableLevel(int64) @@ -594,7 +594,7 @@ @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange -@ stdcall RtlDeleteRegistryValue(long ptr ptr) +@ stdcall RtlDeleteRegistryValue(long ptr wstr) @ stdcall RtlDeleteResource(ptr) @ stdcall RtlDeleteSecurityObject(ptr) @ stdcall RtlDeleteTimer(ptr ptr ptr) @@ -1089,7 +1089,7 @@ @ stdcall RtlWow64IsWowGuestMachineSupported(long ptr) @ stdcall -arch=win64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream -@ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) +@ stdcall RtlWriteRegistryValue(long ptr wstr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) @ stdcall RtlZombifyActivationContext(ptr)

1 0

Michael Stefaniuc : dmsynth/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: fe1aebb600d9585e33263a633b36ce8e3f0462cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe1aebb600d9585e33263a63… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 2 23:40:32 2022 +0100 dmsynth/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/tests/Makefile.in | 1 - dlls/dmsynth/tests/dmsynth.c | 104 ++++++++++++++++++++--------------------- 2 files changed, 52 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe1aebb600d9585e3326…

1 0

Eric Pouech : msvcp: Use correct integral types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 3fb30b5d75a201b9afb8f1cfaa978faa35499cbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb30b5d75a201b9afb8f1cf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:18 2022 +0100 msvcp: Use correct integral types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp90/ios.c | 4 ++-- dlls/msvcp90/locale.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 495817a54db..9cb78e9dd8e 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -8442,7 +8442,7 @@ basic_istream_char* __thiscall basic_istream_char_read_int(basic_istream_char *t istreambuf_iterator_char first={0}, last={0}; first.strbuf = strbuf; - num_get_char_get_long(numget, &last, first, last, &base->base, &state, v); + num_get_char_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v); } basic_istream_char_sentry_destroy(this); @@ -9953,7 +9953,7 @@ static basic_istream_wchar* basic_istream_read_int(basic_istream_wchar *this, in istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v); } basic_istream_wchar_sentry_destroy(this); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 21cf33a505c..a4a8657e74f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8978,7 +8978,7 @@ basic_istream_char* __thiscall basic_istream_char_read_int(basic_istream_char *t istreambuf_iterator_char first={0}, last={0}; first.strbuf = strbuf; - num_get_char_get_long(numget, &last, first, last, &base->base, &state, v); + num_get_char_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v); } basic_istream_char_sentry_destroy(this); @@ -10560,7 +10560,7 @@ static basic_istream_wchar* basic_istream_read_int(basic_istream_wchar *this, in istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v); } basic_istream_wchar_sentry_destroy(this); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 116f3c75e5d..dd7fea203eb 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5931,7 +5931,7 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_do_get_uint(const num_get *t istreambuf_iterator_wchar first, istreambuf_iterator_wchar last, ios_base *base, int *state, unsigned int *pval) { TRACE("(%p %p %p %p %p)\n", this, ret, base, state, pval); - return num_get_wchar_do_get_ulong(this, ret, first, last, base, state, pval); + return num_get_wchar_do_get_ulong(this, ret, first, last, base, state, (ULONG*)pval); } /* ?do_get@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MBE?AV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@0AAVios_base(a)2@AAHAAI(a)Z */ @@ -5941,7 +5941,7 @@ istreambuf_iterator_wchar *__thiscall num_get_short_do_get_uint(const num_get *t istreambuf_iterator_wchar first, istreambuf_iterator_wchar last, ios_base *base, int *state, unsigned int *pval) { TRACE("(%p %p %p %p %p)\n", this, ret, base, state, pval); - return num_get_short_do_get_ulong(this, ret, first, last, base, state, pval); + return num_get_short_do_get_ulong(this, ret, first, last, base, state, (ULONG*)pval); } /* ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AAVios_base(a)2@AAHAAI(a)Z */ @@ -6921,7 +6921,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_uint(const num_get *thi istreambuf_iterator_char first, istreambuf_iterator_char last, ios_base *base, int *state, unsigned int *pval) { TRACE("(%p %p %p %p %p)\n", this, ret, base, state, pval); - return num_get_char_do_get_ulong(this, ret, first, last, base, state, pval); + return num_get_char_do_get_ulong(this, ret, first, last, base, state, (ULONG*)pval); } /* ?get@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHAAI(a)Z */

1 0

Henri Verbeet : d2d1/tests: Pass the hash size as DWORD in compare_sha1().
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: ce6372d9b8f0dbff24ed94353c901394325a3720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce6372d9b8f0dbff24ed9435… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 19:40:07 2022 +0100 d2d1/tests: Pass the hash size as DWORD in compare_sha1(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b0aa02ad2a9..314d8b7ce60 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -536,6 +536,7 @@ static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp, HCRYPTPROV provider; BYTE hash_data[20]; HCRYPTHASH hash; + DWORD hash_size; unsigned int i; char sha1[41]; BOOL ret; @@ -552,10 +553,10 @@ static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp, } ok(ret, "Failed to hash data.\n"); - i = sizeof(hash_data); - ret = CryptGetHashParam(hash, HP_HASHVAL, hash_data, &i, 0); + hash_size = sizeof(hash_data); + ret = CryptGetHashParam(hash, HP_HASHVAL, hash_data, &hash_size, 0); ok(ret, "Failed to get hash value.\n"); - ok(i == sizeof(hash_data), "Got unexpected hash size %u.\n", i); + ok(hash_size == sizeof(hash_data), "Got unexpected hash size %u.\n", hash_size); ret = CryptDestroyHash(hash); ok(ret, "Failed to destroy hash.\n");

1 0

Paul Gofman : hnetcfg: Don't use _GetValue() if text element is missing in get_xml_elements().
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: d907c8959c9b638962e387ab651bdc21b572aff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d907c8959c9b638962e387ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 3 14:28:31 2022 +0300 hnetcfg: Don't use _GetValue() if text element is missing in get_xml_elements(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index def77621764..611a652ce5e 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -265,7 +265,10 @@ static BOOL get_xml_elements( const char *desc_xml, struct xml_value_desc *value if (node_type == XmlNodeType_EndElement) value = L""; else goto done; } - if (FAILED(IXmlReader_GetValue( reader, &value, NULL ))) goto done; + else + { + if (FAILED(IXmlReader_GetValue( reader, &value, NULL ))) goto done; + } if (values[i].value) { WARN( "Duplicate value %s.\n", debugstr_w(values[i].name) );

1 0

Zebediah Figura : quartz/filtergraph: Clean up CheckCircularConnection().
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: e41b3529e394d53ffac0e8ac1e88749d8d942329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e41b3529e394d53ffac0e8ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:58:09 2022 -0600 quartz/filtergraph: Clean up CheckCircularConnection(). Use clearer variable names, and simplify the error handling. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 91 ++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 74f1adcb665..0dccf2b7fb4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -771,65 +771,66 @@ static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, return VFW_E_NOT_FOUND; } -/* Don't allow a circular connection to form, return VFW_E_CIRCULAR_GRAPH if this would be the case. - * A circular connection will be formed if from the filter of the output pin, the input pin can be reached - */ -static HRESULT CheckCircularConnection(struct filter_graph *This, IPin *out, IPin *in) +static HRESULT check_cyclic_connection(IPin *source, IPin *sink) { + IPin *upstream_source, *upstream_sink; + PIN_INFO source_info, sink_info; + IEnumPins *enumpins; HRESULT hr; - PIN_INFO info_out, info_in; - hr = IPin_QueryPinInfo(out, &info_out); + hr = IPin_QueryPinInfo(sink, &sink_info); if (FAILED(hr)) + { + ERR("Failed to query pin, hr %#x.\n", hr); return hr; + } + IBaseFilter_Release(sink_info.pFilter); - hr = IPin_QueryPinInfo(in, &info_in); - if (SUCCEEDED(hr)) - IBaseFilter_Release(info_in.pFilter); + hr = IPin_QueryPinInfo(source, &source_info); if (FAILED(hr)) - goto out; + { + ERR("Failed to query pin, hr %#x.\n", hr); + return hr; + } - if (info_out.pFilter == info_in.pFilter) - hr = VFW_E_CIRCULAR_GRAPH; - else + if (sink_info.pFilter == source_info.pFilter) { - IEnumPins *enumpins; - IPin *test; + WARN("Cyclic connection detected; returning VFW_E_CIRCULAR_GRAPH.\n"); + IBaseFilter_Release(source_info.pFilter); + return VFW_E_CIRCULAR_GRAPH; + } - hr = IBaseFilter_EnumPins(info_out.pFilter, &enumpins); - if (FAILED(hr)) - goto out; + hr = IBaseFilter_EnumPins(source_info.pFilter, &enumpins); + if (FAILED(hr)) + { + ERR("Failed to enumerate pins, hr %#x.\n", hr); + IBaseFilter_Release(source_info.pFilter); + return hr; + } + + while ((hr = IEnumPins_Next(enumpins, 1, &upstream_sink, NULL)) == S_OK) + { + PIN_DIRECTION dir = PINDIR_OUTPUT; - IEnumPins_Reset(enumpins); - while ((hr = IEnumPins_Next(enumpins, 1, &test, NULL)) == S_OK) + IPin_QueryDirection(upstream_sink, &dir); + if (dir == PINDIR_INPUT && IPin_ConnectedTo(upstream_sink, &upstream_source) == S_OK) { - PIN_DIRECTION dir = PINDIR_OUTPUT; - IPin_QueryDirection(test, &dir); - if (dir == PINDIR_INPUT) + hr = check_cyclic_connection(upstream_source, sink); + IPin_Release(upstream_source); + if (FAILED(hr)) { - IPin *victim = NULL; - IPin_ConnectedTo(test, &victim); - if (victim) - { - hr = CheckCircularConnection(This, victim, in); - IPin_Release(victim); - if (FAILED(hr)) - { - IPin_Release(test); - break; - } - } + IPin_Release(upstream_sink); + IEnumPins_Release(enumpins); + IBaseFilter_Release(source_info.pFilter); + return hr; } - IPin_Release(test); } - IEnumPins_Release(enumpins); + IPin_Release(upstream_sink); } + IEnumPins_Release(enumpins); -out: - IBaseFilter_Release(info_out.pFilter); - if (FAILED(hr)) - ERR("Checking filtergraph returned %08x, something's not right!\n", hr); - return hr; + IBaseFilter_Release(source_info.pFilter); + return S_OK; } static struct filter *find_sorted_filter(struct filter_graph *graph, IBaseFilter *iface) @@ -855,7 +856,7 @@ static void sort_filter_recurse(struct filter_graph *graph, struct filter *filte TRACE("Sorting filter %p.\n", filter->filter); - /* Cyclic connections should be caught by CheckCircularConnection(). */ + /* Cyclic connections should be caught by check_cyclic_connection(). */ assert(!filter->sorting); filter->sorting = TRUE; @@ -935,13 +936,13 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi { if (dir == PINDIR_INPUT) { - hr = CheckCircularConnection(This, ppinOut, ppinIn); + hr = check_cyclic_connection(ppinOut, ppinIn); if (SUCCEEDED(hr)) hr = IPin_Connect(ppinOut, ppinIn, pmt); } else { - hr = CheckCircularConnection(This, ppinIn, ppinOut); + hr = check_cyclic_connection(ppinIn, ppinOut); if (SUCCEEDED(hr)) hr = IPin_Connect(ppinIn, ppinOut, pmt); }

1 0

Zebediah Figura : quartz/filtergraph: Remove redundant checks for pin direction from CheckCircularConnection().
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: ae9d64ed4cf1f1d80c5faee1b5a90a6d5739bc97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9d64ed4cf1f1d80c5faee1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:58:08 2022 -0600 quartz/filtergraph: Remove redundant checks for pin direction from CheckCircularConnection(). These are already checked in the callers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index aa646615428..74f1adcb665 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -782,22 +782,12 @@ static HRESULT CheckCircularConnection(struct filter_graph *This, IPin *out, IPi hr = IPin_QueryPinInfo(out, &info_out); if (FAILED(hr)) return hr; - if (info_out.dir != PINDIR_OUTPUT) - { - IBaseFilter_Release(info_out.pFilter); - return VFW_E_CANNOT_CONNECT; - } hr = IPin_QueryPinInfo(in, &info_in); if (SUCCEEDED(hr)) IBaseFilter_Release(info_in.pFilter); if (FAILED(hr)) goto out; - if (info_in.dir != PINDIR_INPUT) - { - hr = VFW_E_CANNOT_CONNECT; - goto out; - } if (info_out.pFilter == info_in.pFilter) hr = VFW_E_CIRCULAR_GRAPH;

1 0

Zebediah Figura : quartz/filtergraph: Remove "#if 1" from CheckCircularConnection().
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 9942693a8552b7b83ccb67fccec68755bb5451c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9942693a8552b7b83ccb67fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:58:07 2022 -0600 quartz/filtergraph: Remove "#if 1" from CheckCircularConnection(). Cycle detection is done by native quartz. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4132ffa5b2f..aa646615428 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -776,7 +776,6 @@ static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, */ static HRESULT CheckCircularConnection(struct filter_graph *This, IPin *out, IPin *in) { -#if 1 HRESULT hr; PIN_INFO info_out, info_in; @@ -841,10 +840,6 @@ out: if (FAILED(hr)) ERR("Checking filtergraph returned %08x, something's not right!\n", hr); return hr; -#else - /* Debugging filtergraphs not enabled */ - return S_OK; -#endif } static struct filter *find_sorted_filter(struct filter_graph *graph, IBaseFilter *iface)

1 0

Zebediah Figura : shell32: Move explorer window messages definitions to shell32_main.h.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 295285620aa2557115ea020009da5315a9190ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=295285620aa2557115ea0200… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:56:40 2022 -0600 shell32: Move explorer window messages definitions to shell32_main.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 22 ++++++++++++++++++++++ dlls/shell32/undocshell.h | 25 ------------------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index b98629298aa..ea8019a85e2 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -268,4 +268,26 @@ static inline WCHAR *strdupAtoW(const char *str) return ret; } +/* explorer ("cabinet") window messages */ +#define CWM_SETPATH (WM_USER + 2) +#define CWM_WANTIDLE (WM_USER + 3) +#define CWM_GETSETCURRENTINFO (WM_USER + 4) +#define CWM_SELECTITEM (WM_USER + 5) +#define CWM_SELECTITEMSTR (WM_USER + 6) +#define CWM_GETISHELLBROWSER (WM_USER + 7) +#define CWM_TESTPATH (WM_USER + 9) +#define CWM_STATECHANGE (WM_USER + 10) +#define CWM_GETPATH (WM_USER + 12) + +/* CWM_TESTPATH types */ +#define CWTP_ISEQUAL 0 +#define CWTP_ISCHILD 1 + +/* CWM_TESTPATH structure */ +typedef struct +{ + DWORD dwType; + ITEMIDLIST idl; +} CWTESTPATHSTRUCT; + #endif diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index e4ed7c3630a..881832c5185 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -61,31 +61,6 @@ LPVOID WINAPI SHLockShared( BOOL WINAPI SHUnlockShared(LPVOID pv); -/**************************************************************************** - * Cabinet Window Messages - */ - -#define CWM_SETPATH (WM_USER + 2) -#define CWM_WANTIDLE (WM_USER + 3) -#define CWM_GETSETCURRENTINFO (WM_USER + 4) -#define CWM_SELECTITEM (WM_USER + 5) -#define CWM_SELECTITEMSTR (WM_USER + 6) -#define CWM_GETISHELLBROWSER (WM_USER + 7) -#define CWM_TESTPATH (WM_USER + 9) -#define CWM_STATECHANGE (WM_USER + 10) -#define CWM_GETPATH (WM_USER + 12) - -/* CWM_TESTPATH types */ -#define CWTP_ISEQUAL 0 -#define CWTP_ISCHILD 1 - -/* CWM_TESTPATH structure */ -typedef struct -{ - DWORD dwType; - ITEMIDLIST idl; -} CWTESTPATHSTRUCT,* LPCWTESTPATHSTRUCT; - /**************************************************************************** * System Imagelist Routines */

1 0

Eric Pouech : conhost/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 7783f021fb2840fd8fa0125f1be6fa314f22483f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7783f021fb2840fd8fa0125f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:04 2022 +0100 conhost/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/Makefile.in | 1 - programs/conhost/tests/tty.c | 128 ++++++++++++++++++------------------- 2 files changed, 64 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7783f021fb2840fd8fa0…

1 0