February 2020 - wine-devel

[PATCH] ucrtbase: added function implementation for get_FMA3_enable
by daxcore 04 Feb '20

04 Feb '20

replaced the stub with a real implementation for FMA3 Proton-Bug: https://github.com/ValveSoftware/Proton/issues/3227 --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 1 + dlls/msvcrt/math.c | 14 ++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index cb8fdc9227..579b97fee3 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -81,7 +81,7 @@ @ cdecl _fpclass(double) ucrtbase._fpclass @ stub _fpclassf @ cdecl -arch=i386 -ret64 _ftol() ucrtbase._ftol -@ stub _get_FMA3_enable +@ cdecl -arch=win64 _get_FMA3_enable() ucrtbase._get_FMA3_enable @ cdecl _hypot(double double) ucrtbase._hypot @ cdecl _hypotf(float float) ucrtbase._hypotf @ cdecl _isnan(double) ucrtbase._isnan diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 903f4b7ce3..1016f6a649 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1639,6 +1639,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable +@ cdecl -arch=win64 _get_FMA3_enable() MSVCRT__get_FMA3_enable @ cdecl -arch=win64 _set_FMA3_enable(long) MSVCRT__set_FMA3_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_controlfp(long long) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f6824128cd..80e73ccefe 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -118,6 +118,20 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) } #if defined(_WIN64) && _MSVCR_VER>=120 +/********************************************************************* + * _get_FMA3_enable (MSVCR120.@) + */ +int CDECL MSVCRT__get_FMA3_enable(void) +{ + #if !defined(__FMA__) && defined(__AVX2__) + #define __FMA__ 1 + #endif + #if defined(__FMA__) + return 1; + #endif + return 0; +} + /********************************************************************* * _set_FMA3_enable (MSVCR120.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 568019da51..6cac7a5ef5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -357,7 +357,7 @@ @ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ cdecl _gcvt(double long str) MSVCRT__gcvt @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s -@ stub _get_FMA3_enable +@ cdecl -arch=win64 _get_FMA3_enable() MSVCRT__get_FMA3_enable @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -- 2.25.0

6 11

[PATCH v8] include: Add xact3.idl
by Alistair Leslie-Hughes 04 Feb '20

04 Feb '20

From: Ethan Lee <elee(a)codeweavers.com> v8. Fixed nameless union. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3.idl | 533 ++++++++++++++++++++++++++++++++++++++++++++ include/xact3wb.h | 2 + 3 files changed, 536 insertions(+) create mode 100644 include/xact3.idl diff --git a/include/Makefile.in b/include/Makefile.in index 5f967b616d..909f025261 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -773,6 +773,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3.idl \ xact3wb.h \ xapo.idl \ xapofx.h \ diff --git a/include/xact3.idl b/include/xact3.idl new file mode 100644 index 0000000000..e073b6b605 --- /dev/null +++ b/include/xact3.idl @@ -0,0 +1,533 @@ +/* + * Copyright (c) 2018 Ethan Lee for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "xaudio2.idl"; + +import "xact3wb.h"; + +[ + uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) +] +coclass XACTEngine +{ +} + +interface IXACT3Engine; +interface IXACT3SoundBank; +interface IXACT3WaveBank; +interface IXACT3Cue; +interface IXACT3Wave; + +typedef WORD XACTCATEGORY; +typedef BYTE XACTCHANNEL; +typedef WORD XACTINDEX; +typedef BYTE XACTINSTANCELIMIT; +typedef BYTE XACTLOOPCOUNT; +typedef BYTE XACTNOTIFICATIONTYPE; +typedef SHORT XACTPITCH; +typedef LONG XACTTIME; +typedef WORD XACTVARIABLEINDEX; +typedef FLOAT XACTVARIABLEVALUE; +typedef BYTE XACTVARIATIONWEIGHT; +typedef FLOAT XACTVOLUME; + +#define XACT_RENDERER_ID_LENGTH 0xff +#define XACT_RENDERER_NAME_LENGTH 0xff +#define XACT_CUE_NAME_LENGTH 0xff + +cpp_quote("#ifndef WAVEBANK_ENTRYNAME_LENGTH") +#define WAVEBANK_ENTRYNAME_LENGTH 64 +cpp_quote("#endif") + +typedef struct XACT_RENDERER_DETAILS +{ + WCHAR rendererID[XACT_RENDERER_ID_LENGTH]; + WCHAR displayName[XACT_RENDERER_NAME_LENGTH]; + BOOL defaultDevice; +} XACT_RENDERER_DETAILS; + +typedef BOOL (__stdcall *XACT_READFILE_CALLBACK)( + HANDLE hFile, + LPVOID lpBuffer, + DWORD nNumberOfBytesRead, + LPDWORD lpNumberOfBytesRead, + void* lpOverlapped +); +typedef BOOL (__stdcall *XACT_GETOVERLAPPEDRESULT_CALLBACK)( + HANDLE hFile, + void* lpOverlapped, + LPDWORD lpNumberOfBytesTransferred, + BOOL bWait +); +typedef struct XACT_FILEIO_CALLBACKS +{ + XACT_READFILE_CALLBACK readFileCallback; + XACT_GETOVERLAPPEDRESULT_CALLBACK getOverlappedResultCallback; +} XACT_FILEIO_CALLBACKS; + +typedef struct XACT_NOTIFICATION XACT_NOTIFICATION; +typedef void (__stdcall *XACT_NOTIFICATION_CALLBACK)( + const XACT_NOTIFICATION *pNotification +); + +typedef struct XACT_RUNTIME_PARAMETERS +{ + DWORD lookAheadTime; + void* pGlobalSettingsBuffer; + DWORD globalSettingsBufferSize; + DWORD globalSettingsFlags; + DWORD globalSettingsAllocAttributes; + XACT_FILEIO_CALLBACKS fileIOCallbacks; + XACT_NOTIFICATION_CALLBACK fnNotificationCallback; + LPCWSTR pRendererID; + IXAudio2 *pXAudio2; + IXAudio2MasteringVoice *pMasteringVoice; +} XACT_RUNTIME_PARAMETERS; + +typedef struct XACT_STREAMING_PARAMETERS +{ + HANDLE file; + DWORD offset; + DWORD flags; + WORD packetSize; +} XACT_STREAMING_PARAMETERS; + +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[WAVEBANK_ENTRYNAME_LENGTH]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES; + +cpp_quote("#if 0") +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES waveProperties; /* properties is a keyword for midl */ + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES; +cpp_quote("#endif") + +cpp_quote("typedef struct XACT_WAVE_INSTANCE_PROPERTIES") +cpp_quote("{") +cpp_quote(" XACT_WAVE_PROPERTIES properties;") +cpp_quote(" BOOL backgroundMusic;") +cpp_quote("} XACT_WAVE_INSTANCE_PROPERTIES;") + +typedef struct XACT_CUE_PROPERTIES +{ + char friendlyName[XACT_CUE_NAME_LENGTH]; + BOOL interactive; + XACTINDEX iaVariableIndex; + XACTINDEX numVariations; + XACTINSTANCELIMIT maxInstances; + XACTINSTANCELIMIT currentInstances; +} XACT_CUE_PROPERTIES; + +typedef struct XACT_TRACK_PROPERTIES +{ + XACTTIME duration; + XACTINDEX numVariations; + XACTCHANNEL numChannels; + XACTINDEX waveVariation; + XACTLOOPCOUNT loopCount; +} XACT_TRACK_PROPERTIES; + +typedef struct XACT_VARIATION_PROPERTIES +{ + XACTINDEX index; + XACTVARIATIONWEIGHT weight; + XACTVARIABLEVALUE iaVariableMin; + XACTVARIABLEVALUE iaVariableMax; + BOOL linger; +} XACT_VARIATION_PROPERTIES; + +typedef struct XACT_SOUND_PROPERTIES +{ + XACTCATEGORY category; + BYTE priority; + XACTPITCH pitch; + XACTVOLUME volume; + XACTINDEX numTracks; + XACT_TRACK_PROPERTIES arrTrackProperties[1]; +} XACT_SOUND_PROPERTIES; + +typedef struct XACT_SOUND_VARIATION_PROPERTIES +{ + XACT_VARIATION_PROPERTIES variationProperties; + XACT_SOUND_PROPERTIES soundProperties; +} XACT_SOUND_VARIATION_PROPERTIES; + +typedef struct XACT_CUE_INSTANCE_PROPERTIES +{ + DWORD allocAttributes; + XACT_CUE_PROPERTIES cueProperties; + XACT_SOUND_VARIATION_PROPERTIES activeVariationProperties; +} XACT_CUE_INSTANCE_PROPERTIES; + +cpp_quote("#include <pshpack1.h>") + +typedef struct XACT_NOTIFICATION_DESCRIPTION +{ + XACTNOTIFICATIONTYPE type; + BYTE flags; + IXACT3SoundBank *pSoundBank; + IXACT3WaveBank *pWaveBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; + XACTINDEX cueIndex; + XACTINDEX waveIndex; + void* pvContext; +} XACT_NOTIFICATION_DESCRIPTION; + +typedef struct XACT_NOTIFICATION_CUE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; +} XACT_NOTIFICATION_CUE; + +typedef struct XACT_NOTIFICATION_MARKER +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + DWORD marker; +} XACT_NOTIFICATION_MARKER; + +typedef struct XACT_NOTIFICATION_SOUNDBANK +{ + IXACT3SoundBank *pSoundBank; +} XACT_NOTIFICATION_SOUNDBANK; + +typedef struct XACT_NOTIFICATION_WAVEBANK +{ + IXACT3WaveBank *pWaveBank; +} XACT_NOTIFICATION_WAVEBANK; + +typedef struct XACT_NOTIFICATION_VARIABLE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + XACTVARIABLEINDEX variableIndex; + XACTVARIABLEVALUE variableValue; + BOOL local; +} XACT_NOTIFICATION_VARIABLE; + +typedef struct XACT_NOTIFICATION_GUI +{ + DWORD reserved; +} XACT_NOTIFICATION_GUI; + +typedef struct XACT_NOTIFICATION_WAVE +{ + IXACT3WaveBank *pWaveBank; + XACTINDEX waveIndex; + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; +} XACT_NOTIFICATION_WAVE; + +struct XACT_NOTIFICATION +{ + XACTNOTIFICATIONTYPE type; + LONG timeStamp; + PVOID pvContext; + union + { + XACT_NOTIFICATION_CUE cue; + XACT_NOTIFICATION_MARKER marker; + XACT_NOTIFICATION_SOUNDBANK soundBank; + XACT_NOTIFICATION_WAVEBANK waveBank; + XACT_NOTIFICATION_VARIABLE variable; + XACT_NOTIFICATION_GUI gui; + XACT_NOTIFICATION_WAVE wave; + } DUMMYUNIONNAME; +}; + +cpp_quote("#include <poppack.h>") + +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16; + +[ + object, + local, + uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), +] +interface IXACT3Engine : IUnknown +{ + HRESULT GetRendererCount(XACTINDEX *pnRendererCount); + + HRESULT GetRendererDetails( + XACTINDEX nRendererIndex, + XACT_RENDERER_DETAILS *pRendererDetails); + + HRESULT GetFinalMixFormat(WAVEFORMATEXTENSIBLE *pFinalMixFormat); + + HRESULT Initialize(const XACT_RUNTIME_PARAMETERS *pParams); + + HRESULT ShutDown(); + + HRESULT DoWork(); + + HRESULT CreateSoundBank( + const void* pvBuffer, + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + IXACT3SoundBank **ppSoundBank); + + HRESULT CreateInMemoryWaveBank( + const void* pvBuffer, + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + IXACT3WaveBank **ppWaveBank); + + HRESULT CreateStreamingWaveBank( + const XACT_STREAMING_PARAMETERS *pParms, + IXACT3WaveBank **ppWaveBank); + + HRESULT PrepareWave( + DWORD dwFlags, + LPCSTR szWavePath, + WORD wStreamingPacketSize, + DWORD dwAlignment, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT PrepareInMemoryWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + DWORD *pdwSeekTable, + BYTE *pbWaveData, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT PrepareStreamingWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + XACT_STREAMING_PARAMETERS streamingParams, + DWORD dwAlignment, + DWORD *pdwSeekTable, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT RegisterNotification( + const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + HRESULT UnRegisterNotification( + const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + XACTCATEGORY GetCategory( + LPCSTR szFriendlyName); + + HRESULT Stop(XACTCATEGORY nCategory, DWORD dwFlags); + + HRESULT SetVolume(XACTCATEGORY nCategory, XACTVOLUME nVolume); + + HRESULT Pause(XACTCATEGORY nCategory, BOOL fPause); + + XACTVARIABLEINDEX GetGlobalVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE nValue); + + HRESULT GetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); +} + +[ + object, + local +] +interface IXACT3SoundBank +{ + XACTINDEX GetCueIndex(LPCSTR szFriendlyName); + + HRESULT GetNumCues(XACTINDEX *pnNumCues); + + HRESULT GetCueProperties( + XACTINDEX nCueIndex, + XACT_CUE_PROPERTIES *pProperties); + + HRESULT Prepare( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + IXACT3Cue **ppCue); + + HRESULT Play( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + IXACT3Cue **ppCue); + + HRESULT Stop(XACTINDEX nCueIndex, DWORD dwFlags); + + HRESULT Destroy(); + + HRESULT GetState(DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT3WaveBank +{ + HRESULT Destroy(); + + HRESULT GetNumWaves(XACTINDEX *pnNumWaves); + + XACTINDEX GetWaveIndex(LPCSTR szFriendlyName); + + HRESULT GetWaveProperties( + XACTINDEX nWaveIndex, + XACT_WAVE_PROPERTIES *pWaveProperties); + + HRESULT Prepare( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT Play( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT Stop(XACTINDEX nWaveIndex, DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT34Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties(XACT_CUE_INSTANCE_PROPERTIES **ppProperties); +} + +[ + object, + local +] +interface IXACT3Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties(XACT_CUE_INSTANCE_PROPERTIES **ppProperties); + + HRESULT SetOutputVoices(const XAUDIO2_VOICE_SENDS *pSendList); + + HRESULT SetOutputVoiceMatrix( + IXAudio2Voice *pDestinationVoice, + UINT32 SourceChannels, + UINT32 DestinationChannels, + const float *pLevelMatrix); +} + +[ + object, + local +] +interface IXACT3Wave +{ + HRESULT Destroy(); + + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT Pause(BOOL fPause); + + HRESULT GetState(DWORD *pdwState); + + HRESULT SetPitch(XACTPITCH pitch); + + HRESULT SetVolume(XACTVOLUME volume); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + HRESULT GetProperties(XACT_WAVE_INSTANCE_PROPERTIES *pProperties); +} diff --git a/include/xact3wb.h b/include/xact3wb.h index b4c5a53d40..130efc9745 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -18,6 +18,8 @@ #ifndef __XACT3WB_H__ #define __XACT3WB_H__ +#define WAVEBANK_ENTRYNAME_LENGTH 64 + typedef union WAVEBANKMINIWAVEFORMAT { struct -- 2.24.1

1 0

[PATCH] Make CallProcEx32W16 clear CPEX_DEST_CDECL flag in 'nrofargs' argument before looping over arguments. The flag being set previously caused the procedure to try to loop over 2^31 + n arguments, triggering an exception.
by Dirk Niggemann 04 Feb '20

04 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48480 Signed-off-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> --- dlls/krnl386.exe16/thunk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index c8ad3824c0..f12766d7d9 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -2477,9 +2477,9 @@ DWORD WINAPIV CallProcEx32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32 DWORD args[32]; unsigned int i; - TRACE("(%d,%d,%p args[",nrofargs,argconvmask,proc32); + TRACE("(%s,%d,%d,%p args[",nrofargs & CPEX_DEST_CDECL ? "cdecl": "stdcall",nrofargs & ~CPEX_DEST_CDECL,argconvmask,proc32); - for (i=0;i<nrofargs;i++) + for (i=0;i<(nrofargs & ~CPEX_DEST_CDECL);i++) { if (argconvmask & (1<<i)) { -- 2.17.2 (Apple Git-113)

1 0

[PATCH resend] msctf: Always provide a context when from GetBase/Top.
by Derek Lesho 04 Feb '20

04 Feb '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/msctf/documentmgr.c | 20 +++++++++++++++++--- dlls/msctf/tests/inputprocessor.c | 26 ++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 44856db632..37d55557f5 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -44,6 +44,7 @@ typedef struct tagDocumentMgr { /* Aggregation */ ITfCompartmentMgr *CompartmentMgr; + ITfContext* initialContext; ITfContext* contextStack[2]; /* limit of 2 contexts */ ITfThreadMgrEventSink* ThreadMgrSink; @@ -87,6 +88,8 @@ static void DocumentMgr_Destructor(DocumentMgr *This) ITfThreadMgr_Release(tm); } + if (This->initialContext) + ITfContext_Release(This->initialContext); if (This->contextStack[0]) ITfContext_Release(This->contextStack[0]); if (This->contextStack[1]) @@ -222,14 +225,21 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) static HRESULT WINAPI DocumentMgr_GetTop(ITfDocumentMgr *iface, ITfContext **ppic) { DocumentMgr *This = impl_from_ITfDocumentMgr(iface); + ITfContext *tgt; + TRACE("(%p)\n",This); if (!ppic) return E_INVALIDARG; if (This->contextStack[0]) - ITfContext_AddRef(This->contextStack[0]); + tgt = This->contextStack[0]; + else + tgt = This->initialContext; + + if (tgt) + ITfContext_AddRef(tgt); - *ppic = This->contextStack[0]; + *ppic = tgt; return S_OK; } @@ -245,8 +255,10 @@ static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **pp if (This->contextStack[1]) tgt = This->contextStack[1]; - else + else if (This->contextStack[0]) tgt = This->contextStack[0]; + else + tgt = This->initialContext; if (tgt) ITfContext_AddRef(tgt); @@ -342,6 +354,7 @@ static const ITfSourceVtbl DocumentMgrSourceVtbl = HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumentMgr **ppOut) { DocumentMgr *This; + DWORD cookie; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DocumentMgr)); if (This == NULL) @@ -354,6 +367,7 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen list_init(&This->TransitoryExtensionSink); CompartmentMgr_Constructor((IUnknown*)&This->ITfDocumentMgr_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + Context_Constructor(processId,NULL,&This->ITfDocumentMgr_iface, &This->initialContext, &cookie); *ppOut = &This->ITfDocumentMgr_iface; TRACE("returning %p\n", *ppOut); diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591ea40..52921ec7cd 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1639,10 +1639,10 @@ static HRESULT TextEditSink_Constructor(ITfTextEditSink **ppOut) static void test_startSession(void) { HRESULT hr; - DWORD cnt; + DWORD cnt, initial_ctx_cnt; DWORD editCookie; ITfDocumentMgr *dmtest; - ITfContext *cxt,*cxt2,*cxt3,*cxtTest; + ITfContext *cxt,*cxt2,*cxt3,*cxtTest,*initial_ctx; ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1684,6 +1684,23 @@ static void test_startSession(void) hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&g_dm); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); + test_OnPushContext = SINK_EXPECTED; + test_OnInitDocumentMgr = SINK_EXPECTED; + + /* For some reason, even when the object isn't initialized, this yields a context */ + hr = ITfDocumentMgr_GetBase(g_dm, &initial_ctx); + ok(SUCCEEDED(hr), "GetBase Failed\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr), "GetTop Failed\n"); + ok(cxtTest == initial_ctx, "GetTop != GetBase\n"); + + ok(initial_ctx != NULL, "Expected initial context\n"); + initial_ctx_cnt = check_context_refcount(initial_ctx); + hr = ITfContext_GetDocumentMgr(initial_ctx,&dmtest); + ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); + ok(dmtest == g_dm, "Wrong documentmgr\n"); + ITfDocumentMgr_Release(dmtest); + test_EnumDocumentMgr(g_tm,g_dm,NULL); hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dmtest); @@ -1740,6 +1757,7 @@ static void test_startSession(void) test_OnPushContext = SINK_EXPECTED; test_ACP_AdviseSink = SINK_EXPECTED; test_OnInitDocumentMgr = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt); ok(SUCCEEDED(hr),"Push Failed\n"); ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); @@ -1749,6 +1767,9 @@ static void test_startSession(void) test_EnumContexts(g_dm, cxt); + /* the initial context is released with the document manager */ + ok(initial_ctx_cnt == check_context_refcount(initial_ctx), "Context ref count changed after documentmgr initialization\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1859,6 +1880,7 @@ static void test_startSession(void) ITfContext_Release(cxt); ITfContext_Release(cxt2); ITfContext_Release(cxt3); + ITfContext_Release(initial_ctx); ITextStoreACP_Release(ts); } -- 2.25.0

2 1

[PATCH 1/3] ntdll/tests: Simplify test_file_name_information().
by Zebediah Figura 04 Feb '20

04 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/file.c | 133 ++++++++++------------------------------ 1 file changed, 34 insertions(+), 99 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 539ce44e0a4..21889870499 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3146,131 +3146,66 @@ todo_wine static void test_file_name_information(void) { - WCHAR *file_name, *volume_prefix, *expected; - FILE_NAME_INFORMATION *info; + char buffer[300]; + FILE_NAME_INFORMATION *info = (FILE_NAME_INFORMATION *)buffer; ULONG old_redir = 1, tmp; - UINT file_name_size; IO_STATUS_BLOCK io; - UINT info_size; - HRESULT hr; + NTSTATUS status; HANDLE h; - UINT len; - - /* GetVolumePathName is not present before w2k */ - if (!pGetVolumePathNameW) { - win_skip("GetVolumePathNameW not found\n"); - return; - } - - file_name_size = GetSystemDirectoryW( NULL, 0 ); - file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); - volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); - expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); - - len = GetSystemDirectoryW( file_name, file_name_size ); - ok(len == file_name_size - 1, - "GetSystemDirectoryW returned %u, expected %u.\n", - len, file_name_size - 1); - - len = pGetVolumePathNameW( file_name, volume_prefix, file_name_size ); - ok(len, "GetVolumePathNameW failed.\n"); - - len = lstrlenW( volume_prefix ); - if (len && volume_prefix[len - 1] == '\\') --len; - memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); - expected[file_name_size - len - 1] = '\0'; - - /* A bit more than we actually need, but it keeps the calculation simple. */ - info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); - info = HeapAlloc( GetProcessHeap(), 0, info_size ); if (pRtlWow64EnableFsRedirectionEx) pRtlWow64EnableFsRedirectionEx( TRUE, &old_redir ); - h = CreateFileW( file_name, GENERIC_READ, + h = CreateFileW( L"C:/windows/system32", GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); if (pRtlWow64EnableFsRedirectionEx) pRtlWow64EnableFsRedirectionEx( old_redir, &tmp ); ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); - hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation ); - ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x.\n", hr); + status = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation ); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x.\n", status); - memset( info, 0xcc, info_size ); - hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); - ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n", - hr, STATUS_BUFFER_OVERFLOW); - ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", - U(io).Status, STATUS_BUFFER_OVERFLOW); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); + memset( info, 0xcc, sizeof(buffer) ); + status = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x.\n", status); + ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x.\n", U(io).Status); + ok(info->FileNameLength == wcslen( L"\\windows\\system32" ) * sizeof(WCHAR), + "info->FileNameLength is %u\n", info->FileNameLength); + ok(!wcsnicmp( info->FileName, L"\\w", 2 ), "Got file name %s.\n", debugstr_wn( info->FileName, 2 )); ok(info->FileName[2] == 0xcccc, "info->FileName[2] is %#x, expected 0xcccc.\n", info->FileName[2]); - ok(CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), - "info->FileName[1] is %p, expected %p.\n", - CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information); - memset( info, 0xcc, info_size ); - hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); - ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); - ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); + memset( info, 0xcc, sizeof(buffer) ); + status = pNtQueryInformationFile( h, &io, info, sizeof(buffer), FileNameInformation ); + ok(!status, "Got status %#x.\n", status); + ok(!U(io).Status, "Got io.Status %#x.\n", U(io).Status); + ok(info->FileNameLength == wcslen( L"\\windows\\system32" ) * sizeof(WCHAR), + "info->FileNameLength is %u\n", info->FileNameLength); ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[len] is %#x, expected 0xcccc.\n", info->FileName[info->FileNameLength / sizeof(WCHAR)]); info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; - ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", - wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); + ok(!wcsicmp( info->FileName, L"\\windows\\system32" ), "Got file name %s.\n", debugstr_w( info->FileName )); ok(io.Information == FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength, "io.Information is %lu, expected %u.\n", io.Information, FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength); CloseHandle( h ); - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, expected ); - HeapFree( GetProcessHeap(), 0, volume_prefix ); - if (old_redir || !pGetSystemWow64DirectoryW || !(file_name_size = pGetSystemWow64DirectoryW( NULL, 0 ))) + if (!old_redir && pGetSystemWow64DirectoryW && pGetSystemWow64DirectoryW( NULL, 0 )) { - skip("Not running on WoW64, skipping test.\n"); - HeapFree( GetProcessHeap(), 0, file_name ); - return; - } - - h = CreateFileW( file_name, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); - ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); - HeapFree( GetProcessHeap(), 0, file_name ); - - file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); - volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); - expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*expected) ); - - len = pGetSystemWow64DirectoryW( file_name, file_name_size ); - ok(len == file_name_size - 1, - "GetSystemWow64DirectoryW returned %u, expected %u.\n", - len, file_name_size - 1); - - len = pGetVolumePathNameW( file_name, volume_prefix, file_name_size ); - ok(len, "GetVolumePathNameW failed.\n"); + h = CreateFileW( L"C:/windows/system32", GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); + ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); - len = lstrlenW( volume_prefix ); - if (len && volume_prefix[len - 1] == '\\') --len; - memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); - expected[file_name_size - len - 1] = '\0'; - - info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); - info = HeapAlloc( GetProcessHeap(), 0, info_size ); - - memset( info, 0xcc, info_size ); - hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); - ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); - info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; - ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", - wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); + memset( info, 0xcc, sizeof(buffer) ); + status = pNtQueryInformationFile( h, &io, info, sizeof(buffer), FileNameInformation ); + ok(!status, "Got status %#x.\n", status); + info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; + ok(!wcsicmp( info->FileName, L"\\windows\\syswow64" ), "Got file name %s.\n", debugstr_w( info->FileName )); - CloseHandle( h ); - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, expected ); - HeapFree( GetProcessHeap(), 0, volume_prefix ); - HeapFree( GetProcessHeap(), 0, file_name ); + CloseHandle( h ); + } + else + skip("Not running on WoW64, skipping test.\n"); } static void test_file_all_name_information(void) -- 2.25.0

