wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Alexandre Julliard : msxml3: Only allow ASCII characters in number conversion.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: a75cc9e6262af8efbbc553bfbdc3a928773fd618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a75cc9e6262af8efbbc553bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 14:31:40 2020 +0100 msxml3: Only allow ASCII characters in number conversion. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/element.c | 2 +- dlls/msxml3/nodelist.c | 2 +- dlls/msxml3/nodemap.c | 2 +- dlls/msxml3/selection.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index a352621bfb3..05255508d4e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -520,7 +520,7 @@ static inline HRESULT variant_from_dt(XDR_DT dt, xmlChar* str, VARIANT* v) if(*p == '.') { p++; - while(isdigitW(*p)) p++; + while (*p >= '0' && *p <= '9') p++; } } diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 2c1d10efb6a..57b8ea823c1 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -312,7 +312,7 @@ static HRESULT xmlnodelist_get_dispid(IUnknown *iface, BSTR name, DWORD flags, D WCHAR *ptr; int idx = 0; - for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + for(ptr = name; *ptr >= '0' && *ptr <= '9'; ptr++) idx = idx*10 + (*ptr-'0'); if(*ptr) return DISP_E_UNKNOWNNAME; diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index a9fef4769dc..5ea083c4495 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -371,7 +371,7 @@ static HRESULT xmlnodemap_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DI WCHAR *ptr; int idx = 0; - for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + for(ptr = name; *ptr >= '0' && *ptr <= '9'; ptr++) idx = idx*10 + (*ptr-'0'); if(*ptr) return DISP_E_UNKNOWNNAME; diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index ede80627d7b..d05a1d6ffcb 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -595,7 +595,7 @@ static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags, WCHAR *ptr; int idx = 0; - for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + for(ptr = name; *ptr >= '0' && *ptr <= '9'; ptr++) idx = idx*10 + (*ptr-'0'); if(*ptr) return DISP_E_UNKNOWNNAME;

1 0

Alexandre Julliard : msxml3: Clear one extra variant in collection enumeration.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: b00e2df3e82bcf3213825bd12f1c2fb0237c47dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b00e2df3e82bcf3213825bd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 11:36:37 2020 +0100 msxml3: Clear one extra variant in collection enumeration. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmldoc.c | 7 +++++-- dlls/msxml3/xmlelem.c | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 7ad6e3177f7..94b5ea01f3b 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -647,7 +647,7 @@ static void test_xmlelem_collection(void) WCHAR path[MAX_PATH]; LONG length, type; ULONG num_vars; - VARIANT var[3], dummy, vIndex, vName; + VARIANT var[4], dummy, vIndex, vName; BSTR url, str; hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, @@ -789,12 +789,15 @@ static void test_xmlelem_collection(void) VariantClear(&var[1]); VariantClear(&var[0]); + memset( var, 0xcc, sizeof(var)); + /* request more elements than available */ - hr = IEnumVARIANT_Next(enumVar, 3, var, &num_vars); + hr = IEnumVARIANT_Next(enumVar, 4, var, &num_vars); ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); ok(V_VT(&var[0]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[0])); ok(V_VT(&var[1]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[1])); ok(V_VT(&var[2]) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&var[2])); + ok(V_VT(&var[3]) == 0xcccc, "Expected invalid, got %x\n", V_VT(&var[3])); ok(num_vars == 2, "Expected 2, got %d\n", num_vars); hr = IDispatch_QueryInterface(V_DISPATCH(&var[1]), &IID_IXMLElement, (LPVOID *)&child); diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 3addcbd19b5..f8778aae91d 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -774,11 +774,13 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next( hr = XMLElement_create(This->current, (void **)&V_DISPATCH(rgVar), FALSE); if (FAILED(hr)) return hr; This->current = This->current->next; - if (--celt && This->current) ++rgVar; if (fetched) ++*fetched; + rgVar++; + celt--; } - - return celt == 0 ? S_OK : S_FALSE; + if (!celt) return S_OK; + V_VT(rgVar) = VT_EMPTY; + return S_FALSE; } static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip(

1 0

Derek Lesho : mf/samplegrabber: Evaluate type compatibility by comparison to the initial type.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 133ba763e1f419dc23fd58ac82c6d8a73014ae22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=133ba763e1f419dc23fd58ac… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Nov 26 12:42:31 2020 +0300 mf/samplegrabber: Evaluate type compatibility by comparison to the initial type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 17 +++++--- dlls/mf/tests/mf.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 54e28b466c5..f60ce2a8433 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -72,6 +72,7 @@ struct sample_grabber IMFSampleGrabberSinkCallback *callback; IMFSampleGrabberSinkCallback2 *callback2; IMFMediaType *media_type; + IMFMediaType *current_media_type; BOOL is_shut_down; IMFMediaEventQueue *event_queue; IMFMediaEventQueue *stream_event_queue; @@ -572,7 +573,8 @@ static ULONG WINAPI sample_grabber_stream_type_handler_Release(IMFMediaTypeHandl static HRESULT sample_grabber_stream_is_media_type_supported(struct sample_grabber *grabber, IMFMediaType *in_type) { - const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; + const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | + MF_MEDIATYPE_EQUAL_FORMAT_DATA; DWORD flags; if (grabber->is_shut_down) @@ -631,9 +633,9 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_SetCurrentMediaType(IMF if (FAILED(hr = sample_grabber_stream_is_media_type_supported(grabber, media_type))) return hr; - IMFMediaType_Release(grabber->media_type); - grabber->media_type = media_type; - IMFMediaType_AddRef(grabber->media_type); + IMFMediaType_Release(grabber->current_media_type); + grabber->current_media_type = media_type; + IMFMediaType_AddRef(grabber->current_media_type); return S_OK; } @@ -651,7 +653,7 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetCurrentMediaType(IMF if (grabber->is_shut_down) return MF_E_STREAMSINK_REMOVED; - *media_type = grabber->media_type; + *media_type = grabber->current_media_type; IMFMediaType_AddRef(*media_type); return S_OK; @@ -669,7 +671,7 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetMajorType(IMFMediaTy if (grabber->is_shut_down) return MF_E_STREAMSINK_REMOVED; - return IMFMediaType_GetMajorType(grabber->media_type, type); + return IMFMediaType_GetMajorType(grabber->current_media_type, type); } static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = @@ -840,6 +842,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback_Release(grabber->callback); if (grabber->callback2) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); + IMFMediaType_Release(grabber->current_media_type); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) IMFMediaEventQueue_Release(grabber->event_queue); @@ -1411,6 +1414,8 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use } object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); + object->current_media_type = context->media_type; + IMFMediaType_AddRef(object->current_media_type); IMFAttributes_GetUINT32(attributes, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, &object->ignore_clock); IMFAttributes_GetUINT64(attributes, &MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, &object->sample_time_offset); list_init(&object->items); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 41ca385cc2b..fda80974724 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2562,6 +2562,109 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_sample_grabber_is_mediatype_supported(void) +{ + IMFMediaType *media_type, *media_type2, *media_type3; + IMFMediaTypeHandler *handler; + IMFActivate *activate; + IMFStreamSink *stream; + IMFMediaSink *sink; + ULONG refcount; + HRESULT hr; + GUID guid; + + /* IsMediaTypeSupported checks are done against the creation type, and check format data */ + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream); + ok(hr == S_OK, "Failed to get sink stream, hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + IMFStreamSink_Release(stream); + + IMFMediaSink_Release(sink); + + /* On Win8+ this initialization happens automatically. */ + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Failed to set media type, hr %#x.\n", hr); + + /* Make it match grabber type sample rate. */ + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type3); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + ok(media_type3 == media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type3); + + /* Change original type. */ + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n"); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n"); + + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + + IMFMediaTypeHandler_Release(handler); + + refcount = IMFActivate_Release(activate); + ok(!refcount, "Unexpected refcount %u.\n", refcount); +} + static BOOL is_supported_video_type(const GUID *guid) { return IsEqualGUID(guid, &MFVideoFormat_L8) @@ -4263,6 +4366,7 @@ START_TEST(mf) test_MFShutdownObject(); test_presentation_clock(); test_sample_grabber(); + test_sample_grabber_is_mediatype_supported(); test_video_processor(); test_quality_manager(); test_sar();

1 0

Hans Leidekker : wbemprox: Mark some string properties as dynamic.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 81e0a6225f1b21294ea244d660c7b556249cf401 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e0a6225f1b21294ea244d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 27 09:14:45 2020 +0100 wbemprox: Mark some string properties as dynamic. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index be22d8d3066..9bd58ca77e6 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -376,10 +376,10 @@ static const struct column col_sid[] = }; static const struct column col_sounddevice[] = { - { L"DeviceID", CIM_STRING }, + { L"DeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, - { L"PNPDeviceID", CIM_STRING }, + { L"PNPDeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ProductName", CIM_STRING }, { L"Status", CIM_STRING }, { L"StatusInfo", CIM_UINT16 },

1 0

Hans Leidekker : oledb32: Add a partial implementation of IErrorRecords_GetErrorInfo().
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: b7f70aa02682005abc6d82cf1a75b97ab23a117d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f70aa02682005abc6d82cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 27 09:14:44 2020 +0100 oledb32: Add a partial implementation of IErrorRecords_GetErrorInfo(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 2 +- dlls/oledb32/tests/database.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 985d5837a29..9987b2113bf 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -361,7 +361,7 @@ static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, if (index >= This->count) return DB_E_BADRECORDNUM; - return E_NOTIMPL; + return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, &IID_IErrorInfo, (void **)ppErrorInfo); } static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG index, DISPPARAMS *pdispparams) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index c2b7e0598dd..1897d57623f 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -486,6 +486,14 @@ static void test_errorinfo(void) ok(dispparams.cArgs == 1, "Got argument count %u\n", dispparams.cArgs); ok(dispparams.cNamedArgs == 1, "Got named argument count %u\n", dispparams.cNamedArgs); + EXPECT_REF(errrecs, 2); + EXPECT_REF(errorinfo, 2); + hr = IErrorRecords_GetErrorInfo(errrecs, 0, 0, &errorinfo2); + ok(hr == S_OK, "got %08x\n", hr); + ok(errorinfo == errorinfo2, "different object\n"); + EXPECT_REF(errorinfo, 3); + IErrorInfo_Release(errorinfo2); + free_dispparams(&dispparams); VariantClear(&arg);

