October 2017 - Wine-Commits

Andrew Eikum : wineandroid: Support 32-bit float audio format.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: b4c0b77b03d6588efe6ad800e4659e3f017d81bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c0b77b03d6588efe6ad800e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 6 11:20:37 2017 -0500 wineandroid: Support 32-bit float audio format. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/build.gradle.in | 2 +- dlls/wineandroid.drv/mmdevdrv.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 53633b7..4bd98b9 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -58,7 +58,7 @@ tasks.whenTaskAdded { t -> android { - compileSdkVersion 17 + compileSdkVersion 21 buildToolsVersion "25.0.3" defaultConfig diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index c138fb8..8f428a8 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -649,23 +649,36 @@ static HRESULT get_audio_session(const GUID *sessionguid, static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLAndroidDataFormat_PCM_EX *pcm) { - /* only support non-float PCM */ - if(fmt->wFormatTag != WAVE_FORMAT_PCM && - !(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)fmt)->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) - return AUDCLNT_E_UNSUPPORTED_FORMAT; - - /* TODO: does android only support 16-bit PCM? */ - if(fmt->nSamplesPerSec < 8000 || fmt->nSamplesPerSec > 48000) return AUDCLNT_E_UNSUPPORTED_FORMAT; pcm->formatType = SL_ANDROID_DATAFORMAT_PCM_EX; - pcm->numChannels = fmt->nChannels; + pcm->sampleRate = fmt->nSamplesPerSec * 1000; /* sampleRate is in milli-Hz */ pcm->bitsPerSample = fmt->wBitsPerSample; pcm->containerSize = fmt->wBitsPerSample; + + if(fmt->wFormatTag == WAVE_FORMAT_PCM || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)fmt)->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + if(pcm->bitsPerSample == 8) + pcm->representation = SL_ANDROID_PCM_REPRESENTATION_UNSIGNED_INT; + else if(pcm->bitsPerSample == 16) + pcm->representation = SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT; + else + return AUDCLNT_E_UNSUPPORTED_FORMAT; + }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)fmt)->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ + if(pcm->bitsPerSample == 32) + pcm->representation = SL_ANDROID_PCM_REPRESENTATION_FLOAT; + else + return AUDCLNT_E_UNSUPPORTED_FORMAT; + }else + return AUDCLNT_E_UNSUPPORTED_FORMAT; + /* only up to stereo */ + pcm->numChannels = fmt->nChannels; if(pcm->numChannels == 1) pcm->channelMask = SL_SPEAKER_FRONT_CENTER; else if(This->dataflow == eRender && pcm->numChannels == 2) @@ -675,11 +688,6 @@ static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLAndroi pcm->endianness = SL_BYTEORDER_LITTLEENDIAN; - if(pcm->bitsPerSample == 8) - pcm->representation = SL_ANDROID_PCM_REPRESENTATION_UNSIGNED_INT; - else - pcm->representation = SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT; - return S_OK; }

1 0

Piotr Caban : msxml3: Use correct string length in saxreader_get_cdata_chunk.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: afdf7491efd7f9bc17ae021eb2ceb32649115e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=afdf7491efd7f9bc17ae021eb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 14:59:56 2017 +0200 msxml3: Use correct string length in saxreader_get_cdata_chunk. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0549bc8..be2caf9 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1972,6 +1972,7 @@ static BSTR saxreader_get_cdata_chunk(const xmlChar *str, int len) BSTR bstr = bstr_from_xmlCharN(str, len), ret; WCHAR *ptr; + len = SysStringLen(bstr); ptr = bstr + len - 1; while ((*ptr == '\r' || *ptr == '\n') && ptr >= bstr) ptr--; @@ -2038,7 +2039,7 @@ static void libxml_cdatablock(void *ctx, const xmlChar *value, int len) while (i < len) { if (value[i] != '\r' && value[i] != '\n') break; - i++; + i++; } end = &value[i];

1 0

Piotr Caban : user32: Remove unneeded RECT parameter from CBPaintText helper.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: e5dd995708a6a2bf42d928597c4076dc1aa48bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5dd995708a6a2bf42d928597… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 4 12:38:04 2017 +0200 user32: Remove unneeded RECT parameter from CBPaintText helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index f35e0d9..4b6bc4f 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -652,9 +652,9 @@ static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) */ static void CBPaintText( LPHEADCOMBO lphc, - HDC hdc, - RECT rectEdit) + HDC hdc) { + RECT rectEdit = lphc->textRect; INT id, size = 0; LPWSTR pText = NULL; @@ -880,7 +880,7 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) } if( !(lphc->wState & CBF_EDIT) ) - CBPaintText( lphc, hDC, lphc->textRect); + CBPaintText( lphc, hDC ); if( hPrevBrush ) SelectObject( hDC, hPrevBrush );

1 0