2 3

[PATCH] bcrypt/tests: Get rid of strcmp_wa()
by Michael Stefaniuc 04 Feb '20

04 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 45 +++++++++++++++----------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d26150f469..0dc2085111 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -155,13 +155,6 @@ static void format_hash(const UCHAR *bytes, ULONG size, char *buf) return; } -static int strcmp_wa(const WCHAR *strw, const char *stra) -{ - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - #define test_object_length(a) _test_object_length(__LINE__,a) static void _test_object_length(unsigned line, void *handle) { @@ -211,7 +204,7 @@ static void _test_hash_length(unsigned line, void *handle, ULONG exlen) } #define test_alg_name(a,b) _test_alg_name(__LINE__,a,b) -static void _test_alg_name(unsigned line, void *handle, const char *exname) +static void _test_alg_name(unsigned line, void *handle, const WCHAR *exname) { ULONG size = 0xdeadbeef; UCHAR buf[256]; @@ -220,13 +213,14 @@ static void _test_alg_name(unsigned line, void *handle, const char *exname) status = pBCryptGetProperty(handle, BCRYPT_ALGORITHM_NAME, buf, sizeof(buf), &size, 0); ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); - ok_(__FILE__,line)(size == (strlen(exname)+1)*sizeof(WCHAR), "got %u\n", size); - ok_(__FILE__,line)(!strcmp_wa(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), exname); + ok_(__FILE__,line)(size == (lstrlenW(exname)+1)*sizeof(WCHAR), "got %u\n", size); + ok_(__FILE__,line)(!lstrcmpW(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), + wine_dbgstr_w(exname)); } struct hash_test { - const char *alg; + const WCHAR *alg; unsigned hash_size; const char *hash; const char *hash2; @@ -239,15 +233,12 @@ static void test_hash(const struct hash_test *test) BCRYPT_ALG_HANDLE alg; BCRYPT_HASH_HANDLE hash; UCHAR buf[512], buf_hmac[1024], hash_buf[128], hmac_hash[128]; - WCHAR alg_name[64]; char str[512]; NTSTATUS ret; ULONG len; - MultiByteToWideChar(CP_ACP, 0, test->alg, -1, alg_name, ARRAY_SIZE(alg_name)); - alg = NULL; - ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, test->alg, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); @@ -312,7 +303,7 @@ static void test_hash(const struct hash_test *test) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); alg = NULL; - ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ret = pBCryptOpenAlgorithmProvider(&alg, test->alg, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); @@ -380,19 +371,19 @@ static void test_hashes(void) { static const struct hash_test tests[] = { - { "SHA1", 20, + { L"SHA1", 20, "961fa64958818f767707072755d7018dcd278e94", "9314f62ff64197143c91fc86de37e9ae776a3fb8", "2472cf65d0e090618d769d3e46f0d9446cf212da", "b2d2ba8cfd714d474cf0d9622cc5d15e1f53d53f", }, - { "SHA256", 32, + { L"SHA256", 32, "ceb73749c899693706ede1e30c9929b3fd5dd926163831c2fb8bd41e6efb1126", "ea0938c118a7b15954f41b85195f2b42aec3a9429c63f593cfa65c137ffaa986", "34c1aa473a4468a91d06e7cdbc75bc4f93b830ccfc2a47ffd74e8e6ed29e4c72", "55feb7052060bd99e33f36eb0982c7f4856eb6a84fbefe19a1afd9faafc3af6f", }, - { "SHA384", 48, + { L"SHA384", 48, "62b21e90c9022b101671ba1f808f8631a8149f0f12904055839a35c1ca78ae53" "63eed1e743a692d70e0504b0cfd12ef9", "724db7c0bbc51ef1ac3fc793083fc54c0e5c423faec9b11378c01c236b19aaaf" @@ -402,7 +393,7 @@ static void test_hashes(void) "03e1818e5c165a0e54619e513acb06c393e1a6cb0ddbb4036b5f29617b334642" "e6e0be8b214d8508595b17a8c4b4e7db", }, - { "SHA512", 64, + { L"SHA512", 64, "d55ced17163bf5386f2cd9ff21d6fd7fe576a915065c24744d09cfae4ec84ee1" "ef6ef11bfbc5acce3639bab725b50a1fe2c204f8c820d6d7db0df0ecbc49c5ca", "7752d707b54d2b00e7d1c09120d189475b0fd2e31ebb988cf0a01fc8492ddc0b" @@ -412,19 +403,19 @@ static void test_hashes(void) "1487bcecba46ae677622fa499e4cb2f0fdf92f6f3427cba76382d537a06e49c3" "3e70a2fc1fc730092bf21128c3704cc6387f6dfbf7e2f9f315bbb894505a1205", }, - { "MD2", 16, + { L"MD2", 16, "1bb33606ba908912a84221109d29cd7e", "b9a6ad9323b17e2d0cd389dddd6ef78a", "7f05b0638d77f4a27f3a9c4d353cd648", "05980873e6bfdd05dd7b30078de7e42a", }, - { "MD4", 16, + { L"MD4", 16, "74b5db93c0b41e36ca7074338fc0b637", "a14a9ff2059a8c28f47b01e6bc48a1bf", "bc2e8ac4d8248ed21b8d26227a30ea3a", "b609db0eb4b8669db74f2c20099701e4", }, - { "MD5", 16, + { L"MD5", 16, "e2a3e68d23ce348b8f68b3079de3d4c9", "bcdd7ca574342aa9db0e212348eacb16", "7bda029b93fa8d817fcc9e13d6bdf092", @@ -460,7 +451,7 @@ static void test_BcryptHash(void) ok(alg != NULL, "alg not set\n"); test_hash_length(alg, 16); - test_alg_name(alg, "MD5"); + test_alg_name(alg, L"MD5"); memset(md5, 0, sizeof(md5)); ret = pBCryptHash(alg, NULL, 0, (UCHAR *)"test", sizeof("test"), md5, sizeof(md5)); @@ -541,7 +532,7 @@ static void test_BcryptDeriveKeyPBKDF2(void) ok(alg != NULL, "alg not set\n"); test_hash_length(alg, 20); - test_alg_name(alg, "SHA1"); + test_alg_name(alg, L"SHA1"); ret = pBCryptDeriveKeyPBKDF2(alg, rfc6070[0].pwd, rfc6070[0].pwd_len, rfc6070[0].salt, rfc6070[0].salt_len, 0, buf, rfc6070[0].dk_len, 0); @@ -581,7 +572,7 @@ static void test_rng(void) ret = pBCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); - test_alg_name(alg, "RNG"); + test_alg_name(alg, L"RNG"); memset(buf, 0, 16); ret = pBCryptGenRandom(alg, buf, 8, 0); @@ -654,7 +645,7 @@ static void test_aes(void) ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); ok(size == 64, "got %u\n", size); - test_alg_name(alg, "AES"); + test_alg_name(alg, L"AES"); ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 2.24.1

1 0

[PATCH 1/3] kernelbase: Return FALSE in ContinueDebugEvent if status is unknown.
by Rémi Bernon 04 Feb '20

04 Feb '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/debug.c | 7 +++++++ dlls/ntdll/tests/exception.c | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 53b95aa6dda..d99309377f0 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -70,6 +70,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH CheckRemoteDebuggerPresent( HANDLE process, BOOL * BOOL WINAPI DECLSPEC_HOTPATCH ContinueDebugEvent( DWORD pid, DWORD tid, DWORD status ) { BOOL ret; + + if (status != DBG_EXCEPTION_NOT_HANDLED && status != DBG_CONTINUE) + { + FIXME("Unknown status %x\n", status); + return FALSE; + } + SERVER_START_REQ( continue_debug_event ) { req->pid = pid; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e8b481e703f..9cb9fc50d5d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -999,6 +999,7 @@ static void test_debugger(void) { continuestatus = DBG_CONTINUE; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); + ok(!ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef), "ContinueDebugEvent unexpectedly succeeded\n"); if (de.dwThreadId != pi.dwThreadId) { -- 2.25.0

2 4

[PATCH 1/5] server: Use STATUS_KERNEL_APC to indicate system APCs.
by Rémi Bernon 04 Feb '20

04 Feb '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This patch series is targetted around this specific status code to tell system APCs from user APCs, although it is not strictly necessary. We could already use the APC call type to tell the difference, but I believe using the specific status makes the logic clearer. dlls/ntdll/server.c | 2 +- dlls/ntdll/sync.c | 2 +- server/thread.c | 20 +++++++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 089eb3b89aa..73f4d86cf4d 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -624,7 +624,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT } SERVER_END_REQ; if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); - if (ret != STATUS_USER_APC) break; + if (ret != STATUS_USER_APC && ret != STATUS_KERNEL_APC) break; if (invoke_apc( &call, &result )) { /* if we ran a user apc we have to check once more if additional apcs are queued, diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index c4885973b68..d09b90a9273 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2497,7 +2497,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size RtlLeaveCriticalSection( &addr_section ); if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); - if (ret != STATUS_USER_APC) break; + if (ret != STATUS_USER_APC && ret != STATUS_KERNEL_APC) break; if (invoke_apc( &call, &result )) { /* if we ran a user apc we have to check once more if additional apcs are queued, diff --git a/server/thread.c b/server/thread.c index aec4c1acf4e..d82463c6baf 100644 --- a/server/thread.c +++ b/server/thread.c @@ -749,7 +749,7 @@ static int check_wait( struct thread *thread ) assert( wait ); if ((wait->flags & SELECT_INTERRUPTIBLE) && !list_empty( &thread->system_apc )) - return STATUS_USER_APC; + return STATUS_KERNEL_APC; /* Suspended threads may not acquire locks, but they can run system APCs */ if (thread->process->suspend + thread->suspend > 0) return -1; @@ -1083,12 +1083,11 @@ void thread_cancel_apc( struct thread *thread, struct object *owner, enum apc_ty } /* remove the head apc from the queue; the returned object must be released by the caller */ -static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_only ) +static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system ) { struct thread_apc *apc = NULL; - struct list *ptr = list_head( &thread->system_apc ); + struct list *ptr = list_head( system ? &thread->system_apc : &thread->user_apc ); - if (!ptr && !system_only) ptr = list_head( &thread->user_apc ); if (ptr) { apc = LIST_ENTRY( ptr, struct thread_apc, entry ); @@ -1585,7 +1584,7 @@ DECL_HANDLER(select) { for (;;) { - if (!(apc = thread_dequeue_apc( current, !(req->flags & SELECT_ALERTABLE) ))) + if (!(apc = thread_dequeue_apc( current, 0 ))) break; /* Optimization: ignore APC_NONE calls, they are only used to * wake up a thread, but since we got here the thread woke up already. @@ -1602,6 +1601,17 @@ DECL_HANDLER(select) release_object( apc ); } } + else if (get_error() == STATUS_KERNEL_APC) + { + if (!(apc = thread_dequeue_apc( current, 1 ))) + return; + + if (!(reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) + return; + + reply->call = apc->call; + release_object( apc ); + } } /* queue an APC for a thread or process */ -- 2.25.0

2 6

[PATCH] wbemuuid: Add library.
by Brendan Shanks 04 Feb '20

04 Feb '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 1 + dlls/wbemuuid/Makefile.in | 4 ++++ dlls/wbemuuid/wbemuuid.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 dlls/wbemuuid/Makefile.in create mode 100644 dlls/wbemuuid/wbemuuid.c diff --git a/configure.ac b/configure.ac index 36f65378a4..dcb33bb9bf 100644 --- a/configure.ac +++ b/configure.ac @@ -3739,6 +3739,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp) WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) +WINE_CONFIG_MAKEFILE(dlls/wbemuuid) WINE_CONFIG_MAKEFILE(dlls/wdscore) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) diff --git a/dlls/wbemuuid/Makefile.in b/dlls/wbemuuid/Makefile.in new file mode 100644 index 0000000000..449a0e68a8 --- /dev/null +++ b/dlls/wbemuuid/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libwbemuuid.a + +C_SRCS = \ + wbemuuid.c diff --git a/dlls/wbemuuid/wbemuuid.c b/dlls/wbemuuid/wbemuuid.c new file mode 100644 index 0000000000..8fc3314d8d --- /dev/null +++ b/dlls/wbemuuid/wbemuuid.c @@ -0,0 +1,35 @@ +/* + * Copyright 2020 Brendan Shanks for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" + +#include "dispex.h" +#include "objbase.h" +#include "oleauto.h" +#include "olectl.h" + +#include "initguid.h" + +#include "wbemcli.h" +#include "wbemprov.h" +#include "wbemdisp.h" -- 2.24.1

1 0

[PATCH] mshtml/tests: Get rid of is_prefix_wa.
by Jacek Caban 04 Feb '20

04 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-)

