November 2019 - Wine-Commits

Connor McAdams : d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByIndex() method.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: a812c1a5ef177567db2e8f8d389d2f6f32399363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a812c1a5ef177567db2e8f8d… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu Nov 14 20:59:57 2019 +0100 d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByIndex() method. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 34a9984768..5c08cdf5e4 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -2077,9 +2077,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetDesc static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByIndex( ID3D10ShaderReflectionConstantBuffer *iface, UINT index) { - FIXME("iface %p, index %d stub!\n", iface, index); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D10ShaderReflectionConstantBuffer(iface); - return &null_variable.ID3D10ShaderReflectionVariable_iface; + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= cb->variable_count) + { + WARN("Invalid index specified.\n"); + return &null_variable.ID3D10ShaderReflectionVariable_iface; + } + + return &cb->variables[index].ID3D10ShaderReflectionVariable_iface; } static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByName(

1 0

Matteo Bruni : d3d10/tests: Add reflection test.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: 1559f6013c212639e41f9555ead7c30e4d43317b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1559f6013c212639e41f9555… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 14 21:00:00 2019 +0100 d3d10/tests: Add reflection test. Share and reuse most of the d3dcompiler test. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/Makefile.in | 5 +- dlls/d3d10/tests/device.c | 1 - dlls/d3dcompiler_43/tests/reflection.c | 103 +++++++++++++++++++++++++++------ 3 files changed, 88 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1559f6013c212639e41f…

1 0

Rémi Bernon : winmm: Fix int-to-pointer and pointer-to-int casts warnings.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: 0ef9ebde9f5ccd8eb9905c8a71a2184b61aa2610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ef9ebde9f5ccd8eb9905c8a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:23 2019 +0100 winmm: Fix int-to-pointer and pointer-to-int casts warnings. The stream pointer was used as the DWORD id, which is only going to work on 32bit. It may very well be that winmm is only used in 32bit, but then we still build a 64bit version of it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0f0cd946d1..9075a78f34 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -54,6 +54,7 @@ #include "winemm.h" #include "wine/debug.h" +#include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(winmm); @@ -72,12 +73,16 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; CRITICAL_SECTION WINMM_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static struct wine_rb_tree wine_midi_streams; +static int wine_midi_stream_compare(const void *key, const struct wine_rb_entry *entry); + /************************************************************************** * WINMM_CreateIData [internal] */ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; + wine_rb_init(&wine_midi_streams, wine_midi_stream_compare); psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); return psLastEvent != NULL; } @@ -924,6 +929,8 @@ typedef struct WINE_MIDIStream { WORD status; HANDLE hEvent; LPMIDIHDR lpMidiHdr; + DWORD dwStreamID; + struct wine_rb_entry entry; } WINE_MIDIStream; #define WINE_MSM_HEADER (WM_USER+0) @@ -935,12 +942,50 @@ typedef struct WINE_MIDIStream { #define MSM_STATUS_PAUSED WINE_MSM_PAUSE #define MSM_STATUS_PLAYING WINE_MSM_RESUME +static int wine_midi_stream_compare(const void *key, const struct wine_rb_entry *entry) +{ + WINE_MIDIStream *stream = WINE_RB_ENTRY_VALUE(entry, struct WINE_MIDIStream, entry); + return memcmp(key, &stream->dwStreamID, sizeof(stream->dwStreamID)); +} + +static WINE_MIDIStream *wine_midi_stream_allocate(void) +{ + DWORD stream_id = 1; + WINE_MIDIStream *stream = NULL; + + EnterCriticalSection(&WINMM_cs); + + while (stream_id < 0xFFFFFFFF && wine_rb_get(&wine_midi_streams, &stream_id)) + stream_id++; + + if (stream_id < 0xFFFFFFFF && + (stream = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)))) + { + stream->dwStreamID = stream_id; + wine_rb_put(&wine_midi_streams, &stream_id, &stream->entry); + } + + LeaveCriticalSection(&WINMM_cs); + return stream; +} + +static void wine_midi_stream_free(WINE_MIDIStream *stream) +{ + EnterCriticalSection(&WINMM_cs); + + wine_rb_remove(&wine_midi_streams, &stream->entry); + HeapFree(GetProcessHeap(), 0, stream); + + LeaveCriticalSection(&WINMM_cs); +} + /************************************************************************** * MMSYSTEM_GetMidiStream [internal] */ static BOOL MMSYSTEM_GetMidiStream(HMIDISTRM hMidiStrm, WINE_MIDIStream** lpMidiStrm, WINE_MIDI** lplpwm) { WINE_MIDI* lpwm = (LPWINE_MIDI)MMDRV_Get(hMidiStrm, MMDRV_MIDIOUT, FALSE); + struct wine_rb_entry *entry; if (lplpwm) *lplpwm = lpwm; @@ -949,7 +994,10 @@ static BOOL MMSYSTEM_GetMidiStream(HMIDISTRM hMidiStrm, WINE_MIDIStream** lpMidi return FALSE; } - *lpMidiStrm = (WINE_MIDIStream*)lpwm->mod.rgIds.dwStreamID; + EnterCriticalSection(&WINMM_cs); + if ((entry = wine_rb_get(&wine_midi_streams, &lpwm->mod.rgIds.dwStreamID))) + *lpMidiStrm = WINE_RB_ENTRY_VALUE(entry, struct WINE_MIDIStream, entry); + LeaveCriticalSection(&WINMM_cs); return *lpMidiStrm != NULL; } @@ -1106,7 +1154,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI #endif if (((LPMIDIEVENT)lpData)->dwStreamID != 0 && ((LPMIDIEVENT)lpData)->dwStreamID != 0xFFFFFFFF && - ((LPMIDIEVENT)lpData)->dwStreamID != (DWORD)lpMidiStrm) { + ((LPMIDIEVENT)lpData)->dwStreamID != lpMidiStrm->dwStreamID) { FIXME("Dropping bad %s lpMidiHdr (streamID=%08x)\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", ((LPMIDIEVENT)lpData)->dwStreamID); @@ -1301,7 +1349,7 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) if(!ret) { lpMidiStrm->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&lpMidiStrm->lock); - HeapFree(GetProcessHeap(), 0, lpMidiStrm); + wine_midi_stream_free(lpMidiStrm); } return midiOutClose((HMIDIOUT)hMidiStrm); @@ -1330,7 +1378,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, if (ret != MMSYSERR_NOERROR) return ret; - lpMidiStrm = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)); + lpMidiStrm = wine_midi_stream_allocate(); if (!lpMidiStrm) return MMSYSERR_NOMEM; @@ -1341,7 +1389,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->status = MSM_STATUS_PAUSED; lpMidiStrm->dwElapsedMS = 0; - mosm.dwStreamID = (DWORD)lpMidiStrm; + mosm.dwStreamID = lpMidiStrm->dwStreamID; /* FIXME: the correct value is not allocated yet for MAPPER */ mosm.wDeviceID = *lpuDeviceID; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm);

1 0

Rémi Bernon : winealsa.drv: Increase buffer size to fix format-overflow warning.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: a8e7523ff164b111aedce5d8a2f0b5c07b6fb749 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e7523ff164b111aedce5d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:19 2019 +0100 winealsa.drv: Increase buffer size to fix format-overflow warning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c2fe59ea79..09f98dc7b8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -631,7 +631,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, static snd_config_t *make_handle_underrun_config(const char *name) { snd_config_t *lconf, *dev_node, *hu_node, *type_node; - char dev_node_name[64]; + char dev_node_name[260]; const char *type_str; int err;

1 0

Alistair Leslie-Hughes : dmime: SegTrigger track supports parameter GUID_IDirectMusicStyle.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: 14e36e619433c30b58ed0c280034cd7d1c49be1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=14e36e619433c30b58ed0c28… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 14 20:40:24 2019 +0100 dmime: SegTrigger track supports parameter GUID_IDirectMusicStyle. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segtriggertrack.c | 15 +++++++++------ dlls/dmime/tests/dmime.c | 10 ++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 37d7e46d20..4b3a71c9a4 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -136,14 +136,17 @@ static HRESULT WINAPI segment_track_SetParam(IDirectMusicTrack8 *iface, REFGUID return S_OK; } -static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); + + if (IsEqualGUID(type, &GUID_IDirectMusicStyle)) + return S_OK; - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI segment_track_AddNotificationType(IDirectMusicTrack8 *iface, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index b7bf542fd8..944a278dbb 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -565,6 +565,16 @@ static void test_track(void) ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %08x\n", hr); hr = IDirectMusicTrack_IsParamSupported(dmt, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %08x\n", hr); + + hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); + ok(hr == E_NOTIMPL, "got: %08x\n", hr); + } + else { + hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); + if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) + ok(hr == S_OK, "got: %08x\n", hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr); } if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && class[i].clsid != &CLSID_DirectMusicTimeSigTrack) {

1 0

Connor McAdams : d3dcompiler: Implement ID3D10ShaderReflectionVariable GetType() method.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: c2325190764e69a723e46deb79e8c7502ee8efba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2325190764e69a723e46deb… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu Nov 14 20:59:56 2019 +0100 d3dcompiler: Implement ID3D10ShaderReflectionVariable GetType() method. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 93819534e6..34a9984768 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -2133,9 +2133,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_variable_GetDesc(ID3D10 static ID3D10ShaderReflectionType * STDMETHODCALLTYPE d3d10_shader_reflection_variable_GetType( ID3D10ShaderReflectionVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dcompiler_shader_reflection_variable *var = impl_from_ID3D10ShaderReflectionVariable(iface); - return &null_type.ID3D10ShaderReflectionType_iface; + TRACE("iface %p.\n", iface); + + return &var->type->ID3D10ShaderReflectionType_iface; } static const struct ID3D10ShaderReflectionVariableVtbl d3d10_shader_reflection_variable_vtbl =

1 0

Connor McAdams : d3dcompiler: Implement ID3D10ShaderReflectionType.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: a3b6d5646d39bd981541098325b6d8fb144eeaa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b6d5646d39bd9815410983… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu Nov 14 20:59:55 2019 +0100 d3dcompiler: Implement ID3D10ShaderReflectionType. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 107 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index a79439a3fe..93819534e6 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1312,6 +1312,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d return NULL; type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3dcompiler_shader_reflection_type_vtbl; + type->ID3D10ShaderReflectionType_iface.lpVtbl = &d3d10_shader_reflection_type_vtbl; type->id = offset; type->reflection = reflection; @@ -2143,6 +2144,112 @@ static const struct ID3D10ShaderReflectionVariableVtbl d3d10_shader_reflection_v d3d10_shader_reflection_variable_GetType, }; +static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D10ShaderReflectionType( + ID3D10ShaderReflectionType *iface) +{ + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_type, ID3D10ShaderReflectionType_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_type_GetDesc(ID3D10ShaderReflectionType *iface, + D3D10_SHADER_TYPE_DESC *desc) +{ + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + if (type == &null_type) + { + WARN("Null type specified.\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified.\n"); + return E_FAIL; + } + + memcpy(desc, &type->desc, sizeof(*desc)); + + return S_OK; +} + +static ID3D10ShaderReflectionType * STDMETHODCALLTYPE d3d10_shader_reflection_type_GetMemberTypeByIndex( + ID3D10ShaderReflectionType *iface, UINT index) +{ + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= type->desc.Members) + { + WARN("Invalid index specified.\n"); + return &null_type.ID3D10ShaderReflectionType_iface; + } + + return &type->members[index].type->ID3D10ShaderReflectionType_iface; +} + +static ID3D10ShaderReflectionType * STDMETHODCALLTYPE d3d10_shader_reflection_type_GetMemberTypeByName( + ID3D10ShaderReflectionType *iface, const char *name) +{ + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface); + unsigned int i; + + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified.\n"); + return &null_type.ID3D10ShaderReflectionType_iface; + } + + for (i = 0; i < type->desc.Members; ++i) + { + struct d3dcompiler_shader_reflection_type_member *member = &type->members[i]; + + if (!strcmp(member->name, name)) + { + TRACE("Returning ID3D10ShaderReflectionType %p.\n", member->type); + return &member->type->ID3D10ShaderReflectionType_iface; + } + } + + WARN("Invalid name specified.\n"); + + return &null_type.ID3D10ShaderReflectionType_iface; +} + +static const char * STDMETHODCALLTYPE d3d10_shader_reflection_type_GetMemberTypeName( + ID3D10ShaderReflectionType *iface, UINT index) +{ + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (type == &null_type) + { + WARN("Null type specified.\n"); + return "$Invalid"; + } + + if (index >= type->desc.Members) + { + WARN("Invalid index specified.\n"); + return NULL; + } + + return type->members[index].name; +} + +static const struct ID3D10ShaderReflectionTypeVtbl d3d10_shader_reflection_type_vtbl = +{ + d3d10_shader_reflection_type_GetDesc, + d3d10_shader_reflection_type_GetMemberTypeByIndex, + d3d10_shader_reflection_type_GetMemberTypeByName, + d3d10_shader_reflection_type_GetMemberTypeName, +}; + HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) { struct d3dcompiler_shader_reflection *object;

1 0

Connor McAdams : d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByName() method.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: 44e65ebd7c9ad293c2f150ff5fad6d5f746e169f URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e65ebd7c9ad293c2f150ff… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu Nov 14 20:59:58 2019 +0100 d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByName() method. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5c08cdf5e4..820e5c239f 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -2093,7 +2093,29 @@ static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflectio static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByName( ID3D10ShaderReflectionConstantBuffer *iface, const char *name) { - FIXME("iface %p, name %s stub!\n", iface, name); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D10ShaderReflectionConstantBuffer(iface); + unsigned int i; + + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified.\n"); + return &null_variable.ID3D10ShaderReflectionVariable_iface; + } + + for (i = 0; i < cb->variable_count; ++i) + { + struct d3dcompiler_shader_reflection_variable *v = &cb->variables[i]; + + if (!strcmp(v->name, name)) + { + TRACE("Returning ID3D10ShaderReflectionVariable %p.\n", v); + return &v->ID3D10ShaderReflectionVariable_iface; + } + } + + WARN("Invalid name specified.\n"); return &null_variable.ID3D10ShaderReflectionVariable_iface; }

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_light().
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: 71d9f15cd43fa61026ed070cb1dce9c8f4456742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d9f15cd43fa61026ed070c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 13 21:47:47 2019 -0600 wined3d: Introduce wined3d_stateblock_set_light(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 41 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 933ad46a93..bf1e577f85 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1640,6 +1640,44 @@ HRESULT CDECL wined3d_stateblock_set_stream_source_freq(struct wined3d_statebloc stateblock->changed.streamFreq |= 1u << stream_idx; return WINED3D_OK; } +HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock, + UINT light_idx, const struct wined3d_light *light) +{ + struct wined3d_light_info *object = NULL; + + TRACE("stateblock %p, light_idx %u, light %p.\n", stateblock, light_idx, light); + + /* Check the parameter range. Need for speed most wanted sets junk lights + * which confuse the GL driver. */ + if (!light) + return WINED3DERR_INVALIDCALL; + + switch (light->type) + { + case WINED3D_LIGHT_POINT: + case WINED3D_LIGHT_SPOT: + case WINED3D_LIGHT_GLSPOT: + /* Incorrect attenuation values can cause the gl driver to crash. + * Happens with Need for speed most wanted. */ + if (light->attenuation0 < 0.0f || light->attenuation1 < 0.0f || light->attenuation2 < 0.0f) + { + WARN("Attenuation is negative, returning WINED3DERR_INVALIDCALL.\n"); + return WINED3DERR_INVALIDCALL; + } + break; + + case WINED3D_LIGHT_DIRECTIONAL: + case WINED3D_LIGHT_PARALLELPOINT: + /* Ignores attenuation */ + break; + + default: + WARN("Light type out of range, returning WINED3DERR_INVALIDCALL.\n"); + return WINED3DERR_INVALIDCALL; + } + + return wined3d_light_state_set_light(&stateblock->stateblock_state.light_state, light_idx, light, &object); +} static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a4caebe718..8591aa5164 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -267,6 +267,7 @@ @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) @ cdecl wined3d_stateblock_set_index_buffer(ptr ptr long) +@ cdecl wined3d_stateblock_set_light(ptr long ptr) @ cdecl wined3d_stateblock_set_material(ptr ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a05305f4d6..33f668f934 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2675,6 +2675,8 @@ HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *sta UINT plane_idx, const struct wined3d_vec4 *plane); void __cdecl wined3d_stateblock_set_index_buffer(struct wined3d_stateblock *stateblock, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); +HRESULT __cdecl wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock, + UINT light_idx, const struct wined3d_light *light); void __cdecl wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, const struct wined3d_material *material); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock,