Alistair Leslie-Hughes : kernelbase: Add AppPolicyGetShowDeveloperDiagnostic stub.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: a06af679696b4d8ea1984f5d02d81c96743346fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06af679696b4d8ea1984f5d0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 6 00:08:57 2017 +0000 kernelbase: Add AppPolicyGetShowDeveloperDiagnostic stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-2.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 14 ++++++++++++++ include/appmodel.h | 7 +++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec index f98ec0e..40f5f53 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -3,7 +3,7 @@ @ stub AppPolicyGetLifecycleManagement @ stub AppPolicyGetMediaFoundationCodecLoading @ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) kernelbase.AppPolicyGetProcessTerminationMethod -@ stub AppPolicyGetShowDeveloperDiagnostic +@ stdcall AppPolicyGetShowDeveloperDiagnostic(ptr ptr) kernelbase.AppPolicyGetShowDeveloperDiagnostic @ stdcall AppPolicyGetThreadInitializationType(ptr ptr) kernelbase.AppPolicyGetThreadInitializationType @ stub AppPolicyGetWindowingModel @ stub GetApplicationUserModelIdFromToken diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 85b2323..17b84da 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -45,7 +45,7 @@ # @ stub AppPolicyGetLifecycleManagement # @ stub AppPolicyGetMediaFoundationCodecLoading @ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) -# @ stub AppPolicyGetShowDeveloperDiagnostic +@ stdcall AppPolicyGetShowDeveloperDiagnostic(ptr ptr) @ stdcall AppPolicyGetThreadInitializationType(ptr ptr) # @ stub AppPolicyGetWindowingModel # @ stub AppXFreeMemory diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index ff1b2f6..be771c2 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -50,6 +50,20 @@ LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadIn } /*********************************************************************** + * AppPolicyGetShowDeveloperDiagnostic (KERNELBASE.@) + */ +LONG WINAPI AppPolicyGetShowDeveloperDiagnostic(HANDLE token, AppPolicyShowDeveloperDiagnostic *policy) +{ + FIXME("%p, %p\n", token, policy); + + if(policy) + *policy = AppPolicyShowDeveloperDiagnostic_ShowUI; + + return ERROR_SUCCESS; +} + + +/*********************************************************************** * QuirkIsEnabled3 (KERNELBASE.@) */ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2) diff --git a/include/appmodel.h b/include/appmodel.h index bc61a89..58d69a0 100644 --- a/include/appmodel.h +++ b/include/appmodel.h @@ -34,7 +34,14 @@ typedef enum AppPolicyThreadInitializationType AppPolicyThreadInitializationType_InitializeWinRT = 1, } AppPolicyThreadInitializationType; +typedef enum AppPolicyShowDeveloperDiagnostic +{ + AppPolicyShowDeveloperDiagnostic_None = 0, + AppPolicyShowDeveloperDiagnostic_ShowUI = 1, +} AppPolicyShowDeveloperDiagnostic; + LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessTerminationMethod *policy); +LONG WINAPI AppPolicyGetShowDeveloperDiagnostic(HANDLE token, AppPolicyShowDeveloperDiagnostic *policy); LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadInitializationType *policy); #if defined(__cplusplus)

1 0