1 0

[PATCH] jscript: Add GetSourceLineText implementation.
by Jacek Caban 04 Feb '20

04 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 3 ++- dlls/jscript/error.c | 4 +++- dlls/jscript/jscript.c | 15 ++++++++++++--- dlls/jscript/parser.y | 18 +++++++++++++++--- dlls/jscript/tests/run.c | 9 +++++++-- 7 files changed, 41 insertions(+), 12 deletions(-)

1 0

[PATCH 3/3] widl: Check dispinterfaces for duplicated methods.
by Jacek Caban 04 Feb '20

04 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/parser.y | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)

1 0

[PATCH 2/3] mshtml.idl: Fix IHTMLComputedStyle declaration.
by Jacek Caban 04 Feb '20

04 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtml.idl | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)

1 0

[PATCH] kernel32: Export kernel32's FlushFileBuffers() implementation.
by Francois Gouget 04 Feb '20

04 Feb '20

kernel32 should export its own implementation now that it has been moved back from kernelbase. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f9295dc3ee4..47c7d63761c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -516,7 +516,7 @@ @ stdcall -import FlsGetValue(long) @ stdcall -import FlsSetValue(long ptr) @ stdcall FlushConsoleInputBuffer(long) -@ stdcall -import FlushFileBuffers(long) +@ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers @ stdcall -import FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() @ stdcall -import FlushViewOfFile(ptr long) -- 2.20.1

2 2

[PATCH] gdi32: Retry with hinting disabled if glyph load failed in hinted mode.
by Nikolay Sivov 04 Feb '20

04 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Freetype bug with test font is at https://savannah.nongnu.org/bugs/?57732. It doesn't seem practical to try and cherry pick specific error codes that might indicate hinting system problems. dlls/gdi32/freetype.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 10127bb77a..b806b62b77 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7620,6 +7620,12 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + if (err && !(load_flags & FT_LOAD_NO_HINTING)) + { + WARN("Failed to load glyph %#x, retrying without hinting. Error %#x.\n", glyph_index, err); + load_flags |= FT_LOAD_NO_HINTING; + err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + } if(err) { WARN("FT_Load_Glyph on index %x returns %d\n", glyph_index, err); -- 2.24.1

2 1

[PATCH] testbot/web: Remove an unneeded import in Sessions.
by Francois Gouget 04 Feb '20

04 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/Sessions.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 380d4b8f7d..8cd3c52fb7 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -31,8 +31,6 @@ WineTestBot::CGI::Session - A web user's session use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use WineTestBot::Utils; - sub InitializeNew($$) { my ($self, $Collection) = @_; -- 2.20.1

1 0

[PATCH] testbot: Simplify and speed up GenerateRandomString().
by Francois Gouget 04 Feb '20

04 Feb '20

Perl's rand() function can return random values greater than 2^16 nowadays. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index e8ba5162dc..27b222fd21 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -201,8 +201,8 @@ sub GenerateRandomString($) my $RandomString = ""; while (length($RandomString) < $Len) { - my $Part = "0000" . sprintf("%lx", int(rand(2 ** 16))); - $RandomString .= substr($Part, -4); + $RandomString .= sprintf("%08x", int(rand(2 ** 32))); + } return substr($RandomString, 0, $Len); -- 2.20.1

1 0

[PATCH] testbot/web: Use a cryptographically secure random number generator.
by Francois Gouget 04 Feb '20

04 Feb '20

Session ids should really be hard to guess so a user cannot take over another's session. This also fixes a bug where the session id length could be less than 32 characters. Note: * This introduces a dependency on the Bytes::Random::Secure Perl module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- libbytes-random-secure-perl is already installed so this should just take a web server restart. Perl documents rand() as being not cryptographically secure. That means an attacker could cycle through session ids for his own account and derive the random number generator internal state, thus allowing him to predict the session ids for other users' next login. Funnily enough the bug that caused session ids to not always have 32 characters could actually make this type of attack much harder: for this attack one needs the sequence of values returned by rand(), here groups of 4 hexadecimal characters. But because sprintf("%lx") does not 0-pad its result, a 31 charachter session id starting with '123456789ab...' could either be '123' + '4567' + '89ab', or '1234' + '567' + '89ab', or '1234' + '5678' + '9ab', etc. But not being a cryptographer and not knowing the internals of rand() I don't know how much harder this makes the attacks. So better safe than sorry. testbot/doc/INSTALL.txt | 1 + testbot/lib/WineTestBot/CGI/Sessions.pm | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 456ffe6957..4d430d9157 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -6,6 +6,7 @@ Dependencies: - MySQL - Perl DBD and DBI::mysql modules - Sendmail and Procmail +- Bytes::Random::Secure (libbytes-random-secure-perl) - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 8cd3c52fb7..4ca62ba76e 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -54,7 +54,9 @@ use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotCollection); our @EXPORT = qw(CreateSessions DeleteSessions NewSession); +use Bytes::Random::Secure; use CGI::Cookie; + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Users; @@ -121,11 +123,7 @@ sub NewSession($$$) my $Id; while (defined($Existing)) { - $Id = ""; - foreach my $i (1..8) - { - $Id .= sprintf("%lx", int(rand(2 ** 16))); - } + $Id = Bytes::Random::Secure::random_bytes_hex(16); $Existing = $self->GetItem($Id); } $Session->Id($Id); -- 2.20.1

1 0

[PATCH] guiddef.h: Remove GUID_NULL declaration.
by Jacek Caban 04 Feb '20

04 Feb '20

It's declared in cguid.h with proper extern "C". Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This matches Windows SDK. dlls/msxml3/tests/schema.c | 1 + dlls/rpcrt4/ndr_contexthandle.c | 1 + dlls/setupapi/devinst.c | 1 + dlls/setupapi/tests/devinst.c | 1 + include/guiddef.h | 2 -- 5 files changed, 4 insertions(+), 2 deletions(-)

1 0

[PATCH] ole32: Silence noisy ERRs.
by Jacek Caban 04 Feb '20

04 Feb '20

Based on patch by Puetz Kevin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- ERR is definitely not the right here. In some cases, those messages indicate that Wine is missing marshalling support for system interfaces, so this could be a FIXME. However, in majority of cases, it's a false positive, so I think WARN will be better in this case. dlls/ole32/marshal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] vbscript: Return the named item itself from lookup_named_item.
by Gabriel Ivăncescu 04 Feb '20

04 Feb '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is be needed for the next patches in the series. dlls/vbscript/interp.c | 7 +++---- dlls/vbscript/vbscript.c | 16 ++++++++-------- dlls/vbscript/vbscript.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 906545c..b328674 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -114,7 +114,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ { ScriptDisp *script_obj = ctx->script->script_obj; named_item_t *item; - IDispatch *disp; unsigned i; DISPID id; HRESULT hres; @@ -196,10 +195,10 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - disp = lookup_named_item(ctx->script, name, SCRIPTITEM_ISVISIBLE); - if(disp) { + item = lookup_named_item(ctx->script, name, SCRIPTITEM_ISVISIBLE); + if(item && item->disp) { ref->type = REF_OBJ; - ref->u.obj = disp; + ref->u.obj = item->disp; return S_OK; } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 2b691af..0bbff30 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -189,7 +189,7 @@ static void exec_queued_code(script_ctx_t *ctx) } } -IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flags) +named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flags) { named_item_t *item; HRESULT hres; @@ -214,7 +214,7 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag } } - return item->disp; + return item; } } @@ -870,7 +870,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { VBScript *This = impl_from_IActiveScriptParse(iface); - IDispatch *context = NULL; + named_item_t *item = NULL; vbscode_t *code; HRESULT hres; @@ -882,9 +882,9 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, return E_UNEXPECTED; if(pstrItemName) { - context = lookup_named_item(This->ctx, pstrItemName, 0); - if(!context) { - WARN("Inknown context %s\n", debugstr_w(pstrItemName)); + item = lookup_named_item(This->ctx, pstrItemName, 0); + if(!item) { + WARN("Unknown context %s\n", debugstr_w(pstrItemName)); return E_INVALIDARG; } } @@ -893,8 +893,8 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(FAILED(hres)) return hres; - if(context) - IDispatch_AddRef(code->context = context); + if(item && item->disp) + IDispatch_AddRef(code->context = item->disp); if(!(dwFlags & SCRIPTTEXT_ISEXPRESSION) && !is_started(This)) { code->pending_exec = TRUE; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 33ecb45..a3f32fd 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -372,7 +372,7 @@ HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigne HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_var(dynamic_var_t*) DECLSPEC_HIDDEN; -IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; +named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; HRESULT report_script_error(script_ctx_t*,const vbscode_t*,unsigned) DECLSPEC_HIDDEN; void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; -- 2.21.0

2 10

[PATCH] objbase.h: Add COWAIT_DEFAULT declaration.
by Jacek Caban 04 Feb '20

04 Feb '20

From: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/objbase.h | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] winex11.drv: Fix incorrect frequency for doublescan and interlaced modes.
by Zhiyi Zhang 04 Feb '20

