wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Zebediah Figura : qcap/tests: Add some tests for unconnected filter state change.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 4f29ddf7fbceb71ed209177089ce309736c046e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f29ddf7fbceb71ed2091770… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:51 2019 -0500 qcap/tests: Add some tests for unconnected filter state change. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/audiorecord.c | 53 ++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/avico.c | 53 ++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/avimux.c | 58 ++++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/smartteefilter.c | 58 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 222 insertions(+) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index e599165d19..11ef690b99 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -245,6 +245,58 @@ static void test_property_bag(IMoniker *mon) IPropertyBag_Release(devenum_bag); } +static void test_unconnected_filter_state(IBaseFilter *filter) +{ + FILTER_STATE state; + HRESULT hr; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); +} + START_TEST(audiorecord) { ICreateDevEnum *devenum; @@ -285,6 +337,7 @@ START_TEST(audiorecord) ok(hr == S_OK, "Got hr %#x.\n", hr); test_interfaces(filter); + test_unconnected_filter_state(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index dbc15e3f15..5c6d4aa54f 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -655,6 +655,58 @@ static void test_enum_media_types(IBaseFilter *filter) IPin_Release(pin); } +static void test_unconnected_filter_state(IBaseFilter *filter) +{ + FILTER_STATE state; + HRESULT hr; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); +} + START_TEST(avico) { static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', @@ -697,6 +749,7 @@ START_TEST(avico) test_pin_info(filter); test_media_types(filter); test_enum_media_types(filter); + test_unconnected_filter_state(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index 85ebd5c82c..572314f8ab 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -798,6 +798,63 @@ static void test_seeking(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_unconnected_filter_state(void) +{ + IBaseFilter *filter = create_avi_mux(); + FILTER_STATE state; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(avimux) { CoInitialize(NULL); @@ -810,6 +867,7 @@ START_TEST(avimux) test_media_types(); test_enum_media_types(); test_seeking(); + test_unconnected_filter_state(); CoUninitialize(); } diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 487c8eca3c..437f3f4a7f 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2154,6 +2154,63 @@ end: IEnumMediaTypes_Release(enumMediaTypes); } +static void test_unconnected_filter_state(void) +{ + IBaseFilter *filter = create_smart_tee(); + FILTER_STATE state; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_smart_tee_filter_aggregation(void) { SourceFilter *sourceFilter = create_video_SourceFilter(); @@ -2381,6 +2438,7 @@ START_TEST(smartteefilter) test_find_pin(); test_pin_info(); test_enum_media_types(); + test_unconnected_filter_state(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Zebediah Figura : qcap/avico: Don't try to commit a NULL allocator in AVICompressor_Run().
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 084cb90f5834aa6dbdf69c7e24b6f0f72b0707de URL: https://source.winehq.org/git/wine.git/?a=commit;h=084cb90f5834aa6dbdf69c7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:50 2019 -0500 qcap/avico: Don't try to commit a NULL allocator in AVICompressor_Run(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 89e8dda08f..ea98b2a655 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -148,8 +148,8 @@ static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStar if(This->filter.state == State_Running) return S_OK; - hres = IMemAllocator_Commit(This->source.pAllocator); - if(FAILED(hres)) { + if (This->source.pAllocator && FAILED(hres = IMemAllocator_Commit(This->source.pAllocator))) + { FIXME("Commit failed: %08x\n", hres); return hres; }

1 0

Zebediah Figura : quartz/tests: Add some tests for unconnected filter state change.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: c08ab0b941db2cf47a9e93311bfa690f020cb32d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c08ab0b941db2cf47a9e9331… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:49 2019 -0500 quartz/tests: Add some tests for unconnected filter state change. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/avidec.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/avisplit.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/dsoundrender.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/filesource.c | 61 +++++++++++++++++---------------------- dlls/quartz/tests/mpegsplit.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/videorenderer.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/waveparser.c | 58 +++++++++++++++++++++++++++++++++++++ 10 files changed, 549 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c08ab0b941db2cf47a9e…

1 0

Zebediah Figura : strmbase: Don't execute OnStartStreaming() or OnStopStreaming() callbacks if the sink is unconnected.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 802ebaf9dbe781db73ac1b9373b659aad687fd45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=802ebaf9dbe781db73ac1b93… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:48 2019 -0500 strmbase: Don't execute OnStartStreaming() or OnStopStreaming() callbacks if the sink is unconnected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 5634ab1905..051230186d 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -407,7 +407,7 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) EnterCriticalSection(&This->csRenderLock); { RendererPosPassThru_ResetMediaTime(This->pPosition); - if (This->pFuncsTable->renderer_stop_stream) + if (This->sink.pin.pConnectedTo && This->pFuncsTable->renderer_stop_stream) This->pFuncsTable->renderer_stop_stream(This); This->filter.state = State_Stopped; SetEvent(This->state_event); @@ -449,7 +449,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) if (SUCCEEDED(hr)) { QualityControlRender_Start(This->qcimpl, This->filter.rtStreamStart); - if (This->pFuncsTable->renderer_start_stream) + if (This->sink.pin.pConnectedTo && This->pFuncsTable->renderer_start_stream) This->pFuncsTable->renderer_start_stream(This); if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); @@ -477,7 +477,7 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) ResetEvent(This->state_event); This->sink.end_of_stream = FALSE; } - else if (This->pFuncsTable->renderer_stop_stream) + else if (This->sink.pin.pConnectedTo && This->pFuncsTable->renderer_stop_stream) This->pFuncsTable->renderer_stop_stream(This); if (This->filter.state == State_Stopped)