Andrew Eikum : wineandroid: Check that Android supports the format in IsFormatSupported.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: d2f904e07f60c7acba890add4910c9650ad634cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f904e07f60c7acba890add4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 6 11:20:35 2017 -0500 wineandroid: Check that Android supports the format in IsFormatSupported. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 199 +++++++++++++++++++++++++--------------- 1 file changed, 126 insertions(+), 73 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 84aafb7..c138fb8 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -683,17 +683,112 @@ static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLAndroi return S_OK; } +static HRESULT try_open_render_device(SLAndroidDataFormat_PCM_EX *pcm, unsigned int num_buffers, SLObjectItf *out) +{ + SLresult sr; + SLDataSource source; + SLDataSink sink; + SLDataLocator_OutputMix loc_outmix; + SLboolean required[2]; + SLInterfaceID iids[2]; + SLDataLocator_AndroidSimpleBufferQueue loc_bq; + SLObjectItf player; + + loc_bq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE; + loc_bq.numBuffers = num_buffers; + source.pLocator = &loc_bq; + source.pFormat = pcm; + + loc_outmix.locatorType = SL_DATALOCATOR_OUTPUTMIX; + loc_outmix.outputMix = outputmix; + sink.pLocator = &loc_outmix; + sink.pFormat = NULL; + + required[0] = SL_BOOLEAN_TRUE; + iids[0] = *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE; + required[1] = SL_BOOLEAN_TRUE; + iids[1] = *pSL_IID_PLAYBACKRATE; + + sr = SLCALL(engine, CreateAudioPlayer, &player, &source, &sink, + 2, iids, required); + if(sr != SL_RESULT_SUCCESS){ + WARN("CreateAudioPlayer failed: 0x%x\n", sr); + return E_FAIL; + } + + sr = SLCALL(player, Realize, SL_BOOLEAN_FALSE); + if(sr != SL_RESULT_SUCCESS){ + SLCALL_N(player, Destroy); + WARN("Player Realize failed: 0x%x\n", sr); + return E_FAIL; + } + + if(out) + *out = player; + else + SLCALL_N(player, Destroy); + + return S_OK; +} + +static HRESULT try_open_capture_device(SLAndroidDataFormat_PCM_EX *pcm, unsigned int num_buffers, SLObjectItf *out) +{ + SLresult sr; + SLDataSource source; + SLDataSink sink; + SLDataLocator_IODevice loc_mic; + SLboolean required[1]; + SLInterfaceID iids[1]; + SLDataLocator_AndroidSimpleBufferQueue loc_bq; + SLObjectItf recorder; + + loc_mic.locatorType = SL_DATALOCATOR_IODEVICE; + loc_mic.deviceType = SL_IODEVICE_AUDIOINPUT; + loc_mic.deviceID = SL_DEFAULTDEVICEID_AUDIOINPUT; + loc_mic.device = NULL; + source.pLocator = &loc_mic; + source.pFormat = NULL; + + loc_bq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE; + loc_bq.numBuffers = num_buffers; + sink.pLocator = &loc_bq; + sink.pFormat = pcm; + + required[0] = SL_BOOLEAN_TRUE; + iids[0] = *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE; + + sr = SLCALL(engine, CreateAudioRecorder, &recorder, &source, &sink, + 1, iids, required); + if(sr != SL_RESULT_SUCCESS){ + WARN("CreateAudioRecorder failed: 0x%x\n", sr); + return E_FAIL; + } + + sr = SLCALL(recorder, Realize, SL_BOOLEAN_FALSE); + if(sr != SL_RESULT_SUCCESS){ + SLCALL_N(recorder, Destroy); + WARN("Recorder Realize failed: 0x%x\n", sr); + return E_FAIL; + } + + if(out) + *out = recorder; + else + SLCALL_N(recorder, Destroy); + + return S_OK; +} + static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient(iface); - int i; + int i, num_buffers; HRESULT hr; SLresult sr; SLAndroidDataFormat_PCM_EX pcm; - SLDataLocator_AndroidSimpleBufferQueue loc_bq; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -763,43 +858,13 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return hr; } - if(This->dataflow == eRender){ - SLDataSource source; - SLDataSink sink; - SLDataLocator_OutputMix loc_outmix; - SLboolean required[2]; - SLInterfaceID iids[2]; - - loc_bq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE; - loc_bq.numBuffers = This->bufsize_frames / This->period_frames; - source.pLocator = &loc_bq; - source.pFormat = &pcm; - - loc_outmix.locatorType = SL_DATALOCATOR_OUTPUTMIX; - loc_outmix.outputMix = outputmix; - sink.pLocator = &loc_outmix; - sink.pFormat = NULL; - - required[0] = SL_BOOLEAN_TRUE; - iids[0] = *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE; - required[1] = SL_BOOLEAN_TRUE; - iids[1] = *pSL_IID_PLAYBACKRATE; - - sr = SLCALL(engine, CreateAudioPlayer, &This->player, &source, &sink, - 2, iids, required); - if(sr != SL_RESULT_SUCCESS){ - WARN("CreateAudioPlayer failed: 0x%x\n", sr); - LeaveCriticalSection(&This->lock); - return E_FAIL; - } + num_buffers = This->bufsize_frames / This->period_frames; - sr = SLCALL(This->player, Realize, SL_BOOLEAN_FALSE); - if(sr != SL_RESULT_SUCCESS){ - SLCALL_N(This->player, Destroy); - This->player = NULL; - WARN("Player Realize failed: 0x%x\n", sr); + if(This->dataflow == eRender){ + hr = try_open_render_device(&pcm, num_buffers, &This->player); + if(FAILED(hr)){ LeaveCriticalSection(&This->lock); - return E_FAIL; + return hr; } sr = SLCALL(This->player, GetInterface, *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE, &This->bufq); @@ -820,42 +885,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_FAIL; } }else{ - SLDataSource source; - SLDataSink sink; - SLDataLocator_IODevice loc_mic; - SLboolean required[1]; - SLInterfaceID iids[1]; - - loc_mic.locatorType = SL_DATALOCATOR_IODEVICE; - loc_mic.deviceType = SL_IODEVICE_AUDIOINPUT; - loc_mic.deviceID = SL_DEFAULTDEVICEID_AUDIOINPUT; - loc_mic.device = NULL; - source.pLocator = &loc_mic; - source.pFormat = NULL; - - loc_bq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE; - loc_bq.numBuffers = This->bufsize_frames / This->period_frames; - sink.pLocator = &loc_bq; - sink.pFormat = &pcm; - - required[0] = SL_BOOLEAN_TRUE; - iids[0] = *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE; - - sr = SLCALL(engine, CreateAudioRecorder, &This->recorder, &source, &sink, - 1, iids, required); - if(sr != SL_RESULT_SUCCESS){ - WARN("CreateAudioRecorder failed: 0x%x\n", sr); + hr = try_open_capture_device(&pcm, num_buffers, &This->recorder); + if(FAILED(hr)){ LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - sr = SLCALL(This->recorder, Realize, SL_BOOLEAN_FALSE); - if(sr != SL_RESULT_SUCCESS){ - SLCALL_N(This->recorder, Destroy); - This->recorder = NULL; - WARN("Recorder Realize failed: 0x%x\n", sr); - LeaveCriticalSection(&This->lock); - return E_FAIL; + return hr; } sr = SLCALL(This->recorder, GetInterface, *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE, &This->bufq); @@ -971,7 +1004,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->initted = TRUE; - TRACE("numBuffers: %u, bufsize: %u, period: %u\n", loc_bq.numBuffers, + TRACE("numBuffers: %u, bufsize: %u, period: %u\n", num_buffers, This->bufsize_frames, This->period_frames); LeaveCriticalSection(&This->lock); @@ -1083,7 +1116,27 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, *outpwfx = NULL; hr = waveformat_to_pcm(This, pwfx, &pcm); + if(SUCCEEDED(hr)){ + if(This->dataflow == eRender){ + hr = try_open_render_device(&pcm, 10, NULL); + }else{ + hr = try_open_capture_device(&pcm, 10, NULL); + } + } + + if(FAILED(hr)){ + if(outpwfx){ + hr = IAudioClient_GetMixFormat(iface, outpwfx); + if(FAILED(hr)) + return hr; + return S_FALSE; + } + + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + } + TRACE("returning: %08x\n", hr); + return hr; }

1 0

Piotr Caban : atl110: Fix _ATL_COM_MODULE structure layout.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: ffed1a5f9fd0478e3f76d6998cbefd74a8fbc16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffed1a5f9fd0478e3f76d6998… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 6 18:51:36 2017 +0200 atl110: Fix _ATL_COM_MODULE structure layout. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/atlbase.h | 28 ++++++++++++ 2 files changed, 157 insertions(+) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 884ff78..0e48a39 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -486,6 +486,7 @@ void* WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE *winmod) /*********************************************************************** * AtlComModuleGetClassObject [atl100.15] */ +#if _ATL_VER < _ATL_VER_110 HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, REFIID riid, void **ppv) { _ATL_OBJMAP_ENTRY **iter; @@ -510,10 +511,37 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, WARN("Class %s not found\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; } +#else +HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, REFIID riid, void **ppv) +{ + _ATL_OBJMAP_ENTRY_EX **iter; + HRESULT hres; + + TRACE("(%p %s %s %p)\n", pm, debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if(!pm) + return E_INVALIDARG; + + for(iter = pm->m_ppAutoObjMapFirst; iter < pm->m_ppAutoObjMapLast; iter++) { + if(IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) { + if(!(*iter)->pCache->pCF) + hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&(*iter)->pCache->pCF); + if((*iter)->pCache->pCF) + hres = IUnknown_QueryInterface((*iter)->pCache->pCF, riid, ppv); + TRACE("returning %p (%08x)\n", *ppv, hres); + return hres; + } + } + + WARN("Class %s not found\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} +#endif /*********************************************************************** * AtlComModuleRegisterClassObjects [atl100.17] */ +#if _ATL_VER < _ATL_VER_110 HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD context, DWORD flags) { _ATL_OBJMAP_ENTRY **iter; @@ -541,10 +569,40 @@ HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD c return S_OK; } +#else +HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD context, DWORD flags) +{ + _ATL_OBJMAP_ENTRY_EX **iter; + IUnknown *unk; + HRESULT hres; + + TRACE("(%p %x %x)\n", module, context, flags); + + if(!module) + return E_INVALIDARG; + + for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + if(!(*iter)->pfnGetClassObject) + continue; + + hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) + return hres; + + hres = CoRegisterClassObject((*iter)->pclsid, unk, context, flags, &(*iter)->pCache->dwRegister); + IUnknown_Release(unk); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} +#endif /*********************************************************************** * AtlComModuleRevokeClassObjects [atl100.20] */ +#if _ATL_VER < _ATL_VER_110 HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) { _ATL_OBJMAP_ENTRY **iter; @@ -563,10 +621,31 @@ HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) return S_OK; } +#else +HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) +{ + _ATL_OBJMAP_ENTRY_EX **iter; + HRESULT hres; + + TRACE("(%p)\n", module); + + if(!module) + return E_INVALIDARG; + + for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + hres = CoRevokeClassObject((*iter)->pCache->dwRegister); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} +#endif /*********************************************************************** * AtlComModuleUnregisterServer [atl100.22] */ +#if _ATL_VER < _ATL_VER_110 HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) { const struct _ATL_CATMAP_ENTRY *catmap; @@ -615,6 +694,56 @@ HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeL return S_OK; } +#else +HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) +{ + const struct _ATL_CATMAP_ENTRY *catmap; + _ATL_OBJMAP_ENTRY_EX **iter; + HRESULT hres; + + TRACE("(%p %x %s)\n", mod, bRegTypeLib, debugstr_guid(clsid)); + + for(iter = mod->m_ppAutoObjMapFirst; iter < mod->m_ppAutoObjMapLast; iter++) { + if(!*iter || (clsid && !IsEqualCLSID((*iter)->pclsid, clsid))) + continue; + + TRACE("Unregistering clsid %s\n", debugstr_guid((*iter)->pclsid)); + + catmap = (*iter)->pfnGetCategoryMap(); + if(catmap) { + hres = AtlRegisterClassCategoriesHelper((*iter)->pclsid, catmap, FALSE); + if(FAILED(hres)) + return hres; + } + + hres = (*iter)->pfnUpdateRegistry(FALSE); + if(FAILED(hres)) + return hres; + } + + if(bRegTypeLib) { + ITypeLib *typelib; + TLIBATTR *attr; + BSTR path; + + hres = AtlLoadTypeLib(mod->m_hInstTypeLib, NULL, &path, &typelib); + if(FAILED(hres)) + return hres; + + SysFreeString(path); + hres = ITypeLib_GetLibAttr(typelib, &attr); + if(SUCCEEDED(hres)) { + hres = UnRegisterTypeLib(&attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, attr->lcid, attr->syskind); + ITypeLib_ReleaseTLibAttr(typelib, attr); + } + ITypeLib_Release(typelib); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} +#endif #endif diff --git a/include/atlbase.h b/include/atlbase.h index bcd634e..1e0d760 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -94,6 +94,23 @@ typedef struct _ATL_OBJMAP_ENTRYW_TAG void (WINAPI *pfnObjectMain)(BOOL bStarting); } _ATL_OBJMAP_ENTRYW, _ATL_OBJMAP_ENTRY30, _ATL_OBJMAP_ENTRY; +typedef struct _ATL_OBJMAP_CACHE +{ + IUnknown *pCF; + DWORD dwRegister; +} _ATL_OBJMAP_CACHE; + +typedef struct _ATL_OBJMAP_ENTRY110 +{ + const CLSID* pclsid; + HRESULT (WINAPI *pfnUpdateRegistry)(BOOL bRegister); + _ATL_CREATORFUNC* pfnGetClassObject; + _ATL_CREATORFUNC* pfnCreateInstance; + _ATL_OBJMAP_CACHE* pCache; + _ATL_DESCRIPTIONFUNCW* pfnGetObjectDescription; + _ATL_CATMAPFUNC* pfnGetCategoryMap; + void (WINAPI *pfnObjectMain)(BOOL bStarting); +} _ATL_OBJMAP_ENTRY110, _ATL_OBJMAP_ENTRY_EX; typedef struct _ATL_TERMFUNC_ELEM_TAG { @@ -186,6 +203,16 @@ typedef struct _ATL_WIN_MODULE70 CSimpleArray /* <ATOM> */ m_rgWindowClassAtoms; } _ATL_WIN_MODULE70; +#if _ATL_VER >= _ATL_VER_110 +typedef struct _ATL_COM_MODULE70 +{ + UINT cbSize; + HINSTANCE m_hInstTypeLib; + _ATL_OBJMAP_ENTRY_EX **m_ppAutoObjMapFirst; + _ATL_OBJMAP_ENTRY_EX **m_ppAutoObjMapLast; + CComCriticalSection m_csObjMap; +} _ATL_COM_MODULE70, _ATL_COM_MODULE; +#else typedef struct _ATL_COM_MODULE70 { UINT cbSize; @@ -194,6 +221,7 @@ typedef struct _ATL_COM_MODULE70 _ATL_OBJMAP_ENTRY **m_ppAutoObjMapLast; CComCriticalSection m_csObjMap; } _ATL_COM_MODULE70, _ATL_COM_MODULE; +#endif #if _ATL_VER >= _ATL_VER_70 typedef _ATL_MODULE70 _ATL_MODULE;

1 0

Piotr Caban : msvcrt/tests: Add _mbccpy_s tests.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: 6d0d955ac0927a9996292d9df21f475206a527fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0d955ac0927a9996292d9df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 6 12:07:23 2017 +0200 msvcrt/tests: Add _mbccpy_s tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 221ee3c..955a092 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -97,6 +97,7 @@ static double (__cdecl *p__strtod_l)(const char *,char**,_locale_t); static int (__cdecl *p__strnset_s)(char*,size_t,int,size_t); static int (__cdecl *p__wcsset_s)(wchar_t*,size_t,wchar_t); static size_t (__cdecl *p__mbsnlen)(const unsigned char*, size_t); +static int (__cdecl *p__mbccpy_s)(unsigned char*, size_t, int*, const unsigned char*); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -373,6 +374,40 @@ static void test_mbcp(void) _mbccpy(buf, mbstring); expect_bin(buf, "\xb0\xb1\xff", 3); + if(!p__mbccpy_s) { + win_skip("_mbccpy_s tests\n"); + }else { + int err, copied; + + memset(buf, 0xff, sizeof(buf)); + copied = -1; + err = p__mbccpy_s(buf, 0, &copied, mbstring); + ok(err == EINVAL, "_mbccpy_s returned %d\n", err); + ok(!copied, "copied = %d\n", copied); + ok(buf[0] == 0xff, "buf[0] = %x\n", buf[0]); + + memset(buf, 0xff, sizeof(buf)); + copied = -1; + err = p__mbccpy_s(buf, 1, &copied, mbstring); + ok(err == ERANGE, "_mbccpy_s returned %d\n", err); + ok(!copied, "copied = %d\n", copied); + ok(!buf[0], "buf[0] = %x\n", buf[0]); + + memset(buf, 0xff, sizeof(buf)); + copied = -1; + err = p__mbccpy_s(buf, 2, &copied, mbstring); + ok(!err, "_mbccpy_s returned %d\n", err); + ok(copied == 2, "copied = %d\n", copied); + expect_bin(buf, "\xb0\xb1\xff", 3); + + memset(buf, 0xff, sizeof(buf)); + copied = -1; + err = p__mbccpy_s(buf, 2, &copied, (unsigned char *)"\xb0"); + ok(err == EILSEQ, "_mbccpy_s returned %d\n", err); + ok(copied == 1, "copied = %d\n", copied); + expect_bin(buf, "\x00\xff", 2); + } + memset(buf, 0xff, sizeof(buf)); _mbsncpy(buf, mbstring, 1); expect_bin(buf, "\xb0\xb1\xff", 3); @@ -3286,6 +3321,7 @@ START_TEST(string) p__strnset_s = (void*)GetProcAddress(hMsvcrt, "_strnset_s"); p__wcsset_s = (void*)GetProcAddress(hMsvcrt, "_wcsset_s"); p__mbsnlen = (void*)GetProcAddress(hMsvcrt, "_mbsnlen"); + p__mbccpy_s = (void*)GetProcAddress(hMsvcrt, "_mbccpy_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Piotr Caban : msvcrt: Add _mbccpy_s_l implementation.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: eb7d55761ed0ee9ee95b02036b4945cd2997f112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7d55761ed0ee9ee95b02036… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 6 12:07:18 2017 +0200 msvcrt: Add _mbccpy_s_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 8 ++-- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 8 ++-- dlls/msvcr110/msvcr110.spec | 8 ++-- dlls/msvcr120/msvcr120.spec | 8 ++-- dlls/msvcr80/msvcr80.spec | 8 ++-- dlls/msvcr90/msvcr90.spec | 8 ++-- dlls/msvcrt/mbcs.c | 56 ++++++++++++++++++++-- dlls/msvcrt/msvcrt.spec | 8 ++-- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 8 ++-- 13 files changed, 89 insertions(+), 39 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 9db4f53..1c987d0 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -67,10 +67,10 @@ @ cdecl _mbbtype(long long) ucrtbase._mbbtype @ stub _mbbtype_l @ stub _mbcasemap -@ cdecl _mbccpy(ptr str) ucrtbase._mbccpy -@ stub _mbccpy_l -@ stub _mbccpy_s -@ stub _mbccpy_s_l +@ cdecl _mbccpy(ptr ptr) ucrtbase._mbccpy +@ cdecl _mbccpy_l(ptr ptr ptr) ucrtbase._mbccpy_l +@ cdecl _mbccpy_s(ptr long ptr ptr) ucrtbase._mbccpy_s +@ cdecl _mbccpy_s_l(ptr long ptr ptr ptr) ucrtbase._mbccpy_s_l @ cdecl _mbcjistojms(long) ucrtbase._mbcjistojms @ stub _mbcjistojms_l @ cdecl _mbcjmstojis(long) ucrtbase._mbcjmstojis diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index f8210b0..51729ce 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -188,7 +188,7 @@ @ cdecl _matherr(ptr) msvcrt._matherr @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype -@ cdecl _mbccpy(ptr str) msvcrt._mbccpy +@ cdecl _mbccpy(ptr ptr) msvcrt._mbccpy @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis @ cdecl _mbclen(ptr) msvcrt._mbclen diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5c8158a..ef49177 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1073,10 +1073,10 @@ @ cdecl _mbbtype(long long) @ stub _mbbtype_l # extern _mbcasemap -@ cdecl _mbccpy(ptr str) -@ stub _mbccpy_l -@ stub _mbccpy_s -@ stub _mbccpy_s_l +@ cdecl _mbccpy(ptr ptr) +@ cdecl _mbccpy_l(ptr ptr ptr) +@ cdecl _mbccpy_s(ptr long ptr ptr) +@ cdecl _mbccpy_s_l(ptr long ptr ptr ptr) @ cdecl _mbcjistojms(long) @ stub _mbcjistojms_l @ cdecl _mbcjmstojis(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2a7b777..be4d8c1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1430,10 +1430,10 @@ @ cdecl _mbbtype(long long) @ stub _mbbtype_l # extern _mbcasemap -@ cdecl _mbccpy(ptr str) -@ stub _mbccpy_l -@ stub _mbccpy_s -@ stub _mbccpy_s_l +@ cdecl _mbccpy(ptr ptr) +@ cdecl _mbccpy_l(ptr ptr ptr) +@ cdecl _mbccpy_s(ptr long ptr ptr) +@ cdecl _mbccpy_s_l(ptr long ptr ptr ptr) @ cdecl _mbcjistojms(long) @ stub _mbcjistojms_l @ cdecl _mbcjmstojis(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 725ecb2..60e0a32 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1440,10 +1440,10 @@ @ cdecl _mbbtype(long long) @ stub _mbbtype_l # extern _mbcasemap -@ cdecl _mbccpy(ptr str) -@ stub _mbccpy_l -@ stub _mbccpy_s -@ stub _mbccpy_s_l +@ cdecl _mbccpy(ptr ptr) +@ cdecl _mbccpy_l(ptr ptr ptr) +@ cdecl _mbccpy_s(ptr long ptr ptr) +@ cdecl _mbccpy_s_l(ptr long ptr ptr ptr) @ cdecl _mbcjistojms(long) @ stub _mbcjistojms_l @ cdecl _mbcjmstojis(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d8290dd..4d97db0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -745,10 +745,10 @@ @ cdecl _mbbtype(long long) @ stub _mbbtype_l # extern _mbcasemap -@ cdecl _mbccpy(ptr str) -@ stub _mbccpy_l -@ stub _mbccpy_s -@ stub _mbccpy_s_l +@ cdecl _mbccpy(ptr ptr) +@ cdecl _mbccpy_l(ptr ptr ptr) +@ cdecl _mbccpy_s(ptr long ptr ptr) +@ cdecl _mbccpy_s_l(ptr long ptr ptr ptr) @ cdecl _mbcjistojms(long) @ stub _mbcjistojms_l @ cdecl _mbcjmstojis(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bfaf6f6..eccbf3c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -723,10 +723,10 @@ @ cdecl _mbbtype(long long) @ stub _mbbtype_l # extern _mbcasemap -@ cdecl _mbccpy(ptr str) -@ stub _mbccpy_l -@ stub _mbccpy_s -@ stub _mbccpy_s_l +@ cdecl _mbccpy(ptr ptr) +@ cdecl _mbccpy_l(ptr ptr ptr) +@ cdecl _mbccpy_s(ptr long ptr ptr) +@ cdecl _mbccpy_s_l(ptr long ptr ptr ptr) @ cdecl _mbcjistojms(long) @ stub _mbcjistojms_l @ cdecl _mbcjmstojis(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 12a7f5d..6e46b84 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -624,13 +624,63 @@ MSVCRT_size_t CDECL _mbsnlen(const unsigned char* str, MSVCRT_size_t maxsize) } /********************************************************************* + * _mbccpy_s_l(MSVCRT.@) + */ +int CDECL _mbccpy_s_l(unsigned char* dest, MSVCRT_size_t maxsize, + int *copied, const unsigned char* src, MSVCRT__locale_t locale) +{ + if(copied) *copied = 0; + if(!MSVCRT_CHECK_PMT(dest != NULL && maxsize >= 1)) return MSVCRT_EINVAL; + dest[0] = 0; + if(!MSVCRT_CHECK_PMT(src != NULL)) return MSVCRT_EINVAL; + + if(_ismbblead_l(*src, locale)) { + if(!src[1]) { + if(copied) *copied = 1; + *MSVCRT__errno() = MSVCRT_EILSEQ; + return MSVCRT_EILSEQ; + } + + if(maxsize < 2) { + MSVCRT_INVALID_PMT("dst buffer is too small", MSVCRT_ERANGE); + return MSVCRT_ERANGE; + } + + *dest++ = *src++; + *dest = *src; + if(copied) *copied = 2; + }else { + *dest = *src; + if(copied) *copied = 1; + } + + return 0; +} + +/********************************************************************* * _mbccpy(MSVCRT.@) */ void CDECL _mbccpy(unsigned char* dest, const unsigned char* src) { - *dest = *src; - if(_ismbblead(*src)) - *++dest = *++src; /* MB char */ + _mbccpy_s_l(dest, 2, NULL, src, NULL); +} + +/********************************************************************* + * _mbccpy_l(MSVCRT.@) + */ +void CDECL _mbccpy_l(unsigned char* dest, const unsigned char* src, + MSVCRT__locale_t locale) +{ + _mbccpy_s_l(dest, 2, NULL, src, locale); +} + +/********************************************************************* + * _mbccpy_s(MSVCRT.@) + */ +int CDECL _mbccpy_s(unsigned char* dest, MSVCRT_size_t maxsize, + int *copied, const unsigned char* src) +{ + return _mbccpy_s_l(dest, maxsize, copied, src, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3c73ae2..50d051d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -688,10 +688,10 @@ # stub _mbbtombc_l(long ptr) @ cdecl _mbbtype(long long) # extern _mbcasemap -@ cdecl _mbccpy(ptr str) -# stub _mbccpy_l(ptr str ptr) -# stub _mbccpy_s(ptr long ptr str) -# stub _mbccpy_s_l(ptr long ptr str ptr) +@ cdecl _mbccpy(ptr ptr) +@ cdecl _mbccpy_l(ptr ptr ptr) +@ cdecl _mbccpy_s(ptr long ptr ptr) +@ cdecl _mbccpy_s_l(ptr long ptr ptr ptr) @ cdecl _mbcjistojms (long) # stub _mbcjistojms_l(long ptr) @ cdecl _mbcjmstojis(long) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index b77b2f3..6ced0fd 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1015,7 +1015,7 @@ @ cdecl _matherr(ptr) msvcrt._matherr @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype -@ cdecl _mbccpy(ptr str) msvcrt._mbccpy +@ cdecl _mbccpy(ptr ptr) msvcrt._mbccpy @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis @ cdecl _mbclen(ptr) msvcrt._mbclen diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 5c10e67..e4ef8d7 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1106,7 +1106,7 @@ @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype -@ cdecl _mbccpy(ptr str) msvcrt._mbccpy +@ cdecl _mbccpy(ptr ptr) msvcrt._mbccpy @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis @ cdecl _mbclen(ptr) msvcrt._mbclen diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 43b34c4..15066c3 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -396,7 +396,7 @@ @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype # extern _mbcasemap -@ cdecl _mbccpy(ptr str) msvcrt._mbccpy +@ cdecl _mbccpy(ptr ptr) msvcrt._mbccpy @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis @ cdecl _mbclen(ptr) msvcrt._mbclen diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6fc805d..2b0f6fa 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -586,10 +586,10 @@ @ cdecl _mbbtype(long long) @ stub _mbbtype_l @ stub _mbcasemap -@ cdecl _mbccpy(ptr str) -@ stub _mbccpy_l -@ stub _mbccpy_s -@ stub _mbccpy_s_l +@ cdecl _mbccpy(ptr ptr) +@ cdecl _mbccpy_l(ptr ptr ptr) +@ cdecl _mbccpy_s(ptr long ptr ptr) +@ cdecl _mbccpy_s_l(ptr long ptr ptr ptr) @ cdecl _mbcjistojms(long) @ stub _mbcjistojms_l @ cdecl _mbcjmstojis(long)

1 0

Piotr Caban : user32: Don' t invalidate ComboBox on LBN_SELCHANGE and LBN_SELCANCEL.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: 9cb29e5182622f7db8316f62fe82e114df73d570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb29e5182622f7db8316f62f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 4 12:38:36 2017 +0200 user32: Don't invalidate ComboBox on LBN_SELCHANGE and LBN_SELCANCEL. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 121 ++++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 4b6bc4f..ee9ce0a 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -646,13 +646,58 @@ static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) } /*********************************************************************** + * COMBO_PrepareColors + * + * This method will sent the appropriate WM_CTLCOLOR message to + * prepare and setup the colors for the combo's DC. + * + * It also returns the brush to use for the background. + */ +static HBRUSH COMBO_PrepareColors( + LPHEADCOMBO lphc, + HDC hDC) +{ + HBRUSH hBkgBrush; + + /* + * Get the background brush for this control. + */ + if (CB_DISABLED(lphc)) + { + hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, + (WPARAM)hDC, (LPARAM)lphc->self ); + + /* + * We have to change the text color since WM_CTLCOLORSTATIC will + * set it to the "enabled" color. This is the same behavior as the + * edit control + */ + SetTextColor(hDC, GetSysColor(COLOR_GRAYTEXT)); + } + else + { + /* FIXME: In which cases WM_CTLCOLORLISTBOX should be sent? */ + hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT, + (WPARAM)hDC, (LPARAM)lphc->self ); + } + + /* + * Catch errors. + */ + if( !hBkgBrush ) + hBkgBrush = GetSysColorBrush(COLOR_WINDOW); + + return hBkgBrush; +} + +/*********************************************************************** * CBPaintText * * Paint CBS_DROPDOWNLIST text field / update edit control contents. */ static void CBPaintText( LPHEADCOMBO lphc, - HDC hdc) + HDC hdc_paint) { RECT rectEdit = lphc->textRect; INT id, size = 0; @@ -690,14 +735,20 @@ static void CBPaintText( } else /* paint text field ourselves */ { - UINT itemState = ODS_COMBOBOXEDIT; - HFONT hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0; + HDC hdc = hdc_paint ? hdc_paint : GetDC(lphc->self); + UINT itemState = ODS_COMBOBOXEDIT; + HFONT hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0; + HBRUSH hPrevBrush, hBkgBrush; /* * Give ourselves some space. */ InflateRect( &rectEdit, -1, -1 ); + hBkgBrush = COMBO_PrepareColors( lphc, hdc ); + hPrevBrush = SelectObject( hdc, hBkgBrush ); + FillRect( hdc, &rectEdit, hBkgBrush ); + if( CB_OWNERDRAWN(lphc) ) { DRAWITEMSTRUCT dis; @@ -757,6 +808,12 @@ static void CBPaintText( if( hPrevFont ) SelectObject(hdc, hPrevFont ); + + if( hPrevBrush ) + SelectObject( hdc, hPrevBrush ); + + if( !hdc_paint ) + ReleaseDC( lphc->self, hdc ); } HeapFree( GetProcessHeap(), 0, pText ); } @@ -787,52 +844,6 @@ static void CBPaintBorder( } /*********************************************************************** - * COMBO_PrepareColors - * - * This method will sent the appropriate WM_CTLCOLOR message to - * prepare and setup the colors for the combo's DC. - * - * It also returns the brush to use for the background. - */ -static HBRUSH COMBO_PrepareColors( - LPHEADCOMBO lphc, - HDC hDC) -{ - HBRUSH hBkgBrush; - - /* - * Get the background brush for this control. - */ - if (CB_DISABLED(lphc)) - { - hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)lphc->self ); - - /* - * We have to change the text color since WM_CTLCOLORSTATIC will - * set it to the "enabled" color. This is the same behavior as the - * edit control - */ - SetTextColor(hDC, GetSysColor(COLOR_GRAYTEXT)); - } - else - { - /* FIXME: In which cases WM_CTLCOLORLISTBOX should be sent? */ - hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT, - (WPARAM)hDC, (LPARAM)lphc->self ); - } - - /* - * Catch errors. - */ - if( !hBkgBrush ) - hBkgBrush = GetSysColorBrush(COLOR_WINDOW); - - return hBkgBrush; -} - - -/*********************************************************************** * COMBO_Paint */ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) @@ -1285,18 +1296,8 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) if( HIWORD(wParam) == LBN_SELCHANGE) { if( lphc->wState & CBF_EDIT ) - { - INT index = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); lphc->wState |= CBF_NOLBSELECT; - CBUpdateEdit( lphc, index ); - /* select text in edit, as Windows does */ - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); - } - else - { - InvalidateRect(lphc->self, &lphc->textRect, TRUE); - UpdateWindow(lphc->self); - } + CBPaintText( lphc, NULL ); } break;