04 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 930e0282be..454f6f2df2 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -478,6 +478,26 @@ static XRRCrtcInfo *xrandr12_get_primary_crtc_info( XRRScreenResources *resource return NULL; } +static DWORD get_frequency( const XRRModeInfo *mode ) +{ + if (mode->hTotal && mode->vTotal) + { + double v_total = mode->vTotal; + + if (mode->modeFlags & RR_DoubleScan) + v_total *= 2; + if (mode->modeFlags & RR_Interlace) + v_total /= 2; + + /* Adding 0.05 instead of 0.5 to round so that common frequencies like + * 59.94Hz and 23.976Hz become 59Hz and 24Hz. Using 0.5 would make + * 59.94Hz become 60Hz and would make it seem like there are two 60Hz modes */ + return mode->dotClock / (mode->hTotal * v_total) + 0.05; + } + + return 0; +} + static int xrandr12_init_modes(void) { unsigned int only_one_resolution = 1, mode_count; @@ -536,8 +556,7 @@ static int xrandr12_init_modes(void) if (mode->id == output_info->modes[i]) { - unsigned int dots = mode->hTotal * mode->vTotal; - unsigned int refresh = dots ? (mode->dotClock + dots / 2) / dots : 0; + unsigned int refresh = get_frequency(mode); TRACE("Adding mode %#lx: %ux%u(a)%u.\n", mode->id, mode->width, mode->height, refresh); X11DRV_Settings_AddOneMode( mode->width, mode->height, 0, refresh ); -- 2.20.1

3 3

[PATCH v3 2/3] msvcrt: Don't set error in wcstombs_s_l if no characters to convert.
by Daniel Lehman 04 Feb '20

04 Feb '20

2 1

[PATCH v3 1/3] msvcrt/tests: Add some wcstombs_s_l tests.
by Daniel Lehman 04 Feb '20

04 Feb '20

2 1

[PATCH] dwrite: Return static axis values for weight/width/italic properties.
by Nikolay Sivov 04 Feb '20

04 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 28 ++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 1 - 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fc0af3c79e..353282bbd4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -80,6 +80,8 @@ struct dwrite_font_data FONTSIGNATURE fontsig; UINT32 flags; /* enum font_flags */ struct dwrite_font_propvec propvec; + /* Static axis for weight/width/italic. */ + DWRITE_FONT_AXIS_VALUE axis[3]; DWRITE_FONT_METRICS1 metrics; IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG + 1]; @@ -2061,8 +2063,9 @@ static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWr TRACE("%p, %p.\n", iface, reference); - return IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)font->family->collection->factory, - font->data->file, font->data->face_index, font->data->simulations, reference); + return IDWriteFactory7_CreateFontFaceReference(font->family->collection->factory, font->data->file, + font->data->face_index, font->data->simulations, font->data->axis, ARRAY_SIZE(font->data->axis), + (IDWriteFontFaceReference1 **)reference); } static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) @@ -3857,6 +3860,20 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_font_data **ret) { + static const float width_axis_values[] = + { + 0.0f, /* DWRITE_FONT_STRETCH_UNDEFINED */ + 50.0f, /* DWRITE_FONT_STRETCH_ULTRA_CONDENSED */ + 62.5f, /* DWRITE_FONT_STRETCH_EXTRA_CONDENSED */ + 75.0f, /* DWRITE_FONT_STRETCH_CONDENSED */ + 87.5f, /* DWRITE_FONT_STRETCH_SEMI_CONDENSED */ + 100.0f, /* DWRITE_FONT_STRETCH_NORMAL */ + 112.5f, /* DWRITE_FONT_STRETCH_SEMI_EXPANDED */ + 125.0f, /* DWRITE_FONT_STRETCH_EXPANDED */ + 150.0f, /* DWRITE_FONT_STRETCH_EXTRA_EXPANDED */ + 200.0f, /* DWRITE_FONT_STRETCH_ULTRA_EXPANDED */ + }; + struct file_stream_desc stream_desc; struct dwrite_font_props props; struct dwrite_font_data *data; @@ -3910,6 +3927,13 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo init_font_prop_vec(data->weight, data->stretch, data->style, &data->propvec); + data->axis[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + data->axis[0].value = props.weight; + data->axis[1].axisTag = DWRITE_FONT_AXIS_TAG_WIDTH; + data->axis[1].value = width_axis_values[props.stretch]; + data->axis[2].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + data->axis[2].value = data->style == DWRITE_FONT_STYLE_ITALIC ? 1.0f : 0.0f; + *ret = data; return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 60c9b9c742..d21326f7c9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7929,7 +7929,6 @@ todo_wine (void **)&ref2))) { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); - todo_wine ok(axis_count > 0, "Unexpected axis value count.\n"); IDWriteFontFaceReference1_Release(ref2); } -- 2.24.1

1 0

[PATCH 2/2] user32/tests: Add more EnumDisplaySettings tests.
by Zhiyi Zhang 04 Feb '20

04 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 282 +++++++++++++++++++++++++++++++--- 1 file changed, 258 insertions(+), 24 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 431b87cde1..cf12725a45 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3083,43 +3083,277 @@ static void test_metrics_for_dpi( int custom_dpi ) } } +static BOOL get_primary_adapter_name(CHAR *name) +{ + DISPLAY_DEVICEA dd; + DWORD adapter; + + dd.cb = sizeof(dd); + for (adapter = 0; EnumDisplayDevicesA(NULL, adapter, &dd, 0); ++adapter) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyA(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + +static BOOL CALLBACK test_enum_display_settings(HMONITOR hmonitor, HDC hdc, LPRECT rect, LPARAM lparam) +{ + CHAR primary_adapter[CCHDEVICENAME]; + INT width, height; + BOOL primary, ret; + MONITORINFOEXA mi; + DEVMODEA dm; + + memset(&mi, 0, sizeof(mi)); + mi.cbSize = sizeof(mi); + ret = GetMonitorInfoA(hmonitor, (MONITORINFO *)&mi); + ok(ret, "GetMonitorInfoA failed, error %#x\n", GetLastError()); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(mi.szDevice, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + + todo_wine ok((dm.dmFields & (DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT)) == (DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT), + "Unexpected dmFields %#x.\n", dm.dmFields); + /* Wine currently reports primary adapter positions for all adapters, same for other todo_wines in this function */ + ret = get_primary_adapter_name(primary_adapter); + ok(ret, "get_primary_adapter_name failed\n"); + primary = !lstrcmpA(primary_adapter, mi.szDevice); + todo_wine_if(!primary && dm.dmPosition.x != mi.rcMonitor.left) + ok(dm.dmPosition.x == mi.rcMonitor.left, "Expect dmPosition.x %d, got %d\n", mi.rcMonitor.left, dm.dmPosition.x); + todo_wine_if(!primary && dm.dmPosition.y != mi.rcMonitor.top) + ok(dm.dmPosition.y == mi.rcMonitor.top, "Expect dmPosition.y %d, got %d\n", mi.rcMonitor.top, dm.dmPosition.y); + width = mi.rcMonitor.right - mi.rcMonitor.left; + todo_wine_if(!primary && dm.dmPelsWidth != width) + ok(dm.dmPelsWidth == width, "Expect dmPelsWidth %d, got %d\n", width, dm.dmPelsWidth); + height = mi.rcMonitor.bottom - mi.rcMonitor.top; + todo_wine_if(!primary && dm.dmPelsHeight != height) + ok(dm.dmPelsHeight == height, "Expect dmPelsHeight %d, got %d\n", height, dm.dmPelsHeight); + + return TRUE; +} + static void test_EnumDisplaySettings(void) { - DEVMODEA devmode; - DWORD val; + static const DWORD mode_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | + DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + static const DWORD setting_fields = mode_fields | DM_POSITION; + CHAR primary_adapter[CCHDEVICENAME]; + DPI_AWARENESS_CONTEXT ctx = NULL; + DWORD err, val, device, mode; + BOOL attached, ret; + DISPLAY_DEVICEA dd; + DEVMODEA dm, dm2; + DEVMODEW dmW; HDC hdc; - DWORD num; - memset(&devmode, 0, sizeof(devmode)); - EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); + /* Test invalid device names */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + SetLastError(0xdeadbeef); + ret = EnumDisplaySettingsA("invalid", ENUM_CURRENT_SETTINGS, &dm); + todo_wine ok(!ret, "EnumDisplaySettingsA succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "Expect error 0xdeadbeef, got %#x\n", GetLastError()); + todo_wine ok(dm.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dm.dmFields); + /* Monitor device names are invalid */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + SetLastError(0xdeadbeef); + ret = EnumDisplaySettingsA("\\\\.\\DISPLAY1\\Monitor0", ENUM_CURRENT_SETTINGS, &dm); + todo_wine ok(!ret, "EnumDisplaySettingsA succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "Expect error 0xdeadbeef, got %#x\n", GetLastError()); + todo_wine ok(dm.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dm.dmFields); + + /* Test that passing NULL to device name parameter means to use the primary adapter */ + memset(&dm, 0, sizeof(dm)); + memset(&dm2, 0, sizeof(dm2)); + dm.dmSize = sizeof(dm); + dm2.dmSize = sizeof(dm2); + ret = get_primary_adapter_name(primary_adapter); + ok(ret, "get_primary_adapter_name failed\n"); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + ret = EnumDisplaySettingsA(primary_adapter, ENUM_CURRENT_SETTINGS, &dm2); + ok(ret, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + ok(!memcmp(&dm, &dm2, sizeof(dm)), "Expect NULL device is the primary device.\n"); + + /* Test dmSize */ + /* EnumDisplaySettingsA/W modify dmSize and don't check for insufficient dmSize */ + memset(&dm, 0, sizeof(dm)); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + ok(dm.dmSize == FIELD_OFFSET(DEVMODEA, dmICMMethod), "Expect dmSize %u, got %u\n", + FIELD_OFFSET(DEVMODEA, dmICMMethod), dm.dmSize); + todo_wine ok((dm.dmFields & setting_fields) == setting_fields, "Expect dmFields to contain %#x, got %#x\n", + setting_fields, dm.dmFields); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + ok(dm.dmSize == FIELD_OFFSET(DEVMODEA, dmICMMethod), "Expect dmSize %u, got %u\n", + FIELD_OFFSET(DEVMODEA, dmICMMethod), dm.dmSize); + todo_wine ok((dm.dmFields & setting_fields) == setting_fields, "Expect dmFields to contain %#x, got %#x\n", + setting_fields, dm.dmFields); + + memset(&dmW, 0, sizeof(dmW)); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW); + ok(ret, "EnumDisplaySettingsW failed, error %#x\n", GetLastError()); + ok(dmW.dmSize == FIELD_OFFSET(DEVMODEW, dmICMMethod), "Expect dmSize %u, got %u\n", + FIELD_OFFSET(DEVMODEW, dmICMMethod), dmW.dmSize); + todo_wine ok((dmW.dmFields & setting_fields) == setting_fields, "Expect dmFields to contain %#x, got %#x\n", + setting_fields, dmW.dmFields); + + memset(&dmW, 0, sizeof(dmW)); + dmW.dmSize = sizeof(dmW); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW); + ok(ret, "EnumDisplaySettingsW failed, error %#x\n", GetLastError()); + ok(dmW.dmSize == FIELD_OFFSET(DEVMODEW, dmICMMethod), "Expect dmSize %u, got %u\n", + FIELD_OFFSET(DEVMODEW, dmICMMethod), dmW.dmSize); + todo_wine ok((dmW.dmFields & setting_fields) == setting_fields, "Expect dmFields to contain %#x, got %#x\n", + setting_fields, dmW.dmFields); + + /* EnumDisplaySettingsExA/W need dmSize to be at least FIELD_OFFSET(DEVMODEA/W, dmFields) + 1 to have valid dmFields */ + /* Crash on Windows when dmSize is zero */ + if (0) + { + memset(&dm, 0, sizeof(dm)); + ret = EnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &dm, 0); + ok(!ret, "EnumDisplaySettingsExA succeed\n"); + + memset(&dmW, 0, sizeof(dmW)); + ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &dmW, 0); + ok(!ret, "EnumDisplaySettingsExA succeed\n"); + } + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = FIELD_OFFSET(DEVMODEA, dmFields); + ret = EnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &dm, 0); + ok(ret, "EnumDisplaySettingsExA failed, error %#x\n", GetLastError()); + todo_wine ok(dm.dmSize == FIELD_OFFSET(DEVMODEA, dmFields), "Expect dmSize unchanged, got %u\n", dm.dmSize); + todo_wine ok(dm.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dm.dmFields); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = FIELD_OFFSET(DEVMODEA, dmFields) + 1; + ret = EnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &dm, 0); + ok(ret, "EnumDisplaySettingsExA failed, error %#x\n", GetLastError()); + todo_wine ok(dm.dmSize == FIELD_OFFSET(DEVMODEA, dmFields) + 1, "Expect dmSize unchanged, got %u\n", dm.dmSize); + todo_wine ok((dm.dmFields & setting_fields) == (DM_POSITION | DM_DISPLAYORIENTATION), + "Expect dmFields to contain %#lx, got %#x\n", DM_POSITION | DM_DISPLAYORIENTATION, dm.dmFields); + /* Fields beyond dmSize don't get written */ + todo_wine ok(dm.dmPelsWidth == 0, "Expect dmPelsWidth unwritten\n"); + + memset(&dmW, 0, sizeof(dmW)); + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmFields); + ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &dmW, 0); + ok(ret, "EnumDisplaySettingsExW failed, error %#x\n", GetLastError()); + todo_wine ok(dmW.dmSize == FIELD_OFFSET(DEVMODEW, dmFields), "Expect dmSize unchanged, got %u\n", dmW.dmSize); + todo_wine ok(dmW.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dmW.dmFields); + + memset(&dmW, 0, sizeof(dmW)); + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmFields) + 1; + ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &dmW, 0); + ok(ret, "EnumDisplaySettingsExW failed, error %#x\n", GetLastError()); + todo_wine ok(dmW.dmSize == FIELD_OFFSET(DEVMODEW, dmFields) + 1, "Expect dmSize unchanged, got %u\n", dmW.dmSize); + todo_wine ok((dmW.dmFields & setting_fields) == (DM_POSITION | DM_DISPLAYORIENTATION), + "Expect dmFields to contain %#lx, got %#x\n", DM_POSITION | DM_DISPLAYORIENTATION, dmW.dmFields); + /* Fields beyond dmSize don't get written */ + todo_wine ok(dmW.dmPelsWidth == 0, "Expect dmPelsWidth unwritten\n"); + + /* Test dmBitsPerPel */ hdc = GetDC(0); val = GetDeviceCaps(hdc, BITSPIXEL); - ok(devmode.dmBitsPerPel == val, - "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", - val, devmode.dmBitsPerPel); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &dm, 0); + ok(ret, "EnumDisplaySettingsExA failed, error %#x\n", GetLastError()); + todo_wine ok((dm.dmFields & setting_fields) == setting_fields, "Expect dmFields to contain %#x, got %#x\n", + setting_fields, dm.dmFields); + ok(dm.dmBitsPerPel == val, "Expect dmBitsPerPel %d, got %d\n", val, dm.dmBitsPerPel); val = GetDeviceCaps(hdc, NUMCOLORS); - if(devmode.dmBitsPerPel <= 8) { - ok(val == 256, "Screen bpp is %d, NUMCOLORS returned %d\n", devmode.dmBitsPerPel, val); - } else { - ok(val == -1, "Screen bpp is %d, NUMCOLORS returned %d\n", devmode.dmBitsPerPel, val); + if (dm.dmBitsPerPel <= 8) + { + ok(val == 256, "Screen bpp is %d, NUMCOLORS returned %d\n", dm.dmBitsPerPel, val); + } + else + { + ok(val == -1, "Screen bpp is %d, NUMCOLORS returned %d\n", dm.dmBitsPerPel, val); } ReleaseDC(0, hdc); - num = 1; - while (1) { - SetLastError (0xdeadbeef); - if (!EnumDisplaySettingsA(NULL, num, &devmode)) { - DWORD le = GetLastError(); - ok(le == ERROR_NO_MORE_FILES || - le == ERROR_MOD_NOT_FOUND /* Win8 */ || - le == 0xdeadbeef, /* XP, 2003 */ - "Expected ERROR_NO_MORE_FILES, ERROR_MOD_NOT_FOUND or 0xdeadbeef, got %d for %d\n", le, num); - break; - } - num++; + /* Test dmPosition, dmPelsWidth and dmPelsHeight */ + /* Set DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE so that GetMonitorInfo() returns physical pixels */ + if (pSetThreadDpiAwarenessContext) + ctx = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); + EnumDisplayMonitors(NULL, NULL, test_enum_display_settings, 0); + if (pSetThreadDpiAwarenessContext && ctx) + pSetThreadDpiAwarenessContext(ctx); + + /* Test mode enumeration and other fields */ + dd.cb = sizeof(dd); + for (device = 0; EnumDisplayDevicesA(NULL, device, &dd, 0); ++device) + { + INT number; + + /* Skip software devices */ + if (sscanf(dd.DeviceName, "\\\\.\\DISPLAY%d", &number) != 1) + continue; + + attached = dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + SetLastError(0xdeadbeef); + for (mode = ENUM_REGISTRY_SETTINGS; EnumDisplaySettingsA(dd.DeviceName, mode, &dm); ++mode) + { + if (mode == ENUM_CURRENT_SETTINGS) + { + todo_wine ok((dm.dmFields & setting_fields) == setting_fields, + "Expect dmFields to contain %#x, got %#x\n", setting_fields, dm.dmFields); + } + else + { + todo_wine ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n", + mode_fields, dm.dmFields); + } + + ok(dm.dmDisplayOrientation == DMDO_DEFAULT, "Expect dmDisplayOrientation DMDO_DEFAULT, got %#x\n", + dm.dmDisplayOrientation); + ok(dm.dmDisplayFlags == 0, "Expect dmDisplayFlags zero\n"); + + if (mode == ENUM_CURRENT_SETTINGS && !attached) + { + todo_wine ok(dm.dmBitsPerPel == 0, "Expect dmBitsPerPel zero, got %u\n", dm.dmBitsPerPel); + todo_wine ok(dm.dmPelsWidth == 0, "Expect dmPelsWidth zero, got %u\n", dm.dmPelsWidth); + todo_wine ok(dm.dmPelsHeight == 0, "Expect dmPelsHeight zero, got %u\n", dm.dmPelsHeight); + todo_wine ok(dm.dmDisplayFrequency == 0, "Expect dmDisplayFrequency zero, got %u\n", dm.dmDisplayFrequency); + } + else if (mode != ENUM_REGISTRY_SETTINGS) + { + ok(dm.dmBitsPerPel, "Expect dmBitsPerPel not zero\n"); + ok(dm.dmPelsWidth, "Expect dmPelsWidth not zero\n"); + ok(dm.dmPelsHeight, "Expect dmPelsHeight not zero\n"); + ok(dm.dmDisplayFrequency, "Expect dmDisplayFrequency not zero\n"); + } + } + + ok(mode >= 1, "Expect at least one valid mode gets enumerated.\n"); + + err = GetLastError(); + ok(err == ERROR_NO_MORE_FILES || + err == ERROR_MOD_NOT_FOUND /* Win8 */ || + err == 0xdeadbeef, /* XP, 2003 */ + "Expected ERROR_NO_MORE_FILES, ERROR_MOD_NOT_FOUND or 0xdeadbeef, got %#x\n", err); } } -- 2.20.1

2 2

[PATCH] winex11.drv: Calculate mask in X11DRV_resize_desktop().
by Zhiyi Zhang 04 Feb '20

04 Feb '20

Calculate XReconfigureWMWindow() mask in X11DRV_resize_desktop() instead of doing it in EnumWindows() callback update_windows_on_desktop_resize() because the result is the same anyway. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d70b38b2b3..bde4841ed4 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -321,26 +321,16 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) return TRUE; } - -struct desktop_resize_data -{ - RECT old_virtual_rect; - RECT new_virtual_rect; -}; - static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ) { struct x11drv_win_data *data; - struct desktop_resize_data *resize_data = (struct desktop_resize_data *)lparam; - int mask = 0; + UINT mask = (UINT)lparam; if (!(data = get_win_data( hwnd ))) return TRUE; /* update the full screen state */ update_net_wm_states( data ); - if (resize_data->old_virtual_rect.left != resize_data->new_virtual_rect.left) mask |= CWX; - if (resize_data->old_virtual_rect.top != resize_data->new_virtual_rect.top) mask |= CWY; if (mask && data->whole_window) { POINT pos = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top ); @@ -399,14 +389,18 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) */ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) { + RECT old_virtual_rect, new_virtual_rect; HWND hwnd = GetDesktopWindow(); - struct desktop_resize_data resize_data; + UINT mask = 0; - resize_data.old_virtual_rect = get_virtual_screen_rect(); + old_virtual_rect = get_virtual_screen_rect(); desktop_width = width; desktop_height = height; X11DRV_DisplayDevices_Init( TRUE ); - resize_data.new_virtual_rect = get_virtual_screen_rect(); + new_virtual_rect = get_virtual_screen_rect(); + + if (old_virtual_rect.left != new_virtual_rect.left) mask |= CWX; + if (old_virtual_rect.top != new_virtual_rect.top) mask |= CWY; if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) { @@ -416,14 +410,13 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) { TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); update_desktop_fullscreen( width, height ); - SetWindowPos( hwnd, 0, resize_data.new_virtual_rect.left, resize_data.new_virtual_rect.top, - resize_data.new_virtual_rect.right - resize_data.new_virtual_rect.left, - resize_data.new_virtual_rect.bottom - resize_data.new_virtual_rect.top, + SetWindowPos( hwnd, 0, new_virtual_rect.left, new_virtual_rect.top, + new_virtual_rect.right - new_virtual_rect.left, new_virtual_rect.bottom - new_virtual_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); ungrab_clipping_window(); SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); } - EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); + EnumWindows( update_windows_on_desktop_resize, (LPARAM)mask ); } -- 2.20.1

