November 2019 - Wine-commits

Jacek Caban : jscript: Treat only ASCII digits as digits.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: f34cecbae27a484f1aa026840dc6d224ffa0b65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f34cecbae27a484f1aa02684… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 21:26:08 2019 +0100 jscript: Treat only ASCII digits as digits. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 4 ++-- dlls/jscript/dispex.c | 2 +- dlls/jscript/global.c | 18 ++++++++++-------- dlls/jscript/jscript.h | 5 +++++ dlls/jscript/json.c | 2 +- dlls/jscript/jsutils.c | 6 +++--- dlls/jscript/lex.c | 30 +++++++++++++++--------------- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 1 + 9 files changed, 40 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f34cecbae27a484f1aa0…

1 0

Jacek Caban : vbscript: Treat only ASCII digits as digits.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: a35adb1950b4eaadc0c53b77a6bd9dd89e1a73cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35adb1950b4eaadc0c53b77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 21:28:32 2019 +0100 vbscript: Treat only ASCII digits as digits. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 14 +++++++------- dlls/vbscript/vbregexp.c | 4 ++-- dlls/vbscript/vbscript.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 005e7c3d58..197285c98e 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -214,7 +214,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) if(*ctx->ptr == '0' && !('0' <= ctx->ptr[1] && ctx->ptr[1] <= '9') && ctx->ptr[1] != '.') return *ctx->ptr++; - while(ctx->ptr < ctx->end && iswdigit(*ctx->ptr)) { + while(ctx->ptr < ctx->end && is_digit(*ctx->ptr)) { hlp = d*10 + *(ctx->ptr++) - '0'; if(d>MAXLONGLONG/10 || hlp<0) { exp++; @@ -223,7 +223,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) else d = hlp; } - while(ctx->ptr < ctx->end && iswdigit(*ctx->ptr)) { + while(ctx->ptr < ctx->end && is_digit(*ctx->ptr)) { exp++; ctx->ptr++; } @@ -232,7 +232,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) use_int = FALSE; ctx->ptr++; - while(ctx->ptr < ctx->end && iswdigit(*ctx->ptr)) { + while(ctx->ptr < ctx->end && is_digit(*ctx->ptr)) { hlp = d*10 + *(ctx->ptr++) - '0'; if(d>MAXLONGLONG/10 || hlp<0) break; @@ -240,7 +240,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) d = hlp; exp--; } - while(ctx->ptr < ctx->end && iswdigit(*ctx->ptr)) + while(ctx->ptr < ctx->end && is_digit(*ctx->ptr)) ctx->ptr++; } @@ -255,7 +255,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) ctx->ptr++; } - if(!iswdigit(*ctx->ptr)) { + if(!is_digit(*ctx->ptr)) { FIXME("Invalid numeric literal\n"); return 0; } @@ -266,7 +266,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) e = e*10 + *(ctx->ptr++) - '0'; if(sign == -1 && -e+exp < -(INT_MAX/100)) { /* The literal will be rounded to 0 anyway. */ - while(iswdigit(*ctx->ptr)) + while(is_digit(*ctx->ptr)) ctx->ptr++; *(double*)ret = 0; return tDouble; @@ -276,7 +276,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) FIXME("Invalid numeric literal\n"); return 0; } - } while(iswdigit(*ctx->ptr)); + } while(is_digit(*ctx->ptr)); exp += sign*e; } diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index ac667da442..60c99772d3 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1560,14 +1560,14 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl default: { DWORD idx; - if(!iswdigit(ptr[1])) { + if(!is_digit(ptr[1])) { hres = strbuf_append(&buf, ptr, 1); prev_ptr = ptr + 1; break; } idx = ptr[1] - '0'; - if(iswdigit(ptr[2]) && idx * 10 + (ptr[2] - '0') <= state->paren_count) { + if(is_digit(ptr[2]) && idx * 10 + (ptr[2] - '0') <= state->paren_count) { idx = idx * 10 + (ptr[2] - '0'); prev_ptr = ptr + 3; }else if(idx && idx <= state->paren_count) { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 04a9b8372d..ef5cee23bf 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -373,6 +373,11 @@ static inline BOOL is_int32(double d) return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; } +static inline BOOL is_digit(WCHAR c) +{ + return '0' <= c && c <= '9'; +} + HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN; BSTR string_replace(BSTR,BSTR,BSTR,int,int) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : dsound/tests: Add media object query tests.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 65488e6cf181d28e091debfe76899ffafbdbdfb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65488e6cf181d28e091debfe… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 8 13:26:30 2019 -0600 dsound/tests: Add media object query tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/dsound8.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index b66275973f..8190a61736 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1424,6 +1424,38 @@ static void test_effects(void) while (IDirectSound8_Release(dso)); } +static void test_dsfx_interfaces(const char *test_prefix, IUnknown *dmo, REFGUID refguid) +{ + HRESULT rc; + IMediaObject *mediaobject; + IMediaObjectInPlace *inplace; + IUnknown *parent; + + rc = IUnknown_QueryInterface(dmo, &IID_IMediaObject, (void**)&mediaobject); + ok(rc == DS_OK, "%s: Failed: %08x\n", test_prefix, rc); + if (rc == DS_OK) + { + rc = IMediaObject_QueryInterface(mediaobject, refguid, (void**)&parent); + ok(rc == S_OK, "%s: got: %08x\n", test_prefix, rc); + ok(dmo == parent, "%s: Objects not equal\n", test_prefix); + IUnknown_Release(parent); + + IMediaObject_Release(mediaobject); + } + + rc = IUnknown_QueryInterface(dmo, &IID_IMediaObjectInPlace, (void**)&inplace); + ok(rc == DS_OK, "%s: Failed: %08x\n", test_prefix, rc); + if (rc == DS_OK) + { + rc = IMediaObjectInPlace_QueryInterface(inplace, refguid, (void**)&parent); + ok(rc == S_OK, "%s: got: %08x\n", test_prefix, rc); + ok(dmo == parent, "%s: Objects not equal\n", test_prefix); + IUnknown_Release(parent); + + IMediaObjectInPlace_Release(inplace); + } +} + static void test_echo_parameters(IDirectSoundBuffer8 *secondary8) { HRESULT rc; @@ -1446,6 +1478,8 @@ static void test_echo_parameters(IDirectSoundBuffer8 *secondary8) ok(params.lPanDelay == 0, "got %d\n", params.lPanDelay); } + test_dsfx_interfaces("FXEcho", (IUnknown *)echo, &IID_IDirectSoundFXEcho); + IDirectSoundFXEcho_Release(echo); } } @@ -1469,6 +1503,8 @@ static void test_gargle_parameters(IDirectSoundBuffer8 *secondary8) ok(params.dwWaveShape == DSFXGARGLE_WAVE_TRIANGLE, "got %d\n", params.dwWaveShape); } + test_dsfx_interfaces("FXGargle", (IUnknown *)gargle, &IID_IDirectSoundFXGargle); + IDirectSoundFXGargle_Release(gargle); } } @@ -1497,6 +1533,8 @@ static void test_chorus_parameters(IDirectSoundBuffer8 *secondary8) ok(params.lPhase == 3, "got %d\n", params.lPhase); } + test_dsfx_interfaces("FXChorus", (IUnknown *)chorus, &IID_IDirectSoundFXChorus); + IDirectSoundFXChorus_Release(chorus); } } @@ -1525,6 +1563,8 @@ static void test_flanger_parameters(IDirectSoundBuffer8 *secondary8) ok(params.lPhase == 2, "got %d\n", params.lPhase); } + test_dsfx_interfaces("FXFlanger", (IUnknown *)flanger, &IID_IDirectSoundFXFlanger); + IDirectSoundFXFlanger_Release(flanger); } } @@ -1551,6 +1591,8 @@ static void test_distortion_parameters(IDirectSoundBuffer8 *secondary8) ok(params.fPreLowpassCutoff == 3675.0f, "got %f\n", params.fPreLowpassCutoff); } + test_dsfx_interfaces("FXDistortion", (IUnknown *)distortion, &IID_IDirectSoundFXDistortion); + IDirectSoundFXDistortion_Release(distortion); } } @@ -1577,6 +1619,8 @@ static void test_compressor_parameters(IDirectSoundBuffer8 *secondary8) ok(params.fPredelay == 4.0f, "got %f\n", params.fPredelay); } + test_dsfx_interfaces("FXCompressor", (IUnknown *)compressor, &IID_IDirectSoundFXCompressor); + IDirectSoundFXCompressor_Release(compressor); } } @@ -1601,6 +1645,8 @@ static void test_parameq_parameters(IDirectSoundBuffer8 *secondary8) ok(params.fGain == 0.0f, "got %f\n", params.fGain); } + test_dsfx_interfaces("FXParamEq", (IUnknown *)parameq, &IID_IDirectSoundFXParamEq); + IDirectSoundFXParamEq_Release(parameq); } } @@ -1632,6 +1678,8 @@ static void test_reverb_parameters(IDirectSoundBuffer8 *secondary8) ok(params.flHFReference == 5000.0f, "got %f\n", params.flHFReference); } + test_dsfx_interfaces("FXI3DL2Reverb", (IUnknown *)reverb, &IID_IDirectSoundFXI3DL2Reverb); + IDirectSoundFXI3DL2Reverb_Release(reverb); } }

