wine-devel October 2019

wine-devel@winehq.org

80 participants
669 discussions

[PATCH] wshom.ocx: Correct out parameter for _NewEnum
by Alistair Leslie-Hughes 16 Oct '19

16 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index d423856ce7..543d951ea0 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -698,7 +698,7 @@ static HRESULT WINAPI WshCollection_get_length(IWshCollection *iface, LONG *coun return E_NOTIMPL; } -static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown *Enum) +static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown **Enum) { WshCollection *This = impl_from_IWshCollection(iface); FIXME("(%p)->(%p): stub\n", This, Enum); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index d936721589..8d4a8f03e1 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -383,7 +383,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); } [ -- 2.17.1

2 1

[PATCH] include: Add SpSharedRecognizer coclass and support interfaces
by Alistair Leslie-Hughes 16 Oct '19

16 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapi.idl | 835 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 835 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index e13843227e..d6f904f29a 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -27,6 +27,73 @@ import "ocidl.idl"; #define vi_progid(str) #endif +cpp_quote("#if 0") +typedef [restricted, hidden] struct WAVEFORMATEX +{ + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; +} WAVEFORMATEX; +cpp_quote("#else") +cpp_quote("#include <mmsystem.h>") +cpp_quote("#endif") + +cpp_quote("#if defined(__cplusplus)") +cpp_quote("interface ISpNotifyCallback") +cpp_quote("{") +cpp_quote("virtual HRESULT STDMETHODCALLTYPE NotifyCallback(WPARAM wParam, LPARAM lParam) = 0;") +cpp_quote("};") +cpp_quote("#else") +typedef void * ISpNotifyCallback; +cpp_quote("#endif") + +cpp_quote("#if 0") +typedef void * SPNOTIFYCALLBACK; +typedef void * SPSTATEHANDLE; +cpp_quote("#endif") + +typedef [restricted, hidden] struct SPEVENT +{ + WORD eEventId; + WORD elParamType; + ULONG ulStreamNum; + ULONGLONG ullAudioStreamOffset; + WPARAM wParam; + LPARAM lParam; +} SPEVENT; + +cpp_quote("typedef void __stdcall SPNOTIFYCALLBACK(WPARAM wParam, LPARAM lParam);") +cpp_quote("DECLARE_HANDLE(SPSTATEHANDLE);") + +const ULONG SP_MAX_LANGIDS = 20; + +typedef [restricted, hidden] struct SPEVENTSOURCEINFO +{ + ULONGLONG ullEventInterest; + ULONGLONG ullQueuedInterest; + ULONG ulCount; +} SPEVENTSOURCEINFO; + +typedef [hidden] enum SPGRAMMARWORDTYPE +{ + SPWT_DISPLAY, + SPWT_LEXICAL, + SPWT_PRONUNCIATION, + SPWT_LEXICAL_NO_SPECIAL_CHARS +} SPGRAMMARWORDTYPE; + +typedef [hidden] struct tagSPPROPERTYINFO +{ + const WCHAR *pszName; + ULONG ulId; + const WCHAR *pszValue; + VARIANT vValue; +} SPPROPERTYINFO; + typedef [hidden] enum SPDATAKEYLOCATION { SPDKL_DefaultLocation = 0, @@ -35,6 +102,387 @@ typedef [hidden] enum SPDATAKEYLOCATION SPDKL_CurrentConfig = 5 } SPDATAKEYLOCATION; +typedef [hidden] enum SPLOADOPTIONS +{ + SPLO_STATIC, + SPLO_DYNAMIC +} SPLOADOPTIONS; + +typedef [hidden] enum SPRULESTATE +{ + SPRS_INACTIVE = 0, + SPRS_ACTIVE = 1, + SPRS_ACTIVE_WITH_AUTO_PAUSE = 3, + SPRS_ACTIVE_USER_DELIMITED = 4 +} SPRULESTATE; + +typedef [hidden] enum SPGRAMMARSTATE +{ + SPGS_DISABLED = 0, + SPGS_ENABLED = 1, + SPGS_EXCLUSIVE = 3 +} SPGRAMMARSTATE; + +typedef [hidden] struct SPBINARYGRAMMAR +{ + ULONG ulTotalSerializedSize; +} SPBINARYGRAMMAR; + +typedef [hidden] struct tagSPTEXTSELECTIONINFO +{ + ULONG ulStartActiveOffset; + ULONG cchActiveChars; + ULONG ulStartSelection; + ULONG cchSelection; +} SPTEXTSELECTIONINFO; + +typedef [hidden] enum SPWORDPRONOUNCEABLE +{ + SPWP_UNKNOWN_WORD_UNPRONOUNCEABLE, + SPWP_UNKNOWN_WORD_PRONOUNCEABLE, + SPWP_KNOWN_WORD_PRONOUNCEABLE +} SPWORDPRONOUNCEABLE; + +typedef [hidden] enum SPINTERFERENCE +{ + SPINTERFERENCE_NONE, + SPINTERFERENCE_NOISE, + SPINTERFERENCE_NOSIGNAL, + SPINTERFERENCE_TOOLOUD, + SPINTERFERENCE_TOOQUIET, + SPINTERFERENCE_TOOFAST, + SPINTERFERENCE_TOOSLOW +} SPINTERFERENCE; + +typedef [hidden] enum SPVISEMES +{ + SP_VISEME_0 = 0, + SP_VISEME_1, + SP_VISEME_2, + SP_VISEME_3, + SP_VISEME_4, + SP_VISEME_5, + SP_VISEME_6, + SP_VISEME_7, + SP_VISEME_8, + SP_VISEME_9, + SP_VISEME_10, + SP_VISEME_11, + SP_VISEME_12, + SP_VISEME_13, + SP_VISEME_14, + SP_VISEME_15, + SP_VISEME_16, + SP_VISEME_17, + SP_VISEME_18, + SP_VISEME_19, + SP_VISEME_20, + SP_VISEME_21, +} SPVISEMES; + +typedef [hidden] enum SPEVENTENUM +{ + SPEI_UNDEFINED = 0, + SPEI_START_INPUT_STREAM = 1, + SPEI_END_INPUT_STREAM = 2, + SPEI_VOICE_CHANGE = 3, + SPEI_TTS_BOOKMARK = 4, + SPEI_WORD_BOUNDARY = 5, + SPEI_PHONEME = 6, + SPEI_SENTENCE_BOUNDARY = 7, + SPEI_VISEME = 8, + SPEI_TTS_AUDIO_LEVEL = 9, + SPEI_TTS_PRIVATE = 15, + + SPEI_MIN_TTS = 1, + SPEI_MAX_TTS = 15, + + SPEI_END_SR_STREAM = 34, + SPEI_SOUND_START = 35, + SPEI_SOUND_END = 36, + SPEI_PHRASE_START = 37, + SPEI_RECOGNITION = 38, + SPEI_HYPOTHESIS = 39, + SPEI_SR_BOOKMARK = 40, + SPEI_PROPERTY_NUM_CHANGE = 41, + SPEI_PROPERTY_STRING_CHANGE = 42, + SPEI_FALSE_RECOGNITION = 43, + SPEI_INTERFERENCE = 44, + SPEI_REQUEST_UI = 45, + SPEI_RECO_STATE_CHANGE = 46, + SPEI_ADAPTATION = 47, + SPEI_START_SR_STREAM = 48, + SPEI_RECO_OTHER_CONTEXT = 49, + SPEI_SR_AUDIO_LEVEL = 50, + SPEI_SR_RETAINEDAUDIO = 51, + SPEI_SR_PRIVATE = 52, + SPEI_ACTIVE_CATEGORY_CHANGED = 53, + + SPEI_MIN_SR = 34, + SPEI_MAX_SR = 55, + + SPEI_RESERVED1 = 30, + SPEI_RESERVED2 = 33, + SPEI_RESERVED3 = 63 +} SPEVENTENUM; + +typedef [hidden] enum SPCONTEXTSTATE +{ + SPCS_DISABLED = 0, + SPCS_ENABLED = 1, +} SPCONTEXTSTATE; + +typedef [hidden] enum SPVPRIORITY +{ + SPVPRI_NORMAL = 0, + SPVPRI_ALERT = 1, + SPVPRI_OVER = 2 +} SPVPRIORITY; + +typedef [hidden] enum SPRECOSTATE +{ + SPRST_INACTIVE, + SPRST_ACTIVE, + SPRST_ACTIVE_ALWAYS, + SPRST_INACTIVE_WITH_PURGE, + SPRST_NUM_STATES +} SPRECOSTATE; + +typedef [hidden] enum SPWAVEFORMATTYPE +{ + SPWF_INPUT, + SPWF_SRENGINE +} SPSTREAMFORMATTYPE; + +typedef [restricted, hidden] struct SPRECOCONTEXTSTATUS +{ + SPINTERFERENCE eInterference; + WCHAR szRequestTypeOfUI[255]; + DWORD dwReserved1; + DWORD dwReserved2; +} SPRECOCONTEXTSTATUS; + +typedef [hidden] enum SPAUDIOOPTIONS +{ + SPAO_NONE, + SPAO_RETAIN_AUDIO +} SPAUDIOOPTIONS; + +typedef [hidden] struct SPSERIALIZEDRESULT +{ + ULONG ulSerializedSize; +} SPSERIALIZEDRESULT; + +typedef [hidden] enum SPDISPLYATTRIBUTES +{ + SPAF_ONE_TRAILING_SPACE = 0x02, + SPAF_TWO_TRAILING_SPACES = 0x04, + SPAF_CONSUME_LEADING_SPACES = 0x08, + SPAF_ALL = 0x0f +} SPDISPLAYATTRIBUTES; + +typedef [hidden] enum SPBOOKMARKOPTIONS +{ + SPBO_NONE, + SPBO_PAUSE +} SPBOOKMARKOPTIONS; + +typedef [hidden] enum _SPAUDIOSTATE +{ + SPAS_CLOSED, + SPAS_STOP, + SPAS_PAUSE, + SPAS_RUN +} SPAUDIOSTATE; + +typedef [hidden] enum SPRUNSTATE +{ + SPRS_DONE = (1L << 0), + SPRS_IS_SPEAKING = (1L << 1) +} SPRUNSTATE; + +typedef [hidden] enum SPEAKFLAGS +{ + SPF_DEFAULT = 0, + SPF_ASYNC = (1L << 0), + SPF_PURGEBEFORESPEAK = (1L << 1), + SPF_IS_FILENAME = (1L << 2), + SPF_IS_XML = (1L << 3), + SPF_IS_NOT_XML = (1L << 4), + SPF_PERSIST_XML = (1L << 5), + SPF_NLP_SPEAK_PUNC = (1L << 6), + SPF_PARSE_SAPI = (1L << 7), + SPF_PARSE_SSML = (1L << 8), + SPF_PARSE_AUTODETECT = 0, + SPF_NLP_MASK = (SPF_NLP_SPEAK_PUNC), + SPF_PARSE_MASK = (SPF_PARSE_SAPI|SPF_PARSE_SSML), + SPF_VOICE_MASK = (SPF_ASYNC|SPF_PURGEBEFORESPEAK|SPF_IS_FILENAME|SPF_IS_XML|SPF_IS_NOT_XML|SPF_NLP_MASK|SPF_PERSIST_XML|SPF_PARSE_MASK), + SPF_UNUSED_FLAGS = ~(SPF_VOICE_MASK) +} SPEAKFLAGS; + +typedef [hidden] enum SPCFGRULEATTRIBUTES +{ + SPRAF_TopLevel = (1 << 0), + SPRAF_Active = (1 << 1), + SPRAF_Export = (1 << 2), + SPRAF_Import = (1 << 3), + SPRAF_Interpreter = (1 << 4), + SPRAF_Dynamic = (1 << 5), + SPRAF_Root = (1 << 6), + SPRAF_AutoPause = (1 << 16), + SPRAF_UserDelimited = (1 << 17) +} SPCFGRULEATTRIBUTES; + +typedef [hidden] enum SPPHRASERNG +{ + SPPR_ALL_ELEMENTS = -1 +} SPPHRASERNG; + +typedef [hidden] enum SPVALUETYPE +{ + SPDF_PROPERTY = 0x00000001, + SPDF_REPLACEMENT = 0x00000002, + SPDF_RULE = 0x00000004, + SPDF_DISPLAYTEXT = 0x00000008, + SPDF_LEXICALFORM = 0x00000010, + SPDF_PRONUNCIATION = 0x00000020, + SPDF_AUDIO = 0x00000040, + SPDF_ALTERNATES = 0x00000080, + SPDF_ALL = 0x000000ff +} SPVALUETYPE; + +typedef unsigned short SPPHONEID; + +typedef [restricted, hidden] struct SPPHRASEELEMENT +{ + ULONG ulAudioTimeOffset; + ULONG ulAudioSizeTime; + ULONG ulAudioStreamOffset; + ULONG ulAudioSizeBytes; + ULONG ulRetainedStreamOffset; + ULONG ulRetainedSizeBytes; + const WCHAR *pszDisplayText; + const WCHAR *pszLexicalForm; + const SPPHONEID *pszPronunciation; + BYTE bDisplayAttributes; + signed char RequiredConfidence; + signed char ActualConfidence; + BYTE Reserved; + float SREngineConfidence; +} SPPHRASEELEMENT; + +typedef [restricted, hidden] struct SPVOICESTATUS +{ + ULONG ulCurrentStream; + ULONG ulLastStreamQueued; + HRESULT hrLastResult; + DWORD dwRunningState; + ULONG ulInputWordPos; + ULONG ulInputWordLen; + ULONG ulInputSentPos; + ULONG ulInputSentLen; + LONG lBookmarkId; + SPPHONEID PhonemeId; + SPVISEMES VisemeId; + DWORD dwReserved1; + DWORD dwReserved2; +} SPVOICESTATUS; + +typedef [restricted, hidden] struct SPAUDIOSTATUS +{ + long cbFreeBuffSpace; + ULONG cbNonBlockingIO; + SPAUDIOSTATE State; + ULONGLONG CurSeekPos; + ULONGLONG CurDevicePos; + DWORD dwAudioLevel; + DWORD dwReserved2; +} SPAUDIOSTATUS; + +typedef [restricted, hidden] struct SPRECOGNIZERSTATUS +{ + SPAUDIOSTATUS AudioStatus; + ULONGLONG ullRecognitionStreamPos; + ULONG ulStreamNumber; + ULONG ulNumActive; + CLSID clsidEngine; + ULONG cLangIDs; + LANGID aLangID[SP_MAX_LANGIDS]; + ULONGLONG ullRecognitionStreamTime; +} SPRECOGNIZERSTATUS; + +typedef [restricted, hidden] struct SPPHRASERULE SPPHRASERULE; + +struct SPPHRASERULE +{ + LPCWSTR pszName; + ULONG ulId; + ULONG ulFirstElement; + ULONG ulCountOfElements; + const SPPHRASERULE* pNextSibling; + const SPPHRASERULE* pFirstChild; + float SREngineConfidence; + signed char Confidence; +}; + +typedef [restricted, hidden] struct SPPHRASEPROPERTY SPPHRASEPROPERTY; + +struct SPPHRASEPROPERTY +{ + const WCHAR *pszName; + ULONG ulId; + const WCHAR *pszValue; + VARIANT vValue; + ULONG ulFirstElement; + ULONG ulCountOfElements; + const SPPHRASEPROPERTY *pNextSibling; + const SPPHRASEPROPERTY *pFirstChild; + float SREngineConfidence; + signed char Confidence; +}; + +typedef [restricted, hidden] struct SPPHRASEREPLACEMENT +{ + BYTE bDisplayAttributes; + const WCHAR *pszReplacementText; + ULONG ulFirstElement; + ULONG ulCountOfElements; +} SPPHRASEREPLACEMENT; + +typedef [restricted, hidden] struct SPPHRASE +{ + ULONG cbSize; + LANGID LangID; + WORD wReserved; + ULONGLONG ullGrammarID; + ULONGLONG ftStartTime; + ULONGLONG ullAudioStreamPosition; + ULONG ulAudioSizeBytes; + ULONG ulRetainedSizeBytes; + ULONG ulAudioSizeTime; + SPPHRASERULE Rule; + const SPPHRASEPROPERTY *pProperties; + const SPPHRASEELEMENT *pElements; + ULONG cReplacements; + const SPPHRASEREPLACEMENT *pReplacements; + GUID SREngineID; + ULONG ulSREnginePrivateDataSize; + const BYTE *pSREnginePrivateData; +} SPPHRASE; + +typedef [restricted, hidden] struct SPSERIALIZEDPHRASE +{ + ULONG ulSerializedSize; +} SPSERIALIZEDPHRASE; + +typedef [restricted, hidden] struct SPRECORESULTTIMES +{ + FILETIME ftStreamTime; + ULONGLONG ullLength; + DWORD dwTickCount; + ULONGLONG ullStart; +} SPRECORESULTTIMES; + cpp_quote("#if defined(__GNUC__)") cpp_quote("#define SPCAT_AUDIOOUT (const WCHAR []){ 'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','A','u','d','i','o','O','u','t','p','u','t',0 }") @@ -56,6 +504,10 @@ cpp_quote("static const WCHAR SPCAT_VOICES[] = {'H','K','E','Y','_','L','O','C', cpp_quote("#endif") interface IEnumSpObjectTokens; +interface ISpEventSource; +interface ISpRecoContext; +interface ISpRecognizer; +interface ISpStreamFormat; [ object, @@ -190,6 +642,380 @@ interface IEnumSpObjectTokens : IUnknown HRESULT GetCount([out] ULONG *pCount); } +[ + object, + uuid(1a5c0354-b621-4b5a-8791-d306ed379e53), + local, + pointer_default(unique), + restricted +] +interface ISpPhrase : IUnknown +{ + HRESULT GetPhrase([out] SPPHRASE **phrase); + HRESULT GetSerializedPhrase([out] SPSERIALIZEDPHRASE **phrase); + HRESULT GetText([in] ULONG start, [in] ULONG count, [in] BOOL replacements, + [out] WCHAR **text, [out] BYTE *attributes); + HRESULT Discard([in] DWORD types); +}; + +[ + object, + uuid(8fcebc98-4e49-4067-9c6c-d86a0e092e3d), + local, + pointer_default(unique), + restricted +] +interface ISpPhraseAlt : ISpPhrase +{ + HRESULT GetAltInfo(ISpPhrase **parent, ULONG *start, ULONG *count, + ULONG *elements); + HRESULT Commit(); +}; + +[ + object, + uuid(20b053be-e235-43cd-9a2a-8d17a48b7842), + pointer_default(unique), + local, + restricted +] +interface ISpRecoResult : ISpPhrase +{ + HRESULT GetResultTimes([out] SPRECORESULTTIMES *times); + + HRESULT GetAlternates( + [in] ULONG start, + [in] ULONG elements, + [in] ULONG count, + [out] ISpPhraseAlt **phrases, + [out] ULONG *returned); + + HRESULT GetAudio( + [in] ULONG start, + [in] ULONG elements, + [out] ISpStreamFormat **stream); + HRESULT SpeakAudio( + [in] ULONG start, + [in] ULONG elements, + [in] DWORD flags, + [out] ULONG *number); + + HRESULT Serialize([out] SPSERIALIZEDRESULT **result); + + HRESULT ScaleAudio([in] const GUID *format, [in] const WAVEFORMATEX *wave); + + HRESULT GetRecoContext([out] ISpRecoContext *context); +}; + +[ + object, + uuid(8137828f-591a-4a42-be58-49ea7ebaac68), + helpstring("ISpGrammarBuilder Interface"), + pointer_default(unique), + restricted, + local +] +interface ISpGrammarBuilder : IUnknown +{ + HRESULT ResetGrammar([in] LANGID language); + + HRESULT GetRule([in] const WCHAR *rule, + [in] DWORD id, + [in] DWORD attributes, + [in] BOOL should_create, + [out] SPSTATEHANDLE *state); + HRESULT ClearRule(SPSTATEHANDLE state); + + HRESULT CreateNewState( + [in] SPSTATEHANDLE instate, + [out] SPSTATEHANDLE *outstate); + + HRESULT AddWordTransition( + [in] SPSTATEHANDLE from_state, + [in] SPSTATEHANDLE to_state, + [in] const WCHAR *value, + [in] const WCHAR *separators, + [in] SPGRAMMARWORDTYPE type, + [in] float weight, + [in] const SPPROPERTYINFO *info); + + HRESULT AddRuleTransition( + [in] SPSTATEHANDLE from_state, + [in] SPSTATEHANDLE to_state, + [in] SPSTATEHANDLE rule, + [in] float weight, + [in] const SPPROPERTYINFO *info); + + HRESULT AddResource([in] SPSTATEHANDLE state, + [in] const WCHAR *name, + [in] const WCHAR *value); + + HRESULT Commit([in] DWORD reserved); +}; + +[ + object, + uuid(2177db29-7f45-47d0-8554-067e91c80502), + pointer_default(unique), + restricted, + local +] +interface ISpRecoGrammar : ISpGrammarBuilder +{ + HRESULT GetGrammarId([out] ULONGLONG *grammar); + HRESULT GetRecoContext([out] ISpRecoContext **context); + + HRESULT LoadCmdFromFile([in, string] const WCHAR * pszFileName, [in] SPLOADOPTIONS options); + HRESULT LoadCmdFromObject([in] REFCLSID rcid, [in, string] const WCHAR * pszGrammarName, [in] SPLOADOPTIONS options); + HRESULT LoadCmdFromResource([in] HMODULE hmod, + [in, string] const WCHAR *name, + [in, string] const WCHAR *type, + [in] WORD language, + [in] SPLOADOPTIONS options); + HRESULT LoadCmdFromMemory([in] const SPBINARYGRAMMAR *grammar, [in] SPLOADOPTIONS options); + HRESULT LoadCmdFromProprietaryGrammar( + [in] REFGUID guid, + [in, string] const WCHAR *param, + [in] const void *data, + [in] ULONG size, + [in] SPLOADOPTIONS options); + HRESULT SetRuleState([in, string] const WCHAR *name, [in] void *reserved, + [in] SPRULESTATE state); + HRESULT SetRuleIdState([in] ULONG rule, [in] SPRULESTATE state); + + HRESULT LoadDictation([in, string] const WCHAR *name, [in] SPLOADOPTIONS options); + HRESULT UnloadDictation(); + HRESULT SetDictationState([in] SPRULESTATE state); + + HRESULT SetWordSequenceData([in] const WCHAR *text, [in] ULONG count, [in] const SPTEXTSELECTIONINFO *info); + HRESULT SetTextSelection([in] const SPTEXTSELECTIONINFO *info); + + HRESULT IsPronounceable([in, string] const WCHAR *word, [out] SPWORDPRONOUNCEABLE *pronounceable); + + HRESULT SetGrammarState([in] SPGRAMMARSTATE state); + + HRESULT SaveCmd([in] IStream *stream, [out, optional] WCHAR **error); + + HRESULT GetGrammarState([out] SPGRAMMARSTATE *state); +}; + +[ + object, + uuid(259684dc-37c3-11d2-9603-00c04f8ee628), + pointer_default(unique), + restricted +] +interface ISpNotifySink : IUnknown +{ + HRESULT Notify(void); +} + +[ + object, + uuid(6c44df74-72b9-4992-a1ec-ef996e0422d4), + pointer_default(unique), + restricted +] +interface ISpVoice : ISpEventSource +{ + HRESULT SetOutput([in] IUnknown *unk, [in] BOOL changes); + HRESULT GetOutputObjectToken([out] ISpObjectToken **token); + HRESULT GetOutputStream([out] ISpStreamFormat **stream); + + HRESULT Pause(void); + HRESULT Resume(void); + + HRESULT SetVoice([in] ISpObjectToken *token); + HRESULT GetVoice([out] ISpObjectToken **token); + + HRESULT Speak([in, string] const WCHAR *pwcs, + [in] DWORD flags, + [out] ULONG *number); + HRESULT SpeakStream([in] IStream *stream, + [in] DWORD flags, + [out] ULONG *number); + + HRESULT GetStatus( + [out] SPVOICESTATUS *status, + [out, string] WCHAR **bookmark); + + HRESULT Skip([in,string] WCHAR* type, [in] long items, [out] ULONG *skipped); + + HRESULT SetPriority([in] SPVPRIORITY priority); + HRESULT GetPriority([out] SPVPRIORITY* priority); + + HRESULT SetAlertBoundary([in] SPEVENTENUM boundary); + HRESULT GetAlertBoundary([out] SPEVENTENUM* boundary); + + HRESULT SetRate([in] long adjust); + HRESULT GetRate([out] long *adjust); + + HRESULT SetVolume([in] USHORT volume); + HRESULT GetVolume([out] USHORT *volume); + + HRESULT WaitUntilDone([in] ULONG timeout); + + HRESULT SetSyncSpeakTimeout([in] ULONG timeout); + HRESULT GetSyncSpeakTimeout([out] ULONG *timeout); + + [local] HANDLE SpeakCompleteEvent(); + + [local] HRESULT IsUISupported( + [in] const WCHAR *type, + [in] void * extra, + [in] ULONG count, + [out] BOOL *supported); + [local] HRESULT DisplayUI( + [in] HWND parent, + [in] const WCHAR *title, + [in] const WCHAR *type, + [in] void *extra, + [in] ULONG count); +}; + +[ + object, + uuid(5eff4aef-8487-11d2-961c-00c04f8ee628), + pointer_default(unique), + restricted +] +interface ISpNotifySource : IUnknown +{ + HRESULT SetNotifySink([in] ISpNotifySink *sink); + [local] HRESULT SetNotifyWindowMessage( + [in] HWND hwnd, + [in] UINT msg, + [in] WPARAM wparam, + [in] LPARAM lparam); + [local] HRESULT SetNotifyCallbackFunction( + [in] SPNOTIFYCALLBACK *callback, + [in] WPARAM wparam, + [in] LPARAM lparam); + [local] HRESULT SetNotifyCallbackInterface( + [in] ISpNotifyCallback *callback, + [in] WPARAM wparam, + [in] LPARAM lparam); + [local] HRESULT SetNotifyWin32Event(void); + [local] HRESULT WaitForNotifyEvent([in] DWORD milliseconds); + [local] HANDLE GetNotifyEventHandle(); +} + +[ + object, + uuid(be7a9cce-5f9e-11d2-960f-00c04f8ee628), + pointer_default(unique), + local, + restricted +] +interface ISpEventSource : ISpNotifySource +{ + HRESULT SetInterest([in] ULONGLONG event, [in] ULONGLONG queued); + HRESULT GetEvents([in] ULONG count, + [out, size_is(count)] SPEVENT *array, + [out] ULONG *fetched); + HRESULT GetInfo([out] SPEVENTSOURCEINFO *info); +}; + +[ + object, + uuid(f740a62f-7c15-489e-8234-940a33d9272d), + pointer_default(unique), + local, + restricted +] +interface ISpRecoContext : ISpEventSource +{ + HRESULT GetRecognizer([out] ISpRecognizer **recognizer); + + HRESULT CreateGrammar([in] ULONGLONG grammar, [out] ISpRecoGrammar **spgrammar); + + HRESULT GetStatus([out] SPRECOCONTEXTSTATUS *status); + + HRESULT GetMaxAlternates([in] ULONG *alternates); + HRESULT SetMaxAlternates([in] ULONG alternates); + + HRESULT SetAudioOptions([in] SPAUDIOOPTIONS options, [in] const GUID *format, [in] const WAVEFORMATEX *wave); + HRESULT GetAudioOptions([in] SPAUDIOOPTIONS *options, [out] GUID *format, [out] WAVEFORMATEX **wave); + + HRESULT DeserializeResult([in] const SPSERIALIZEDRESULT *serialized, [out] ISpRecoResult **result); + + HRESULT Bookmark([in] SPBOOKMARKOPTIONS options, [in] ULONGLONG position, [in] LPARAM event); + + HRESULT SetAdaptationData([in, string] const WCHAR *data, [in] const ULONG count); + + HRESULT Pause(DWORD reserved); + HRESULT Resume(DWORD reserved); + + HRESULT SetVoice([in] ISpVoice *voice, [in] BOOL changes); + HRESULT GetVoice([out] ISpVoice **voice); + HRESULT SetVoicePurgeEvent([in] ULONGLONG interest); + HRESULT GetVoicePurgeEvent([out] ULONGLONG *interest); + + HRESULT SetContextState([in] SPCONTEXTSTATE state); + HRESULT GetContextState([in] SPCONTEXTSTATE *state); +}; + +[ + object, + uuid(bed530be-2606-4f4d-a1c0-54c5cda5566f), + pointer_default(unique), + restricted +] +interface ISpStreamFormat : IStream +{ + HRESULT GetFormat(GUID *format, WAVEFORMATEX **wave); +} + +[ + object, + uuid(5b4fb971-b115-4de1-ad97-e482e3bf6ee4), + pointer_default(unique), + local, + restricted +] +interface ISpProperties : IUnknown +{ + HRESULT SetPropertyNum([in] const WCHAR *name, [in] long value); + HRESULT GetPropertyNum([in] const WCHAR *name, [out] long *value); + HRESULT SetPropertyString([in] const WCHAR *name, [in] const WCHAR *value); + HRESULT GetPropertyString([in] const WCHAR *name, [out] WCHAR **value); +}; + +[ + object, + uuid(c2b5f241-daa0-4507-9e16-5a1eaa2b7a5c), + pointer_default(unique), + restricted +] +interface ISpRecognizer : ISpProperties +{ + HRESULT SetRecognizer([in] ISpObjectToken *recognizer); + HRESULT GetRecognizer([out] ISpObjectToken **recognizer); + + HRESULT SetInput([in] IUnknown *input, [in] BOOL changes); + HRESULT GetInputObjectToken([out] ISpObjectToken **token); + + HRESULT GetInputStream( [out] ISpStreamFormat **stream); + HRESULT CreateRecoContext([out] ISpRecoContext **cxt); + + HRESULT GetRecoProfile([out] ISpObjectToken **token); + HRESULT SetRecoProfile([in] ISpObjectToken *token); + + HRESULT IsSharedInstance(void); + + HRESULT GetRecoState([out] SPRECOSTATE *state); + HRESULT SetRecoState([in] SPRECOSTATE state); + + HRESULT GetStatus([out] SPRECOGNIZERSTATUS *status); + HRESULT GetFormat([in] SPSTREAMFORMATTYPE type, [out] GUID *format, [out] WAVEFORMATEX **wave); + + [local] HRESULT IsUISupported([in] const WCHAR *type, [in] void *extra, [in] ULONG count, + [out] BOOL *supported); + [local] HRESULT DisplayUI([in] HWND hwnd,[in] const WCHAR *title, [in] const WCHAR *type, + [in] void *extra, [in] ULONG cnt); + HRESULT EmulateRecognition([in] ISpPhrase *phrase); +}; + [ helpstring("Speech Object Library"), uuid(c866ca3a-32f7-11d2-9602-00c04f8ee628), @@ -210,4 +1036,13 @@ library SpeechLib { interface ISpObjectTokenCategory; } + + [ + uuid(3bee4890-4fe9-4a37-8c1e-5e7e12791c1f) + ] + coclass SpSharedRecognizer + { + /*[default] interface ISpeechRecognizer;*/ + interface ISpRecognizer; + }; } -- 2.17.1

1 0

[PATCH] winex11: Copy icon color table in 256-color mode (Valgrind)
by Alex Henrie 16 Oct '19

16 Oct '19

create_icon_pixmaps calls GetDIBits and create_pixmap_from_image, which calls get_dib_info_size. GetDIBits sets biClrUsed to 0, which is a special value meaning that the size of the color table is the maximum size possible given the bit depth. Without code to handle that case in get_dib_info_size, the color table is lost. gdi32's version of get_dib_info_size does not have to deal with biClrUsed being zero because bitmapinfo_from_user_bitmapinfo makes a copy of the bitmap info with biClrUsed set to a nonzero value. However, there is no reason to have anything that complicated in winex11. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Supersedes patch 171325 --- dlls/winex11.drv/bitblt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 4eec3288e2..973af40c33 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -924,13 +924,14 @@ static void free_ximage_bits( struct gdi_image_bits *bits ) XFree( bits->ptr ); } -/* only for use on sanitized BITMAPINFO structures */ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) { if (info->bmiHeader.biCompression == BI_BITFIELDS) return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); if (coloruse == DIB_PAL_COLORS) return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); + if (!info->bmiHeader.biClrUsed && info->bmiHeader.biBitCount <= 8) + return FIELD_OFFSET( BITMAPINFO, bmiColors[1 << info->bmiHeader.biBitCount] ); return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); } -- 2.23.0

1 0

[PATCH 1/5] strmbase: Get rid of the unused BaseWindowImpl_GetDefaultRect() function.
by Zebediah Figura 15 Oct '19

15 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/window.c | 6 ------ include/wine/strmbase.h | 1 - 2 files changed, 7 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 7f4dd402484..a7c2201c64e 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -147,12 +147,6 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) return S_OK; } -RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This) -{ - static RECT defRect = {0, 0, 800, 600}; - return defRect; -} - BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam) { BaseControlWindow* pControlWindow = impl_from_BaseWindow(This); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index de5c875105a..518db8de3f3 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -391,7 +391,6 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow); HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This); HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This); -RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This); LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width); -- 2.23.0