1 0

[PATCH 1/2] user32/tests: Add more ChangeDisplaySettings tests.
by Zhiyi Zhang 04 Feb '20

04 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 587 ++++++++++++++++++++++++++++++++---- 1 file changed, 531 insertions(+), 56 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 47e01b1a6a..03fd6f3ec3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -24,6 +24,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "wine/heap.h" #include <stdio.h> static HMODULE hdll; @@ -252,82 +253,167 @@ static const struct vid_mode vid_modes_test[] = { */ }; +struct device_info +{ + DWORD index; + CHAR name[CCHDEVICENAME]; + DEVMODEA original_mode; +}; + +static BOOL get_primary_adapter(CHAR *name) +{ + DISPLAY_DEVICEA dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesA(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyA(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + +#define expect_dm(a, b, c) _expect_dm(__LINE__, a, b, c) +static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD test) +{ + CHAR primary_adapter[CCHDEVICENAME]; + BOOL is_primary; + DEVMODEA dm; + BOOL ret; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + SetLastError(0xdeadbeef); + ret = EnumDisplaySettingsA(device, ENUM_CURRENT_SETTINGS, &dm); + /* On win10 TestBot, after many resolution changes, EnumDisplaySettingsA fails sometimes for unknown reasons */ + if (!ret) + { + win_skip_(__FILE__, line)("EnumDisplaySettingsA failed.\n"); + return; + } + ok_(__FILE__, line)(ret, "Device %s test %d EnumDisplaySettingsA failed, error %#x\n", device, test, GetLastError()); + + ok(get_primary_adapter(primary_adapter), "Failed to get primary adapter name.\n"); + is_primary = !lstrcmpA(primary_adapter, device); + + todo_wine_if(expected.dmFields & DM_POSITION) + ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, + "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); + /* Wine doesn't support changing color depth yet */ + todo_wine_if(expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) + ok_(__FILE__, line)(dm.dmBitsPerPel == expected.dmBitsPerPel, "Device %s test %d expect dmBitsPerPel %d, got %d\n", + device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); + /* Wine currently reports primary monitor settings for non-primary monitors */ + todo_wine_if(!is_primary && dm.dmPelsWidth != expected.dmPelsWidth) + ok_(__FILE__, line)(dm.dmPelsWidth == expected.dmPelsWidth, "Device %s test %d expect dmPelsWidth %d, got %d\n", + device, test, expected.dmPelsWidth, dm.dmPelsWidth); + todo_wine_if(!is_primary && dm.dmPelsHeight != expected.dmPelsHeight) + ok_(__FILE__, line)(dm.dmPelsHeight == expected.dmPelsHeight, "Device %s test %d expect dmPelsHeight %d, got %d\n", + device, test, expected.dmPelsHeight, dm.dmPelsHeight); + todo_wine_if(!is_primary && dm.dmPosition.x != expected.dmPosition.x) + ok_(__FILE__, line)(dm.dmPosition.x == expected.dmPosition.x, "Device %s test %d expect dmPosition.x %d, got %d\n", + device, test, expected.dmPosition.x, dm.dmPosition.x); + todo_wine_if(!is_primary && dm.dmPosition.y != expected.dmPosition.y) + ok_(__FILE__, line)(dm.dmPosition.y == expected.dmPosition.y, "Device %s test %d expect dmPosition.y %d, got %d\n", + device, test, expected.dmPosition.y, dm.dmPosition.y); + todo_wine_if(!is_primary && dm.dmDisplayFrequency != expected.dmDisplayFrequency) + ok_(__FILE__, line)(dm.dmDisplayFrequency == expected.dmDisplayFrequency, + "Device %s test %d expect dmDisplayFrequency %d, got %d\n", device, test, expected.dmDisplayFrequency, + dm.dmDisplayFrequency); + todo_wine_if(!is_primary && dm.dmDisplayOrientation != expected.dmDisplayOrientation) + ok_(__FILE__, line)(dm.dmDisplayOrientation == expected.dmDisplayOrientation, + "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected.dmDisplayOrientation, + dm.dmDisplayOrientation); +} + static void test_ChangeDisplaySettingsEx(void) { DPI_AWARENESS_CONTEXT context = NULL; - DEVMODEA dm; + UINT primary, device, side, mode; + UINT device_size, device_count; + struct device_info *devices; + INT count, old_count; + DISPLAY_DEVICEA dd; + DEVMODEA dm, dm2; + POINTL position; DEVMODEW dmW; - DWORD width; LONG res; int i; - SetLastError(0xdeadbeef); + /* Test dmDriverExtra */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); - ok(res, "EnumDisplaySettings error %u\n", GetLastError()); - - width = dm.dmPelsWidth; - - dm.dmDriverExtra = 1; - res = ChangeDisplaySettingsA(&dm, CDS_TEST); - ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsA returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); - ok(dm.dmDriverExtra == 0 || broken(dm.dmDriverExtra == 1) /* win9x */, - "ChangeDisplaySettingsA didn't reset dmDriverExtra to 0\n"); - - /* crashes under XP SP3 for large dmDriverExtra values */ - dm.dmDriverExtra = 1; - res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); - ok(dm.dmDriverExtra == 1, "ChangeDisplaySettingsExA shouldn't reset dmDriverExtra to 0\n"); + ok(res, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); memset(&dmW, 0, sizeof(dmW)); dmW.dmSize = sizeof(dmW); - dmW.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; - dmW.dmPelsWidth = dm.dmPelsWidth; - dmW.dmPelsHeight = dm.dmPelsHeight; + res = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW); + ok(res, "EnumDisplaySettingsW failed, error %#x\n", GetLastError()); + + /* ChangeDisplaySettingsA/W reset dmDriverExtra to 0 */ + dm.dmDriverExtra = 1; + res = ChangeDisplaySettingsA(&dm, CDS_TEST); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA returned unexpected %d\n", res); + ok(dm.dmDriverExtra == 0, "ChangeDisplaySettingsA didn't reset dmDriverExtra to 0\n"); + dmW.dmDriverExtra = 1; - SetLastError(0xdeadbeef); res = ChangeDisplaySettingsW(&dmW, CDS_TEST); - if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) - { - ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); - ok(dmW.dmDriverExtra == 0, "ChangeDisplaySettingsW didn't reset dmDriverExtra to 0\n"); - } + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW returned unexpected %d\n", res); + ok(dmW.dmDriverExtra == 0, "ChangeDisplaySettingsW didn't reset dmDriverExtra to 0\n"); + + /* ChangeDisplaySettingsExA/W do not modify dmDriverExtra */ + dm.dmDriverExtra = 1; + res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d\n", res); + ok(dm.dmDriverExtra == 1, "ChangeDisplaySettingsExA shouldn't change dmDriverExtra\n"); - /* Apparently XP treats dmDriverExtra being != 0 as an error */ dmW.dmDriverExtra = 1; res = ChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); - if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) - { - ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); - ok(dmW.dmDriverExtra == 1, "ChangeDisplaySettingsExW shouldn't reset dmDriverExtra to 0\n"); - } + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW returned unexpected %d\n", res); + ok(dmW.dmDriverExtra == 1, "ChangeDisplaySettingsExW shouldn't change dmDriverExtra\n"); - /* the following 2 tests show that dm.dmSize being 0 is invalid, but - * ChangeDisplaySettingsExA still reports success. - */ + /* Test dmSize */ + /* ChangeDisplaySettingsA/ExA report success even if dmSize is 0 */ memset(&dm, 0, sizeof(dm)); - dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; - dm.dmPelsWidth = width; - res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL || - res == DISP_CHANGE_BADMODE || /* Win98, WinMe */ - res == DISP_CHANGE_FAILED, /* NT4 */ - "ChangeDisplaySettingsExA returned unexpected %d\n", res); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + dm.dmSize = 0; + res = ChangeDisplaySettingsA(&dm, CDS_TEST); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA returned unexpected %d\n", res); + + dm.dmSize = 0; + res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d\n", res); + + /* dmSize for ChangeDisplaySettingsW/ExW needs to be at least FIELD_OFFSET(DEVMODEW, dmICMMethod) */ memset(&dmW, 0, sizeof(dmW)); - dmW.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; - dmW.dmPelsWidth = width; - SetLastError(0xdeadbeef); + dmW.dmSize = sizeof(dmW); + res = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW); + ok(res, "EnumDisplaySettingsW failed, error %#x\n", GetLastError()); + + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod) - 1; + res = ChangeDisplaySettingsW(&dmW, CDS_TEST); + todo_wine ok(res == DISP_CHANGE_BADMODE, "ChangeDisplaySettingsW returned %d, expect DISP_CHANGE_BADMODE\n", res); + + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod) - 1; res = ChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); - if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) - ok(res == DISP_CHANGE_FAILED || - res == DISP_CHANGE_BADPARAM || /* NT4 */ - res == DISP_CHANGE_BADMODE /* XP SP3 */, - "ChangeDisplaySettingsExW returned %d\n", res); + todo_wine ok(res == DISP_CHANGE_BADMODE, "ChangeDisplaySettingsExW returned %d, expect DISP_CHANGE_BADMODE\n", res); + + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); + res = ChangeDisplaySettingsW(&dmW, CDS_TEST); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW returned unexpected %d\n", res); + + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); + res = ChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW returned unexpected %d\n", res); /* Test clip rectangle after resolution changes */ /* GetClipCursor always returns result in physical pixels but GetSystemMetrics(SM_CX/CYVIRTUALSCREEN) are not. @@ -349,7 +435,7 @@ static void test_ChangeDisplaySettingsEx(void) (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART || res == DISP_CHANGE_BADMODE || res == DISP_CHANGE_BADPARAM), - "Unexpected ChangeDisplaySettingsEx() return code for resolution[%d]: %d\n", i, res); + "Unexpected ChangeDisplaySettingsExA() return code for vid_modes_test[%d]: %d\n", i, res); if (res == DISP_CHANGE_SUCCESSFUL) { @@ -394,6 +480,395 @@ static void test_ChangeDisplaySettingsEx(void) pSetThreadDpiAwarenessContext(context); res = ChangeDisplaySettingsExA(NULL, NULL, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %d\n", res); + + /* Save the original mode for all devices so that they can be restored at the end of tests */ + device_count = 0; + device_size = 2; + devices = heap_calloc(device_size, sizeof(*devices)); + ok(devices != NULL, "Failed to allocate memory.\n"); + + primary = 0; + memset(&dd, 0, sizeof(dd)); + dd.cb = sizeof(dd); + for (device = 0; EnumDisplayDevicesA(NULL, device, &dd, 0); ++device) + { + INT number; + + /* Skip software devices */ + if (sscanf(dd.DeviceName, "\\\\.\\DISPLAY%d", &number) != 1) + continue; + + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + primary = device_count; + + if (device_count >= device_size) + { + device_size *= 2; + devices = heap_realloc(devices, device_size * sizeof(*devices)); + ok(devices != NULL, "Failed to reallocate memory.\n"); + } + + devices[device_count].index = device; + lstrcpyA(devices[device_count].name, dd.DeviceName); + devices[device_count].original_mode.dmSize = sizeof(devices[device_count].original_mode); + res = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &devices[device_count].original_mode); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", dd.DeviceName, GetLastError()); + ++device_count; + } + + /* Make the primary adapter first */ + if (primary) + { + struct device_info tmp; + tmp = devices[0]; + devices[0] = devices[primary]; + devices[primary] = tmp; + } + + /* Test detaching adapters */ + /* Test that when there is only one adapter, it can't be detached */ + if (device_count == 1) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPosition = devices[0].original_mode.dmPosition; + res = ChangeDisplaySettingsExA(devices[0].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[0].name, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[0].name, res); + + /* Check that the adapter is still attached */ + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[0].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x\n", devices[0].name, GetLastError()); + ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect device %s still attached.\n", devices[0].name); + + count = GetSystemMetrics(SM_CMONITORS); + ok(count == old_count, "Expect monitor count %d, got %d\n", old_count, count); + + /* Restore registry settings */ + res = ChangeDisplaySettingsExA(devices[0].name, &devices[0].original_mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_BADPARAM) || /* win10 */ + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[0].name, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[0].name, res); + } + + /* Test that only specifying DM_POSITION in dmFields is not enough to detach an adapter */ + if (device_count >= 2) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + /* MSDN says set dmFields to DM_POSITION to detach, but DM_PELSWIDTH and DM_PELSHEIGHT are needed actually. + * To successfully detach adapters, settings have to be saved to the registry first, and then call + * ChangeDisplaySettingsExA(device, NULL, NULL, 0, NULL) to update settings. Otherwise on some older versions + * of Windows, e.g., XP and Win7, the adapter doesn't get detached */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION; + dm.dmPosition = devices[1].original_mode.dmPosition; + res = ChangeDisplaySettingsExA(devices[1].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); + res = ChangeDisplaySettingsExA(devices[1].name, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); + + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[1].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x\n", devices[1].name, GetLastError()); + ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect device %s still attached.\n", devices[1].name); + + count = GetSystemMetrics(SM_CMONITORS); + ok(count == old_count, "Expect monitor count %d, got %d\n", old_count, count); + } + + /* Detach all non-primary adapters to avoid position conflicts */ + for (device = 1; device < device_count; ++device) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPosition = devices[device].original_mode.dmPosition; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x\n", devices[device].name, GetLastError()); + todo_wine ok(!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP), "Expect device %s detached.\n", devices[device].name); + + count = GetSystemMetrics(SM_CMONITORS); + todo_wine ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); + } + + /* Test changing each adapter to every available mode */ + position.x = 0; + position.y = 0; + for (device = 0; device < device_count; ++device) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode) + { + dm.dmPosition = position; + dm.dmFields |= DM_POSITION; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); + /* Reattach detached non-primary adapters, otherwise ChangeDisplaySettingsExA with only CDS_RESET fails */ + if (mode == 0 && device) + { + todo_wine ok(res == DISP_CHANGE_FAILED, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", + devices[device].name, mode, res); + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", + devices[device].name, mode, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + } + + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* TestBots using VGA driver can't change to some modes */ + "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", devices[device].name, mode, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change %s to mode %d.\n", devices[device].name, mode); + continue; + } + + expect_dm(dm, devices[device].name, mode); + } + + /* Restore settings */ + res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + + /* Place the next adapter to the right so that there is no position conflict */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", + devices[device].name, GetLastError()); + if (!res) + { + win_skip("EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + continue; + } + position.x = dm.dmPosition.x + dm.dmPelsWidth; + } + + /* Test changing modes by saving settings to the registry first */ + for (device = 0; device < device_count; ++device) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + if (!res) + { + win_skip("EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + continue; + } + + /* Find a mode that's different from the current mode */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsA(devices[device].name, mode, &dm2); ++mode) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, "Failed to find a different mode.\n"); + + dm.dmPelsWidth = dm2.dmPelsWidth; + dm.dmPelsHeight = dm2.dmPelsHeight; + dm.dmDisplayFrequency = dm2.dmDisplayFrequency; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change mode for %s.\n", devices[device].name); + continue; + } + + expect_dm(dm, devices[device].name, 0); + } + + /* Test dmPosition */ + /* First detach all adapters except for the primary and secondary adapters to avoid position conflicts */ + if (device_count >= 3) + { + for (device = 2; device < device_count; ++device) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + + dm.dmPelsWidth = 0; + dm.dmPelsHeight = 0; + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + } + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d\n", res); + } + + if (device_count >= 2) + { + /* Query the primary adapter settings */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[0].name, ENUM_CURRENT_SETTINGS, &dm); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[0].name, GetLastError()); + + if (res) + { + /* Query the secondary adapter settings */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + } + + if (res) + { + /* Test position conflict */ + dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.y = dm.dmPosition.y; + res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); + + /* Position is not changed even if ChangeDisplaySettingsExA returned DISP_CHANGE_SUCCESSFUL */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x || broken(!res), "Expect position change not applied.\n"); + + /* Test position with extra space. The extra space will be removed */ + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth - dm2.dmPelsWidth / 2; + dm2.dmPosition.y = dm.dmPosition.y; + res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); + + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + expect_dm(dm2, devices[1].name, 0); + + /* Test placing the secondary adapter to all sides of the primary adapter */ + for (side = 0; side < 4; ++side) + { + switch (side) + { + /* Bottom */ + case 0: + dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight; + break; + /* Left */ + case 1: + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y; + break; + /* Top */ + case 2: + dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.y = dm.dmPosition.y - dm2.dmPelsHeight; + break; + /* Right */ + case 3: + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y; + break; + } + + res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s side %d returned unexpected %d\n", + devices[1].name, side, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("ChangeDisplaySettingsExA %s side %d returned unexpected %d.\n", devices[1].name, side, res); + continue; + } + + expect_dm(dm2, devices[1].name, side); + } + + /* Test automatic position update when other adapters change resolution */ + /* Find a mode that's different from the current mode */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsA(devices[0].name, mode, &dm2); ++mode) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, "Failed to find a different mode.\n"); + + /* Change the primary adapter to a different mode */ + dm = dm2; + res = ChangeDisplaySettingsExA(devices[0].name, &dm, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[0].name, res); + + /* Now the position of the second adapter should be changed */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + todo_wine ok(dm2.dmPosition.x == dm.dmPelsWidth || broken(!res), "Expect dmPosition.x %d, got %d\n", + dm.dmPelsWidth, dm2.dmPosition.x); + } + else + { + win_skip("EnumDisplaySettingsA failed\n"); + } + } + + /* Restore all adapters to their original settings */ + for (device = 0; device < device_count; ++device) + { + res = ChangeDisplaySettingsExA(devices[device].name, &devices[device].original_mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + } + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA returned unexpected %d\n", res); + for (device = 0; device < device_count; ++device) + expect_dm(devices[device].original_mode, devices[device].name, 0); + + heap_free(devices); } static void test_monitors(void) -- 2.20.1

