January 2020 - Wine-devel - list.winehq.org

[PATCH v2 2/2] include: Add xact.idl
by Alistair Leslie-Hughes 23 Jan '20

23 Jan '20

From: Ethan Lee <elee(a)codeweavers.com> v2: Use a xact3wb.h for the structures that use :X syntax, which is the same as windows. #if 0 these structures and removed the union part with a equal size value. Windows only exposes the lastest IXACT3Engine, we'll have to use a private idl to define the other versions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3.idl | 547 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 548 insertions(+) create mode 100644 include/xact3.idl diff --git a/include/Makefile.in b/include/Makefile.in index 5dac4e66d5..ee62a2ce70 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -771,6 +771,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..85b18d0b9f --- /dev/null +++ b/include/xact3.idl @@ -0,0 +1,547 @@ +/* + * 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"; + +cpp_quote("#include \"xact3wb.h\"") + +[ + uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) +] +coclass XACTEngine +{ + interface IUnknown; +} + +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; + +typedef struct XACT_RENDERER_DETAILS +{ + WCHAR rendererID[0xFF]; + WCHAR displayName[0xFF]; + 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 +{ + BYTE* readFileCallback; /* FIXME: XACT_READFILE_CALLBACK */ + BYTE* getOverlappedResultCallback; /* FIXME: XACT_GETOVERLAPPEDRESULT_CALLBACK */ +} 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; + BYTE* pGlobalSettingsBuffer; /* FIXME: void* */ + DWORD globalSettingsBufferSize; + DWORD globalSettingsFlags; + DWORD globalSettingsAllocAttributes; + XACT_FILEIO_CALLBACKS fileIOCallbacks; + BYTE* fnNotificationCallback; /* FIXME: XACT_NOTIFICATION_CALLBACK */ + LPCWSTR pRendererID; + IXAudio2 *pXAudio2; + IXAudio2MasteringVoice *pMasteringVoice; +} XACT_RUNTIME_PARAMETERS; + +typedef struct XACT_STREAMING_PARAMETERS +{ + BYTE* file; /* FIXME: HANDLE */ + DWORD offset; + DWORD flags; + WORD packetSize; +} XACT_STREAMING_PARAMETERS; + +/* defined in xact3wb.h */ +cpp_quote("#if 0") + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef union WAVEBANKMINIWAVEFORMAT +{ + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKENTRY +{ + DWORD dwFlagsAndDuration; /* Is a union */ + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +cpp_quote("#endif") + +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[64]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES; + +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES waveProperties; /* FIXME: 'properties' */ + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES; + +typedef struct XACT_CUE_PROPERTIES +{ + char friendlyName[0xFF]; + 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; + BYTE* pvContext; /* FIXME: LPVOID */ +} 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; + }; +}; + +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, + uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), +] +interface IXACT3Engine : IUnknown +{ + HRESULT GetRendererCount([out] XACTINDEX *pnRendererCount); + + HRESULT GetRendererDetails( + XACTINDEX nRendererIndex, + [out] XACT_RENDERER_DETAILS *pRendererDetails); + + HRESULT GetFinalMixFormat([out] WAVEFORMATEXTENSIBLE *pFinalMixFormat); + + HRESULT Initialize([in] const XACT_RUNTIME_PARAMETERS *pParams); + + HRESULT ShutDown(); + + HRESULT DoWork(); + + HRESULT CreateSoundBank( + [in] const BYTE* pvBuffer, /* FIXME: void* */ + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + [out] IXACT3SoundBank **ppSoundBank); + + HRESULT CreateInMemoryWaveBank( + [in] const BYTE* pvBuffer, /* FIXME: void* */ + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + [out] IXACT3WaveBank **ppWaveBank); + + HRESULT CreateStreamingWaveBank( + [in] const XACT_STREAMING_PARAMETERS *pParms, + [out] IXACT3WaveBank **ppWaveBank); + + HRESULT PrepareWave( + DWORD dwFlags, + [in] LPCSTR szWavePath, + WORD wStreamingPacketSize, + DWORD dwAlignment, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT PrepareInMemoryWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + [in] DWORD *pdwSeekTable, + [in] BYTE *pbWaveData, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT PrepareStreamingWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + XACT_STREAMING_PARAMETERS streamingParams, + DWORD dwAlignment, + [in] DWORD *pdwSeekTable, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT RegisterNotification( + [in] const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + HRESULT UnRegisterNotification( + [in] const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + XACTCATEGORY GetCategory( + [in] LPCSTR szFriendlyName); + + HRESULT Stop(XACTCATEGORY nCategory, DWORD dwFlags); + + HRESULT SetVolume(XACTCATEGORY nCategory, XACTVOLUME nVolume); + + HRESULT Pause(XACTCATEGORY nCategory, BOOL fPause); + + XACTVARIABLEINDEX GetGlobalVariableIndex([in] LPCSTR szFriendlyName); + + HRESULT SetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE nValue); + + HRESULT GetGlobalVariable( + XACTVARIABLEINDEX nIndex, + [out] XACTVARIABLEVALUE *nValue); +} + +[ + object, + local +] +interface IXACT3SoundBank +{ + XACTINDEX GetCueIndex([in] LPCSTR szFriendlyName); + + HRESULT GetNumCues([out] XACTINDEX *pnNumCues); + + HRESULT GetCueProperties( + XACTINDEX nCueIndex, + [out] XACT_CUE_PROPERTIES *pProperties); + + HRESULT Prepare( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + [out] IXACT3Cue **ppCue); + + HRESULT Play( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + [out] IXACT3Cue **ppCue); + + HRESULT Stop(XACTINDEX nCueIndex, DWORD dwFlags); + + HRESULT Destroy(); + + HRESULT GetState([out] DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT3WaveBank +{ + HRESULT Destroy(); + + HRESULT GetNumWaves([out] XACTINDEX *pnNumWaves); + + XACTINDEX GetWaveIndex([in] LPCSTR szFriendlyName); + + HRESULT GetWaveProperties( + XACTINDEX nWaveIndex, + [out] XACT_WAVE_PROPERTIES *pWaveProperties); + + HRESULT Prepare( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT Play( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + [out] IXACT3Wave **ppWave); + + HRESULT Stop(XACTINDEX nWaveIndex, DWORD dwFlags); + + HRESULT GetState([out] DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT34Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState([out] DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + [in] float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex([in] LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + [out] XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties([out] XACT_CUE_INSTANCE_PROPERTIES **ppProperties); +} + +[ + object, + local +] +interface IXACT3Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState([out] DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + [in] float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex([in] LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + [out] XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties([out] XACT_CUE_INSTANCE_PROPERTIES **ppProperties); + + HRESULT SetOutputVoices([in] const XAUDIO2_VOICE_SENDS *pSendList); + + HRESULT SetOutputVoiceMatrix( + [in] IXAudio2Voice *pDestinationVoice, + UINT32 SourceChannels, + UINT32 DestinationChannels, + [in, size_is(SourceChannels * DestinationChannels)] const float *pLevelMatrix); +} + +[ + object, + local +] +interface IXACT3Wave +{ + HRESULT Destroy(); + + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT Pause(BOOL fPause); + + HRESULT GetState([out] DWORD *pdwState); + + HRESULT SetPitch(XACTPITCH pitch); + + HRESULT SetVolume(XACTVOLUME volume); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + [in] float *pMatrixCoefficients); + + HRESULT GetProperties([out] XACT_WAVE_INSTANCE_PROPERTIES *pProperties); +} -- 2.17.1