1 0

Piotr Caban : user32/tests: Add test for CB_SETCURSEL on ComboBox.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: eb5c7bccd4543427e335328fa06b2111ae9a927b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5c7bccd4543427e335328fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 4 12:37:51 2017 +0200 user32/tests: Add test for CB_SETCURSEL on ComboBox. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6f4b7f4..1d34fd2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6598,6 +6598,21 @@ static void test_static_messages(void) /****************** ComboBox message test *************************/ #define ID_COMBOBOX 0x000f +static const struct message SetCurSelComboSeq[] = +{ + { CB_SETCURSEL, sent|wparam|lparam, 0, 0 }, + { LB_SETCURSEL, sent|wparam|lparam, 0, 0 }, + { LB_SETTOPINDEX, sent|wparam|lparam, 0, 0 }, + { LB_GETCURSEL, sent|wparam|lparam, 0, 0 }, + { LB_GETTEXTLEN, sent|wparam|lparam, 0, 0 }, + { LB_GETTEXTLEN, sent|wparam|lparam|optional, 0, 0 }, /* TODO: it's sent on all Windows versions */ + { LB_GETTEXT, sent|wparam, 0 }, + { WM_CTLCOLOREDIT, sent|parent }, + { LB_GETITEMDATA, sent|wparam|lparam, 0, 0 }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_COMBOBOX, 0x100010f3 }, + { 0 } +}; + static const struct message WmKeyDownComboSeq[] = { { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, @@ -6681,9 +6696,10 @@ static const struct message SetFocusButtonSeq2[] = { 0 } }; -static WNDPROC old_combobox_proc, edit_window_proc; +static WNDPROC old_combobox_proc, edit_window_proc, lbox_window_proc; -static LRESULT CALLBACK combobox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK combobox_edit_subclass_proc(HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; LRESULT ret; @@ -6704,7 +6720,7 @@ static LRESULT CALLBACK combobox_subclass_proc(HWND hwnd, UINT message, WPARAM w if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - msg.descr = "combo"; + msg.descr = "combo edit"; add_message(&msg); } @@ -6715,6 +6731,38 @@ static LRESULT CALLBACK combobox_subclass_proc(HWND hwnd, UINT message, WPARAM w return ret; } +static LRESULT CALLBACK combobox_lbox_subclass_proc(HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + LRESULT ret; + struct recvd_message msg; + + /* do not log painting messages */ + if (message != WM_PAINT && + message != WM_NCPAINT && + message != WM_SYNCPAINT && + message != WM_ERASEBKGND && + message != WM_NCHITTEST && + !ignore_message( message )) + { + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "combo lbox"; + add_message(&msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(lbox_window_proc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -6764,7 +6812,7 @@ static void subclass_combobox(void) static void test_combobox_messages(void) { - HWND parent, combo, button, edit; + HWND parent, combo, button, edit, lbox; LRESULT ret; BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); COMBOBOXINFO cbInfo; @@ -6832,7 +6880,8 @@ static void test_combobox_messages(void) ok(res, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); edit = cbInfo.hwndItem; - edit_window_proc = (WNDPROC)SetWindowLongPtrA(edit, GWLP_WNDPROC, (ULONG_PTR)combobox_subclass_proc); + edit_window_proc = (WNDPROC)SetWindowLongPtrA(edit, GWLP_WNDPROC, + (ULONG_PTR)combobox_edit_subclass_proc); button = CreateWindowExA(0, "Button", "OK", WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON, 5, 50, 100, 20, parent, NULL, @@ -6867,6 +6916,30 @@ static void test_combobox_messages(void) DestroyWindow(button); DestroyWindow(combo); + + combo = CreateWindowExA(0, "my_combobox_class", "test", + WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | CBS_DROPDOWNLIST, + 5, 5, 100, 100, parent, (HMENU)ID_COMBOBOX, NULL, NULL); + ok(combo != 0, "Failed to create combobox window\n"); + + ret = SendMessageA(combo, CB_ADDSTRING, 0, (LPARAM)"item 0"); + ok(ret == 0, "expected 0, got %ld\n", ret); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + res = pGetComboBoxInfo(combo, &cbInfo); + ok(res, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + lbox = cbInfo.hwndList; + lbox_window_proc = (WNDPROC)SetWindowLongPtrA(lbox, GWLP_WNDPROC, + (ULONG_PTR)combobox_lbox_subclass_proc); + flush_sequence(); + + log_all_parent_messages++; + SendMessageA(combo, CB_SETCURSEL, 0, 0); + log_all_parent_messages--; + ok_sequence(SetCurSelComboSeq, "CB_SETCURSEL on a ComboBox", TRUE); + + DestroyWindow(combo); DestroyWindow(parent); }

1 0