November 2020 - Wine-Commits

Zebediah Figura : quartz/avidec: Don't copy the media time to the output sample.
by Alexandre Julliard Nov. 20, 2020

Nov. 20, 2020

Module: wine Branch: master Commit: cd3b23c13ce98631432782942e633af441073e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd3b23c13ce9863143278294… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 17:24:14 2020 -0600 quartz/avidec: Don't copy the media time to the output sample. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 5 ----- dlls/quartz/tests/avidec.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 4995276dbfc..77d2b5e2aa5 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -204,11 +204,6 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, else IMediaSample_SetTime(pOutSample, NULL, NULL); - if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) - IMediaSample_SetMediaTime(pOutSample, &tStart, &tStop); - else - IMediaSample_SetMediaTime(pOutSample, NULL, NULL); - hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr); diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index ac1e245c9e6..b9bca9b02ef 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -911,7 +911,7 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample } hr = IMediaSample_GetMediaTime(sample, &start, &stop); - todo_wine ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); hr = IMediaSample_IsDiscontinuity(sample); todo_wine_if (testmode == 5) ok(hr == (testmode == 4) ? S_OK : S_FALSE, "Got hr %#x.\n", hr); hr = IMediaSample_IsPreroll(sample);

1 0

Zebediah Figura : quartz/avidec: Don't send ICM_DECOMPRESS_BEGIN or ICM_DECOMPRESS_END messages if the source is disconnected.
by Alexandre Julliard Nov. 20, 2020

Nov. 20, 2020

Module: wine Branch: master Commit: cf7717b830e99211e4d211dc4458338e2d667bb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf7717b830e99211e4d211dc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 17:24:12 2020 -0600 quartz/avidec: Don't send ICM_DECOMPRESS_BEGIN or ICM_DECOMPRESS_END messages if the source is disconnected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 11 ++++++++--- dlls/quartz/tests/avidec.c | 18 +++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 72f69ef7c5a..4995276dbfc 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -565,6 +565,9 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) LRESULT res; HRESULT hr; + if (!filter->source.pin.peer) + return S_OK; + filter->late = -1; source_format = (VIDEOINFOHEADER *)filter->sink.pin.mt.pbFormat; @@ -574,7 +577,7 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) return E_FAIL; } - if (filter->source.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) ERR("Failed to commit allocator, hr %#x.\n", hr); return S_OK; @@ -585,14 +588,16 @@ static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface) struct avi_decompressor *filter = impl_from_strmbase_filter(iface); LRESULT res; + if (!filter->source.pin.peer) + return S_OK; + if (filter->hvid && (res = ICDecompressEnd(filter->hvid))) { ERR("ICDecompressEnd() failed, error %ld.\n", res); return E_FAIL; } - if (filter->source.pin.peer) - IMemAllocator_Decommit(filter->source.pAllocator); + IMemAllocator_Decommit(filter->source.pAllocator); return S_OK; } diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index ddfe22ed797..8717e107106 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -692,25 +692,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + 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); + 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); + 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); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + 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); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -720,11 +720,11 @@ static void test_unconnected_filter_state(void) 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); + 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); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -956,7 +956,7 @@ static void test_connect_pin(void) ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); hr = IMediaControl_Stop(control);

1 0

Alexandre Julliard : msvcrt: Move the fenv_t definition to the public header.
by Alexandre Julliard Nov. 20, 2020

Nov. 20, 2020

Module: wine Branch: master Commit: 34422eb56cad1ba799270bc6dd56f31bec86023a URL: https://source.winehq.org/git/wine.git/?a=commit;h=34422eb56cad1ba799270bc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 12:51:23 2020 +0100 msvcrt: Move the fenv_t definition to the public header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 16 +++------ dlls/msvcrt/math.c | 81 +++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.h | 6 ---- include/msvcrt/fenv.h | 16 +++++++++ 4 files changed, 62 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34422eb56cad1ba79927…

1 0

Alexandre Julliard : msvcrt: Remove some duplicate definitions from msvcrt.h.
by Alexandre Julliard Nov. 20, 2020

Nov. 20, 2020