1 4

[PATCH] winex11: Initialize biCompression in create_icon_pixmaps (Valgrind)
by Alex Henrie 15 Oct '19

15 Oct '19

create_icon_pixmaps calls GetDIBits, which checks biCompression and returns early if the value is incorrect. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99ae6393bb..407d06fd3e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -546,6 +546,7 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biBitCount = 0; + info->bmiHeader.biCompression = BI_RGB; if (!(lines = GetDIBits( hdc, icon->hbmColor, 0, 0, NULL, info, DIB_RGB_COLORS ))) goto failed; if (!(bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto failed; if (!GetDIBits( hdc, icon->hbmColor, 0, lines, bits.ptr, info, DIB_RGB_COLORS )) goto failed; @@ -557,6 +558,7 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biBitCount = 0; + info->bmiHeader.biCompression = BI_RGB; if (!(lines = GetDIBits( hdc, icon->hbmMask, 0, 0, NULL, info, DIB_RGB_COLORS ))) goto failed; if (!(bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto failed; if (!GetDIBits( hdc, icon->hbmMask, 0, lines, bits.ptr, info, DIB_RGB_COLORS )) goto failed; -- 2.23.0

3 5

[PATCH 1/2] include: Add more wininet error codes.
by Zebediah Figura 15 Oct '19

15 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wininet.h | 6 +++++- include/winineti.h | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/wininet.h b/include/wininet.h index e9126de4ba8..ce5aebdca8c 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1463,6 +1463,8 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_SEC_CERT_ERRORS (INTERNET_ERROR_BASE + 55) #define ERROR_INTERNET_SEC_CERT_NO_REV (INTERNET_ERROR_BASE + 56) #define ERROR_INTERNET_SEC_CERT_REV_FAILED (INTERNET_ERROR_BASE + 57) +#define ERROR_HTTP_HSTS_REDIRECT_REQUIRED (INTERNET_ERROR_BASE + 60) +#define ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE (INTERNET_ERROR_BASE + 62) #define ERROR_FTP_TRANSFER_IN_PROGRESS (INTERNET_ERROR_BASE + 110) #define ERROR_FTP_DROPPED (INTERNET_ERROR_BASE + 111) #define ERROR_FTP_NO_PASSIVE_MODE (INTERNET_ERROR_BASE + 112) @@ -1501,7 +1503,9 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_NEED_MSN_SSPI_PKG (INTERNET_ERROR_BASE + 173) #define ERROR_INTERNET_LOGIN_FAILURE_DISPLAY_ENTITY_BODY (INTERNET_ERROR_BASE + 174) #define ERROR_INTERNET_DECODING_FAILED (INTERNET_ERROR_BASE + 175) -#define INTERNET_ERROR_LAST ERROR_INTERNET_DECODING_FAILED +#define ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED_PROXY (INTERNET_ERROR_BASE + 187) +#define ERROR_INTERNET_SECURE_FAILURE_PROXY (INTERNET_ERROR_BASE + 188) +#define INTERNET_ERROR_LAST ERROR_INTERNET_SECURE_FAILURE_PROXY #define NORMAL_CACHE_ENTRY 0x00000001 diff --git a/include/winineti.h b/include/winineti.h index 5e38424fa3d..812ff793317 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -106,6 +106,17 @@ typedef enum { #define CACHE_CONFIG_CONTENT_USAGE_FC 0x00002000 #define CACHE_CONFIG_STICKY_CONTENT_USAGE_FC 0x00004000 +#define ERROR_INTERNET_NO_NEW_CONTAINERS (INTERNET_ERROR_BASE + 51) +#define ERROR_INTERNET_SOURCE_PORT_IN_USE (INTERNET_ERROR_BASE + 58) +#define ERROR_INTERNET_INSECURE_FALLBACK_REQUIRED (INTERNET_ERROR_BASE + 59) +#define ERROR_INTERNET_PROXY_ALERT (INTERNET_ERROR_BASE + 61) +#define ERROR_INTERNET_NO_CM_CONNECTION (INTERNET_ERROR_BASE + 80) +#define ERROR_HTTP_PUSH_STATUS_CODE_NOT_SUPPORTED (INTERNET_ERROR_BASE + 147) +#define ERROR_HTTP_PUSH_RETRY_NOT_SUPPORTED (INTERNET_ERROR_BASE + 148) +#define ERROR_HTTP_PUSH_ENABLE_FAILED (INTERNET_ERROR_BASE + 149) + +#define ERROR_INTERNET_OFFLINE ERROR_INTERNET_DISCONNECTED + #ifdef __cplusplus extern "C" { #endif -- 2.23.0

2 2

[PATCH] wininet: Include winsock2.h before stdlib.h.
by Francois Gouget 15 Oct '19

15 Oct '19

Otherwise winsock2.h's fd_set macros break <sys/select.h> which is included by <time.h> on NetBSD. Moving winsock2.h after all system includes may work too because http.c does not (currently) use any of the fd_set APIs. But it seems like there would be a higher risk of mixing Unix socket types from the Unix headers with the Windows ones. So include winsock2.h first as recommended, but then _WIN32 is defined which causes zlib.h to use FAR which is not allowed in Wine code. So carve out an exception for it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Resubmitting... dlls/wininet/http.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fc412849eb5..949a6afc9c6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -29,15 +29,19 @@ #include "config.h" +#include "winsock2.h" +#include "ws2ipdef.h" + #include <stdlib.h> #ifdef HAVE_ZLIB +# undef FAR +# define FAR # include <zlib.h> +# undef FAR +# define FAR __ONLY_IN_WINELIB(/* nothing */) #endif -#include "winsock2.h" -#include "ws2ipdef.h" - #include <stdarg.h> #include <stdio.h> #include <time.h> -- 2.20.1

8 14

[PATCH 1/1] iphlpapi: partially implement NotifyIpInterfaceChange
by Joseph Kogut 15 Oct '19

15 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47935 Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1f823b401d..e0d2e2d60d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2755,10 +2755,10 @@ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) DWORD WINAPI NotifyIpInterfaceChange(ADDRESS_FAMILY family, PIPINTERFACE_CHANGE_CALLBACK callback, PVOID context, BOOLEAN init_notify, PHANDLE handle) { - FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): hacked stub\n", family, callback, context, init_notify, handle); if (handle) *handle = NULL; - return ERROR_NOT_SUPPORTED; + return NO_ERROR; } -- 2.23.0

1 0

[PATCH] scrrun/tests: Fix DriveCollection clone tests when there's only one drive.
by Gijs Vermeulen 14 Oct '19

14 Oct '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/scrrun/tests/filesystem.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5f207ed37a..3b4af3c498 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -973,7 +973,7 @@ static void test_GetFolder(void) IFolder_Release(folder); } -static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, int line) +static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, LONG count, int line) { HRESULT hr; IEnumVARIANT *clone; @@ -998,17 +998,25 @@ static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, int line VariantInit(&var2); fetched = -1; hr = IEnumVARIANT_Next(clone, 1, &var2, &fetched); - ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); - ok(fetched == 1, "%d: got %d\n", line, fetched); - if (!position_inherited) - todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); + if (position_inherited && count == 1) + { + ok(hr == S_FALSE, "%d: got 0x%08x\n", line, hr); + ok(fetched == 0, "%d: got %d\n", line, fetched); + } else { - fetched = -1; - hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); ok(fetched == 1, "%d: got %d\n", line, fetched); - todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); + if (!position_inherited) + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); + else + { + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); + } } VariantClear(&var2); @@ -1018,7 +1026,7 @@ static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, int line hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); } -#define test_clone(a, b) _test_clone(a, b, __LINE__) +#define test_clone(a, b, c) _test_clone(a, b, c, __LINE__) /* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FolderCollection(void) @@ -1115,7 +1123,7 @@ static void test_FolderCollection(void) ref2 = GET_REFCOUNT(folders); ok(ref2 == ref, "got %d, %d\n", ref2, ref); - test_clone(enumvar, FALSE); + test_clone(enumvar, FALSE, count); for (i = 0; i < 3; i++) { @@ -1285,7 +1293,7 @@ static void test_FileCollection(void) ref2 = GET_REFCOUNT(files); ok(ref2 == ref, "got %d, %d\n", ref2, ref); - test_clone(enumvar, FALSE); + test_clone(enumvar, FALSE, count); for (i = 0; i < 3; i++) { @@ -1399,7 +1407,7 @@ static void test_DriveCollection(void) hr = IEnumVARIANT_Skip(enumvar, 1); ok(hr == S_FALSE, "got 0x%08x\n", hr); - test_clone(enumvar, TRUE); + test_clone(enumvar, TRUE, count); while (IEnumVARIANT_Next(enumvar, 1, &var, &fetched) == S_OK) { IDrive *drive = (IDrive*)V_DISPATCH(&var); -- 2.23.0

1 0

[PATCH] wininet: Fix off by 1 error when parsing time.
by Dmitry Timoshkov 14 Oct '19

14 Oct '19

This patch makes HTTP_ParseRfc1123Date() work for dates without space before "GMT". Since this is an internal helper there's no way to add a test case for this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fc412849eb..cf156a9eb5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4375,8 +4375,7 @@ static BOOL HTTP_ParseTime(SYSTEMTIME *st, LPCWSTR *str) ERR("unexpected second in time format %s\n", debugstr_w(ptr)); return FALSE; } - ptr = nextPtr + 1; - *str = ptr; + *str = nextPtr; st->wSecond = (WORD)num; return TRUE; } -- 2.20.1

2 1

Running Wine From Build Directory
by Thales 12 Oct '19

12 Oct '19

Hello everyone, I'm in experimental mode right now. I'm making changes to wine code to see what I can do, but when I run Wine I don't see an effect on Wine, even though the compiles are successful. I'm running from the wine 64-bit build directory, which I thought would hook into the DLLs, etc. in that build tree. Instead, it appears to be using the installed version of Wine on my system (Ubuntu, 16.04). According to the Codeweavers article I link to below, the build directory is supposed to use the newly built code when you run wine or winedbg from it. How do I get it to use my newly built code? https://www.codeweavers.com/about/blogs/aeikum/2019/1/10/working-on-wine-pa… Thanks for any feedback on this! Regards,...John Alway

2 2

Wine test machine: cw-rx460-wow64
by Jeff Smith 11 Oct '19

11 Oct '19

In trying to get familiar with test.winehq.org, I noticed that under the Linux test machines, one in particular currently exhibits quite a few errors that no other machine does: cw-rx460-wow64. After looking into the particular errors, several appear to be directly or indirectly caused by the %windir% and %SystemRoot% environment variables not being defined. I don't know the processes involved in managing the test machines, but I wonder if clearing and re-initializing the registry for that machine may help. -- Jeff Smith

3 3

[PATCH] wininet/tests: Add setting Authorization header override tests.
by Alistair Leslie-Hughes 11 Oct '19

11 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/tests/http.c | 171 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 99ea0ef48f..9c2b949cdd 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2053,6 +2053,11 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char okmsg201[] = +"HTTP/1.1 201 OK\r\n" +"Server: winetest\r\n" +"\r\n"; + static const char okmsg2[] = "HTTP/1.1 200 OK\r\n" "Date: Mon, 01 Dec 2008 13:44:34 GMT\r\n" @@ -2438,6 +2443,15 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, noauthmsg, sizeof noauthmsg-1, 0); } + if (strstr(buffer, "HEAD /upload4.txt")) + { + if (strstr(buffer, "Authorization: Bearer dXNlcjE6cHdkMQ==")) + send(c, okmsg, sizeof okmsg-1, 0); + else if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) + send(c, okmsg201, sizeof okmsg-1, 0); + else + send(c, noauthmsg, sizeof noauthmsg-1, 0); + } if (strstr(buffer, "/test_host_override")) { if (strstr(buffer, host_header_override)) @@ -4677,6 +4691,161 @@ static void test_basic_auth_credentials_different(int port) InternetCloseHandle( ses ); } +/* + * Manually set the Authorization for both calls. + */ +static void test_basic_auth_credentials_manual(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + /* Clear the cached credentials */ + ret = InternetSetOptionA(ses, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); + ok(ret, "unexpected failure %u\n", GetLastError()); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + /* Set Authorization Header */ + ret = HttpAddRequestHeadersA(req, "Authorization: Basic dXNlcjpwd2Q=\r\n", ~0u, + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders Failed\n"); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + /* Show manual headers are cached. */ + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 401, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload4.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + /* Set Authorization Header */ + ret = HttpAddRequestHeadersA(req, "Authorization: Bearer dXNlcjE6cHdkMQ==\r\n", ~0u, + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders Failed\n"); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + +/* + * Manually set the Authorization for the bearer call, which shows the cached is used. + */ +static void test_basic_auth_credentials_cached_manual(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + /* Clear the cached credentials */ + ret = InternetSetOptionA(ses, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); + ok(ret, "unexpected failure %u\n", GetLastError()); + + con = InternetConnectA( ses, "localhost", port, "user", "pwd", + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload4.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + /* Setting an Authorization Header doesn't override the cached one. */ + ret = HttpAddRequestHeadersA(req, "Authorization: Bearer dXNlcjE6cHdkMQ==\r\n", ~0u, + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders Failed\n"); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 201, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + static void test_async_read(int port) { HINTERNET ses, con, req; @@ -5873,6 +6042,8 @@ static void test_http_connection(void) test_basic_auth_credentials_reuse(si.port); test_basic_auth_credentials_end_session(si.port); test_basic_auth_credentials_different(si.port); + test_basic_auth_credentials_manual(si.port); + test_basic_auth_credentials_cached_manual(si.port); test_async_read(si.port); test_http_read(si.port); test_connection_break(si.port); -- 2.17.1

2 1

[PATCH] kernel32: FindFirstFileExW needs to open the directory with FILE_OPEN_FOR_BACKUP_INTENT flag.
by Alistair Leslie-Hughes 10 Oct '19

10 Oct '19

Patch by user qsniyg on bugzilla. The usvfs project on github checks for this flag to allow iteration of directories. The ntdll/directory tests always pass this flag in when opening a directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47833 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 8691a726e3..c3be67cc3c 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -754,7 +754,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, status = NtOpenFile( &info->handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT ); if (status != STATUS_SUCCESS) { -- 2.17.1

2 1

[PATCH] kernel32/tests: Test loading system DLLs with WoW64 redirection disabled
by Brendan Shanks 10 Oct '19

10 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47912 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/kernel32/tests/loader.c | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 65184887b8..4e0c3c92e8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -84,6 +84,8 @@ static BOOL (WINAPI *pFlsSetValue)(DWORD, PVOID); static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsFree)(DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -3812,6 +3814,45 @@ static void test_InMemoryOrderModuleList(void) ok(entry2 == mark2, "expected entry2 == mark2, got %p and %p\n", entry2, mark2); } +static void test_wow64_redirection(void) +{ + VOID *OldValue; + HMODULE lib; + OSVERSIONINFOEXA info; + + if (!is_wow64) + return; + + /* Only run tests on Win7/2008R2 (NT 6.1) and newer. The LoadLibrary calls fail on Vista/2008. */ + memset(&info, 0, sizeof(info)); + info.dwOSVersionInfoSize = sizeof(info); + info.dwMajorVersion = 6; + info.dwMinorVersion = 1; + if (VerifyVersionInfoA(&info, VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR, + VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(0, + VER_MAJORVERSION,VER_GREATER_EQUAL), + VER_MINORVERSION,VER_GREATER_EQUAL), + VER_SERVICEPACKMAJOR,VER_GREATER_EQUAL)) == 0) + return; + + ok(pWow64DisableWow64FsRedirection(&OldValue), "Disabling FS redirection failed\n"); + + /* Use system libraries that shouldn't already be loaded in this process. */ + lib = LoadLibraryExA("bcrypt.dll", NULL, 0); + todo_wine ok (lib != NULL, "Loading bcrypt.dll should succeed with WOW64 redirection disabled\n"); + if (lib) FreeLibrary(lib); + + lib = LoadLibraryExA("dxgi.dll", NULL, 0); + todo_wine ok (lib != NULL, "Loading dxgi.dll should succeed with WOW64 redirection disabled\n"); + if (lib) FreeLibrary(lib); + + lib = LoadLibraryExA("dwrite.dll", NULL, 0); + todo_wine ok (lib != NULL, "Loading dwrite.dll should succeed with WOW64 redirection disabled\n"); + if (lib) FreeLibrary(lib); + + ok(pWow64RevertWow64FsRedirection(OldValue), "Re-enabling FS redirection failed\n"); +} + static void test_dll_file( const char *name ) { HMODULE module = GetModuleHandleA( name ); @@ -3897,6 +3938,8 @@ START_TEST(loader) pFlsGetValue = (void *)GetProcAddress(kernel32, "FlsGetValue"); pFlsFree = (void *)GetProcAddress(kernel32, "FlsFree"); pIsWow64Process = (void *)GetProcAddress(kernel32, "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64RevertWow64FsRedirection"); pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); @@ -3930,6 +3973,7 @@ START_TEST(loader) test_import_resolution(); test_ExitProcess(); test_InMemoryOrderModuleList(); + test_wow64_redirection(); test_dll_file( "ntdll.dll" ); test_dll_file( "kernel32.dll" ); test_dll_file( "advapi32.dll" ); -- 2.17.1

3 3

[PATCH v2 1/5] quartz/tests: Bail out if connecting returns E_FAIL.
by Zebediah Figura 10 Oct '19

10 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47911 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 928484ccb6a..fa63b5b85cc 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -941,7 +941,7 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr); IPin_Release(peer); iface->pin.peer = NULL; FreeMediaType(&iface->pin.mtCurrent); @@ -1016,6 +1016,11 @@ static void test_connect_pin(void) vih.bmiHeader.biBitCount = bpp_tests[j]; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + if (hr == E_FAIL) + { + skip("Got E_FAIL when connecting.\n"); + goto out; + } ok(hr == S_OK, "Got hr %#x for subtype %s and bpp %u.\n", hr, wine_dbgstr_guid(subtype_tests[i]), bpp_tests[j]); @@ -1087,6 +1092,7 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); +out: IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.23.0