1 0

[PATCH] setupapi: Implement SetupDiOpenDeviceInterfaceRegKey().
by Zhiyi Zhang 04 Feb '20

04 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 25 +++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/devinst.c | 60 +++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f8a4e93efc..f8197444d4 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3524,6 +3524,31 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceA( return FALSE; } +/*********************************************************************** + * SetupDiOpenDeviceInterfaceRegKey (SETUPAPI.@) + */ +HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO devinfo, PSP_DEVICE_INTERFACE_DATA iface_data, + DWORD reserved, REGSAM access) +{ + struct device_iface *iface; + LSTATUS lr; + HKEY key; + + TRACE("devinfo %p, iface_data %p, reserved %d, access %#x.\n", devinfo, iface_data, reserved, access); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return INVALID_HANDLE_VALUE; + + lr = RegOpenKeyExW(iface->refstr_key, DeviceParameters, 0, access, &key); + if (lr) + { + SetLastError(lr); + return INVALID_HANDLE_VALUE; + } + + return key; +} + /*********************************************************************** * SetupDiSetClassInstallParamsA (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 74c252c6fd..33ccc48097 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -380,7 +380,7 @@ @ stdcall SetupDiOpenDeviceInfoA(ptr str ptr long ptr) @ stdcall SetupDiOpenDeviceInfoW(ptr wstr ptr long ptr) @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) -@ stub SetupDiOpenDeviceInterfaceRegKey +@ stdcall SetupDiOpenDeviceInterfaceRegKey(ptr ptr long long) @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stdcall SetupDiRegisterCoDeviceInstallers(ptr ptr) @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a02752d2de..c01dcda65a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2010,6 +2010,7 @@ static void test_device_interface_key(void) ok(!ret, "key should exist: %u\n", ret); ret = RegSetValueA(key, NULL, REG_SZ, "test", 5); + ok(!ret, "RegSetValue failed: %u\n", ret); sz = sizeof(buffer); ret = RegQueryValueA(dikey, NULL, buffer, &sz); ok(!ret, "RegQueryValue failed: %u\n", ret); @@ -2030,6 +2031,64 @@ static void test_device_interface_key(void) SetupDiDestroyDeviceInfoList(set); } +static void test_open_device_interface_key(void) +{ + SP_DEVICE_INTERFACE_DATA iface; + SP_DEVINFO_DATA device; + CHAR buffer[5]; + HDEVINFO set; + LSTATUS lr; + LONG size; + HKEY key; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x\n", GetLastError()); + + device.cbSize = sizeof(device); + ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + iface.cbSize = sizeof(iface); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + + /* Test open before creation */ + key = SetupDiOpenDeviceInterfaceRegKey(set, &iface, 0, KEY_ALL_ACCESS); + ok(key == INVALID_HANDLE_VALUE, "Expect open interface registry key failure\n"); + + /* Test opened key is from SetupDiCreateDeviceInterfaceRegKey */ + key = SetupDiCreateDeviceInterfaceRegKeyW(set, &iface, 0, KEY_ALL_ACCESS, NULL, NULL); + ok(key != INVALID_HANDLE_VALUE, "Failed to create interface registry key, error %#x\n", GetLastError()); + + lr = RegSetValueA(key, NULL, REG_SZ, "test", 5); + ok(!lr, "RegSetValue failed, error %#x\n", lr); + + RegCloseKey(key); + + key = SetupDiOpenDeviceInterfaceRegKey(set, &iface, 0, KEY_ALL_ACCESS); + ok(key != INVALID_HANDLE_VALUE, "Failed to open interface registry key, error %#x\n", GetLastError()); + + size = sizeof(buffer); + lr = RegQueryValueA(key, NULL, buffer, &size); + ok(!lr, "RegQueryValue failed, error %#x\n", lr); + ok(!strcmp(buffer, "test"), "got wrong data %s\n", buffer); + + RegCloseKey(key); + + /* Test open after removal */ + ret = SetupDiRemoveDeviceInterface(set, &iface); + ok(ret, "Failed to remove device interface, error %#x.\n", GetLastError()); + + key = SetupDiOpenDeviceInterfaceRegKey(set, &iface, 0, KEY_ALL_ACCESS); + ok(key == INVALID_HANDLE_VALUE, "Expect open interface registry key failure\n"); + + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); +} + static void test_device_install_params(void) { SP_DEVINFO_DATA device = {sizeof(device)}; @@ -3141,6 +3200,7 @@ START_TEST(devinst) test_get_inf_class(); test_devnode(); test_device_interface_key(); + test_open_device_interface_key(); test_device_install_params(); test_driver_list(); test_call_class_installer(); -- 2.20.1

1 0

[PATCH 1/1] include: Add remaining MIB_TCP6 types
by Alex Henrie 04 Feb '20

04 Feb '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/tcpmib.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/tcpmib.h b/include/tcpmib.h index 477500c4fb..6576f8afa5 100644 --- a/include/tcpmib.h +++ b/include/tcpmib.h @@ -115,6 +115,24 @@ typedef struct _MIB_TCPTABLE_OWNER_PID MIB_TCPROW_OWNER_PID table[1]; } MIB_TCPTABLE_OWNER_PID, *PMIB_TCPTABLE_OWNER_PID; +typedef struct _MIB_TCP6ROW_OWNER_PID +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + UCHAR ucRemoteAddr[16]; + DWORD dwRemoteScopeId; + DWORD dwRemotePort; + DWORD dwState; + DWORD dwOwningPid; +} MIB_TCP6ROW_OWNER_PID, *PMIB_TCP6ROW_OWNER_PID; + +typedef struct _MIB_TCP6TABLE_OWNER_PID +{ + DWORD dwNumEntries; + MIB_TCP6ROW_OWNER_PID table[1]; +} MIB_TCP6TABLE_OWNER_PID, *PMIB_TCP6TABLE_OWNER_PID; + typedef struct _MIB_TCPROW_OWNER_MODULE { DWORD dwState; @@ -133,6 +151,26 @@ typedef struct _MIB_TCPTABLE_OWNER_MODULE MIB_TCPROW_OWNER_MODULE table[1]; } MIB_TCPTABLE_OWNER_MODULE, *PMIB_TCPTABLE_OWNER_MODULE; +typedef struct _MIB_TCP6ROW_OWNER_MODULE +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + UCHAR ucRemoteAddr[16]; + DWORD dwRemoteScopeId; + DWORD dwRemotePort; + DWORD dwState; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_TCP6ROW_OWNER_MODULE, *PMIB_TCP6ROW_OWNER_MODULE; + +typedef struct _MIB_TCP6TABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_TCP6ROW_OWNER_MODULE table[1]; +} MIB_TCP6TABLE_OWNER_MODULE, *PMIB_TCP6TABLE_OWNER_MODULE; + typedef struct _MIB_TCPROW2 { DWORD dwState; -- 2.25.0

1 0

[PATCH v3 4/8] msvcrt: Share ctype tables between threadlocinfo instances.
by Chip Davis 04 Feb '20

04 Feb '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v3: Fix a naive attempt at modifying a patch immediately before sending. --- dlls/msvcr90/tests/msvcr90.c | 16 +++++----- dlls/msvcrt/locale.c | 62 +++++++++++++++++++++--------------- 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 693b8a30c5c1..038e16a1d326 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -2120,10 +2120,10 @@ static void test__get_current_locale(void) l->locinfo->lc_codepage, l2->locinfo->lc_codepage); ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", l->locinfo->lc_clike, l2->locinfo->lc_clike); + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); } - ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); todo_wine { - ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); @@ -2195,10 +2195,10 @@ static void test__get_current_locale(void) l->locinfo->lc_codepage, l2->locinfo->lc_codepage); ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", l->locinfo->lc_clike, l2->locinfo->lc_clike); + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); } - ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); todo_wine { - ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); @@ -2276,10 +2276,10 @@ static void test__get_current_locale(void) l->locinfo->lc_codepage, l2->locinfo->lc_codepage); ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", l->locinfo->lc_clike, l2->locinfo->lc_clike); + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); } - ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); todo_wine { - ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); @@ -2352,10 +2352,10 @@ static void test__get_current_locale(void) l->locinfo->lc_codepage, l2->locinfo->lc_codepage); ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", l->locinfo->lc_clike, l2->locinfo->lc_clike); + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); } - ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); todo_wine { - ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 3723c14d483b..47f7c60a445c 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -55,6 +55,9 @@ BOOL initial_locale = TRUE; #define MSVCRT_LEADBYTE 0x8000 #define MSVCRT_C1_DEFINED 0x200 +static unsigned char cloc_clmap[256]; +static unsigned char cloc_cumap[256]; + static const MSVCRT_wchar_t sun[] = {'S','u','n',0}; static const MSVCRT_wchar_t mon[] = {'M','o','n',0}; static const MSVCRT_wchar_t tue[] = {'T','u','e',0}; @@ -163,6 +166,16 @@ static const char * const _country_synonyms[] = "spanish-modern", "esn" }; +static BOOL WINAPI init_cloc_casemap(PINIT_ONCE once, void *param, void **context) +{ + int i; + for(i=0; i<256; i++) { + cloc_clmap[i] = (i>='A' && i<='Z' ? i-'A'+'a' : i); + cloc_cumap[i] = (i>='a' && i<='z' ? i-'a'+'A' : i); + } + return TRUE; +} + /* INTERNAL: Map a synonym to an ISO code */ static void remap_synonym(char *name) { @@ -926,11 +939,13 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) MSVCRT_free(locinfo->lconv_mon_refcount); MSVCRT_free(locinfo->lconv); - MSVCRT_free(locinfo->ctype1_refcount); - MSVCRT_free(locinfo->ctype1); - - MSVCRT_free(locinfo->pclmap); - MSVCRT_free(locinfo->pcumap); + if(locinfo->ctype1_refcount + && !InterlockedDecrement(locinfo->ctype1_refcount)) { + MSVCRT_free(locinfo->ctype1_refcount); + MSVCRT_free(locinfo->ctype1); + MSVCRT_free(locinfo->pclmap); + MSVCRT_free(locinfo->pcumap); + } if(locinfo->lc_time_curr != &cloc_time_data) MSVCRT_free(locinfo->lc_time_curr); @@ -1198,13 +1213,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } memset(locinfo->lconv, 0, sizeof(struct MSVCRT_lconv)); - locinfo->pclmap = MSVCRT_malloc(sizeof(char[256])); - locinfo->pcumap = MSVCRT_malloc(sizeof(char[256])); - if(!locinfo->pclmap || !locinfo->pcumap) { - free_locinfo(locinfo); - return NULL; - } - if(locale_name[MSVCRT_LC_COLLATE] && !init_category_name(locale_name[MSVCRT_LC_COLLATE], locale_len[MSVCRT_LC_COLLATE], locinfo, MSVCRT_LC_COLLATE)) { @@ -1254,6 +1262,16 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, free_locinfo(locinfo); return NULL; } + locinfo->lc_codepage = old_locinfo->lc_codepage; + locinfo->lc_clike = old_locinfo->lc_clike; + locinfo->mb_cur_max = old_locinfo->mb_cur_max; + locinfo->ctype1 = old_locinfo->ctype1; + locinfo->ctype1_refcount = old_locinfo->ctype1_refcount; + locinfo->pctype = old_locinfo->pctype; + locinfo->pclmap = old_locinfo->pclmap; + locinfo->pcumap = old_locinfo->pcumap; + if(locinfo->ctype1_refcount) + InterlockedIncrement(locinfo->ctype1_refcount); } else if(lcid[MSVCRT_LC_CTYPE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_CTYPE)) { CPINFO cp_info; int j; @@ -1274,7 +1292,9 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->ctype1_refcount = MSVCRT_malloc(sizeof(int)); locinfo->ctype1 = MSVCRT_malloc(sizeof(short[257])); - if(!locinfo->ctype1_refcount || !locinfo->ctype1) { + locinfo->pclmap = MSVCRT_malloc(sizeof(char[256])); + locinfo->pcumap = MSVCRT_malloc(sizeof(char[256])); + if(!locinfo->ctype1_refcount || !locinfo->ctype1 || !locinfo->pclmap || !locinfo->pcumap) { free_locinfo(locinfo); return NULL; } @@ -1315,7 +1335,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_UPPERCASE, buf, 256, (char*)locinfo->pcumap, 256); } else { - locinfo->lc_clike = 1; + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; locinfo->mb_cur_max = 1; locinfo->pctype = MSVCRT__ctype+1; if(!init_category_name("C", 1, locinfo, MSVCRT_LC_CTYPE)) { @@ -1323,17 +1343,9 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } - for(i=0; i<256; i++) { - if(locinfo->pctype[i] & MSVCRT__LEADBYTE) - buf[i] = ' '; - else - buf[i] = i; - } - - for(i=0; i<256; i++) { - locinfo->pclmap[i] = (i>='A' && i<='Z' ? i-'A'+'a' : i); - locinfo->pcumap[i] = (i>='a' && i<='z' ? i-'a'+'A' : i); - } + InitOnceExecuteOnce(&once, init_cloc_casemap, NULL, NULL); + locinfo->pclmap = cloc_clmap; + locinfo->pcumap = cloc_cumap; } if(locale_name[MSVCRT_LC_MONETARY] && -- 2.24.0

1 0

[PATCH v2] include: Add cdosys.idl
by Alistair Leslie-Hughes 04 Feb '20

04 Feb '20

v2: Added all interfaces, no just their forwards. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/cdosys.idl | 417 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 418 insertions(+) create mode 100644 include/cdosys.idl diff --git a/include/Makefile.in b/include/Makefile.in index b1e7d0084f..5f967b616d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -51,6 +51,7 @@ SOURCES = \ bluetoothapis.h \ bthsdpdef.h \ cderr.h \ + cdosys.idl \ cfgmgr32.h \ cguid.h \ chprst.idl \ diff --git a/include/cdosys.idl b/include/cdosys.idl new file mode 100644 index 0000000000..648ec0d8da --- /dev/null +++ b/include/cdosys.idl @@ -0,0 +1,417 @@ +/* + * Copyright (C) 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; +import "msado15_backcompat.idl"; + +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + uuid(cd000000-8b95-11d1-82db-00c04fb1625d), + version(1.0) +] +library CDO +{ + importlib("stdole2.tlb"); + + interface IBodyPart; + + typedef enum + { + cdoDSNDefault = 0, + cdoDSNNever = 1, + cdoDSNFailure = 2, + cdoDSNSuccess = 4, + cdoDSNDelay = 8, + cdoDSNSuccessFailOrDelay = 14 + } CdoDSNOptions; + + typedef enum + { + cdoRefTypeId = 0, + cdoRefTypeLocation = 1 + } CdoReferenceType; + + typedef enum + { + cdoSuppressNone = 0, + cdoSuppressImages = 1, + cdoSuppressBGSounds = 2, + cdoSuppressFrames = 4, + cdoSuppressObjects = 8, + cdoSuppressStyleSheets = 16, + cdoSuppressAll = 31 + } CdoMHTMLFlags; + + typedef enum + { + cdoDefaults = 0xffffffff, + cdoIIS = 1, + cdoOutlookExpress = 2 + } CdoConfigSource; + + [ + odl, + uuid(cd000029-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IDataSource : IDispatch + { + [id(0x000000cf), propget] + HRESULT SourceClass([out, retval] BSTR *source); + + [id(0x000000d0)] + HRESULT Source([out, retval] IUnknown **source); + + [id(0x000000d1), propget] + HRESULT IsDirty([out, retval] VARIANT_BOOL *dirty); + [id(0x000000d1), propput] + HRESULT IsDirty([in] VARIANT_BOOL dirty); + + [id(0x000000d2), propget] + HRESULT SourceURL([out, retval] BSTR *url); + + [id(0x000000d3), propget] + HRESULT ActiveConnection([out, retval] _Connection **connection); + + [id(0x000000fb)] + HRESULT SaveToObject([in] IUnknown *source, [in] BSTR iname); + + [id(0x000000fc)] + HRESULT OpenObject([in] IUnknown *source, [in] BSTR iname); + + [id(0x000000fd)] + HRESULT SaveTo([in] BSTR url, [in, optional, defaultvalue(NULL)] IDispatch *connection, + [in, optional] ConnectModeEnum mode, [in, optional] RecordCreateOptionsEnum create, + [in, optional] RecordOpenOptionsEnum options, [in, optional] BSTR username, + [in, optional] BSTR password); + + [id(0x000000fe)] + HRESULT Open([in] BSTR url, [in, optional, defaultvalue(NULL)] IDispatch *connection, + [in, optional] ConnectModeEnum mode, [in, optional, defaultvalue(-1)] RecordCreateOptionsEnum create, + [in, optional] RecordOpenOptionsEnum options, [in, optional] BSTR username, + [in, optional] BSTR password); + + [id(0x000000ff)] + HRESULT Save(); + + [id(0x00000100)] + HRESULT SaveToContainer([in] BSTR url, [in, optional, defaultvalue(NULL)] IDispatch *connection, + [in, optional] ConnectModeEnum mode, [in, optional] RecordCreateOptionsEnum create, + [in, optional] RecordOpenOptionsEnum options, [in, optional] BSTR username, + [in, optional] BSTR password); + }; + + [ + odl, + uuid(cd000023-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IBodyParts : IDispatch + { + [id(0x00000001), propget] + HRESULT Count([out, retval] long *count); + + [id(00000000), propget] + HRESULT Item([in] long index, [out, retval] IBodyPart **body); + + [id(DISPID_NEWENUM), propget, restricted] + HRESULT _NewEnum([out, retval] IUnknown **retval); + + [id(0x00000002)] + HRESULT Delete([in] VARIANT bodypart); + + [id(0x00000003)] + HRESULT DeleteAll(); + + [id(0x00000004)] + HRESULT Add([in, optional, defaultvalue(-1)] long index, [out, retval] IBodyPart **bodypart); + }; + + [ + odl, + uuid(cd000021-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IBodyPart : IDispatch + { + [id(0x000000c8), propget] + HRESULT BodyParts([out, retval] IBodyParts **bodypart); + + [id(0x000000c9), propget] + HRESULT ContentTransferEncoding([out, retval] BSTR *encoding); + [id(0x000000c9), propput] + HRESULT ContentTransferEncoding([in] BSTR encoding); + + [id(0x000000ca), propget] + HRESULT ContentMediaType([out, retval] BSTR *mediatype); + [id(0x000000ca), propput] + HRESULT ContentMediaType([in] BSTR mediatype); + + [id(0x000000cb), propget] + HRESULT Fields([out, retval] Fields *fields); + + [id(0x000000cc), propget] + HRESULT Charset([out, retval] BSTR *charset); + [id(0x000000cc), propput] + HRESULT Charset([in] BSTR charset); + + [id(0x000000cd), propget] + HRESULT FileName([out, retval] BSTR *filename); + + [id(0x000000cf), propget] + HRESULT DataSource([out, retval] IDataSource *datasource); + + [id(0x000000d0), propget] + HRESULT ContentClass([out, retval] BSTR *content); + [id(0x000000d0), propput] + HRESULT ContentClass([in] BSTR content); + + [id(0x000000d1), propget] + HRESULT ContentClassName([out, retval] BSTR *name); + [id(0x000000d1), propput] + HRESULT ContentClassName([in] BSTR name); + + [id(0x000000d2), propget] + HRESULT Parent([out, retval] IBodyPart **parent); + + [id(0x000000fa)] + HRESULT AddBodyPart([in, optional, defaultvalue(-1)] long index, [out, retval] IBodyPart **bodypart); + + [id(0x000000fb)] + HRESULT SaveToFile([in] BSTR filename); + + [id(0x000000fc)] + HRESULT GetEncodedContentStream([out, retval] _Stream **stream); + + [id(0x000000fd)] + HRESULT GetDecodedContentStream([out, retval] _Stream **stream); + + [id(0x000000fe)] + HRESULT GetStream([out, retval] _Stream **stream); + + [id(0x000000ff)] + HRESULT GetFieldParameter([in] BSTR fieldname, [in] BSTR parameter, [out, retval] BSTR *streamalue); + + [id(0x000000a0)] + HRESULT GetInterface([in] BSTR iface, [out, retval] IDispatch **unk); + }; + + [ + odl, + uuid(cd000022-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IConfiguration : IDispatch + { + [id(00000000), propget] + HRESULT Fields([out, retval] Fields **fields); + + [id(0x00000032)] + HRESULT Load([in] CdoConfigSource source, [in, optional] BSTR url); + + [id(0x000000a0)] + HRESULT GetInterface([in] BSTR iname, [out, retval] IDispatch **unk); + }; + + [ + odl, + uuid(cd000020-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IMessage : IDispatch + { + [id(0x00000065), propget] + HRESULT BCC([out, retval] BSTR *bcc); + [id(0x00000065), propput] + HRESULT BCC([in] BSTR bcc); + + [id(0x00000067), propget] + HRESULT CC([out, retval] BSTR *cc); + [id(0x00000067), propput] + HRESULT CC([in] BSTR cc); + + [id(0x00000069), propget] + HRESULT FollowUpTo([out, retval] BSTR *follow); + [id(0x00000069), propput] + HRESULT FollowUpTo([in] BSTR follow); + + [id(0x0000006a), propget] + HRESULT From([out, retval] BSTR *from); + [id(0x0000006a), propput] + HRESULT From([in] BSTR from); + + [id(0x0000006b), propget] + HRESULT Keywords([out, retval] BSTR* keywords); + [id(0x0000006b), propput] + HRESULT Keywords([in] BSTR keywords); + + [id(0x0000006e), propget] + HRESULT MimeFormatted([out, retval] VARIANT_BOOL *formatted); + [id(0x0000006e), propput] + HRESULT MimeFormatted([in] VARIANT_BOOL formatted); + + [id(0x0000006f), propget] + HRESULT Newsgroups([out, retval] BSTR *newsgroups); + [id(0x0000006f), propput] + HRESULT Newsgroups([in] BSTR newsgroups); + [id(0x00000070), propget] + + HRESULT Organization([out, retval] BSTR *organization); + [id(0x00000070), propput] + HRESULT Organization([in] BSTR organization); + + [id(0x00000072), propget] + HRESULT ReceivedTime([out, retval] DATE *received); + + [id(0x00000073), propget] + HRESULT ReplyTo([out, retval] BSTR *reply); + [id(0x00000073), propput] + HRESULT ReplyTo([in] BSTR reply); + + [id(0x00000074), propget] + HRESULT DSNOptions([out, retval] CdoDSNOptions *options); + [id(0x00000074), propput] + HRESULT DSNOptions([in] CdoDSNOptions options); + + [id(0x00000077), propget] + HRESULT SentOn([out, retval] DATE *sent); + + [id(0x00000078), propget] + HRESULT Subject([out, retval] BSTR *subject); + [id(0x00000078), propput] + HRESULT Subject([in] BSTR subject); + + [id(0x00000079), propget] + HRESULT To([out, retval] BSTR *to); + [id(0x00000079), propput] + HRESULT To([in] BSTR to); + + [id(0x0000007b), propget] + HRESULT TextBody([out, retval] BSTR *body); + [id(0x0000007b), propput] + HRESULT TextBody([in] BSTR body); + + [id(0x0000007c)] + HRESULT HTMLBody([out, retval] BSTR* body); + [id(0x0000007c), propput] + HRESULT HTMLBody([in] BSTR body); + + [id(0x0000007d), propget] + HRESULT Attachments([out, retval] IBodyParts **attachments); + + [id(0x0000007e), propget] + HRESULT Sender([out, retval] BSTR *sender); + [id(0x0000007e), propput] + HRESULT Sender([in] BSTR sender); + + [id(0x0000007f), propget] + HRESULT Configuration([out, retval] IConfiguration **config); + [id(0x0000007f), propput] + HRESULT Configuration([in] IConfiguration *config); + [id(0x0000007f), propputref] + HRESULT Configuration([in] IConfiguration *config); + + [id(0x00000080), propget] + HRESULT AutoGenerateTextBody([out, retval] VARIANT_BOOL *body); + [id(0x00000080), propput] + HRESULT AutoGenerateTextBody([in] VARIANT_BOOL body); + + [id(0x00000081), propget] + HRESULT EnvelopeFields([out, retval] Fields **fields); + + [id(0x00000082), propget] + HRESULT TextBodyPart([out, retval] IBodyPart **body); + [id(0x00000083), propget] + HRESULT HTMLBodyPart([out, retval] IBodyPart **body); + + [id(0x00000084), propget] + HRESULT BodyPart([out, retval] IBodyPart ** part); + + [id(0x00000085), propget] + HRESULT DataSource([out, retval] IDataSource **datasource); + + [id(0x00000086), propget] + HRESULT Fields([out, retval] Fields **fields); + + [id(0x00000087), propget] + HRESULT MDNRequested([out, retval] VARIANT_BOOL* requested); + [id(0x00000087), propput] + HRESULT MDNRequested([in] VARIANT_BOOL requested); + + [id(0x00000096)] + HRESULT AddRelatedBodyPart([in] BSTR url, [in] BSTR Reference, [in] CdoReferenceType ReferenceType, + [in, optional] BSTR username, [in, optional] BSTR password, [out, retval] IBodyPart **body); + [id(0x00000097)] + HRESULT AddAttachment([in] BSTR url, [in, optional] BSTR username, + [in, optional] BSTR password, [out, retval] IBodyPart **body); + + [id(0x00000098)] + HRESULT CreateMHTMLBody([in] BSTR url, [in, optional, defaultvalue(0)] CdoMHTMLFlags flags, + [in, optional] BSTR username, [in, optional] BSTR password); + + [id(0x00000099)] + HRESULT Forward([out, retval] IMessage **msg); + + [id(0x0000009a)] + HRESULT Post(); + + [id(0x0000009b)] + HRESULT PostReply([out, retval] IMessage **msg); + + [id(0x0000009c)] + HRESULT Reply([out, retval] IMessage **msg); + + [id(0x0000009d)] + HRESULT ReplyAll([out, retval] IMessage **msg); + + [id(0x0000009e)] + HRESULT Send(); + + [id(0x0000009f)] + HRESULT GetStream([out, retval] _Stream **stream); + + [id(0x000000a0)] + HRESULT GetInterface([in] BSTR name, [out, retval] IDispatch **unknown); + }; + + [ + uuid(cd000001-8b95-11d1-82db-00c04fb1625d) + ] + coclass Message + { + [default] interface IMessage; + interface IDataSource; + interface IBodyPart; + }; +} -- 2.17.1

1 0

[PATCH v5 0/8] msvcrt: _locale_t object management overhaul
by Chip Davis 04 Feb '20

04 Feb '20

This patch series fixes management of _locale_t objects to align more with native. Some apps and libraries--most notably libc++--depend on this to behave properly. The first patch contains tests demonstrating the proper behavior of _locale_t objects and their various members. Patches 2 through 6 copy various portions of the threadlocinfo struct from old to new when they aren't updated. This is all to clear the way for patch 7, which updates the locale pointer in msvcrt itself instead of the contents of the threadlocinfo struct. The last patch fixes the reference counting behavior of _get_current_locale() to match native.

2 13

[PATCH] testbot: Do cosmetic cleanups in the patch handling code.
by Francois Gouget 04 Feb '20

04 Feb '20

Prefix unused variables with an underscore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 23 +++++++-------------- testbot/lib/WineTestBot/PendingPatchSets.pm | 4 ++-- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index ca8d57f90f..46b17e52a1 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -212,7 +212,7 @@ sub Submit($$$) $BuildStep->DebugLevel(0); # Save the build step so the others can reference it. - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined($ErrMessage)) { $self->Disposition("Failed to submit build step"); @@ -308,7 +308,7 @@ sub Submit($$$) } # Save it all - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { $self->Disposition("Failed to submit job"); @@ -325,7 +325,7 @@ sub Submit($$$) # Switch Status to staging to indicate we are done setting up the job $NewJob->Status("staging"); $NewJob->Priority($Priority); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { $self->Disposition("Failed to submit job (staging)"); @@ -470,9 +470,7 @@ sub NewPatch($$$) if ($Subject =~ m/\d+\/\d+/) { $Patch->Disposition("Checking series"); - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (! defined($ErrMessage)) { @@ -482,9 +480,7 @@ sub NewPatch($$$) else { $Patch->Disposition("Checking patch"); - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (! defined($ErrMessage)) { @@ -505,14 +501,11 @@ sub NewPatch($$$) { $PatchBody->purge(); } - + if (! defined($ErrMessage)) { - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); + return $ErrMessage if (defined $ErrMessage); } return undef; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 5be39e4016..53395130e7 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -258,7 +258,7 @@ sub NewSubmission($$) $Part->Patch($Patch); - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $self->Save(); if (defined($ErrMessage)) { $Patch->Disposition("Error occurred during series processing"); @@ -280,7 +280,7 @@ sub NewSubmission($$) $ErrMessage = $Set->SubmitSubset($PartNo, $Part->Patch); if (!defined $ErrMessage) { - (my $ErrProperty, $ErrMessage) = $Part->Patch->Save(); + ($_ErrProperty, $ErrMessage) = $Part->Patch->Save(); } } else -- 2.20.1

1 0

[PATCH 1/5] d3d9: Set the primary stateblock when executing draw calls.
by Zebediah Figura 04 Feb '20

04 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 88 ++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8122ab0a05..bb7f5ddd4a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2938,13 +2938,13 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); d3d9_generate_auto_mipmaps(device); - wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx); + wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3025,7 +3025,6 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3048,14 +3047,15 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, stride); if (FAILED(hr)) goto done; d3d9_generate_auto_mipmaps(device); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); - wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3142,7 +3142,6 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa return D3DERR_INVALIDCALL; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -3187,20 +3186,21 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, vertex_stride); if (FAILED(hr)) goto done; d3d9_generate_auto_mipmaps(device); - wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, - wined3dformat_from_d3dformat(index_format), 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride - min_vertex_idx); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, + wined3dformat_from_d3dformat(index_format)); + wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); - wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); - wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN, 0); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); + wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3217,17 +3217,17 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexbuffer *dst_impl = unsafe_impl_from_IDirect3DVertexBuffer9(dst_buffer); struct d3d9_vertex_declaration *decl_impl = unsafe_impl_from_IDirect3DVertexDeclaration9(declaration); + const struct wined3d_stateblock_state *state; + const struct wined3d_stream_state *stream; struct d3d9_vertexbuffer *d3d9_buffer; - struct wined3d_buffer *wined3d_buffer; - unsigned int i, offset, stride, map; + unsigned int i, map; HRESULT hr; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, declaration %p, flags %#x.\n", iface, src_start_idx, dst_idx, vertex_count, dst_buffer, declaration, flags); wined3d_mutex_lock(); - - wined3d_device_apply_stateblock(device->wined3d_device, device->state); + state = wined3d_stateblock_get_state(device->state); /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we @@ -3238,16 +3238,15 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, while (map) { i = wined3d_bit_scan(&map); + stream = &state->streams[i]; - if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) - ERR("Failed to get stream source.\n"); - d3d9_buffer = wined3d_buffer_get_parent(wined3d_buffer); - if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, - i, d3d9_buffer->wined3d_buffer, offset, stride))) + d3d9_buffer = wined3d_buffer_get_parent(stream->buffer); + if (FAILED(wined3d_stateblock_set_stream_source(device->state, + i, d3d9_buffer->wined3d_buffer, stream->offset, stream->stride))) ERR("Failed to set stream source.\n"); } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, dst_impl->wined3d_buffer, decl_impl ? decl_impl->wined3d_declaration : NULL, flags, dst_impl->fvf); @@ -3256,13 +3255,11 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, while (map) { i = wined3d_bit_scan(&map); + stream = &state->streams[i]; - if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) - ERR("Failed to get stream source.\n"); - d3d9_buffer = wined3d_buffer_get_parent(wined3d_buffer); - if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, - i, d3d9_buffer->draw_buffer, offset, stride))) + d3d9_buffer = wined3d_buffer_get_parent(stream->buffer); + if (FAILED(wined3d_stateblock_set_stream_source(device->state, + i, d3d9_buffer->draw_buffer, stream->offset, stream->stride))) ERR("Failed to set stream source.\n"); } @@ -3663,8 +3660,12 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); if (!buffer_impl) - wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, - &offset, &stride); + { + const struct wined3d_stream_state *stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + wined3d_buffer = stream->buffer; + offset = stream->offset; + stride = stream->stride; + } if (!buffer_impl) wined3d_buffer = NULL; @@ -3695,9 +3696,8 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, UINT stream_idx, IDirect3DVertexBuffer9 **buffer, UINT *offset, UINT *stride) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + const struct wined3d_stream_state *stream; struct d3d9_vertexbuffer *buffer_impl; - struct wined3d_buffer *wined3d_buffer; - HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, offset %p, stride %p.\n", iface, stream_idx, buffer, offset, stride); @@ -3705,23 +3705,28 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, if (!buffer) return D3DERR_INVALIDCALL; + if (stream_idx > WINED3D_MAX_STREAMS) + { + WARN("Stream index %u out of range.\n", stream_idx); + return WINED3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); - hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, offset, stride); - if (SUCCEEDED(hr) && wined3d_buffer) + stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + if (stream->buffer) { - buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffer_impl = wined3d_buffer_get_parent(stream->buffer); *buffer = &buffer_impl->IDirect3DVertexBuffer9_iface; IDirect3DVertexBuffer9_AddRef(*buffer); } else - { - if (FAILED(hr)) - FIXME("Call to GetStreamSource failed %p %p\n", offset, stride); *buffer = NULL; - } + if (offset) + *offset = stream->offset; + *stride = stream->stride; wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetStreamSourceFreq(IDirect3DDevice9Ex *iface, UINT stream_idx, UINT freq) @@ -3784,7 +3789,6 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 **buffer) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d9_indexbuffer *buffer_impl; @@ -3794,7 +3798,7 @@ static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3 return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format, NULL))) + if ((wined3d_buffer = wined3d_stateblock_get_state(device->state)->index_buffer)) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer9_iface; -- 2.25.0

2 7

[PATCH v4 0/8] msvcrt: _locale_t object management overhaul
by Chip Davis 03 Feb '20

03 Feb '20

This patch series fixes management of _locale_t objects to align more with native. Some apps and libraries--most notably libc++--depend on this to behave properly. The first patch contains tests demonstrating the proper behavior of _locale_t objects and their various members. Patches 2 through 6 copy various portions of the threadlocinfo struct from old to new when they aren't updated. This is all to clear the way for patch 7, which updates the locale pointer in msvcrt itself instead of the contents of the threadlocinfo struct. The last patch fixes the reference counting behavior of _get_current_locale() to match native.

1 8

[PATCH v3 3/3] msvcrt: Set return value on all paths in wcstombs_s_l.
by Daniel Lehman 03 Feb '20

03 Feb '20

1 0

[PATCH v2 1/8] msvcr90/tests: Test _get_current_locale()/setlocale() interaction.
by Chip Davis 03 Feb '20

03 Feb '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Bail if setlocale() fails. Mark a result as broken(). --- dlls/msvcr90/tests/msvcr90.c | 466 +++++++++++++++++++++++++++++++++++ 1 file changed, 466 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c8a49f25492d..c81f4410d60b 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -139,6 +139,22 @@ static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); static _locale_t (__cdecl *p__create_locale)(int, const char*); static void (__cdecl *p__free_locale)(_locale_t); +static _locale_t (__cdecl *p__get_current_locale)(void); + +struct __lc_time_data { + const char *short_wday[7]; + const char *wday[7]; + const char *short_mon[12]; + const char *mon[12]; + const char *am; + const char *pm; + const char *short_date; + const char *date; + const char *time; + LCID lcid; + int unk; + int refcount; +}; /* make sure we use the correct errno */ #undef errno @@ -408,6 +424,7 @@ static BOOL init(void) SET(p____mb_cur_max_l_func, "___mb_cur_max_l_func"); SET(p__create_locale, "_create_locale"); SET(p__free_locale, "_free_locale"); + SET(p__get_current_locale, "_get_current_locale"); if (sizeof(void *) == 8) { @@ -1961,6 +1978,454 @@ static void test____mb_cur_max_l_func(void) p__free_locale(l); } +static void test__get_current_locale(void) +{ + _locale_t l = p__get_current_locale(), l2 = p__get_current_locale(); + int i; +#define lc_str(lc, s) \ + ok(!strcmp(l->locinfo->lc_category[lc].locale, s), #lc " = \"%s\"\n", \ + l->locinfo->lc_category[lc].locale) + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + + ok(l->locinfo->refcount == 3, "refcount = %d\n", l->locinfo->refcount); + + if(!p_setlocale(LC_ALL, "english")) { + win_skip("English locale not available\n"); + p__free_locale(l); + p__free_locale(l2); + return; + } + + todo_wine { + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + } +#undef lc_str + + todo_wine ok(l->locinfo->refcount == 2, "refcount = %d\n", l->locinfo->refcount); + ok(l->locinfo == l2->locinfo, "different locinfo pointers\n"); + ok(l->mbcinfo == l2->mbcinfo, "different mbcinfo pointers\n"); + + p__free_locale(l); + p__free_locale(l2); + + l = p__get_current_locale(); + p_setlocale(LC_COLLATE, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + todo_wine { + ok(l->locinfo->lc_category[LC_COLLATE].locale != l2->locinfo->lc_category[LC_COLLATE].locale, + "same locale name pointers for LC_COLLATE\n"); + ok(l->locinfo->lc_category[LC_COLLATE].refcount != l2->locinfo->lc_category[LC_COLLATE].refcount, + "same refcount pointers for LC_COLLATE\n"); + ok(l->locinfo->lc_category[LC_COLLATE].refcount, "null refcount pointer for LC_COLLATE\n"); + if(l->locinfo->lc_category[LC_COLLATE].refcount) + ok(*l->locinfo->lc_category[LC_COLLATE].refcount == 1, "refcount = %d\n", + *l->locinfo->lc_category[LC_COLLATE].refcount); + ok(l2->locinfo->lc_category[LC_COLLATE].refcount, "null refcount pointer for LC_COLLATE\n"); + if(l2->locinfo->lc_category[LC_COLLATE].refcount) + ok(*l2->locinfo->lc_category[LC_COLLATE].refcount == 2, "refcount = %d\n", + *l2->locinfo->lc_category[LC_COLLATE].refcount); + } + for(i = LC_CTYPE; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage == l2->locinfo->lc_codepage, "different lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike == l2->locinfo->lc_clike, "different lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + /* The meaning of this member seems to be reversed--go figure */ + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(l->locinfo->ctype1 == l2->locinfo->ctype1, "different ctype1 pointers\n"); + ok(l->locinfo->pclmap == l2->locinfo->pclmap, "different clmap pointers\n"); + ok(l->locinfo->pcumap == l2->locinfo->pcumap, "different cumap pointers\n"); + ok(l->locinfo->ctype1_refcount == l2->locinfo->ctype1_refcount, "different ctype1_refcount pointers\n"); + todo_wine ok(*l->locinfo->ctype1_refcount == 3, "refcount = %d\n", *l->locinfo->ctype1_refcount); + + ok(l->locinfo->lconv == l2->locinfo->lconv, "different lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount == l2->locinfo->lconv_intl_refcount, "different lconv_intl_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + todo_wine ok(*l->locinfo->lconv_intl_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + ok(l->locinfo->lconv->currency_symbol == l2->locinfo->lconv->currency_symbol, "different LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount == l2->locinfo->lconv_mon_refcount, "different lconv_mon_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + todo_wine ok(*l->locinfo->lconv_mon_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_CTYPE, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i < LC_MONETARY; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + for(i = LC_MONETARY; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lconv == l2->locinfo->lconv, "different lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount == l2->locinfo->lconv_intl_refcount, "different lconv_intl_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + todo_wine ok(*l->locinfo->lconv_intl_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + ok(l->locinfo->lconv->currency_symbol == l2->locinfo->lconv->currency_symbol, "different LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount == l2->locinfo->lconv_mon_refcount, "different lconv_mon_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + todo_wine ok(*l->locinfo->lconv_mon_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_MONETARY, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i <= LC_MONETARY; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + for(i = LC_NUMERIC; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + ok(l2->locinfo->lconv_intl_refcount, "null refcount pointer for C locale\n"); + if(l2->locinfo->lconv_intl_refcount) + ok(*l2->locinfo->lconv_intl_refcount == 2, "refcount = %d\n", *l2->locinfo->lconv_intl_refcount); + } + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_NUMERIC, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i <= LC_NUMERIC; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + ok(l->locinfo->lc_category[LC_TIME].locale == l2->locinfo->lc_category[LC_TIME].locale, + "different locale name pointers for LC_TIME\n"); + ok(l->locinfo->lc_category[LC_TIME].refcount == l2->locinfo->lc_category[LC_TIME].refcount, + "different refcount pointers for LC_TIME\n"); + todo_wine ok(*l->locinfo->lc_category[LC_TIME].refcount == 3, "refcount = %d\n", + *l->locinfo->lc_category[LC_TIME].refcount); + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + } + ok(!l2->locinfo->lconv_intl_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->decimal_point != l2->locinfo->lconv->decimal_point, "same LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount != l2->locinfo->lconv_num_refcount, "same lconv_num_refcount pointers\n"); + ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + ok(*l->locinfo->lconv_num_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + } + ok(!l2->locinfo->lconv_num_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_TIME, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + todo_wine { + for(i = LC_MIN+1; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + } + ok(!l2->locinfo->lconv_intl_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->decimal_point != l2->locinfo->lconv->decimal_point, "same LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount != l2->locinfo->lconv_num_refcount, "same lconv_num_refcount pointers\n"); + ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + ok(*l->locinfo->lconv_num_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + } + ok(!l2->locinfo->lconv_num_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine ok(l->locinfo->lc_time_curr != l2->locinfo->lc_time_curr, "same lc_time_curr pointers\n"); + ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 1, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + ok(l2->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l2->locinfo->lc_time_curr->unk); + todo_wine ok(l2->locinfo->lc_time_curr->refcount == 3 || broken(l2->locinfo->lc_time_curr->refcount == 2), + "refcount = %d\n", l2->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p__free_locale(l); + p_setlocale(LC_ALL, "C"); +} + START_TEST(msvcr90) { if(!init()) @@ -2001,4 +2466,5 @@ START_TEST(msvcr90) test___strncnt(); test_swscanf(); test____mb_cur_max_l_func(); + test__get_current_locale(); } -- 2.24.0

3 15

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 03 Feb '20

03 Feb '20

2 1

[PATCH v5 1/5] quartz/tests: Add tests for IFilterGraph::Reconnect().
by Zebediah Figura 03 Feb '20

03 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fd946faaa9b..2483c502f45 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2878,8 +2878,41 @@ todo_wine ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test Reconnect[Ex](). */ + + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* Both pins are disconnected when a filter is removed. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); sink_pin.peer = &source_pin.IPin_iface; IPin_AddRef(sink_pin.peer); hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); -- 2.25.0