2 1

[PATCH v2 1/2] include: Add xact3wb.h
by Alistair Leslie-Hughes 23 Jan '20

23 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3wb.h | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 include/xact3wb.h diff --git a/include/Makefile.in b/include/Makefile.in index 8a05f5d01c..5dac4e66d5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -771,6 +771,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3wb.h \ xapo.idl \ xapofx.h \ xaudio2.idl \ diff --git a/include/xact3wb.h b/include/xact3wb.h new file mode 100644 index 0000000000..b7dd818329 --- /dev/null +++ b/include/xact3wb.h @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2020 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 + */ +#ifndef __XACT3WB_H__ +#define __XACT3WB_H__ + +typedef union WAVEBANKMINIWAVEFORMAT +{ + struct + { + DWORD wFormatTag : 2; + DWORD nChannels : 3; + DWORD nSamplesPerSec : 18; + DWORD wBlockAlign : 8; + DWORD wBitsPerSample : 1; + } NONAMELESSUNION; + + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKENTRY +{ + union + { + union + { + DWORD dwFlags : 4; + DWORD Duration : 28; + } NONAMELESSUNION; + DWORD dwFlagsAndDuration; + }; + + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +#endif /* __XACT3WB_H__ */ -- 2.17.1

2 1

[PATCH 1/2] crypt32/test: additional test for skipping unknown CAs
by Ilia Mirkin 23 Jan '20