2 6

[PATCH 1/5] quartz/tests: Bail out if connecting returns E_FAIL.
by Zebediah Figura 10 Oct '19

10 Oct '19

2 6

Using the DDD Debugger with Winedbg?
by Thales 10 Oct '19

10 Oct '19

Hello, I'm John Alway. I program in C and C++, among other languages. This is my first message to the list. I've been playing around with the Wine repository for a while and have delved into some of the Bugzilla errors posted on "bugs.winehq.org." In the process of doing this, I've been using the "winedbg" executable with the "--gdb" switch set. That works fine for debugging, but lately I've been trying to employ the graphical application DDD, Data Display Debugger, with the winedbg executable. I've followed the instructions at this link: https://wiki.winehq.org/Wine_Developer%27s_Guide/Debugging_Wine#DDD When I do winedbg comes to life, but then fails. The error reads "Err: winedbg extract_packets Dropping packets: I was too slow to respond" . I do see this error on occasion even when not using DDD, and I can still work, so I don't know if that's the reason it stops. Does anyone have any insights into using this, or is there a better way altogether? I like a visual display where I can see several elements at once. Thanks for any help! Regards,...John Alway

2 2

[PATCH 1/3] crypt32/tests: Tidy up unexpected length failure messages in base64.
by Jeff Smith 09 Oct '19