2 5

[PATCH] atlbase.h: Fix some declarations on win64.
by Jacek Caban 03 Feb '20

03 Feb '20

From: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/atl/atl.c | 2 +- dlls/atl/tests/module.c | 11 +++++++---- include/atlbase.h | 8 ++++---- 3 files changed, 12 insertions(+), 9 deletions(-)

1 0

[PATCH v3 1/5] quartz/tests: Add tests for IFilterGraph::Reconnect().
by Zebediah Figura 03 Feb '20

03 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fd946faaa9b..2483c502f45 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2878,8 +2878,41 @@ todo_wine ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test Reconnect[Ex](). */ + + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* Both pins are disconnected when a filter is removed. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); sink_pin.peer = &source_pin.IPin_iface; IPin_AddRef(sink_pin.peer); hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); -- 2.25.0

3 9

[PATCH v4 1/5] quartz/tests: Add tests for IFilterGraph::Reconnect().
by Zebediah Figura 03 Feb '20

03 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fd946faaa9b..2483c502f45 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2878,8 +2878,41 @@ todo_wine ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test Reconnect[Ex](). */ + + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* Both pins are disconnected when a filter is removed. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); sink_pin.peer = &source_pin.IPin_iface; IPin_AddRef(sink_pin.peer); hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); -- 2.25.0