23 Jan '20

This is already tested by setting a flag in the ssl policy parameters, but apparently the flag in base policy parameters also needs to be respected. Tested on Win7. Signed-off-by: Ilia Mirkin <imirkin(a)alum.mit.edu> --- dlls/crypt32/tests/chain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e2a7633526..1bf78b084d 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4743,6 +4743,11 @@ static void check_ssl_policy(void) CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); sslPolicyPara.fdwChecks = 0; + /* And again, but specifying the ignore in dwFlags */ + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, + ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); + policyPara.dwFlags = 0; /* And again, but checking the Google chain at a bad date */ sslPolicyPara.pwszServerName = google_dot_com; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, -- 2.24.1

3 3

[PATCH] user32/msgbox: Implement copying contents to clipboard
by Vadim Zeitlin 23 Jan '20

23 Jan '20

Standard message box dialog provides a useful feature: pressing Ctrl-C or Ctrl-Insert in it copies its contents to the clipboard, which is very convenient when reporting problems in the programs using message boxes for error reporting, for example. Implement support for this, by adding WM_COPY handler to the message box dialog proc, which does the actual copying, and modifying the general dialog box proc to generate WM_COPY when keys above are pressed in a message box dialog. This required adding a new DF_MSGBOX flag, which allows to distinguish message boxes from the other dialogs, which is a bit ugly, but seems to be the best/only way to support this feature. Signed-off-by: Vadim Zeitlin <vz-wine(a)zeitlins.org> --- dlls/user32/controls.h | 5 +- dlls/user32/dialog.c | 18 +++- dlls/user32/msgbox.c | 196 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+), 3 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 0b0f1c2801..09ac4d98dd 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -234,10 +234,11 @@ extern UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth, UINT xBaseUnit; /* Dialog units (depends on the font) */ UINT yBaseUnit; INT idResult; /* EndDialog() result / default pushbutton ID */ - UINT flags; /* EndDialog() called for this dialog */ + UINT flags; /* Combination of DF_XXX values below */ } DIALOGINFO; -#define DF_END 0x0001 +#define DF_END 0x0001 /* EndDialog() called for this dialog */ +#define DF_MSGBOX 0x0002 /* Dialog is a message box */ extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; extern INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 88c2930c06..552fae2fbe 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -810,7 +810,23 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) break; } if (!IsWindow( hwnd )) return 0; - if (!(dlgInfo->flags & DF_END) && !IsDialogMessageW( hwnd, &msg)) + if (dlgInfo->flags & DF_END) break; + + /* Special hack for message boxes: allow them to copy their + * contents to clipboard when Ctrl-C or Ctrl-Ins is pressed. */ + if (dlgInfo->flags & DF_MSGBOX) + { + if ((msg.message == WM_CHAR && + LOBYTE(msg.wParam) == 3) || + (msg.message == WM_KEYDOWN && + LOBYTE(msg.wParam) == VK_INSERT && + GetKeyState(VK_CONTROL) < 0)) + { + SendMessageW(hwnd, WM_COPY, 0, 0); + } + } + + if (!IsDialogMessageW( hwnd, &msg)) { TranslateMessage( &msg ); DispatchMessageW( &msg ); diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 457c3ae7d1..5124a4835b 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -27,6 +27,7 @@ #include "wingdi.h" #include "winternl.h" #include "dlgs.h" +#include "controls.h" #include "user_private.h" #include "resources.h" #include "wine/debug.h" @@ -317,6 +318,191 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) } +/************************************************************************** + * MSGBOX_CopyToClipboard + * + * Called from MSGBOX_CopyToClipboard() to either build the text string + * representing the message box contents, in the following format: + * + * --------------------------- + * Caption + * --------------------------- + * Text line 1 + * ... + * Text line N + * --------------------------- + * Button_1 ... Button_N + * --------------------------- + * + * or to calculate the size of the buffer needed by this string, if the input + * buffer is null. + * + * Returns the length (not size) of the string that was, or would be, built. + */ +static int MSGBOX_BuildText( HWND hwnd, WCHAR* buffer ) +{ + HWND hItem; + int i; + WCHAR windowText[4096]; + const int windowTextLen = sizeof(windowText) / sizeof(WCHAR); + int len, total_len = 0; + + static const WCHAR separatorLine[] = {'-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','\r','\n',0}; + static int separatorLen = sizeof(separatorLine) / sizeof(WCHAR) - 1; + + static const WCHAR buttonSeparator[] = {' ',' ',' ',0}; + static int buttonSeparatorLen = sizeof(buttonSeparator) / sizeof(WCHAR) - 1; + + static const WCHAR eol[] = {'\r','\n',0}; + static int eolLen = sizeof(eol) / sizeof(WCHAR) - 1; + + /* Top separator line */ + if (buffer) + { + strcpyW(buffer, separatorLine); + buffer += separatorLen; + } + total_len += separatorLen; + + /* Message box caption */ + if (buffer) + { + GetWindowTextW(hwnd, windowText, windowTextLen); + len = strlenW(windowText); + + strcpyW(buffer, windowText); + buffer += len; + + strcpyW(buffer, eol); + buffer += eolLen; + } + else + { + len = GetWindowTextLengthW(hwnd); + } + total_len += len + eolLen; + + /* Second separator line */ + if (buffer) + { + strcpyW(buffer, separatorLine); + buffer += separatorLen; + } + total_len += separatorLen; + + /* Message box text */ + hItem = GetDlgItem(hwnd, MSGBOX_IDTEXT); + if (buffer) + { + GetWindowTextW(hItem, windowText, windowTextLen); + len = strlenW(windowText); + + strcpyW(buffer, windowText); + buffer += len; + + strcpyW(buffer, eol); + buffer += eolLen; + } + else + { + len = GetWindowTextLengthW(hItem); + } + total_len += len + eolLen; + + /* Third separator line */ + if (buffer) + { + strcpyW(buffer, separatorLine); + buffer += separatorLen; + } + total_len += separatorLen; + + /* Buttons line */ + for (i = IDOK; i <= IDCONTINUE; i++) + { + if (i == IDCLOSE) continue; /* No CLOSE button */ + hItem = GetDlgItem(hwnd, i); + if (!(GetWindowLongW(hItem, GWL_STYLE) & WS_VISIBLE)) continue; + + /* Add button text followed by a separator. Notice that we include the + * separator after the last button too, both because it's simpler and + * because this is how the native message box does it. + */ + if (buffer) + { + WCHAR* text = windowText; + + GetWindowTextW(hItem, windowText, windowTextLen); + len = strlenW(windowText); + + /* Don't include mnemonics in the output: all message box buttons + * that use mnemonics at all use them for their first character. + */ + if (windowText[0] == '&') + { + text++; + len--; + } + + strcpyW(buffer, text); + buffer += len; + + strcpyW(buffer, buttonSeparator); + buffer += buttonSeparatorLen; + } + else + { + len = GetWindowTextLengthW(hItem); + } + total_len += len + buttonSeparatorLen; + } + + if (buffer) + { + strcpyW(buffer, eol); + buffer += eolLen; + } + total_len += eolLen; + + /* Bottom separator line */ + if (buffer) + { + strcpyW(buffer, separatorLine); + buffer += separatorLen; + } + total_len += separatorLen; + + return total_len; +} + +/************************************************************************** + * MSGBOX_CopyToClipboard + * + * Called from MSGBOX_DlgProc() and puts message box contents to the clipboard + * in the following format: + * + */ +static void MSGBOX_CopyToClipboard( HWND hwnd ) +{ + HGLOBAL hmem; + WCHAR* buffer; + const int bufferLen = MSGBOX_BuildText(hwnd, NULL); + + hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (bufferLen + 1) * sizeof(WCHAR)); + if (!hmem) return; + buffer = GlobalLock(hmem); + MSGBOX_BuildText(hwnd, buffer); + TRACE_(msgbox)("Copying %s to clipboard\n", debugstr_w(buffer)); + GlobalUnlock(buffer); + + if (OpenClipboard(hwnd)) + { + EmptyClipboard(); + SetClipboardData(CF_UNICODETEXT, hmem); + CloseClipboard(); + } +} + /************************************************************************** * MSGBOX_DlgProc * @@ -328,10 +514,15 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message, switch(message) { case WM_INITDIALOG: { + DIALOGINFO *dlgInfo; LPMSGBOXPARAMSW mbp = (LPMSGBOXPARAMSW)lParam; SetWindowContextHelpId(hwnd, mbp->dwContextHelpId); MSGBOX_OnInit(hwnd, mbp); SetPropA(hwnd, "WINE_MSGBOX_HELPCALLBACK", mbp->lpfnMsgBoxCallback); + + dlgInfo = DIALOG_get_info(hwnd, FALSE); + if (dlgInfo) + dlgInfo->flags |= DF_MSGBOX; break; } @@ -370,6 +561,11 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message, break; } + case WM_COPY: + /* See code sending this message in dialog.c */ + MSGBOX_CopyToClipboard(hwnd); + break; + default: /* Ok. Ignore all the other messages */ TRACE("Message number 0x%04x is being ignored.\n", message); -- 2.24.0.155.gd9f6f3b619

