May 2023 - Wine-commits - list.winehq.org

Zebediah Figura : qcap/tests: Add tests for media types.
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: c06fe6112cda883098071fd56c54958ce26be115 URL: https://gitlab.winehq.org/wine/wine/-/commit/c06fe6112cda883098071fd56c5495… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 12:09:50 2023 -0500 qcap/tests: Add tests for media types. --- dlls/qcap/tests/audiorecord.c | 250 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 250 insertions(+)

1 0

Zebediah Figura : qcap/audiorecord: Implement pin_get_media_type().
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: fa323802925d6ab153a0577a4bc350f4d1ca7ccd URL: https://gitlab.winehq.org/wine/wine/-/commit/fa323802925d6ab153a0577a4bc350… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 12:27:54 2023 -0500 qcap/audiorecord: Implement pin_get_media_type(). --- dlls/qcap/audiorecord.c | 69 ++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/audiorecord.c | 82 +++++++++++++++++++++---------------------- 2 files changed, 109 insertions(+), 42 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 40fde996479..7107f22851b 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -50,6 +50,74 @@ static HRESULT audio_record_source_query_interface(struct strmbase_pin *iface, R return S_OK; } +static const struct +{ + unsigned int rate; + unsigned int depth; + unsigned int channels; +} +audio_formats[] = +{ + {44100, 16, 2}, + {44100, 16, 1}, + {32000, 16, 2}, + {32000, 16, 1}, + {22050, 16, 2}, + {22050, 16, 1}, + {11025, 16, 2}, + {11025, 16, 1}, + { 8000, 16, 2}, + { 8000, 16, 1}, + {44100, 8, 2}, + {44100, 8, 1}, + {22050, 8, 2}, + {22050, 8, 1}, + {11025, 8, 2}, + {11025, 8, 1}, + { 8000, 8, 2}, + { 8000, 8, 1}, + {48000, 16, 2}, + {48000, 16, 1}, + {96000, 16, 2}, + {96000, 16, 1}, +}; + +static HRESULT fill_media_type(unsigned int index, AM_MEDIA_TYPE *mt) +{ + WAVEFORMATEX *format; + + if (index >= ARRAY_SIZE(audio_formats)) + return VFW_S_NO_MORE_ITEMS; + + if (!(format = CoTaskMemAlloc(sizeof(*format)))) + return E_OUTOFMEMORY; + + memset(format, 0, sizeof(WAVEFORMATEX)); + format->wFormatTag = WAVE_FORMAT_PCM; + format->nChannels = audio_formats[index].channels; + format->nSamplesPerSec = audio_formats[index].rate; + format->wBitsPerSample = audio_formats[index].depth; + format->nBlockAlign = audio_formats[index].channels * audio_formats[index].depth / 8; + format->nAvgBytesPerSec = format->nBlockAlign * format->nSamplesPerSec; + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + mt->majortype = MEDIATYPE_Audio; + mt->subtype = MEDIASUBTYPE_PCM; + mt->bFixedSizeSamples = TRUE; + mt->lSampleSize = format->nBlockAlign; + mt->formattype = FORMAT_WaveFormatEx; + mt->cbFormat = sizeof(WAVEFORMATEX); + mt->pbFormat = (BYTE *)format; + + return S_OK; +} + +static HRESULT audio_record_source_get_media_type(struct strmbase_pin *iface, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + return fill_media_type(index, mt); +} + static HRESULT WINAPI audio_record_source_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) { @@ -60,6 +128,7 @@ static HRESULT WINAPI audio_record_source_DecideBufferSize(struct strmbase_sourc static const struct strmbase_source_ops source_ops = { + .base.pin_get_media_type = audio_record_source_get_media_type, .base.pin_query_interface = audio_record_source_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index 89964100ab6..6d06a5417bd 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -386,50 +386,48 @@ static void test_media_types(IBaseFilter *filter) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + pformat = (void *)pmt->pbFormat; + ok(pformat->nChannels == 2, "Got %u channels.\n", pformat->nChannels); + ok(pformat->wBitsPerSample == 16, "Got depth %u.\n", pformat->wBitsPerSample); + ok(pformat->nSamplesPerSec == 44100, "Got sample rate %lu.\n", pformat->nSamplesPerSec); + + do { pformat = (void *)pmt->pbFormat; - ok(pformat->nChannels == 2, "Got %u channels.\n", pformat->nChannels); - ok(pformat->wBitsPerSample == 16, "Got depth %u.\n", pformat->wBitsPerSample); - ok(pformat->nSamplesPerSec == 44100, "Got sample rate %lu.\n", pformat->nSamplesPerSec); - do - { - pformat = (void *)pmt->pbFormat; - - ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", - debugstr_guid(&pmt->majortype)); - ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_PCM), "Got subtype %s\n", - debugstr_guid(&pmt->subtype)); - ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); - ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); - ok(pmt->lSampleSize == pformat->nBlockAlign, "Got sample size %lu.\n", pmt->lSampleSize); - ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", - debugstr_guid(&pmt->formattype)); - ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); - ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %lu.\n", pmt->cbFormat); - - ok(pformat->wFormatTag == WAVE_FORMAT_PCM, "Got format %#x.\n", pformat->wFormatTag); - ok(pformat->nChannels == 1 || pformat->nChannels == 2, "Got %u channels.\n", pformat->nChannels); - ok(pformat->wBitsPerSample == 8 || pformat->wBitsPerSample == 16, "Got depth %u.\n", pformat->wBitsPerSample); - ok(pformat->nBlockAlign == pformat->nChannels * pformat->wBitsPerSample / 8, - "Got block align %u.\n", pformat->nBlockAlign); - ok(pformat->nAvgBytesPerSec == pformat->nSamplesPerSec * pformat->nBlockAlign, - "Got %lu bytes per second.\n", pformat->nAvgBytesPerSec); - ok(!pformat->cbSize, "Got size %u.\n", pformat->cbSize); - - strmbase_dump_media_type(pmt); - - hr = IPin_QueryAccept(pin, pmt); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - - CoTaskMemFree(pmt->pbFormat); - CoTaskMemFree(pmt); - - hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); - } while (hr == S_OK); - } + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", + debugstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_PCM), "Got subtype %s\n", + debugstr_guid(&pmt->subtype)); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == pformat->nBlockAlign, "Got sample size %lu.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + debugstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %lu.\n", pmt->cbFormat); + + ok(pformat->wFormatTag == WAVE_FORMAT_PCM, "Got format %#x.\n", pformat->wFormatTag); + ok(pformat->nChannels == 1 || pformat->nChannels == 2, "Got %u channels.\n", pformat->nChannels); + ok(pformat->wBitsPerSample == 8 || pformat->wBitsPerSample == 16, "Got depth %u.\n", pformat->wBitsPerSample); + ok(pformat->nBlockAlign == pformat->nChannels * pformat->wBitsPerSample / 8, + "Got block align %u.\n", pformat->nBlockAlign); + ok(pformat->nAvgBytesPerSec == pformat->nSamplesPerSec * pformat->nBlockAlign, + "Got %lu bytes per second.\n", pformat->nAvgBytesPerSec); + ok(!pformat->cbSize, "Got size %u.\n", pformat->cbSize); + + strmbase_dump_media_type(pmt); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + } while (hr == S_OK); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); @@ -522,7 +520,7 @@ static void test_stream_config(IBaseFilter *filter) hr = IAMStreamConfig_GetStreamCaps(config, count, &mt, (BYTE *)&caps); todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumMediaTypes_Next(enummt, 1, &mt2, NULL); - ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumMediaTypes_Release(enummt);