1 0

Michael Stefaniuc : ole32: Use wide-char string literals in filemoniker.c.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 496c6734e4d89104ab189b38ad6cbb81c6fdec71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=496c6734e4d89104ab189b38… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 27 09:00:22 2020 +0000 ole32: Use wide-char string literals in filemoniker.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index e5978169ca1..d8c401c8978 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -657,8 +657,6 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, { HRESULT res; LPOLESTR str1=0,str2=0,*strDec1=0,*strDec2=0,newStr=0; - static const WCHAR twoPoint[]={'.','.',0}; - static const WCHAR bkSlash[]={'\\',0}; IBindCtx *bind=0; int i=0,j=0,lastIdx1=0,lastIdx2=0; DWORD mkSys, order; @@ -687,17 +685,15 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, lastIdx1=FileMonikerImpl_DecomposePath(str1,&strDec1)-1; lastIdx2=FileMonikerImpl_DecomposePath(str2,&strDec2)-1; - if ((lastIdx1==-1 && lastIdx2>-1)||(lastIdx1==1 && wcscmp(strDec1[0],twoPoint)==0)) + if ((lastIdx1 == -1 && lastIdx2 > -1) || (lastIdx1 == 1 && !wcscmp(strDec1[0], L".."))) res = MK_E_SYNTAX; else{ - if(wcscmp(strDec1[lastIdx1],bkSlash)==0) + if (!wcscmp(strDec1[lastIdx1], L"\\")) lastIdx1--; /* for each "..\" in the left of str2 remove the right element from str1 */ - for(i=0; ( (lastIdx1>=0) && (strDec2[i]!=NULL) && (wcscmp(strDec2[i],twoPoint)==0) ); i+=2){ - + for (i = 0; lastIdx1 >= 0 && strDec2[i] && !wcscmp(strDec2[i], L".."); i += 2) lastIdx1-=2; - } /* the length of the composed path string is increased by the sum of the two paths' lengths */ newStr=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(lstrlenW(str1)+lstrlenW(str2)+1)); @@ -707,8 +703,8 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, for(*newStr=0,j=0;j<=lastIdx1;j++) lstrcatW(newStr,strDec1[j]); - if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || wcscmp(strDec2[i],bkSlash)!=0) - lstrcatW(newStr,bkSlash); + if ((!strDec2[i] && lastIdx1 > -1 && lastIdx2 > -1) || wcscmp(strDec2[i], L"\\")) + lstrcatW(newStr, L"\\"); for(j=i;j<=lastIdx2;j++) lstrcatW(newStr,strDec2[j]); @@ -1016,7 +1012,6 @@ failed: */ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) { - static const WCHAR bSlash[] = {'\\',0}; LPOLESTR word; int i=0,j,tabIndex=0, ret=0; LPOLESTR *strgtable ; @@ -1040,7 +1035,8 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) while(str[i]!=0){ - if(str[i]==bSlash[0]){ + if (str[i] == L'\\') + { strgtable[tabIndex]=CoTaskMemAlloc(2*sizeof(WCHAR)); @@ -1050,14 +1046,14 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) goto lend; } - lstrcpyW(strgtable[tabIndex++],bSlash); + lstrcpyW(strgtable[tabIndex++], L"\\"); i++; } else { - for(j=0; str[i]!=0 && str[i]!=bSlash[0] ; i++,j++) + for (j = 0; str[i] && str[i] != L'\\'; i++, j++) word[j]=str[i]; word[j]=0; @@ -1103,7 +1099,6 @@ FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm HRESULT res; LPOLESTR str1=0,str2=0,*tabStr1=0,*tabStr2=0,relPath=0; DWORD len1=0,len2=0,sameIdx=0,j=0; - static const WCHAR back[] ={'.','.','\\',0}; TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath); @@ -1150,7 +1145,7 @@ FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm if (len2>0 && !(len1==1 && len2==1 && sameIdx==0)) for(j=sameIdx;(tabStr1[j] != NULL); j++) if (*tabStr1[j]!='\\') - lstrcatW(relPath,back); + lstrcatW(relPath, L"..\\"); /* add items of the second path (similar items with the first path are not included) to the relativePath */ for(j=sameIdx;tabStr2[j]!=NULL;j++) @@ -1340,8 +1335,6 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa int nb=0,i; int sizeStr=lstrlenW(lpszPathName); LPOLESTR *tabStr=0; - static const WCHAR twoPoint[]={'.','.',0}; - static const WCHAR bkSlash[]={'\\',0}; BOOL addBkSlash; TRACE("(%p,%s)\n",This,debugstr_w(lpszPathName)); @@ -1364,18 +1357,20 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa if (nb > 0 ){ addBkSlash = TRUE; - if (wcscmp(tabStr[0],twoPoint)!=0) + if (wcscmp(tabStr[0], L"..")) addBkSlash = FALSE; else for(i=0;i<nb;i++){ - if ( (wcscmp(tabStr[i],twoPoint)!=0) && (wcscmp(tabStr[i],bkSlash)!=0) ){ + if (wcscmp(tabStr[i], L"..") && wcscmp(tabStr[i], L"\\")) + { addBkSlash = FALSE; break; } else - if (wcscmp(tabStr[i],bkSlash)==0 && i<nb-1 && wcscmp(tabStr[i+1],bkSlash)==0){ + if (!wcscmp(tabStr[i], L"\\") && i < nb - 1 && !wcscmp(tabStr[i+1], L"\\")) + { *tabStr[i]=0; sizeStr--; addBkSlash = FALSE; @@ -1383,7 +1378,7 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa } } - if (wcscmp(tabStr[nb-1],bkSlash)==0) + if (!wcscmp(tabStr[nb-1], L"\\")) addBkSlash = FALSE; This->filePathName=HeapReAlloc(GetProcessHeap(),0,This->filePathName,(sizeStr+1)*sizeof(WCHAR)); @@ -1394,7 +1389,7 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa lstrcatW(This->filePathName,tabStr[i]); if (addBkSlash) - lstrcatW(This->filePathName,bkSlash); + lstrcatW(This->filePathName, L"\\"); } free_stringtable(tabStr); @@ -1447,11 +1442,10 @@ HRESULT FileMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, LPDWORD pchEaten, IMoniker **ppmk) { LPCWSTR end; - static const WCHAR wszSeparators[] = {':','\\','/','!',0}; for (end = szDisplayName + lstrlenW(szDisplayName); end && (end != szDisplayName); - end = memrpbrkW(szDisplayName, end - szDisplayName, wszSeparators)) + end = memrpbrkW(szDisplayName, end - szDisplayName, L":\\/!")) { HRESULT hr; IRunningObjectTable *rot; @@ -1538,7 +1532,6 @@ HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, { FileMonikerImpl* newFileMoniker; HRESULT hr; - static const WCHAR wszEmpty[] = { 0 }; TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); @@ -1551,7 +1544,7 @@ HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, if (!newFileMoniker) return E_OUTOFMEMORY; - hr = FileMonikerImpl_Construct(newFileMoniker, wszEmpty); + hr = FileMonikerImpl_Construct(newFileMoniker, L""); if (SUCCEEDED(hr)) hr = IMoniker_QueryInterface(&newFileMoniker->IMoniker_iface, riid, ppv);

1 0

Michael Stefaniuc : ole32: Use wide-char string literals.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 137acffdf41945bea86726165081621023c6186f URL: https://source.winehq.org/git/wine.git/?a=commit;h=137acffdf41945bea8672616… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 26 22:20:04 2020 +0100 ole32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 2 +- dlls/ole32/clipboard.c | 6 ++--- dlls/ole32/comcat.c | 8 +++---- dlls/ole32/compobj.c | 37 +++++++++++-------------------- dlls/ole32/datacache.c | 6 ++--- dlls/ole32/defaulthandler.c | 3 +-- dlls/ole32/itemmoniker.c | 3 +-- dlls/ole32/moniker.c | 6 ++--- dlls/ole32/ole2.c | 53 +++++++++++++-------------------------------- dlls/ole32/stg_prop.c | 6 ++--- dlls/ole32/storage32.c | 51 +++++++++++++++---------------------------- 11 files changed, 60 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=137acffdf41945bea867…

1 0

Zebediah Figura : vkd3d-compiler: Add support for running the HLSL preprocessor.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: vkd3d Branch: master Commit: 9a4a5ba63ebd6fd09fe711c6ed02d2f4af12ad1e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a4a5ba63ebd6fd09fe711c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 26 11:54:35 2020 -0600 vkd3d-compiler: Add support for running the HLSL preprocessor. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 3eee4bd..cec2ebb 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -163,6 +163,7 @@ static void print_usage(const char *program_name) " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" " -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n" + " -E Preprocess the source code instead of compiling it.\n" " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" " output file is specified, output will be written to\n" " standard output.\n" @@ -196,6 +197,7 @@ struct options const char *profile; enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; + bool preprocess_only; bool print_version; bool print_source_types; bool print_target_types; @@ -402,7 +404,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "b:e:ho:p:Vx:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "b:e:Eho:p:Vx:", long_options, NULL)) == -1) break; switch (option) @@ -429,6 +431,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->entry_point = optarg; break; + case 'E': + options->preprocess_only = true; + break; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -669,7 +675,11 @@ int main(int argc, char **argv) goto done; } - ret = vkd3d_shader_compile(&info, &output_code, &messages); + if (options.preprocess_only) + ret = vkd3d_shader_preprocess(&info, &output_code, &messages); + else + ret = vkd3d_shader_compile(&info, &output_code, &messages); + if (messages) fputs(messages, stderr); vkd3d_shader_free_messages(messages);

1 0

Zebediah Figura : vkd3d-compiler: Also pass the entry point as part of the SPIR-V target information.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: vkd3d Branch: master Commit: 584f84737b2b8a49a4f4af76db27522138bf046a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=584f84737b2b8a49a4f4af7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 26 11:54:34 2020 -0600 vkd3d-compiler: Also pass the entry point as part of the SPIR-V target information. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index bcca04c..3eee4bd 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -583,6 +583,7 @@ static bool has_colour(FILE *f) int main(int argc, char **argv) { + struct vkd3d_shader_spirv_target_info spirv_target_info = {0}; struct vkd3d_shader_hlsl_source_info hlsl_source_info = {0}; bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; @@ -654,9 +655,14 @@ int main(int argc, char **argv) info.source_name = options.filename; hlsl_source_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; + hlsl_source_info.next = &spirv_target_info; hlsl_source_info.profile = options.profile; hlsl_source_info.entry_point = options.entry_point; + spirv_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; + spirv_target_info.entry_point = options.entry_point; + spirv_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; + if (!read_shader(&info.source, input)) { fprintf(stderr, "Failed to read input shader.\n");

1 0

Zebediah Figura : vkd3d-compiler: Rename the 'spirv' local variable to 'output_code'.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: vkd3d Branch: master Commit: 2164915450881d6a9cb3b91d262b23ea0b7d2292 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2164915450881d6a9cb3b91… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 26 11:54:33 2020 -0600 vkd3d-compiler: Rename the 'spirv' local variable to 'output_code'. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 7a1a5b0..bcca04c 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -586,7 +586,7 @@ int main(int argc, char **argv) struct vkd3d_shader_hlsl_source_info hlsl_source_info = {0}; bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; - struct vkd3d_shader_code spirv; + struct vkd3d_shader_code output_code; struct options options; FILE *input, *output; char *messages; @@ -663,7 +663,7 @@ int main(int argc, char **argv) goto done; } - ret = vkd3d_shader_compile(&info, &spirv, &messages); + ret = vkd3d_shader_compile(&info, &output_code, &messages); if (messages) fputs(messages, stderr); vkd3d_shader_free_messages(messages); @@ -674,15 +674,15 @@ int main(int argc, char **argv) goto done; } - if (!write_shader(&spirv, output)) + if (!write_shader(&output_code, output)) { fprintf(stderr, "Failed to write output shader.\n"); - vkd3d_shader_free_shader_code(&spirv); + vkd3d_shader_free_shader_code(&output_code); goto done; } fail = 0; - vkd3d_shader_free_shader_code(&spirv); + vkd3d_shader_free_shader_code(&output_code); done: if (close_output) fclose(output);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
86
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-commits November 2020