wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Michael Stefaniuc : dmstyle: Implement IsParamSupported() for the Audition track.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 274427aa6ac8cd298532328a7b773c4fc372ddf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=274427aa6ac8cd298532328a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 19 21:02:52 2019 +0100 dmstyle: Implement IsParamSupported() for the Audition track. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/auditiontrack.c | 28 ++++++++++++++++++++-------- dlls/dmstyle/tests/dmstyle.c | 20 +++++++++----------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 7555da0c6c..9d45f1bcd0 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -137,18 +137,30 @@ static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID return S_OK; } -static HRESULT WINAPI audition_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI audition_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); + static const GUID *valid[] = { + &GUID_DisableTimeSig, + &GUID_EnableTimeSig, + &GUID_SeedVariations, + &GUID_Valid_Start_Time, + &GUID_Variations + }; + unsigned int i; + - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); + + if (!type) + return E_POINTER; - if (!rguidType) - return E_POINTER; + for (i = 0; i < ARRAY_SIZE(valid); i++) + if (IsEqualGUID(type, valid[i])) + return S_OK; - /* 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 audition_track_AddNotificationType(IDirectMusicTrack8 *iface, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 6419f6f810..a63d1dbd1c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -286,16 +286,15 @@ static void test_track(void) const char *name; BOOL has_save; BOOL has_join; - /* bitfields with supported param types */ + /* bitfield with supported param types */ unsigned int has_params; - unsigned int todo_params; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, - { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 0 }, - { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, - { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, - { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, - { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200, 0 }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002 }, + { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38 }, + { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200 }, + { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000 }, + { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200 }, }; #undef X unsigned int i, j; @@ -329,9 +328,8 @@ static void test_track(void) for (j = 0; j < ARRAY_SIZE(param_types); j++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type); if (class[i].has_params & (1 << j)) - todo_wine_if(class[i].todo_params & (1 << j)) - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", - param_types[j].name, hr); + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); else ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",

1 0

Alistair Leslie-Hughes : dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: de11d172dc701740fb58fc9510eb344b23210f20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de11d172dc701740fb58fc95… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 18 03:07:53 2019 +0000 dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam. 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/dmstyle/styletrack.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index cc15bd81d1..06fe1c7ca8 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -132,15 +132,31 @@ static HRESULT WINAPI style_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + struct list *item = NULL; - if (!rguidType) + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; + if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) { + LIST_FOR_EACH (item, &This->Items) { + DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry); + if (style->pObject) { + IDirectMusicStyle8_AddRef(style->pObject); + *((IDirectMusicStyle8**)param) = style->pObject; + + return S_OK; + } + } + + return DMUS_E_NOT_FOUND; + } + return S_OK; }

1 0

Michael Stefaniuc : dmcompos/tests: Check all IDirectMusicTrack_IsParamSupported() types.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: bcab0696e01fff9a7dd8de1627dc117d1af3c360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcab0696e01fff9a7dd8de16… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 19 21:02:50 2019 +0100 dmcompos/tests: Check all IDirectMusicTrack_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/tests/dmcompos.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index d23f5d6dae..e5cb7da8ad 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -270,6 +270,42 @@ static void test_chordmaptrack(void) CLSID class; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } unsupported[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) }, + }; +#undef X + unsigned int i; hr = CoCreateInstance(&CLSID_DirectMusicChordMapTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); @@ -290,8 +326,18 @@ static void test_chordmaptrack(void) hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); + ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + unsupported[i].name, hr); + } + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL);

1 0