5 6

[PATCH 3/3] jscript: Store source location in statement_t.
by Jacek Caban 23 Jan '20

23 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 142 +++++++++++++++++++++--------------------- 2 files changed, 73 insertions(+), 70 deletions(-)

1 0

[PATCH 2/3] jscript: Always set parser error code on error.
by Jacek Caban 23 Jan '20

23 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/lex.c | 8 ++++---- dlls/jscript/parser.y | 24 +++++++++--------------- 2 files changed, 13 insertions(+), 19 deletions(-)

1 0

[PATCH 1/3] jscript: Use parser location to calculate function body string.
by Jacek Caban 23 Jan '20

23 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 10 +++++++++- dlls/jscript/lex.c | 16 ++++++++-------- dlls/jscript/parser.h | 2 +- dlls/jscript/parser.y | 30 +++++++++++++----------------- 4 files changed, 31 insertions(+), 27 deletions(-)

1 0

[PATCH 1/5] dwrite: Add a helper specifically for TryGetFontTable().
by Nikolay Sivov 23 Jan '20

23 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/opentype.c | 95 ++++++++++++++++++++++-------------- 3 files changed, 61 insertions(+), 39 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cc5c028fd2..875f12916b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -310,7 +310,8 @@ extern const void* get_fontface_table(IDWriteFontFace5 *fontface, UINT32 tag, struct dwrite_fonttable *table) DECLSPEC_HIDDEN; extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,BOOL*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,UINT32*) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_table(struct file_stream_desc*,UINT32,const void**,void**,UINT32*,BOOL*) DECLSPEC_HIDDEN; +extern HRESULT opentype_try_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag, const void **data, + void **context, UINT32 *size, BOOL *exists) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_fonttable *table, unsigned int max_count, DWRITE_UNICODE_RANGE *ranges, unsigned int *count) DECLSPEC_HIDDEN; extern void opentype_get_font_properties(struct file_stream_desc*,struct dwrite_font_props*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9280b5d32a..25b09feb07 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -707,7 +707,7 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace5 *iface, UI stream_desc.stream = fontface->stream; stream_desc.face_type = fontface->type; stream_desc.face_index = fontface->index; - return opentype_get_font_table(&stream_desc, table_tag, table_data, context, table_size, exists); + return opentype_try_get_font_table(&stream_desc, table_tag, table_data, context, table_size, exists); } static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace5 *iface, void *table_context) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 09a9a861c3..c5f1d16fac 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1366,7 +1366,7 @@ HRESULT opentype_analyze_font(IDWriteFontFileStream *stream, BOOL *supported, DW return S_OK; } -HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag, const void **table_data, +HRESULT opentype_try_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag, const void **table_data, void **table_context, UINT32 *table_size, BOOL *found) { void *table_directory_context, *sfnt_context; @@ -1434,6 +1434,12 @@ HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag return hr; } +static HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag, + struct dwrite_fonttable *table) +{ + return opentype_try_get_font_table(stream_desc, tag, (const void **)&table->data, &table->context, &table->size, &table->exists); +} + /********** * CMAP **********/ @@ -1555,15 +1561,15 @@ HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_fonttable *cmap, un void opentype_get_font_typo_metrics(struct file_stream_desc *stream_desc, unsigned int *ascent, unsigned int *descent) { + struct dwrite_fonttable os2; const TT_OS2_V2 *data; - unsigned int size; - void *context; - opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void **)&data, &context, &size, NULL); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + data = (const TT_OS2_V2 *)os2.data; *ascent = *descent = 0; - if (size >= FIELD_OFFSET(TT_OS2_V2, sTypoLineGap)) + if (os2.size >= FIELD_OFFSET(TT_OS2_V2, sTypoLineGap)) { SHORT value = GET_BE_WORD(data->sTypoDescender); *ascent = GET_BE_WORD(data->sTypoAscender); @@ -1571,12 +1577,12 @@ void opentype_get_font_typo_metrics(struct file_stream_desc *stream_desc, unsign } if (data) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, context); + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); } void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT_METRICS1 *metrics, DWRITE_CARET_METRICS *caret) { - void *os2_context, *head_context, *post_context, *hhea_context; + struct dwrite_fonttable os2, head, post, hhea; const TT_OS2_V2 *tt_os2; const TT_HEAD *tt_head; const TT_POST *tt_post; @@ -1584,10 +1590,15 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT memset(metrics, 0, sizeof(*metrics)); - opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_HEAD_TAG, (const void**)&tt_head, &head_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_POST_TAG, (const void**)&tt_post, &post_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_HHEA_TAG, (const void**)&tt_hhea, &hhea_context, NULL, NULL); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + opentype_get_font_table(stream_desc, MS_HEAD_TAG, &head); + opentype_get_font_table(stream_desc, MS_POST_TAG, &post); + opentype_get_font_table(stream_desc, MS_HHEA_TAG, &hhea); + + tt_head = (const TT_HEAD *)head.data; + tt_os2 = (const TT_OS2_V2 *)os2.data; + tt_post = (const TT_POST *)post.data; + tt_hhea = (const TT_HHEA *)hhea.data; if (tt_head) { metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); @@ -1597,7 +1608,8 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT metrics->glyphBoxBottom = GET_BE_WORD(tt_head->yMin); } - if (caret) { + if (caret) + { if (tt_hhea) { caret->slopeRise = GET_BE_WORD(tt_hhea->caretSlopeRise); caret->slopeRun = GET_BE_WORD(tt_hhea->caretSlopeRun); @@ -1679,23 +1691,26 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT metrics->capHeight = metrics->designUnitsPerEm * 7 / 10; if (tt_os2) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); if (tt_head) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head_context); + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head.context); if (tt_post) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, post_context); + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, post.context); if (tt_hhea) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, hhea_context); + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, hhea.context); } void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct dwrite_font_props *props) { - void *os2_context, *head_context; + struct dwrite_fonttable os2, head; const TT_OS2_V2 *tt_os2; const TT_HEAD *tt_head; - opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_HEAD_TAG, (const void**)&tt_head, &head_context, NULL, NULL); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + opentype_get_font_table(stream_desc, MS_HEAD_TAG, &head); + + tt_os2 = (const TT_OS2_V2 *)os2.data; + tt_head = (const TT_HEAD *)head.data; /* default stretch, weight and style to normal */ props->stretch = DWRITE_FONT_STRETCH_NORMAL; @@ -1767,10 +1782,10 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style); - if (tt_os2) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); - if (tt_head) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head_context); + if (os2.data) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); + if (head.data) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head.context); } static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT encoding) @@ -2026,13 +2041,16 @@ HRESULT opentype_get_font_info_strings(const void *table_data, DWRITE_INFORMATIO have 'Preferred Family Name' in WWS format, then WWS name is not used. */ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWriteLocalizedStrings **names) { + struct dwrite_fonttable os2, name; const TT_OS2_V2 *tt_os2; - void *os2_context, *name_context; const void *name_table; HRESULT hr; - opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + opentype_get_font_table(stream_desc, MS_NAME_TAG, &name); + + tt_os2 = (const TT_OS2_V2 *)os2.data; + name_table = (const void *)name.data; *names = NULL; @@ -2047,10 +2065,10 @@ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWri if (FAILED(hr)) hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_FAMILY_NAME, names); - if (tt_os2) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); - if (name_context) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name_context); + if (os2.context) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); + if (name.context) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name.context); return hr; } @@ -2059,14 +2077,17 @@ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWri have 'Preferred Face Name' in WWS format, then WWS name is not used. */ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR *lfname, IDWriteLocalizedStrings **names) { + struct dwrite_fonttable os2, name; IDWriteLocalizedStrings *lfnames; - void *os2_context, *name_context; const TT_OS2_V2 *tt_os2; const void *name_table; HRESULT hr; - opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); - opentype_get_font_table(stream_desc, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); + opentype_get_font_table(stream_desc, MS_NAME_TAG, &name); + + tt_os2 = (const TT_OS2_V2 *)os2.data; + name_table = name.data; *names = NULL; @@ -2113,10 +2134,10 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * IDWriteLocalizedStrings_Release(lfnames); } - if (tt_os2) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); - if (name_context) - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name_context); + if (os2.context) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); + if (name.context) + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name.context); return hr; } -- 2.24.1