1 0

Zebediah Figura : qcap/audiorecord: Implement IAMStreamConfig::GetStreamCaps().
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: c752b56110ae3cee63dbfb8fc2c563c73cd4ce47 URL: https://gitlab.winehq.org/wine/wine/-/commit/c752b56110ae3cee63dbfb8fc2c563… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 12:30:23 2023 -0500 qcap/audiorecord: Implement IAMStreamConfig::GetStreamCaps(). Needed by the Microsoft Silverlight configuration tool. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36230 --- dlls/qcap/audiorecord.c | 46 ++++++++++++++++++++++++++++++++++++++----- dlls/qcap/tests/audiorecord.c | 26 +++++++++++++----------- 2 files changed, 55 insertions(+), 17 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 7107f22851b..ffd8e059b7b 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -174,15 +174,51 @@ static HRESULT WINAPI stream_config_GetFormat(IAMStreamConfig *iface, AM_MEDIA_T static HRESULT WINAPI stream_config_GetNumberOfCapabilities(IAMStreamConfig *iface, int *count, int *size) { - FIXME("iface %p, count %p, size %p, stub!\n", iface, count, size); - return E_NOTIMPL; + struct audio_record *filter = impl_from_IAMStreamConfig(iface); + + TRACE("filter %p, count %p, size %p.\n", filter, count, size); + + *count = ARRAY_SIZE(audio_formats); + *size = sizeof(AUDIO_STREAM_CONFIG_CAPS); + return S_OK; } static HRESULT WINAPI stream_config_GetStreamCaps(IAMStreamConfig *iface, - int index, AM_MEDIA_TYPE **mt, BYTE *caps) + int index, AM_MEDIA_TYPE **ret_mt, BYTE *caps) { - FIXME("iface %p, index %d, mt %p, caps %p, stub!\n", iface, index, mt, caps); - return E_NOTIMPL; + struct audio_record *filter = impl_from_IAMStreamConfig(iface); + AUDIO_STREAM_CONFIG_CAPS *audio_caps = (void *)caps; + AM_MEDIA_TYPE *mt; + HRESULT hr; + + TRACE("filter %p, index %d, ret_mt %p, caps %p.\n", filter, index, ret_mt, caps); + + if (index >= ARRAY_SIZE(audio_formats)) + return S_FALSE; + + if (!(mt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) + return E_OUTOFMEMORY; + + if ((hr = fill_media_type(index, mt)) != S_OK) + { + CoTaskMemFree(mt); + return hr; + } + + *ret_mt = mt; + + audio_caps->guid = MEDIATYPE_Audio; + audio_caps->MinimumChannels = 1; + audio_caps->MaximumChannels = 2; + audio_caps->ChannelsGranularity = 1; + audio_caps->MinimumBitsPerSample = 8; + audio_caps->MaximumBitsPerSample = 16; + audio_caps->BitsPerSampleGranularity = 8; + audio_caps->MinimumSampleFrequency = 11025; + audio_caps->MaximumSampleFrequency = 44100; + audio_caps->SampleFrequencyGranularity = 11025; + + return S_OK; } static const IAMStreamConfigVtbl stream_config_vtbl = diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index 6d06a5417bd..c64a8a83b2e 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -482,9 +482,9 @@ static void test_stream_config(IBaseFilter *filter) count = size = 0xdeadbeef; hr = IAMStreamConfig_GetNumberOfCapabilities(config, &count, &size); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(count && count != 0xdeadbeef, "Got count %d.\n", count); - todo_wine ok(size == sizeof(AUDIO_STREAM_CONFIG_CAPS), "Got size %d.\n", size); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count && count != 0xdeadbeef, "Got count %d.\n", count); + ok(size == sizeof(AUDIO_STREAM_CONFIG_CAPS), "Got size %d.\n", size); hr = IPin_EnumMediaTypes(source, &enummt); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -518,9 +518,9 @@ static void test_stream_config(IBaseFilter *filter) } hr = IAMStreamConfig_GetStreamCaps(config, count, &mt, (BYTE *)&caps); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumMediaTypes_Next(enummt, 1, &mt2, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumMediaTypes_Release(enummt); @@ -551,19 +551,21 @@ static void test_stream_config(IBaseFilter *filter) winetest_push_context("Caps %u", i); hr = IAMStreamConfig_GetStreamCaps(config, i, &mt, (BYTE *)&caps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IAMStreamConfig_SetFormat(config, mt); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IAMStreamConfig_GetFormat(config, &mt2); todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) { - hr = IAMStreamConfig_SetFormat(config, mt); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - - hr = IAMStreamConfig_GetFormat(config, &mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); DeleteMediaType(mt2); - - DeleteMediaType(mt); } + + DeleteMediaType(mt); + winetest_pop_context(); }