1 0

Alexandre Julliard : kernelbase: Use set_ntstatus() in more places.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 31d522ea53e5cfeb426e88e5badd3864be5b047a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31d522ea53e5cfeb426e88e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 12:42:16 2019 +0200 kernelbase: Use set_ntstatus() in more places. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/loader.c | 30 +++++-------------- dlls/kernelbase/main.c | 14 ++------- dlls/kernelbase/memory.c | 9 ++---- dlls/kernelbase/sync.c | 78 ++++++++---------------------------------------- dlls/kernelbase/thread.c | 47 +++++++++++------------------ 5 files changed, 43 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31d522ea53e5cfeb426e…

1 0

Alexandre Julliard : winegcc: Centralize argument parsing into the main switch.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 0bfee2c6eb3aa9a688e9493eff7565b5cdafb8f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bfee2c6eb3aa9a688e9493e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 13:25:59 2019 +0200 winegcc: Centralize argument parsing into the main switch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 90 ++++++++++++++++++------------------------------- 1 file changed, 33 insertions(+), 57 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 6f26f60709..0ca553318e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1304,7 +1304,6 @@ static int is_linker_arg(const char* arg) { case 'R': case 'z': - case 'l': case 'u': return 1; case 'W': @@ -1324,43 +1323,6 @@ static int is_linker_arg(const char* arg) return 0; } -/* - * Target Options - * -b machine -V version - */ -static int is_target_arg(const char* arg) -{ - return arg[1] == 'b' || arg[1] == 'V'; -} - - -/* - * Directory Options - * -Bprefix -Idir -I- -Ldir -specs=file - */ -static int is_directory_arg(const char* arg) -{ - return arg[1] == 'B' || arg[1] == 'L' || arg[1] == 'I' || strncmp("-specs=", arg, 7) == 0; -} - -/* - * MinGW Options - * -mno-cygwin -mwindows -mconsole -mthreads -municode - */ -static int is_mingw_arg(const char* arg) -{ - static const char* mingw_switches[] = - { - "-mno-cygwin", "-mwindows", "-mconsole", "-mthreads", "-municode" - }; - unsigned int j; - - for (j = 0; j < ARRAY_SIZE(mingw_switches); j++) - if (strcmp(mingw_switches[j], arg) == 0) return 1; - - return 0; -} - static void parse_target_option( struct options *opts, const char *target ) { char *p, *platform, *spec = xstrdup( target ); @@ -1524,25 +1486,8 @@ int main(int argc, char **argv) } /* determine what options go 'as is' to the linker & the compiler */ - raw_compiler_arg = raw_linker_arg = 0; - if (is_linker_arg(argv[i])) - { - raw_linker_arg = 1; - } - else - { - if (is_directory_arg(argv[i]) || is_target_arg(argv[i])) - raw_linker_arg = 1; - raw_compiler_arg = !is_mingw_arg(argv[i]); - } - - /* these things we handle explicitly so we don't pass them 'as is' */ - if (argv[i][1] == 'l' || argv[i][1] == 'I' || argv[i][1] == 'L') - raw_linker_arg = 0; - if (argv[i][1] == 'c' || argv[i][1] == 'L') - raw_compiler_arg = 0; - if (argv[i][1] == 'o' || argv[i][1] == 'b' || argv[i][1] == 'V') - raw_compiler_arg = raw_linker_arg = 0; + raw_linker_arg = is_linker_arg(argv[i]); + raw_compiler_arg = !raw_linker_arg; /* do a bit of semantic analysis */ switch (argv[i][1]) @@ -1552,14 +1497,18 @@ int main(int argc, char **argv) if (strendswith(str, "/")) str[strlen(str) - 1] = 0; if (!opts.prefix) opts.prefix = strarray_alloc(); strarray_add(opts.prefix, str); + raw_linker_arg = 1; break; case 'b': parse_target_option( &opts, option_arg ); + raw_compiler_arg = 0; break; case 'V': opts.version = xstrdup( option_arg ); + raw_compiler_arg = 0; break; case 'c': /* compile or assemble */ + raw_compiler_arg = 0; if (argv[i][2] == 0) opts.compile_only = 1; /* fall through */ case 'S': /* generate assembler code */ @@ -1583,24 +1532,45 @@ int main(int argc, char **argv) break; case 'l': strarray_add(opts.files, strmake("-l%s", option_arg)); + raw_compiler_arg = 0; break; case 'L': strarray_add(opts.lib_dirs, option_arg); + raw_compiler_arg = 0; break; case 'M': /* map file generation */ linking = 0; break; case 'm': if (strcmp("-mno-cygwin", argv[i]) == 0) + { opts.use_msvcrt = 1; + raw_compiler_arg = 0; + } else if (strcmp("-mwindows", argv[i]) == 0) + { opts.gui_app = 1; + raw_compiler_arg = 0; + } else if (strcmp("-mconsole", argv[i]) == 0) + { opts.gui_app = 0; + raw_compiler_arg = 0; + } else if (strcmp("-municode", argv[i]) == 0) + { opts.unicode_app = 1; + raw_compiler_arg = 0; + } + else if (strcmp("-mthreads", argv[i]) == 0) + { + raw_compiler_arg = 0; + } else if (strcmp("-m16", argv[i]) == 0) + { opts.win16_app = 1; + raw_compiler_arg = 0; + } else if (strcmp("-m32", argv[i]) == 0) { if (opts.target_cpu == CPU_x86_64) @@ -1642,12 +1612,15 @@ int main(int argc, char **argv) break; case 'o': opts.output_name = option_arg; + raw_compiler_arg = 0; break; case 's': if (strcmp("-static", argv[i]) == 0) linking = -1; else if(strcmp("-save-temps", argv[i]) == 0) keep_generated = 1; + else if (strncmp("-specs=", argv[i], 7) == 0) + raw_linker_arg = 1; else if(strcmp("-shared", argv[i]) == 0) { opts.shared = 1; @@ -1723,7 +1696,10 @@ int main(int argc, char **argv) if (strcmp("-static", argv[i]+1) == 0) linking = -1; else if (is_option( argv, i, "--sysroot", &option_arg )) + { opts.sysroot = option_arg; + raw_linker_arg = 1; + } else if (is_option( argv, i, "--target", &option_arg )) { parse_target_option( &opts, option_arg );

1 0

Alexandre Julliard : rpcrt4: Add stubless proxy support for ARM64.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: d9adc902f88445fb1a33825775884de394124d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9adc902f88445fb1a338257… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 12:39:49 2019 +0200 rpcrt4: Add stubless proxy support for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cproxy.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/cstub.c | 17 +++++++++++++++++ dlls/rpcrt4/ndr_stubless.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 3b9467735b..968c7b5156 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -196,6 +196,50 @@ static inline void init_thunk( struct thunk *thunk, unsigned int index ) thunk->func = call_stubless_func; } +#elif defined(__aarch64__) + +extern void call_stubless_func(void); +__ASM_GLOBAL_FUNC( call_stubless_func, + "stp x29, x30, [sp, #-0x90]!\n\t" + "mov x29, sp\n\t" + "stp d0, d1, [sp, #0x10]\n\t" + "stp d2, d3, [sp, #0x20]\n\t" + "stp d4, d5, [sp, #0x30]\n\t" + "stp d6, d7, [sp, #0x40]\n\t" + "stp x0, x1, [sp, #0x50]\n\t" + "stp x2, x3, [sp, #0x60]\n\t" + "stp x4, x5, [sp, #0x70]\n\t" + "stp x6, x7, [sp, #0x80]\n\t" + "ldr x0, [x0]\n\t" /* This->lpVtbl */ + "ldr x0, [x0, #-16]\n\t" /* MIDL_STUBLESS_PROXY_INFO */ + "ldp x1, x4, [x0, #8]\n\t" /* info->ProcFormatString, FormatStringOffset */ + "ldrh w4, [x4, x16, lsl #1]\n\t" /* info->FormatStringOffset[index] */ + "add x1, x1, x4\n\t" /* info->ProcFormatString + offset */ + "ldr x0, [x0]\n\t" /* info->pStubDesc */ + "add x2, sp, #0x50\n\t" /* stack */ + "add x3, sp, #0x10\n\t" /* fpu_stack */ + "bl " __ASM_NAME("ndr_client_call") "\n\t" + "ldp x29, x30, [sp], #0x90\n\t" + "ret" ) + +struct thunk +{ + DWORD ldr_index; /* ldr w16, index */ + DWORD ldr_func; /* ldr x17, func */ + DWORD br; /* br x17 */ + DWORD index; + void *func; +}; + +static inline void init_thunk( struct thunk *thunk, unsigned int index ) +{ + thunk->ldr_index = 0x18000070; /* ldr w16,index */ + thunk->ldr_func = 0x58000071; /* ldr x17,func */ + thunk->br = 0xd61f0220; /* br x17 */ + thunk->index = index; + thunk->func = call_stubless_func; +} + #else /* __i386__ */ #warning You must implement stubless proxies for your CPU diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 607e9d4bc8..1903a5f0c9 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -183,6 +183,23 @@ typedef struct DWORD offset; } vtbl_method_t; +#elif defined(__aarch64__) + +static const DWORD opcodes[] = +{ + 0xf9401000, /* ldr x0, [x0,#32] */ + 0xf9400010, /* ldr x16, [x0] */ + 0x18000071, /* ldr w17, offset */ + 0xf8716a10, /* ldr x16, [x16,x17] */ + 0xd61f0200 /* br x16 */ +}; + +typedef struct +{ + DWORD opcodes[ARRAY_SIZE(opcodes)]; + DWORD offset; +} vtbl_method_t; + #else #warning You must implement delegated proxies/stubs for your CPU diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index bceecdc827..cc52ee27e8 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1169,6 +1169,35 @@ __ASM_GLOBAL_FUNC( call_server_func, "5:\tblx r4\n\t" "mov SP, r5\n\t" "pop {r4, r5, PC}" ) +#elif defined __aarch64__ +LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char *args, unsigned int stack_size); +__ASM_GLOBAL_FUNC( call_server_func, + "stp x29, x30, [sp, #-16]!\n\t" + "mov x29, sp\n\t" + "add x3, x2, #15\n\t" + "lsr x3, x3, #4\n\t" + "sub sp, sp, x3, lsl #4\n\t" + "cbz x2, 2f\n" + "1:\tsub x2, x2, #8\n\t" + "ldr x4, [x1, x2]\n\t" + "str x4, [sp, x2]\n\t" + "cbnz x2, 1b\n" + "2:\tmov x8, x0\n\t" + "cbz x3, 3f\n\t" + "ldp x0, x1, [sp], #16\n\t" + "cmp x3, #1\n\t" + "b.le 3f\n\t" + "ldp x2, x3, [sp], #16\n\t" + "cmp x3, #2\n\t" + "b.le 3f\n\t" + "ldp x4, x5, [sp], #16\n\t" + "cmp x3, #3\n\t" + "b.le 3f\n\t" + "ldp x6, x7, [sp], #16\n" + "3:\tblr x8\n\t" + "mov sp, x29\n\t" + "ldp x29, x30, [sp], #16\n\t" + "ret" ) #else #warning call_server_func not implemented for your architecture LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned short stack_size)

1 0

Alexandre Julliard : oleaut32: Return value pointer needs to be in x8 on ARM64.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: d01470ad451b5aff7b1586f35ef90ff039458d02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01470ad451b5aff7b1586f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 12:00:09 2019 +0200 oleaut32: Return value pointer needs to be in x8 on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d40c0efb0f..7ad92837da 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6823,7 +6823,7 @@ __ASM_GLOBAL_FUNC( call_method, "ldr x4, [x2, x1, lsl #3]\n\t" "str x4, [sp, x1, lsl #3]\n\t" "cbnz x1, 1b\n" - "2:\tmov x8, x0\n\t" + "2:\tmov x16, x0\n\t" "mov x9, x3\n\t" "ldp d0, d1, [x9]\n\t" "ldp d2, d3, [x9, #0x10]\n\t" @@ -6833,7 +6833,8 @@ __ASM_GLOBAL_FUNC( call_method, "ldp x2, x3, [x9, #0x50]\n\t" "ldp x4, x5, [x9, #0x60]\n\t" "ldp x6, x7, [x9, #0x70]\n\t" - "blr x8\n\t" + "ldr x8, [x9, #0x80]\n\t" + "blr x16\n\t" "mov sp, x29\n\t" "ldp x29, x30, [sp], #16\n\t" "ret" ) @@ -6856,7 +6857,7 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART float f; double d; } fp[8]; - DWORD_PTR x[8]; + DWORD_PTR x[9]; } regs; int rcount; /* 64-bit register index count */ int fpcount = 0; /* float register index count */ @@ -6887,7 +6888,7 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART { case VT_DECIMAL: case VT_VARIANT: - regs.x[rcount++] = (DWORD_PTR)result; /* arg 0 is a pointer to the result */ + regs.x[8] = (DWORD_PTR)result; /* x8 is a pointer to the result */ break; case VT_HRESULT: WARN("invalid return type %u\n", ret_type);

1 0

Alexandre Julliard : winegcc: Update __stdcall defines for ARM platforms.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: c3072237911eba11195cd3aa0018186022cac869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3072237911eba11195cd3aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 12:01:40 2019 +0200 winegcc: Update __stdcall defines for ARM platforms. Reported by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f1798a8978..6f26f60709 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -723,32 +723,29 @@ static void compile(struct options* opts, const char* lang) switch (opts->target_cpu) { case CPU_x86_64: + case CPU_ARM64: strarray_add(comp_args, "-D__stdcall=__attribute__((ms_abi))"); - strarray_add(comp_args, "-D__cdecl=__attribute__((ms_abi))"); - strarray_add(comp_args, "-D_stdcall=__attribute__((ms_abi))"); - strarray_add(comp_args, "-D_cdecl=__attribute__((ms_abi))"); - strarray_add(comp_args, "-D__fastcall=__attribute__((ms_abi))"); - strarray_add(comp_args, "-D_fastcall=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D__cdecl=__stdcall"); + strarray_add(comp_args, "-D__fastcall=__stdcall"); break; case CPU_x86: strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); - strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); - strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); - strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); break; case CPU_ARM: - case CPU_ARM64: + strarray_add(comp_args, "-D__stdcall=__attribute__((pcs(\"aapcs-vfp\")))"); + strarray_add(comp_args, "-D__cdecl=__stdcall"); + strarray_add(comp_args, "-D__fastcall=__stdcall"); case CPU_POWERPC: strarray_add(comp_args, "-D__stdcall="); strarray_add(comp_args, "-D__cdecl="); - strarray_add(comp_args, "-D_stdcall="); - strarray_add(comp_args, "-D_cdecl="); strarray_add(comp_args, "-D__fastcall="); - strarray_add(comp_args, "-D_fastcall="); break; } + strarray_add(comp_args, "-D_stdcall=__stdcall"); + strarray_add(comp_args, "-D_cdecl=__cdecl"); + strarray_add(comp_args, "-D_fastcall=__fastcall"); strarray_add(comp_args, "-D__declspec(x)=__declspec_##x"); strarray_add(comp_args, "-D__declspec_align(x)=__attribute__((aligned(x)))"); strarray_add(comp_args, "-D__declspec_allocate(x)=__attribute__((section(x)))");

1 0

Francois Gouget : testbot/SpecialJobs: Don't create jobs if given no VM.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: tools Branch: master Commit: 8fd5b0f126a222e3b55a932d899571735a35af20 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8fd5b0f126a222e3b55a932… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 13:03:24 2019 +0200 testbot/SpecialJobs: Don't create jobs if given no VM. The jobs would have no task! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/SpecialJobs.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index d709e48..c313567 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -61,6 +61,7 @@ sub GetReconfigVMs($$) sub AddReconfigJob($$$) { my ($VMs, $VMKey, $VMType) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs(); @@ -138,6 +139,7 @@ sub GetWindowsTestVMs($$$) sub AddWindowsTestJob($$$$$) { my ($VMs, $VMKey, $Build, $BaseJob, $LatestBaseName) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs(); @@ -221,6 +223,7 @@ sub GetWineTestVMs($) sub AddWineTestJob($$) { my ($VMs, $VMKey) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs();

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
63
Older →

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 September 2019