2 6

[PATCH 1/2] testbot/LogUtils: Rename the $Summary variables to $LogInfo.
by Francois Gouget 23 Jan '20

23 Jan '20

ParseTaskLog() will eventually return the same information as GetLogErrors() so name the resulting structures to match. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 10 +++++----- testbot/bin/WineRunReconfig.pl | 16 ++++++++-------- testbot/bin/WineRunWineTest.pl | 12 ++++++------ testbot/lib/WineTestBot/LogUtils.pm | 16 ++++++++-------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ce8f40f05e..cf6428ae4a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -419,23 +419,23 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my $Summary = ParseTaskLog("$TaskDir/log"); - if ($Summary->{Task} eq "ok") + my $LogInfo = ParseTaskLog("$TaskDir/log"); + if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. # So forget any prior error. $NewStatus = "completed"; $TAError = $ErrMessage = undef; } - elsif ($Summary->{Task} eq "badpatch") + elsif ($LogInfo->{Task} eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; $TAError = $ErrMessage = undef; } - elsif ($Summary->{NoLog}) + elsif ($LogInfo->{NoLog}) { - FatalError("$Summary->{NoLog}\n", "retry"); + FatalError("$LogInfo->{NoLog}\n", "retry"); } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9b0b479ee2..c16c40a5af 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -416,21 +416,21 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) } } -my $Summary; +my $LogInfo; Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - $Summary = ParseTaskLog("$TaskDir/log"); - if ($Summary->{Task} eq "ok") + $LogInfo = ParseTaskLog("$TaskDir/log"); + if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. # So forget any prior error. $NewStatus = "completed"; $TAError = $ErrMessage = undef; } - elsif ($Summary->{NoLog}) + elsif ($LogInfo->{NoLog}) { - FatalError("$Summary->{NoLog}\n", "retry"); + FatalError("$LogInfo->{NoLog}\n", "retry"); } else { @@ -438,7 +438,7 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) # probably already have an error message that explains why. NotifyAdministrator("The ". $VM->Name ." build failed", "The ". $VM->Name ." build failed:\n\n". - "$Summary->{Task}\n\n". + "$LogInfo->{Task}\n\n". "See the link below for more details:\n". MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; @@ -469,7 +469,7 @@ if ($NewStatus eq "completed") "latest/wine-parentsrc.txt") { my $BaseName = basename($FileName); - if ($FileName !~ m~^latest/~ and !$Summary->{$BaseName} and + if ($FileName !~ m~^latest/~ and !$LogInfo->{$BaseName} and -f "$DataDir/latest/$BaseName") { # This file was not updated so there is no point in redownloading it. @@ -486,7 +486,7 @@ if ($NewStatus eq "completed") } } - if ($Summary->{"testagentd"}) + if ($LogInfo->{"testagentd"}) { # Restart the TestAgent server from the new binary # Note that the privileged TestAgent server is usually run with diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 245128a73a..fecbab0098 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -527,8 +527,8 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my $Summary = ParseTaskLog("$TaskDir/log"); - if ($Summary->{Task} eq "ok") + my $LogInfo = ParseTaskLog("$TaskDir/log"); + if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the task completed successfully # (with or without test failures). So clear any previous errors, including @@ -536,17 +536,17 @@ if ($TA->GetFile("Task.log", "$TaskDir/log")) $NewStatus = "completed"; $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } - elsif ($Summary->{Task} eq "badpatch") + elsif ($LogInfo->{Task} eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } - elsif ($Summary->{NoLog}) + elsif ($LogInfo->{NoLog}) { - FatalError("$Summary->{NoLog}\n", "retry"); + FatalError("$LogInfo->{NoLog}\n", "retry"); } - elsif ($Summary->{Type} eq "build") + elsif ($LogInfo->{Type} eq "build") { # The error happened before the tests started so blame the build. $NewStatus = "badbuild"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c83b63d25d..af17c110d9 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -94,35 +94,35 @@ sub ParseTaskLog($) if (open(my $LogFile, "<", $FileName)) { - my $Summary = {Type => "build"}; + my $LogInfo = {Type => "build"}; foreach my $Line (<$LogFile>) { chomp $Line; if ($Line eq "Task: tests") { - $Summary->{Type} = "tests"; + $LogInfo->{Type} = "tests"; } elsif ($Line eq "Task: ok") { - $Summary->{Task} ||= "ok"; + $LogInfo->{Task} ||= "ok"; } elsif ($Line eq "Task: Patch failed to apply") { - $Summary->{Task} = "badpatch"; + $LogInfo->{Task} = "badpatch"; last; # Should be the last and most specific message } elsif ($Line =~ /^Task: Updated ([a-zA-Z0-9.]+)$/) { - $Summary->{$1} = "updated"; + $LogInfo->{$1} = "updated"; } elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { - $Summary->{Task} = "failed"; + $LogInfo->{Task} = "failed"; } } close($LogFile); - $Summary->{Task} ||= "missing"; - return $Summary; + $LogInfo->{Task} ||= "missing"; + return $LogInfo; } return {NoLog => "Unable to open the task log for reading: $!"}; } -- 2.20.1