1 0

Zebediah Figura : qcap/audiorecord: Partially implement QueryAccept().
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: d53fdd0eb0537d0481dcbc6a710e8e09e07294f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d53fdd0eb0537d0481dcbc6a710e8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 15:16:36 2023 -0500 qcap/audiorecord: Partially implement QueryAccept(). --- dlls/qcap/audiorecord.c | 12 ++++++++++++ dlls/qcap/tests/audiorecord.c | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index ffd8e059b7b..d97d7fef19a 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -50,6 +50,17 @@ static HRESULT audio_record_source_query_interface(struct strmbase_pin *iface, R return S_OK; } +static HRESULT audio_record_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)) + return S_FALSE; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx)) + return S_FALSE; + + return S_OK; +} + static const struct { unsigned int rate; @@ -129,6 +140,7 @@ static HRESULT WINAPI audio_record_source_DecideBufferSize(struct strmbase_sourc static const struct strmbase_source_ops source_ops = { .base.pin_get_media_type = audio_record_source_get_media_type, + .base.pin_query_accept = audio_record_source_query_accept, .base.pin_query_interface = audio_record_source_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index c64a8a83b2e..0438b970ff1 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -443,18 +443,18 @@ static void test_media_types(IBaseFilter *filter) init_pcm_mt(&mt, &format, 1, 44100, 8); mt.majortype = MEDIATYPE_Stream; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); mt.majortype = GUID_NULL; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&mt, &format, 1, 44100, 8); mt.formattype = FORMAT_None; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); mt.formattype = GUID_NULL; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&mt, &format, 1, 44100, 8); format.wFormatTag = 0xdead;

1 0