2 6

[PATCH 2/2] wscript/tests: Get rid of mystrchr.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wscript/tests/run.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)

1 0

[PATCH 1/2] wscript/tests: Get rid of strcmp_wa.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wscript/tests/run.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)

1 0

[PATCH 3/3 v2] msvcrt: Set return value on all paths in wcstombs_s_l.
by Piotr Caban 03 Feb '20

03 Feb '20

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 20 ++++++++------------ dlls/msvcrt/wcs.c | 16 +++++++++++----- 2 files changed, 19 insertions(+), 17 deletions(-)

2 1

[PATCH v2] wldap32: Define a debug channel only when we are using it.
by Gerald Pfeifer 03 Feb '20

03 Feb '20

We only need this debug channel when we're later using it - and all uses in this file are guarded by #ifdef HAVE_LDAP, so use the same guard here as well. Thanks to Nikolay for this hint based on an earlier patch. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/wldap32/add.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 0a24d95f32..f5796a6fd7 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif #ifdef HAVE_LDAP static LDAPMod *nullattrs[] = { NULL }; -- 2.25.0

2 3

[PATCH 2/3 v2] msvcrt: Don't set error in wcstombs_s_l if no characters to convert.
by Piotr Caban 03 Feb '20

03 Feb '20

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 4 ++-- dlls/msvcrt/wcs.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)

2 1

[PATCH 1/3 v2] msvcrt/tests: Add some wcstombs_s_l tests.
by Piotr Caban 03 Feb '20

03 Feb '20

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - check if _create_locale succeeded dlls/msvcrt/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)

3 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2020