1 1

[PATCH] testbot: Rename the staging files for the mailing list patches.
by Francois Gouget 23 Jan '20

23 Jan '20

There is no need to use the mailing list name for those files. Also make it clear that these files contain the email, not just the patch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 4 ++-- testbot/bin/Janitor.pl | 2 +- testbot/bin/WinePatchesMLSubmit.pl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ca352335bd..a8fc2f0de9 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -420,13 +420,13 @@ sub HandleWinePatchMLSubmission() foreach my $Entry (@Entries) { # Validate file name - next if ($Entry !~ m/^([0-9a-fA-F]{32}_wine-patches)$/); + next if ($Entry !~ m/^([0-9a-fA-F]{32}_email)$/); my $FullMessageFileName = "$DataDir/staging/$1"; # Create a work directory my $WorkDir = CreateNewDir("$DataDir/staging", "_work"); - # Process the patch + # Process the email my $Parser = new MIME::Parser; $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open($FullMessageFileName); diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 115b7d5eec..bf3989a712 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -276,7 +276,7 @@ if (opendir(my $dh, "$DataDir/staging")) # These files always expire after one day $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/) + elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe)$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n"; diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index bddd42c1a1..4797e986ad 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -45,7 +45,7 @@ use WineTestBot::Engine::Notify; use WineTestBot::Log; # Store the message in the staging dir -my ($fh, $FileName) = OpenNewFile("$DataDir/staging", "_wine-patches"); +my ($fh, $FileName) = OpenNewFile("$DataDir/staging", "_email"); if (!$fh) { LogMsg "Could not create a staging file: $!\n"; -- 2.20.1

1 0