Rémi Bernon : win32u: Introduce a new ImeProcessKey call through NtUserMessageCall.
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: c7dc10b19256f27a1a6a6f2e32aadaeebef07eb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7dc10b19256f27a1a6a6f2e32aada… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 12 07:23:00 2023 +0200 win32u: Introduce a new ImeProcessKey call through NtUserMessageCall. --- dlls/imm32/ime.c | 17 +++++++++++++---- dlls/win32u/driver.c | 12 ++++++++++++ dlls/win32u/imm.c | 13 +++++++++++++ dlls/win32u/message.c | 3 +++ dlls/win32u/ntuser_private.h | 4 ++++ dlls/winex11.drv/ime.c | 7 ------- dlls/winex11.drv/winex11.drv.spec | 1 - dlls/wow64win/user.c | 13 +++++++++++++ include/ntuser.h | 14 ++++++++++++++ include/wine/gdi_driver.h | 1 + 10 files changed, 73 insertions(+), 12 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index 3e5f34d6760..eee623a6eb5 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -439,11 +439,20 @@ BOOL WINAPI ImeSetActiveContext( HIMC himc, BOOL flag ) return TRUE; } -BOOL WINAPI ImeProcessKey( HIMC himc, UINT vkey, LPARAM key_data, BYTE *key_state ) +BOOL WINAPI ImeProcessKey( HIMC himc, UINT vkey, LPARAM lparam, BYTE *state ) { - FIXME( "himc %p, vkey %u, key_data %#Ix, key_state %p stub!\n", himc, vkey, key_data, key_state ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + struct ime_driver_call_params params = {.himc = himc, .state = state}; + INPUTCONTEXT *ctx; + LRESULT ret; + + TRACE( "himc %p, vkey %#x, lparam %#Ix, state %p\n", himc, vkey, lparam, state ); + + if (!(ctx = ImmLockIMC( himc ))) return FALSE; + ret = NtUserMessageCall( ctx->hWnd, WINE_IME_PROCESS_KEY, vkey, lparam, &params, + NtUserImeDriverCall, FALSE ); + ImmUnlockIMC( himc ); + + return ret; } UINT WINAPI ImeToAsciiEx( UINT vkey, UINT scan_code, BYTE *key_state, TRANSMSGLIST *msgs, UINT state, HIMC himc ) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index f0055b68d1e..e1dd1a1ebcf 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -716,6 +716,11 @@ static SHORT nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) return -256; /* use default implementation */ } +static UINT nulldrv_ImeProcessKey( HIMC himc, UINT wparam, UINT lparam, const BYTE *state ) +{ + return 0; +} + static void nulldrv_NotifyIMEStatus( HWND hwnd, UINT status ) { } @@ -1074,6 +1079,11 @@ static SHORT loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } +static UINT loaderdrv_ImeProcessKey( HIMC himc, UINT wparam, UINT lparam, const BYTE *state ) +{ + return load_driver()->pImeProcessKey( himc, wparam, lparam, state ); +} + static void loaderdrv_NotifyIMEStatus( HWND hwnd, UINT status ) { return load_driver()->pNotifyIMEStatus( hwnd, status ); @@ -1185,6 +1195,7 @@ static const struct user_driver_funcs lazy_load_driver = loaderdrv_ToUnicodeEx, loaderdrv_UnregisterHotKey, loaderdrv_VkKeyScanEx, + loaderdrv_ImeProcessKey, loaderdrv_NotifyIMEStatus, /* cursor/icon functions */ nulldrv_DestroyCursorIcon, @@ -1265,6 +1276,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(ToUnicodeEx); SET_USER_FUNC(UnregisterHotKey); SET_USER_FUNC(VkKeyScanEx); + SET_USER_FUNC(ImeProcessKey); SET_USER_FUNC(NotifyIMEStatus); SET_USER_FUNC(DestroyCursorIcon); SET_USER_FUNC(SetCursor); diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 328a4a3eddf..b91c3617472 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -421,6 +421,19 @@ NTSTATUS WINAPI NtUserBuildHimcList( UINT thread_id, UINT count, HIMC *buffer, U return STATUS_SUCCESS; } +LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPARAM lparam, + struct ime_driver_call_params *params ) +{ + switch (call) + { + case WINE_IME_PROCESS_KEY: + return user_driver->pImeProcessKey( params->himc, wparam, lparam, params->state ); + default: + ERR( "Unknown IME driver call %#x\n", call ); + return 0; + } +} + /***************************************************************************** * NtUserNotifyIMEStatus (win32u.@) */ diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 5ca568d7302..b3d94120455 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3522,6 +3522,9 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa spy_exit_message( ansi, hwnd, msg, (LPARAM)result_info, wparam, lparam ); return 0; + case NtUserImeDriverCall: + return ime_driver_call( hwnd, msg, wparam, lparam, result_info ); + default: FIXME( "%p %x %lx %lx %p %x %x\n", hwnd, msg, (long)wparam, lparam, result_info, (int)type, ansi ); } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index c9c2dfa571a..0e7d84e3faa 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -229,6 +229,10 @@ BOOL needs_ime_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void register_builtin_classes(void) DECLSPEC_HIDDEN; extern void register_desktop_class(void) DECLSPEC_HIDDEN; +/* imm.c */ +extern LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPARAM lparam, + struct ime_driver_call_params *params ) DECLSPEC_HIDDEN; + /* cursoricon.c */ HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index b46c2d86892..348be4f0ad6 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -477,13 +477,6 @@ static void IME_AddToSelected(HIMC hIMC) hSelectedFrom[hSelectedCount-1] = hIMC; } -BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, const LPBYTE lpbKeyState) -{ - /* See the comment at the head of this file */ - TRACE("We do no processing via this route\n"); - return FALSE; -} - BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) { LPINPUTCONTEXT lpIMC; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 64154d709a2..8b286033250 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -13,4 +13,3 @@ #IME Interface @ stdcall ImeSelect(long long) @ stdcall ImeToAsciiEx(long long ptr ptr long long) -@ stdcall ImeProcessKey(long long long ptr) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 68670acecc6..75da3792a8a 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3116,6 +3116,19 @@ NTSTATUS WINAPI wow64_NtUserMessageCall( UINT *args ) return message_call_32to64( hwnd, msg, wparam, lparam, LongToPtr( result32 ), type, ansi ); } + + case NtUserImeDriverCall: + { + struct + { + ULONG himc; + ULONG state; + } *params32 = result_info; + struct ime_driver_call_params params; + params.himc = UlongToPtr( params32->himc ); + params.state = UlongToPtr( params32->state ); + return NtUserMessageCall( hwnd, msg, wparam, lparam, &params, type, ansi ); + } } return message_call_32to64( hwnd, msg, wparam, lparam, result_info, type, ansi ); diff --git a/include/ntuser.h b/include/ntuser.h index 2415d61c8e4..ee401231619 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -305,6 +305,7 @@ enum NtUserSpyEnter = 0x0304, NtUserSpyExit = 0x0305, NtUserWinProcResult = 0x0306, + NtUserImeDriverCall = 0x0307, }; /* NtUserThunkedMenuItemInfo codes */ @@ -490,6 +491,19 @@ enum wine_internal_message #define IME_INTERNAL_HKL_ACTIVATE 0x19 #define IME_INTERNAL_HKL_DEACTIVATE 0x20 +/* builtin IME driver calls */ +enum wine_ime_call +{ + WINE_IME_PROCESS_KEY, +}; + +/* NtUserImeDriverCall params */ +struct ime_driver_call_params +{ + HIMC himc; + const BYTE *state; +}; + /* internal IME private */ typedef struct ime_private { diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index c6683c750ef..2edf208a9bd 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -288,6 +288,7 @@ struct user_driver_funcs void (*pUnregisterHotKey)(HWND, UINT, UINT); SHORT (*pVkKeyScanEx)(WCHAR, HKL); /* IME functions */ + UINT (*pImeProcessKey)(HIMC,UINT,UINT,const BYTE*); void (*pNotifyIMEStatus)(HWND,UINT); /* cursor/icon functions */ void (*pDestroyCursorIcon)(HCURSOR);

1 0

Rémi Bernon : winemac: Use the ImeProcessKey driver entry to process IME input.
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: f185dc1701f2076758ca59233fffc93924da1814 URL: https://gitlab.winehq.org/wine/wine/-/commit/f185dc1701f2076758ca59233fffc9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 2 12:14:19 2023 +0200 winemac: Use the ImeProcessKey driver entry to process IME input. --- dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/ime.c | 90 +-------------------------------------- dlls/winemac.drv/keyboard.c | 29 ++++++++----- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 30 ------------- dlls/winemac.drv/unixlib.h | 12 ------ dlls/winemac.drv/winemac.drv.spec | 1 - 7 files changed, 22 insertions(+), 143 deletions(-)

1 0

Alexandre Julliard : win32u: Don't use floating point types in syscalls.
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: f83ec675bdf226b221e53ae298eb5f819b512376 URL: https://gitlab.winehq.org/wine/wine/-/commit/f83ec675bdf226b221e53ae298eb5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 11:38:34 2023 +0200 win32u: Don't use floating point types in syscalls. --- dlls/gdi32/dc.c | 2 +- dlls/win32u/painting.c | 4 +++- dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 4 ++-- dlls/win32u/wrappers.c | 2 +- include/ntgdi.h | 8 ++++---- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a0308ffa118..91ab6c43bde 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1523,7 +1523,7 @@ BOOL WINAPI AngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle, FL if (dc_attr->print) print_call_start_page( dc_attr ); if (dc_attr->emf && !EMFDC_AngleArc( dc_attr, x, y, radius, start_angle, sweep_angle )) return FALSE; - return NtGdiAngleArc( hdc, x, y, radius, start_angle, sweep_angle ); + return NtGdiAngleArc( hdc, x, y, radius, *(DWORD *)&start_angle, *(DWORD *)&sweep_angle ); } /*********************************************************************** diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c index 8ad9b6267c5..6ec6806896e 100644 --- a/dlls/win32u/painting.c +++ b/dlls/win32u/painting.c @@ -637,8 +637,10 @@ BOOL WINAPI NtGdiExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT fill_ /*********************************************************************** * NtGdiAngleArc (win32u.@) */ -BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, FLOAT eSweepAngle ) +BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD dwRadius, DWORD start_angle, DWORD sweep_angle ) { + FLOAT eStartAngle = *(FLOAT *)&start_angle; + FLOAT eSweepAngle = *(FLOAT *)&sweep_angle; PHYSDEV physdev; BOOL result; DC *dc; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index af3ac7468a9..2831b20ece9 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -113,7 +113,7 @@ @ stub NtGdiAddRemoteFontToDC @ stub NtGdiAddRemoteMMInstanceToDC @ stdcall NtGdiAlphaBlend(long long long long long long long long long long long ptr) -@ stdcall NtGdiAngleArc(long long long long float float) +@ stdcall NtGdiAngleArc(long long long long long long) @ stub NtGdiAnyLinkedFonts @ stdcall NtGdiArcInternal(long long long long long long long long long long) @ stub NtGdiBRUSHOBJ_DeleteRbrush @@ -123,7 +123,7 @@ @ stub NtGdiBRUSHOBJ_ulGetBrushColor @ stub NtGdiBeginGdiRendering @ stdcall NtGdiBeginPath(long) -@ stdcall NtGdiBitBlt(long long long long long long long long long long float) +@ stdcall NtGdiBitBlt(long long long long long long long long long long long) @ stub NtGdiCLIPOBJ_bEnum @ stub NtGdiCLIPOBJ_cEnumStart @ stub NtGdiCLIPOBJ_ppoGetPath diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 32c6c2b905b..fe5143d7903 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -40,8 +40,8 @@ struct unix_funcs BOOL (WINAPI *pNtGdiAlphaBlend)( HDC hdc_dst, int x_dst, int y_dst, int width_dst, int height_dst, HDC hdc_src, int x_src, int y_src, int width_src, int height_src, BLENDFUNCTION blend_function, HANDLE xform ); - BOOL (WINAPI *pNtGdiAngleArc)( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle, - FLOAT sweep_angle ); + BOOL (WINAPI *pNtGdiAngleArc)( HDC hdc, INT x, INT y, DWORD radius, DWORD start_angle, + DWORD sweep_angle ); BOOL (WINAPI *pNtGdiArcInternal)( UINT type, HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ); BOOL (WINAPI *pNtGdiBeginPath)( HDC hdc ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index e128705ef37..4e23f325aec 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -45,7 +45,7 @@ BOOL WINAPI NtGdiAlphaBlend( HDC hdc_dst, int x_dst, int y_dst, int width_dst, i x_src, y_src, width_src, height_src, blend_function, xform ); } -BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle, FLOAT sweep_angle ) +BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD radius, DWORD start_angle, DWORD sweep_angle ) { if (!unix_funcs) return FALSE; return unix_funcs->pNtGdiAngleArc( hdc, x, y, radius, start_angle, sweep_angle ); diff --git a/include/ntgdi.h b/include/ntgdi.h index 7d00ced2d19..918a5c5d7b3 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -251,8 +251,8 @@ INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files BOOL WINAPI NtGdiAlphaBlend( HDC hdc_dst, int x_dst, int y_dst, int width_dst, int height_dst, HDC hdc_src, int x_src, int y_src, int width_src, int height_src, BLENDFUNCTION blend_function, HANDLE xform ); -BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle, - FLOAT sweep_angle ); +BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD radius, DWORD start_angle, + DWORD sweep_angle ); BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ); BOOL WINAPI NtGdiBeginPath( HDC hdc ); @@ -351,7 +351,7 @@ DWORD WINAPI NtGdiGetGlyphOutline( HDC hdc, UINT ch, UINT format, GLYPHMETRIC DWORD size, void *buffer, const MAT2 *mat2, BOOL ignore_rotation ); DWORD WINAPI NtGdiGetKerningPairs( HDC hdc, DWORD count, KERNINGPAIR *kern_pair ); -BOOL WINAPI NtGdiGetMiterLimit( HDC hdc, FLOAT *limit ); +BOOL WINAPI NtGdiGetMiterLimit( HDC hdc, DWORD *limit ); COLORREF WINAPI NtGdiGetNearestColor( HDC hdc, COLORREF color ); UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ); UINT WINAPI NtGdiGetOutlineTextMetricsInternalW( HDC hdc, UINT cbData, @@ -435,7 +435,7 @@ BOOL WINAPI NtGdiSetDeviceGammaRamp( HDC hdc, void *ptr ); DWORD WINAPI NtGdiSetLayout( HDC hdc, LONG wox, DWORD layout ); BOOL WINAPI NtGdiSetMagicColors( HDC hdc, DWORD magic, ULONG index ); INT WINAPI NtGdiSetMetaRgn( HDC hdc ); -BOOL WINAPI NtGdiSetMiterLimit( HDC hdc, FLOAT limit, FLOAT *prev_limit ); +BOOL WINAPI NtGdiSetMiterLimit( HDC hdc, DWORD limit, DWORD *prev_limit ); COLORREF WINAPI NtGdiSetPixel( HDC hdc, INT x, INT y, COLORREF color ); BOOL WINAPI NtGdiSetPixelFormat( HDC hdc, INT format ); BOOL WINAPI NtGdiSetRectRgn( HRGN hrgn, INT left, INT top, INT right, INT bottom );

1 0

Alexandre Julliard : winebuild: Disallow floating point arguments in syscall functions.
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: fddd7aab7c49d7b833bd07090a03a870dc088cf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/fddd7aab7c49d7b833bd07090a03a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 11:38:51 2023 +0200 winebuild: Disallow floating point arguments in syscall functions. --- tools/winebuild/parser.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 5eed7e22ab0..eaf90a85966 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -271,14 +271,20 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) error( "Unknown argument type '%s'\n", token ); return 0; } - if (is_win32) switch (arg) + switch (arg) { case ARG_WORD: case ARG_SWORD: case ARG_SEGPTR: case ARG_SEGSTR: + if (!is_win32) break; error( "Argument type '%s' only allowed for Win16\n", token ); return 0; + case ARG_FLOAT: + case ARG_DOUBLE: + if (!(odp->flags & FLAG_SYSCALL)) break; + error( "Argument type '%s' not allowed for syscall function\n", token ); + return 0; } odp->u.func.args[i] = arg; }