Module: wine Branch: master Commit: 1f11f41f613264dd5b937d0df0a3ee746db0517c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f11f41f613264dd5b937d0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 12:44:42 2020 +0100 msvcrt: Remove some duplicate definitions from msvcrt.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm.c | 5 +- dlls/msvcrt/except_arm64.c | 5 +- dlls/msvcrt/except_i386.c | 5 +- dlls/msvcrt/except_x86_64.c | 5 +- dlls/msvcrt/locale.c | 2 + dlls/msvcrt/math.c | 1 + dlls/msvcrt/mbcs.c | 1 + dlls/msvcrt/msvcrt.h | 268 +------------------------------------------- 8 files changed, 17 insertions(+), 275 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f11f41f613264dd5b93…

1 0

Zebediah Figura : quartz/tests: Add some tests for streaming events on the AVI decoder.
by Alexandre Julliard Nov. 20, 2020

Nov. 20, 2020

Module: wine Branch: master Commit: 48552496a4eff93c3830012a27295203abfff130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48552496a4eff93c3830012a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 17:24:15 2020 -0600 quartz/tests: Add some tests for streaming events on the AVI decoder. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avidec.c | 120 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index b9bca9b02ef..71f974806ea 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -116,8 +116,9 @@ static LRESULT CALLBACK vfw_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; BITMAPINFOHEADER *in = (BITMAPINFOHEADER *)lparam1; - ok(!memcmp(in, &sink_bitmap_info, sizeof(BITMAPINFOHEADER)), - "Input types didn't match.\n"); + todo_wine_if (in->biSizeImage != sink_bitmap_info.biSizeImage) + ok(!memcmp(in, &sink_bitmap_info, sizeof(BITMAPINFOHEADER)), + "Input types didn't match.\n"); todo_wine ok(!memcmp(out, &source_bitmap_info, sizeof(BITMAPINFOHEADER)), "Output types didn't match.\n"); ok(!in_begin, "Got multiple ICM_DECOMPRESS_BEGIN messages.\n"); @@ -796,7 +797,7 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *mt; - unsigned int got_sample; + unsigned int got_sample, got_new_segment, got_eos, got_begin_flush, got_end_flush; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -922,12 +923,48 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample return S_OK; } +static HRESULT testsink_new_segment(struct strmbase_sink *iface, + REFERENCE_TIME start, REFERENCE_TIME stop, double rate) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_new_segment; + ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start)); + ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop)); + ok(rate == 1.0, "Got rate %.16e.\n", rate); + return S_OK; +} + +static HRESULT testsink_eos(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_eos; + return S_OK; +} + +static HRESULT testsink_begin_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_begin_flush; + return S_OK; +} + +static HRESULT testsink_end_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_end_flush; + return S_OK; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, .base.pin_query_accept = testsink_query_accept, .base.pin_get_media_type = testsink_get_media_type, .pfnReceive = testsink_Receive, + .sink_new_segment = testsink_new_segment, + .sink_eos = testsink_eos, + .sink_begin_flush = testsink_begin_flush, + .sink_end_flush = testsink_end_flush, }; static void testfilter_init(struct testfilter *filter) @@ -1102,6 +1139,82 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, IMemAllocator_Release(allocator); } +static void test_streaming_events(IMediaControl *control, IPin *sink, + IMemInputPin *input, struct testfilter *testsink) +{ + IMemAllocator *allocator; + IMediaSample *sample; + HRESULT hr; + BYTE *data; + LONG i; + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 200; ++i) + data[i] = i; + hr = IMediaSample_SetActualDataLength(sample, 200); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetSyncPoint(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(!testsink->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + hr = IPin_NewSegment(sink, 10000, 20000, 1.0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + + ok(!testsink->got_eos, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!testsink->got_sample, "Got %u calls to Receive().\n", testsink->got_sample); + ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + testsink->got_eos = 0; + + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + + testmode = 0; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(testsink->got_sample == 1, "Got %u calls to Receive().\n", testsink->got_sample); + testsink->got_sample = 0; + + ok(!testsink->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + hr = IPin_BeginFlush(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_begin_flush == 1, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(sink); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ok(!testsink->got_end_flush, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + hr = IPin_EndFlush(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_end_flush == 1, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_sample == 1, "Got %u calls to Receive().\n", testsink->got_sample); + testsink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); +} + static void test_connect_pin(void) { VIDEOINFOHEADER req_format = @@ -1312,6 +1425,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); test_sample_processing(control, meminput, &testsink); + test_streaming_events(control, sink, meminput, &testsink); hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Michael Stefaniuc : imm32: Use wide-char string literals.
by Alexandre Julliard Nov. 20, 2020

Nov. 20, 2020

Module: wine Branch: master Commit: e7d088a6295f894fedb43cf9f748e9473f49f102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7d088a6295f894fedb43cf9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 19 23:03:03 2020 +0100 imm32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 45 +++++++++++++++------------------------------ dlls/imm32/tests/imm32.c | 10 +++------- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 0f3d7d5f8c8..9d2a09f22be 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -99,14 +99,8 @@ typedef struct _tagIMMThreadData { static struct list ImmHklList = LIST_INIT(ImmHklList); static struct list ImmThreadDataList = LIST_INIT(ImmThreadDataList); -static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','M','C','P','r','o','p','e','r','t','y',0}; - -static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; -static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; -static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; - -static const WCHAR szwIME[] = {'I','M','E',0}; -static const WCHAR szwDefaultIME[] = {'D','e','f','a','u','l','t',' ','I','M','E',0}; +static const WCHAR szwWineIMCProperty[] = L"WineImmHIMCProperty"; +static const WCHAR szImeRegFmt[] = L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\%08lx"; static CRITICAL_SECTION threaddata_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -297,23 +291,15 @@ static void IMM_FreeThreadData(void) static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; - static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; + static const WCHAR displayW[] = L"}\\0000"; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), L"__wine_display_device_guid" )); if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); @@ -321,7 +307,8 @@ static HMODULE load_graphics_driver(void) lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); - if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + if (!RegQueryValueExW( hkey, L"GraphicsDriver", NULL, NULL, (BYTE *)path, &size )) + ret = LoadLibraryW( path ); RegCloseKey( hkey ); TRACE( "%s %p\n", debugstr_w(path), ret ); return ret; @@ -1642,7 +1629,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, L"IME")) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE; @@ -1680,7 +1667,7 @@ BOOL WINAPI __wine_register_window(HWND hwnd) { /* Do not create the window inside of a critical section */ LeaveCriticalSection(&threaddata_cs); - new = CreateWindowExW( 0, szwIME, szwDefaultIME, + new = CreateWindowExW( 0, L"IME", L"Default IME", WS_POPUP | WS_DISABLED | WS_CLIPSIBLINGS, 0, 0, 1, 1, 0, 0, 0, 0); /* thread_data is in the current thread so we can assume it's still valid */ @@ -1785,13 +1772,11 @@ UINT WINAPI ImmGetDescriptionA( */ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) { - static const WCHAR name[] = { 'W','i','n','e',' ','X','I','M',0 }; - FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen); if (!hKL) return 0; - if (!uBufLen) return lstrlenW( name ); - lstrcpynW( lpszDescription, name, uBufLen ); + if (!uBufLen) return lstrlenW(L"Wine XIM" ); + lstrcpynW( lpszDescription, L"Wine XIM", uBufLen ); return lstrlenW( lpszDescription ); } @@ -1872,7 +1857,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) } length = 0; - rc = RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, NULL, &length); + rc = RegGetValueW(hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, NULL, &length); if (rc != ERROR_SUCCESS) { @@ -1892,7 +1877,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) return length / sizeof(WCHAR); } - RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, lpszFileName, &length); + RegGetValueW(hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, lpszFileName, &length); RegCloseKey(hkey); @@ -2111,10 +2096,10 @@ HKL WINAPI ImmInstallIMEW( if (rc == ERROR_SUCCESS) { - rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (const BYTE*)lpszIMEFileName, + rc = RegSetValueExW(hkey, L"Ime File", 0, REG_SZ, (const BYTE*)lpszIMEFileName, (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (const BYTE*)lpszLayoutText, + rc = RegSetValueExW(hkey, L"Layout Text", 0, REG_SZ, (const BYTE*)lpszLayoutText, (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); return hkl; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 827b31eec2e..cc9e0e8c01f 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1099,10 +1099,9 @@ static void test_ImmDefaultHwnd(void) static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) { - static const WCHAR imeW[] = {'I','M','E',0}; WCHAR class_nameW[16]; HWND *ime_window = (HWND *)param; - if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, imeW)) + if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, L"IME")) { *ime_window = hWnd; return FALSE; @@ -1562,9 +1561,6 @@ static LRESULT CALLBACK processkey_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, static void test_ime_processkey(void) { - WCHAR classNameW[] = {'P','r','o','c','e','s','s', 'K','e','y','T','e','s','t','C','l','a','s','s',0}; - WCHAR windowNameW[] = {'P','r','o','c','e','s','s', 'K','e','y',0}; - MSG msg; WNDCLASSW wclass; HANDLE hInstance = GetModuleHandleW(NULL); @@ -1573,7 +1569,7 @@ static void test_ime_processkey(void) INT rc; HWND hWndTest; - wclass.lpszClassName = classNameW; + wclass.lpszClassName = L"ProcessKeyTestClass"; wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = processkey_wnd_proc; wclass.hInstance = hInstance; @@ -1589,7 +1585,7 @@ static void test_ime_processkey(void) } /* create the test window that will receive the keystrokes */ - hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, + hWndTest = CreateWindowW(wclass.lpszClassName, L"ProcessKey", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, NULL, NULL, hInstance, NULL);

1 0

Michael Stefaniuc : itss: Use zero terminated WCHAR strings.
by Alexandre Julliard Nov. 20, 2020

Nov. 20, 2020

Module: wine Branch: master Commit: 688318261cf331979e28c87f393bb4f9d8bf1985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=688318261cf331979e28c87f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 19 23:03:02 2020 +0100 itss: Use zero terminated WCHAR strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/protocol.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 167ce906b90..6d40ddf738f 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -148,16 +148,16 @@ static ULONG WINAPI ITSInternetProtocol_Release(IInternetProtocol *iface) static LPCWSTR skip_schema(LPCWSTR url) { - static const WCHAR its_schema[] = {'i','t','s',':'}; - static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; - static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'}; - - if(!wcsnicmp(its_schema, url, ARRAY_SIZE(its_schema))) - return url + ARRAY_SIZE(its_schema); - if(!wcsnicmp(msits_schema, url, ARRAY_SIZE(msits_schema))) - return url + ARRAY_SIZE(msits_schema); - if(!wcsnicmp(mk_schema, url, ARRAY_SIZE(mk_schema))) - return url + ARRAY_SIZE(mk_schema); + static const WCHAR its_schema[] = L"its:"; + static const WCHAR msits_schema[] = L"ms-its:"; + static const WCHAR mk_schema[] = L"mk:@MSITStore:"; + + if(!wcsnicmp(its_schema, url, ARRAY_SIZE(its_schema) - 1)) + return url + ARRAY_SIZE(its_schema) - 1; + if(!wcsnicmp(msits_schema, url, ARRAY_SIZE(msits_schema) - 1)) + return url + ARRAY_SIZE(msits_schema) - 1; + if(!wcsnicmp(mk_schema, url, ARRAY_SIZE(mk_schema) - 1)) + return url + ARRAY_SIZE(mk_schema) - 1; return NULL; }

1 0

Michael Stefaniuc : itss: Use wide-char string literals.
by Alexandre Julliard Nov. 20, 2020

Nov. 20, 2020

Module: wine Branch: master Commit: c90294aba7258e532a7d42b6a7b75d785f5278d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c90294aba7258e532a7d42b6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 19 23:03:01 2020 +0100 itss: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/chm_lib.c | 33 ++++---------------------- dlls/itss/moniker.c | 7 ++---- dlls/itss/protocol.c | 8 ++----- dlls/itss/storage.c | 3 +-- dlls/itss/tests/protocol.c | 58 +++++++++++++++------------------------------- 5 files changed, 29 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c90294aba7258e532a7d…

1 0

Alexandre Julliard : msvcrt: Avoid msvcrt-specific types in the Unix library interface.
by Alexandre Julliard Nov. 20, 2020

Nov. 20, 2020

Module: wine Branch: master Commit: 8ecd9afc89269c3506f30585b92bbcce52dee4ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ecd9afc89269c3506f30585… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 11:20:04 2020 +0100 msvcrt: Avoid msvcrt-specific types in the Unix library interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/unixlib.c | 18 +++++++++--------- dlls/msvcrt/unixlib.h | 20 +++++++++----------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index b64355ebf16..3913d61048a 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -443,7 +443,7 @@ static double CDECL unix_jn(int n, double num) /********************************************************************* * ldexp */ -static double CDECL unix_ldexp(double num, MSVCRT_long exp) +static double CDECL unix_ldexp(double num, int exp) { return ldexp( num, exp ); } @@ -477,7 +477,7 @@ static float CDECL unix_lgammaf(float x) /********************************************************************* * llrint */ -static MSVCRT_longlong CDECL unix_llrint(double x) +static __int64 CDECL unix_llrint(double x) { return llrint(x); } @@ -485,7 +485,7 @@ static MSVCRT_longlong CDECL unix_llrint(double x) /********************************************************************* * llrintf */ -static MSVCRT_longlong CDECL unix_llrintf(float x) +static __int64 CDECL unix_llrintf(float x) { return llrintf(x); } @@ -589,7 +589,7 @@ static float CDECL unix_logbf( float x ) /********************************************************************* * lrint */ -static MSVCRT_long CDECL unix_lrint(double x) +static int CDECL unix_lrint(double x) { return lrint(x); } @@ -597,7 +597,7 @@ static MSVCRT_long CDECL unix_lrint(double x) /********************************************************************* * lrintf */ -static MSVCRT_long CDECL unix_lrintf(float x) +static int CDECL unix_lrintf(float x) { return lrintf(x); } @@ -795,7 +795,7 @@ static float CDECL unix_roundf(float x) /********************************************************************* * lround */ -static MSVCRT_long CDECL unix_lround(double x) +static int CDECL unix_lround(double x) { #ifdef HAVE_LROUND return lround(x); @@ -807,7 +807,7 @@ static MSVCRT_long CDECL unix_lround(double x) /********************************************************************* * lroundf */ -static MSVCRT_long CDECL unix_lroundf(float x) +static int CDECL unix_lroundf(float x) { #ifdef HAVE_LROUNDF return lroundf(x); @@ -819,7 +819,7 @@ static MSVCRT_long CDECL unix_lroundf(float x) /********************************************************************* * llround */ -static MSVCRT_longlong CDECL unix_llround(double x) +static __int64 CDECL unix_llround(double x) { #ifdef HAVE_LLROUND return llround(x); @@ -831,7 +831,7 @@ static MSVCRT_longlong CDECL unix_llround(double x) /********************************************************************* * llroundf */ -static MSVCRT_longlong CDECL unix_llroundf(float x) +static __int64 CDECL unix_llroundf(float x) { #ifdef HAVE_LLROUNDF return llroundf(x); diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index cfad08aee0b..b506151664f 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -21,8 +21,6 @@ #ifndef __UNIXLIB_H #define __UNIXLIB_H -#include "msvcrt.h" - struct unix_funcs { double (CDECL *acosh)(double x); @@ -62,13 +60,13 @@ struct unix_funcs double (CDECL *j0)(double num); double (CDECL *j1)(double num); double (CDECL *jn)(int n, double num); - double (CDECL *ldexp)(double x, MSVCRT_long exp); + double (CDECL *ldexp)(double x, int exp); double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); - MSVCRT_longlong (CDECL *llrint)(double x); - MSVCRT_longlong (CDECL *llrintf)(float x); - MSVCRT_longlong (CDECL *llround)(double x); - MSVCRT_longlong (CDECL *llroundf)(float x); + __int64 (CDECL *llrint)(double x); + __int64 (CDECL *llrintf)(float x); + __int64 (CDECL *llround)(double x); + __int64 (CDECL *llroundf)(float x); double (CDECL *log)(double x); float (CDECL *logf)(float x); double (CDECL *log10)(double x); @@ -79,10 +77,10 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *logb)(double x); float (CDECL *logbf)(float x); - MSVCRT_long (CDECL *lrint)(double x); - MSVCRT_long (CDECL *lrintf)(float x); - MSVCRT_long (CDECL *lround)(double x); - MSVCRT_long (CDECL *lroundf)(float x); + int (CDECL *lrint)(double x); + int (CDECL *lrintf)(float x); + int (CDECL *lround)(double x); + int (CDECL *lroundf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); double (CDECL *nearbyint)(double num);

1 0

Jacek Caban : kernelbase: Move Unicode conversion from ReadConsoleA to conhost.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: a66eab0dfb476ef15e32df71652d08e24ce5b482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a66eab0dfb476ef15e32df71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 17:59:16 2020 +0100 kernelbase: Move Unicode conversion from ReadConsoleA to conhost. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 17 +++-------- include/wine/condrv.h | 21 +++++++------ programs/conhost/conhost.c | 76 ++++++++++++++++++++++++++++++++++++++-------- server/console.c | 10 +++++- 4 files changed, 88 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a66eab0dfb476ef15e32…

1 0