09 Oct '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/crypt32/tests/base64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 4ff76272e3..3668543048 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -121,12 +121,12 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, strLen2 = strLen; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, NULL, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen == strLen2, "Unexpected required length.\n"); + ok(strLen == strLen2, "Unexpected required length %u, expected %u.\n", strLen2, strLen); strLen2 = strLen - 1; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, NULL, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen == strLen2, "Unexpected required length.\n"); + ok(strLen == strLen2, "Unexpected required length %u, expected %u.\n", strLen2, strLen); str = heap_alloc(strLen); @@ -137,7 +137,7 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, todo_wine ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringA failed %d, error %d.\n", ret, GetLastError()); - ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen - 1, strLen); + ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen, strLen2); todo_wine { if (header) ok(str[0] == header[0], "Unexpected buffer contents %#x.\n", str[0]); @@ -147,7 +147,7 @@ todo_wine { strLen2 = strLen; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, str, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen); + ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen2); ptr = str; if (header) -- 2.21.0

1 2

[PATCH v3 1/2] wineserver: Implement thread priorities with sched_setscheduler / setpriority.
by Rémi Bernon 09 Oct '19

09 Oct '19

This does not report permission errors in order to avoid any breaking change, only the parameter checks that were already there are returning errors. We only call setpriority on Linux, as unix_tid is a Mach port on Mac OS. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure.ac | 19 ++++++ include/config.h.in | 6 ++ server/process.c | 20 +++++- server/thread.c | 154 ++++++++++++++++++++++++++++++++++++++++---- server/thread.h | 1 + 5 files changed, 186 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index b9339b90aa7..47c1f7c5315 100644 --- a/configure.ac +++ b/configure.ac @@ -2285,6 +2285,25 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi +AC_CACHE_CHECK([for sched_setscheduler],wine_cv_have_sched_setscheduler, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sched.h>]], [[sched_setscheduler(0, 0, 0);]])],[wine_cv_have_sched_setscheduler=yes],[wine_cv_have_sched_setscheduler=no])) +if test "$wine_cv_have_sched_setscheduler" = "yes" +then + AC_DEFINE(HAVE_SCHED_SETSCHEDULER, 1, [Define to 1 if you have the `sched_setscheduler' function.]) +fi + +AC_CACHE_CHECK([for setpriority],wine_cv_have_setpriority, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sys/resource.h> +#include <sys/time.h>]], [[setpriority(0, 0, 0);]])],[wine_cv_have_setpriority=yes],[wine_cv_have_setpriority=no])) +if test "$wine_cv_have_setpriority" = "yes" +then + AC_DEFINE(HAVE_SETPRIORITY, 1, [Define to 1 if you have the `setpriority' function.]) +fi + AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#define _GNU_SOURCE diff --git a/include/config.h.in b/include/config.h.in index 9c7a49ae9a2..929b11a8754 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -785,6 +785,9 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY +/* Define to 1 if you have the `sched_setscheduler' function. */ +#undef HAVE_SCHED_SETSCHEDULER + /* Define to 1 if you have the `sched_yield' function. */ #undef HAVE_SCHED_YIELD @@ -809,6 +812,9 @@ /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT +/* Define to 1 if you have the `setpriority' function. */ +#undef HAVE_SETPRIORITY + /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE diff --git a/server/process.c b/server/process.c index 16bb5d57e72..0c544b46096 100644 --- a/server/process.c +++ b/server/process.c @@ -1465,6 +1465,24 @@ DECL_HANDLER(get_process_vm_counters) release_object( process ); } +static void set_process_priority( struct process *process, int priority ) +{ + struct thread *thread; + + if (!process->running_threads) + { + set_error( STATUS_PROCESS_IS_TERMINATING ); + return; + } + + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { + set_thread_priority( thread, priority, thread->priority ); + } + + process->priority = priority; +} + static void set_process_affinity( struct process *process, affinity_t affinity ) { struct thread *thread; @@ -1490,7 +1508,7 @@ DECL_HANDLER(set_process_info) if ((process = get_process_from_handle( req->handle, PROCESS_SET_INFORMATION ))) { - if (req->mask & SET_PROCESS_INFO_PRIORITY) process->priority = req->priority; + if (req->mask & SET_PROCESS_INFO_PRIORITY) set_process_priority( process, req->priority ); if (req->mask & SET_PROCESS_INFO_AFFINITY) set_process_affinity( process, req->affinity ); release_object( process ); } diff --git a/server/thread.c b/server/thread.c index e753c8d0dda..36bd41e977f 100644 --- a/server/thread.c +++ b/server/thread.c @@ -38,6 +38,12 @@ #ifdef HAVE_SCHED_H #include <sched.h> #endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -515,28 +521,149 @@ affinity_t get_thread_affinity( struct thread *thread ) return mask; } +#if defined(HAVE_SCHED_SETSCHEDULER) || defined(HAVE_SETPRIORITY) +static int get_unix_priority( int priority_class, int priority ) +{ + switch (priority_class) { + case PROCESS_PRIOCLASS_IDLE: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 10; + case THREAD_PRIORITY_BELOW_NORMAL: return 8; + case THREAD_PRIORITY_NORMAL: return 6; + case THREAD_PRIORITY_ABOVE_NORMAL: return 4; + case THREAD_PRIORITY_HIGHEST: return 2; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_BELOW_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 8; + case THREAD_PRIORITY_BELOW_NORMAL: return 6; + case THREAD_PRIORITY_NORMAL: return 4; + case THREAD_PRIORITY_ABOVE_NORMAL: return 2; + case THREAD_PRIORITY_HIGHEST: return 0; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 4; + case THREAD_PRIORITY_BELOW_NORMAL: return 2; + case THREAD_PRIORITY_NORMAL: return 0; + case THREAD_PRIORITY_ABOVE_NORMAL: return -2; + case THREAD_PRIORITY_HIGHEST: return -4; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_ABOVE_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 0; + case THREAD_PRIORITY_BELOW_NORMAL: return -2; + case THREAD_PRIORITY_NORMAL: return -4; + case THREAD_PRIORITY_ABOVE_NORMAL: return -6; + case THREAD_PRIORITY_HIGHEST: return -8; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_HIGH: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return -2; + case THREAD_PRIORITY_BELOW_NORMAL: return -4; + case THREAD_PRIORITY_NORMAL: return -6; + case THREAD_PRIORITY_ABOVE_NORMAL: return -8; + case THREAD_PRIORITY_HIGHEST: return -10; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_REALTIME: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 1; + case -7: + case -6: + case -5: + case -4: + case -3: + case THREAD_PRIORITY_LOWEST: + case THREAD_PRIORITY_BELOW_NORMAL: + case THREAD_PRIORITY_NORMAL: + case THREAD_PRIORITY_ABOVE_NORMAL: + case THREAD_PRIORITY_HIGHEST: + case 3: + case 4: + case 5: + case 6: + return priority + 9; + case THREAD_PRIORITY_TIME_CRITICAL: + return 16; + } + } + return 0; +} +#endif + #define THREAD_PRIORITY_REALTIME_HIGHEST 6 #define THREAD_PRIORITY_REALTIME_LOWEST -7 +int set_thread_priority( struct thread* thread, int priority_class, int priority ) +{ + int max = THREAD_PRIORITY_HIGHEST; + int min = THREAD_PRIORITY_LOWEST; + if (priority_class == PROCESS_PRIOCLASS_REALTIME) + { + max = THREAD_PRIORITY_REALTIME_HIGHEST; + min = THREAD_PRIORITY_REALTIME_LOWEST; + } + + if ((priority < min || priority > max) && + priority != THREAD_PRIORITY_IDLE && + priority != THREAD_PRIORITY_TIME_CRITICAL) + { + errno = EINVAL; + return -1; + } + + if (thread->process->priority == priority_class && + thread->priority == priority) + return 0; + + thread->priority = priority; + if (thread->unix_tid == -1) + return 0; + +#ifdef __linux__ + if (priority_class == PROCESS_PRIOCLASS_REALTIME) + { +#ifdef HAVE_SCHED_SETSCHEDULER + struct sched_param param; + if (sched_getparam( thread->unix_tid, &param ) != 0) + return 0; /* ignore errors for now */ + + param.sched_priority = get_unix_priority( priority_class, priority ); + if (sched_setscheduler( thread->unix_tid, SCHED_RR|SCHED_RESET_ON_FORK, &param ) == 0) + return 0; +#endif + } + else + { +#ifdef HAVE_SETPRIORITY + if (setpriority( PRIO_PROCESS, thread->unix_tid, + get_unix_priority( priority_class, priority ) ) == 0) + return 0; +#endif + } +#endif + + return 0; /* ignore errors for now */ +} + /* set all information about a thread */ static void set_thread_info( struct thread *thread, const struct set_thread_info_request *req ) { if (req->mask & SET_THREAD_INFO_PRIORITY) { - int max = THREAD_PRIORITY_HIGHEST; - int min = THREAD_PRIORITY_LOWEST; - if (thread->process->priority == PROCESS_PRIOCLASS_REALTIME) - { - max = THREAD_PRIORITY_REALTIME_HIGHEST; - min = THREAD_PRIORITY_REALTIME_LOWEST; - } - if ((req->priority >= min && req->priority <= max) || - req->priority == THREAD_PRIORITY_IDLE || - req->priority == THREAD_PRIORITY_TIME_CRITICAL) - thread->priority = req->priority; - else - set_error( STATUS_INVALID_PARAMETER ); + if (set_thread_priority( thread, thread->process->priority, req->priority )) + file_set_error(); } if (req->mask & SET_THREAD_INFO_AFFINITY) { @@ -1367,6 +1494,7 @@ DECL_HANDLER(init_thread) process->unix_pid = -1; /* can happen with linuxthreads */ init_thread_context( current ); generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); + set_thread_priority( current, current->process->priority, current->priority ); set_thread_affinity( current, current->affinity ); } debug_level = max( debug_level, req->debug_level ); diff --git a/server/thread.h b/server/thread.h index e10120dcf6e..b81061aea11 100644 --- a/server/thread.h +++ b/server/thread.h @@ -125,6 +125,7 @@ extern int thread_add_inflight_fd( struct thread *thread, int client, int server extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); extern struct token *thread_get_impersonation_token( struct thread *thread ); +extern int set_thread_priority( struct thread *thread, int priority_class, int priority ); extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); extern int is_cpu_supported( enum cpu_type cpu ); extern unsigned int get_supported_cpu_mask(void); -- 2.23.0

1 1

[PATCH 1/4] dwrite: Update to IDWriteFontFaceReference1.
by Nikolay Sivov 09 Oct '19

09 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 220 ++++++++++++++++++++++++--------------------- 1 file changed, 119 insertions(+), 101 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index be9ff88fe4..f83c14381f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -221,9 +221,10 @@ struct dwrite_fontfile { IDWriteFontFileStream *stream; }; -struct dwrite_fontfacereference { - IDWriteFontFaceReference IDWriteFontFaceReference_iface; - LONG ref; +struct dwrite_fontfacereference +{ + IDWriteFontFaceReference1 IDWriteFontFaceReference1_iface; + LONG refcount; IDWriteFontFile *file; UINT32 index; @@ -317,9 +318,9 @@ static inline struct dwrite_fontlist *impl_from_IDWriteFontList1(IDWriteFontList return CONTAINING_RECORD(iface, struct dwrite_fontlist, IDWriteFontList1_iface); } -static inline struct dwrite_fontfacereference *impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface) +static inline struct dwrite_fontfacereference *impl_from_IDWriteFontFaceReference1(IDWriteFontFaceReference1 *iface) { - return CONTAINING_RECORD(iface, struct dwrite_fontfacereference, IDWriteFontFaceReference_iface); + return CONTAINING_RECORD(iface, struct dwrite_fontfacereference, IDWriteFontFaceReference1_iface); } static HRESULT get_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) @@ -5890,15 +5891,16 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R } /* IDWriteFontFaceReference */ -static HRESULT WINAPI fontfacereference_QueryInterface(IDWriteFontFaceReference *iface, REFIID riid, void **obj) +static HRESULT WINAPI fontfacereference_QueryInterface(IDWriteFontFaceReference1 *iface, REFIID riid, void **obj) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); - if (IsEqualIID(riid, &IID_IDWriteFontFaceReference) || IsEqualIID(riid, &IID_IUnknown)) { + if (IsEqualIID(riid, &IID_IDWriteFontFaceReference1) || + IsEqualIID(riid, &IID_IDWriteFontFaceReference) || + IsEqualIID(riid, &IID_IUnknown)) + { *obj = iface; - IDWriteFontFaceReference_AddRef(iface); + IDWriteFontFaceReference1_AddRef(iface); return S_OK; } @@ -5909,43 +5911,46 @@ static HRESULT WINAPI fontfacereference_QueryInterface(IDWriteFontFaceReference return E_NOINTERFACE; } -static ULONG WINAPI fontfacereference_AddRef(IDWriteFontFaceReference *iface) +static ULONG WINAPI fontfacereference_AddRef(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); - return ref; + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); + ULONG refcount = InterlockedIncrement(&reference->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; } -static ULONG WINAPI fontfacereference_Release(IDWriteFontFaceReference *iface) +static ULONG WINAPI fontfacereference_Release(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); + ULONG refcount = InterlockedDecrement(&reference->refcount); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - if (!ref) { - IDWriteFontFile_Release(This->file); - IDWriteFactory5_Release(This->factory); - heap_free(This); + if (!refcount) + { + IDWriteFontFile_Release(reference->file); + IDWriteFactory5_Release(reference->factory); + heap_free(reference); } - return ref; + return refcount; } -static HRESULT WINAPI fontfacereference_CreateFontFace(IDWriteFontFaceReference *iface, IDWriteFontFace3 **fontface) +static HRESULT WINAPI fontfacereference_CreateFontFace(IDWriteFontFaceReference1 *iface, IDWriteFontFace3 **fontface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - TRACE("(%p)->(%p)\n", This, fontface); + TRACE("%p, %p.\n", iface, fontface); - return IDWriteFontFaceReference_CreateFontFaceWithSimulations(iface, This->simulations, fontface); + return IDWriteFontFaceReference1_CreateFontFaceWithSimulations(iface, reference->simulations, fontface); } -static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFontFaceReference *iface, +static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFontFaceReference1 *iface, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFace3 **ret) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); DWRITE_FONT_FILE_TYPE file_type; DWRITE_FONT_FACE_TYPE face_type; IDWriteFontFace *fontface; @@ -5953,14 +5958,16 @@ static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFon UINT32 face_num; HRESULT hr; - TRACE("(%p)->(%d %p)\n", This, simulations, ret); + TRACE("%p, %#x, %p.\n", iface, simulations, ret); - hr = IDWriteFontFile_Analyze(This->file, &is_supported, &file_type, &face_type, &face_num); + hr = IDWriteFontFile_Analyze(reference->file, &is_supported, &file_type, &face_type, &face_num); if (FAILED(hr)) return hr; - hr = IDWriteFactory5_CreateFontFace(This->factory, face_type, 1, &This->file, This->index, simulations, &fontface); - if (SUCCEEDED(hr)) { + hr = IDWriteFactory5_CreateFontFace(reference->factory, face_type, 1, &reference->file, reference->index, + simulations, &fontface); + if (SUCCEEDED(hr)) + { hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace3, (void **)ret); IDWriteFontFace_Release(fontface); } @@ -5968,143 +5975,150 @@ static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFon return hr; } -static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference *iface, IDWriteFontFaceReference *ref) +static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference1 *iface, IDWriteFontFaceReference *ref) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); IDWriteFontFile *file; BOOL ret; - TRACE("(%p)->(%p)\n", This, ref); + TRACE("%p, %p.\n", iface, ref); if (FAILED(IDWriteFontFaceReference_GetFontFile(ref, &file))) return FALSE; - ret = is_same_fontfile(This->file, file) && - This->index == IDWriteFontFaceReference_GetFontFaceIndex(ref) && - This->simulations == IDWriteFontFaceReference_GetSimulations(ref); + ret = is_same_fontfile(reference->file, file) && + reference->index == IDWriteFontFaceReference_GetFontFaceIndex(ref) && + reference->simulations == IDWriteFontFaceReference_GetSimulations(ref); IDWriteFontFile_Release(file); return ret; } -static UINT32 WINAPI fontfacereference_GetFontFaceIndex(IDWriteFontFaceReference *iface) +static UINT32 WINAPI fontfacereference_GetFontFaceIndex(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); - return This->index; + return reference->index; } -static DWRITE_FONT_SIMULATIONS WINAPI fontfacereference_GetSimulations(IDWriteFontFaceReference *iface) +static DWRITE_FONT_SIMULATIONS WINAPI fontfacereference_GetSimulations(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); - return This->simulations; + return reference->simulations; } -static HRESULT WINAPI fontfacereference_GetFontFile(IDWriteFontFaceReference *iface, IDWriteFontFile **file) +static HRESULT WINAPI fontfacereference_GetFontFile(IDWriteFontFaceReference1 *iface, IDWriteFontFile **file) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); IDWriteFontFileLoader *loader; const void *key; UINT32 key_size; HRESULT hr; - TRACE("(%p)->(%p)\n", This, file); + TRACE("%p, %p.\n", iface, file); - hr = IDWriteFontFile_GetReferenceKey(This->file, &key, &key_size); + hr = IDWriteFontFile_GetReferenceKey(reference->file, &key, &key_size); if (FAILED(hr)) return hr; - hr = IDWriteFontFile_GetLoader(This->file, &loader); + hr = IDWriteFontFile_GetLoader(reference->file, &loader); if (FAILED(hr)) return hr; - hr = IDWriteFactory5_CreateCustomFontFileReference(This->factory, key, key_size, loader, file); + hr = IDWriteFactory5_CreateCustomFontFileReference(reference->factory, key, key_size, loader, file); IDWriteFontFileLoader_Release(loader); return hr; } -static UINT64 WINAPI fontfacereference_GetLocalFileSize(IDWriteFontFaceReference *iface) +static UINT64 WINAPI fontfacereference_GetLocalFileSize(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - FIXME("(%p): stub\n", This); + FIXME("%p.\n", iface); return 0; } -static UINT64 WINAPI fontfacereference_GetFileSize(IDWriteFontFaceReference *iface) +static UINT64 WINAPI fontfacereference_GetFileSize(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - FIXME("(%p): stub\n", This); + FIXME("%p.\n", iface); return 0; } -static HRESULT WINAPI fontfacereference_GetFileTime(IDWriteFontFaceReference *iface, FILETIME *writetime) +static HRESULT WINAPI fontfacereference_GetFileTime(IDWriteFontFaceReference1 *iface, FILETIME *writetime) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - FIXME("(%p)->(%p): stub\n", This, writetime); + FIXME("%p, %p.\n", iface, writetime); return E_NOTIMPL; } -static DWRITE_LOCALITY WINAPI fontfacereference_GetLocality(IDWriteFontFaceReference *iface) +static DWRITE_LOCALITY WINAPI fontfacereference_GetLocality(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - FIXME("(%p): stub\n", This); + FIXME("%p.\n", iface); return DWRITE_LOCALITY_LOCAL; } -static HRESULT WINAPI fontfacereference_EnqueueFontDownloadRequest(IDWriteFontFaceReference *iface) +static HRESULT WINAPI fontfacereference_EnqueueFontDownloadRequest(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - FIXME("(%p): stub\n", This); + FIXME("%p.\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI fontfacereference_EnqueueCharacterDownloadRequest(IDWriteFontFaceReference *iface, WCHAR const *chars, - UINT32 count) +static HRESULT WINAPI fontfacereference_EnqueueCharacterDownloadRequest(IDWriteFontFaceReference1 *iface, + WCHAR const *chars, UINT32 count) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + FIXME("%p, %s, %u.\n", iface, debugstr_wn(chars, count), count); - FIXME("(%p)->(%s:%u): stub\n", This, debugstr_wn(chars, count), count); + return E_NOTIMPL; +} + +static HRESULT WINAPI fontfacereference_EnqueueGlyphDownloadRequest(IDWriteFontFaceReference1 *iface, + UINT16 const *glyphs, UINT32 count) +{ + FIXME("%p, %p, %u.\n", iface, glyphs, count); return E_NOTIMPL; } -static HRESULT WINAPI fontfacereference_EnqueueGlyphDownloadRequest(IDWriteFontFaceReference *iface, UINT16 const *glyphs, - UINT32 count) +static HRESULT WINAPI fontfacereference_EnqueueFileFragmentDownloadRequest(IDWriteFontFaceReference1 *iface, + UINT64 offset, UINT64 size) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + FIXME("%p, 0x%s, 0x%s.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(size)); - FIXME("(%p)->(%p %u): stub\n", This, glyphs, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI fontfacereference1_CreateFontFace(IDWriteFontFaceReference1 *iface, IDWriteFontFace5 **fontface) +{ + FIXME("%p, %p.\n", iface, fontface); return E_NOTIMPL; } -static HRESULT WINAPI fontfacereference_EnqueueFileFragmentDownloadRequest(IDWriteFontFaceReference *iface, - UINT64 offset, UINT64 size) +static UINT32 WINAPI fontfacereference1_GetFontAxisValueCount(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + FIXME("%p.\n", iface); - FIXME("(%p)->(0x%s 0x%s): stub\n", This, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(size)); + return 0; +} + +static HRESULT WINAPI fontfacereference1_GetFontAxisValues(IDWriteFontFaceReference1 *iface, + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 value_count) +{ + FIXME("%p, %p, %u.\n", iface, axis_values, value_count); return E_NOTIMPL; } -static const IDWriteFontFaceReferenceVtbl fontfacereferencevtbl = { +static const IDWriteFontFaceReference1Vtbl fontfacereferencevtbl = +{ fontfacereference_QueryInterface, fontfacereference_AddRef, fontfacereference_Release, @@ -6121,33 +6135,37 @@ static const IDWriteFontFaceReferenceVtbl fontfacereferencevtbl = { fontfacereference_EnqueueFontDownloadRequest, fontfacereference_EnqueueCharacterDownloadRequest, fontfacereference_EnqueueGlyphDownloadRequest, - fontfacereference_EnqueueFileFragmentDownloadRequest + fontfacereference_EnqueueFileFragmentDownloadRequest, + fontfacereference1_CreateFontFace, + fontfacereference1_GetFontAxisValueCount, + fontfacereference1_GetFontAxisValues, }; HRESULT create_fontfacereference(IDWriteFactory5 *factory, IDWriteFontFile *file, UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **ret) { - struct dwrite_fontfacereference *ref; + struct dwrite_fontfacereference *object; *ret = NULL; if (!is_simulation_valid(simulations)) return E_INVALIDARG; - ref = heap_alloc(sizeof(*ref)); - if (!ref) + object = heap_alloc(sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - ref->IDWriteFontFaceReference_iface.lpVtbl = &fontfacereferencevtbl; - ref->ref = 1; + object->IDWriteFontFaceReference1_iface.lpVtbl = &fontfacereferencevtbl; + object->refcount = 1; + + object->factory = factory; + IDWriteFactory5_AddRef(object->factory); + object->file = file; + IDWriteFontFile_AddRef(object->file); + object->index = index; + object->simulations = simulations; - ref->factory = factory; - IDWriteFactory5_AddRef(ref->factory); - ref->file = file; - IDWriteFontFile_AddRef(ref->file); - ref->index = index; - ref->simulations = simulations; - *ret = &ref->IDWriteFontFaceReference_iface; + *ret = (IDWriteFontFaceReference *)&object->IDWriteFontFaceReference1_iface; return S_OK; } -- 2.23.0

2 4

[PATCH] msxml3/tests: Add IXMLDOMNode::selectSingleNode() test for an XML with multiple namespaces.
by Dmitry Timoshkov 09 Oct '19

09 Oct '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/domdoc.c | 80 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c4337ab191..eee29add38 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12998,6 +12998,85 @@ static void test_namespaces_as_attributes(void) free_bstrs(); } +static const char ticket[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +"<psf:PrintTicket xmlns:psf=\"http://a\" xmlns:xsi=\"http://b\" xmlns:xsd=\"http://c\" xmlns:psk=\"http://d\">" +" <psf:Feature name=\"psk:PageMediaSize\">" +" <psf:Option name=\"psk:ISOA4\">" +" <psf:ScoredProperty name=\"psk:MediaSizeWidth\">" +" <psf:Value xsi:type=\"xsd:integer\">210000</psf:Value>" +" </psf:ScoredProperty>" +" <psf:ScoredProperty name=\"psk:MediaSizeHeight\">" +" <psf:Value xsi:type=\"xsd:integer\">297000</psf:Value>" +" </psf:ScoredProperty>" +" </psf:Option>" +" </psf:Feature>" +"</psf:PrintTicket>"; + +static void test_selectSingleNode_ns(void) +{ + IXMLDOMDocument *doc; + IXMLDOMNode *node, *option, *child, *val; + VARIANT_BOOL b; + VARIANT var; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + b = VARIANT_FALSE; + hr = IXMLDOMDocument_loadXML(doc, _bstr_(ticket), &b); + ok(hr == S_OK, "got %#x\n", hr ); + ok(b == VARIANT_TRUE, "got %d\n", b); + + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("psf:PrintTicket/psf:Feature[@name='psk:PageMediaSize']"), &node); + ok(hr == S_OK, "got %#x\n", hr ); + + hr = IXMLDOMNode_selectSingleNode(node, _bstr_("./psf:Option"), &option); + ok(hr == S_OK, "got %#x\n", hr ); + + hr = IXMLDOMNode_selectSingleNode(option, _bstr_("./psf:ScoredProperty[@name='psk:MediaSizeWidth']"), &child); + ok(hr == S_OK, "got %#x\n", hr ); + + hr = IXMLDOMNode_selectSingleNode(child, _bstr_("./psf:Value[@xsi:type='xsd:integer']"), &val); +todo_wine + ok(hr == S_OK, "got %#x\n", hr ); + if (hr == S_OK) + { + VariantInit(&var); + hr = IXMLDOMNode_get_nodeTypedValue(val, &var); + ok(hr == S_OK, "got %#x\n", hr ); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"210000"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + IXMLDOMNode_Release(val); + } + IXMLDOMNode_Release(child); + + hr = IXMLDOMNode_selectSingleNode(option, _bstr_("./psf:ScoredProperty[@name='psk:MediaSizeHeight']"), &child); + ok(hr == S_OK, "got %#x\n", hr ); + + hr = IXMLDOMNode_selectSingleNode(child, _bstr_("./psf:Value[@xsi:type='xsd:integer']"), &val); +todo_wine + ok(hr == S_OK, "got %#x\n", hr ); + if (hr == S_OK) + { + VariantInit(&var); + hr = IXMLDOMNode_get_nodeTypedValue(val, &var); + ok(hr == S_OK, "got %#x\n", hr ); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"297000"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + IXMLDOMNode_Release(val); + } + IXMLDOMNode_Release(child); + + IXMLDOMNode_Release(option); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -13014,6 +13093,7 @@ START_TEST(domdoc) return; } + test_selectSingleNode_ns(); test_domdoc(); test_persiststream(); test_domnode(); -- 2.20.1

2 4

[PATCH] dinput: Dont treat Stylus devices as joysticks.
by Alistair Leslie-Hughes 09 Oct '19

09 Oct '19

Tablet/Stylus devices have a js* entry which we are treating as a yoystick. Any testbox VM that is configured with is a tablet is currently failing the joystick tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/joystick_linux.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 67898a708d7..3ecbf441aad 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -168,6 +168,7 @@ static INT find_joystick_devices(void) struct JoyDev joydev, *new_joydevs; BYTE axes_map[ABS_MAX + 1]; SHORT btn_map[KEY_MAX - BTN_MISC + 1]; + BOOL is_stylus = FALSE; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); if ((fd = open(joydev.device, O_RDONLY)) == -1) @@ -241,12 +242,22 @@ static INT find_joystick_devices(void) case BTN_DEAD: joydev.is_joystick = TRUE; break; + case BTN_STYLUS: + is_stylus = TRUE; + break; default: break; } } } + if(is_stylus) + { + TRACE("Stylus detected. Skipping\n"); + close(fd); + continue; + } + if (ioctl(fd, JSIOCGAXMAP, axes_map) < 0) { WARN("ioctl(%s,JSIOCGAXMAP) failed: %s\n", joydev.device, strerror(errno)); -- 2.23.0

1 0

[PATCH v3 1/5] winegcc: Strip symbols before the make_wine_builtin call.
by Rémi Bernon 09 Oct '19

09 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47718 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/winegcc/winegcc.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0ca553318eb..893ad1021ea 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -406,6 +406,10 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, "-image_base" ); strarray_add( flags, opts->image_base ); } + /* On Mac, change -s into -Wl,-x. ld's -s switch + * is deprecated, and it doesn't work on Tiger with + * MH_BUNDLEs anyway + */ if (opts->strip) strarray_add( flags, "-Wl,-x" ); strarray_addall( link_args, flags ); return link_args; @@ -1250,9 +1254,21 @@ static void build(struct options* opts) if (libgcc) strarray_add(link_args, libgcc); + if (opts->target_platform != PLATFORM_APPLE && !is_pe && opts->strip) + strarray_add(link_args, "-s"); + spawn(opts->prefix, link_args, 0); strarray_free (link_args); + if (opts->target_platform != PLATFORM_APPLE && is_pe && opts->strip) + { + strarray *strip_args = strarray_fromstring(build_tool_name(opts, "strip", "strip"), " "); + strarray_add(strip_args, "--strip-all"); + strarray_add(strip_args, output_path); + spawn(opts->prefix, strip_args, 1); + strarray_free(strip_args); + } + if (is_pe && opts->wine_builtin) make_wine_builtin( output_path ); /* set the base address with prelink if linker support is not present */ @@ -1626,12 +1642,8 @@ int main(int argc, char **argv) opts.shared = 1; raw_compiler_arg = raw_linker_arg = 0; } - else if (strcmp("-s", argv[i]) == 0 && opts.target_platform == PLATFORM_APPLE) + else if (strcmp("-s", argv[i]) == 0) { - /* On Mac, change -s into -Wl,-x. ld's -s switch - * is deprecated, and it doesn't work on Tiger with - * MH_BUNDLEs anyway - */ opts.strip = 1; raw_linker_arg = 0; } @@ -1666,6 +1678,11 @@ int main(int argc, char **argv) opts.wine_builtin = 1; continue; } + if (!strcmp(Wl->base[j], "--strip-all") || !strcmp(Wl->base[j], "-s")) + { + opts.strip = 1; + continue; + } if (!strcmp(Wl->base[j], "--subsystem") && j < Wl->size - 1) { opts.subsystem = strdup( Wl->base[++j] ); -- 2.23.0

1 4

[PATCH 1/6] strmbase: IVideoWindow::get_AutoShow() returns OATRUE, not TRUE.
by Zebediah Figura 09 Oct '19

09 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/strmbase/window.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f1f901d164d..e1b1f17c72a 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1928,7 +1928,7 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap hr = IVideoWindow_get_AutoShow(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IVideoWindow_put_Visible(window, OAFALSE); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index cb41aee2f4f..66db2d6c07e 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -203,7 +203,7 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, if (SUCCEEDED(hr)) { pControlWindow->IVideoWindow_iface.lpVtbl = lpVtbl; - pControlWindow->AutoShow = TRUE; + pControlWindow->AutoShow = OATRUE; pControlWindow->hwndDrain = NULL; pControlWindow->hwndOwner = NULL; pControlWindow->pFilter = owner; -- 2.23.0

2 9

← Newer
1
...
17
18
19
20
21
22
23
...
27
Older →

Jump to page:

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 October 2019