1 0

Alexandre Julliard : server: Add a separate request to create a memory view for a .so builtin.
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: 8f9c0c825d6e0b26a7cf8990fa9e3f9d73fc1af5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f9c0c825d6e0b26a7cf8990fa9e3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 15:07:30 2023 +0200 server: Add a separate request to create a memory view for a .so builtin. --- dlls/ntdll/unix/virtual.c | 6 ++-- include/wine/server_protocol.h | 19 +++++++++-- server/mapping.c | 76 ++++++++++++++++++++++++++---------------- server/protocol.def | 11 ++++-- server/request.h | 3 ++ server/trace.c | 9 ++++- 6 files changed, 86 insertions(+), 38 deletions(-)

1 0

Alexandre Julliard : server: Move the Wine-specific flags out of the image_flags field.
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: 1d368b3789c41612c07f78d4d5b41b13baca6c02 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d368b3789c41612c07f78d4d5b41b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 15:36:13 2023 +0200 server: Move the Wine-specific flags out of the image_flags field. --- dlls/ntdll/unix/loader.c | 13 +++++-------- dlls/ntdll/unix/virtual.c | 2 +- include/wine/server_protocol.h | 8 ++++---- include/winternl.h | 5 ----- server/mapping.c | 8 ++++---- server/protocol.def | 6 +++--- 6 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 893f2566ed9..61743df7556 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -732,7 +732,7 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i ULONGLONG res_end = pe_info->base + pe_info->map_size; char preloader_reserve[64], socket_env[64]; - if (pe_info->image_flags & IMAGE_FLAGS_WineFakeDll) res_start = res_end = 0; + if (pe_info->wine_fakedll) res_start = res_end = 0; if (pe_info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) machine = native_machine; signal( SIGPIPE, SIG_DFL ); @@ -1131,12 +1131,12 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) const IMAGE_DOS_HEADER *dos = (const IMAGE_DOS_HEADER *)module; const IMAGE_NT_HEADERS *nt = (IMAGE_NT_HEADERS *)((const BYTE *)dos + dos->e_lfanew); + memset( info, 0, sizeof(*info) ); info->base = nt->OptionalHeader.ImageBase; info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; info->map_size = nt->OptionalHeader.SizeOfImage; info->stack_size = nt->OptionalHeader.SizeOfStackReserve; info->stack_commit = nt->OptionalHeader.SizeOfStackCommit; - info->zerobits = 0; info->subsystem = nt->OptionalHeader.Subsystem; info->subsystem_minor = nt->OptionalHeader.MinorSubsystemVersion; info->subsystem_major = nt->OptionalHeader.MajorSubsystemVersion; @@ -1146,13 +1146,10 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) info->dll_charact = nt->OptionalHeader.DllCharacteristics; info->machine = nt->FileHeader.Machine; info->contains_code = TRUE; - info->image_flags = IMAGE_FLAGS_WineBuiltin; - info->loader_flags = 0; + info->wine_builtin = TRUE; info->header_size = nt->OptionalHeader.SizeOfHeaders; info->file_size = nt->OptionalHeader.SizeOfImage; info->checksum = nt->OptionalHeader.CheckSum; - info->dbg_offset = 0; - info->dbg_size = 0; } @@ -1573,12 +1570,12 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, if (loadorder == LO_DISABLED) return STATUS_DLL_NOT_FOUND; - if (image_info->image_flags & IMAGE_FLAGS_WineBuiltin) + if (image_info->wine_builtin) { if (loadorder == LO_NATIVE) return STATUS_DLL_NOT_FOUND; loadorder = LO_BUILTIN_NATIVE; /* load builtin, then fallback to the file we found */ } - else if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) + else if (image_info->wine_fakedll) { TRACE( "%s is a fake Wine dll\n", debugstr_w(filename) ); if (loadorder == LO_NATIVE) return STATUS_DLL_NOT_FOUND; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index db9d7f1e323..b33b45ad07f 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3042,7 +3042,7 @@ NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size *size = 0; filename = (WCHAR *)(image_info + 1); - if (!(image_info->image_flags & IMAGE_FLAGS_WineBuiltin)) /* ignore non-builtins */ + if (!image_info->wine_builtin) /* ignore non-builtins */ { WARN( "%s found in WINEDLLPATH but not a builtin, ignoring\n", debugstr_w(filename) ); status = STATUS_DLL_NOT_FOUND; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1c54d47a1a6..e9307cef1c9 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -834,7 +834,9 @@ typedef struct unsigned short image_charact; unsigned short dll_charact; unsigned short machine; - unsigned char contains_code; + unsigned char contains_code : 1; + unsigned char wine_builtin : 1; + unsigned char wine_fakedll : 1; unsigned char image_flags; unsigned int loader_flags; unsigned int header_size; @@ -849,8 +851,6 @@ typedef struct #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 #define IMAGE_FLAGS_ComPlusPrefer32bit 0x20 -#define IMAGE_FLAGS_WineBuiltin 0x40 -#define IMAGE_FLAGS_WineFakeDll 0x80 struct rawinput_device { @@ -6393,7 +6393,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 765 +#define SERVER_PROTOCOL_VERSION 766 /* ### protocol_version end ### */ diff --git a/include/winternl.h b/include/winternl.h index 4061843c4c7..df0f8dc1f84 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3251,12 +3251,7 @@ typedef struct _SECTION_IMAGE_INFORMATION { UCHAR ImageMappedFlat : 1; UCHAR BaseBelow4gb : 1; UCHAR ComPlusPrefer32bit : 1; -#ifdef __WINESRC__ /* Wine extensions */ - UCHAR WineBuiltin : 1; - UCHAR WineFakeDll : 1; -#else UCHAR Reserved : 2; -#endif } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; ULONG LoaderFlags; diff --git a/server/mapping.c b/server/mapping.c index bdfeef81da4..e0f4ad62f6e 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -803,10 +803,10 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.zerobits = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; - if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; - else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; + mapping->image.wine_builtin = (mz_size == sizeof(mz) && + !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )); + mapping->image.wine_fakedll = (mz_size == sizeof(mz) && + !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )); /* load the section headers */ diff --git a/server/protocol.def b/server/protocol.def index 26a26375069..1adda93b801 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -850,7 +850,9 @@ typedef struct unsigned short image_charact; unsigned short dll_charact; unsigned short machine; - unsigned char contains_code; + unsigned char contains_code : 1; + unsigned char wine_builtin : 1; + unsigned char wine_fakedll : 1; unsigned char image_flags; unsigned int loader_flags; unsigned int header_size; @@ -865,8 +867,6 @@ typedef struct #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 #define IMAGE_FLAGS_ComPlusPrefer32bit 0x20 -#define IMAGE_FLAGS_WineBuiltin 0x40 -#define IMAGE_FLAGS_WineFakeDll 0x80 struct rawinput_device {

1 0