1 0

Francois Gouget : kernel32: Match the Windows 10 1709+ SetConsoleFont() implementation.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: da238dc1d11cb57333de40d5ec76985c75f39130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da238dc1d11cb57333de40d5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 14 00:29:58 2019 +0100 kernel32: Match the Windows 10 1709+ SetConsoleFont() implementation. That is return the same 'E_NOTIMPL' error code. Remove the todo_wine-s but keep the tests in case we want to implement the API for compatibility with old Windows versions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 2 +- dlls/kernel32/tests/console.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4c0bee2caf..a698e53efe 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1627,7 +1627,7 @@ DWORD WINAPI GetNumberOfConsoleFonts(void) BOOL WINAPI SetConsoleFont(HANDLE hConsole, DWORD index) { FIXME("(%p, %u): stub!\n", hConsole, index); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); return FALSE; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 171b2dad4d..1ecb350673 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2973,12 +2973,12 @@ static void test_SetConsoleFont(HANDLE std_output) skip("SetConsoleFont is not implemented\n"); return; } - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleFont(GetStdHandle(STD_INPUT_HANDLE), 0); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); pGetNumberOfConsoleFonts = (void *)GetProcAddress(hmod, "GetNumberOfConsoleFonts"); if (!pGetNumberOfConsoleFonts)

1 0