1 0

Alistair Leslie-Hughes : dmime: Trace dwGroupBits parameter consistently.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: e4a5af6c0d812572ffff2d3a452c1d301e0f00ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4a5af6c0d812572ffff2d3a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 8 21:48:44 2019 +0100 dmime: Trace dwGroupBits parameter consistently. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index a0e6191864..d47c2f2c23 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -170,7 +170,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if IPersistStream* pCLSIDStream = NULL; HRESULT hr = S_OK; - TRACE("(%p, %s, %d, 0x%x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); + TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); if (NULL == ppTrack) { return E_POINTER; @@ -243,12 +243,12 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %d)\n", This, pTrack, dwGroupBits); + TRACE("(%p, %p, %#x)\n", This, pTrack, dwGroupBits); LIST_FOR_EACH (pEntry, &This->Tracks) { i++; pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - #%u: %p -> %d,%p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - #%u: %p -> %#x, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { ERR("(%p, %p): track is already in list\n", This, pTrack); return E_FAIL; @@ -424,7 +424,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *if REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, void *pParam) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %d, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %#x, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; } @@ -503,7 +503,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetTrackConfig(IDirectMusicSegmen DWORD dwFlagsOff) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %d, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %#x, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; }

1 0

Alistair Leslie-Hughes : dmband: Handle the DirectX 7 version of DMUS_IO_INSTRUMENT structure.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 070cfc358c8ed67ba08a49ae78c20205ab4e2d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=070cfc358c8ed67ba08a49ae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 8 22:32:56 2019 +0100 dmband: Handle the DirectX 7 version of DMUS_IO_INSTRUMENT structure. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/band.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 4338791971..53f407c1a4 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -171,6 +171,8 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { band_IDirectMusicObject_ParseDescriptor }; +#define DMUS_IO_INSTRUMENT_DX7_SIZE offsetof(DMUS_IO_INSTRUMENT, nPitchBendRange) + /* IDirectMusicBandImpl IPersistStream part: */ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) @@ -199,8 +201,14 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * switch (Chunk.fccID) { case DMUS_FOURCC_INSTRUMENT_CHUNK: { TRACE_(dmfile)(": Instrument chunk\n"); - if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) return E_FAIL; - IStream_Read (pStm, &inst, sizeof(DMUS_IO_INSTRUMENT), NULL); + if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT) && Chunk.dwSize != DMUS_IO_INSTRUMENT_DX7_SIZE) { + ERR_(dmfile)("unexpected size %d\n", Chunk.dwSize); + return E_FAIL; + } + IStream_Read (pStm, &inst, Chunk.dwSize, NULL); + if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) + inst.nPitchBendRange = 0; + TRACE_(dmfile)(" - dwPatch: %u\n", inst.dwPatch); TRACE_(dmfile)(" - dwAssignPatch: %u\n", inst.dwAssignPatch); TRACE_(dmfile)(" - dwNoteRanges[0]: %u\n", inst.dwNoteRanges[0]);

1 0

Nikolay Sivov : rpcss: Implement interface to return sequential identifiers.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 9bec4bb582ba59baa2c2b7c9fae411722ee9cb64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bec4bb582ba59baa2c2b7c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 7 23:00:00 2019 +0300 rpcss: Implement interface to return sequential identifiers. 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> --- include/wine/irpcss.idl | 33 +++++++++++++++++++++++++++++++++ programs/rpcss/Makefile.in | 3 ++- programs/rpcss/irpcss.idl | 21 +++++++++++++++++++++ programs/rpcss/rpcss_main.c | 12 ++++++++++++ 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/include/wine/irpcss.idl b/include/wine/irpcss.idl new file mode 100644 index 0000000000..1874e10025 --- /dev/null +++ b/include/wine/irpcss.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2019 Nikolay Sivov 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 + */ + +import "wtypes.idl"; + +cpp_quote("#define IRPCSS_PROTSEQ {'n','c','a','l','r','p','c',0}") +cpp_quote("#define IRPCSS_ENDPOINT {'i','r','p','c','s','s',0}") + +[ + uuid(85da4974-edc7-40ff-bad4-9c4525a8d044), + version(0.0), +] +interface Irpcss +{ + HRESULT irpcss_get_thread_seq_id( + [in] handle_t handle, + [out] DWORD *sequence_id); +} diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index 6ccb5e965a..dcc405a944 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -10,4 +10,5 @@ C_SRCS = \ IDL_SRCS = \ epm.idl \ - irot.idl + irot.idl \ + irpcss.idl diff --git a/programs/rpcss/irpcss.idl b/programs/rpcss/irpcss.idl new file mode 100644 index 0000000000..1f346ada82 --- /dev/null +++ b/programs/rpcss/irpcss.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2019 Nikolay Sivov 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 + */ + +#pragma makedep server + +#include "wine/irpcss.idl" diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 42749028c3..6e85ef2c33 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -28,6 +28,7 @@ #include "winsvc.h" #include "irot.h" #include "epm.h" +#include "irpcss.h" #include "wine/debug.h" @@ -37,6 +38,13 @@ static WCHAR rpcssW[] = {'R','p','c','S','s',0}; static HANDLE exit_event; static SERVICE_STATUS_HANDLE service_handle; +HRESULT __cdecl irpcss_get_thread_seq_id(handle_t h, DWORD *id) +{ + static LONG thread_seq_id; + *id = InterlockedIncrement(&thread_seq_id); + return S_OK; +} + static RPC_STATUS RPCSS_Initialize(void) { static unsigned short irot_protseq[] = IROT_PROTSEQ; @@ -45,6 +53,8 @@ static RPC_STATUS RPCSS_Initialize(void) static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + static unsigned short irpcss_protseq[] = IRPCSS_PROTSEQ; + static unsigned short irpcss_endpoint[] = IRPCSS_ENDPOINT; static const struct protseq_map { unsigned short *protseq; @@ -54,11 +64,13 @@ static RPC_STATUS RPCSS_Initialize(void) { epm_protseq, epm_endpoint }, { epm_protseq_lrpc, epm_endpoint_lrpc }, { irot_protseq, irot_endpoint }, + { irpcss_protseq, irpcss_endpoint }, }; RPC_IF_HANDLE ifspecs[] = { epm_v3_0_s_ifspec, Irot_v0_2_s_ifspec, + Irpcss_v0_0_s_ifspec, }; RPC_STATUS status; int i, j;

1 0

Nikolay Sivov : rpcss: Make initialization helper easier to extend.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 52218251368ae7b9c9abfa309be7c1cc5d8e2e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=52218251368ae7b9c9abfa30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 7 22:59:59 2019 +0300 rpcss: Make initialization helper easier to extend. 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> --- programs/rpcss/rpcss_main.c | 102 +++++++++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 45 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 6d24ccbc07..42749028c3 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -37,53 +37,60 @@ static WCHAR rpcssW[] = {'R','p','c','S','s',0}; static HANDLE exit_event; static SERVICE_STATUS_HANDLE service_handle; -static BOOL RPCSS_Initialize(void) +static RPC_STATUS RPCSS_Initialize(void) { - static unsigned short irot_protseq[] = IROT_PROTSEQ; - static unsigned short irot_endpoint[] = IROT_ENDPOINT; - static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; - static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; - static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; - static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; - RPC_STATUS status; - - WINE_TRACE("\n"); - - status = RpcServerRegisterIf(epm_v3_0_s_ifspec, NULL, NULL); - if (status != RPC_S_OK) - return status; - status = RpcServerRegisterIf(Irot_v0_2_s_ifspec, NULL, NULL); - if (status != RPC_S_OK) - { - RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); - return FALSE; - } - - status = RpcServerUseProtseqEpW(epm_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - epm_endpoint, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerUseProtseqEpW(epm_protseq_lrpc, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - epm_endpoint_lrpc, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerUseProtseqEpW(irot_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - irot_endpoint, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); - if (status != RPC_S_OK) - goto fail; - - return TRUE; + static unsigned short irot_protseq[] = IROT_PROTSEQ; + static unsigned short irot_endpoint[] = IROT_ENDPOINT; + static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; + static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; + static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + static const struct protseq_map + { + unsigned short *protseq; + unsigned short *endpoint; + } protseqs[] = + { + { epm_protseq, epm_endpoint }, + { epm_protseq_lrpc, epm_endpoint_lrpc }, + { irot_protseq, irot_endpoint }, + }; + RPC_IF_HANDLE ifspecs[] = + { + epm_v3_0_s_ifspec, + Irot_v0_2_s_ifspec, + }; + RPC_STATUS status; + int i, j; + + WINE_TRACE("\n"); + + for (i = 0, j = 0; i < ARRAY_SIZE(ifspecs); ++i, j = i) + { + status = RpcServerRegisterIf(ifspecs[i], NULL, NULL); + if (status != RPC_S_OK) + goto fail; + } + + for (i = 0; i < ARRAY_SIZE(protseqs); ++i) + { + status = RpcServerUseProtseqEpW(protseqs[i].protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + protseqs[i].endpoint, NULL); + if (status != RPC_S_OK) + goto fail; + } + + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); + if (status != RPC_S_OK) + goto fail; + + return RPC_S_OK; fail: - RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); - RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, FALSE); - return FALSE; + for (i = 0; i < j; ++i) + RpcServerUnregisterIf(ifspecs[i], NULL, FALSE); + + return status; } static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) @@ -121,10 +128,15 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { SERVICE_STATUS status; + RPC_STATUS ret; TRACE( "starting service\n" ); - if (!RPCSS_Initialize()) return; + if ((ret = RPCSS_Initialize())) + { + WARN("Failed to initialize rpc interfaces, status %d.\n", ret); + return; + } exit_event = CreateEventW( NULL, TRUE, FALSE, NULL );

1 0

Nikolay Sivov : ole32: Reimplement CoGetCurrentProcess() to use global counter from rpcss.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: c79b9bb46fca1df2d10b58ce3ea032016c8a0d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c79b9bb46fca1df2d10b58ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 7 23:00:01 2019 +0300 ole32: Reimplement CoGetCurrentProcess() to use global counter from rpcss. 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/ole32/Makefile.in | 1 + dlls/ole32/compobj.c | 18 +++++------ dlls/ole32/compobj_private.h | 5 ++- dlls/ole32/irpcss.idl | 21 +++++++++++++ dlls/ole32/moniker.c | 75 +++++++++++++++++++++++++++++++++++++------- dlls/ole32/tests/compobj.c | 27 ++++++++++++++++ 6 files changed, 125 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 6c2f1231f1..32de987a8c 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -48,6 +48,7 @@ RC_SRCS = ole32res.rc IDL_SRCS = \ dcom.idl \ irot.idl \ + irpcss.idl \ ole32_objidl.idl \ ole32_oleidl.idl \ ole32_unknwn.idl diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0dc0d39c22..a91067fcb7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4027,18 +4027,18 @@ done: /****************************************************************************** * CoGetCurrentProcess [OLE32.@] - * - * Gets the current process ID. - * - * RETURNS - * The current process ID. - * - * NOTES - * Is DWORD really the correct return type for this function? */ DWORD WINAPI CoGetCurrentProcess(void) { - return GetCurrentProcessId(); + struct oletls *info = COM_CurrentInfo(); + + if (!info) + return 0; + + if (!info->thread_seqid) + info->thread_seqid = rpcss_get_next_seqid(); + + return info->thread_seqid; } /*********************************************************************** diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index bda1c6bff2..29f94421d1 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -165,7 +165,7 @@ struct oletls { struct apartment *apt; IErrorInfo *errorinfo; /* see errorinfo.c */ - IUnknown *state; /* see CoSetState */ + DWORD thread_seqid;/* returned with CoGetCurrentProcess */ DWORD apt_mask; /* apartment mask (+0Ch on x86) */ void *unknown0; DWORD inits; /* number of times CoInitializeEx called */ @@ -178,6 +178,7 @@ struct oletls IUnknown *call_state; /* current call context (+3Ch on x86) */ DWORD unknown2[46]; IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ + IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; }; @@ -355,4 +356,6 @@ static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) extern HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, BOOL copy, IEnumSTATDATA **ppenum) DECLSPEC_HIDDEN; +extern DWORD rpcss_get_next_seqid(void) DECLSPEC_HIDDEN; + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/irpcss.idl b/dlls/ole32/irpcss.idl new file mode 100644 index 0000000000..65078167de --- /dev/null +++ b/dlls/ole32/irpcss.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2019 Nikolay Sivov 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 + */ + +#pragma makedep client + +#include "wine/irpcss.idl" diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 82d829d719..f82159d9e1 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -41,6 +41,7 @@ #include "compobj_private.h" #include "moniker.h" #include "irot.h" +#include "irpcss.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -77,6 +78,7 @@ typedef struct RunningObjectTableImpl static RunningObjectTableImpl* runningObjectTableInstance = NULL; static IrotHandle irot_handle; +static RPC_BINDING_HANDLE irpcss_handle; /* define the EnumMonikerImpl structure */ typedef struct EnumMonikerImpl @@ -102,23 +104,30 @@ static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface) static HRESULT EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, ULONG pos, IEnumMoniker **ppenumMoniker); +static RPC_BINDING_HANDLE get_rpc_handle(unsigned short *protseq, unsigned short *endpoint) +{ + RPC_BINDING_HANDLE handle = NULL; + RPC_STATUS status; + RPC_WSTR binding; + + status = RpcStringBindingComposeW(NULL, protseq, NULL, endpoint, NULL, &binding); + if (status == RPC_S_OK) + { + status = RpcBindingFromStringBindingW(binding, &handle); + RpcStringFreeW(&binding); + } + + return handle; +} + static IrotHandle get_irot_handle(void) { if (!irot_handle) { - RPC_STATUS status; - RPC_WSTR binding; - IrotHandle new_handle; - unsigned short ncacn_np[] = IROT_PROTSEQ; + unsigned short protseq[] = IROT_PROTSEQ; unsigned short endpoint[] = IROT_ENDPOINT; - status = RpcStringBindingComposeW(NULL, ncacn_np, NULL, endpoint, NULL, &binding); - if (status == RPC_S_OK) - { - status = RpcBindingFromStringBindingW(binding, &new_handle); - RpcStringFreeW(&binding); - } - if (status != RPC_S_OK) - return NULL; + + IrotHandle new_handle = get_rpc_handle(protseq, endpoint); if (InterlockedCompareExchangePointer(&irot_handle, new_handle, NULL)) /* another thread beat us to it */ RpcBindingFree(&new_handle); @@ -126,6 +135,21 @@ static IrotHandle get_irot_handle(void) return irot_handle; } +static RPC_BINDING_HANDLE get_irpcss_handle(void) +{ + if (!irpcss_handle) + { + unsigned short protseq[] = IROT_PROTSEQ; + unsigned short endpoint[] = IROT_ENDPOINT; + + RPC_BINDING_HANDLE new_handle = get_rpc_handle(protseq, endpoint); + if (InterlockedCompareExchangePointer(&irpcss_handle, new_handle, NULL)) + /* another thread beat us to it */ + RpcBindingFree(&new_handle); + } + return irpcss_handle; +} + static BOOL start_rpcss(void) { static const WCHAR rpcssW[] = {'R','p','c','S','s',0}; @@ -176,6 +200,33 @@ static BOOL start_rpcss(void) return ret; } +DWORD rpcss_get_next_seqid(void) +{ + DWORD id = 0; + HRESULT hr; + + for (;;) + { + __TRY + { + hr = irpcss_get_thread_seq_id(get_irpcss_handle(), &id); + } + __EXCEPT(rpc_filter) + { + hr = HRESULT_FROM_WIN32(GetExceptionCode()); + } + __ENDTRY + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) + { + if (start_rpcss()) + continue; + } + break; + } + + return id; +} + static HRESULT create_stream_on_mip_ro(const InterfaceData *mip, IStream **stream) { HGLOBAL hglobal = GlobalAlloc(0, mip->ulCntData); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 8412ee45a0..6b15040ebe 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3893,6 +3893,31 @@ static void test_implicit_mta(void) CoUninitialize(); } +static DWORD WINAPI co_get_current_process_thread(void *param) +{ + DWORD *id = param; + + *id = CoGetCurrentProcess(); + return 0; +} + +static void test_CoGetCurrentProcess(void) +{ + DWORD id, id2; + HANDLE thread; + + id = CoGetCurrentProcess(); + ok(!!id && id != GetCurrentProcessId() && id != GetCurrentThreadId(), "Unexpected result %d.\n", id); + + id2 = 0; + thread = CreateThread(NULL, 0, co_get_current_process_thread, &id2, 0, NULL); + ok(thread != NULL, "Failed to create test thread.\n"); + ok(!WaitForSingleObject(thread, 10000), "Wait timed out.\n"); + CloseHandle(thread); + + ok(id2 && id2 != id, "Unexpected id from another thread.\n"); +} + START_TEST(compobj) { init_funcs(); @@ -3949,5 +3974,7 @@ START_TEST(compobj) test_CoGetInstanceFromFile(); test_GlobalOptions(); test_implicit_mta(); + test_CoGetCurrentProcess(); + DeleteFileA( testlib ); }