Michael Stefaniuc : dmstyle: The Chord track doesn't support the BandParam type.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: f5ad835ec3bcfbce2039a994577f2dd27fc48957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5ad835ec3bcfbce2039a994… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 19 21:02:51 2019 +0100 dmstyle: The Chord track doesn't support the BandParam type. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/chordtrack.c | 25 +++++++++++-------------- dlls/dmstyle/tests/dmstyle.c | 9 ++++----- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index cb690b04dc..09d0bf3c9f 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -140,23 +140,20 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rg return S_OK; } -static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - if (!rguidType) - return E_POINTER; + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); - if (IsEqualGUID (rguidType, &GUID_BandParam) - || IsEqualGUID (rguidType, &GUID_ChordParam) - || IsEqualGUID (rguidType, &GUID_RhythmParam)) { - TRACE("param supported\n"); - return S_OK; - } - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + if (!type) + return E_POINTER; + + if (IsEqualGUID(type, &GUID_ChordParam) || IsEqualGUID(type, &GUID_RhythmParam)) + return S_OK; + + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI chord_track_AddNotificationType(IDirectMusicTrack8 *iface, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 0c17ef3b41..6419f6f810 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -291,7 +291,7 @@ static void test_track(void) unsigned int todo_params; } class[] = { { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, - { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 0 }, { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, @@ -333,10 +333,9 @@ static void test_track(void) ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", param_types[j].name, hr); else - todo_wine_if(class[i].todo_params & (1 << j)) - ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", - param_types[j].name, hr); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); } if (class[i].clsid == &CLSID_DirectMusicMuteTrack) {

1 0

Alistair Leslie-Hughes : dmime: Rewrite IDirectMusicSegment8 GetParam.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: cec8d5c968ed6c5708f7d94192bf93f631e13781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cec8d5c968ed6c5708f7d941… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 19 21:02:49 2019 +0100 dmime: Rewrite IDirectMusicSegment8 GetParam. 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/segment.c | 78 +++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index d47c2f2c23..3c0d4ac567 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -366,58 +366,50 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_RemoveNotificationType(IDirectMus } static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface, - REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, - void *pParam) + REFGUID type, DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next, + void *param) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - CLSID pIt_clsid; - struct list* pEntry = NULL; - IDirectMusicTrack* pTrack = NULL; - IPersistStream* pCLSIDStream = NULL; - LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; - HRESULT hr = S_OK; + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + struct list *item; + IDirectMusicTrack *track; + DMUS_PRIVATE_SEGMENT_TRACK *segment; + HRESULT hr; - FIXME("(%p, %s, 0x%x, %d, %d, %p, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); - - if (DMUS_SEG_ANYTRACK == dwIndex) { - - LIST_FOR_EACH (pEntry, &This->Tracks) { - pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); + FIXME("(%p, %s, 0x%x, %d, %d, %p, %p) Semi-stub\n", This, debugstr_dmguid(type), group, + index, time, next, param); - hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); - if (FAILED(hr)) { - ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack); - continue ; - } + if (index == DMUS_SEG_ANYTRACK || group == 0xffffffff) { + if (group == 0xffffffff && index != DMUS_SEG_ANYTRACK) + WARN("Any group doesnt have DMUS_SEG_ANYTRACK index.\n"); - TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + LIST_FOR_EACH (item, &This->Tracks) { + segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry); - if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ; - hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid); - IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL; - if (FAILED(hr)) { - ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack); - continue ; - } - if (FALSE == IsEqualGUID(&pIt_clsid, rguidType)) continue ; - if (FAILED(IDirectMusicTrack_IsParamSupported(pIt->pTrack, rguidType))) continue ; - hr = IDirectMusicTrack_GetParam(pIt->pTrack, rguidType, mtTime, pmtNext, pParam); - if (SUCCEEDED(hr)) return hr; + TRACE(" - %p -> 0x%x,%p\n", segment, segment->dwGroupBits, segment->pTrack); + + if (group != 0xffffffff && !(segment->dwGroupBits & group)) + continue; + if (FAILED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type))) + continue; + hr = IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param); + if (SUCCEEDED(hr)) + return hr; + } + + WARN("(%p): not found\n", This); + return DMUS_E_TRACK_NOT_FOUND; } - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } - hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, dwGroupBits, dwIndex, &pTrack); - if (FAILED(hr)) { - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } + hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, index, &track); + if (FAILED(hr)) { + ERR("(%p): not found\n", This); + return DMUS_E_TRACK_NOT_FOUND; + } - hr = IDirectMusicTrack_GetParam(pTrack, rguidType, mtTime, pmtNext, pParam); - IDirectMusicTrack_Release(pTrack); pTrack = NULL; + hr = IDirectMusicTrack_GetParam(track, type, time, next, param); + IDirectMusicTrack_Release(track); - return hr; + return hr; } static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *iface,

1 0

João Diogo Ferreira : kernel32: Handle GEOCLASS_ALL in EnumSystemGeoID().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 2a03c0958b1d15e7684b9437e67bf327098bcfde URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a03c0958b1d15e7684b9437… Author: João Diogo Ferreira <devilj(a)outlook.pt> Date: Mon Nov 18 02:27:24 2019 +0000 kernel32: Handle GEOCLASS_ALL in EnumSystemGeoID(). Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 25 +++++++++++++++++++------ dlls/kernel32/tests/locale.c | 13 +++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e5e32d3cb5..b2a5831a9e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4247,16 +4247,28 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L /****************************************************************************** * EnumSystemGeoID (KERNEL32.@) * - * Call a users function for every location available on the system. + * Calls a user's function for every location available on the system. * * PARAMS - * geoclass [I] Type of information desired (SYSGEOTYPE enum from "winnls.h") - * parent [I] GEOID for the parent - * enumproc [I] Callback function to call for each location + * geoclass [I] Type of location desired (SYSGEOTYPE enum from "winnls.h") + * parent [I] GeoID for the parent + * enumproc [I] Callback function to call for each location (prototype in "winnls.h") * * RETURNS * Success: TRUE. * Failure: FALSE. Use GetLastError() to determine the cause. + * + * NOTES + * The enumproc function returns TRUE to continue enumerating + * or FALSE to interrupt the enumeration. + * + * On failure, GetLastError() returns one of the following values: + * - ERROR_INVALID_PARAMETER: no callback function was provided. + * - ERROR_INVALID_FLAGS: the location type was invalid. + * + * TODO + * On Windows 10, this function filters out those locations which + * simultaneously lack ISO and UN codes (e.g. Johnson Atoll). */ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumproc) { @@ -4269,7 +4281,7 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr return FALSE; } - if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION) { + if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION && geoclass != GEOCLASS_ALL) { SetLastError(ERROR_INVALID_FLAGS); return FALSE; } @@ -4277,9 +4289,10 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) { const struct geoinfo_t *ptr = &geoinfodata[i]; - if (geoclass == GEOCLASS_NATION && (ptr->kind == LOCATION_REGION)) + if (geoclass == GEOCLASS_NATION && (ptr->kind != LOCATION_NATION)) continue; + /* LOCATION_BOTH counts as region. */ if (geoclass == GEOCLASS_REGION && (ptr->kind == LOCATION_NATION)) continue; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index aaaf09cf5c..45cb11d254 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4981,6 +4981,19 @@ static void test_EnumSystemGeoID(void) ret = pEnumSystemGeoID(GEOCLASS_REGION, 0, test_geoid_enumproc2); ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); } + + geoidenum_count = 0; + ret = pEnumSystemGeoID(GEOCLASS_ALL, 39070, test_geoid_enumproc2); + if (ret == 0) + win_skip("GEOCLASS_ALL is not supported in EnumSystemGeoID.\n"); + else + { + ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); + + geoidenum_count = 0; + ret = pEnumSystemGeoID(GEOCLASS_ALL, 0, test_geoid_enumproc2); + ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); + } } struct invariant_entry {

1 0

Derek Lesho : setupapi: Add SetupGetInfDriverStoreLocationW stub.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: f1b94dc16c35a5c477b6df8aa94c6d3537642c77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1b94dc16c35a5c477b6df8a… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 18 16:20:12 2019 -0600 setupapi: Add SetupGetInfDriverStoreLocationW stub. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/query.c | 14 ++++++++++++++ dlls/setupapi/setupapi.spec | 1 + 2 files changed, 15 insertions(+) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index ea1b969618..828d8a1145 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -717,3 +717,17 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( return TRUE; } + +/*********************************************************************** + * SetupGetInfDriverStoreLocationW (SETUPAPI.@) + */ +BOOL WINAPI SetupGetInfDriverStoreLocationW( + PCWSTR FileName, PSP_ALTPLATFORM_INFO AlternativePlatformInfo, + PCWSTR LocaleName, PWSTR ReturnBuffer, DWORD ReturnBufferSize, + PDWORD RequiredSize) +{ + FIXME("stub: %s %p %s %p %u %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 81256a3417..8c4ebcc101 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -421,6 +421,7 @@ @ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr) @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) +@ stdcall SetupGetInfDriverStoreLocationW(wstr ptr wstr ptr long ptr) @ stdcall SetupGetInfFileListA(str long ptr long ptr) @ stdcall SetupGetInfFileListW(wstr long ptr long ptr) @ stdcall SetupGetInfInformationA(ptr long ptr long ptr)

1 0

Alexandre Julliard : kernel32/tests: Get rid of Unicode helper functions.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: e8ef4c0f53720243f8bccfdfec7f87cf75e0ed7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8ef4c0f53720243f8bccfdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 15:36:22 2019 +0100 kernel32/tests: Get rid of Unicode helper functions. --- dlls/kernel32/tests/locale.c | 57 +++++++++++++------------------------------- 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9a13693443..aaaf09cf5c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -48,33 +48,6 @@ static const WCHAR fooW[] = {'f','o','o',0}; static const WCHAR emptyW[] = {0}; static const WCHAR invalidW[] = {'i','n','v','a','l','i','d',0}; -static inline unsigned int strlenW( const WCHAR *str ) -{ - const WCHAR *s = str; - while (*s) s++; - return s - str; -} - -static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - if (n <= 0) return 0; - while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - -static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) -{ - do { if (*str == ch) return (WCHAR *)str; } while (*str++); - return NULL; -} - -static inline BOOL isdigitW( WCHAR wc ) -{ - WORD type; - GetStringTypeW( CT_CTYPE1, &wc, 1, &type ); - return type & C1_DIGIT; -} - /* Some functions are only in later versions of kernel32.dll */ static WORD enumCount; @@ -171,7 +144,7 @@ static void InitFunctionPointers(void) MultiByteToWideChar(CP_ACP,0,y,-1,Expected,ARRAY_SIZE(Expected)); \ SetLastError(0xdeadbeef); buffer[0] = '\0' #define EXPECT_LENW ok(ret == lstrlenW(Expected)+1, "Expected Len %d, got %d\n", lstrlenW(Expected)+1, ret) -#define EXPECT_EQW ok(strncmpW(buffer, Expected, strlenW(Expected)) == 0, "Bad conversion\n") +#define EXPECT_EQW ok(wcsncmp(buffer, Expected, lstrlenW(Expected)) == 0, "Bad conversion\n") #define NUO LOCALE_NOUSEROVERRIDE @@ -681,7 +654,7 @@ static void test_GetTimeFormatEx(void) STRINGSW("m1s2m3s4", ""); /* TIME_NOMINUTESORSECONDS/complex format */ ret = pGetTimeFormatEx(localeW, TIME_NOMINUTESORSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + ok(ret == lstrlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENW; EXPECT_EQW; STRINGSW("", "8:56 AM"); /* TIME_NOSECONDS/Default format */ @@ -701,7 +674,7 @@ static void test_GetTimeFormatEx(void) STRINGSW("s1s2s3", ""); /* Duplicate tokens */ ret = pGetTimeFormatEx(localeW, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + ok(ret == lstrlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENW; EXPECT_EQW; STRINGSW("t/tt", "A/AM"); /* AM time marker */ @@ -3346,6 +3319,7 @@ static void test_FoldStringA(void) static void test_FoldStringW(void) { int ret; + WORD type; unsigned int i, j; WCHAR src[256], dst[256], ch, prev_ch = 1; static const DWORD badFlags[] = @@ -3564,10 +3538,11 @@ static void test_FoldStringW(void) ret = pFoldStringW(MAP_FOLDDIGITS, src, -1, dst, 256); ok(ret == 2, "Expected ret == 2, got %d, error %d\n", ret, GetLastError()); - ok(dst[0] == ch || strchrW(outOfSequenceDigits, ch) || + ok(dst[0] == ch || wcschr(outOfSequenceDigits, ch) || (ch >= 0xa8e0 && ch <= 0xa8e9), /* combining Devanagari on Win8 */ "MAP_FOLDDIGITS: ch 0x%04x Expected unchanged got %04x\n", ch, dst[0]); - ok(!isdigitW(ch) || strchrW(outOfSequenceDigits, ch) || + GetStringTypeW( CT_CTYPE1, &ch, 1, &type ); + ok(!(type & C1_DIGIT) || wcschr(outOfSequenceDigits, ch) || broken( ch >= 0xbf0 && ch <= 0xbf2 ), /* win2k */ "char %04x should not be a digit\n", ch ); } @@ -3595,7 +3570,7 @@ static void test_FoldStringW(void) broken( dst[0] == ch ) || /* old Windows versions don't have all mappings */ (digitRanges[j] == 0x3020 && dst[0] == ch) || /* Hangzhou not present in all Windows versions */ (digitRanges[j] == 0x0F29 && dst[0] == ch) || /* Tibetan not present in all Windows versions */ - strchrW(noDigitAvailable, c), + wcschr(noDigitAvailable, c), "MAP_FOLDDIGITS: ch %04x Expected %04x got %04x\n", ch, '0' + digitRanges[j] - ch, dst[0]); } @@ -5908,22 +5883,22 @@ static void test_NormalizeString(void) if (dstlen) { dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen ); - ok(dstlen == strlenW( dst )+1, "%s:%d: Copied length differed: was %d, should be %d\n", - wine_dbgstr_w(ptest->str), i, dstlen, strlenW( dst )+1); - str_cmp = strncmpW( ptest->expected[i], dst, dstlen+1 ); + ok(dstlen == lstrlenW( dst )+1, "%s:%d: Copied length differed: was %d, should be %d\n", + wine_dbgstr_w(ptest->str), i, dstlen, lstrlenW( dst )+1); + str_cmp = wcsncmp( ptest->expected[i], dst, dstlen+1 ); todo_wine_if(ptest->todo[i]) ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); } - dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), NULL, 0 ); + dstlen = pNormalizeString( norm_forms[i], ptest->str, lstrlenW(ptest->str), NULL, 0 ); if (dstlen) { memset(dst, 0, sizeof(dst)); - dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), dst, dstlen ); - ok(dstlen == strlenW( dst ), "%s:%d: Copied length differed: was %d, should be %d\n", - wine_dbgstr_w(ptest->str), i, dstlen, strlenW( dst )); - str_cmp = strncmpW( ptest->expected[i], dst, dstlen ); + dstlen = pNormalizeString( norm_forms[i], ptest->str, lstrlenW(ptest->str), dst, dstlen ); + ok(dstlen == lstrlenW( dst ), "%s:%d: Copied length differed: was %d, should be %d\n", + wine_dbgstr_w(ptest->str), i, dstlen, lstrlenW( dst )); + str_cmp = wcsncmp( ptest->expected[i], dst, dstlen ); todo_wine_if(ptest->todo[i]) ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) );

1 0

Alexandre Julliard : kernel32: Use RtlLocaleNameToLcid().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 9f0983ddfc570f20e211ddc257f2c39068266273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f0983ddfc570f20e211ddc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 10:10:18 2019 +0100 kernel32: Use RtlLocaleNameToLcid(). --- dlls/kernel32/locale.c | 43 +++++++------------------------------------ dlls/kernel32/tests/locale.c | 7 +++++++ 2 files changed, 14 insertions(+), 36 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a465ba6e29..e5e32d3cb5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1182,32 +1182,12 @@ BOOL WINAPI GetUserPreferredUILanguages( DWORD flags, ULONG *count, WCHAR *buffe */ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) { - struct locale_name locale_name; - static int once; - - if (flags && !once++) - FIXME( "unsupported flags %x\n", flags ); - - if (name == LOCALE_NAME_USER_DEFAULT) - return GetUserDefaultLCID(); + LCID lcid; - /* string parsing */ - parse_locale_name( name, &locale_name ); - - TRACE( "found lcid %x for %s, matches %d\n", - locale_name.lcid, debugstr_w(name), locale_name.matches ); - - if (!locale_name.matches) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (locale_name.matches == 1) - WARN( "locale %s not recognized, defaulting to %s\n", - debugstr_w(name), debugstr_w(locale_name.lang) ); - - return locale_name.lcid; + if (!name) return GetUserDefaultLCID(); + if (!set_ntstatus( RtlLocaleNameToLcid( name, &lcid, 2 ))) return 0; + if (!(flags & LOCALE_ALLOW_NEUTRAL_NAMES)) lcid = ConvertDefaultLocale( lcid ); + return lcid; } @@ -2570,18 +2550,9 @@ BOOL WINAPI IsValidLocale( LCID lcid, DWORD flags ) */ BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) { - struct locale_name locale_name; - - if (!locale) - return FALSE; - - /* string parsing */ - parse_locale_name( locale, &locale_name ); - - TRACE( "found lcid %x for %s, matches %d\n", - locale_name.lcid, debugstr_w(locale), locale_name.matches ); + LCID lcid; - return locale_name.matches > 0; + return !RtlLocaleNameToLcid( locale, &lcid, 2 ); } /****************************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b87f99c1c2..9a13693443 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2856,6 +2856,9 @@ static void test_LocaleNameToLCID(void) ok(lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT), "Got wrong lcid for es-es: 0x%x\n", lcid); /* english neutral name */ + lcid = pLocaleNameToLCID(enW, LOCALE_ALLOW_NEUTRAL_NAMES); + ok(lcid == MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), SORT_DEFAULT) || + broken(lcid == 0) /* Vista */, "got 0x%04x\n", lcid); lcid = pLocaleNameToLCID(enW, 0); ok(lcid == MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT) || broken(lcid == 0) /* Vista */, "got 0x%04x\n", lcid); @@ -2871,6 +2874,7 @@ static void test_LocaleNameToLCID(void) *buffer = 0; ret = pLCIDToLocaleName(lcid, buffer, ARRAY_SIZE(buffer), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(ptr->name), ret); + todo_wine_if (ptr->todo) ok(!lstrcmpW(ptr->sname, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(buffer)); @@ -4740,6 +4744,7 @@ static void test_GetLocaleInfoEx(void) static void test_IsValidLocaleName(void) { static const WCHAR enusW[] = {'e','n','-','U','S',0}; + static const WCHAR enW[] = {'e','n',0}; static const WCHAR zzW[] = {'z','z',0}; static const WCHAR zz_zzW[] = {'z','z','-','Z','Z',0}; static const WCHAR zzzzW[] = {'z','z','z','z',0}; @@ -4753,6 +4758,8 @@ static void test_IsValidLocaleName(void) ret = pIsValidLocaleName(enusW); ok(ret, "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(enW); + ok(ret || broken(!ret), "IsValidLocaleName failed\n"); ret = pIsValidLocaleName(zzW); ok(!ret || broken(ret), "IsValidLocaleName should have failed\n"); ret = pIsValidLocaleName(zz_zzW);

1 0

Alexandre Julliard : ntdll: Implement RtlLocaleNameToLcid().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 7ac7a902c87d7d82e6b2431b8a44260eb5149ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac7a902c87d7d82e6b2431b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 10:08:27 2019 +0100 ntdll: Implement RtlLocaleNameToLcid(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 79 ++++++++++++++++++++++-- dlls/ntdll/loader.c | 2 + dlls/ntdll/locale.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 1 + include/winternl.h | 1 + 6 files changed, 221 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ac7a902c87d7d82e6b2…

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
90
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 2019