1 0

Zebediah Figura : configure: Install winebus.inf.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 86f51040e8912398547a9a8093941fc6fc385fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f51040e8912398547a9a80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:51 2019 -0600 configure: Install winebus.inf. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index d69d1ac4a3..f1797bf603 100755 --- a/configure +++ b/configure @@ -21231,6 +21231,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +loader/winebus.inf \ loader/winehid.inf \ programs/msidb/msidb \ programs/msiexec/msiexec \ diff --git a/configure.ac b/configure.ac index c99db6984b..e5003f769c 100644 --- a/configure.ac +++ b/configure.ac @@ -4100,6 +4100,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +loader/winebus.inf \ loader/winehid.inf \ programs/msidb/msidb \ programs/msiexec/msiexec \

1 0

Zebediah Figura : setupapi: Fix setting filepart in SetupCopyOEMInfW().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 161a0c259acc97064cdf9d71f86f982506b01538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=161a0c259acc97064cdf9d71… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:52 2019 -0600 setupapi: Fix setting filepart in SetupCopyOEMInfW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 3fadb6827b..3b5d62b682 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1073,6 +1073,7 @@ done: if (buffer_size >= size) { lstrcpyW( dest, target ); + if (filepart) *filepart = wcsrchr( dest, '\\' ) + 1; } else { @@ -1081,7 +1082,6 @@ done: } } - if (filepart) *filepart = wcsrchr( target, '\\' ) + 1; if (required_size) *required_size = size; if (ret) SetLastError(ERROR_SUCCESS);

1 0